Commit Graph

4217 Commits

Author SHA1 Message Date
Enoch
a8620889e1
Merge branch 'beta' into formChangeLocale 2024-09-22 10:08:52 +09:00
Lugiad
784b1fd221
Apply suggestions from code review
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-09-22 02:40:16 +02:00
ImperialSympathizer
0518cfd9d6
Merge pull request #4363 from PigeonBar/gts-infinite-loop
[Bug] [Beta] Fix game freeze from GTS infinite loop
2024-09-21 17:24:20 -04:00
Mumble
50dc438930
[Bug] Preventing Duplicate Species in Trainer Battles (#4368)
* no trainer repeats

* Update src/field/trainer.ts

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-21 22:27:19 +02:00
Mumble
4fb76fd117
[Move] Implement Heal Block (#4120)
* Heal Block on new branch

* Add/update code from previous PR

* Re-add i18n from previous PR

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>

* Disabling Moves

* Still need to update tests and write docs

* removing partial tags from abilities to feel better

* Pollen Puff works now

* Implemented Psychic Noise

* typedocs

* Documentation

* Update src/data/battler-tags.ts

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Update src/data/battler-tags.ts

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Update src/data/battler-tags.ts

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Turns out the old condition wasn't buggy. Probably mixed up another change I made.

* changed array clear

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-09-21 13:15:32 -07:00
Jannik Tappert
1e70cb92d1
[BUG] Add enough keys in dialogue.ts for team star (#4362) 2024-09-21 12:39:44 -07:00
Jannik Tappert
3790acad66
Merge branch 'beta' into formChangeLocale 2024-09-21 21:20:15 +02:00
Blitzy
ba5e89cf61
Swap Order in Trainer Config (#4367) 2024-09-21 14:15:02 -05:00
Michael Li
7190277f79 PR Feedback 2024-09-21 14:36:02 -04:00
Michael Li
5a24435047 [Bug] Fix game freeze from GTS infinite loop 2024-09-21 11:52:54 -04:00
Madmadness65
35cd615363
[Enhancement] Set Appropriate Evil Team on Monogen Challenges (#4355) 2024-09-20 22:49:16 -04:00
Blitzy
1a600d18c6
[Balance] Partial Passives + Egg Move Changes (#4357)
* Update Passives

* Zebra my Beloved
2024-09-20 19:47:14 -07:00
Madmadness65
f2a042c3f0
[Enhancement] Add Team Star as potential evil team (#4019)
* Add Team Star (WIP)

Still missing dialogue for all new trainer types, team compositions will need refining, and Starmobile graphics still do not exist yet.

* Add dialogue for all Team Star trainers

Dialogue put together courtesy of @Blitz425

* Add additional Macro Grunt dialogue lines

As suggested to be included by @Blitz425

* Add dialogue entries in dialogue.ts

Forgot them with my last commit, whoops

* Add back Team Star trainer types

Latest merge of beta into this PR deleted them for some reason

* Update Team Star boss team compositions

Bunch up Eeveelutions more in first fight, move random Rotom form to first fight. Remove Espeon, Umbreon, and Rotom from second fight, add legendary beasts and paradox beasts in their place, remove Zacian chance from second fight.

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>

* fix missing semicolon

* Guarantee Sylveon is always Terastallized

* Guarantee Starmobiles on admin's teams

Also resizing the Starmobiles by 1.5 like Gigantamax Pokémon (it is still just regular Revavroom visually for now).

* Adjust trainer pools for Grunts and Admins

* Add new custom sprites for Starmobiles

This adds front and shiny front sprites made by Kieran. Party icons and back sprites are still placeholders for now.

* Minor pool adjustments

Eevee moved to Uncommon on grunts, Varoom replaced with Hisui Qwilfish for Atticus, and Heracross replaced with Pawmi for Eri.

* Remove Leon's Zamazenta, rename Team Star Boss

As to not have overlap between the champion and Star boss teams.
Also doubled the weights of the Starmobile forms.

* Force movesets for Starmobiles

Also fix accidentally giving Mela a Venusaur instead of a Revavroom. (it was just a testing thing, I swear)

* Correct movesets

Didn't realize copied movesets were desired, ech

---------

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
2024-09-20 18:17:44 -07:00
flx-sta
0aac6c6647
[Dev][Test] Add "Mystery Encounter" type for create-test script + minor timeout fixes (#4350)
* add: mystery encounter to create-test

* remove: leftover `TIMEOUT`

in boss-pokemon.test

* add regex to replace ` ` with `_`

This was never done before. for any

* remove: manual test timeout overwrites
2024-09-20 17:54:37 -04:00
MokaStitcher
5f5b439e42
[P2 Bug] Fix sturdy and endure causing an extra stat boost to boss Pokemon (#4347)
* [bug] fix sturdy and endure causing an extra stat boost to boss Pokemon

* [doc] add doc for handleBossSegmentCleared
2024-09-20 17:19:33 -04:00
flx-sta
4cc3b0daae
[Test] Make berries abound test more robust (#4339)
* make `berries-abound` test more robust

the "should reward the player with X berries based on wave" test was failing due to berry max stacks and the party only having 1 pokemone.
Increased it to 3 to reduce that probability

* berries abound test: change `defaultParty`

increase size of default-party to 3

* add: some missing types in berries-abound encounter

for ease of reading

* fix: berries abound tests

the "Should skip battle when fastest pokemon is faster than boss" test was failing due to the party being more than 1 pokemon.
2024-09-20 17:18:48 -04:00
flx-sta
4c9c66f898
[Test] Fix Teleporting Hijinks tests (#4349)
set enemy passive ability by default to `Ball Fetch` to prevent random passive abilities that raise stats too
2024-09-20 17:18:18 -04:00
flx-sta
0a5e9ff9e6
[Test] Fix The Pokemon Salesman tests (#4345)
The expects didn't account for the possible shiny, which appends a `_shiny` to some dialogue tokens.
I've added regexes to account for that possibility
2024-09-20 17:14:55 -04:00
Jannik Tappert
20ab2b9272
Localizable Trainer Name + Cleffa Species name can be used in all 3 pokemon names (#4331) 2024-09-20 14:12:35 -07:00
flx-sta
1a5cbf8ecb
[Refactor][Tests] Set default test timeout to 20s (#4338)
* set default test timeout to 20s

* remove "TIMEOUT" reference from create-test-boilerplate

* remove TIMEOUT from tests

* test: remove leftover `20 sec timeout` references

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-20 23:05:45 +02:00
Jannik Tappert
6ba18b3f8f
Merge branch 'beta' into formChangeLocale 2024-09-20 20:14:06 +02:00
flx-sta
facdf3cdb9
[Qol][Misc] Make create-test script interactive (#4303)
* add: inquirer module

* make create-test interactive

To be more intuitive

* restructure create-test-boilerplate.js code

* move: test type choices into function

* fix: type choices only contain types

the "exit" option is added separately

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-20 08:24:08 -07:00
Lugiad
6b3abf1eec
Merge branch 'beta' into formChangeLocale 2024-09-20 16:28:27 +02:00
DustinLin
0eea2031fb
[Bug] Fixing seed sower uturn switchout bug for trainer battles (#4113)
* refactor wildFlee for seed sower animation bug

* better naming functions

* review suggestions

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-20 10:27:43 -04:00
Lugiad
0393fe67b4
Merge branch 'beta' into formChangeLocale 2024-09-20 16:26:35 +02:00
MokaStitcher
4feb45f532
[P3Bug][UI] Fix run history scrolling and other small bugs (#4326) 2024-09-20 10:19:45 -04:00
MokaStitcher
2610a64980
[Bug] Fix candy count when not skipping to summary (#4342) 2024-09-20 10:16:07 -04:00
Niccolò
d5099eb0ec
Update pokemon-form.json
deleted all of the remaining "form" snippets since it'll be shown as "Form: form name" so the form snippet was useless
2024-09-20 15:37:23 +02:00
Niccolò
0a765e542b
Update src/locales/it/pokemon-form.json 2024-09-20 15:35:15 +02:00
Niccolò
15a51a384f
Update src/locales/it/pokemon-form.json 2024-09-20 15:35:07 +02:00
Niccolò
2921a9b4f1
Update src/locales/it/pokemon-form.json 2024-09-20 15:34:58 +02:00
Niccolò
47cc73be9d
Update src/locales/it/pokemon-form.json 2024-09-20 15:34:48 +02:00
Niccolò
b16978cde9
Update src/locales/it/pokemon-form.json 2024-09-20 15:34:37 +02:00
Niccolò
b21f20c2fe
Update src/locales/it/pokemon-form.json 2024-09-20 15:34:18 +02:00
Niccolò
e48aa49efa
Update src/locales/it/pokemon-form.json 2024-09-20 15:34:04 +02:00
Niccolò
464a178a70
Update src/locales/it/pokemon-form.json 2024-09-20 15:33:54 +02:00
Niccolò
f92229300c
Update src/locales/it/pokemon-form.json 2024-09-20 15:33:38 +02:00
Niccolò
73c32fffd2
Update src/locales/it/pokemon-form.json 2024-09-20 15:33:30 +02:00
Niccolò
348a77c6f8
Update src/locales/it/pokemon-form.json 2024-09-20 15:33:14 +02:00
Niccolò
cdc18f7c94
Update src/locales/it/pokemon-form.json 2024-09-20 15:33:07 +02:00
Niccolò
821ab1f14a
Update src/locales/it/pokemon-form.json 2024-09-20 15:33:00 +02:00
Niccolò
5d5094520f
Update src/locales/it/pokemon-form.json 2024-09-20 15:32:52 +02:00
Niccolò
9464446ca4
Update src/locales/it/pokemon-form.json 2024-09-20 15:32:44 +02:00
Niccolò
14bd1b333b
Update src/locales/it/pokemon-form.json 2024-09-20 15:32:36 +02:00
Niccolò
b0fe1ed184
Update src/locales/it/pokemon-form.json 2024-09-20 15:32:28 +02:00
Niccolò
90b5656088
Update src/locales/it/pokemon-form.json 2024-09-20 15:31:04 +02:00
Lugiad
13acd1e454
Merge branch 'beta' into formChangeLocale 2024-09-20 12:07:40 +02:00
Tempoanon
63fba0dcae
[P3 Bug] Update pokemon-info-container ability highlighting to match tinted ball ability check (#4307)
* Update pokemon-info-container ability highlighting to match tinted ball ability check

* Fix typo

Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
2024-09-19 23:30:21 -04:00
flx-sta
baf686f621
[Beta][P3 Bug] fix: reading stats.battleCount (#4335)
instead of stats.battlesWon
2024-09-19 23:23:36 -04:00
Chapybara-jp
4bdaf93c72
[Localisation] [JA] Translated various dialogue files (#4336)
* Update ability-trigger.json

* Update ability.json

* Update arena-flyout.json

* Update arena-tag.json

* Update battle.json

* Update fight-ui-handler.json

* Update berry.json

* Update menu.json

* Update party-ui-handler.json

* Update starter-select-ui-handler.json

* Update tutorial.json

* Update move.json

* Update battle.json

* Update arena-flyout.json

* Update arena-flyout.json

* Update arena-tag.json

* Update party-ui-handler.json

* Update settings.json

* Update move-trigger.json

* Translate modifier-type.json

* Update modifier-type.json

* Translated modifier-type.json

* Update move-trigger.json

* Update move-trigger.json

* Update move-trigger.json

* Update modifier-type.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue-misc.json

* Update dialogue.json

* Update dialogue-misc.json

* Update dialogue-misc.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

Archers and Arianas dialog taken from Pokemon Stadium 2, HGSS, LGP/LGE, FRLG

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

* Update menu.json

* Update dialogue.json

* dialogue.json

* Update dialogue-final-boss.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json
2024-09-19 23:22:58 -04:00