Commit Graph

4395 Commits

Author SHA1 Message Date
Madmadness65
d14a66f523 Replace all instances of integer with number
All usages of Utils.IntegerHolder were left as-is as to not risk breaking any existing functionality.
2024-10-29 17:41:17 -05:00
Madmadness65
12ffa17ea2
Merge branch 'beta' into evil-team-monogen 2024-10-28 20:59:49 -05:00
AJ Fontaine
13377806ff
[Refactor] Change attack type booster names to enum (#4725) 2024-10-28 15:58:46 -07:00
PrabbyDD
3241332a3c
[Ability] Implementing Friend Guard (#4718)
* implementing friend guard ability

* Update src/data/ability.ts

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

* Update src/data/ability.ts

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

* Update src/data/ability.ts

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

* Update src/test/abilities/friend_guard.test.ts

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

* Update src/field/pokemon.ts

Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>

* more tests and fixing other issues

* more tests and fixing other issues

* Update Friend Guard test with damage mocks

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: innerthunder <brandonerickson98@gmail.com>
2024-10-28 13:49:04 -07:00
Moka
fe7d156d2d
Merge pull request #4754 from pagefaultgames/main
Main -> Beta (1.1.6)
2024-10-28 17:40:48 +01:00
innerthunder
b4cc9d7892
[Hotfix] Fix crash when Mist would block a stat drop (#4746)
* Fix crash when Mist would block a stat drop

* Bump version

* Bump version (again)
2024-10-28 14:02:10 +01:00
pom-eranian
5797f265a4
[Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja (#4743)
* [Sprite][hotfix] Fixed cropping on static greninja and ash greninja

* bump version number
2024-10-28 02:32:36 +00:00
chaosgrimmon
33f5f4c33b
[Sprite] Hotfix cut off Binacle sprite (#4741)
* Trim 688.json duration

* Trim 688.json duration

* Fix cut off Binacle back

* Fix cut off shiny Binacle back

* Bump version

* Bump version

* Revert cutting off hair

* Revert cutting off hair

* Remove trailing comma

* Remove trailing comma
2024-10-27 23:23:09 +01:00
Moka
41380b39b9
[Hotfix] Fix manifest getting loaded before the game is initialized (#4739)
* Fix manifest being used before the game is initialized

* bump game version

* make manifest fix more future proof

* Revert "make manifest fix more future proof"

This reverts commit 32591b35d0.

* fix locales path for offline builds
2024-10-27 21:32:30 +01:00
Madmadness65
840e3063ff Minor fix
Gen 7 challenge wasn't taking into account the  `rand` value
2024-10-27 11:13:24 -05:00
Madmadness65
ab44755d4b Move rand value
I had done the randSeedInt value in the wrong place, so the value wasn't saving to the session data properly, so that has been fixed.
2024-10-27 10:37:35 -05:00
Madmadness65
b8e87eb488 Add missing challenge data entries 2024-10-27 02:56:16 -05:00
Madmadness65
4f95452544 Hopefully fix evil team randomness issue
Added a new `rand` value to the Challenge class as a means of setting a random value only once when beginning a mono-gen challenge run. This should mean that the evil teams no longer change between waves now.
2024-10-27 02:09:47 -05:00
Madmadness65
18e4a4a42b
Merge branch 'beta' into evil-team-monogen 2024-10-27 00:51:47 -05:00
PigeonBar
dfb42e44a6
[Hotfix] Fix Eternatus egg tier (#4734) 2024-10-27 04:04:57 +00:00
innerthunder
9a56f080db
[Hotfix] Fix status damage triggering before berry usage (#4732)
* Fix status damage triggering before berry usage

* Bump version number

* Revert "Bump version number"

This reverts commit 64b194f5a7.

* Bump version number for real this time
2024-10-27 02:34:48 +00:00
Frederico Santos
908784b011 Merge branch 'main' of github.com:pagefaultgames/pokerogue into pokerogue-main 2024-10-26 22:43:47 +01:00
Frederico Santos
a9a73863e8 Comment out startGame call on manifest fetch failure 2024-10-26 22:43:15 +01:00
Frederico Santos
78adade5c3
Merge pull request #4730 from pagefaultgames/beta
1.1.0 - The Halloween Update
2024-10-26 22:29:58 +01:00
Moka
22865c010a
fix oversight with save migration (#4731) 2024-10-26 22:16:37 +01:00
Madmadness65
4fb1f37baa [Sprite] Fix Berry Juice item sprite
Sprite will now be centered properly.
2024-10-26 16:13:05 -05:00
Frederico Santos
61193562f1 Updated date 2024-10-26 21:30:05 +01:00
pom-eranian
4be0214d5a
[fix] added missing rare icons for spinarak, ariados. added to icon sheet (#4729) 2024-10-26 21:09:19 +01:00
pom-eranian
39362389c7
[Sprite] October Variant Update (#4608)
* 40 Wigglytuff (base fix) @ hanniel

* 39 40 174 variant icons

* 39 40 174 - Variant Palettes

* 359 - Absol Mega Absol [Base Fixes] - @ rival_kieran

* 359 Absol Variant icons

* 359 Absol Variant palettes

* 359 Absol  [_masterlist.json]

Enabled variants for absol & mega absol

* [Sprite][Anim] 275 Shiftree- cropped ear fix - @hamez

* Honchcrow Murkrow [Base fixes]

* Murkrow Honchkrow - Icons for variant & female murkrow

* 198 430 Murkrow Honchkrow Variants [Epic Rare]

* [fix] 359 - masterlist - removed ghost entry for exp absol

* 527 528 Woobat Swoobat [Epic Rare] @ rival_kieran

base fix on  woobat back, swoobat front, back
palette files for front, back
added to masterlist
variant icons

* [fix] masterlist -removed incorrect entry

* 590 591 Foongus Amoongus @ Omniv

variant icons
variant palettes
fixes for base front and back

* 587 Emolga [Rare Epic] @ bagonganda

icons variants
front back base fix
variant palettes

* [fix] masterlist  Added missiing variants.  Added Qwuilfish variants

Qwilfish icons
variant palettes

Enabled variants for pokemon in title.
39 40  174 Jigglypff Wigglytuff Igglybuff
587 Emolga
211 Qwilfish

* 377 378 379 486 894 895 Regirock Regice Registeel Regigigas Regieleki Regidrago @greenninja757 @_vari_ @splashceles @gonfold @sphinx_sage

variant icons
variant palettes
base fixes for regigigas, regieleki & registeel
added all to masterlist

* 684 685 Swirlix Slurpuff [Rare Epic] - @ gerolau

* 682 683 - Sprizee Aromatisse [Rare Epic] - @ Koda_want_to_sleep

* 378 Regice [Base shiny + replacement] - @ Vari

* 501 502 503 6503 - Oshawott Dewott Samurott [Base Fix Rare Epic] - @Omniv @yepitscaio

* 152 153 154 - Chikorita Bayleef Meganium [Base Fix Rare Epic] - @ corsola_bandit

* 807 Zeraora [Epic Rare] - @ luckyluckylucky

* 194 195 Wooper Quagsire [Rare Epic] - @ OfficerPorkchops

cleaned up wooper's face
variant icons
added to masterlist
palette files

* 616 617 Shelmet Accelgor [Base fix, Rare, Epic] - @ Vari

shelmet base fixes
variant icons
variant palettes
added to masterlist

* 588 589 Karrablast Escavalier [Rare, Epic] - @ Vari

variant palettes
variant icons
added to masterlist

* 170 171 Chinchou Lanturn [Rare, Epic] - @ thetruegge

variant icons
variant palettes
added to masterlist

* 158 159 160 Totodile Croconaw Feraligatr [Rare, Epic] - @ Dingosig @ Ashhawk

variant icons
variant palettes
added to masterlist

* [128] Tauros [Rare Epic] - @ Bibble

variant icons
variant palettes
added to masterlist

* 509 510 Purrloin Liepard [Basefix, Rare, Epic] - @ MeganiumOpus

variant icons
variant palettes
base fix 510 liepard
added to masterlist

* 390 391 392 Chimchar Monferno Infernape [Base Fix, Rare, Epic] @ hanniel.15

base fix all
variant icons
variant palettes
added to masterlist

* [fix] masterlist erroneous value on chinchou, lanturn

* 455 Carnivine [Base Fix Rare Epic] - @ hamez

base fix for front, back
variant icons
variant palettes
added to masterlist

* 944 945 Shroodle Grafaiai [Base fix, Shiny fix, Rare, Epic] - @ Vari

* 167 168 Spinarak Ariados [Rare, Epic] - @ Thorn @ wormhood

* 676 Furfrou [BaseFix Rare Epic] - @ gerolau

* Variant removed 509 510 Purrloin Liepard

This reverts commit 90ab203708.

* 621 - Druddigon [Rare Epic] - @ Koda_want_to_sleep

variant palettes
variant icons
added to masterlist

* Fix misplaced Gen4 variant icons

* Remove misplaced Gen4 variant icons

* More icon fixes

- Shiny Milotic antenna recolour
- Shaded variant Eevees and added Partner variants
- Swapped Golbat common and rare
- Added variant Centiskorch and Gmax

* Move misclassified Gen9 icons

Also fixes a stray pixel on Fuecoco.

* 102 103 2103 Exeggcute Exeggutor [Rare. Epic] - @ clickonflareblitz

variant palettes
variant icons
added to masterlist

* 276 277 Taillow Swellow [BaseFix Rare Epic] - @ peng06

variant icons
variant palettes
base fixes on all spritesheets
added to masterlist

* [QoL] reordered key for 6713 exp

* reformat of masterlist with less whitespace

* 1012 1013 Poltchageist, Sinistcha

icons, variants, base fixes, my sanity

* 172 Pichu [basefix rare epic]

* 26 raichu [basefix rare epic]

* 25-gmax pikachu [basefix rare epic]

* 25 raichu [basefix] added missing female back

* 25-beauty-cosplay pikachu

* 25-tough-cosplay pikachu [epic rare]

* 25-smart-cosplay pikachu

* 25-cute-cosplay pikachu

* 25-cool-cosplay pikachu

* 25-partner pikachu

* 25 pikachu

* 25-cosplay pikachu

* 2026 alolan raichu  [basefix rare epic]

* 25 pikachu - corrected icon colors, shiny correct colors

* 25 other icons

* 656 657 froakie frogadier

* removed variant images included in commits for  25 26 172 2026, 1012 1013, 656 657

* [masterlist] added 25 26 172 2025 pikachu raichu pichu a-raichu

* [masterlist] added 1012 1013 poltchaageist sinistcha

* [masterlist] added 656 657 froakie frogadier [GRENINJA MISSING]

* 688 689 Binacle Barbaracle [Base Fix, Rare, Epic] - @ saltedcarriemel

replaced front static by first frame of exp
base fixes
variant palettes
variant icons
added to masterlist

* [658] ash-greninja static front variants

* 658 greninja, ash greninja [rare epic]

base fixes
animation standardized front / back
variant palettes
variant icons
added to masterlist

* [fix][icons]  torchic, combusken, blaziken gender icons

* [fix] 658 corrected color error

white on knees

* Updated variant icon sheets

* Reverted override file pushed By Mistake

WHY WAS IT THERE.

* [fix] icon sheet v1 - removed ".png" from file names

---------

Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
2024-10-26 18:06:07 +01:00
Frederico Santos
51b2a4d7fe
Something (#4728)
* [Feature] Add event-based friendship multiplier and update TrainerConfig for event modifiers

* [UI][Dev] Improve event banner placement (#4726)

* [ui] automatically place event banner and timer in the title screen

* add new event banner

* ugh

* [Refactor] Clean up TrainerConfig and remove unused timed event

---------

Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
2024-10-26 17:14:17 +01:00
Smewkie
61cf937cab
[Balance] Ferroseed HA
Ferroseed HA
2024-10-26 00:38:12 +01:00
PigeonBar
f87ac116fa
[Beta] Stop Transform giving copied moves negative fractional ppUp (#4722)
* [Beta] Stop Transform giving copied moves negative fractional `ppUp`

* Remove some bangs/etc

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-25 19:34:40 -04:00
chaosgrimmon
6418f46bf7
[Sprite] Fix transparency of pixels on Fletchinder (#4720)
* [Sprite] Front Fletchinder

* [Sprite] Back Fletchinder

* [Sprite] Shiny front Fletchinder

* [Sprite] Shiny back Fletchinder
2024-10-25 16:02:05 -07:00
Frederico Santos
a50763cd89 updating locales 2024-10-25 23:29:20 +01:00
innerthunder
414e0a5447
[Balance] Change Tyrogue to move-based evolutions (#4694) 2024-10-23 23:17:55 -07:00
Opaque02
a2419c4fc3
[Misc] Add admin for (un)linking 3rd party accounts (#4198)
* Updated admin panel to allow the concept of unlinking accounts

* Don't look too hard at this commit, nothing to see here

* Admin stuff

* Fixed linking and unlinking and updated menu options

* Undid some changes and cleaned up some code

* Updated some logic and added some comments

* Updates to admin panel logic

* Stupid promises everyone hates them and they deserver to die

* Promise stuff still

* Promises working thanks to Ydarissep on discord - pushing with debug code before it decides to stop working again

* Removed debugging code

* All discord functionality seems to be working here?? Not sure what happened but yay

* Fixed up some bugs and code

* Added registered date to the panel

* Fixed and updated some minor error message related stuff

* Minor changes

* Fixed some minor bugs, made the save related errors have error codes, and added updated icons

* Updated search field error

* Missed a couple of things to push

* Fixed linting and doc errors

* Revert dev related code and clean up dev comments

* Reverting utils

* Updating front end to match back end from Pancakes' comments

* make getFields and getInputFieldConfigs a single function of FormUiHandler

* remove outdated doc

* Apply suggestions from code review

Moka review changes

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

* Added docs

* eslint fixes

* Fixed error not showing up in certain conditions

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: MokaStitcher <millennium.stitcher@gmail.com>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: innerthunder <brandonerickson98@gmail.com>
2024-10-23 22:00:07 +02:00
Moka
a13550ec44
[Balance][ME] Various ME Balance changes (#4700)
* balance changes and updates to various MEs

* fix import to new item

* fix import to new item

* Update src/data/mystery-encounters/utils/encounter-pokemon-utils.ts

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

* Update src/phases/select-modifier-phase.ts

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

* Update src/modifier/modifier.ts

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

* Update src/modifier/modifier.ts

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

* revert item atlas changes

* eslint

* revert 'revert item atlas'

* update locale repo to latest commit

* Fix fiery fallout missing argument

* [balance] Training session ME does not update Seen/Defeated GameStats

* [balance] update Weird Dream ME maximum spawn wave

* [ME] update CombinationRequirements to allow AND or OR combinations

* refactor: CombinationPokemonRequirement `.Some()` and `Every()`

* chore: rename `orRequirements` to `requirements`

* fix: returns of `Some()` and `Any()`

* apply `Some()` / `Any()` pattern to `CombinationSceneRequirement` too

* revert 'offer you can't refuse' giving Silver Pokeball'

* Apply code review suggestions

* [me] Weird Dream: apply same old gateau logic to team in options 1 and 2

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: innerthunder <brandonerickson98@gmail.com>
2024-10-23 21:46:57 +02:00
innerthunder
c7e9eaf435
[P2] Fix binding, etc. not being removed when switching with Baton Pass (#4709)
* Fix binding, etc. not being removed when switching with Baton Pass

* New baton pass test
2024-10-23 11:24:50 -04:00
schmidtc1
958d79140c
[P2] Fixes Transform/Imposter not updating type/battle stat changes immediately; set move PP to 5 when transforming (#3462)
* Adds updateInfo to transform move/ability, mirrors Transform functionality in Imposter

* Implements functionality for reducing pp to 5 or less for each move when transforming

* Refactors to async/await pattern, adds back removed anims/sounds from last commit

* Eslint fix attempt

* Update src/data/ability.ts

per DayKev's suggestion

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

* Merge and fix conflicts

* Adds unit tests for pp-change with transform/imposter

* Updates to consistency in syntax/deprecated code

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-23 11:12:53 -04:00
NightKev
fd38ab4cb4
[P2] Missing Minior form (violet) now spawns in the wild (#4711) 2024-10-23 11:10:43 -04:00
innerthunder
03025b2674
[P2] Fix various charge move bugs (#4595)
* Add charge move classes and phase

* Integrate `MoveChargePhase` in battle phase sequence

* Fix Protean + charge move interaction

* Fix effect chance applying to semi-invulnerability

* Remove `ChargeAttr` and fix ChargeAnim loading

* Restore move history entry for charge phases

* Gravity now cancels Fly, etc. after charge turn

* Dig integration tests

* Fly integration tests

* Dive integration test + fix Dive in Harsh Sun bug

* Solar Beam integration tests + `CHARGING` tag fixes

* Fix dive test

* Electro Shot integration tests

* fix import in MoveChargePhase

* Electro Shot Multi Lens test

* Geomancy integration tests

* Fix duplicate move queue

* Update import

* Docs + Fix Meteor Beam being boosted by Sheer Force

* Fix volt absorb test

* Apply PigeonBar's suggested move-phase changes

Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>

* Make Electro Shot Sheer Force boosted again

* Apply PigeonBar's feedback pt. 2

* Apply suggestions from code review

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

* Fix mistimed/dupe showMoveText and leftover TODO

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
2024-10-23 11:08:40 -04:00
Moka
16b7194366
[P3] Fix Egg Summary not showing new abilities in blue (#4712) 2024-10-23 11:05:13 -04:00
bjparker1226
a0baf89297
[P2] Fix dark deal reducing transformed Pokemon's held item stack to 1 (#4707) 2024-10-23 11:04:37 -04:00
NightKev
1ad4f3b376
[Test] Add STATUS_ACTIVATION_OVERRIDE to overrides.ts (#4689)
This applies to Paralysis and Freeze

Added Paralysis test to demonstrate usage

- Consolidate `this.cancel()` calls
2024-10-22 23:11:02 -04:00
Blitzy
0fe57b44b5
[Balance] Add Exclusive Moves from Prior Evolutions via Memory Mushroom (#4681) 2024-10-22 18:13:10 -07:00
damocleas
96e5f2d763
Starmobile Stat Adjustments (#4704)
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-10-22 18:07:28 -07:00
Mumble
5e7f2042fc
[UI][QoL] Cursor defaults to Fight at the start of each new wave (#4666)
* cursors are dumb

* update

* fixed?

* maybe solution

* fix in!

* Possible cursor fixes

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
2024-10-22 13:05:37 -07:00
NightKev
181f59882a
[P2] Fix Early Bird (#4632)
* Fix Early Bird, add tests

* Update tsdocs for Early Bird's `AbAttr`

Rename `turnCount` to `toxicTurnCount` and
`turnsRemaining` to `sleepTurnsRemaining` in `status-effect.ts`

* Fix Toxic Orb test

* Redundant code :despair:

* Fix status override to set the number of sleep turns
2024-10-22 12:37:13 -04:00
Mason S
7066a15ceb
[Refactor] Added BattlerTagLapseType.AFTER_HIT (#3655)
* [Refactor] Added ON_GET_HIT BattlerTagLapseType

Adjusted BeakBlastChargingTag and ShellTrapTag to use new lapse type

Adjusted MoveEffectPhase to now lapse all tags with the ON_GET_HIT lapse type

* [Refactor] Added ON_GET_HIT BattlerTagLapseType

Adjusted BeakBlastChargingTag and ShellTrapTag to use new lapse type

Adjusted MoveEffectPhase to now lapse all tags with the ON_GET_HIT lapse type

* Fix nits

* Rename `ON_GET_HIT` to `AFTER_HIT`

Change `isOpponentTo` to `isOpponent`

* Fix a couple minor nits

* Remove single-use function

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-21 23:53:00 -07:00
innerthunder
c2eb9de9df
[Ability] Partially Implement Infiltrator (does not work with mist) (#4636)
* Implement Infiltrator

* Integration tests + Infiltrator is (P) again

* Fix screen tests

* Fix `hitsSubstitute`

* docs for Infiltrator attr
2024-10-21 21:41:25 -04:00
PrabbyDD
467841d167
[P2] Nightmare triggers at turn end instead of after move (#4702) 2024-10-21 21:33:41 -04:00
NightKev
f7797603a1
[P2] Fix oversight where hazards cannnot affect Pokemon that set it (#4693)
Fixes #935
2024-10-21 11:03:12 -04:00
NightKev
966b07f62b
[Misc] Shiny overrides can now force Pokemon to not be shiny (#4699)
Also fixes random shinies breaking tests
2024-10-21 11:00:58 -04:00
innerthunder
f51814467a
[P3] Fix mistimed sound effect in LearnMovePhase (#4698) 2024-10-21 10:59:23 -04:00
NightKev
b76e54fe7f
Replace duplicate code with getDoubleBattleChance() (#4690) 2024-10-21 02:29:21 -07:00