Stats boosts are now tracked using a battler tag instead of turn data

ElliottSimmonds · Jun 11, 2024 · d68a7fd · d68a7fd
1 parent 29d4e58
commit d68a7fd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
@@ -1522,6 +1522,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc
     return new DestinyBondTag(sourceMove, sourceId);
   case BattlerTagType.ICE_FACE:
     return new IceFaceTag(sourceMove);
+  case BattlerTagType.STATS_BOOSTED:
+    return new BattlerTag(tagType, BattlerTagLapseType.TURN_END, turnCount, sourceMove);
   case BattlerTagType.NONE:
   default:
     return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);

diff --git a/src/data/enums/battler-tag-type.ts b/src/data/enums/battler-tag-type.ts
@@ -58,5 +58,6 @@ export enum BattlerTagType {
   MAGNET_RISEN = "MAGNET_RISEN",
   MINIMIZED = "MINIMIZED",
   DESTINY_BOND = "DESTINY_BOND",
-  ICE_FACE = "ICE_FACE"
+  ICE_FACE = "ICE_FACE",
+  STATS_BOOSTED = "STATS_BOOSTED"
 }
diff --git a/src/data/move.ts b/src/data/move.ts
@@ -5252,10 +5252,7 @@ export class AddBattlerTagIfBoostedAttr extends AddBattlerTagAttr {
    * @returns true
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (
-      target.turnData.statsBoosted ||
-      (user.scene.currentBattle.turn === 1 && target.battleData.statsBoostedFirstTurn)
-    ) {
+    if (user.getTag(BattlerTagType.STATS_BOOSTED)) {
       super.apply(user, target, move, args);
     }
     return true;
@@ -5283,10 +5280,7 @@ export class StatusIfBoostedAttr extends MoveEffectAttr {
    * @returns true
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (
-      target.turnData.statsBoosted ||
-      (user.scene.currentBattle.turn === 1 && target.battleData.statsBoostedFirstTurn)
-    ) {
+    if (target.getTag(BattlerTagType.STATS_BOOSTED)) {
       target.trySetStatus(this.effect, true, user);
     }
     return true;

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
@@ -3811,7 +3811,6 @@ export class PokemonBattleData {
   public endured: boolean = false;
   public berriesEaten: BerryType[] = [];
   public abilitiesApplied: Abilities[] = [];
-  public statsBoostedFirstTurn: boolean = false;
 }
 
 export class PokemonBattleSummonData {
@@ -3822,7 +3821,6 @@ export class PokemonBattleSummonData {
 export class PokemonTurnData {
   public flinched: boolean = false;
   public acted: boolean = false;
-  public statsBoosted: boolean = false;
   public hitCount: integer;
   public hitsLeft: integer;
   public damageDealt: integer = 0;

diff --git a/src/phases.ts b/src/phases.ts
@@ -3198,12 +3198,7 @@ export class StatChangePhase extends PokemonPhase {
 
       for (const stat of filteredStats) {
         if (levels.value > 0 && pokemon.summonData.battleStats[stat] + levels.value <= 6) {
-          if (pokemon.turnData) {
-            pokemon.turnData.statsBoosted = true;
-          }
-          if (pokemon.scene.currentBattle.turn === 1) {
-            pokemon.battleData.statsBoostedFirstTurn = true;
-          }
+          pokemon.addTag(BattlerTagType.STATS_BOOSTED, 1);
         }
 
         pokemon.summonData.battleStats[stat] = Math.max(Math.min(pokemon.summonData.battleStats[stat] + levels.value, 6), -6);