mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-26 18:22:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into magic-bounce

Browse Source
This commit is contained in:
damocleas 2025-02-11 01:31:40 -05:00 committed by GitHub
commit f5e38cb1c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 1079 additions and 3827 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2455
public/images/pokemon/335.json
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 10 KiB

10
public/images/pokemon/back/658.json
View File

@ -1,19 +1,19 @@
{ "frames": [ { "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"frame": { "x": 0, "y": 0, "w": 77, "h": 77 }, "frame": { "x": 0, "y": 0, "w": 77, "h": 65 },
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 }, "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 },
"sourceSize": { "w": 77, "h": 77 }, "sourceSize": { "w": 77, "h": 65 },
"duration": 100 "duration": 100
} }
], ],
"meta": { "meta": {
"app": "https://www.aseprite.org/", "app": "https://www.aseprite.org/",
"version": "1.3.7-x64", "version": "1.3.9.2-x64",
"format": "I8", "format": "I8",
"size": { "w": 77, "h": 77 }, "size": { "w": 77, "h": 65 },
"scale": "1" "scale": "1"
} }
} }

BIN
public/images/pokemon/back/658.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 890 B

8
public/images/pokemon/back/shiny/658.json
View File

@ -1,11 +1,11 @@
{ "frames": [ { "frames": [
{ {
"filename": "0001.png", "filename": "0001.png",
"frame": { "x": 0, "y": 0, "w": 77, "h": 77 }, "frame": { "x": 0, "y": 0, "w": 77, "h": 65 },
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 }, "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 65 },
"sourceSize": { "w": 77, "h": 77 }, "sourceSize": { "w": 77, "h": 65 },
"duration": 100 "duration": 100
} }
], ],
@ -13,7 +13,7 @@
"app": "https://www.aseprite.org/", "app": "https://www.aseprite.org/",
"version": "1.3.7-x64", "version": "1.3.7-x64",
"format": "I8", "format": "I8",
"size": { "w": 77, "h": 77 }, "size": { "w": 77, "h": 65 },
"scale": "1" "scale": "1"
} }
} }

BIN
public/images/pokemon/back/shiny/658.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 890 B

2431
public/images/pokemon/shiny/335.json
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
src/field/pokemon.ts
View File

@ -1066,6 +1066,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
globalScene.applyModifiers(PokemonBaseStatFlatModifier, this.isPlayer(), this, baseStats); globalScene.applyModifiers(PokemonBaseStatFlatModifier, this.isPlayer(), this, baseStats);
if (this.isFusion()) { if (this.isFusion()) {
const fusionBaseStats = this.getFusionSpeciesForm(true).baseStats; const fusionBaseStats = this.getFusionSpeciesForm(true).baseStats;
applyChallenges(globalScene.gameMode, ChallengeType.FLIP_STAT, this, fusionBaseStats);
for (const s of PERMANENT_STATS) { for (const s of PERMANENT_STATS) {
baseStats[s] = Math.ceil((baseStats[s] + fusionBaseStats[s]) / 2); baseStats[s] = Math.ceil((baseStats[s] + fusionBaseStats[s]) / 2);
} }