Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta -> Main 1.2.0 update #4897

Merged
merged 114 commits into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from 111 commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
fe7d156
Merge pull request #4754 from pagefaultgames/main
MokaStitcher Oct 28, 2024
3241332
[Ability] Implementing Friend Guard (#4718)
PrabbyDD Oct 28, 2024
1337780
[Refactor] Change attack type booster names to enum (#4725)
Fontbane Oct 28, 2024
38a6bf0
[Bug] Fix enemy faint causing Frenzy moves to mishandle paralysis (#4…
geeilhan Oct 29, 2024
fb2d3e4
[Move][Ability] Fully Implement Forest's Curse / Trick Or Treat / Mim…
frutescens Oct 29, 2024
13ff80f
Mark Last Respects as partial (#4749)
DayKev Oct 29, 2024
65269f9
[Balance] Change Bouncy Bubble's Attributes (#4757)
Blitz425 Oct 29, 2024
1cbe8b1
[P3] Fixing form name being incorrect for some evolved pokemon (#4742)
Opaque02 Oct 29, 2024
f9fe592
[TMs] Remove Sacred Sword, add Secret Power TM, fix Reflect compatibi…
Fontbane Oct 29, 2024
921d4fa
[P2] Chloroblast & Struggle should not recoil if the move failed (#4719)
DayKev Oct 29, 2024
fd1aa41
[P2] Fix AI targeting allies with status effect moves (#4717)
innerthunder Oct 29, 2024
afe6d29
[P2] Fix for Speed Boost is Activated on the Turn a Pokemon is Switch…
PrabbyDD Oct 29, 2024
15dedf0
[P2] No Exp Gained after Switching in a Pokemon as the Opponent Faint…
PrabbyDD Oct 29, 2024
b3a0ca9
[Misc] Update Donation Link (#4763)
frutescens Oct 30, 2024
5b9dfe1
[P2] Fix Own Tempo Rockruff not being able to evolve (#4762)
PigeonBar Oct 30, 2024
5755180
[Audio] Replace Graveyard BGM with Firel's custom BGM (#4765)
Madmadness65 Oct 31, 2024
abc9264
[Localization] Spanish modification form es to es-ES (#4753)
Adri1 Oct 31, 2024
684fb93
the fix (#4733)
frutescens Oct 31, 2024
8169760
[Bug] Prevent wild mons fleeing with U-turn, Flip Turn, Volt Switch (…
Fontbane Nov 2, 2024
c2d24d6
[Bug] Take weight into account when getting the tier of a modifier (#…
MokaStitcher Nov 2, 2024
80a8c65
[P2] Add "no switch-in" fail condition for Shed Tail and Baton Pass (…
innerthunder Nov 2, 2024
1659f57
[P2] Camouflage now considers Terrains first (#4761)
frutescens Nov 2, 2024
1474f8c
[Refactor] Add `options` param interface for `MoveEffectAttr` (#4710)
innerthunder Nov 2, 2024
c31657d
[Refactor] Reduced nesting in MoveEffectPhase (#3541)
ElizaAlex Nov 3, 2024
70ddc29
[Refactor] Refactor data/pokemon-species.ts (#4054)
frutescens Nov 3, 2024
f16309f
[P2] Plus, Minus, Beads/Sword of Ruin not ignorable. Shield Dust and …
frutescens Nov 3, 2024
b17b1d6
[P1] Fixing crash that can occur when failing to loading variant spri…
podarsmarty Nov 3, 2024
f0ae36d
[Ability] Implement Wimp Out and Emergency Exit (#4701)
muscode13 Nov 3, 2024
5e2dfa9
Rename `PokemonTurnData`'s `damageDealt` and `currDamageDealt` (#4784)
DayKev Nov 3, 2024
87b7122
[P2] Illuminate ignores evasion (#4781)
Tempo-anon Nov 4, 2024
af473ba
[Refactor] Clean up various methods in `battle-scene.ts` and `pokemon…
DayKev Nov 4, 2024
836b37f
[Refactor] Clean up some code related to starter select UI (#4752)
DayKev Nov 4, 2024
1619d51
[Move] Implement Fairy Lock (#4736)
muscode13 Nov 4, 2024
3f97c9e
[Ability] Implement Unburden (#4534)
muscode13 Nov 4, 2024
c3d832a
[Move] Fully Implement Round (#4783)
innerthunder Nov 4, 2024
62f9f6d
[UI] Starter Select UI no longer reloads sprite when changing nature,…
MokaStitcher Nov 4, 2024
770f388
[Refactor] Miscellaneous code cleanup (#4596)
DayKev Nov 4, 2024
3a767ed
[Refactor] Another Audio clean up (#4077)
frutescens Nov 4, 2024
618dfbd
[Refactor] Reduce nesting in doEvolution() (#4786)
torranx Nov 4, 2024
a70f086
[Beta Bug] Enemy pokemon shouldn't get unimplemented moves (#4787)
DayKev Nov 4, 2024
7a0c88e
[Refactor] Pokerogue API client (#4583)
flx-sta Nov 4, 2024
433d4b4
[P3][UI][QoL] Fix tooltips going out of screen on mobile & other impr…
MokaStitcher Nov 5, 2024
ab6d15e
[Move] Improve Future Sight & Doom Desire (still partial) (#4545)
DayKev Nov 5, 2024
1384176
[Dev] Update test save with everything unlocked (#4137)
Fontbane Nov 5, 2024
543a970
[P1][Beta] Fix FormChangePhase being broken by EvolutionPhase refacto…
PigeonBar Nov 5, 2024
88789c6
[Documentation] Flag Gulp Missile with edge case (#4800)
torranx Nov 5, 2024
6fd3ba2
[Move][Ability] Implement Commander and Order Up (#4670)
innerthunder Nov 5, 2024
198d3ce
[P2] Fixing Incorrect Freeze Dry Interaction With Soaked Wonder Guard…
geeilhan Nov 5, 2024
b79b643
[P2][ME] Fix GTS not getting proper item tier when trading items (#4802)
MokaStitcher Nov 5, 2024
eb32545
[Balance][Beta] Commander now increases double battle chance (#4803)
innerthunder Nov 5, 2024
4f73379
[Move] Implement Grudge (#4794)
frutescens Nov 6, 2024
6b7efb4
[Ability] Fully implement Synchronize (#4785)
frutescens Nov 6, 2024
9dae28f
[Misc] Adding Type, Current HP, Max HP, & Status to updateGameInfo() …
ThePsychedelicSeal Nov 6, 2024
1f6dab0
[Feature][Balance] Add critical captures, update shake probability to…
Fontbane Nov 7, 2024
4c5b836
[P2] END biome transition now properly uses seeded RNG (#4809)
frutescens Nov 7, 2024
5601bb1
Locales update
f-fsantos Nov 7, 2024
b2fdb9f
[P2] Fix Cosmoem requirng an evolution level (#4812)
Fontbane Nov 7, 2024
2b91d9d
[Dev] Remove logging for api requests outside of dev (#4804)
MokaStitcher Nov 7, 2024
aa2c794
[Balance/Bug] Boss segments properly heal (#4819)
dp0ch Nov 8, 2024
4821df6
[P1] Prevents crash from using Sketch against a lost turn (#4806)
frutescens Nov 8, 2024
625b98a
[Move][Refactor] Create `Move.getPriority` + Fully Implement Upper Ha…
innerthunder Nov 8, 2024
58d40b9
[Bug] Fixing Encore's interactions with other Move Restriction moves …
frutescens Nov 8, 2024
00f7fd4
[Refactor] Remove unnecessary re-exports (#4818)
DayKev Nov 8, 2024
de4ec5e
[Feature] [Item] Add Catching Charm item (#4811)
Fontbane Nov 9, 2024
c6cc187
[Balance] Modify potion and ether weight funcs (#4829)
Fontbane Nov 9, 2024
c54d21c
[Test] Fix flaky Wimp Out test (#4830)
DayKev Nov 9, 2024
329e43a
[P2] Removed incorrect calls to `resetBattleData` on switchout (#4828)
innerthunder Nov 9, 2024
a763cd1
[Beta][P1-3] Fix Commander implementation bugs (#4826)
innerthunder Nov 9, 2024
2bf8ace
[Beta][P2] Fix Sketch failing to sketch moves that call other moves v…
PigeonBar Nov 9, 2024
198ac24
Undo Event modifier-type.ts item table changes (#4836)
damocleas Nov 9, 2024
265b3cb
[P3] Fix visual bug with level text remaining the same when pokemon l…
paytonrog Nov 10, 2024
44a68a9
[P1] Fix crash when newly aquired Pokemon are sent in battle (#4835)
MokaStitcher Nov 10, 2024
b3a94e6
[Telemetry][Misc] Client-Side changes to log run results at the end o…
frutescens Nov 10, 2024
2968059
[P1] Transform and Imposter will now fail when either Pokemon is fuse…
DayKev Nov 10, 2024
63ffab0
[Beta][P2] Several Unburden bug fixes (#4820)
PigeonBar Nov 10, 2024
f2a2281
[Sprite] Implement female icon assets for Meganium and Doduo + Torchi…
chaosgrimmon Nov 10, 2024
efa9f11
[Beta][P3] Fix shiny Pokemon being displayed before shiny colours are…
PigeonBar Nov 11, 2024
6799594
[Test] Update Zen Mode test (#4845)
DayKev Nov 11, 2024
6feb634
[P3] Added `failIfSingleBattle` condtion to Doubles-only moves and di…
frutescens Nov 11, 2024
e5e3926
[beta] Fix MovePhase not ending properly. (#4848)
frutescens Nov 11, 2024
cebedd2
[Balance] Rework Multi-Lens (#4831)
innerthunder Nov 11, 2024
4802f51
[P1][Beta] Fix softlock when losing a run on local build (#4846)
PigeonBar Nov 11, 2024
8e26db9
[Balance][Beta] Revert Spread Move Restriction on Multi-Lens (#4851)
innerthunder Nov 12, 2024
6f3fd0f
[Beta][P3] Fix failed charge moves not displaying failed text (#4853)
PigeonBar Nov 12, 2024
b6b756a
[P2] Fix issue with Pokemon not evolving until the next floor and cle…
DayKev Nov 12, 2024
e45cb42
[Balance] Disable King's Rock for moves that can already flinch (#4860)
innerthunder Nov 13, 2024
162eea5
Fixed wild form changes messages, and form-changed Cramorant crashing…
muscode13 Nov 13, 2024
0c521bb
[Move] Implement Freeze Dry type-changed interactions (#4840)
geeilhan Nov 13, 2024
d0d9eb7
Set the IVs of default starters to 15. (#4861)
frutescens Nov 14, 2024
640ac23
[Dev] Add overrides for alternating between single and double battles…
PigeonBar Nov 14, 2024
58912db
[P2] Telekinesis now sets FloatingTag to 3 turns instead of 5 turns (…
frutescens Nov 14, 2024
f778bd5
Prevent crash from null dexData attributes (#4871)
MokaStitcher Nov 14, 2024
b1138c1
[P2][Beta] Freeze-dry Re-implementation (#4874)
PigeonBar Nov 15, 2024
6dec84e
[Balance] No more double 50x bosses in Endless + cleaning up RNG (#4862)
frutescens Nov 15, 2024
8326e35
Remove `.edgeCase()` from fully implemented moves (#4876)
DayKev Nov 15, 2024
9273b49
[Beta][P1] Fix crash when resetting Commanded Dondozo before Trainer …
innerthunder Nov 15, 2024
ef7d860
[Balance] Remove from trainers: Pika/Eevee forms before 30, BB Grenin…
Fontbane Nov 15, 2024
5ca1fd5
[Sprite] Set default fps to 10 instead of 12 on pokemon animations (#…
Nov 15, 2024
eb3c0d7
[P2] Lunar Blessing / Jungle Healing now heal Freeze (#4877)
frutescens Nov 15, 2024
c535e92
[Beta][QoL] Improved cursor memory for target selection in Doubles (#…
frutescens Nov 15, 2024
5e7d44a
[Balance] Fix Liquidation, Double-Edge, Body Press compatibility (#4879)
Fontbane Nov 15, 2024
413f2b8
[Balance] Increase Gimmighoul's evo counter more with Big Nugget/Reli…
Fontbane Nov 15, 2024
360a897
[Balance] Endure Tokens only endure one hit (#4875)
innerthunder Nov 15, 2024
77b94bf
bump version to 1.2.0 and update locale submodule to latest commit (#…
MokaStitcher Nov 16, 2024
4aff2ff
[Dev] Sessions will now sync with the server at the start of every 5 …
frutescens Nov 16, 2024
c22b48f
[P1] Fix System Data Conversion Failure 3 (#4866)
xsn34kzx Nov 16, 2024
c2afac8
[Bug] Moved code preventing MBH's transfer to post modifier generatio…
frutescens Nov 16, 2024
7dc4210
[Bug] fix training session encounter not applying nature correctly (#…
dp0ch Nov 16, 2024
ae8efee
[UI] Make ME text legible when using the legacy UI theme (#4847)
MokaStitcher Nov 16, 2024
07f0887
[Balance] Multi Lens damage reduction on fixed-damage moves (#4896)
PigeonBar Nov 17, 2024
1867ac4
[Dev] Minor Version Migration Tweaks (#4727)
xsn34kzx Nov 17, 2024
6b58d51
Changed conditional to actually consider the wave index. (#4899)
frutescens Nov 17, 2024
e825e30
[Test] Update wimp out test and comment (#4900)
frutescens Nov 17, 2024
33d8db7
[P1] Fix crash caused by removing arena tags on a new catch (#4888)
MokaStitcher Nov 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ declare global {
*
* To set up your own server in a test see `game_data.test.ts`
*/
var i18nServer: SetupServerApi;
var server: SetupServerApi;
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pokemon-rogue-battle",
"private": true,
"version": "1.1.6",
"version": "1.2.0",
"type": "module",
"scripts": {
"start": "vite",
Expand Down
Binary file modified public/audio/bgm/graveyard.mp3
Binary file not shown.
Binary file modified public/images/items.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/items/catching_charm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/2/154-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/2/154s-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/255-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/255s-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/256-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/256s-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/257-f-mega.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/257-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/257s-f-mega.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/pokemon/icons/3/257s-f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 84 additions & 0 deletions public/images/pokemon_icons_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -1647,6 +1647,27 @@
"h": 25
}
},
{
"filename": "85-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 5,
"y": 3,
"w": 29,
"h": 25
},
"frame": {
"x": 55,
"y": 270,
"w": 29,
"h": 25
}
},
{
"filename": "22s",
"rotated": false,
Expand Down Expand Up @@ -1731,6 +1752,27 @@
"h": 25
}
},
{
"filename": "85s-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 5,
"y": 3,
"w": 29,
"h": 25
},
"frame": {
"x": 56,
"y": 317,
"w": 29,
"h": 25
}
},
{
"filename": "9s",
"rotated": false,
Expand Down Expand Up @@ -6456,6 +6498,27 @@
"h": 18
}
},
{
"filename": "84-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 9,
"y": 10,
"w": 21,
"h": 18
},
"frame": {
"x": 98,
"y": 712,
"w": 21,
"h": 18
}
},
{
"filename": "107",
"rotated": false,
Expand Down Expand Up @@ -6519,6 +6582,27 @@
"h": 18
}
},
{
"filename": "84s-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 9,
"y": 10,
"w": 21,
"h": 18
},
"frame": {
"x": 96,
"y": 770,
"w": 21,
"h": 18
}
},
{
"filename": "88",
"rotated": false,
Expand Down
42 changes: 42 additions & 0 deletions public/images/pokemon_icons_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,27 @@
"h": 27
}
},
{
"filename": "154-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 8,
"y": 1,
"w": 23,
"h": 27
},
"frame": {
"x": 29,
"y": 147,
"w": 23,
"h": 27
}
},
{
"filename": "154s",
"rotated": false,
Expand All @@ -807,6 +828,27 @@
"h": 27
}
},
{
"filename": "154s-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 8,
"y": 1,
"w": 23,
"h": 27
},
"frame": {
"x": 29,
"y": 174,
"w": 23,
"h": 27
}
},
{
"filename": "229-mega",
"rotated": false,
Expand Down
126 changes: 126 additions & 0 deletions public/images/pokemon_icons_3.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,27 @@
"h": 27
}
},
{
"filename": "257-f-mega",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 4,
"y": 2,
"w": 32,
"h": 27
},
"frame": {
"x": 0,
"y": 79,
"w": 32,
"h": 27
}
},
{
"filename": "257s-mega",
"rotated": false,
Expand All @@ -219,6 +240,27 @@
"h": 27
}
},
{
"filename": "257s-f-mega",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 4,
"y": 2,
"w": 32,
"h": 27
},
"frame": {
"x": 0,
"y": 106,
"w": 32,
"h": 27
}
},
{
"filename": "323-mega",
"rotated": false,
Expand Down Expand Up @@ -1248,6 +1290,27 @@
"h": 26
}
},
{
"filename": "257-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 7,
"y": 2,
"w": 25,
"h": 26
},
"frame": {
"x": 28,
"y": 556,
"w": 25,
"h": 26
}
},
{
"filename": "257s",
"rotated": false,
Expand All @@ -1269,6 +1332,27 @@
"h": 26
}
},
{
"filename": "257s-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 7,
"y": 2,
"w": 25,
"h": 26
},
"frame": {
"x": 28,
"y": 582,
"w": 25,
"h": 26
}
},
{
"filename": "359-mega",
"rotated": false,
Expand Down Expand Up @@ -1605,6 +1689,27 @@
"h": 25
}
},
{
"filename": "256-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 8,
"y": 3,
"w": 23,
"h": 25
},
"frame": {
"x": 98,
"y": 72,
"w": 23,
"h": 25
}
},
{
"filename": "282s-mega",
"rotated": false,
Expand Down Expand Up @@ -5553,6 +5658,27 @@
"h": 19
}
},
{
"filename": "255-f",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 40,
"h": 30
},
"spriteSourceSize": {
"x": 13,
"y": 9,
"w": 13,
"h": 19
},
"frame": {
"x": 204,
"y": 342,
"w": 13,
"h": 19
}
},
{
"filename": "307s",
"rotated": false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"textures": [
{
"image": "statuses_es.png",
"image": "statuses_es-ES.png",
"format": "RGBA8888",
"size": {
"w": 22,
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"textures": [
{
"image": "types_es.png",
"image": "types_es-ES.png",
"format": "RGBA8888",
"size": {
"w": 32,
Expand Down
File renamed without changes
2 changes: 1 addition & 1 deletion public/locales
Submodule locales updated 231 files
Loading
Loading