63 Commits

Author SHA1 Message Date
Tempoanon
f6ad30b58f
[Feature] Add evil teams assets (#1577)
* Fix tinted caught icon false positive

* Remove unused import

* Rename and optimize

* Block comment

* Draft of evil team grunt pokemon pools

* Add graphics and music

* Add grunt spawn logic

* Add Giovanni

* Add team leader graphics

Giovanni and Ghetsis already have sprites, so they do not need added.

* Add teams for other evil team bosses

* Fix some typos and change hp bars to 2/2/2

* Fix sprites and add random team boss

* Add forced grunt encounter and update dialogue

* Update locales

* also lint en trainers

* More merge conflicts

* Deleted some duplicate images

* Correctly renamed the grunt files

* Forgot about team rocket

* New Magma Sprites

* Adjusted the trimming. Now they dont have as huge of a shadow bbelow them

* Fix grunt sprites

* Add real dialogue

* German Localization of the Dialogue

* Changes

* Tweak waves grunts spawn on

* Fix some typos in dialogue

* Y is canon

* Disable evil team spawns

* Fix another merge conflict

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-06-09 19:02:29 -04:00
Tempoanon
04bad2e15d
[Feature] Update E4 teams (#1851)
* Update E4s

* Accidentally made double Poliwrath

* Fixed some typos in the champ part

* Update based on Fontbane's comments
2024-06-09 12:20:00 -04:00
Madmadness65
c1405c7fd6
[Hotfix] Add Mixed Battle BGM entries for the Gen 1-5 trainers (#1988)
* Add Mixed Battle BGM entries for the Gen 1-5 trainers

* Also fix regular trainers
2024-06-09 01:48:32 -05:00
Madmadness65
67a0ae49b3
Add new Gym Leader, Elite Four, and Champion music (#1971) 2024-06-08 20:51:37 -05:00
MadridPawmot
f3de114d2b
[enhancement] Added Sailor trainer class (#1411)
* Add files via upload

* Update trainer-type.ts

* Update biomes.ts

* Update trainer-config.ts

* Update trainer-names.ts

* Update trainer-names.ts

* Update trainers.ts

* Update trainers.ts

* Added German translation

Thanks to CodeTappert

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts to resolve conflicts

* Fixed syntax error

* Update biomes.ts

* Re-added possible biomes for the Sailor trainer class

* Added data for dialogue lines for the sailor class

* Added dialogue from FRLG

* Added locale

* Added locale

* Added locale

* Update trainers.ts

* Added locale

* Added locale

* Added Korean translation

* Added locale

* Added Portuguese translation

* Added locale

* Added locale

* Added Mandarin Chinese translation

* Added Cantonese Chinese translation

* Added images

* Recentered sprite

* Added Spanish translation for the dialogue

* Delete duplicate

* Delete duplicate

* Updated dialogue with requested changes

* Update Spanish translation to reflect the changes

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts
2024-06-06 11:55:32 -05:00
Tempoanon
809c86599d
[Feature] Updated Champion teams (#1676)
* Updated champion teams

* Forgot Alder's legendary

* Give Alder Genesect

* Merge and update

* Update teams a bit more

* Red now leads with Pikachu, fixed Iris dialogue

* Add champ leads
2024-06-04 14:37:04 -04:00
MadridPawmot
63a416a65b
[enhancement] Added Firebreather trainer class (#1409)
* Add files via upload

* Update trainer-type.ts

* Update biomes.ts

* Update trainer-config.ts

* Update trainer-names.ts

* Add Spanish localization

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Update trainers.ts

* Finished adding placeholder strings for each language

* Updated German translation

Thanks to CodeTappert

* Updated trainer.ts to resolve conflicts

* Update trainers.ts to resolve conflicts

* Update trainers.ts

* Fixed syntax error

* Update dialogue.ts

* Re-added dialogue back

* Added firebreather name string to Korean locale

* Added dialogue string to locale

* Added dialogue string to locale

* Update dialogue.ts

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added dialogue string to locale

* Added requested changes

* Added requested changes

* Added requested changes

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Update dialogue.ts

* Finished adding requested changes to locales

* Added requested changes
2024-05-31 14:05:04 -05:00
Benjamin Odom
700ccf3afc
Various Error Fixes (#1580)
* Add @types/node to the package lock to resolve node_module errors

Devs will need to run npm install --save-dev @types/node on their end as well

* Final Various Fixes
2024-05-29 18:14:32 -05:00
Jannik Tappert
ac4e72c87a
Fix double battle named trainers having unevolved Pokemon (#1582) 2024-05-29 18:33:18 -04:00
Jannik Tappert
7ea8e48a4e
Readded import for i18next to trainer-config.ts (#1427) 2024-05-27 06:38:22 -05:00
Jannik Tappert
ac2f7755c2
Add the option to localize the Dialogue (#1254)
* Started Dialogue Loc. This is very much WIP

* Done with the trainer dialogue except the rival(s). And the special dialogue...

* Added Rival Dialogue

* Added final boss and ending dialogue

* Added Dialogue to all languages (just copied the english file). And updates the config.ts

* Added chinese splash

* Lint

* Added the new dialogue for the galar elite 4

* The dobule dialogue is now also localizable (also added dialogue localization files at all to chinese TW

* Added german dialouge for the named doubles

* Added Endboss translation for german

* Added rival dialogue in german (and yes i checked that every of them fits)

* Dialogue for trainer classes (As good as possible since the english text at some parts doesnt make a lot of sense)

* Start Gym Leaders

* Finished Kanto Gym Leaders
(Added missing dialogue to all other languages)

* Hoenn Gym Leaders

* Some more

* The Rest

* Marshal was missing something

* Partial French translation to dialogue.ts

* Added gender specific titles for elite 4, gym leaders and champs

* Readded import that was removed by a merge

* The dialogue can now be localized based on the players gender (male or female). unset uses the male dialogue. Can be easily adopted when we add non binary options later

---------

Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
2024-05-27 06:14:37 -05:00
Madmadness65
6f4c087f7a Add Pikachu and Eevee technical forms
This adds Partner Eevee and Partner Pikachu, as well as all Cosplay Pikachu variants. Also included are some minor trainer-related formatting clean ups.

• Partner Pikachu and Eevee have their boosted base stats from the Let's Go games, but are otherwise identical in function and appearance to their regular variants.
• Cosplay Pikachus have their special moves as "evolution" moves and can be relearned if desired.
• Unlike the canon games, Partner Pikachu and Eevee are able to evolve like normal.
2024-05-26 16:15:37 -05:00
Smewkie
42e0545918
Update trainer-config.ts (#1403)
Simply changing Marshal to have 2 evolved pokemon on his list rather than their unevolved forms, just in case there's another hiccup like with Iris having an Aron on her champion team.
2024-05-26 12:36:44 -05:00
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
Frederico Santos
f95bd40353
Swapped Aron for Aggron on Iris pokemon pool (#1374) 2024-05-25 11:45:27 -05:00
Frederico Santos
ef28e75b39
hotfix for alder bgm on double battle (#1368) 2024-05-25 09:20:27 -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
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
Matthew Olker
1e283afc84 fix anmation duplicate warnings 2024-05-24 22:57:47 -04:00
Greenlamp2
136fcbfda8
init dialog call in the loading-scene (#1331) 2024-05-24 15:08:18 -05:00
Greenlamp2
c1a7df913a
refactor executed code while importing and initializing all of these in loading-scene (#1125) 2024-05-24 13:46:30 -04:00
Greenlamp2
e2be6ba002
added rule no-trailing-spaces (#1307) 2024-05-23 18:45:04 -05:00
Greenlamp2
bac6c22973
ESLint - The Essential Linter and Formatter for JavaScript and TypeScript (#1224)
* eslint config + packages

* updated eslint config

* fix the issue eslint adding ;;;; at interfaces

* first round with eslint --fix .

* removed config for unused export

* Revert "first round with eslint --fix ."

This reverts commit 77a88e0895f7c3389cb223651b90d918af778fe9.

* removed config for camelCase

* for real this time, first round of eslint --fix .

* halfway to manual eslint fix

* eslint done

* added "how to setup" the hook to eslint --fix each new file before commit (if wanted)

* removed eslintrc config file duplicat

* fix human error + ignore build folder + merge overrides

* added curly brace style + eslint

* applied double quote linter rule

* added lefthook

* test precommit

* test precommit

* test precommit

* test precommit

* test precommit

* test precommit

* test precommit

* github action to run eslint

* added node_modules to ignore eslint

* different action for typescript

* no need for different glob (default src)

* node 20

* node 20

* removed no longer needed install file

* remove hooks part from README

* eslint fixes

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
2024-05-23 11:03:10 -04:00
Jannik Tappert
13f2cafe5e
Female Variant Trainer Class Names set explicitly in definition of trainer classes (#1126)
* Set the name for the ace trainer female class

* Wrote out the name for all females trainer classes explicitly so they are always used.

Also made some changes (added missing classes) to languages
2024-05-19 14:52:48 -05:00
Jannik Tappert
e3b25a9fab
So currently if you meet someone with a title it only shows there nam… (#1055)
* So currently if you meet someone with a title it only shows there name and only then the title (not like trainer classes). So i wanted to change that

* The title is not set again to its own value. It is just got differenlty for the nametag (includeTitle true)

* Added the ; as well as some comments that are hopefully helpful for others (i am terrible at writing comments)

* Forgot getTitle for comments
2024-05-19 06:23:24 -05:00
Vaner42
49adedbc0f
Fixed the replace method that was not executed in check female version exists; And fixed pokefan key in localization; (#1086)
* Translate 'trainer' into  Simplified Chinese.

* fixed translate 'hau'、 ‘diantha’ 、‘leon’ into Simplified Chinese.

* Fixed the replace method that was not executed in check female version exists; And fixed pokefan key in localization;

---------

Co-authored-by: Junhan <junhan.wu@nexttao.com>
2024-05-18 09:47:59 -05:00
Jannik Tappert
93dee06e21
Larry and Lance now only need one localization key for both of their positions (because i just use setName and now they use the same key). This does not affect their title (#1053) 2024-05-17 21:04:14 -05:00
Jannik Tappert
55105bf79a
Fixes that brocks name is undefined (#967)
* Brock now has a name againg (we check if i18 is initialized before localising elite4,champs and gym leaders

* Removed console log
2024-05-16 06:10:20 -05:00
Jannik Tappert
7f003d46ca
Added all double battle names as trainer classes. And updated/corrected errors. (in all languages but german i used the english version) (#963)
Also fixed that the rival does not have localized name
2024-05-16 05:43:31 -05:00
Jannik Tappert
b06190c4e7
Issue #745 localized trainer names trainer classes and titles (#752)
* Issue #745 - Added the option to localize titles, trainer names (for important trainers like elite 4, champs etc) and trainer classes.

- Also i already did the whole localization for german (sorry thats the only language is speak other then english...)
- Also renamed the trainer Type "student" to school_kid (because there apparently really is a trainer class called student since the gen 9 dlc)
- And i changed it so it makes sure that i18 only gets initalized once (it may be needed to initalize it before the loading phase so the elite 4 titles etc can be localized)

* Issue #745 - Removed stuff that wasnt meant for this branch

* Translation of French trainers.ts

* Translation of French trainers.ts

* Translation of French trainers.ts

* Fixed spelling on german translation

* Fixed name of Hex Maniac

* ADded missing "," that were lost in the merge

* For Trainer Classes that have a female and male variant the correct name is now choosen. (If a language has both).

Also added a safety net that if the female version does not exist it uses the one without the suffix

* Reverting override.ts

* Added ptBR trainers.ts (thanks to zé ricardo on discord)

* Updates Pokefan to reflect the correct english spelling (in all languages that still have the english defaults)

* Updated Rich_kid trainer typ to named correctly as "Rich Boy" in english and all non yet localized languages

* Added that the title will get made lower case so the rival is correctly set

* Reverted a formatting change that i didnt make intentionally

---------

Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
2024-05-16 04:05:25 -05:00
Xavion3
9197f9f070 Limit rare eggs to e4+ and fix trainer boss check
Also fixes weighting to account for adjusted level ranges
2024-05-15 11:55:47 -04:00
Flashfyre
437cb87df9 Add separate achievements for sub-legendaries and rename pseudoLegendary field 2024-05-05 11:05:22 -04:00
Madmadness65
c2136a6df1 Miscellaneous minor changes
• The volume of Pikachu's cry has been lowered by 10 dB.
• Tarountula's starter value has been lowered to 1.
• Altered Whitney and Chuck's signature Pokémon (swapped Whitney's Clefairy for Girafarig, and gave Chuck Mankey).
• The alternate forms in Flabébé's evolution line can now be encountered.
2024-04-21 00:47:55 -05:00
Flashfyre
c76f8c5e7e Add tiered shiny variants 2024-04-18 22:52:26 -04:00
ARSOD-Z
7c8aed50cd
trainer dialogue (#81) 2024-04-10 22:39:42 -04:00
Flashfyre
665eece2ac Slightly nerf early-mid to late-mid rival battles 2024-04-08 18:05:42 -04:00
Flashfyre
87aae2ff1c Nerf enemy evolution levels and first gym leader 2024-04-07 21:56:38 -04:00
Flashfyre
4f0b1fdcfb Fix namebox not updating with theme
Fix namebox not updating with theme; ban certain species from being used by trainers
2024-04-04 18:00:21 -04:00
Flashfyre
db960d9a98 Cap breeder party member base total below 450 2024-04-02 18:25:43 -04:00
Madmadness65
76a409245a Adjust some Champion teams
Lance no longer has Zacian or Zamazenta and instead has Zygarde, Leon had his Mr. Rime swapped for his ace Charizard, and Kieran now has a chance for either Ogerpon or Terapagos.
2024-04-01 16:36:38 -05:00
Madmadness65
bedeb2480c Fix E4 Molayne specializing in the wrong type
He's a Steel-type specialist.
2024-03-31 00:15:01 -05:00
Flashfyre
9455330329 Add female worker variant 2024-03-30 15:46:00 -04:00
Flashfyre
ff7258d9b6 Alter first and second gym leader levels 2024-03-28 14:47:57 -04:00
Flashfyre
0afec8fd35 Rebalance trainer evolution logic 2024-03-28 14:05:15 -04:00
Flashfyre
3d8edb8e9b Fix rival having 1 less party member than intended and add EXP All at wave 25 2024-03-27 10:20:08 -04:00
Flashfyre
dbe6fefac9 Fix rival party members sometimes being at unintended evolutions 2024-03-22 20:48:47 -04:00
Madmadness65
945236f760 Adjust some double battle team names
They have been changed to be the same as the official names for these specific double battle teams.
2024-03-21 02:38:44 -05:00
Flashfyre
a76f795cd5 Trainer updates including names and double battle pairs
Add dynamic trainer pairs; add trainer names with Bulbapedia scraping logic; add Hex Maniac trainer; make namebox stretch to fit name
2024-03-21 00:57:28 -04:00
Madmadness65
51b1e76da7 Fix Bugs struggling; implement some trainer types
Also removes a now-unused learnset for Bloodmoon Ursaluna, as it isn't a form for Ursaluna anymore, but rather a standalone Pokémon.
2024-03-16 21:10:21 -05:00
Flashfyre
56f4a71ca6 Add daily runs (WiP) 2024-03-16 22:06:56 -04:00