IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: IAmChrisAMA:battle-stats
Branches Tags
IAmChrisAMA:main
IAmChrisAMA:promise-rework
IAmChrisAMA:dialogue-rework
IAmChrisAMA:nuzlocke-mode
IAmChrisAMA:revert-750-thomas-t-huynh/bugfix/roost-doesnt-ground-correctly
IAmChrisAMA:battle-stats
IAmChrisAMA:hyun/fullscreen
..
compare: IAmChrisAMA:main
Branches Tags
IAmChrisAMA:main
IAmChrisAMA:promise-rework
IAmChrisAMA:dialogue-rework
IAmChrisAMA:nuzlocke-mode
IAmChrisAMA:revert-750-thomas-t-huynh/bugfix/roost-doesnt-ground-correctly
IAmChrisAMA:battle-stats
IAmChrisAMA:hyun/fullscreen

389 Commits
battle-sta ... main

Author SHA1 Message Date
Lugiad a5bafe5c47
Corrections to French menu.ts (#932) 
* Corrections to French menu.ts

* Corrections to French menu.ts
 2024-05-15 16:43:28 -05:00
José Ricardo Fleury Oliveira 1b751dddec Update translations in pt_BR/menu.ts and pt_BR/weather.ts 2024-05-15 15:25:35 -04:00
José Ricardo Fleury Oliveira 04866e503a
Minor translating fixes and Save and Quit in ptBR (#928) 
* Minor fixes in menu-ui-handler

* Minor fix in menu.ts
 2024-05-15 15:24:47 -04:00
Lugiad 2778eb2651
French weather.ts corrections (#923) 
* French weather.ts corrections

* French weather.ts corrections
 2024-05-15 13:05:07 -05:00
Surinam b8dff030aa
Weather & evolution i18n with french translations (#380) 
Co-authored-by: Marius MICHAUD <marius@lacomstore.com>
 2024-05-15 12:31:18 -05:00
Adrian Torrano 44c0d29c1d
Add missing translation for learning move (#879) 
* add missing translation for learn move

* fix countdown german translation

* Fix countdown French translation

---------

Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
 2024-05-15 11:42:34 -05:00
Flashfyre 78f7965304 Revert "add logic to conditionally align window (#851)" 
This reverts commit 7769c06393.
 2024-05-15 12:22:32 -04:00
Adrian Torrano 7769c06393
add logic to conditionally align window (#851) 2024-05-15 11:01:20 -05:00
Lugiad afcffab90f
Added Gen names localizations in Starter Selection UI (+"Uncaught" translation in French) (#907) 
* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Update starter-select-ui-handler.ts

* Update starter-select-ui-handler.ts

* Added Gen names localizations in Starter Selection UI

* Added Gen names localizations in Starter Selection UI

* Updated with recent pt BR edits
 2024-05-15 10:57:48 -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
Lugiad fcffa000c5 French translation Save and Quit 2024-05-15 11:45:44 -04:00
Flashfyre ac2e78129e Add Save and Quit option to replace Return to Title 2024-05-15 11:42:18 -04:00
Tempoanon 38e3022d06
Add missing biomes for camoflauge (#912) 2024-05-15 10:32:10 -05:00
José Ricardo Fleury Oliveira 9b8af7ad71
Fixed the ptBR text in starter menu popping out of the info box... (#902) 
* Fixes the ptBR text in starter menu popping out of the info box and added language personalization, changed some ptBR natures and ordered thw switch case in alphabetic order

* Small fix
 2024-05-15 10:13:35 -05:00
Flashfyre adf5690383 Migrate data for offline users 2024-05-15 10:55:17 -04:00
mbroll d32dbddd48
Update ability.ts (#910) 
Water bubble should double the damage of water moves. The current multiplier in-game is x1.
 2024-05-15 09:21:52 -05:00
Flashfyre 3c8d919ef8 Revert "Implemented Power Split and Guard Split (#699)" 
This reverts commit 0b75a5210a.
 2024-05-15 10:13:29 -04:00
Alessandro Bruzzese 3aeef50507
Update Italian starter-select-ui-handler.ts (#901) 2024-05-15 09:08:32 -05:00
karl-police 3ef08e433a Correct a translation due to misleading token 2024-05-15 09:58:45 -04:00
Flashfyre 5f3fd17fdd Add Quick Claw item 2024-05-15 09:42:45 -04:00
Flashfyre 58e59369ed Revert "Readded removed args, inverted 'simulated' instead of removing (#874)" 
This reverts commit e89dbad5f1.
 2024-05-15 09:12:03 -04:00
Frederico Santos 0b75a5210a
Implemented Power Split and Guard Split (#699) 
* Implemented Power Split and Guard Split

* Update changeStat method to use summonData for Pokemon stats

This commit modifies the `changeStat` method in the `Pokemon` class to use the `summonData` object for updating Pokemon stats instead of directly modifying the `stats` object. This change ensures that the updated stats are correctly reflected in the `summonData` object, which is used for battle calculations and other related operations.

Refactor the `getStat` method to check if `summonData` exists and return the corresponding stat value from `summonData.stats` if it does. Otherwise, return the stat value from the `stats` object.

This change improves the accuracy of stat calculations during battles and ensures consistency between the `stats` and `summonData` objects.

* Added documentation for Power Split and Guard Split + linting

* removed incorrect files

* Removed incorrect folder

* removed unnecessary import

* Added documentation for getStat and changeSummonStat methods

* New description for getStat()

* Adjusting function descriptions

* adjusted descriptions according to guideline

---------

Co-authored-by: Frederico Santos <frederico.santos@fivedegrees.nl>
 2024-05-15 07:41:40 -05:00
andrew-wilcox 1f5b2726b5
added auto hit and 2x damage from certain moves when targeting a pokemon that used minimize (#824) 
* added auto hit and 2x damage from certain moves when targetting a pokemon who used minimize

* review fixes and bad merge

* review fixes and bad merge v2

* changed to be double damage instead of power for the minimize condition

* added TSdocs for function]

* remove ability to add minimize tag to dynamax-mons

* status cannot be applied to max-mons, and falls off if they dynamax

* updated doccumentation

* Update move.ts

---------

Co-authored-by: Cae Rulius <cae@polywhack.com>
Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
 2024-05-15 07:36:34 -05:00
Jannik Tappert 512016faef
Sacrifical Moves (that dont require a target like explosion or self d… (#691) 
* Sacrifical Moves (that dont require a target like explosion or self destruct) now also work if the target is flying, diving etc.

There is also a new catagorie of moves. "SacrificalMovesOnHit" for all moves that need to hit for them to be sacrifical like MEMENTO

* Added comments, added (what i think is TSDoc) to functions and classes. Removed empty lines i introduced

* .

* Added fixes for the Review by TempsRay.

* Added missing *

* Remove Target Requirement of SacrificialAttr

* Update move.ts

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
 2024-05-15 04:10:20 -05:00
notpatchmaybe e89dbad5f1
Readded removed args, inverted 'simulated' instead of removing (#874) 2024-05-15 03:56:06 -05:00
Madmadness65 1e224a6ac4 Allow Original Color Magearna to be obtained 
Another completely cosmetic Pokémon form (and a nice looking one at that!).
 2024-05-15 01:46:24 -05:00
Flashfyre 4a7da3e5f6 Fix export not working 2024-05-15 02:01:30 -04:00
Flashfyre 70ecc51f50 Don't clear local data in offline mode 2024-05-15 01:54:15 -04:00
Flashfyre 751120e77e Fix crashing in offline mode 2024-05-15 01:42:36 -04:00
Flashfyre 7e0e4ecd6d Call saveSystem on gacha pull outside of current battle 2024-05-15 01:29:07 -04:00
Flashfyre c6973365cb Change last save interval to correct value 2024-05-15 00:56:17 -04:00
Samuel H 67c18a15e2
Implement client session and re-implement hybrid saving (#888) 
* Implement client session and re-implement hybrid saving (WiP)

* Fixes for hybrid saving

* Add local data clears where applicable

* Include client session ID in system update

* Change save threshold from 5 waves to 10 waves or 5 minutes
 2024-05-15 00:52:06 -04:00
Benjamin Odom 835b00d457
Added Comments to Base Classes (#860) 2024-05-14 23:19:12 -05:00
karl-police 6bed21770d
Recoil (#863) 2024-05-14 20:36:49 -05:00
cimds aeeebcbf38 Update biomes.ts: Cave's Beach link changed to Lake 
Replacing Cave's Beach link with Lake would weaken the "water loop", a situation where players get continually routed back to Beach, leading to frustration. Lake is a crossroads biome that connects to much of the rest of the game, while still connecting to Beach, making it not a drastic detour.

Infernal Vulpix simulated a hypothetical 10k wave endless run for me to see the difference this change would have on biome frequencies. Apologies for the broken formatting from me copying this from Discord:

                   Odds      Alt
Abyss              1.98%     2.40%
Badlands           3.57%     3.46%
Beach              6.30%     4.06%
Cave               5.87%     5.91%
Construction Site  3.90%     4.83%
Desert             1.70%     1.70%
Dojo               2.05%     2.58%
Factory            2.03%     2.57%
Fairy Cave         0.86%     0.59%
Forest             5.79%     5.64%
Grass              2.12%     2.48%
Graveyard          2.03%     2.39%
Ice Cave           4.00%     2.68%
Island             0.79%     0.53%
Jungle             2.80%     2.72%
Laboratory         0.13%     0.13%
Lake               3.37%     6.26%
Meadow             2.93%     2.74%
Metropolis         2.33%     2.55%
Mountain           2.86%     2.40%
Plains             5.96%     6.94%
Power Plant        2.06%     2.63%
Ruins              2.51%     2.59%
Sea                6.16%     4.07%
Seabed             2.90%     2.04%
Slum               2.58%     2.67%
Snowy Forest       3.79%     2.60%
Space              0.37%     0.41%
Swamp              3.79%     4.64%
Tall Grass         4.18%     4.73%
Temple             2.98%     3.06%
Town               0.00%     0.00%
Volcano            2.58%     2.29%
Wasteland          0.72%     0.72%
End                2.00%     2.00%
 2024-05-14 18:54:39 -04:00
Flashfyre f505c7f5fd Fix issues with formatLargeNumber 2024-05-14 16:12:31 -04:00
karl-police 06ec265bcd battle.ts Translation Consistency and fixes 2024-05-14 15:43:33 -04:00
Nexllon df499e2f71
offline mode - adds daily run and fixes clear freezes (#834) 
* offline mode - adds daily run and fixes clear freezes

* removed unused import
 2024-05-14 15:42:30 -04:00
daniel_and 58ec2ebd89 meta charset should be ordered before any elements containing text 2024-05-14 14:40:24 -04:00
Ethan 7d3cf577a6
Implented Gen VII Sheer Cold Changes (#349) 
* Made Sheer Cold not affect Ice Types, as well as implementing the Gen VII change of 20% for non ice types.

* Pushed accurancy change

* Updated and separated the accuracy attribute and the Ice no effect attribute

* Fixed the OHKO attribute (accidentally removed) and fixed multiplier

* Updated attribute names, as well as making the move cancelled instead of 0x multiplier

* Added TSDoc comments

* Updated accuracy logic

* Changed the text response for Sheer Cold immunity

* Added immune to the HitResult enum
 2024-05-14 13:01:37 -05:00
Brandon Rodgers 06c3611d06
Ability Corrosion (#744) 
* Ability Corrosion

Implemented Corrosion Partially.
Tested against:
- Poison Powder
- Toxic
- Dire Claw
- Sludge Bomb
- Psycho Shift

They all work as expected

Missing ability Magic Bounce to test against.

* Added TSDoc Documentation

Added documentation to the new IgnoreTypeStatusEffectImunnityAbAttr and added comments to the checks for this ability attribute.

* Added More Documentation

Add comment into Phases for what sourcePokemon is for.
Renamed source to sourcePokemon onto trySetStatus and canSetStatus.
Added TSDoc head for what sourcePokemon is and anything else I am aware of what they are used for.

* Removed unfinished TSDoc

Removed TSDoc headers due to not having enough understanding to fill out all of the parameters

* Fix Formatting and Reorder Parameters

* Update arena-tag.ts

* Update phases.ts

* Update ability.ts

Added access modifiers to my class and the class I compared to.

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
 2024-05-14 13:00:37 -05:00
Alessandro Bruzzese 89411d7b3e
Update Italian ability-trigger.ts (#861) 2024-05-14 10:38:52 -05:00
Xavion3 d1187c7174
Modify legend gacha to be even split (#858) 
* Modify egg gacha to be even split

* Update to a daily cycle

* Add spaces

* Removes now unused getSunday function
 2024-05-14 11:34:40 -04:00
Madmadness65 7061bb0d70 Lower starter cost of some mythical Pokémon 
Deoxys, Victini, and Genesect should not be in the Legendary egg pool, to make them consistent with the other mythicals.
Also additional learnset changes for a couple mythicals with no/lacking starting moves.
 2024-05-14 01:21:28 -05:00
Madmadness65 37f672789d Give Delibird an actual level up learnset 
No longer is it stuck with just two moves via level up. It now has a thematic set of level up moves based on other similar Pokémon and its TM compatibility.
 2024-05-14 00:56:45 -05:00
Madmadness65 856757fd56 Add custom Jungle biome music by Lmz 2024-05-13 23:46:28 -05:00
James Diefenbach 81349816d9
changed formIndex to getFormkey in EvolutionItem constructor (#844) 
Co-authored-by: James Diefenbach <z5421232@ad.unsw.edu.au>
 2024-05-13 23:01:08 -05:00
AJ Fontaine fe7a4180a2
Give level 1 moves back that were made unusable in SV (#842) 2024-05-13 21:21:49 -05:00
Lugiad c0426cfe6b
Update French move.ts (#845) 2024-05-13 21:19:28 -05:00
Madmadness65 4e279224c5 Update Let's Go moves to their Gen 8 functionality 
This primarily just affects Zippy Zap, as it loses its always crit attribute for an evasion increase (Associated localization strings will need updating). Also implemented Sparkly Swirl's status curing attribute.

Also included is a wild evolution delay for some stone evolution Pokémon that was previously overlooked.
 2024-05-13 20:59:38 -05:00
Lugiad c42441294b
Update French ability-trigger.ts (#836) 2024-05-13 20:17:41 -05:00
Douglas Marchione de Souza de3ca08704
Fix Air_Lock ability to express when it is switched in (#765) 
* Airlock ability now properly announces when it is
in field when the pokemon with it is switched in

* Set message as in the original games, also created
a new attribute for in switch messages to not have
the pokemon name required to be on it.

* Committing language changes (i18n function)

* Revert "Committing language changes (i18n function)"

This reverts commit 2a3152003b.

* Changed message variable name
 2024-05-13 20:09:46 -05:00
Flashfyre 7943633481 Revert "Implement hybrid saving for optimization" 
This reverts commit b45cd2f7e7.
 2024-05-13 20:56:28 -04:00
Flashfyre ab92bc61ba Revert "Only show save icon on server sync" 
This reverts commit 5d0dbfff98.
 2024-05-13 20:56:19 -04:00
YounesM 9d90cc3e10
corrected uturn flip turn crash (#596) 2024-05-13 18:52:36 -05:00
LaukkaE af86bdeb06
Prevent applying item boosts when power is <1 (#795) 
* Prevent applying item boosts when power is <1

* add comments
 2024-05-13 18:48:47 -05:00
LaukkaE 1d29ca7974
Fix Comeuppance (#781) 2024-05-13 18:48:22 -05:00
JackGilham 19d244ee94
Update modifier-type.ts (#636) 
Issue#613.

Have added additional EvolutionItemModifierType condition that prevents none base form pokes from taking Evo Items.
 2024-05-13 18:38:27 -05:00
Benjamin Odom 1c56efc860
Added Ability Triggers Localization (#811) 
Adds the base files needed to start translating Ability trigger messages. Provides one as an example.
 2024-05-13 18:12:28 -05:00
José Ricardo Fleury Oliveira 74ee3329f8
Added "Uncaught" localization in Starter Selection UI (#831) 2024-05-13 18:02:44 -05:00
José Ricardo Fleury Oliveira 3a3611dfc0
Minor translation fixes (#829) 2024-05-13 17:59:09 -05:00
Flashfyre 5d0dbfff98 Only show save icon on server sync 2024-05-13 18:37:48 -04:00
Flashfyre b45cd2f7e7 Implement hybrid saving for optimization 2024-05-13 18:17:57 -04:00
Flashfyre 7e5c7fb4f7 Don't allow trainer egg moves before level 60 and no rare egg moves at all 2024-05-13 17:03:53 -04:00
Griffin Zody ed87293867
Fix Zygarge Complete form changing back into 50% (#786) 2024-05-13 14:53:23 -05:00
Matthew Olker 47c9eb547d fix Rare Shiny Groudon back sprite 2024-05-13 15:29:50 -04:00
José Ricardo Fleury Oliveira e2dfbc4aa5
Added new entries (#823) 2024-05-13 13:55:15 -05:00
Jannik Tappert 487b1d26d1
Added german localization to the new entries in starter-select-ui-handler.ts (#822) 2024-05-13 13:24:55 -05:00
Matthew Olker 40993793cb Show default icon for missing starter icon 2024-05-13 14:23:34 -04:00
Matt Ross 4e6cf2a6ac
Facade should ignore burn damage reduction (#530) 
* Facade should ignore burn damage reduction

* update order of burn conditions

* remove unnecessary space

* undo facade check in apply

* Rework facade bypassing burn as move attribute

* Only check ability attribute if move attribute was false

* Add missing semicolon

* Add tsdoc comment

* Add comment to burn damage reduction class

* Added changes from Discord thread

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
 2024-05-13 13:06:15 -05:00
Matt Ross fa60e002e8
Fixes some variable damage moves not working with tinted lens (#759) 
* Fixes some variable damage moves not working with abilities

* Rework as new ability attribute

* Update variable base power check to original location

* formatting

* Add tsdoc comments

* add floor for potential non int multipliers

* Update pokemon.ts

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
 2024-05-13 13:05:09 -05:00
Lugiad 610de916a0
Update French starter-select-ui-handler.ts (#821) 2024-05-13 13:01:30 -05:00
Madmadness65 34a4f86982 Add a couple starter select localization entries 
The passive ability's "Locked" and "Disabled" strings can now be localized.
 2024-05-13 12:50:56 -05:00
Flashfyre 9a49691a9e Add max options to language select 
Add max options to language select (fixes #819)
 2024-05-13 13:10:01 -04:00
José Ricardo Fleury Oliveira 2a32189ea1
Added Portuguese (Brazil) translations (#766) 
* Add support for Portuguese (Brazil) locale, except for moves and abilities.

* All ptBR translations, names of moves and abilities maintained in english.

* Small fixes

* Updated Frisk and fixed Plus and Minus descriptions

* Changed the settings label to "Português (BR)"
 2024-05-13 11:18:24 -05:00
Alvin Zou 6d73500aeb
Update Frisk descriptions (#784) 2024-05-13 11:08:55 -05:00
Jannik Tappert e4d3f73dee
ToggleSize is now dependend on language + added some missing german translations (#797) 2024-05-13 11:06:26 -05:00
Alessandro Bruzzese b189289890
Updated italian localization (#815) 
Updated:
 - `it/fight-ui-handler`
- `it/growth`
- `it/nature`
 2024-05-13 10:52:31 -05:00
alpaca 09287c22ba
implements telepathy (#307) 2024-05-13 05:59:39 -05:00
lucfd b36c23fae1
Implemented Curious Medicine (#263) 
* implemented supersweet syrup

* implemented curious medicine

* removed sneaky test overrides

* removed sneaky test overrides x2

* updated to new language-agnostic format, removed supersweet syrup

* fixed whitespace

* Update ability.ts

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
 2024-05-13 04:57:17 -05:00
Marcos 3cc990f5d2
Fully implemented floral healing (#250) 
* Created BoostedHealAttr and implemented Floral Healing

* Update move.ts

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
 2024-05-13 04:27:38 -05:00
Matthew 21a0a0276d
add pokeball override (#793) 2024-05-13 03:40:53 -05:00
Flashfyre 8d96ec7666 Add canonical link 2024-05-13 01:43:04 -04:00
Tempoanon e9c09070df
Stench should not trigger on status moves (#800) 2024-05-13 00:24:07 -05:00
Benjamin Odom 9ee5fec41d
Added Passives to the Summary Screen (#703) 
* Added passives to the Summary Screen

Adds the ability to view passives on the Summary screen. Just like in the starter select, you can only see the passive once it is unlocked.

There is a small pixel button prompt which helps indicate you are able to press the button to view the passive. This buttons shows an A when gamepad support is enabled and a Z otherwise.

* Update summary-ui-handler.ts

* Updated for Legacy Support
 2024-05-12 23:38:28 -04:00
Samuel H 2b9b63e3f3
Add combined save between waves (#777) 2024-05-12 23:01:05 -04:00
James Diefenbach 9a09d790f0
Rockruff dusk form not evolving (#700) 
* changed nonfunctioning rockruff form check to ability check for own tempo for dusk form evos

* testing changes

* rockruff OT uses formIndex for dusk form evolution, removed temporary debug rockruff getFormIndex changes

* reverted overrides

* fixed spacing issue

* evolution times revised

* revised dawn and dusk evos for rockruff

* reordering evo times for consistency

* removed unused imports (abilities, attackTypeBoosterModifierType)

---------

Co-authored-by: James Diefenbach <z5421232@ad.unsw.edu.au>
 2024-05-12 22:00:46 -05:00
Xavion3 22097a0c95 Fix getSunday function 2024-05-12 21:22:50 -04:00
Flashfyre 347972d103 Remove boosted shiny rate 2024-05-12 20:45:41 -04:00
Tempoanon e61c63f6c8
Implement innards out (#569) 
* Implement innards out

* remove log statement

* Some cleanup

* Added comment
 2024-05-13 07:07:31 +10:00
Matthew e195c6d799
Show Default Pokemon icon for missing shiny icon (#802) 2024-05-13 06:41:02 +10:00
Douglas Marchione de Souza 9e453c5b0f
Fix sturdy (#604) 
* Fixes sturdy to stop popping up even if not used

* Made changes to better the code, also added
a check for wonder_guard 1hp

* Refined code, as requested by bennybroseph

* Made a small fix and added better comments in
relation to interaction with Wonder_guard ability
 2024-05-12 14:53:54 -05:00
Benjamin Odom 512cc5b965
Fix Duplicate Egg Moves (#736) 
Fixes an issue where egg moves could get duplicated onto a starter Pokémon's moveset.
 2024-05-12 14:56:37 -04:00
phynor 2176d5854d
fixed typo in german pokemon names (#794) 2024-05-12 13:55:57 -05:00
Lugiad dbb8f4c217
French translation of growth.ts (#763) 2024-05-12 14:42:56 -04:00
phynor 7b7df5b245
More german translations (#612) 
* added more german translations

* added german translation for move.ts

* more german translations

* ability.ts wih german translation updated

* added missing german translation for abilites.ts

* added more missing translations

* changed description of frisk
 2024-05-12 12:53:07 -05:00
Madmadness65 20a09c2b92 Remove species form encounter code for Scatterbug line and Calyrex 
The Vivillon forms can all be encountered properly now, and Calyrex's forms have since been removed from the wild encounter pool, requiring a form change item to obtain.
 2024-05-12 11:33:27 -05:00
Benjamin Odom 79a87e1c65 Update pokemon.ts 2024-05-12 10:27:54 -04:00
LaukkaE ced74efc52
fix isGrounded check (#774) 2024-05-12 06:30:18 -05:00
Madi Simpson e1ef3c03de
ability: make technician respect variable power moves (#529) 2024-05-12 04:06:09 -05:00
Landon Lee a27822b624
Fix cry when pokemon is fused with its own species (#615) 
If the pokemon species and form is the same as the second fusion component, then skip the logic to make a fused cry and just use the cry of the primary component.
 2024-05-12 03:01:59 -05:00
Thomas Huynh d5f82611f5
added battle tag check in isGrounded method (#750) 
Co-authored-by: unknown <t_huynh927@yahoo.com>
 2024-05-12 02:28:30 -05:00
Frederico Santos e4afdf1d45
Add ignoresProtect to life dew (#758) 
Co-authored-by: Frederico Santos <frederico.santos@fivedegrees.nl>
 2024-05-12 02:18:23 -05:00
Xavion3 db6008d15c
Add tsdoc comments for ability getters (#764) 
* Add tsdoc comments for ability getters

* Add links to the docs
 2024-05-12 00:48:56 -05:00
ArceUseless fe6aefd910
Natures langs with new config (#611) 
* Natures lang files

* Updated French nature.ts

* Nature german translation + chinese added

* Added nature to chinese config.ts

---------

Co-authored-by: rnicar <rj.nieto.car@gmail.com>
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: rnicar245 <55734812+rnicar245@users.noreply.github.com>
 2024-05-11 21:22:45 -05:00
ArceUseless e9ca17c519
New growth rate lang files (#563) 
* New growth rate lang files

* Update i18n.ts, fixing overwrite

* Added growth to lang conf files

---------

Co-authored-by: rnicar <rj.nieto.car@gmail.com>
 2024-05-11 21:04:09 -05:00
Flashfyre f540b7d17f Fix always clearing first slot in offline mode 2024-05-11 20:33:03 -04:00
Madmadness65 3f9158083e Swap Rayquaza's egg moves 
With egg moves factoring in to trainer Pokémon's learnsets now, Oblivion Wing was too problematic for a common egg move. So it has been swapped with V-create to make fights with it more tolerable.
 2024-05-11 14:20:54 -05:00
Xavion3 34aa68df14
Fix fusion icon variant id (#747) 2024-05-11 13:15:01 -05:00
Xavion3 6b49b4f469
Lowers xp curve for fluctuating slightly (#746) 2024-05-11 11:54:05 -05:00
Xavion3 03d68f877a
Fix fluctuating xp curve (#743) 
Was scaling with square of level, not cube.
 2024-05-11 10:25:48 -05:00
notpatchmaybe ea459826d0
Heart Swap implementation. (#712) 
* Heart Swap implementation.

 Simply switches the values in 3 arrays.

* Fixed missing space

* Removed some lines.

Removed a for loop.

* Removed an unneccesary line

* TSDoc commentation added

* Changed message method to be more descriptive

* Adjusted message line to be consistent with Pokemon Showdown

* Adjusted priorBoostArray to priorBoost integer

Only one values is relevant at a time, so the array was pointless, woops.
 2024-05-11 09:42:57 -05:00
William Burleson 8707213e88
Adds session playtime to gameInfo for Rich Presence (#738) 
* Add rich presence support

* Adds playtime to gameInfo
 2024-05-11 10:11:00 -04:00
Flashfyre 60f86c85ce Fix Glimmora atlases 2024-05-11 09:26:57 -04:00
Somod1 cd9e066524 update 2024-05-11 09:25:02 -04:00
Benjamin Odom ae7c1ef4f0
Fix Charge Move Infinites (#741) 
Fixed an issue where two turn charge moves could be paused by status or Truant causing some infinite sequences if not careful.
 2024-05-11 23:22:26 +10:00
Flashfyre 28c75e4377 Add missed EXP variant sprites 2024-05-11 01:49:34 -04:00
Xavion3 d24762b5dc
Fix bug in moveset code (#735) 
Pokemon with very limited movepools could sometimes generate with no moves
 2024-05-11 00:46:36 -05:00
Flashfyre 168869d322 Update EXP sprites list 2024-05-11 01:01:15 -04:00
Flashfyre 483310c345 Fix missing backgrounds after clearing a run 2024-05-11 00:29:16 -04:00
Xavion3 72467388fc
Redo moveset generation (#550) 
* Redo moveset generation

* Decrease the weight of lower power moves and egg moves

* More weight tweaking

Trainers never get OHKO moves, are less likely to get self KO and multiturn moves, and more likely to get stat buffing moves. All pokemon are less likely to get offstat moves.
 2024-05-11 00:20:21 -04:00
Flashfyre 994da9813b Add new variant sprites 2024-05-11 00:00:39 -04:00
Madmadness65 b13a563dad Update passive abilities for starters and pseudos 
The latest changes from the balancing team. These changes will take immediate effect in any existing runs, so do keep that in mind.
 2024-05-10 18:46:10 -05:00
Flashfyre 9cfc09f673 Restructure game over logic to save before clear 2024-05-10 18:12:33 -04:00
td76099 acb61d6fb7
Fixes Tidy Up so it clears hazards from both sides (#717) 2024-05-10 11:31:27 -05:00
Flashfyre d7d2320844 Fix Mega Latias animated sprites 2024-05-10 12:19:18 -04:00
Athebyne 2ab335a3c5
Implement Snipe Shot, and Propeller Tail/Stalwart (#661) 
* Implemented Snipe Shot and Stalwart/Propeller Tail

* Remove Testing Overrides

I don't know why these got pushed, they are in the gitignore file.

* Snipe Shot also has a high crit rate

* Add Comment

* Add TsDoc documentation to BypassRedirectAttr

* Add ability pop-up for when Propeller Tail/Stalwart proc.

* Fix Formatting

* Tab align comment
 2024-05-10 10:40:21 -05:00
Dakurei 593ac38267
Fix some errors from previous PR #711 (#716) 2024-05-10 10:29:22 -05:00
William Burleson 7bdb969a73 Add rich presence support 2024-05-10 10:34:51 -04:00
Greenlamp 5d62d0bb25 fix speed level up notification 2024-05-10 10:34:10 -04:00
Dakurei f1935a3e15 Adds 'accuracy' to the move information in the fight ui 
+ Capitalize 'power' and 'accuracy' fields
 2024-05-10 10:27:44 -04:00
Greenlamp2 b32b802ab4
QOL - Settings to choose party Exp display at the end of fight (#488) 
* added settings to manage how to display party experience at the end of fight

* added back stats changes support when setting is on but ignored when on skip

* removed a useless parameter

* added new level in the text

* only Lv. UP if level is greated than 200

* cleanup

* added some comment

* TSDoc comment block

* EXP_Party -> EXP_Party_Display, Only Up -> Level Up Notification

* better duration for the level up notification

* typo

Co-authored-by: Samuel H <flashfireex@gmail.com>

---------

Co-authored-by: Samuel H <flashfireex@gmail.com>
 2024-05-10 09:54:14 -04:00
Greenlamp2 22a73642df
Fix - Gamepad support setting "lost focus" behaviour (#658) 
* fix "lost focus behaviour" when disabling gamepad and thus repeating RIGHT key

* added some comment

* added full TSDoc, helped by chatGPT, refined every entry manually of course
 2024-05-10 09:26:45 -04:00
Greenlamp2 6fbc0cb923
Settings navigation, when on top to go to the bottom, and when on the bottom to go to the top (#605) 
* fix settings top and bottom

* added some comment

* TSDoc ready + less lengthy comments
 2024-05-10 09:25:41 -04:00
Flashfyre 97b50707a0 Fix icon configuration always including gen 9 2024-05-10 00:24:21 -04:00
Flashfyre 89ab909719 Move Eternal Floette icon to gen 6 2024-05-09 23:53:15 -04:00
Flashfyre 190fd771c5 Remove extensions from gen 9 icons 2024-05-09 23:46:14 -04:00
Flashfyre 5c98529108 Re-remove fallback API change with new URL 2024-05-09 23:44:09 -04:00
Flashfyre 4810966b7e Revert "Reapply "Revert API URL change"" 
This reverts commit 35d06512a2.
 2024-05-09 23:40:54 -04:00
Flashfyre 35d06512a2 Reapply "Revert API URL change" 
This reverts commit 08067d9937.
 2024-05-09 23:29:45 -04:00
Flashfyre 72107aa615 Implement various sprite fixes and restructure icons 2024-05-09 23:28:08 -04:00
MonsieurDMA 6a3f5c5428
German - Tutorials and UI Buttons (#650) 
* German - UI buttons

* German - Tutorials

* Fix typo in quote transformation
 2024-05-09 21:33:15 -05:00
MonsieurDMA 43b75b601a
German - All Gen 8 pokemons (#640) 2024-05-09 21:31:07 -05:00
AJ Fontaine 7219556e77
Hydro Steam (#231) 
* Hydro Steam, Spirit Shackle, U-turn fix

Match formatting to project style

Co-authored-by: Samuel H <flashfireex@gmail.com>

* Fix Hydro Steam power up in Sun, even harsh sun if type changes

* Fix issue with Hydro Steam outside sun

* Add comments to IgnoreWeatherTypeDebuffAttr for documentation

* Move U-turn fix to another PR

---------

Co-authored-by: Samuel H <flashfireex@gmail.com>
 2024-05-09 21:21:57 -04:00
Flashfyre 2bc1cfb0fc Extend the temporary shiny chance increase by 1 day 2024-05-09 20:16:29 -04:00
Flashfyre 02cba0f741 Add temporary triple shiny chance 2024-05-09 19:59:21 -04:00
Flashfyre dc9026f583 Add missing and updated biome art 2024-05-09 19:05:19 -04:00
Matthew 10cf1cd94f
Cleanup overrides and imports (#603) 
* cleanup overrides and imports

* Add GreenLamps Modifier Overrides

* added comments

* starting money and biome comments

* account for overriding empty move

* more override descriptions

* added generator held item names to override comment
 2024-05-09 14:52:09 -05:00
Lugiad 882f9c289c
French typos + forgotten description in move.ts (#617) 
* French typos in move.ts

* French typos + forgotten description in move.ts
 2024-05-09 15:50:14 -04:00
alpaca 1d7d8b1ac7
Implement Heal Bell + Aromatherapy (#238) 
* adds frame for StatusCureAttr

* heal bell and aromatherapy functioning as intended

* refactor attr to solely handle party cure, party interaction unique enough to justify

* adds header to PartyStatusCureAttr

* code comment

* comment formatting improvement

* checks for passives as well

* code comment

* shows ability bar if immune
 2024-05-09 14:15:56 -05:00
Xavion3 d5681a6e03
Fix loading protosynthesis/quark drive boosts (#687) 2024-05-09 11:33:47 -05:00
Madmadness65 407d9b7c49 Minor fix for Oinkologne's gender ratio 
It was unintentionally set to be 100% male instead of 50/50.
 2024-05-09 10:21:01 -05:00
maru 7f0362e124
Fix it for real this time 2024-05-09 07:30:19 -04:00
maru c1cff02a18
Fix bug with accounts being unable to create new saves 2024-05-09 06:22:33 -04:00
Benjamin Odom b231b887aa
Update ability.ts (#671) 2024-05-09 16:40:23 +10:00
Xavion3 802daecd65
Fix starters with multiple forms being unable to change move (#667) 2024-05-09 00:39:45 -05:00
Xavion3 fd088c9360
Prevent doubles trainers generating with one pokemon (#642) 2024-05-09 00:39:20 -05:00
Xavion3 aba97c6ddc
Make max and z moves unable to be chosen with metronome (#641) 2024-05-09 00:38:46 -05:00
Xavion3 e6ba60364e
Save battler tags (#516) 
* Save battler tags

Also saves the rest of the summonData except for transform specific things.

* Add missing values for type boost tag.

* Add intellisense comments
 2024-05-09 00:37:51 -05:00
mercurius-00 a48a12ec0b
Add wordwrap to Chinese words (#670) 
Since Phaser.Text's wordwrap doesn't work with Chinese words, ''\n' has been added to move.ts and ability.ts
 2024-05-09 00:20:01 -05:00
Tempoanon d16cb1202f
Fix charge (#614) 
* Fix charge

* Remove console logs
 2024-05-08 23:37:50 -05:00
Reid McInroy c6749b1fb4
Update spacing of icons upon Name/Tera update (#655) 
This change will update the relative position of the Tera, Splice, and Shiny icons when the Name or Tera Type updates. Fixes #618
 2024-05-08 23:18:26 -05:00
Madmadness65 e39b157767 Make Simplified Chinese locale use zh_CN 2024-05-08 23:13:38 -05:00
Jane620 5992d9eb81
add simplifed chinese locale (#485) 
* add chinese locale, but translation is not yet complete.

* Add chs and cht locale

* translate ability,move,pokeball,pokemon

* Add files via upload

* Add files via upload

* Update i18n.ts

* Delete src/locales/zh_cn directory

* Add files via upload

* Update settings.ts

* Delete src/locales/chs directory

* Add files via upload

* add tutorial

* fix conflict issue

* remove cht, due to chs is almost done by justhil

* remove duplicated setting

* spell correction

---------

Co-authored-by: ZXZhuang <2993968012@qq.com>
Co-authored-by: justhil <138752349+justhil@users.noreply.github.com>
Co-authored-by: Jianfeng 2. Wang (NSB) <jianfeng.2.wang@nokia-sbell.com>
 2024-05-08 22:59:49 -05:00
alpaca 76ac86d2ae
Implements healer (#259) 
* Implements healer

* adds an ally check to the condition

* done testing, changes chance back to 30%

* adds comment header for PostTurnResetStatusAbAttr

* adds override to resetStatus to not allow revive

* dont revive

* override revert
 2024-05-08 20:21:55 -05:00
Lugiad 71e9d0c385
Fix French battle.ts (#663) 
Fix after global edit to "notDisabled"
 2024-05-08 20:00:38 -05:00
alpaca aeab9d78ec
Implements cursed body (#227) 
* implements cursed body

* 30 percent chance to proc

* check if max

* removes unimplemented tag

* bypasses faint

* un-disable message specifies pokemon name

* adds prefix to un-disable message

* space issue
 2024-05-08 19:25:16 -05:00
William Burleson 94da7838f8
fix offline imports (#659) 2024-05-08 18:14:09 -05:00
alpaca b5888b5472
Implements Cotton Down (#254) 
* Implements Cotton Down

* activates on faint as well
 2024-05-08 17:25:15 -05:00
Benjamin Odom ea5e535f9f
Fixed Failed Moves Not Using PP (#634) 
Fixed an issue where if a move failed, it would not use power points.
 2024-05-08 15:51:56 -05:00
Benjamin Odom 4509e08dc6
Renamed the Python Script File (#657) 
Accidentally left out the 'c' in 'comments'
 2024-05-08 15:50:31 -05:00
Flashfyre e993bf9945 Fix session slot always saving to first slot in offline mode 2024-05-08 16:36:44 -04:00
maru 3ec9081a77
Change titlestats update interval to 60 seconds 2024-05-08 15:47:03 -04:00
Elliott Simmonds cb24faa12e
Small fixes to burning bulwark and alluring voice (#651) 2024-05-08 13:39:22 -05:00
Madmadness65 8a35166988 Slightly adjust Recovery Tokens 
Each individual token heals 1 percent less, but now stacks to 15 instead of 10, to maintain the current maximum of 30% recovered per turn.
The purpose of this change is to make the healing more gradual, and just generally less painful if you get multiple early on.
 2024-05-08 12:38:31 -05:00
Lugiad 0af02210ee
Overflowing fix in French menu.ts (#648) 2024-05-08 12:36:09 -05:00
Akuma-Reiki ea1ed1352c
Hide Ribbons When Not Owned (#649) 
* Candy/Ribbon UI Update

* Removes the overrides

No level 2000000000000000 runs for you

* checks for all root species

* Hide ribbon when not owned
 2024-05-08 12:35:27 -05:00
Lugiad e93777e52a
Names of the languages in their respectives languages (#635) 
* Names of the languages in their respectives languages in settings

* Names of the languages in their respectives languages
 2024-05-08 12:08:34 -05:00
Akuma-Reiki 662319e9ac
Candy/Ribbon UI Improvement (#622) 
* Candy/Ribbon UI Update

* Removes the overrides

No level 2000000000000000 runs for you

* checks for all root species
 2024-05-08 12:01:05 -05:00
Gray b6692e42b2
Fix Flare Blitz in Gravity (#637) 
This condition is out of place since Flare Blitz is not supposed to fail if used in Gravity.
 2024-05-08 10:25:47 -05:00
Jeremy B bb28d3599e
fix scrappy and mindseye working as passive ability (#567) 
* fix scrappy and mindseye working as passive ability

* update apply for ignoretypeimmunityabattr

* simplify logic for ignoretypeimmunityabattr

---------

Co-authored-by: contra1337 <jpbastyr@gmail.com>
 2024-05-08 00:32:38 -05:00
Procyonae 118c57ba75
Add fell stingers effect (#202) 
* Add Fell Stinger Effect

* Update src/phases.ts
 2024-05-07 23:44:55 -05:00
Benjamin Odom bb6bb1e6c1
Fixed Crash Moves and Reckless (#609) 
* Fixed Crash Moves and Reckless

Added a new MoveFlags flag 'RECKLESS_MOVE' to make crash and recoil moves in line with other move flag boosting attacks.

Modified how flags were defined so they are easier to maintain.

Added the appropriate flag to all mvoes listed as being affected by Reckless. Steel Beam and Mind Blown do not count according to source:
https://bulbapedia.bulbagarden.net/wiki/Reckless_(Ability)

* Update move.ts

* Update abilities.ts
 2024-05-07 23:28:35 -05:00
Benjamin Odom ce3d12d58e
Added hyperlinks to Moves, Abilities, and Species enums (#586) 
* Added hyperlinks to Moves enum

Yes, I'm aware of what this looks like in the file itself, but it enables a nice neat little hyperlink shown below to the bulbapedia page when you hover over a move. I feel like the added convenience is worth making the file harder to read considering nobody is ever going to touch that file anyway. I plan on adding a python script to finish the rest of them, but didn't want to actually sink time into this if we absolutely despise it.

* Added Python Script

Created a python script to add comments with a url to abilities.ts, moves.ts, and species.ts using regex
 2024-05-07 23:18:19 -05:00
Madmadness65 1c9b65125d Fix Bouncy Bubble targeting & Hau encounter dialogue 2024-05-07 23:01:54 -05:00
Flashfyre 08067d9937 Revert "Revert API URL change" 
This reverts commit 4ef6707333.
 2024-05-07 16:16:22 -04:00
Benjamin Odom bd839a1ffb
FIx Sceptile and Blaziken Learnsets (#606) 
These got missed in the transition from looking at Serebii and Bulbapedia for data.
 2024-05-07 13:42:07 -05:00
Flashfyre 72b4552b01 Don't update user info on save for optimization 2024-05-07 13:36:52 -04:00
Tempoanon 4fcea107ab
Fix wrong stat displayed for mythicals hatched (#601) 2024-05-07 12:10:48 -05:00
Xavion3 cc3113ff43 Fix revive weight cap 2024-05-07 11:26:28 -04:00
Flashfyre 02b2c2d55b Ribbons are also awarded for first clear 2024-05-07 10:15:40 -04:00
Flashfyre b9ce5cfaaa Mints permanently unlock natures 2024-05-07 00:58:36 -04:00
Madmadness65 fd0f21943e Implement Supersweet Syrup ability 
Uses the new once per battle condition.
 2024-05-06 23:47:20 -05:00
alpaca 36cde21ce3
Adds ribbon in starter screen if mon has beat classic mode (#370) 
* adds the ribbon asset, hooking it up

* works if override. need to add field on server side I imagine

* moves count to starterData, increments on win

* formatting

* increment works properly

* recursively check for prevolution

* cleaned up to use getRootSpeciesId()

* changes ribbon to gold medal version

* adds Akuma's ribbon achievements

* ribbons increment correctly

* missed ui handler update

* reorder achievements

* ribbon correct, vouchers not. currently investigating

* increments properly, but voucher reward phase not appearing

* some cleanup

* works great, need to better reflect who is getting ribbon in message and cry

* plays level fanfare, tabling cry for now

* reran items.bat

* Minor fixes

---------

Co-authored-by: Flashfyre <flashfireex@gmail.com>
 2024-05-07 00:44:41 -04:00
Xavion3 2d740f1952 Implement once per battle restriction on abilities 
Currently just Intrepid Sword and Dauntless Shield
 2024-05-07 00:39:16 -04:00
kenniky 52b546c924
add hazard removal for Rapid Spin, Defog, Tidy Up, Mortal Spin (#248) 
* add hazard removal for Rapid Spin, Defog, Tidy Up, Mortal Spin

* Updated templating and fixed some errors

support for either pokemon using it
added better templating

* revert logic, and remove partial tags

---------

Co-authored-by: kenwang <kenwang@umich.edu>
Co-authored-by: Gwen Valentine <gwenvalentine@starshine.dev>
 2024-05-06 22:00:31 -05:00
Alvin Zou 0beb3a0f89
Show number of Pokeballs in inventory when selecting a pokeball in the reward phase (#573) 
* Show number of Pokeballs in inventory when selecting a pokeball in the reward phase

* Address comments
 2024-05-06 21:43:01 -05:00
Benjamin Odom f18ff5b6cc
Update Learnsets for Gen3 to Indigo Disk (#571) 
* 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.

* Update Learnsets for Gen3 to Indigo Disk

A good chunk of these changes is just reordering the moves to match bulbapedia so that it's easier to see what changed in the future. Otherwise, it's really just replacing moves that don't exist anymore.

Also, Zangoose got a ton of new moves that work with a move relearner, but not by level-up. Weird, but good if you like Zangoose.

* Fix Duplicates
 2024-05-06 19:54:02 -05:00
Reldnahc 84f6f06ca4 add override to force double battles. 
add override for passive abilities.
 2024-05-06 19:11:34 -04:00
Bruzzi 582330df33 Update italian translation 2024-05-06 15:01:18 -04:00
Dakurei 4c39bf64c5 Fix overflowing fr locale 2024-05-06 15:01:00 -04:00
Matthew 674b2257be
I18n import cleanup (#562) 
* config import change

* all other configs
 2024-05-06 14:25:17 -04:00
Lugiad 009d538ac5
Update French starter-select-ui-handler.ts (#559) 2024-05-06 13:54:32 -04:00
ArceUseless bde7620ac0
New spanish translations and literals for all langs (#552) 
* Spanish translations for intro messages and some menus. Added Empty (save file) to lang files

* Spanish translations + new literals in all langs

* Spanish translations, new literals for all langs (starter-select-ui-handler)

* Two translations

* Resolving accidental overwrite in french menu.ts

* New starter-select-ui-handler lang files for all langs

---------

Co-authored-by: rnicar <rj.nieto.car@gmail.com>
 2024-05-06 12:02:45 -04:00
Tempoanon 78ae7c9f0a
Minor TM learn fixes and make glacial lance non contact (#553) 
* Make curse target

* Minor TM learn set changes and make glacial lance non contact
 2024-05-06 12:00:51 -04:00
Viet Nguyen f22c25d376
add unit test for util function padInt (#175) 
Co-authored-by: Viet Nguyen <vietnguyen@Viets-MacBook-Air.local>
 2024-05-07 01:30:23 +10:00
lucfd 80b6001c77
Implemented Revelation Dance (#166) 
* implemented Revelation Dance

* fixed steam engine activating on all water moves

* implemented typeless

* stellar handling for revelation dance

* removed testing lines

* changed to UNKNOWN implementation

* removed UNKNOWN RGB

* removed print debug + unnecessary logic

* simplified test condition further
 2024-05-06 10:24:37 -05:00
Lugiad e3c1d08b37 Update French battle.ts + typo 2024-05-06 09:37:55 -04:00
Matthew Ross f92b563baa Hunger switch shouldn't trigger if terastallized 2024-05-06 08:49:26 -04:00
gericocross 29b80dbed8
Fixed Grafaiai animation (#547) 
* Longer descriptions don't stuck shorter ones anymore

* Fixed Grafaiai animation
 2024-05-06 08:44:05 -04:00
Madmadness65 a45da8a382 Quick egg move fixes 2024-05-06 00:31:28 -05:00
Jeremy B bc8cb51dc1
Add Scrappy ability handling (#473) 
* partially implement scrappy

* add minds eye handling also

* remove unimplemented from minds eye

---------

Co-authored-by: jbastyr <jpbastyr@gmail.com>
Co-authored-by: Madmadness65 <59298170+Madmadness65@users.noreply.github.com>
 2024-05-06 00:27:56 -05:00
Matthew Ross 6016243caf Lum berry should cure status and confusion if possible 2024-05-06 00:27:39 -04:00
Benjamin Odom 2b4dc9a4f0
Fixes Struggle Softlock (#531) 
* Fixes Struggle Softlock

Fixed an issue where moves marked as (N) would prevent you from being able to Struggle.

Also fixes messaging so that a message shows when you are out of PP, Disabled, or trying to use an unimplemented move consistently.

* Update phases.ts
 2024-05-06 00:02:52 -04:00
phynor c41546b680
updated move.ts german translation (#519) 
* updated move.ts german translation

* fixed encoding on Pokémon
 2024-05-05 21:44:55 -04:00
Madmadness65 700b79e0c3 Update egg moves 
The latest in egg move changes. As usual, if there are any complaints, direct them toward the egg move discussion thread on the Discord.
 2024-05-05 19:29:54 -05:00
LaukkaE 67ee104178
Fix Protosynthesis and Quark Drive (#289) 
* Fix Protosynthesis and Quark Drive

* add partial tags
 2024-05-06 10:26:11 +10:00
Greenlamp 4a49ff848a allow 2 button to be pressed at the same time 2024-05-05 19:34:21 -04:00
Temps Ray 77b6ad47d0 Make curse target 2024-05-05 18:40:21 -04:00
Greenlamp2 82b0606311
Fix - stop repeating key when focus is lost (#514) 
* disable all key pressed when trying to open a modal

* in fact, checking the if the focus is lost is a better solution
 2024-05-05 18:40:05 -04:00
Flashfyre 005caeb1ab Change cookie expiration to 90 days 2024-05-05 18:13:19 -04:00
Benjamin Odom e6fd331931 Fix HalfSacrificialAttr 
Mind Blown targets all users and was triggering recoil every time it hit. Changed so that it only applies once after all targets take damage by adding a new MoveEffectTrigger, POST_TARGET. This also fixes an issue where dying to recoil stopped the rest of the damage from hitting the remaining targets.

This change also applies fixes for Steel Beam since they are have the same effect but is single target.

Also added missing messages for Damp and Recoil. All messaging is in line with Pokémon Showdown.
 2024-05-05 17:46:15 -04:00
Tempoanon 9b72dfbd71
Implement curse (#510) 
* Implement curse

* self targeting is always true if not ghost type
 2024-05-05 17:45:20 -04:00
Flashfyre 6a3ca62490 Add separate sub-legendary stats 2024-05-05 17:11:29 -04:00
Madi Simpson f7f235cdec move: handle some aspects of custom fail text a bit better 2024-05-05 14:28:06 -04:00
lucfd 4aad37a758
Implement Take Heart Sleep Talk edge case (#508) 
* removed take heart condition, added sleep talk edge case

* removed freeze heal

* removed testing stuff
 2024-05-05 13:04:19 -05:00
LaukkaE 697f2a3a42 fix-takeHeart 2024-05-05 13:36:52 -04:00
Madi Simpson b6603e2c6c move: fix issue with self switch moves causing softlocks 2024-05-05 12:22:03 -04:00
EggMuncherSupreme fa2d257144
Changed Bouncy Bubble to heal 100% of damage dealt and implemented Take Heart (#326) 
* Changed Bouncy Bubble to heal 100% of damage dealt, as according to Gen 8

* Fully implemented Take Heart
 2024-05-05 11:01:39 -05:00
Madmadness65 d5cd243967 Re-export Furfrou trim sprites 
Apparently all the non-shiny sprites had artifacts on them. This has been corrected.
 2024-05-05 10:51:41 -05:00
Madi Simpson 8e606139fa
moves: (mostly) fix parting shot stack bug (#495) 2024-05-05 11:50:46 -04:00
Greenlamp 408b189966 1st attempt with a fix for black screen 2024-05-05 11:43:38 -04:00
Madi Simpson fa01f32475 ability: sturdy ability tag no longer pops up with 1 max hp 2024-05-05 11:40:54 -04:00
Armin 5c6e161eda Issue-483: Fix contact effects after death 2024-05-05 11:06:26 -04:00
Flashfyre 437cb87df9 Add separate achievements for sub-legendaries and rename pseudoLegendary field 2024-05-05 11:05:22 -04:00
Madi Simpson 80ee440109
Implement Guard Dog, attribute for abilities to give Intimidate immunity (#448) 
* abilities: implement guard dog, abilities that give intimidate immunity

* abilities: implement rattled's second effect, remove refs to mold breaker

* abilities: fix rattled not giving the attack drop still

* abilities: make ability bars pop in to some success

* abilities: implement suction cups since it has the same effect

* moves: add custom fail text, fix animation issues with Guard Dog/Roar

* abilities: manually show intimidate ability bar to prevent weirdness
 2024-05-05 10:52:27 -04:00
Lugiad f5bf35f8de
Removing forms names in Italian pokemon.ts (#486) 
* Removing forms names in Italian pokemon.ts

Forms names aren't supposed to be specified in the name of the Pokémon

* Removing forms names in Italian pokemon.ts
 2024-05-05 10:47:16 -04:00
Alessandro Bruzzese fea73081e5
Trasleted move.ts in italian (#490) 
* Added Italian translations for ability.ts and other element

* traslated move.ts
 2024-05-05 10:46:56 -04:00
Benjamin Odom faf1c0bce6 Small Typo when Learning a TM 
Fixes a small typo when learning a tm. The incorrect escape character was being used and no escape character was being used for Spanish.
 2024-05-05 10:45:47 -04:00
Greenlamp 3ee9c39975 disable the gamepad support when the option is on OFF 2024-05-05 10:45:18 -04:00
Madi Simpson e4b8bffdec stat change phase: only display comma before and if there are 3 or more stats 2024-05-05 10:45:00 -04:00
Akuma-Reiki b076dec346
Add Candy Progress UI to Starter Selecgt (#479) 
Co-authored-by: Samuel H <flashfireex@gmail.com>
 2024-05-05 10:35:14 -04:00
Greenlamp2 d98f7733d4
Rework - Inputs management to include all gamepad mapping V2 (#429) 
* rework of the input handling, including different gamepad and keyboard

* rework of the input handling, including different gamepad and keyboard

* first version of a too complex inputHandler based on phaser3-merged-input

* removed useless control management and kept it simple for our use case, investigating to put out button_XX()

* renamed inputHandler to inputController

* aggregate directions and some action into a same method + fix menu return value

* added back repeated input feature on keeping down a key

* cleanup + return type

* fix submit/action doing two things simultaneously, still same behaviour as before

* extracted UI inputs out of battle-scene

* tab -> spaces

* tab -> spaces what about now github ?

* tab -> spaces final (maybe)

* tried to fix the plugin loading issue on prod

* remove Plugins things as it's too uncertain how it works on prod

* seems old code source is indented with tab

* cleanup

* cleanup

* cleanup

* putting in an enum file the enum buttons

* fix repeating stats button + change message in event when the key is repeating

* added return type for ui-inputs

* added return type for inputs-controller

* adapted the code to integrate changes of bennybroseph
 2024-05-05 10:30:00 -04: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
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
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
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
Lugiad 77c3a5ad78
Minor update to French battle.ts (#438) 
* Minor update to French battle.ts

Added missing spaces before some exclamation marks

* Minor Update to French battle.ts
 2024-05-03 18:07:51 -05:00
Lugiad 0c9402a649
Update French tutorial.ts (#437) 
Changes made after in game test
 2024-05-03 18:07:06 -05:00
Lugiad 75cbe4fe2c
French Update to menu.ts (#436) 2024-05-03 17:43:32 -05:00
Flashfyre 754fe434e6 Update biome pools for various legendaries and regionals 2024-05-03 18:37:46 -04:00
Flashfyre 2eec545c49 Fix stat number keys in legacy battle stats view 2024-05-03 17:54:56 -04:00
ArceUseless 19e434929c
Spanish translations (#422) 
* Spanish translations for intro messages and some menus. Added Empty (save file) to lang files

* Spanish translations + new literals in all langs

---------

Co-authored-by: rnicar <rj.nieto.car@gmail.com>
 2024-05-03 17:52:09 -04:00
gericocross 6f446324db Longer descriptions don't stuck shorter ones anymore 2024-05-03 17:43:13 -04:00
Madi Simpson 06ae04abad bugfix: ensure hit recoil moves always do at least 1hp in recoil 2024-05-03 17:10:50 -04:00
Madi Simpson d48f0aa97d
Implement Anger Shell and Berserk (#421) 
* abilities: implement anger shell and berserk

* abilities: fix small typo causing berserk to raise speed instead of spatk

* abilities: condense battlestats into an array instead of multiple attrs
 2024-05-03 15:55:46 -05:00
Benjamin Odom 313fdc0e42 Fix Venom Drench not working on Toxic Status 2024-05-03 16:48:11 -04:00
Benjamin Odom 3b61662bba Fixed Mighty Cleave not being a Slicing Move 2024-05-03 16:18:29 -04:00
Matt Ross 1484a52fd7
Add variable power attribute for knock off (#426) 
* feature/add-variable-power-knock-off

* Remove console logs
 2024-05-03 15:54:21 -04:00
Madi Simpson cbf06ffa2c bugfix: ensure direct stat modifying moves update both pokemon's stat info 2024-05-03 15:12:48 -04:00
Madmadness65 9a559c8d6a Update passive abilities for legendaries 
This is the first batch of passive ability revisions, this one directed at legendary and mythical Pokémon.
 2024-05-03 14:04:43 -05:00
Flashfyre 71705dd6d4 Add candy popup sound 2024-05-03 15:03:11 -04:00
Flashfyre 9fc6bdde21 Revert "Rework - Inputs management to include all gamepad mapping (#390)" 
This reverts commit 70324c4159.
 2024-05-03 13:04:32 -04:00
Greenlamp2 70324c4159
Rework - Inputs management to include all gamepad mapping (#390) 
* rework of the input handling, including different gamepad and keyboard

* rework of the input handling, including different gamepad and keyboard

* first version of a too complex inputHandler based on phaser3-merged-input

* removed useless control management and kept it simple for our use case, investigating to put out button_XX()

* renamed inputHandler to inputController

* aggregate directions and some action into a same method + fix menu return value

* added back repeated input feature on keeping down a key

* cleanup + return type

* fix submit/action doing two things simultaneously, still same behaviour as before

* extracted UI inputs out of battle-scene

* tab -> spaces

* tab -> spaces what about now github ?
 2024-05-03 12:59:10 -04:00
Dario Krause c44ec421b0 Update pokemon.ts 2024-05-03 12:05:45 -04:00
Xavion3 c7c4deb416 Implement Sniper 2024-05-03 12:05:20 -04:00
Lugiad e082dd9089
Minor correction to apostrophes in French menu-ui-handler.ts (#415) 2024-05-03 09:51:00 -05:00
Xavion3 bc319a8eda Fix eggs during dailies 2024-05-03 10:28:40 -04:00
Paul Beslin 24a9dba2c4 Fix attacks with charge (solar beam, dig...) allowing to switch target on second turn 2024-05-03 08:35:31 -04:00
Benjamin Odom b84a4b4ee5 Fix Shedinja PPused Share 
Fixed having Shedinja share PP usage with the Ninjask it evolved from and vice versa.

The solution was to make a deep copy of each move in the moveset array rather than copying the array itself.
 2024-05-03 08:33:33 -04:00
Jaime f7b391746e Fix Gyro Ball only checking base stat 2024-05-03 08:32:39 -04:00
Matt Ross fbc0800571
Issue/smack down should cancel fly (#407) 
* Smack down and thousand arrows should cancel charging fly

* Remove console log

* Update interruptible check to use flying tag instead of move history

* Remove extra comma
 2024-05-03 01:20:41 -04:00
Madmadness65 6011794732 Minor egg move fix 
Gen 8 fossils unintentionally had Earthquake. They have now been replaced.
 2024-05-02 21:58:38 -05:00
Flashfyre b30ab6136e Starter friendship for candies is split between spliced species 2024-05-02 21:55:11 -04:00
Simoninoo 67431fb83b
Patch Ita (#399) 
* Syntax correction

* Tutorial translation
 2024-05-02 20:45:45 -04:00
Benjamin Odom fec8771830 Fix Shedinja Luck and Crash 
Shedinja wasn't taking the luck value from Ninjask so when it calculated its luck it just took the entire fused Pokemon's luck somehow. This has been fixed so it takes both the first and second part of the fusion's luck values instead.

Also fixes an issue where Shedinja crashed the game if it was the second part of a fusion combo. Now the correct pokemon species gets checked against and the correct pokemon evolution occurs to create Shedinja.
 2024-05-02 17:55:45 -04:00
Flashfyre 991f097e9e Rebalance friendship and add starter friendship with candy reward 2024-05-02 17:48:08 -04:00
maru dffa9b2704
Add more files to be purged from CF cache on deploy 2024-05-02 15:48:59 -04:00
Benjamin Odom 9d8f7ddcf0
Implement Tailwind (#398) 
Added a new ArenaTagType for Tailwind. Lasts 4 turns including the turn used.
 2024-05-02 14:10:21 -05:00
Madmadness65 ddb4383b1f Move Porygon line down to Rare in Factory biome 
This makes the Porygon line more common than before.
 2024-05-02 14:01:57 -05:00
Flashfyre 322838cfb5 Move service-worker to public folder 2024-05-02 11:37:06 -04:00
Flashfyre 3a7a48fe83 Temporarily disable error handling 2024-05-02 09:00:36 -04:00
James Lin 0185dd639e
Catch global errors and rejected promises and display them in an alert box. (#351) 
* Catch errors and rejected promises.

* Clean up
 2024-05-02 08:44:10 -04:00
Lugiad 10506f9cf5
Update italian pokemon-stat.ts (#389) 
* Update italian pokemon-stat.ts

* Update italian pokemon-stat.ts
 2024-05-02 08:37:05 -04:00
Lugiad 71893e8428 Update Spanish fight-ui-handler.ts 2024-05-02 08:36:33 -04:00
Benjamin Odom c9152cda3f
Fix Mobile PWA not showing in true Fullscreen (#394) 
* Fixed Rounding Error For TargetHalfHpDamageAttr

Moves that deal half of a target's HP were not able to deal damage if the target had 1 HP. Used Math.max to ensure 1 is the lowest this value ever evaluates to.

* Fix Mobile PWA not showing in true Fullscreen

adding "fullscreen" to the display attribute wasn't enough, but adding it to the start_url attribute was. This does not appear to affect PC (which is good since it shouldn't).

* Allow any orientation for mobile PWA

remove the orientation restriction since it doesn't prevent fullscreen PWA from displaying properly.
 2024-05-02 01:17:32 -04:00
Lugiad a1bb0e7baf
Updated French transaltion for tutorial.ts (#375) 
Translation of "statChange" + some remaning typos
 2024-05-01 23:26:24 -05:00
Xavion3 6d9424e431
Implement Gastro Acid (#393) 2024-05-01 23:22:30 -05:00
Flashfyre ba5bef123c Load missed master achievement bar 2024-05-01 19:42:06 -04:00
Flashfyre 2f8000885e Fix coloring error in rogue achievement bar 2024-05-01 19:29:04 -04:00
Flashfyre 86b0596a60 Add rogue achievement and voucher tier 2024-05-01 19:28:07 -04:00
Benjamin Odom ad59c0a7c4 Fixed Rounding Error For TargetHalfHpDamageAttr 
Moves that deal half of a target's HP were not able to deal damage if the target had 1 HP. Used Math.max to ensure 1 is the lowest this value ever evaluates to.
 2024-05-01 19:14:18 -04:00
Flashfyre 6ac224ab8a Refactor to split battle messages from menu 2024-05-01 18:54:35 -04:00
TeKrop e34b204664 feat: added support for localisation on battle scene sentences 2024-05-01 18:54:35 -04:00
Flashfyre 89e2642d91 Fix update issue for battle stats display 2024-05-01 18:24:21 -04:00
Flashfyre 7a418109c3 Fix not checking move conditions for AI 2024-05-01 18:17:12 -04:00
Tempoanon 0f153d39b1
Fix effect spore immunities, tera blast TM distribution, and IVs shown on catch (#388) 
* Fix effect spore, tera blast distribution, and IVs shown on catch

* Forgot to add tms

* Unown does not learn any TMs

* Fix some tera blast learns

* delelele whooooop
 2024-05-01 16:47:32 -05:00
Xavion3 5a6ea40dae Implement Acrobatics 
Currently scales from 0-5 items
 2024-05-01 17:11:16 -04:00
Xavion3 d6ca09e431 Implement Belch 2024-05-01 16:52:48 -04:00
InfernoVulpix 10169382d9
Implemented Synchronoise's effect (#221) 
* Implemented Synchronoise's effect

Tested with Soak, Forest's Curse, and a variety of attacker and defender types.

* Fixed Synchronoise double battle functionality

It now does zero damage only to targets who do not share any types with it, while correctly damaging any who do.  It also fails entirely if the user is UNKNOWN type.
 2024-05-02 06:14:19 +10:00
dielle000 e6c31966d7 Change pokemon stats chart 
Stats are arranged like in the mainline games
 2024-05-01 15:45:29 -04:00
Madmadness65 68f3326607 Add Heal Block back to level up learnsets 
The move itself is still not functional yet, but will be valuable for Endless when it is.
Also made Curse's flavor text accurate to the canon games.
 2024-05-01 12:21:22 -05:00
Thomas David c8583d6c69 Update manifest.webmanifest 2024-05-01 12:49:21 -04:00
Mistmemo 56b24c70b6
fix double battle iv scanner color (#379) 
* Add color for the IV scanner

add a new color SUMMARY_GREEN in text.js, add the green color if the iv of the pokemon is better than the iv on the starter of that pokemon

Co-authored-by: EmoUsedHM01 <131687820+emousedhm01@users.noreply.github.com>

* fix battle-message-ui-handler.ts formatting

* fix missing similicon battle-message-ui-handler.ts

* modified so it take a boolean instead of doing lot of else if battle-message-ui-handler.ts

* Fix iv scanner only doing color for the right pokemon in double fight

---------

Co-authored-by: EmoUsedHM01 <131687820+emousedhm01@users.noreply.github.com>
 2024-05-01 10:50:13 -04:00
thicco-catto fc1a9f0283
Select Move UI Shows PP (#372) 
* Select move UI shows PP

* Removed testing forced max pp

* PP only shows when using PP restoring items

* Removed testing max pp again

* Update src/phases.ts

* Update src/ui/party-ui-handler.ts

---------

Co-authored-by: Samuel H <flashfireex@gmail.com>
 2024-05-01 10:16:58 -04:00
Flashfyre 3b09e176a2 Fix IV text not comparing against starter species 2024-05-01 09:44:57 -04:00
TeKrop eac9b4d385 fix: reworked daily and weekly rankings translations workflow 2024-05-01 08:56:33 -04:00
Flashfyre 77caa8ece5 Add back shift for toggling stats 2024-05-01 00:27:11 -04:00
Flashfyre 17ec6b3ccc Fix start button mapping 2024-05-01 00:12:04 -04:00
lucfd e065610440
Fixed Dire Claw & Tri-Attack status chances (#367) 
* created MultiStatusEffectAttr

* removed testing stuff

* switched to randSeedItem
 2024-04-30 23:30:10 -04:00
Flashfyre 7ad9c67673 Fix crash on catch 2024-04-30 23:27:22 -04:00
Flashfyre 93765d4121 Update battle info on stat change 2024-04-30 23:23:32 -04:00
Flashfyre 6fd5709b13 Reapply stat change feature with fixes 2024-04-30 23:02:16 -04:00
Flashfyre 8a54e862fc Revert "Add togglable stat change display" 
This reverts commit 718585062b.
 2024-04-30 22:14:24 -04:00
Flashfyre 718585062b Add togglable stat change display 2024-04-30 22:06:54 -04:00
Mistmemo 05b0140075
Add color for the IV scanner (#363) 
* Add color for the IV scanner

add a new color SUMMARY_GREEN in text.js, add the green color if the iv of the pokemon is better than the iv on the starter of that pokemon

Co-authored-by: EmoUsedHM01 <131687820+emousedhm01@users.noreply.github.com>

* fix battle-message-ui-handler.ts formatting

* fix missing similicon battle-message-ui-handler.ts

* modified so it take a boolean instead of doing lot of else if battle-message-ui-handler.ts

---------

Co-authored-by: EmoUsedHM01 <131687820+emousedhm01@users.noreply.github.com>
 2024-04-30 20:32:02 -04:00
Valentin Porchet 7846fdc1e6
feat: added french translation for new entries in menu.ts (#360) 2024-04-30 17:33:34 -04:00
Dakurei c44009738a Add auto detect user language 
+ prLang used to override langague detected if necessary
 2024-04-30 16:48:37 -04:00
Dakurei 869a5c2d4c Fix tutorials translation fr 
+ Fix the length problem of some strings that aren't readable in the game
  + Fix a few typo errors
 2024-04-30 16:08:07 -04:00
Dario Krause 1449147121
Update pokemon.ts (#357) 2024-04-30 15:29:56 -04:00
Dakurei 36de62dc8a Fix Pokerus tutorial condition 2024-04-30 15:29:28 -04:00
Madmadness65 c5cc4445c4 Fix Furfrou trims missing shiny graphics 2024-04-30 13:39:16 -05:00
Nero 55dc339647
Bug Fixes and QoL: Minor changes to UI related bugs (#356) 
* bug fix: updates move description correctly

viewing the description of move slot 1 in a pokemon's move summary UI only updated the first time it was viewed per session, exiting the party UI and re-entering caused the moves in a pokemon's summary screen to not automatically populate the description box unless you moved the cursor down to move 2 and then back up to move 1

* slight logic changes to fix party UI controls

when battlerCount = 2 (double battle), starting in party slot 1 and pressing DOWN -> UP -> RIGHT would move the cursor back down when it should be moving it to the right: these changes fix that

* finalised the minor UI changes

* finalising

* refactor

* removed console logs used for testing

* bug fix: updates move description correctly

viewing the description of move slot 1 in a pokemon's move summary UI only updated the first time it was viewed per session, exiting the party UI and re-entering caused the moves in a pokemon's summary screen to not automatically populate the description box unless you moved the cursor down to move 2 and then back up to move 1

* slight logic changes to fix party UI controls

when battlerCount = 2 (double battle), starting in party slot 1 and pressing DOWN -> UP -> RIGHT would move the cursor back down when it should be moving it to the right: these changes fix that

* finalised the minor UI changes

* finalising

* refactor

* removed console logs used for testing
 2024-04-30 12:42:20 -04:00
Reldnahc 1e7c329928
Implement move wish (#323) 
* implement wish move

* Serene grace implementation idea

* only do the thingy if it actually gets effected.

* Revert "only do the thingy if it actually gets effected."

This reverts commit 4b084658d2.

* Revert "Serene grace implementation idea"

This reverts commit 4dd2504bc7.

* Fixes for Wish implementation

---------

Co-authored-by: Flashfyre <flashfireex@gmail.com>
 2024-04-30 12:38:24 -04:00
NxKarim 8e64eaea3f
Some Fixes (HPRatio, Hustle, Imposter, Sleep Talk) (#353) 
* Some Fixes

- HP ratio related checks (`getHpRatio`): Added rounding to 2 decimals for non-precise option.

- Hustle (`BattleStatMultiplierAbAttr`): added optional condition; Hustle now works only for physical attacks.

- Imposter (`PostSummonTransformAbAttr`): Switch in a double battle after both foes have been defeated no longer crashes the game.

- Sleep Talk (`RandomMovesetMoveAttr`): Single target moves no longer target allies.

* Formatting changes for consistency

---------

Co-authored-by: Flashfyre <flashfireex@gmail.com>
 2024-04-30 11:47:10 -04:00
Raphael van der Woude c7bd99b345
Added missing menu translations (#355) 
* Added missing menu translations

* Added missing translations to other languages

---------

Co-authored-by: Raphael van der Woude <raphael.van.der.woude@dias.nl>
 2024-04-30 10:53:00 -04:00
Xavion3 2402b8e6a0 Add overrides to .gitignore 2024-04-30 09:12:19 -04:00
Xavion3 ad5efdf4f9 Refactor overrides 2024-04-30 09:12:19 -04:00
Madmadness65 14cc639654 Small egg move change 
Gave Eevee and Pichu replacement egg moves for moves that are now on their level up learnsets. As usual, these are subject to change.
 2024-04-29 22:00:42 -05:00
Madmadness65 224fac574a Add Let's Go moves to Pikachu and Eevee's learnsets 
Also removed the duplicate Teeter Dance from Spinda's learnset and gave it back Dizzy Punch.
 2024-04-29 21:51:08 -05:00
Madmadness65 bd30dca47d Partially implement Battle Bond (Gen 8) & Power Construct abilities 
Both abilities are still not fully functional yet (Battle Bond does not interact with Water Shuriken yet, Power Construct does not interact with 10% Power Construct Zygarde, and both forms do not revert after a battle yet), but this is a step to having them both completed.
Battle Bond Froakie line and Power Construct 50% Zygardes (as well as Aura Break 10% Zygardes) can now randomly appear in the wild.
Expect Battle Bond to potentially change to its Gen 9 version at some point in the future, rendering Ash-Greninja inaccessible.
 2024-04-29 19:50:29 -05:00
lucfd 7a1895242c
Fixed Fake Out + Pivot move interaction (#347) 
* decrement turnCount if pivot move is used

* improved formatting
 2024-04-29 13:51:43 -04:00
Thomas David 9575054010
Implement localisation for tutorial (#330) 
* Implement localisation for tutorial

* Fix modules name

* Fix keys name

* Fix keys name part 2 : the return

* Add lines breaks in localisation files
 2024-04-29 12:33:18 -04:00
ElMoustacho 3b83d0b4d9 Fix typo in french names for a few pokémon 2024-04-29 11:55:34 -04:00
Dario Krause d93b6632c8 Gen 2, 3 de local 2024-04-29 10:00:42 -04:00
Dario Krause 116bf7ee18 Gen 1 de local 2024-04-29 08:38:07 -04:00
Madmadness65 b173000008 Implement Alcremie flavors 
...But not all evolution sweets. This way, you can get all the differently colored Alcremies without there being like ~60 different forms.
There currently is an unintended side-effect with Gigantamaxing, where the Alcremie flavor will always switch to Vanilla Cream when reverting to normal, but aside from that, it works fine.
 2024-04-29 01:42:02 -05:00
AJ Fontaine 7050e0db6c Fixed Outrage etc. lasting 4 turns 2024-04-28 23:57:40 -04:00
Xavion3 696c31f3e2 Make grass types unable to be seeded 2024-04-28 23:33:13 -04:00
Flashfyre 891b18592e Disable source map in Vite config 2024-04-28 23:21:22 -04:00
Flashfyre bc4d1207b9 Disable source map 2024-04-28 23:15:12 -04:00
Madmadness65 b72b4cffed Implement Furfrou forms 
They can be randomly encountered like many other multiple form Pokémon. Like canon, they do not have any statistical changes, just cosmetic.
 2024-04-28 21:58:55 -05:00
Flashfyre 9641d77bba Re-add shiny override EXCEPT FALSE THIS TIME 2024-04-28 22:03:29 -04:00
Madmadness65 6f078f4645 Minor fix to Roughneck's possible names 2024-04-28 20:02:06 -05:00
Flashfyre 7115683274 Increment game version 2024-04-28 20:45:04 -04:00
Flashfyre 57ece2c1d7 Revert "Add shiny and variant debug override" 
This reverts commit 21482a641b.
 2024-04-28 20:41:38 -04:00
Flashfyre 0b438d0ff4 Revert "Add temporary double wild shiny chance" 
This reverts commit 4607782578.
 2024-04-28 20:30:12 -04:00
Flashfyre 21482a641b Add shiny and variant debug override 2024-04-28 20:30:03 -04:00
Xavion3 b43a6ec764
Fix end catching (#332) 
* Fix end catching

* Remove fusion code
 2024-04-28 10:52:43 -04:00
Lugiad c09a0254ef French moves typos 2024-04-28 10:31:13 -04:00
Flashfyre a9a9e512a0 Revert "Auto select language implementation" 
This reverts commit 5fd7b368e2.
 2024-04-28 10:01:29 -04:00
Thomas David 5fd7b368e2 Auto select language implementation 2024-04-28 09:38:16 -04:00
Flashfyre 854de76467 Improve handling of variant data overrides for mixed animated mode 2024-04-27 18:06:41 -04:00
Flashfyre 55f68c0ce6 Fix DNA splicer exploit 2024-04-27 15:52:21 -04:00
Flashfyre 51408a0c9d Add missing animated Toxapex variant sprites 2024-04-27 01:13:03 -04:00
Flashfyre 014c13b95b Add workaround for crash with static variant sprites 2024-04-27 00:54:10 -04:00
4351 changed files with 245920 additions and 46943 deletions
Show Stats Expand all files Collapse all files

4
.github/workflows/deploy.yml vendored
View File

@ -41,4 +41,6 @@ jobs:
files: | files: |
https://pokerogue.net/ https://pokerogue.net/
https://pokerogue.net/index.html https://pokerogue.net/index.html
https://pokerogue.net/manifest.json https://pokerogue.net/manifest.json
https://pokerogue.net/manifest.webmanifest
https://pokerogue.net/service-worker.js

1
.gitignore vendored
View File

@ -33,5 +33,6 @@ public/images/pokemon/icons/input/output/*
public/images/character/*/ public/images/character/*/
src/data/battle-anim-raw-data*.ts src/data/battle-anim-raw-data*.ts
src/data/battle-anim-data.ts src/data/battle-anim-data.ts
src/overrides.ts
coverage coverage

4
README.md
View File

@ -19,7 +19,7 @@ If you have the motivation and experience with Typescript/Javascript (or are wil
### ❔ FAQ ### ❔ FAQ
**How do I test a new _______?** **How do I test a new _______?**
- In the `battle-scene.ts` file there are overrides for most values you'll need to change for testing - In the `src/overrides.ts` file there are overrides for most values you'll need to change for testing
## 🪧 To Do ## 🪧 To Do
@ -44,6 +44,8 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
- Arata Iiyoshi - Arata Iiyoshi
- Atsuhiro Ishizuna - Atsuhiro Ishizuna
- Pokémon Black/White 2 - Pokémon Black/White 2
- Firel (Custom Metropolis and Laboratory biome music)
- Lmz (Custom Jungle biome music)
- edifette (Title screen music) - edifette (Title screen music)
### 🎵 Sound Effects ### 🎵 Sound Effects

4
index.css
View File

@ -150,6 +150,10 @@ body {
display: none; display: none;
} }
#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apad #apadStats {
display: none;
}
#apad .apadRectBtnContainer + .apadSqBtnContainer { #apad .apadRectBtnContainer + .apadSqBtnContainer {
top: calc(var(--controls-size) * -1.9); top: calc(var(--controls-size) * -1.9);
left: calc(var(--controls-size) * -0.9); left: calc(var(--controls-size) * -0.9);

6
index.html
View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" />
<title>PokéRogue</title> <title>PokéRogue</title>
<meta name="description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." /> <meta name="description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." />
<meta name="theme-color" content="#da3838" /> <meta name="theme-color" content="#da3838" />
@ -11,7 +12,7 @@
<meta property="og:image" content="https://pokerogue.net/logo512.png" /> <meta property="og:image" content="https://pokerogue.net/logo512.png" />
<link rel="apple-touch-icon" href="./logo512.png" /> <link rel="apple-touch-icon" href="./logo512.png" />
<link rel="shortcut icon" type="image/png" href="./logo512.png" /> <link rel="shortcut icon" type="image/png" href="./logo512.png" />
<meta charset="UTF-8" /> <link rel="canonical" href="https://pokerogue.net" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
<style type="text/css"> <style type="text/css">
@font-face { @font-face {
@ -74,6 +75,9 @@
<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="CYCLE_VARIANT"> <div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="CYCLE_VARIANT">
<text class="apadLabel apadLabelSmall">V</text> <text class="apadLabel apadLabelSmall">V</text>
</div> </div>
<div id="apadStats" class="apadRectBtn apadBtn" data-key="STATS">
<text class="apadLabel apadLabelSmall">C</text>
</div>
<div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU"> <div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU">
<text class="apadLabel apadLabelSmall">Menu</text> <text class="apadLabel apadLabelSmall">Menu</text>
</div> </div>

13
package-lock.json generated
View File

@ -1,16 +1,17 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.0.1", "version": "1.0.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.0.1", "version": "1.0.4",
"dependencies": { "dependencies": {
"@material/material-color-utilities": "^0.2.7", "@material/material-color-utilities": "^0.2.7",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"i18next": "^23.11.1", "i18next": "^23.11.1",
"i18next-browser-languagedetector": "^7.2.1",
"json-stable-stringify": "^1.1.0", "json-stable-stringify": "^1.1.0",
"phaser": "^3.70.0", "phaser": "^3.70.0",
"phaser3-rex-plugins": "^1.1.84" "phaser3-rex-plugins": "^1.1.84"
@ -2772,6 +2773,14 @@
"@babel/runtime": "^7.23.2" "@babel/runtime": "^7.23.2"
} }
}, },
"node_modules/i18next-browser-languagedetector": {
"version": "7.2.1",
"resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.2.1.tgz",
"integrity": "sha512-h/pM34bcH6tbz8WgGXcmWauNpQupCGr25XPp9cZwZInR9XHSjIFDYp1SIok7zSPsTOMxdvuLyu86V+g2Kycnfw==",
"dependencies": {
"@babel/runtime": "^7.23.2"
}
},
"node_modules/i18next-http-backend": { "node_modules/i18next-http-backend": {
"version": "2.5.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.0.tgz", "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.0.tgz",

3
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"private": true, "private": true,
"version": "1.0.3", "version": "1.0.4",
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "vite", "start": "vite",
@ -31,6 +31,7 @@
"@material/material-color-utilities": "^0.2.7", "@material/material-color-utilities": "^0.2.7",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"i18next": "^23.11.1", "i18next": "^23.11.1",
"i18next-browser-languagedetector": "^7.2.1",
"json-stable-stringify": "^1.1.0", "json-stable-stringify": "^1.1.0",
"phaser": "^3.70.0", "phaser": "^3.70.0",
"phaser3-rex-plugins": "^1.1.84" "phaser3-rex-plugins": "^1.1.84"

0
public/audio/bgm/battle_legendary_k.mp3 → public/audio/bgm/battle_legendary_kyurem.mp3
View File

BIN
public/audio/bgm/battle_legendary_regis.mp3 Normal file
View File

Binary file not shown.

0
public/audio/bgm/battle_legendary_rz.mp3 → public/audio/bgm/battle_legendary_res_zek.mp3
View File

0
public/audio/bgm/battle_legendary.mp3 → public/audio/bgm/battle_legendary_unova.mp3
View File

BIN
public/audio/bgm/jungle.mp3
View File

Binary file not shown.

BIN
public/audio/bgm/laboratory.mp3
View File

Binary file not shown.

BIN
public/audio/bgm/metropolis.mp3
View File

Binary file not shown.

BIN
public/audio/se/shing.wav Normal file
View File

Binary file not shown.

2
public/battle-anims/lick.json
View File

@ -1978,7 +1978,7 @@
}, },
{ {
"frameIndex": 0, "frameIndex": 0,
"resourceName": "PRAS- Sketch and Lick", "resourceName": "PRAS- Sketch + Lick",
"bgX": 0, "bgX": 0,
"bgY": 0, "bgY": 0,
"opacity": 0, "opacity": 0,

335
public/exp-sprites.json
View File

@ -4539,20 +4539,44 @@
"1000", "1000",
"1001", "1001",
"1004", "1004",
"1007-apex",
"1007-apex",
"1007-apex",
"1007-apex",
"1008-ultimate",
"127-mega",
"142-mega",
"150-mega",
"150-mega",
"181-mega", "181-mega",
"212-mega", "212-mega",
"282-mega_2", "282-mega_2",
"282-mega_2", "282-mega_2",
"282-mega_3", "282-mega_3",
"282-mega_3", "282-mega_3",
"3-mega_2",
"3-mega_2",
"3-mega_3",
"3-mega_3",
"303-mega", "303-mega",
"306-mega",
"308-mega",
"310-mega",
"334-mega", "334-mega",
"334-mega_2", "334-mega_2",
"334-mega_2", "334-mega_2",
"373-mega",
"376-mega", "376-mega",
"380-mega",
"381-mega",
"382-primal",
"383-primal",
"384-mega", "384-mega",
"384-mega_2", "384-mega_2",
"384-mega_2", "384-mega_2",
"4052",
"4077",
"4078",
"4263", "4263",
"4264", "4264",
"428-mega", "428-mega",
@ -4562,14 +4586,58 @@
"475-mega_2", "475-mega_2",
"475-mega_3", "475-mega_3",
"475-mega_3", "475-mega_3",
"6215",
"653",
"654",
"6549", "6549",
"655",
"6570", "6570",
"6571", "6571",
"664",
"665",
"666-archipelago",
"666-continental",
"666-elegant",
"666-fancy_2",
"666-fancy_2",
"666-fancy_3",
"666-fancy_3",
"666-garden",
"666-high",
"666-icy",
"666-jungle",
"666-marine",
"666-meadow_2",
"666-meadow_2",
"666-meadow_3",
"666-meadow_3",
"666-modern",
"666-monsoon",
"666-ocean",
"666-poke",
"666-poke",
"666-poke",
"666-polar",
"666-river",
"666-river_2",
"666-river_2",
"666-sandstorm",
"666-savanna",
"666-sun",
"666-tundra",
"6705", "6705",
"6706_2", "6706_2",
"6706_2", "6706_2",
"6706_3", "6706_3",
"6706_3", "6706_3",
"690",
"691",
"696",
"696_3",
"696_3",
"697",
"697_3",
"697_3",
"700", "700",
"704", "704",
"705_2", "705_2",
@ -4581,20 +4649,74 @@
"709", "709",
"710", "710",
"711", "711",
"716-active",
"716-neutral",
"717_2",
"717_2",
"717_3",
"717_3",
"720-unbound", "720-unbound",
"720", "720",
"728",
"729",
"730",
"730_2",
"730_2",
"747",
"748",
"753",
"754",
"755", "755",
"756", "756",
"761",
"762",
"763",
"767",
"768",
"771",
"771_2",
"771_2",
"771_3",
"771_3",
"789", "789",
"790",
"791",
"791_1", "791_1",
"791_1", "791_1",
"792",
"793_2",
"793_2",
"793_3",
"793_3",
"800-dawn",
"800-dusk",
"800-ultra",
"800",
"802", "802",
"808",
"809",
"821_2",
"821_2",
"821_3",
"821_3",
"822",
"823",
"829",
"830",
"835",
"836_2",
"836_2",
"836_3",
"836_3",
"850",
"851",
"856", "856",
"857_2", "857_2",
"857_2", "857_2",
"857_3", "857_3",
"857_3", "857_3",
"858", "858",
"863",
"872", "872",
"873", "873",
"877-hangry", "877-hangry",
@ -4607,6 +4729,17 @@
"890_3", "890_3",
"890_3", "890_3",
"900", "900",
"901",
"903",
"909",
"910_2",
"910_2",
"910_3",
"910_3",
"911_2",
"911_2",
"911_3",
"911_3",
"919", "919",
"920", "920",
"924", "924",
@ -4620,32 +4753,103 @@
"925-three_2", "925-three_2",
"925-three_3", "925-three_3",
"925-three_3", "925-three_3",
"932_2",
"932_2",
"932_3",
"932_3",
"933_2",
"933_2",
"933_3",
"933_3",
"934",
"935",
"935_3",
"935_3",
"936_1",
"936_1",
"936_2",
"936_2",
"936_3",
"936_3",
"937_1",
"937_1",
"937_2",
"937_2",
"937_3",
"937_3",
"94-mega_1", "94-mega_1",
"94-mega_1", "94-mega_1",
"94-mega_2", "94-mega_2",
"94-mega_2", "94-mega_2",
"94-mega_3", "94-mega_3",
"94-mega_3", "94-mega_3",
"948",
"949",
"962", "962",
"967", "967",
"968",
"969",
"970_2",
"970_2",
"970_3",
"970_3",
"973", "973",
"978-curly_2",
"978-curly_2",
"978-curly_3",
"978-curly_3",
"978-droopy_2",
"978-droopy_2",
"978-droopy_3",
"978-droopy_3",
"978-stretchy_2",
"978-stretchy_2",
"978-stretchy_3",
"978-stretchy_3",
"987", "987",
"988", "988",
"988_3", "988_3",
"988_3", "988_3",
"994",
"994_3",
"994_3",
"999", "999",
"999_1", "999_1",
"999_1", "999_1",
"1000b", "1000b",
"1001b", "1001b",
"1004b", "1004b",
"1007b-apex",
"1007b-apex",
"1007b-apex",
"1007b-apex",
"1008b-ultimate",
"127b-mega",
"142b-mega",
"150b-mega",
"150b-mega",
"181b-mega", "181b-mega",
"212b-mega", "212b-mega",
"282b-mega", "282b-mega",
"3b-mega_2",
"3b-mega_2",
"3b-mega_3",
"3b-mega_3",
"303b-mega", "303b-mega",
"306b-mega",
"308b-mega",
"310b-mega",
"334b-mega", "334b-mega",
"373b-mega",
"376b-mega", "376b-mega",
"380b-mega",
"381b-mega",
"382b-primal",
"383b-primal",
"384b-mega", "384b-mega",
"4052b",
"4077b",
"4078b",
"4263b", "4263b",
"4264b", "4264b",
"428b-mega", "428b-mega",
@ -4655,14 +4859,104 @@
"475b-mega_2", "475b-mega_2",
"475b-mega_3", "475b-mega_3",
"475b-mega_3", "475b-mega_3",
"6215b",
"653b",
"654b",
"6549b", "6549b",
"655b",
"6570b", "6570b",
"6571b", "6571b",
"664b",
"665b",
"665_2b",
"665_2b",
"666b-archipelago_2",
"666b-archipelago_2",
"666b-archipelago_3",
"666b-archipelago_3",
"666b-continental_2",
"666b-continental_2",
"666b-continental_3",
"666b-continental_3",
"666b-elegant_2",
"666b-elegant_2",
"666b-elegant_3",
"666b-elegant_3",
"666b-fancy_2",
"666b-fancy_2",
"666b-fancy_3",
"666b-fancy_3",
"666b-garden_2",
"666b-garden_2",
"666b-garden_3",
"666b-garden_3",
"666b-high",
"666b-high",
"666b-high",
"666b-high",
"666b-icy",
"666b-icy",
"666b-icy",
"666b-icy",
"666b-jungle_2",
"666b-jungle_2",
"666b-jungle_3",
"666b-jungle_3",
"666b-marine_2",
"666b-marine_2",
"666b-marine_3",
"666b-marine_3",
"666b-meadow_2",
"666b-meadow_2",
"666b-meadow_3",
"666b-meadow_3",
"666b-modern_2",
"666b-modern_2",
"666b-modern_3",
"666b-modern_3",
"666b-monsoon_2",
"666b-monsoon_2",
"666b-monsoon_3",
"666b-monsoon_3",
"666b-ocean_2",
"666b-ocean_2",
"666b-ocean_3",
"666b-ocean_3",
"666b-poke",
"666b-poke",
"666b-poke",
"666b-poke",
"666b-polar_2",
"666b-polar_2",
"666b-polar_3",
"666b-polar_3",
"666b-river_2",
"666b-river_2",
"666b-river_3",
"666b-river_3",
"666b-sandstorm_2",
"666b-sandstorm_2",
"666b-sandstorm_3",
"666b-sandstorm_3",
"666b-savanna_2",
"666b-savanna_2",
"666b-savanna_3",
"666b-savanna_3",
"666b-sun_2",
"666b-sun_2",
"666b-sun_3",
"666b-sun_3",
"666b-tundra_2",
"666b-tundra_2",
"666b-tundra_3",
"666b-tundra_3",
"6705b", "6705b",
"6706_2b", "6706_2b",
"6706_2b", "6706_2b",
"6706_3b", "6706_3b",
"6706_3b", "6706_3b",
"690b",
"691b",
"700b", "700b",
"704b", "704b",
"705b", "705b",
@ -4673,11 +4967,28 @@
"711b", "711b",
"720b-unbound", "720b-unbound",
"720b", "720b",
"747_2b",
"747_2b",
"747_3b",
"747_3b",
"748b",
"755b", "755b",
"756b", "756b",
"771b",
"789b", "789b",
"790b",
"791b", "791b",
"792b",
"793b",
"800b-dawn",
"800b-dusk",
"800b-ultra",
"800b",
"802b", "802b",
"829b",
"830b",
"850b",
"851b",
"856b", "856b",
"857_2b", "857_2b",
"857_2b", "857_2b",
@ -4706,7 +5017,30 @@
"925b-three_2", "925b-three_2",
"925b-three_3", "925b-three_3",
"925b-three_3", "925b-three_3",
"932b",
"933b",
"934b",
"935_1b",
"935_1b",
"935_2b",
"935_2b",
"935_3b",
"935_3b",
"936_1b",
"936_1b",
"936_2b",
"936_2b",
"936_3b",
"936_3b",
"937_1b",
"937_1b",
"937_2b",
"937_2b",
"937_3b",
"937_3b",
"94b-mega", "94b-mega",
"948b",
"949b",
"962b", "962b",
"962_3b", "962_3b",
"962_3b", "962_3b",
@ -4714,5 +5048,6 @@
"973b", "973b",
"987b", "987b",
"988b", "988b",
"994b",
"999b" "999b"
] ]

BIN
public/images/arenas/island_a.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
public/images/arenas/island_b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
public/images/arenas/island_b_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
public/images/arenas/island_b_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 910 B

BIN
public/images/arenas/island_b_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
public/images/arenas/island_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
public/images/arenas/jungle_a.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/images/arenas/jungle_b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/images/arenas/jungle_b_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/images/arenas/jungle_b_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/images/arenas/jungle_b_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1022 B

BIN
public/images/arenas/jungle_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
public/images/arenas/laboratory_a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
public/images/arenas/laboratory_b.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
public/images/arenas/laboratory_b_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 931 B

BIN
public/images/arenas/laboratory_b_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 821 B

BIN
public/images/arenas/laboratory_b_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 752 B

BIN
public/images/arenas/laboratory_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 776 B

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
public/images/arenas/metropolis_a.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 750 B

BIN
public/images/arenas/metropolis_b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
public/images/arenas/metropolis_b_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
public/images/arenas/metropolis_b_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
public/images/arenas/metropolis_b_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 885 B

BIN
public/images/arenas/metropolis_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
public/images/arenas/snowy_forest_a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/images/arenas/snowy_forest_b.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/images/arenas/snowy_forest_b_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
public/images/arenas/snowy_forest_b_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 921 B

BIN
public/images/arenas/snowy_forest_b_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/images/arenas/snowy_forest_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 4.7 KiB

6074
public/images/items.json
View File

File diff suppressed because it is too large Load Diff

BIN
public/images/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
public/images/items/bronze_ribbon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 400 B

BIN
public/images/items/burn_drive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
public/images/items/chill_drive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
public/images/items/douse_drive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
public/images/items/great_ribbon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 408 B

BIN
public/images/items/master_ribbon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 408 B

BIN
public/images/items/quick_claw.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 B

BIN
public/images/items/rogue_ribbon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B

BIN
public/images/items/shock_drive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
public/images/items/ultra_ribbon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 406 B

293
public/images/pbinfo_stat_numbers.json Normal file
View File

@ -0,0 +1,293 @@
{
"textures": [
{
"image": "pbinfo_stat_numbers.png",
"format": "RGBA8888",
"size": {
"w": 117,
"h": 8
},
"scale": 1,
"frames": [
{
"filename": "+1",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "+2",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 9,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "+3",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 18,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "+4",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 27,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "+5",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 36,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "+6",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 45,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "-1",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 54,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "-2",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 63,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "-3",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 72,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "-4",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 81,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "-5",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 90,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "-6",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 99,
"y": 0,
"w": 9,
"h": 8
}
},
{
"filename": "0",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 9,
"h": 8
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 9,
"h": 8
},
"frame": {
"x": 108,
"y": 0,
"w": 9,
"h": 8
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:794aa4af3291db5abd8a2667626c1998:1a6706ad557b92f9bf099c23e02af4a6:6537c634087637bb27e8a1edb1ee2e35$"
}
}

BIN
public/images/pokemon/226.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
public/images/pokemon/279.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
public/images/pokemon/335.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 59 KiB

BIN
public/images/pokemon/373.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 47 KiB

24
public/images/pokemon/676-dandy.json
View File

@ -4,30 +4,30 @@
"image": "676-dandy.png", "image": "676-dandy.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 71, "w": 65,
"h": 71 "h": 65
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 56, "w": 96,
"h": 71 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 22,
"y": 0, "y": 15,
"w": 56, "w": 50,
"h": 71 "h": 65
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 56, "w": 50,
"h": 71 "h": 65
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:29165e5c573c8a4235076355ce5d29d5:17a1912fd81d23ce8a7209e27ad3e9ed:b5a287256e260744fe6660dc2ceefd11$" "smartupdate": "$TexturePacker:SmartUpdate:c09947cc1f66b7a7bf844a7caaa3bd76:20ba7e14cce8a9ee80955d94d19ae46f:b5a287256e260744fe6660dc2ceefd11$"
} }
} }

BIN
public/images/pokemon/676-dandy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 765 B

24
public/images/pokemon/676-debutante.json
View File

@ -4,30 +4,30 @@
"image": "676-debutante.png", "image": "676-debutante.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 67, "w": 61,
"h": 67 "h": 61
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 56, "w": 96,
"h": 67 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 20,
"y": 0, "y": 19,
"w": 56, "w": 50,
"h": 67 "h": 61
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 56, "w": 50,
"h": 67 "h": 61
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:689efba1d73755e99f598016fd321c3c:07d06d321fff31976e1b993edb972e4f:bf2f862a1c8881133f9f3ffbf44602fa$" "smartupdate": "$TexturePacker:SmartUpdate:107780a0e7447bf89ae4998e24021f8b:7623c7ab8d7b6bc5f755e8a1f81ea257:bf2f862a1c8881133f9f3ffbf44602fa$"
} }
} }

BIN
public/images/pokemon/676-debutante.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 802 B

24
public/images/pokemon/676-diamond.json
View File

@ -4,30 +4,30 @@
"image": "676-diamond.png", "image": "676-diamond.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 74, "w": 68,
"h": 74 "h": 68
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 53, "w": 96,
"h": 74 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 24,
"y": 0, "y": 12,
"w": 53, "w": 47,
"h": 74 "h": 68
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 53, "w": 47,
"h": 74 "h": 68
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:b33f3de937219e7763316531398d7bbd:c7e104da9393ec52b9e6d37f92fc20d9:88c467fc09249b0d2f579d44eacd528d$" "smartupdate": "$TexturePacker:SmartUpdate:90477dc67c3429f2f0430f0a868ed85c:bd69660307b7d945313b73a256c24d57:88c467fc09249b0d2f579d44eacd528d$"
} }
} }

BIN
public/images/pokemon/676-diamond.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 807 B

24
public/images/pokemon/676-heart.json
View File

@ -4,30 +4,30 @@
"image": "676-heart.png", "image": "676-heart.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 72, "w": 66,
"h": 72 "h": 66
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 54, "w": 96,
"h": 72 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 24,
"y": 0, "y": 14,
"w": 54, "w": 48,
"h": 72 "h": 66
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 54, "w": 48,
"h": 72 "h": 66
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:15e433a2269dd4043b1614811a1b8fbd:421a40542b16cdb2cc154c85e963b40d:e11d4dd16bff2ef69bc5ca683c44ca7c$" "smartupdate": "$TexturePacker:SmartUpdate:a9b1c7a73abb563b1ecadad8b517794e:2273c7342204f52860d8e96670ddf46a:e11d4dd16bff2ef69bc5ca683c44ca7c$"
} }
} }

BIN
public/images/pokemon/676-heart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 813 B

24
public/images/pokemon/676-kabuki.json
View File

@ -4,30 +4,30 @@
"image": "676-kabuki.png", "image": "676-kabuki.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 70, "w": 64,
"h": 70 "h": 64
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 58, "w": 96,
"h": 70 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 22,
"y": 0, "y": 16,
"w": 58, "w": 52,
"h": 70 "h": 64
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 58, "w": 52,
"h": 70 "h": 64
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:7f4056b1c055475f905d048c8d8d2969:08eecd31f557298e1570ec3490acffe2:c3cad56aa65d2ee971ceebc435a14ee6$" "smartupdate": "$TexturePacker:SmartUpdate:d36abbc31bcd28664e28eb50f8e4719d:43c9d8bb344b7a1373b93f493badb47e:c3cad56aa65d2ee971ceebc435a14ee6$"
} }
} }

BIN
public/images/pokemon/676-kabuki.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 842 B

24
public/images/pokemon/676-la-reine.json
View File

@ -4,30 +4,30 @@
"image": "676-la-reine.png", "image": "676-la-reine.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 69, "w": 63,
"h": 69 "h": 63
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 55, "w": 96,
"h": 69 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 23,
"y": 0, "y": 17,
"w": 55, "w": 49,
"h": 69 "h": 63
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 55, "w": 49,
"h": 69 "h": 63
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:d209428aca72f49f1e9ee3e97f1c18ab:c56ae957d7acb10c7373b842af3a8786:b99821e87dffda3297dd25a224a9029f$" "smartupdate": "$TexturePacker:SmartUpdate:81b2b5d853a3d2527630ca0b2fea6569:98097941483e509b7962c50b179d132f:b99821e87dffda3297dd25a224a9029f$"
} }
} }

BIN
public/images/pokemon/676-la-reine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 726 B

24
public/images/pokemon/676-matron.json
View File

@ -4,30 +4,30 @@
"image": "676-matron.png", "image": "676-matron.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 68, "w": 62,
"h": 68 "h": 62
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 52, "w": 96,
"h": 68 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 23,
"y": 0, "y": 18,
"w": 52, "w": 46,
"h": 68 "h": 62
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 52, "w": 46,
"h": 68 "h": 62
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:698fab0e5221743b912637e774bfaecd:72a9977db421d061829c639e3b50a617:020798583d07c479020bb0af34cf8bb6$" "smartupdate": "$TexturePacker:SmartUpdate:50d9857668a013306b96adc3777a22b2:7d3708f1b5b6eeb8419815fc6734bf06:020798583d07c479020bb0af34cf8bb6$"
} }
} }

BIN
public/images/pokemon/676-matron.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 777 B

24
public/images/pokemon/676-pharaoh.json
View File

@ -4,30 +4,30 @@
"image": "676-pharaoh.png", "image": "676-pharaoh.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 69, "w": 63,
"h": 69 "h": 63
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 52, "w": 96,
"h": 69 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 25,
"y": 0, "y": 17,
"w": 52, "w": 46,
"h": 69 "h": 63
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 52, "w": 46,
"h": 69 "h": 63
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:5c1df95bcf0d53d4f1b9f1bf77690598:623b4bc6698ef1a984b6bad42e68115b:904b7ab6f57249c96beea4b5f72deb53$" "smartupdate": "$TexturePacker:SmartUpdate:69f1be06f9a7175f294267b08e7ba275:42e7e4068e30b78248d3629cffa5d2ec:904b7ab6f57249c96beea4b5f72deb53$"
} }
} }

BIN
public/images/pokemon/676-pharaoh.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 770 B

24
public/images/pokemon/676-star.json
View File

@ -4,30 +4,30 @@
"image": "676-star.png", "image": "676-star.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 72, "w": 66,
"h": 72 "h": 66
}, },
"scale": 1, "scale": 0.5,
"frames": [ "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"sourceSize": { "sourceSize": {
"w": 56, "w": 96,
"h": 72 "h": 96
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 24,
"y": 0, "y": 14,
"w": 56, "w": 50,
"h": 72 "h": 66
}, },
"frame": { "frame": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 56, "w": 50,
"h": 72 "h": 66
} }
} }
] ]
@ -36,6 +36,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:31c1ce60aa953fb647ff40c50ac54cf1:d7eefc05e299310d05d389e05997e449:dd7fedf66b493b0bbdef5d25e0041dd8$" "smartupdate": "$TexturePacker:SmartUpdate:fde8824a7749541f5af1cc14e6281670:204c6eb602358a5c7c1389b42317ffce:dd7fedf66b493b0bbdef5d25e0041dd8$"
} }
} }

BIN
public/images/pokemon/676-star.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 838 B

BIN
public/images/pokemon/716-active.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
public/images/pokemon/716-neutral.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

41
public/images/pokemon/869-caramel-swirl.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-caramel-swirl.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:e565b3b962f894b4de5291159fced6f2:dec57ba4f1836b6834da2da4c98c442a:a9efacddd6da069c39eca521bf0c5c93$"
}
}

BIN
public/images/pokemon/869-caramel-swirl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

41
public/images/pokemon/869-lemon-cream.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-lemon-cream.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:8a99ba9bf3bfb93bba7c6010553d9e0e:b231a3962960f61ce4d970d95bde3f3c:0284bb2fb44231f3756d5e41407b29dc$"
}
}

BIN
public/images/pokemon/869-lemon-cream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

41
public/images/pokemon/869-matcha-cream.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-matcha-cream.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:713d1a6f0fbac3236c31960e722f4425:29a82de035ed4f33426b4bb6943c4036:3607dee150b69bb8409f07bf4b436c27$"
}
}

BIN
public/images/pokemon/869-matcha-cream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

41
public/images/pokemon/869-mint-cream.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-mint-cream.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:5deaa7830e8cbf001dce6c800a9e3da2:4c9255c2ad6d33fc00a90e447fb8a344:5a3d349b5aaedd43ed9c9acbc0c8652a$"
}
}

BIN
public/images/pokemon/869-mint-cream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

41
public/images/pokemon/869-rainbow-swirl.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-rainbow-swirl.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:1a4d1bc0283fdcf9704523ff9c304937:8122f937b67cb25a772bdb63688456b7:5efb62c1b2c8ccb825172755b6a5956b$"
}
}

BIN
public/images/pokemon/869-rainbow-swirl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

41
public/images/pokemon/869-ruby-cream.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-ruby-cream.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:e03bb56ed3208e982eb0bec819d53bf6:2c86ae79dcda2aeecdcf0c025c16d3c3:36b2afa6f1e593bd875572a5eaa54a8f$"
}
}

BIN
public/images/pokemon/869-ruby-cream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

41
public/images/pokemon/869-ruby-swirl.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-ruby-swirl.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:3c79af909f9735d7ece0527b789506f2:0b973ea05d9bc875560323eb9df5efe3:ea7e9be6cfcdb9bb39d201b2ab117eae$"
}
}

BIN
public/images/pokemon/869-ruby-swirl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

41
public/images/pokemon/869-salted-cream.json Normal file
View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "869-salted-cream.png",
"format": "RGBA8888",
"size": {
"w": 55,
"h": 55
},
"scale": 0.5,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 96,
"h": 96
},
"spriteSourceSize": {
"x": 28,
"y": 20,
"w": 39,
"h": 55
},
"frame": {
"x": 0,
"y": 0,
"w": 39,
"h": 55
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:bb169ea1db5dad0a39dcd54df8356c06:608e3745adcb907d1f382e251ad807f4:6e5c7cbfd1699b5560a39643a258e386$"
}
}

BIN
public/images/pokemon/869-salted-cream.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

Some files were not shown because too many files have changed in this diff Show More