Commit Graph

2393 Commits

Author SHA1 Message Date
Jannik Tappert bc773f07e3
Added a check for if it is a double battle. Otherwise a named trainer that has a potential double would show the "female" (partner) sprite if the solo battle was of female variant. (#1383) 2024-05-26 15:48:28 +01:00
Jannik Tappert 5f82449120
Tate Animation was 5 times slower as the one from Liza. So i just shr… (#1381)
* Tate Animation was 5 times slower as the one from Liza. So i just shrunk down the file for it to have only every fifth frame

* Tates Animation is now smoother and more in sync with liza
2024-05-26 06:20:16 -05:00
Lugiad 96491039fb
Update French biome.ts (#1386) 2024-05-26 04:07:44 -05:00
Upos1997 6e286257d3
Implemented Plus and Minus (#1155)
* Implemented Plus and Minus

* Merge branch 'pagefaultgames:main' into main
2024-05-26 04:03:27 -05:00
Madmadness65 8b920f2e60 Mark Magearna's forms as selectable starters 2024-05-26 02:06:48 -05:00
SnowCharm a2996cdd66
add zh_CN biome.ts (#1389) 2024-05-26 00:33:14 -05:00
Nicholas Galauxy 9aa22d6150
Bugfix: In-Battle Formes are incorrectly selectable (#1388)
* Fix incorrectly unselectable starter formes

* Fix linter issue that got merged upstream

* Remove battle-bond key from form key overrides based on feedback

* Fixes being able to select forms that shouldn't be startable

* Add Minior Cores as cycleable

* Remove unused code from previous implementation
2024-05-25 22:31:42 -05:00
Matthew Olker 44f4f14956 Update Artist Sprite Fixes 2024-05-25 23:08:36 -04:00
Greenlamp2 b170478119
fix conflict without rebase (#1186) 2024-05-25 21:36:09 -04:00
Jannik Tappert de1c2b2b5b
Added localization to the biomes. (#1378)
* Added localization to the biomes.

German Localization by me. (Native German).
French Localiztation by sangara42 from Discord

* Changed End back to ??? and Space is now Space again it all but German and French

* Changed english biome names according to https://wiki.pokerogue.net/biomes:biomes

* And we are back to grassy field since apparently the wiki is wrong...
2024-05-25 15:57:22 -05:00
nterrien 6f2d639a7b
Fix French translation of Genesect's Drive (#1379) 2024-05-25 15:54:31 -05:00
td76099 ae0cd86bc3
Adding clause so right Pokemon in double battle cannot target itself with a spread move when left one dies with no replacement (#1370) 2024-05-25 14:06:50 -05:00
Nicholas Galauxy 93c91bf73a
Fix incorrectly unselectable starter formes (#1332)
* Fix incorrectly unselectable starter formes

* Fix linter issue that got merged upstream

* Remove battle-bond key from form key overrides based on feedback
2024-05-25 12:53:46 -05:00
damocleas 1b8b0789c0
Made Lab 25% instead of 12.5% to encounter after Factory (#1351)
This biome is too rare, this is just a temporary change until biomes are redone.
2024-05-25 18:45:07 +01:00
ASCAlex 311f7b7420
Fixed German localization for Starf Berry description and localized zippyZap effect (#1373) 2024-05-25 11:47:31 -05:00
Frederico Santos f95bd40353
Swapped Aron for Aggron on Iris pokemon pool (#1374) 2024-05-25 11:45:27 -05:00
Benjamin Odom 5c28e1fb11
Adds New BattleSceneEventTypes (#1372)
* Add BattleSceneEvents

* Update battle-scene-events.ts
2024-05-25 17:23:53 +01:00
Jannik Tappert 97d8275417
localized Honeygather again (#1369) 2024-05-25 09:31:30 -05:00
Frederico Santos ef28e75b39
hotfix for alder bgm on double battle (#1368) 2024-05-25 09:20:27 -05:00
Jakub Hanko caeb22c26b
Implement Honey Gather (#1360)
* Implement Honey Gather

* Updated Ability Description

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-05-25 08:01:08 -05:00
Jannik Tappert aaa96ebe0e
Adding the option to have named trainers be able to have a double battle together (#1318)
* WIP: Adding the option to have named trainers be able to have a double battle together

* The team generation now works.
Also changed it so the special pools are now seperatly defined so we can access it for the team generation of the doubles.

They will happen at a 33% chance.

TODO: Option for seperate double dialogue (because for example the dialogue for tate and liza dont make sense since they reference their other sibling not beeing there...)

* Obviously didnt mean to push changes to battle.ts... (I made this change for a test)

* The doubles now have victory and encounter dialogue (the dialogue itself isnt THAT good since english isnt my first language)

* Changed signatureSpecies for the new galar elite 4

* Added Marnie & Piers as a double

* ESLint

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-05-25 07:47:18 -05:00
Tempoanon 49c365f154
Make iv scanner check against baby form IVs (#1214) 2024-05-25 06:47:26 -05:00
Jannik Tappert b524be1db1
Issue #1118 Added Galar Elite 4 (#1246)
Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-05-25 06:38:59 -05:00
td76099 c4c4774528
Beat Up checks the user's party instead of always checking player's party (#1268) 2024-05-25 06:31:04 -05:00
innerthunder 4ffff8e1ee
Implement Quick Guard and other conditional team protection moves (#1275)
* Implement conditional protection arena tag

Affected moves:
- Quick Guard
- Wide Guard
- Mat Block
- Crafty Shield
- Feint (updated)

* Add support for moves that ignore Protect to conditional protection moves

* Comments for protect arena tags

* ESLint

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-05-25 06:22:10 -05:00
ReneGV 5c327e347a
Implement Purify (#1291)
* Implement purify

* Code review fixes

* Remove vitest import

* Update status-effect.ts

* Update status-effect.ts

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-05-25 06:01:23 -05:00
神龟 79f69ddfe0
Update move.ts (#1359) 2024-05-25 05:43:42 -05:00
LaukkaE 0da469d7a3
Fix Wind Rider (#607)
Fix Wind Rider
2024-05-25 05:32:32 -05:00
arColm ae2928e1c9
Implement Poison Puppeteer (#320)
Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-05-25 04:51:36 -05:00
Franck TROUILLEZ 37ebbd28d5
Apply offset to baseY as well during Pokemon#setMini (#1357)
This fixes an issue where this.baseY and this.y were not sync anymore, leading to unexpected behavior while using both values, especially during the selectTargetPhase, where the UI was not working for the first player pokemon.
2024-05-25 04:45:47 -05:00
Tempoanon d71451fc23
Players win if classic and past floor 200 (#1348)
* Players win if classic and past floor 200

* isClassic

* no need to handle game over twice
2024-05-25 04:36:30 -05:00
Jannik Tappert 34474fb10e
German Loc for the menu.ts change (#1354) 2024-05-25 04:36:14 -05:00
YounesM 4277439a2d
Implemented Dancer Ability (#590)
* implemented Dancer Ability

* corrected target selection for double battles, improved ability detection

* Added TSDoc

* Enhanced TSDoc

* Corrected dancing StatusMove triggering

* Linter corrections
2024-05-24 23:00:58 -05:00
SnowCharm 5f7c593365
Update zh_CN ability.ts and move.ts (#1350)
* fix translation error in zh_CN ability.ts

* add translation for Zippy Zap

* fix translation to keep up with the current impl
2024-05-24 23:46:16 -04:00
Matthew Olker 1e283afc84 fix anmation duplicate warnings 2024-05-24 22:57:47 -04:00
Benjamin Odom 32fadf8cb6
Update menu.ts (#1349) 2024-05-24 21:46:21 -04:00
Matthew Olker 840ac9f53f fix single pokemon run away in double battle 2024-05-24 21:16:27 -04:00
Matthew 623c05a3df
update running away in double battles for real this time (#1345) 2024-05-24 19:39:58 -05:00
zaccie 564add66d2
Changing Biome Text Colour (#1346)
On light coloured biomes this change should be similar readability
In darker biomes it's has much easier readability
+ now becomes more consistent colour with the rest of the game text which just looks better imo
2024-05-24 20:31:33 -04:00
Tempoanon dc828c6801
Revert "Update running away in Double Battles (#1336)" (#1342)
This reverts commit 5e7a9b0872.
2024-05-25 09:54:46 +10:00
Matthew 5e7a9b0872
Update running away in Double Battles (#1336)
* Add check for active pokemon and double battle with 1 active

* remove unecessary case
2024-05-24 19:46:52 -04:00
Benjamin Odom 416d666b30
Update Biome Text Labels and Variable Name (#1340)
* Added ability to get hex colour from type, added biome text, added functionality for querying biomeType with object.

* Revert "Added ability to get hex colour from type, added biome text, added functionality for querying biomeType with object."

This reverts commit 0f87000aa4.

* Reverted changes, added biome text to line one and renamed wavecounttext to a more standard name.

* Update battle-scene.ts

* Update Formatting

* Update Enums

* Revert

* Update overrides.ts

* Update battle-scene.ts

---------

Co-authored-by: Jon Studders <jonstudders1@gmail.com>
2024-05-24 18:43:38 -05:00
Nicholas Galauxy 815b37d23c
Convert reconnect method to exponential backoff timeout (#1293)
* Convert reconnect method to exponential backoff timeout

* Reset to the starting duration after getting a response

* Fix broken scope enclosures
2024-05-24 17:57:49 -05:00
Jon Studders c8b77cffc1
Added current biome text (#915)
* Added ability to get hex colour from type, added biome text, added functionality for querying biomeType with object.

* Revert "Added ability to get hex colour from type, added biome text, added functionality for querying biomeType with object."

This reverts commit 0f87000aa4.

* Reverted changes, added biome text to line one and renamed wavecounttext to a more standard name.

* Update battle-scene.ts

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-05-24 18:36:02 -04:00
Jon Studders 919760e2e1
Added if statement to deploy.yml stopping local builds failing. (#1335) 2024-05-24 18:26:23 -04:00
Greenlamp2 410b33a44f
Merge pull request #1338 from bennybroseph/MoveUsedEvent-Add
Add MoveUsedEvent to Listen For When a Move Gets Used
2024-05-25 00:20:12 +02:00
Benjamin Odom 3985c63dad Update battle-scene.ts 2024-05-24 17:03:49 -05:00
Benjamin Odom 74bf42b4b7 Let's try this again 2024-05-24 17:01:47 -05:00
Matthew Olker 751a3d1e49 add names to battle info ui objects and solve key already exists warning for starter select 2024-05-24 17:23:49 -04:00
Jon Studders d01cd98d06
Fixed champion ribbon boss segments. (#1334) 2024-05-24 16:07:57 -05:00