Stay eligible

1 files changed, 58 insertions, 0 deletions

diff --git a/rules.js b/rules.js
index 8a230f5..286059e 100644
--- a/rules.js
+++ b/rules.js
@@ -217,6 +217,7 @@ exports.setup = function (seed, scenario, _options) {
 		current: 0,
 		state: null,
 		succ: 0,
+		marked: 0,
 		cylinder: [ ELIGIBLE, ELIGIBLE, ELIGIBLE ],
 		resources: [ 12, 6, 7 ],
 		vp: [ 18, 0, 0 ],
@@ -359,6 +360,7 @@ function goto_card() {
 		adjust_eligibility(DS)
 		adjust_eligibility(BK)
 		adjust_eligibility(VE)
+		game.marked = 0
 		resume_event_card()
 	}
 }
@@ -425,6 +427,9 @@ function adjust_eligibility(faction) {
 		game.cylinder[faction] = ELIGIBLE
 	else if (game.cylinder[faction] !== ELIGIBLE)
 		game.cylinder[faction] = INELIGIBLE
+
+	if (game.marked & (16 << faction))
+		game.cylinder[faction] = ELIGIBLE
 }
 
 function goto_pass() {
@@ -4176,6 +4181,12 @@ function vm_set_space() {
 	vm_next()
 }
 
+function vm_stay_eligible() {
+	log("Marked " + faction_name[game.current] + " Eligible.")
+	game.marked |= (16 << game.current)
+	vm_next()
+}
+
 // VM: PIECE ITERATOR
 
 function vm_piece() {
@@ -5060,6 +5071,7 @@ const CODE = []
 
 // EVENT 1
 CODE[1 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_prompt, "Move all Governors to Provinces adjacent to Delhi." ],
 	[ vm_piece, false, 999, 999, (p,s)=>(is_governor(p) && !set_has(SPACES[S_DELHI].adjacent, piece_space(p))) ],
@@ -5072,6 +5084,7 @@ CODE[1 * 2 + 0] = [
 
 // SHADED 1
 CODE[1 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Select a Space to move in Units and Attack for free." ],
 	[ vm_space, true, 1, 1, (s)=>s ],
@@ -5088,6 +5101,7 @@ CODE[1 * 2 + 1] = [
 
 // EVENT 2
 CODE[2 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_prompt, "Remove up to 2 Delhi Sultanate Units in both Mountain Passes and Punjab." ],
 	[ vm_space, true, 2, 2, (s)=>((s === S_MOUNTAIN_PASSES || s === S_PUNJAB) && has_ds_unit(s)) ],
 	[ vm_piece, false, 2, 2, (p,s)=>is_ds_unit(p) && is_piece_in_event_space(p) ],
@@ -5099,6 +5113,7 @@ CODE[2 * 2 + 0] = [
 
 // SHADED 2
 CODE[2 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Attack for free in Mountain Passes or Punjab" ],
 	[ vm_space, true, 1, 1, (s)=>((s === S_MOUNTAIN_PASSES || s === S_PUNJAB) && has_ds_unit(s) && has_piece(s, MI, TROOPS)) ],
@@ -5146,6 +5161,7 @@ CODE[3 * 2 + 1] = [
 
 // EVENT 4
 CODE[4 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_prompt, ()=>`Replace 1 Governor with an Obedient or Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.` ],
 	[ vm_piece, false, 1, 1, (p,s)=>is_governor(p) ],
@@ -5159,6 +5175,7 @@ CODE[4 * 2 + 0] = [
 
 // SHADED 4
 CODE[4 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Govern, without location requirements." ],
 	[ vm_govern ],
@@ -5167,6 +5184,7 @@ CODE[4 * 2 + 1] = [
 
 // EVENT 5
 CODE[5 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_prompt, ()=>`Replace up to 3 Delhi Sultanate Units with Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.` ],
 	[ vm_piece, true, 0, 3, (p,s)=>(is_adjacent_to_city(C_CHITTOR, piece_space(p)) && can_place_piece(piece_space(p), game.current, ELITE) && is_ds_unit(p)) ],
@@ -5184,6 +5202,7 @@ CODE[5 * 2 + 0] = [
 
 // SHADED 5
 CODE[5 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Replace up to 3 opposing Units adjacent to Chittor." ],
 	[ vm_piece, true, 0, 3, (p,s)=>(is_adjacent_to_city(C_CHITTOR, piece_space(p)) && can_place_piece(piece_space(p), DS, TROOPS) && is_enemy_piece(p)) ],
@@ -5201,6 +5220,7 @@ CODE[5 * 2 + 1] = [
 
 // EVENT 6
 CODE[6 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_prompt, "Select a Province adjacent to Warangal to remove a Tributary marker." ],
 	[ vm_space, true, 0, 1, (s)=>(is_adjacent_to_city(C_WARANGAL, s)) ],
@@ -5213,6 +5233,7 @@ CODE[6 * 2 + 0] = [
 
 // SHADED 6
 CODE[6 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Select four contiguous spaces, finishing adjacent to Warangal" ],
 	[ vm_shaded_6 ],
@@ -5222,6 +5243,7 @@ CODE[6 * 2 + 1] = [
 
 // EVENT 7
 CODE[7 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_prompt, ()=>`Place up to 2 ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}s in Tamilakam.` ],
 	[ vm_space, true, 1, 1, (s)=>(s === S_TAMILAKAM) ],
@@ -5233,6 +5255,7 @@ CODE[7 * 2 + 0] = [
 
 // SHADED 7
 CODE[7 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, ()=>`Place up to 4 Troops and a Governor in Tamilakam.` ],
 	[ vm_space, true, 1, 1, (s)=>(s === S_TAMILAKAM) ],
@@ -5297,6 +5320,7 @@ CODE[9 * 2 + 1] = [
 
 // EVENT 10
 CODE[10 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_prompt, "Move up to 4 Delhi Sultanate Units into adjacent Provinces." ],
 	[ vm_piece, true, 0, 4, (p,s)=>is_ds_unit(p) ],
 	[ vm_prompt, "Move Delhi Sultanate Unit into an adjacent space." ],
@@ -5310,6 +5334,7 @@ CODE[10 * 2 + 0] = [
 
 // SHADED 10
 CODE[10 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Move any Qasbah to Spaces containing Governors." ],
 	[ vm_piece, false, 0, 999, (p,s)=>is_qasbah(p) ],
@@ -5326,6 +5351,7 @@ CODE[10 * 2 + 1] = [
 
 // EVENT 11
 CODE[11 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_prompt, "Place up to two Mongol Invaders in each of Mtn Passes and Punjab." ],
 	[ vm_space, true, 0, 2, (s)=>(s === S_PUNJAB || s === S_MOUNTAIN_PASSES) ],
 	[ vm_place, false, 1, 2, MI, TROOPS ],
@@ -5335,6 +5361,7 @@ CODE[11 * 2 + 0] = [
 
 // SHADED 11
 CODE[11 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Remove 4 Mongol Invaders." ],
 	[ vm_piece, false, 4, 4, (p,s)=>is_mongol_invader(p) ],
@@ -5446,6 +5473,7 @@ CODE[14 * 2 + 1] = [
 
 // EVENT 15
 CODE[15 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_prompt, "Replace Governors with Rebelling Amirs in Provinces adjacent to Devagiri." ],
 	[ vm_piece, false, 0, 999, (p,s)=>is_adjacent_to_city(C_DEVAGIRI, piece_space(p)) && can_place_piece(piece_space(p), BK, ELITE)  && is_governor(p) ],
 	[ vm_set_piece_space ],
@@ -5463,6 +5491,7 @@ CODE[15 * 2 + 0] = [
 
 // SHADED 15
 CODE[15 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_prompt, "Replace an Amir with a Governor and place a Tributary marker in a Province adjacent to Devagiri." ],
 	[ vm_space, true, 1, 1, (s)=>is_adjacent_to_city(C_DEVAGIRI, s) && can_place_piece(s, DS, ELITE) && !is_tributary(s) ],
 	[ vm_asm, ()=>game.vm.p = find_piece(game.vm.s, BK, ELITE) ],
@@ -5475,6 +5504,7 @@ CODE[15 * 2 + 1] = [
 
 // EVENT 16
 CODE[16 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, BK ],
 	[ vm_asm, ()=>game.vm.count = 0 ],
 	[ vm_repeat, 3 ],
@@ -5493,6 +5523,7 @@ CODE[16 * 2 + 0] = [
 
 // SHADED 16
 CODE[16 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, [DS, VE] ],
 	[ vm_if, ()=>game.current === DS ],
 	[ vm_prompt, "Free March into a Province with a Fort, then remove the Fort." ],
@@ -5542,6 +5573,7 @@ CODE[17 * 2 + 1] = [
 
 // EVENT 18
 CODE[18 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_if, ()=>n_province_with_both_rebels() > 0 ],
 	[ vm_repeat, ()=>(n_province_with_both_rebels()) ],
 	[ vm_add_influence, BK ],
@@ -5554,6 +5586,7 @@ CODE[18 * 2 + 0] = [
 
 // SHADED 18
 CODE[18 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, [DS, VE] ],
 	[ vm_prompt, ()=>`Replace an Amir with a ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.` ],
 	[ vm_piece, false, 0, 1, (p,s)=>is_amir(p) && can_place_piece(s, game.current, ELITE) && is_piece_on_map(p) ],
@@ -5625,6 +5658,7 @@ CODE[20 * 2 + 1] = [
 
 // EVENT 21
 CODE[21 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_prompt, "Move any Troops from Gondwana and Madhyadesh to Delhi." ],
 	[ vm_move_to, S_DELHI, (p,s)=>(is_troop(p) && (piece_space(p) === S_GONDWANA || piece_space(p) === S_MADHYADESH)) ],
@@ -5633,6 +5667,7 @@ CODE[21 * 2 + 0] = [
 
 // SHADED 21
 CODE[21 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_campaign ],
 	[ vm_prompt, "Govern, Attack or Demande Obedience in selected Province." ],
@@ -5644,6 +5679,7 @@ CODE[21 * 2 + 1] = [
 
 // EVENT 22
 CODE[22 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_prompt, ()=>`Build in any province with a ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.` ],
 	[ vm_space, true, 1, 1, (s)=>can_build_in_space(s) ],
@@ -5654,6 +5690,7 @@ CODE[22 * 2 + 0] = [
 
 // SHADED 22
 CODE[22 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Place 1 Troops in one space." ],
 	[ vm_space, true, 0, 1, (s)=>can_place_piece(s, DS, TROOPS) ],
@@ -5704,6 +5741,7 @@ CODE[23 * 2 + 1] = [
 
 // EVENT 24
 CODE[24 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, VE ],
 	[ vm_prompt, "Free Migrate in up to 2 Provinces." ],
 	[ vm_space, true, 0, 2, (s)=>can_migrate_in_space(s) ],
@@ -5723,6 +5761,7 @@ CODE[24 * 2 + 0] = [
 
 // SHADED 24
 CODE[24 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, [DS, BK] ],
 	[ vm_prompt, "Place up to 2 Units in each Province with a Temple." ],
 	[ vm_space, true, 0, 999, (s)=>has_temple(s) ],
@@ -5733,6 +5772,7 @@ CODE[24 * 2 + 1] = [
 
 // EVENT 25
 CODE[25 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_event_25 ],
 	[ vm_return ],
@@ -5740,6 +5780,7 @@ CODE[25 * 2 + 0] = [
 
 // SHADED 25
 CODE[25 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Place up to 2 Troops in 3 Provinces adjance to Goa or Warangal." ],
 	[ vm_space, true, 0, 3, (s)=>(is_adjacent_to_city(C_GOA, s) || is_adjacent_to_city(C_WARANGAL, s)) ],
@@ -5755,6 +5796,7 @@ CODE[25 * 2 + 1] = [
 
 // EVENT 26
 CODE[26 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_log, "NOT IMPLEMENTED" ],
 	[ vm_return ],
 ]
@@ -5793,6 +5835,7 @@ CODE[27 * 2 + 1] = [
 
 // EVENT 28
 CODE[28 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_add_influence, BK ],
 	[ vm_remove_influence, VE ],
 	[ vm_current, BK ],
@@ -5810,6 +5853,7 @@ CODE[28 * 2 + 0] = [
 
 // SHADED 28
 CODE[28 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, [DS, VE] ],
 	[ vm_if, ()=>(game.current === DS) ],
 	[ vm_prompt, "In a space with Bahmani presence, you may add 2 Troops and free Attack without defenders." ],
@@ -5829,6 +5873,7 @@ CODE[28 * 2 + 1] = [
 
 // EVENT 29
 CODE[29 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, BK ],
 	[ vm_gain_cavalry, ()=>3 ],
 	[ vm_prompt, "Execute a free Limited Attack." ],
@@ -5840,6 +5885,7 @@ CODE[29 * 2 + 0] = [
 
 // SHADED 29
 CODE[29 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_shaded_29 ],
 	[ vm_prompt, "Execute a free Limited Attack." ],
 	[ vm_space, true, 1, 1, (s)=>(can_attack_in_space(s)) ],
@@ -5850,6 +5896,7 @@ CODE[29 * 2 + 1] = [
 
 // EVENT 30
 CODE[30 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, BK ],
 	[ vm_prompt, "Free Attack in each Province with a fort, without defenders." ],
 	[ vm_space, true, 0, 5, (s)=>(has_fort(s) && can_attack_in_space(s)) ],
@@ -5860,6 +5907,7 @@ CODE[30 * 2 + 0] = [
 
 // SHADED 30
 CODE[30 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_prompt, "Free limited Attak, without defenders." ],
 	[ vm_space, true, 1, 1, (s)=>(can_attack_in_space(s)) ],
 	[ vm_free_attack ],
@@ -5902,6 +5950,7 @@ CODE[31 * 2 + 1] = [
 
 // EVENT 32
 CODE[32 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_add_influence, ()=>(game.current) ],
 	[ vm_remove_influence, ()=>(other_rebel_faction(game.current)) ],
@@ -5917,6 +5966,7 @@ CODE[32 * 2 + 0] = [
 
 // SHADED 32
 CODE[32 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_remove_influence, BK ],
 	[ vm_remove_influence, VE ],
 	[ vm_return ],
@@ -5924,6 +5974,7 @@ CODE[32 * 2 + 1] = [
 
 // EVENT 33
 CODE[33 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, ()=>(has_majority_goa()) ],
 	[ vm_prompt, "Remove up to 3 Opposing Units adjacent to Goa." ],
 	[ vm_piece, false, 0, 3, (p,s)=>(is_adjacent_to_city(C_GOA, piece_space(p)) && is_enemy_piece(p)) ],
@@ -5935,6 +5986,7 @@ CODE[33 * 2 + 0] = [
 
 // SHADED 33
 CODE[33 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, DS ],
 	[ vm_prompt, "Reduce Rebel Factions Resources by half." ],
 	[ vm_resources, true, BK, ()=>(-Math.floor(game.resources[BK]/2)) ],
@@ -5944,6 +5996,7 @@ CODE[33 * 2 + 1] = [
 
 // EVENT 34
 CODE[34 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, VE ],
 	[ vm_steal, VE, BK, 2 ],
 	[ vm_steal_cavalry, VE, BK, 2 ],
@@ -5952,6 +6005,7 @@ CODE[34 * 2 + 0] = [
 
 // SHADED 34
 CODE[34 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_current, BK ],
 	[ vm_conspire_trade ],
 	[ vm_return ],
@@ -5959,6 +6013,7 @@ CODE[34 * 2 + 1] = [
 
 // EVENT 35
 CODE[35 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
 	[ vm_add_influence, ()=>(game.current) ],
 	[ vm_prompt, ()=>`Place a ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]} in up to 3 Provinces with ${PIECE_FACTION_TYPE_NAME[other_rebel_faction(game.current)][ELITE]}.` ],
@@ -5970,6 +6025,7 @@ CODE[35 * 2 + 0] = [
 
 // SHADED 35
 CODE[35 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_remove_influence, BK ],
 	[ vm_remove_influence, VE ],
 	[ vm_return ],
@@ -5977,6 +6033,7 @@ CODE[35 * 2 + 1] = [
 
 // EVENT 36
 CODE[36 * 2 + 0] = [
+	[ vm_stay_eligible ],
 	[ vm_current, VE ],
 	[ vm_asm, ()=>game.vm.count = 0 ],
 	[ vm_repeat, 4 ],
@@ -5991,6 +6048,7 @@ CODE[36 * 2 + 0] = [
 
 // SHADED 36
 CODE[36 * 2 + 1] = [
+	[ vm_stay_eligible ],
 	[ vm_remove_influence, VE ],
 	[ vm_prompt, "Remove up to 3 Rajas from the map." ],
 	[ vm_piece, false, 0, 3, (p,s)=>is_raja(p) && is_piece_on_map(p) ],