From 5463d7b859d7bf704c282a019fdf503c228cdce6 Mon Sep 17 00:00:00 2001
From: Luc <lucrfd@gmail.com>
Date: Thu, 18 Apr 2024 19:37:35 -0400
Subject: [PATCH] prevented stench from stacking with flinching moves

---
 src/data/ability.ts | 60 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 0e06a28e394..5e384d46fef 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -9,7 +9,7 @@ import { BattlerTag } from "./battler-tags";
 import { BattlerTagType } from "./enums/battler-tag-type";
 import { StatusEffect, getStatusEffectDescriptor, getStatusEffectHealText } from "./status-effect";
 import { Gender } from "./gender";
-import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, RecoilAttr, StatusMoveTypeImmunityAttr, allMoves } from "./move";
+import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, RecoilAttr, StatusMoveTypeImmunityAttr, FlinchAttr, allMoves } from "./move";
 import { ArenaTagType } from "./enums/arena-tag-type";
 import { Stat } from "./pokemon-stat";
 import { PokemonHeldItemModifier } from "../modifier/modifier";
@@ -880,6 +880,61 @@ export class PostAttackApplyStatusEffectAbAttr extends PostAttackAbAttr {
   }
 }
 
+export class PostAttackApplyBattlerTagAbAttr extends PostAttackAbAttr {
+  private contactRequired: boolean;
+  private chance: integer;
+  private effects: BattlerTagType[];
+
+  constructor(contactRequired: boolean, chance: integer, ...effects: BattlerTagType[]) {
+    super();
+
+    this.contactRequired = contactRequired;
+    this.chance = chance;
+    this.effects = effects;
+  }
+
+  applyPostAttack(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
+    if (pokemon != attacker && (!this.contactRequired || move.getMove().checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance && !pokemon.status) {
+      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)];
+
+
+      return attacker.addTag(effect);
+    }
+
+    return false;
+  }
+}
+
+export class StenchAbAttr extends PostAttackAbAttr {
+  private contactRequired: boolean;
+  private chance: integer;
+  private effects: BattlerTagType[];
+
+  constructor(contactRequired: boolean, chance: integer, ...effects: BattlerTagType[]) {
+    super();
+
+    this.contactRequired = contactRequired;
+    this.chance = chance;
+    this.effects = effects;
+  }
+
+  applyPostAttack(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
+    if (pokemon != attacker && (!this.contactRequired || move.getMove().checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) && pokemon.randSeedInt(100) < this.chance && !pokemon.status) {
+      const effect = this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randSeedInt(this.effects.length)];
+
+
+      const flinchAttr = move.getMove().findAttr(attr => attr instanceof FlinchAttr);
+      if (!flinchAttr) 
+        return attacker.addTag(effect);
+      
+
+    }
+
+    return false;
+  }
+}
+
+
 export class PostAttackContactApplyStatusEffectAbAttr extends PostAttackApplyStatusEffectAbAttr {
   constructor(chance: integer, ...effects: StatusEffect[]) {
     super(true, chance, ...effects);
@@ -2152,7 +2207,8 @@ export const allAbilities = [ new Ability(Abilities.NONE, "-", "", 3) ];
 
 export function initAbilities() {
   allAbilities.push(
-    new Ability(Abilities.STENCH, "Stench (N)", "By releasing stench when attacking, this Pokémon may cause the target to flinch.", 3),
+    new Ability(Abilities.STENCH, "Stench", "By releasing stench when attacking, this Pokémon may cause the target to flinch.", 3)
+      .attr(StenchAbAttr, false, 10, BattlerTagType.FLINCHED),
     new Ability(Abilities.DRIZZLE, "Drizzle", "The Pokémon makes it rain when it enters a battle.", 3)
       .attr(PostSummonWeatherChangeAbAttr, WeatherType.RAIN)
       .attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.RAIN),