From 18a30b83f052fbca0fca425cd80d1775117cd0a4 Mon Sep 17 00:00:00 2001
From: 1jamie <charja113@gmail.com>
Date: Sat, 19 Sep 2026 01:37:32 -0500
Subject: [PATCH] fix(game3): add partial_trap_name helper and include search
 path in lint.sh

---
 scripts/lint.sh                 | 2 ++
 src/core/game3/battle/rules.lua | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/lint.sh b/scripts/lint.sh
index 48c72ae0..78354326 100755
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -24,6 +24,8 @@ if [ "${1:-}" = "--gate" ]; then
   shift
 fi
 
+export PATH="$(pwd)/node_modules/.bin:${HOME:-}/.luarocks/bin:$PATH"
+
 if ! command -v luacheck >/dev/null 2>&1; then
   echo "luacheck not found on PATH (install: luarocks install luacheck)" >&2
   exit 2
diff --git a/src/core/game3/battle/rules.lua b/src/core/game3/battle/rules.lua
index 2b595953..50e7be0d 100644
--- a/src/core/game3/battle/rules.lua
+++ b/src/core/game3/battle/rules.lua
@@ -148,8 +148,12 @@ function Rules.partialTrap.rollTurns(rng)
   return (math.floor(n) % 4) + 3
 end
 
-function Rules.partialTrap.active()
-  return Capabilities.gen3PartialTrap
+local function partial_trap_name(moveId)
+  local ok, Moves = pcall(require, "src.core.game3.battle.moves")
+  if ok and Moves and Moves.displayName then
+    return Moves.displayName(moveId)
+  end
+  return tostring(moveId or "the attack")
 end
 
 -- pokefirered/src/battle_message.c:1263