Obedient ending

1 files changed, 10 insertions, 5 deletions

diff --git a/rules.js b/rules.js
index fac3f06..0c56a14 100644
--- a/rules.js
+++ b/rules.js
@@ -4567,6 +4567,7 @@ function goto_rebel_or_obedient(s) {
 }
 
 states.rebel_or_obedient = {
+	inactive: "Obedient or Rebelling units",
 	prompt() {
 		event_prompt(`Obedient or Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`)
 
@@ -4575,20 +4576,24 @@ states.rebel_or_obedient = {
 	},
 	obedient() {
 		push_undo()
-		vm_next()
+		end_rebel_or_obedient()
 	},
 	rebelling() {
 		push_undo()
 		let p = find_piece(game.decree.where, game.current, ELITE)
 		to_rebel(p)
 		log(`A ${piece_name(p)} in S${game.decree.where} to Rebel.`)
-		if (game.vm)
-			vm_next()
-		else
-			game.state = "conspire"
+		end_rebel_or_obedient()
 	}
 }
 
+function end_rebel_or_obedient() {
+	if (game.vm && game.vm.ip)
+		vm_next()
+	else
+		game.state = "conspire"
+}
+
 // VM: GAIN_CAVALRY
 
 function vm_gain_cavalry() {