From ca8a3019c9ee038131da2cff987686405f01bbf8 Mon Sep 17 00:00:00 2001
From: innerthunder <brandonerickson98@gmail.com>
Date: Tue, 22 Oct 2024 02:31:28 -0700
Subject: [PATCH] Apply PigeonBar's feedback pt. 2

---
 src/data/ability.ts      | 4 +++-
 src/phases/move-phase.ts | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 336cd7357bd..ef68c3c341b 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -1139,7 +1139,9 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
   apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
     // Disable showAbility during getTargetBenefitScore
     this.showAbility = args[4];
-    if ((args[0] as Utils.NumberHolder).value <= 0 || (args[1] as Move).id === Moves.ORDER_UP) {
+
+    const exceptMoves = [ Moves.ORDER_UP, Moves.ELECTRO_SHOT ];
+    if ((args[0] as Utils.NumberHolder).value <= 0 || exceptMoves.includes((args[1] as Move).id)) {
       return false;
     }
 
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index 32c45998c30..6970aecd079 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -313,6 +313,8 @@ export class MovePhase extends BattlePhase {
     const move = this.move.getMove();
     const targets = this.getActiveTargetPokemon();
 
+    this.showMoveText();
+
     if (move.applyConditions(this.pokemon, targets[0], move)) {
       // Protean and Libero apply on the charging turn of charge moves
       applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, this.move.getMove());