1 files changed, 23 insertions, 5 deletions

diff --git a/rules.js b/rules.js
index c1f9f36..6067a1d 100644
--- a/rules.js
+++ b/rules.js
@@ -1342,12 +1342,29 @@ function goto_roll_phase() {
 	}
 }
 
+states.skip_action = {
+	prompt() {
+		view.prompt = "Skipped action phase; roll the dice in your pool."
+
+		if (can_shift_any_infantry() || can_shift_any_cavalry())
+			view.actions.shift = 1
+
+		view.actions.roll = 1
+		view.actions.end_turn = 0
+	},
+	shift() {
+		push_undo()
+		game.state = "shift_from"
+	},
+	roll() {
+		clear_undo()
+		roll_dice_in_pool()
+	},
+}
+
 states.roll = {
 	prompt() {
-		if (game.reacted === player_index())
-			view.prompt = "Skipped action phase; roll the dice in your pool."
-		else
-			view.prompt = "Roll the dice in your pool."
+		view.prompt = "Roll the dice in your pool."
 		view.actions.roll = 1
 		view.actions.end_turn = 0
 	},
@@ -1863,7 +1880,7 @@ states.s25_stony_hill = {
 
 function goto_action_phase() {
 	if (game.reacted === player_index()) {
-		end_action_phase()
+		game.state = "skip_action"
 	} else {
 		if (can_take_any_action())
 			game.state = "action"
@@ -2075,6 +2092,7 @@ states.shift_to = {
 	},
 	next() {
 		// TODO: skip action phase?
+		log(`Shifted ${get_shift_sticks(game.target2)} sticks from C${game.selected} to C${game.target2}.`)
 		end_action_phase()
 	},
 }