IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,883 Commits
7 Branches
0 Tags
680 MiB
Commit Graph

217 Commits (95a5ba23492f7b3dd09bc10b6b59f8f2e8fad269)

Author SHA1 Message Date
Chacolay 95a5ba2349 Fix merge overwrite issues 2024-04-29 11:33:20 -04:00
Chacolay 53731e6bca Merge branch 'pr/259' 2024-04-29 11:31:23 -04:00
Chacolay 05913ae7b2 Merge branch 'pr/254' 2024-04-29 11:26:38 -04:00
Chacolay 8f079c858d Merge branch 'pr/246' 2024-04-29 11:23:48 -04:00
Chacolay 9b881d74a3 Merge branch 'pr/243' 2024-04-29 11:17:14 -04:00
Chacolay e1071615a3 Merge branch 'pr/241' 2024-04-29 11:16:15 -04:00
Chacolay 9dd806f775 Merge branch 'pr/240' 2024-04-29 11:15:24 -04:00
Chacolay e709074211 Merge branch 'pr/227' 2024-04-29 11:07:14 -04:00
Chacolay 87b2684328 Merge branch 'pr/205' 2024-04-29 10:59:50 -04:00
Chacolay 9ddb9920c3 Merge branch 'pr/116' 2024-04-29 10:53:45 -04:00
NxKarim 40f4858690
Merge branch 'main' into side 2024-04-28 23:58:40 -06:00
NxKarim 3731f943a8
Merge branch 'main' into main 2024-04-28 23:54:20 -06:00
lucfd 481d8e2796
removed redundant condition 2024-04-28 23:49:26 -04:00
Akuma-Reiki a6c27773f8
Make arena trap count as a lure ability (#245) 2024-04-26 13:58:57 -04:00
shayebeadlingkl e18f5f972b check if max 2024-04-26 09:14:36 -04:00
shayebeadlingkl 5c4d299de1 Merge branch 'main' into implements-cursed-body 2024-04-26 09:13:29 -04:00
InfernoVulpix d4c265443f Assurance effect implementation 
Theoretically implemented for all use cases but only tested for regular damage so far.
 2024-04-25 23:03:00 -04:00
AJ Fontaine 9f3bef0142
Implemented explosive moves and Damp (#290) 
* Implemented explosives

* Add Aftermath and Magic Guard interactions

* Adjust AI score for Mind Blown/Steel Beam
 2024-04-25 21:42:41 -04:00
NxKarim 29337fd1f9
Merge branch 'pagefaultgames:main' into side 2024-04-25 15:47:11 -06:00
NxKarim 1838e50248
Merge branch 'pagefaultgames:main' into main 2024-04-25 15:43:14 -06:00
lucfd fa463b77db
Implements Stakeout & Analytic (#292) 
* implemented stakeout

* implemented analytic
 2024-04-25 14:29:05 -04:00
NxKarim 5163774fa6
Merge branch 'main' into side 2024-04-25 00:04:24 -06:00
NxKarim 413591ce70
Merge branch 'main' into main 2024-04-24 23:58:12 -06:00
Tempoanon 230c2bf983
Fix Moody and Quark Drive (#284) 
* Fix Quark Drive and Moody

* Telepathy still unimplemented

* more merge conflict stuff
 2024-04-25 01:23:45 -04:00
lucfd a762101f64
fixing merge conflicts 2024-04-25 01:07:08 -04:00
lucfd 8d0a868dbe
Merge branch 'main' into quickdraw 2024-04-25 01:00:23 -04:00
Temps Ray 1bfd601f4c More merge conflict grrrrrr 2024-04-24 23:06:03 -04:00
Temps Ray e88b4a216a merge 2024-04-24 23:04:51 -04:00
Temps Ray 0a5160d029 Merge branch 'main' into misc2 2024-04-24 23:04:34 -04:00
Temps Ray ffae8cc1fa Merge branch 'main' into misc2 2024-04-24 22:58:30 -04:00
Flashfyre a0311f4b0f Fix partial and unimplemented indicators not showing on abilities 2024-04-24 22:42:09 -04:00
Pablo González 7055ea49c7
Support localization of Pokémon abilities (#271) 
* Support localization of Pokemon abilities

* Reload ability localization when language is changed

* Add Spanish localization for abilities

* Add missing French abilities localization

* Add missing localize call on abilities

---------

Co-authored-by: Flashfyre <flashfireex@gmail.com>
 2024-04-24 21:10:09 -04:00
Temps Ray d8bb221eff Remove unnecessary ohko flag 2024-04-24 15:13:05 -04:00
shayebeadlingkl da3e06713e done testing, changes chance back to 30% 2024-04-23 12:47:21 -04:00
shayebeadlingkl d0df0c06ff adds an ally check to the condition 2024-04-23 12:43:19 -04:00
shayebeadlingkl 06cdd808fd Implements healer 2024-04-23 12:35:26 -04:00
shayebeadlingkl dff97caf9e Implements Cotton Down 2024-04-23 11:38:43 -04:00
Luc Dube 2774251e6d reduced priority bonus to 0.01 2024-04-23 10:26:42 -04:00
Luc Dube 53aff71f52 changed to only attacking moves 2024-04-23 10:20:33 -04:00
Luc Dube de3db9988f now goes first in priority bracket 2024-04-23 10:18:58 -04:00
shayebeadling 11ee81091b
Implements hospitality (#252) 
* implements hospitality

* 1/8 -> 1/4

* shows animation

* Minor nitpicks

---------

Co-authored-by: Flashfyre <flashfireex@gmail.com>
 2024-04-23 09:43:35 -04:00
NxKarim fb9739bede .3 2024-04-22 21:41:43 -06:00
Flashfyre 3a46ee4a6a Serene Grace, Shield Dust, Sheer Force (P) 2024-04-22 21:04:12 -06:00
Luc Dube a9b0753a7e Implemented Quick Draw 2024-04-22 19:45:39 -04:00
Temps Ray aff79e508f Fix if/else formatting 2024-04-22 16:10:37 -04:00
Temps Ray 4dd694acb2 Implement Forewarn, Frisk, and BattlerTags for Magnet Rise (WIP) 2024-04-22 16:05:34 -04:00
Luc Dube 6548b65843 fixed type immunity abilities not working against status moves 2024-04-22 15:28:21 -04:00
NxKarim 5569571438
Merge branch 'main' into main 2024-04-22 02:36:46 -06:00
Luc 8cf82d3db4 fixed steam engine activating on all water moves 2024-04-22 00:49:54 -04:00
Flashfyre df7a6be654 Fix errors from merged PRs 2024-04-21 23:05:36 -04:00