Cleaner remove log

1 files changed, 35 insertions, 7 deletions

diff --git a/rules.js b/rules.js
index 4bd9944..44b3403 100644
--- a/rules.js
+++ b/rules.js
@@ -509,6 +509,7 @@ function end_cavalry() {
 		pop_summary()
 	else
 		upop_summary()
+	log_br()
 
 	if (game.vm) {
 		vm_next()
@@ -3829,6 +3830,11 @@ function log_summary_remove(p) {
 	log_summary("Removed % " + piece_symbol(p))
 }
 
+
+function log_summary_remove_from(p) {
+	log_summary("Removed % " + piece_symbol(p) + " from S" + piece_space(p))
+}
+
 function log_summary_cavalry(c) {
 	let from = game.cavalry[c]
 	if (from !== AVAILABLE)
@@ -4510,6 +4516,12 @@ function vm_log_h2() {
 	vm_next()
 }
 
+function vm_pop_summary() {
+	upop_summary()
+	log_br()
+	vm_next()
+}
+
 function vm_mark_space() {
 	if (game.vm.m)
 		set_add(game.vm.m, game.vm.s)
@@ -4552,6 +4564,14 @@ function pop_vm_prompt() {
 	}
 }
 
+function vm_summary_remove() {
+	if (!game.summary)
+		push_summary()
+	log_summary_remove_from(game.vm.p)
+	remove_piece(game.vm.p)
+	vm_next()
+}
+
 function vm_remove() {
 	log("Removed " + piece_symbol(game.vm.p) + " from S" + piece_space(game.vm.p) + ".")
 	remove_piece(game.vm.p)
@@ -5096,6 +5116,7 @@ function tick_cav_resources() {
 	if (game.vm.count === 0) {
 		log_br()
 		upop_summary()
+		log_br()
 		vm_next()
 	}
 }
@@ -5747,9 +5768,10 @@ CODE[2 * 2 + 0] = [
 	[ vm_space, true, 2, 2, (s)=>((s === S_MOUNTAIN_PASSES || s === S_PUNJAB) && has_ds_unit(s)) ],
 	[ vm_prompt, "Remove up to 2 Delhi Sultanate Units." ],
 	[ vm_piece, true, 0, 2, (p,s)=>is_ds_unit(p) && is_piece_in_event_space(p) ],
-	[ vm_remove ],
+	[ vm_summary_remove ],
 	[ vm_endpiece ],
 	[ vm_endspace ],
+	[ vm_pop_summary ],
 	[ vm_return ],
 ]
 
@@ -5999,8 +6021,9 @@ CODE[11 * 2 + 1] = [
 	[ vm_current, DS ],
 	[ vm_prompt, "Remove 4 Mongol Invaders." ],
 	[ vm_piece, true, 0, 4, (p,s)=>is_mongol_invader(p) ],
-	[ vm_remove ],
+	[ vm_summary_remove ],
 	[ vm_endpiece ],
+	[ vm_pop_summary ],
 	[ vm_return ],
 ]
 
@@ -6010,8 +6033,9 @@ CODE[12 * 2 + 0] = [
 	[ vm_gain_cavalry, ()=>2 ],
 	[ vm_prompt, "Remove 4 Delhi Sultantes pieces from Provinces adjacent to Warangal." ],
 	[ vm_piece, true, 0, 4, (p,s)=>(is_adjacent_to_city(C_WARANGAL, piece_space(p)) && piece_faction(p) === DS) ],
-	[ vm_remove ],
+	[ vm_summary_remove ],
 	[ vm_endpiece ],
+	[ vm_pop_summary ],
 	[ vm_return ],
 ]
 
@@ -6186,8 +6210,9 @@ CODE[17 * 2 + 0] = [
 	[ vm_add_influence, BK ],
 	[ vm_prompt, "Remove up to 5 Delhi Sultanate Units from Provinces with you presence." ],
 	[ vm_piece, true, 0, 5, (p,s)=>is_ds_unit(p) && has_piece_faction(piece_space(p), BK) ],
-	[ vm_remove ],
+	[ vm_summary_remove ],
 	[ vm_endpiece ],
+	[ vm_pop_summary ],
 	[ vm_return ],
 ]
 
@@ -6201,8 +6226,9 @@ CODE[17 * 2 + 1] = [
 	[ vm_endpiece ],
 	[ vm_prompt, "Remove up to 2 Amirs from selected Province." ],
 	[ vm_piece, true, 0, 2, (p,s)=>is_piece_in_event_space(p) && is_amir(p) ],
-	[ vm_remove ],
+	[ vm_summary_remove ],
 	[ vm_endpiece ],
+	[ vm_pop_summary ],
 	[ vm_endspace ],
 	[ vm_resources, false, BK, -2 ],
 	[ vm_return ],
@@ -6615,8 +6641,9 @@ CODE[33 * 2 + 0] = [
 	[ 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)) ],
-	[ vm_remove ],
+	[ vm_summary_remove ],
 	[ vm_endpiece ],
+	[ vm_pop_summary ],
 	[ vm_resources, false, ()=>(game.current), 2 ],
 	[ vm_return ],
 ]
@@ -6689,8 +6716,9 @@ CODE[36 * 2 + 1] = [
 	[ 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) ],
-	[ vm_remove ],
+	[ vm_summary_remove ],
 	[ vm_endpiece ],
+	[ vm_pop_summary ],
 	[ vm_return ],
 ]