From 10f38ec5aac278113f1c91e5dd0a405931828f59 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Sun, 23 Jun 2024 01:31:12 +0200
Subject: fix edge case with georges vaysset when commune has no cards in hand

---
 events.txt | 10 +++++++---
 rules.js   |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/events.txt b/events.txt
index 528f726..7be3fff 100644
--- a/events.txt
+++ b/events.txt
@@ -421,10 +421,14 @@ CARD 60 - Sapper Tactics
 	remove_disc (where_present(ANY))
 
 CARD 61 - Georges Vaysset
-	asm clear_undo()
 	asm log("Commune hand:")
-	asm { for (let c of game.red_hand) logi("C" + c) }
-	goto "georges_vaysset"
+	if (game.red_hand.length > 0)
+		asm clear_undo()
+		asm { for (let c of game.red_hand) logi("C" + c) }
+		goto "georges_vaysset"
+	else
+		asm { logi("Empty") }
+	endif
 
 CARD 62 - Colonne Vendôme
 	# must have initiative
diff --git a/rules.js b/rules.js
index aeecf6f..de5f33e 100644
--- a/rules.js
+++ b/rules.js
@@ -4519,10 +4519,14 @@ CODE[60] = [ // Sapper Tactics
 ]
 
 CODE[61] = [ // Georges Vaysset
-	[ vm_asm, ()=>clear_undo() ],
 	[ vm_asm, ()=>log("Commune hand:") ],
+	[ vm_if, ()=>(game.red_hand.length > 0) ],
+	[ vm_asm, ()=>clear_undo() ],
 	[ vm_asm, ()=>{ for (let c of game.red_hand) logi("C" + c) } ],
 	[ vm_goto, "georges_vaysset" ],
+	[ vm_else ],
+	[ vm_asm, ()=>{ logi("Empty") } ],
+	[ vm_endif ],
 	[ vm_return ],
 ]
 
-- 
cgit v1.2.3