Gen6+ Transform should also remove Focus Energy if necessary (smogon#…

…6637)
kirliavc · May 1, 2020 · 544417e · 544417e
1 parent c4dd88a
commit 544417e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/sim/pokemon.ts b/sim/pokemon.ts
@@ -1098,8 +1098,16 @@ export class Pokemon {
 		for (boostName in pokemon.boosts) {
 			this.boosts[boostName] = pokemon.boosts[boostName]!;
 		}
-		if (this.battle.gen >= 6 && pokemon.volatiles['focusenergy']) this.addVolatile('focusenergy');
-		if (pokemon.volatiles['laserfocus']) this.addVolatile('laserfocus');
+		if (this.battle.gen >= 6) {
+			const volatilesToCopy = ['focusenergy', 'laserfocus'];
+			for (const volatile of volatilesToCopy) {
+				if (pokemon.volatiles[volatile]) {
+					this.addVolatile(volatile);
+				} else {
+					this.removeVolatile(volatile);
+				}
+			}
+		}
 		if (effect) {
 			this.battle.add('-transform', this, pokemon, '[from] ' + effect.fullname);
 		} else {