From d5fa15333f25c2d0ec5092eb21f503f7b82dfef7 Mon Sep 17 00:00:00 2001
From: Mischa Untaga <99098079+MischaU8@users.noreply.github.com>
Date: Fri, 20 Oct 2023 06:04:22 +0200
Subject: move drm and border zone fixes

---
 rules.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/rules.js b/rules.js
index 17aecca..efb4391 100644
--- a/rules.js
+++ b/rules.js
@@ -497,7 +497,8 @@ function clear_unit_dispersed(u) {
 }
 
 function move_unit(u, to) {
-	log(`>Moved U${u} to A${to}`)
+	let loc = unit_loc(u)
+	log(`>Moved U${u} from A${loc} to A${to}`)
 	set_unit_loc(u, to)
 	set_unit_box(u, OC)
 }
@@ -3240,8 +3241,9 @@ states.fln_move = {
 		let loc = unit_loc(unit)
 		push_undo()
 
-		let drm = -count_patrol_units_in_loc(loc)
-		if (is_border_crossing(loc, to)) {
+		// Note that the die roll is modified by the number of Government units on Patrol in the area moved to, not from.
+		let drm = -count_patrol_units_in_loc(to)
+		if (is_border_crossing(loc, to) && game.border_zone_active) {
 			drm += game.border_zone_drm
 		}
 		let [_result, effect] = roll_mst(drm)
@@ -4503,6 +4505,9 @@ function unit_redeployment() {
 			}
 		}
 	})
+
+	restore_air_helo_avail()
+	game.border_zone_active = false
 }
 
 function roll_coup_table(drm=0) {
@@ -4808,7 +4813,6 @@ function goto_turn_interphase() {
 
 	unit_and_area_recovery()
 	unit_redeployment()
-	restore_air_helo_avail()
 	final_psl_adjustment()
 
 	if (check_victory())
-- 
cgit v1.2.3