confirm ending movement with unmoved pieces

2 files changed, 10 insertions, 1 deletions

diff --git a/play.js b/play.js
index 51a2b73..6da09b2 100644
--- a/play.js
+++ b/play.js
@@ -902,6 +902,9 @@ function on_update() {
 	action_button("end_supply", "End supply")
 	action_button("end_turn", "End turn")
 
+	confirm_action_button("confirm_end_movement", "End movement",
+		"You still have UNMOVED pieces.?")
+
 	action_button("undo", "Undo")
 
 	process_actions()
diff --git a/rules.js b/rules.js
index f0b082d..bc844e8 100644
--- a/rules.js
+++ b/rules.js
@@ -1347,7 +1347,10 @@ states.movement = {
 		else
 			prompt("Move your generals and supply trains.")
 
-		view.actions.end_movement = 1
+		if (done_trains && done_generals)
+			view.actions.end_movement = 1
+		else
+			view.actions.confirm_end_movement = 1
 	},
 	piece(p) {
 		push_undo()
@@ -1375,6 +1378,9 @@ states.movement = {
 		else
 			resume_move_general()
 	},
+	confirm_end_movement() {
+		this.end_movement()
+	},
 	end_movement() {
 		push_undo()
 		goto_recruit()