From 4fdda6328e67b25db6ff30c0f18fb7d5ffef97b9 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Mon, 24 Apr 2023 21:38:29 +0200
Subject: Fix free Assault events.

---
 events.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'events.txt')

diff --git a/events.txt b/events.txt
index b62a41d..d18e5c2 100644
--- a/events.txt
+++ b/events.txt
@@ -384,7 +384,9 @@ EVENT 29
 		piece all is_piece_in_event_space(p) && is_farc_guerrilla(p) && is_underground(p)
 			activate
 		endpiece
-		free_assault
+		if can_assault_in_space(game.vm.s)
+			free_assault
+		endif
 	endspace
 
 SHADED 29
@@ -699,9 +701,9 @@ EVENT 47
 	endif
 	current GOVT
 	prompt "All Police free Assault AUC as if Troops."
-	space all has_police(s) && has_auc_piece(s)
-		# TODO: test this
+	space all can_assault_in_space_faction(s, AUC)
 		free_assault_auc
+		# TODO transfer dropped shipments early
 	endspace
 
 SHADED 47
-- 
cgit v1.2.3