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

Events without shiny boost shouldn't give shiny charm

Browse Source
This commit is contained in:
AJ Fontaine 2025-01-21 17:01:57 -05:00
parent 47c6f0b903
commit ada67e1576
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.isEventActive()) { if (globalScene.eventManager.getShinyMultiplier() > 1) { //If a shiny boosting event is active
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));
} }

7
src/timed-event-manager.ts
View File

@ -12,7 +12,8 @@ import { MysteryEncounterTier } from "./enums/mystery-encounter-tier";
export enum EventType { export enum EventType {
SHINY, SHINY,
NO_TIMER_DISPLAY NO_TIMER_DISPLAY,
LUCK
} }
interface EventBanner { interface EventBanner {
@ -95,7 +96,7 @@ const timedEvents: TimedEvent[] = [
}, },
{ {
name: "Year of the Snake", name: "Year of the Snake",
eventType: EventType.SHINY, eventType: EventType.LUCK,
luckBoost: 1, luckBoost: 1,
startDate: new Date(Date.UTC(2025, 0, 29, 0)), startDate: new Date(Date.UTC(2025, 0, 29, 0)),
endDate: new Date(Date.UTC(2025, 1, 3, 0)), endDate: new Date(Date.UTC(2025, 1, 3, 0)),
@ -111,6 +112,7 @@ const timedEvents: TimedEvent[] = [
{ species: Species.TEDDIURSA }, { species: Species.TEDDIURSA },
{ species: Species.SEVIPER }, { species: Species.SEVIPER },
{ species: Species.LUNATONE }, { species: Species.LUNATONE },
{ species: Species.CHIMCHAR },
{ species: Species.SNIVY }, { species: Species.SNIVY },
{ species: Species.DARUMAKA }, { species: Species.DARUMAKA },
{ species: Species.DRAMPA }, { species: Species.DRAMPA },
@ -127,6 +129,7 @@ const timedEvents: TimedEvent[] = [
Species.SEVIPER, Species.SEVIPER,
Species.LUNATONE, Species.LUNATONE,
Species.RAYQUAZA, Species.RAYQUAZA,
Species.CHIMCHAR, Species.MONFERNO, Species.INFERNAPE,
Species.SNIVY, Species.SERVINE, Species.SERPERIOR, Species.SNIVY, Species.SERVINE, Species.SERPERIOR,
Species.DARUMAKA, Species.DARMANITAN, Species.DARUMAKA, Species.DARMANITAN,
Species.ZYGARDE, Species.ZYGARDE,