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

Merge branch 'beta' into pr-illusion

Browse Source
This commit is contained in:
Lylian BALL 2025-01-29 19:00:37 +01:00 committed by GitHub
commit 01a6bd5ff1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/images/events/yearofthesnakeevent-de.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
public/images/events/yearofthesnakeevent-en.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/images/events/yearofthesnakeevent-es-ES.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/images/events/yearofthesnakeevent-fr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/images/events/yearofthesnakeevent-it.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/images/events/yearofthesnakeevent-ja.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/images/events/yearofthesnakeevent-ko.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/images/events/yearofthesnakeevent-pt-BR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/images/events/yearofthesnakeevent-zh-CN.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

4
src/loading-scene.ts
View File

@ -246,9 +246,9 @@ export class LoadingScene extends SceneBase {
} }
const availableLangs = [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ]; const availableLangs = [ "en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN" ];
if (lang && availableLangs.includes(lang)) { if (lang && availableLangs.includes(lang)) {
this.loadImage("winter_holidays2024-event-" + lang, "events"); this.loadImage("yearofthesnakeevent-" + lang, "events");
} else { } else {
this.loadImage("winter_holidays2024-event-en", "events"); this.loadImage("yearofthesnakeevent-en", "events");
} }
this.loadAtlas("statuses", ""); this.loadAtlas("statuses", "");

2
src/phases/trainer-victory-phase.ts
View File

@ -29,7 +29,7 @@ export class TrainerVictoryPhase extends BattlePhase {
globalScene.unshiftPhase(new ModifierRewardPhase(modifierRewardFunc)); globalScene.unshiftPhase(new ModifierRewardPhase(modifierRewardFunc));
} }
if (globalScene.eventManager.getShinyMultiplier() > 1) { //If a shiny boosting event is active if (globalScene.eventManager.isEventActive()) {
for (const rewardFunc of globalScene.currentBattle.trainer?.config.eventRewardFuncs!) { for (const rewardFunc of globalScene.currentBattle.trainer?.config.eventRewardFuncs!) {
globalScene.unshiftPhase(new ModifierRewardPhase(rewardFunc)); globalScene.unshiftPhase(new ModifierRewardPhase(rewardFunc));
} }