fix(combat): single roll to escape grapple

src/pf1e_simulator/combat.py

@@ -703,15 +703,22 @@ class CombatEngine:
     def resolve_skill(
         self, state: CombatantState, skill: str, dc: int
     ) -> SaveResult:
-        """Roll a skill check against ``dc``.
+        """Roll a skill check against ``dc``."""
 
-        """
+        roll = self._rng.d20()
+        bonus = self._skill_static_bonus(state, skill)
+        total = roll + bonus
+        # Natural 1/20 are not auto-fail/success for skills
+        success = total >= dc
+        return SaveResult(success=success, roll=roll, total=total, dc=dc)
+
+    def _skill_static_bonus(self, state: CombatantState, skill: str) -> int:
+        """Return a skill's static bonus (no d20). Shared by resolve_skill."""
         skill_spec = PREDEFINED_SKILLS.get(skill)
         if skill_spec is None:
             msg = f"Unknown skill: {skill}"
             raise ValueError(msg)
 
-        roll = self._rng.d20()
         skill_rank = state.combatant.skills.get(skill, None)
         rank = skill_rank.rank if skill_rank else 0
         # Class skill bonus
@@ -728,10 +735,7 @@ class CombatEngine:
         ability_mod = (ability_score - 10) // 2
         # Effect/condition modifiers
         mod_bonus = resolve_modifiers(self._stat_modifiers(state, skill))
-        total = roll + rank + class_bonus + ability_mod + armor_penalty + mod_bonus
-        # Natural 1/20 are not auto-fail/success for skills
-        success = total >= dc
-        return SaveResult(success=success, roll=roll, total=total, dc=dc)
+        return rank + class_bonus + ability_mod + armor_penalty + mod_bonus
 
     def _roll_initiative(self) -> list[CombatantState]:
         rolls: dict[str, tuple[int, int]] = {}
@@ -1304,7 +1308,7 @@ class CombatEngine:
     ) -> None:
         escape_cmb = self._maneuver_cmb(state)
         escape_skill = (
-            self.resolve_skill(state, "escape_artist", 0).total
+            self._skill_static_bonus(state, "escape_artist")
             if hasattr(state.combatant, "skills") and "escape_artist" in state.combatant.skills
             else 0
         )