random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2024-12-11 16:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,377 Commits 36 Branches 8 Tags 2.6 GiB
03ae134174
Commit Graph

4377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flx-sta
87d2300ee8
[Bug] skip-seen-dialogue storing strings instead of i18n keys (#3900) 
* fix skipSeenDialogue storing

seen dialogues were stores as actual string instead of their i18n-keys. This fixes it.

Reported on discord:
https://discord.com/channels/1125469663833370665/1176874654015684739/1278794542648131695

* fix falling back to english

* Victory-Rival Dialgoue

* Update src/phases/game-over-phase.ts

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

* fix showDialogue for non i18n-key calls

showDialogue can be called with either text or an i18n key. This wasn't taken into account and caused some console spamming.

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
 2024-08-30 10:59:39 -07:00
AJ Fontaine
e2db9cb8a4
Even more TM fixes (#3889) 2024-08-30 10:54:48 -07:00
Mumble
60aa61e56e
[Bug] Skip Eternatus dialogue again (#3716) 
* The fix.

* Ordinals....

* tsdocs..

* my forgetting

* Fixed issues

* Update src/phases/encounter-phase.ts

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

* The actual change

* actual fixes

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-08-30 11:16:15 +02:00
chaosgrimmon
db4a63dbb9
[Sprite] Fix Courtney eye whites (#3907) 2024-08-30 00:15:35 -07:00
Madmadness65
aeecb67f32 Add inverse "item" sprite 
Pull #3525 forgot to add this graphic into the items folder, which would mean the sprite would be lost if the items atlas was overwritten at any point. This shouldn't affect any existing functionality.
 2024-08-29 20:56:05 -05:00
Opaque02
d1132a5765
[QoL] Test dialogue menu option (#3725) 
* Adding code to allow use of a testing dialogue translation menu

* Updated to include autocomplete functionality

* Added multiple inputs

* Added locales for other languages as well as checks to make this only available on local/beta

* Updated a few things to try get the dialogue to work for full length of the window

* Fixed issue with message box not taking up full length of the screen (thanks Moka!) and some minor bugs

* Whoops, forgot to stage a file

* Updated locale files

* Fixed broken tests and docs

* Removed keys from json

* Reordered and reorganised some things

* Put admin enum at end to match handlers

* Removed old unneeded line of code

* Updated to include the ability to handle cases where i18 keys are null in the locales json
 2024-08-30 02:38:46 +01:00
Frederico Santos
f7169868f3 chore: Refactor AdminUiHandler to clear input fields and revert mode 2024-08-30 00:22:09 +01:00
Frederico Santos
7eb6ba4dfd chore: Clear input fields and revert mode in AdminUiHandler 2024-08-30 00:19:03 +01:00
Frederico Santos
f1111dc0d2 chore: Update AdminUiHandler to clear input fields and set mode to ADMIN 2024-08-30 00:13:53 +01:00
AJ Fontaine
3b9b0c4091
Blitzy's implementation of evil teams in trainer-config.ts (#3884) 2024-08-30 00:05:09 +01:00
Frederico Santos
8bf44a2047 Fix error handling and revert mode in AdminUiHandler 2024-08-29 23:59:19 +01:00
MokaStitcher
e4da48f51a
[Bug] Starter select default attributes fixes (#3870) 
* Test changes to starter ui stuff for edge case stuff to fix

* Minor bug fixes

* [starter-ui] cleanup outdated fix

* use existing method to get the default form from the caught attributes

* clear the existing StarterPreferences of potential invalid values

* remember the last variant used even when disabling shiny form

* fix variant and shiny checks for edge case with variant flags but no shiny flag

* more fixes for invalid starter prefs and default settings

---------

Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
 2024-08-29 14:47:37 -07:00
AJ Fontaine
b2cd21bcb1
Fix evolution items not working on mons without forms (#3902) 2024-08-29 22:13:10 +01:00
Mumble
9833b1da7e
[Balance] Randomized Biome after End Biome (#3888) 
* Biome.END goes somewhere random

* this way island is included too

* no towns or plains

* Enums are dumb

---------

Co-authored-by: frutescens <info@laptop>
 2024-08-29 22:10:38 +01:00
damocleas
db9434ac11
[Balance] Biome Changes / Minor Passive Changes / Minor Egg Move Changes / Beta GMax form adjustments (#3852) 
* [Balance] Previous Egg/Passive/Eternatus Update Adjustments

* Update pokemon-species.ts

* Updated Eternatus, src/field/pokemon.ts

* Update egg-moves.ts for Drowzee and Darkrai

* Update biomes.ts

* Update biomes.ts to screw over Dojo!

* Update pokemon-species.ts gmax adjustments
 2024-08-29 20:29:06 +01:00
Leo Kim
c112abbcd2
[Challenge] Inverse battle challenge (#3525) 
* add inverse battle challenge. refactoring type.ts for inverse battle challenge

* update type integer -> number

* add inverse battle condition to thunder wave, conversion 2.

* add inverse_battle test code, add checking gameMode in runToSummon not to overwrite gameMode to CLASSIC always

* update startBattle with isClassicMode default = true

* add inverse achievement

* fix achv validation condition

* remove unnecessary new line

* update defaultWidth 160 -> 200

* update locales

* fix korean translation

* fix korean translation2

* Update src/locales/de/achv.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/challenges.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/challenges.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* resize challenge description 96 -> 84

* update challenge select UI size.

* revert font size to 84. update de translation

* Update src/locales/fr/challenges.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/achv.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/es/challenges.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/fr/challenges.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/achv.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/es/achv.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/fr/achv.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* shrink de font size on achivement

* set middle align to achv title

* Update src/locales/zh_CN/achv.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/achv.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_CN/challenges.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/challenges.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* fix zh_TW ahiv.ts

* fix import code on inverse battle test for updated phase

* Update src/data/type.ts

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

* update requested changes

* Update src/locales/pt_BR/achv.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/achv.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/challenges.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* [draft] update inverse battle apply function

* change the way how to use applyChallenge for inverse type

* resolve confilct

* fix test codes

* remove unnecessary multiplier variable and break codes

* update getTypeDamageMultiplier argument type from `number` to `Type`

* Fix inverse types tests (#1)

* Fix Inverse Battle tests

* Add timeout parameter to tests

* update requested changes

* update requested changes

* update requested changes2

* update comments

* Update src/test/utils/helpers/challengeModeHelper.ts

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

* Update src/test/utils/helpers/challengeModeHelper.ts

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

* fix mis pasted code

* revert loadChallenge code for  FreshStartChallenge

* code refactoring

* restore challenge.json lost translations

* revert UI changes

* revert unreverted newlines

* Run History inclusion

* requested changes from torranx

* update WaterSuperEffectTypeMultiplierAttr for inverse battle matchup.

* fix test code. adding flying press test code

* update requested change from xavion3

* updated requested change from xavion 2

* update requested changes from xavion 3

* remove exception code which is not valid

* attach partial mark to Freeze dry. requested by xavion

* add missing game over phase code when we delete old phases.ts

* fix test codes

* merge conflict

* fix achv condition

* updated achv block condition. we don't want to change desc now

* resolve conflict

* Eternatus Moveset Tinkering

* Cleaning it up

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: frutescens <info@laptop>
 2024-08-29 19:59:33 +01:00
Jannik Tappert
1e95068f14
[Localization] [EN] Admin Dialouge as it was intended by blitzy (#3896) 
* Admin Dialouge as it was intended by blitzy

* Dont forget the females

* Delete female file
 2024-08-29 19:40:12 +02:00
flx-sta
968c4ce3e6
[Localization] Use gender context for dialogues (all 3 files) (#3879) 
* merge dialogue files into single files

No more -male, -female. Rather using context

* adopt changes from #3697
 2024-08-29 10:17:40 -07:00
Jason Guan
0d7c335cd9
[Bug] Make Destiny Bond fail when used consecutively in accordance with Gen VII+ implementation (#3504) 
* make destiny bond fail on consecutive turns

* Update move.ts to remove .length shorthand

Co-authored-by: schmidtc1 <62030095+schmidtc1@users.noreply.github.com>

* change 'turnMove' variable name

Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>

* update variable names

Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>

* add comments

* Replace tabs with spaces

---------

Co-authored-by: schmidtc1 <62030095+schmidtc1@users.noreply.github.com>
Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-08-29 10:00:58 -07:00
ImperialSympathizer
b086c882ab pull latest from beta 2024-08-29 12:56:43 -04:00
ImperialSympathizer
494ef4435e
Merge pull request #3894 from ben-lear/uncommon-breed 
[Feature] Uncommon Breed Mystery Encounter
 2024-08-29 12:55:13 -04:00
Blitzy
4cea71c400
[Localization] Change a few Evil Admin lines to sound more coherent. (#3697) 
* Change a few lines of dialogue

* Change line per request of Dertapp

* Update dialogue.ts

* Update src/locales/de/dialogue.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update ko locales

* Apply suggestions from code review

Co-authored-by: Asdar <asdargmng@gmail.com>

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
 2024-08-29 18:54:56 +02:00
ImperialSympathizer
b6e90931ac Adds Uncommon Breed ME and misc. ME bug fixes 2024-08-29 12:46:23 -04:00
gitlocalize-app[bot]
c742e99650
[Localization] [DE] Fix Lusamine Dialog spelling (#3880) 
* Translate dialogue-male.json via GitLocalize

* Translate dialogue-female.json via GitLocalize

* Update src/locales/de/dialogue-male.json

* Update src/locales/de/dialogue-male.json

---------

Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
 2024-08-29 18:41:44 +02:00
flx-sta
af918975a8
adapt gender context logic to run-history (#3881) 2024-08-29 09:25:45 -07:00
Opaque02
b781562553
Updated rival battle to have space between words again (#3893) 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
 2024-08-29 18:16:51 +02:00
flx-sta
44294f1aec
[Localization] Use gender context for achievments/achv (#3871) 
* i18n: prepare female DE achievments

and copy keys in base language: en

* adapt gender context for achv

* add a TODO about an odd `this` usage

* remove debugging leftover code

whops

* add `playerGender` to settings helper

* fix test runs

And revert some changes
 2024-08-29 09:13:35 -07:00
Opaque02
27d52af077
Changed Mode.ADMIN enum to be in line with the handler (#3892) 2024-08-29 15:59:06 +01:00
Opaque02
59ff4e9941
Admin panel beta (#3846) 
* feat: Add hasAdminRole property to UserInfo interface and update initLoggedInUser and updateUserInfo functions

This commit adds the hasAdminRole property to the UserInfo interface in the account.ts file. The initLoggedInUser function is updated to set the hasAdminRole property to false by default. The updateUserInfo function is also updated to set the hasAdminRole property to false when bypassLogin is true. This change allows for better management of user roles and permissions.

Co-authored-by: frutescens <info@laptop>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>

* Updated UI for admin panel and menu

* Remove random blank line from merge

* Fix imports in `src/ui/ui.ts`

---------

Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-08-29 10:22:01 +01:00
Blitzy
d86c47a39f
[Sprite] Update Rose Sprite (#3890) 2024-08-29 01:57:22 -07:00
Blitzy
8f2699e6ea
[Enhancement] Update Team Skull Sprites (#3886) 
* Update Team Skull Sprites

* Add files via upload

* Update skull_grunt_f.json

* Update skull_grunt_m.json

* Fix eol

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-08-28 23:38:21 -07:00
Mumble
781e25848d
fixed infinite loop (#3887) 
Co-authored-by: frutescens <info@laptop>
 2024-08-28 22:44:26 -07:00
ImperialSympathizer
e77c6adb4f pull latest from beta and update Mysterious Chest visuals 2024-08-28 20:30:44 -04:00
EmberCM
35f522fd99
Fix text disappearing while in transferMode (#3740) 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-08-28 17:17:18 -07:00
ImperialSympathizer
115ff396f6 small ME balance changes 2024-08-28 17:50:41 -04:00
ImperialSympathizer
ed8d502cf4 small ME balance changes 2024-08-28 17:48:09 -04:00
Mumble
e0bcb2ef27
[P3 Bug] Run History function saves the most-recent session data possible (#3838) 
Co-authored-by: frutescens <info@laptop>
 2024-08-28 15:00:38 -04:00
gitlocalize-app[bot]
447d47ef47
Translate trainer-names.json via GitLocalize (#3860) 
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
 2024-08-28 20:29:15 +02:00
gitlocalize-app[bot]
fd81a5d3b3
Translate settings.json via GitLocalize (#3867) 
Co-authored-by: Asdar <asdargmng@gmail.com>
 2024-08-28 20:27:12 +02:00
Mumble
170a5831bf
[Bug] Updating ModifierItems' audio keys (#3853) 
Co-authored-by: frutescens <info@laptop>
 2024-08-28 11:01:15 -07:00
gitlocalize-app[bot]
ad4b4a0af7
[Localisation] [ES] Reviewed and translated missing settings.json (#3865) 
* Translate settings.json via GitLocalize

* Translate settings.json via GitLocalize

---------

Co-authored-by: Rafa <rhijano@hotmail.com>
Co-authored-by: Asdar <asdargmng@gmail.com>
 2024-08-29 01:06:39 +09:00
gitlocalize-app[bot]
35af6b2cbc
Translate pokemon-summary.json via GitLocalize (#3864) 
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
 2024-08-28 10:15:56 +02:00
chaosgrimmon
c543fd7832
Merge pull request #3854 from chaosgrimmon/lycanroc-midnight 
[Sprite] Shiny Lycanroc Midnight using non-shiny palette
 2024-08-28 01:18:03 -04:00
ImperialSympathizer
162a3b1d5b
Merge pull request #3861 from pagefaultgames/fun-and-games 
Fun And Games! Encounter
 2024-08-27 21:30:37 -04:00
ImperialSympathizer
c1f1ba113b update jsdoc 2024-08-27 21:27:57 -04:00
ImperialSympathizer
43a6722496 add unit tests for Fun and Games encounter 2024-08-27 20:54:46 -04:00
NightKev
4124ad0b93
Create the appropriate startBattle() functions in the helper classes (#3855) 2024-08-27 17:47:09 -07:00
Enoch
214a9275a9
Add missed natureFragment (#3859) 2024-08-27 17:37:20 -07:00
gitlocalize-app[bot]
f34137a950
[Localization][KO] Translate missed things (settings, bgm-name) (#3857) 
* Translate bgm-name.json via GitLocalize

* Translate settings.json via GitLocalize

---------

Co-authored-by: Enoch <enoch.jwsong@gmail.com>
 2024-08-27 17:34:58 -07:00
Adrian T.
5f3383ff04
[Dev] Cleanup some opponent overrides + add new opp form override (#3733) 
* replace interger types, add opp form override

* move code to EnemyPokemon class

* Update src/field/pokemon.ts

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

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-08-27 17:34:16 -07:00