mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-31 12:42:22 +02:00
Events without shiny boost shouldn't give shiny charm
This commit is contained in:
parent
47c6f0b903
commit
ada67e1576
@ -29,7 +29,7 @@ export class TrainerVictoryPhase extends BattlePhase {
|
||||
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!) {
|
||||
globalScene.unshiftPhase(new ModifierRewardPhase(rewardFunc));
|
||||
}
|
||||
|
@ -12,7 +12,8 @@ import { MysteryEncounterTier } from "./enums/mystery-encounter-tier";
|
||||
|
||||
export enum EventType {
|
||||
SHINY,
|
||||
NO_TIMER_DISPLAY
|
||||
NO_TIMER_DISPLAY,
|
||||
LUCK
|
||||
}
|
||||
|
||||
interface EventBanner {
|
||||
@ -95,7 +96,7 @@ const timedEvents: TimedEvent[] = [
|
||||
},
|
||||
{
|
||||
name: "Year of the Snake",
|
||||
eventType: EventType.SHINY,
|
||||
eventType: EventType.LUCK,
|
||||
luckBoost: 1,
|
||||
startDate: new Date(Date.UTC(2025, 0, 29, 0)),
|
||||
endDate: new Date(Date.UTC(2025, 1, 3, 0)),
|
||||
@ -111,6 +112,7 @@ const timedEvents: TimedEvent[] = [
|
||||
{ species: Species.TEDDIURSA },
|
||||
{ species: Species.SEVIPER },
|
||||
{ species: Species.LUNATONE },
|
||||
{ species: Species.CHIMCHAR },
|
||||
{ species: Species.SNIVY },
|
||||
{ species: Species.DARUMAKA },
|
||||
{ species: Species.DRAMPA },
|
||||
@ -127,6 +129,7 @@ const timedEvents: TimedEvent[] = [
|
||||
Species.SEVIPER,
|
||||
Species.LUNATONE,
|
||||
Species.RAYQUAZA,
|
||||
Species.CHIMCHAR, Species.MONFERNO, Species.INFERNAPE,
|
||||
Species.SNIVY, Species.SERVINE, Species.SERPERIOR,
|
||||
Species.DARUMAKA, Species.DARMANITAN,
|
||||
Species.ZYGARDE,
|
||||
|
Loading…
Reference in New Issue
Block a user