From d1333dfb5056f03619e8a7984d0544fa51c22816 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Sun, 5 May 2024 22:50:21 +0200 Subject: re-introduce pause at end of assign hits step --- rules.js | 12 ++++++++++-- rules.ts | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/rules.js b/rules.js index 0148b58..f404289 100644 --- a/rules.js +++ b/rules.js @@ -6359,6 +6359,10 @@ function goto_defender_assign_hits() { else game.state = "assign_hits"; } +function resume_defender_assign_hits() { + set_active_defender(); + game.state = "assign_hits"; +} function end_defender_assign_hits() { game.who = NOBODY; game.battle.ahits = 0; @@ -6371,6 +6375,10 @@ function goto_attacker_assign_hits() { else game.state = "assign_hits"; } +function resume_attacker_assign_hits() { + set_active_attacker(); + game.state = "assign_hits"; +} function end_attacker_assign_hits() { game.who = NOBODY; game.battle.dhits = 0; @@ -6663,9 +6671,9 @@ function finish_action_assign_hits() { else game.battle.dhits--; if (game.active === game.battle.attacker) - goto_attacker_assign_hits(); + resume_attacker_assign_hits(); else - goto_defender_assign_hits(); + resume_defender_assign_hits(); } // === BATTLE EVENT: SWIFT MANEUVER === states.swift_maneuver_1 = { diff --git a/rules.ts b/rules.ts index 2d2848f..c0d6907 100644 --- a/rules.ts +++ b/rules.ts @@ -7499,6 +7499,11 @@ function goto_defender_assign_hits() { game.state = "assign_hits" } +function resume_defender_assign_hits() { + set_active_defender() + game.state = "assign_hits" +} + function end_defender_assign_hits() { game.who = NOBODY game.battle.ahits = 0 @@ -7513,6 +7518,11 @@ function goto_attacker_assign_hits() { game.state = "assign_hits" } +function resume_attacker_assign_hits() { + set_active_attacker() + game.state = "assign_hits" +} + function end_attacker_assign_hits() { game.who = NOBODY game.battle.dhits = 0 @@ -7828,9 +7838,9 @@ function finish_action_assign_hits() { game.battle.dhits-- if (game.active === game.battle.attacker) - goto_attacker_assign_hits() + resume_attacker_assign_hits() else - goto_defender_assign_hits() + resume_defender_assign_hits() } // === BATTLE EVENT: SWIFT MANEUVER === -- cgit v1.2.3