From f296767321abb7b586a874726f9de1edb1ae00b7 Mon Sep 17 00:00:00 2001
From: teisuru <31881306+teisuru@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:22:48 +0100
Subject: bugfix blocked ford & automatic parley

---
 rules.js | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/rules.js b/rules.js
index 9da4c13..eff10dd 100644
--- a/rules.js
+++ b/rules.js
@@ -5748,7 +5748,7 @@ function do_influence_check() {
 	let roll = roll_die()
 	let success
 
-	if (roll === 1)
+	if (roll === 1 || rating === 6)
 		success = true
 	else if (roll === 6)
 		success = false
@@ -6597,7 +6597,6 @@ states.blocked_ford = {
 		goto_battle()
 	},
 	pass() {
-		set_active_enemy()
 		goto_exiles()
 	},
 }
@@ -8444,7 +8443,6 @@ states.defender_events = {
 	inactive: "Defender Events",
 	prompt() {
 		view.prompt = "Defender may play Events."
-
 		prompt_battle_events()
 
 		// defender only events
@@ -8497,6 +8495,11 @@ states.ravine = {
 				gen_action_lord(lord)
 			}
 		}
+		for (let lord of game.battle.reserves) {
+			if (is_enemy_lord(lord)) {
+				gen_action_lord(lord)
+			}
+		}
 	},
 	lord(lord) {
 		push_undo()
@@ -8507,7 +8510,6 @@ states.ravine = {
 	},
 }
 
-
 // === EVENT : CALTROPS ===
 
 states.caltrops = {
@@ -8744,19 +8746,6 @@ function end_for_trust_not_him() {
 	resume_battle_events()
 }
 
-// === BATTLE: RAVINE ===
-
-states.ravine = {
-	inactive: "Ravine",
-	prompt() {
-		view.prompt = "Ravine: Select an enemy lord : he is ignored Round 1"
-		view.actions.done = 1
-	},
-	done() {
-		end_defender_events()
-	},
-}
-
 // === BATTLE: FLEE ===
 
 function goto_battle_rounds() {
-- 
cgit v1.2.3