From 3b518b0d94bc0b1d0b63f6d446fe5ca1f2c59e98 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Wed, 20 Aug 2025 21:09:06 -0400 Subject: [PATCH] Reverted change to light screen DR% --- src/data/arena-tag.ts | 3 +-- test/moves/light-screen.test.ts | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index 3d8d6cce8ec..fd4b57ecaf0 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -339,8 +339,7 @@ export abstract class WeakenMoveScreenTag extends SerializableArenaTag { if (bypassed.value) { return false; } - // Screens are less effective during Double Battles - damageMultiplier.value = globalScene.currentBattle.double ? 2 / 3 : 1 / 2; + damageMultiplier.value = globalScene.currentBattle.double ? 2732 / 4096 : 0.5; return true; } } diff --git a/test/moves/light-screen.test.ts b/test/moves/light-screen.test.ts index 0dcd8bbc0ef..72028459bac 100644 --- a/test/moves/light-screen.test.ts +++ b/test/moves/light-screen.test.ts @@ -127,10 +127,8 @@ const getMockedMoveDamage = (defender: Pokemon, attacker: Pokemon, move: Move) = const multiplierHolder = new NumberHolder(1); const side = defender.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; - if (globalScene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, side)) { - if (move.getAttrs("CritOnlyAttr").length === 0) { - globalScene.arena.applyTagsForSide(ArenaTagType.LIGHT_SCREEN, side, attacker, move.category, multiplierHolder); - } + if (globalScene.arena.getTagOnSide(ArenaTagType.LIGHT_SCREEN, side) && !move.hasAttr("CritOnlyAttr")) { + globalScene.arena.applyTagsForSide(ArenaTagType.LIGHT_SCREEN, side, attacker, move.category, multiplierHolder); } return move.power * multiplierHolder.value;