Commit Graph

1938 Commits

Author SHA1 Message Date
Greenlamp
9874587103 adapted the code to integrate changes of bennybroseph 2024-05-05 16:20:12 +02:00
Greenlamp
18b1627f87 Merge branch 'main' of github.com:Greenlamp2/pokerogue into feat/inputs_management_rework 2024-05-05 16:13:27 +02:00
Benjamin Odom
3ed7649ce5
Remove Debug Code (#480)
Remove code intended only for debugging.
2024-05-05 18:45:54 +10:00
Ivan Perez
3a218eb92b
Fixed a bug where a yawned target in a semi-vulnerable state would be stuck in that state (#396) 2024-05-05 00:35:47 -05:00
Reldnahc
7cdf07c050
have arena tags check their sides. (#447)
* have arena traps check their sides.

* make sure we check the right tags layers
2024-05-05 00:27:46 -05:00
Benjamin Odom
dd76cbc7a2
Add Setting to Swap A and B on Gamepad (#474)
* Add Setting to Swap A and B on Gamepad

Added a new setting to swap the A and B button on controller. Defaults to off which retains the current behavior on live.

* Add comments
2024-05-05 01:25:57 -04:00
Madmadness65
5440c0b40c Add B2W2 Legendary Titan Theme
This is a small part of a larger addition of music, added before the rest due to it being a B2W2 track.
2024-05-04 22:48:23 -05:00
Flashfyre
5d82a1538c Add various missing variant sprites and icons 2024-05-04 23:33:45 -04:00
Benjamin Odom
daa6e3b3a8
Prevent Fusion Status Errors +Fix Double Battle Issue (#472)
* Reapply "Prevent Fusing Status Errors (#465)"

This reverts commit 18a1c152c0.

* Update phases.ts
2024-05-04 22:16:59 -05:00
Alessandro Bruzzese
41f9420c90
Added Italian translations for ability.ts and other element (#471) 2024-05-04 21:00:28 -05:00
Madmadness65
18a1c152c0 Revert "Prevent Fusing Status Errors (#465)"
This reverts commit 68eca464f7.
2024-05-04 20:50:48 -05:00
Madi Simpson
96d7fdd3f9
Implement Water Shuriken Battle Bond condition (#466)
* moves: water shuriken hits 3x 20bp in ash greninja forme

* moves: remove fusion checks
2024-05-04 20:50:12 -05:00
Madi Simpson
2c003854e9
terrain: psychic terrain doesn't block priority moves on the user's side (#470) 2024-05-04 20:45:37 -05:00
Benjamin Odom
68eca464f7
Prevent Fusing Status Errors (#465) 2024-05-04 20:37:31 -05:00
Benjamin Odom
d170aeeab6
Updated Learnset of Gen2 to Indigo Disc (#469)
* Updated Learnset of Gen1 to Indigo Disc

Not many changes here for how much time it takes to comb through, but here it is.

Only notable change is Power-Up Punch got removed this gen so it had to be removed from Hitmonchan's learnset. Are we okay with this change? If so, this is good to go for Gen 1.

* Updated Learnset of Gen2 to Indigo Disc

Notable changes:

Porygon 2 loses Magic Coat with no replacement.

Ho-oh loses Burn Up but gains Overheat.

The rest seems better or neutral.
2024-05-04 20:27:01 -05:00
Madmadness65
1792b98608 Implement Genesect's forms & Techno Blast
Genesect's Drive forms does not change it's typing, only Techno Blast's type.
2024-05-04 19:45:07 -05:00
Madi Simpson
6151ec0e49
modifiers: pp up/max now also shows pp (#467) 2024-05-04 19:31:25 -05:00
Madi Simpson
b2c74cfc90
Implement Opportunist (#460)
* abilities: implement opportunist

* abilities: make it not infinitely loop like a dummy

* abilities: properly ignore only opportunist on opportunist boosts

* abilities: rename some things to make a bit more sense
2024-05-04 18:38:53 -05:00
Madmadness65
4e0bf8f5a1 Adjust Tyrogue egg move
Mach Punch was unnecessary, as Hitmonchan gets it via level up. This provides a good setup option for all three evolutions.
2024-05-04 18:37:04 -05:00
Greenlamp
8e3bf1ce15 Merge branch 'main' of github.com:Greenlamp2/pokerogue into feat/inputs_management_rework
 Conflicts:
	src/ui/summary-ui-handler.ts
2024-05-05 01:02:29 +02:00
Akuma-Reiki
92fb8b715e
Added Candy Progress UI (#463)
* Added Candy Progress UI

* GetRootSpecies rather than colors of current Species
2024-05-04 18:29:48 -04:00
LaukkaE
620a92aace
Bugfix Tickle, Tearful Look, Decorate (#464) 2024-05-04 17:28:15 -05:00
Greenlamp
4526683c5a added return type for inputs-controller 2024-05-04 23:13:59 +02:00
Greenlamp
a84f9f89bf added return type for ui-inputs 2024-05-04 22:52:20 +02:00
nrawicz
cd7de10722
Expanding force hotfix (#459)
* Expanding Force Implementation

Added target change attribute based on terrain

* Class change I guess

* Expanding Force Implementation

Added target change attribute based on terrain

Class change I guess

Squashed weird split commit

* Fixed removed commits

My bad

* ACTUALLY fixed removed commits

* Expanding Force Hotfix

Fixes a bug where Expanding Force would not act as a multi-target move in the MoveEffectPhase while in psychic terrain
2024-05-04 13:28:44 -05:00
Benjamin Odom
f53c699d04 Updated Learnset of Gen1 to Indigo Disc
Not many changes here for how much time it takes to comb through, but here it is.

Only notable change is Power-Up Punch got removed this gen so it had to be removed from Hitmonchan's learnset. Are we okay with this change? If so, this is good to go for Gen 1.
2024-05-04 13:43:07 -04:00
Greenlamp
c6a2d98e4a fix repeating stats button + change message in event when the key is repeating 2024-05-04 19:08:42 +02:00
Flashfyre
a7af14b8e2 Fix fusion token weight at 1000 2024-05-04 11:54:00 -04:00
nrawicz
da5615eb4a
Implement Expanding Force (#417)
* Expanding Force Implementation

Added target change attribute based on terrain

* Class change I guess

* Expanding Force Implementation

Added target change attribute based on terrain

Class change I guess

Squashed weird split commit

* Fixed removed commits

My bad

* ACTUALLY fixed removed commits
2024-05-04 10:52:24 -05:00
Flashfyre
3d2f31eb4f Fix endure token weight 2024-05-04 11:50:15 -04:00
Lugiad
d77ae729c0 Minor Update to French battle.ts
Thanks to @Dakurei for this nice compromise
2024-05-04 11:01:18 -04:00
Lugiad
3de4b9cd12 Minor Update to French battle.ts 2024-05-04 10:49:50 -04:00
dpMelian
c58a2fdee3 feat: replace steel type sprite with new version for consistency 2024-05-04 09:49:21 -04:00
Flashfyre
5b4f1da854 Fix level capped party members not gaining friendship 2024-05-04 00:19:50 -04:00
Benjamin Odom
b529eee5ac
Add Form Text to Starter UI (#446)
* Add Form Text to Starter UI

Adds text to the starter screen UI which indicates which Form you are currently selecting. This helps with Pokémon who don't have a sprite change for their form because it doesn't affect them until later.

* Make Title Case
2024-05-04 00:02:55 -04:00
Benjamin Odom
5d6181926a Removed Hardcoded Values
Realized there was an enum for the -1 value which should help clear up confusion if someone has to mess with this code later
2024-05-03 23:26:56 -04:00
Tempoanon
fabd2b1550
Add in missing import (#445) 2024-05-04 12:40:34 +10:00
Tempoanon
5b44905b86
Fix Shedinja passive, mummy passive, acupressure, moody, and added a second move override (#369) 2024-05-04 12:30:23 +10:00
Tempoanon
f9abc50d8b
Add Neutralizing Gas message, display Manaphy egg gacha origin, allow catching wonder guard bosses (#322)
* Add Neutralizing Gas message, display Manaphy egg gacha origin, allowcatching wonder guard bosses

* Add edge cases of supressed/overriden wonder guard bosses
2024-05-04 12:29:30 +10:00
Tempoanon
4163005f12
Implement Forewarn, Frisk, and BattlerTags for Magnet Rise (WIP) (#241)
* Implement Forewarn, Frisk, and BattlerTags for Magnet Rise (WIP)
2024-05-04 12:10:40 +10:00
Benjamin Odom
e02b85629f Fix Enemy Counter Moves
The AI couldn't decide who to target with CounterDamageAttr  moves which don't need a target. This change makes an exception. Now functions the same as when the player selects one of these moves.
2024-05-03 21:00:56 -04:00
Madmadness65
ed24e03a6f Fix Groudon's passive
Changed from Flame Body to Protosynthesis, the original change wasn't discussed enough.
2024-05-03 19:35:07 -05:00
Madmadness65
cfee310350 Adjust more passive abilities
Changes some of the more problematic passives some Pokémon had. As usual, if there's any that you may have a problem with, we are always up for suggestions.
2024-05-03 19:21:02 -05:00
Greenlamp
b55eac7d5d putting in an enum file the enum buttons 2024-05-04 02:04:16 +02:00
Greenlamp
15c82d2de2 cleanup 2024-05-04 01:55:18 +02:00
Greenlamp
db009550e7 cleanup 2024-05-04 01:53:29 +02:00
Greenlamp
b1a171011c cleanup 2024-05-04 01:52:32 +02:00
Greenlamp
c1a0835a65 seems old code source is indented with tab 2024-05-04 01:48:13 +02:00
Greenlamp
ba8ebc64ef Merge branch 'main' of github.com:Greenlamp2/pokerogue into feat/inputs_management_rework
 Conflicts:
	src/ui/confirm-ui-handler.ts
	src/ui/save-slot-select-ui-handler.ts
	src/ui/starter-select-ui-handler.ts
2024-05-04 01:39:32 +02:00
Greenlamp
e18a4f3d16 remove Plugins things as it's too uncertain how it works on prod 2024-05-04 01:34:59 +02:00