From ada67e15765877c58ce5d688a9632c509d800ca0 Mon Sep 17 00:00:00 2001
From: AJ Fontaine <fontbane@gmail.com>
Date: Tue, 21 Jan 2025 17:01:57 -0500
Subject: [PATCH] Events without shiny boost shouldn't give shiny charm

---
 src/phases/trainer-victory-phase.ts | 2 +-
 src/timed-event-manager.ts          | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts
index e2617f598da..9722e9c4197 100644
--- a/src/phases/trainer-victory-phase.ts
+++ b/src/phases/trainer-victory-phase.ts
@@ -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));
       }
diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts
index 0bdafee2b5e..dd87c8209b1 100644
--- a/src/timed-event-manager.ts
+++ b/src/timed-event-manager.ts
@@ -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,