Shaded 2.

2 files changed, 33 insertions, 3 deletions

diff --git a/events.txt b/events.txt
index dc0939c..03bab2e 100644
--- a/events.txt
+++ b/events.txt
@@ -31,7 +31,22 @@ EVENT 2
 	endspace
 
 SHADED 2
-	log "NOT IMPLEMENTED"
+	current DS
+	prompt "Attack for free in Mountain Passes or Punjab"
+	space 1 ((s === S_MOUNTAIN_PASSES || s === S_PUNJAB) && has_ds_unit(s) && has_piece(s, MI, TROOPS))
+		free_attack
+	endspace
+	prompt "Choose a Space with which to rearrange Units with Mountain Passes and Punjab"
+	space 1 (s !== S_MOUNTAIN_PASSES && s !== S_PUNJAB)
+		mark_space
+	endspace
+	prompt `Move up to ${6-game.vm.pp.length} Units between the selected Spaces.`
+	piece_opt 6 ([S_MOUNTAIN_PASSES, S_PUNJAB, game.vm.m[0]].includes(piece_space(p)) && is_ds_unit(p))
+		prompt `Move up to ${6-game.vm.pp.length+1} Units between the selected Spaces.`
+		space 1 ((s === S_MOUNTAIN_PASSES || s === S_PUNJAB || s === game.vm.m[0]) && s !== piece_space(game.vm.p))
+			move
+		endspace
+	endpiece
 
 EVENT 3
 	current REBEL_FACTIONS
diff --git a/rules.js b/rules.js
index 71816b5..d0fe31e 100644
--- a/rules.js
+++ b/rules.js
@@ -266,7 +266,7 @@ exports.setup = function (seed, scenario, _options) {
 }
 
 function setup_deck() {
-	game.deck = [ 22, 1, 38, 21, 39, 4, 29, 15, 17, 16, 18, 5, 3, 36, 10, 37, 11, 2, 10, 1, 12, 13, 14 ]
+	game.deck = [ 38, 4, 2, 6, 7, 21, 39, 4, 29, 15, 17, 16, 18, 5, 3, 36, 10, 37, 11, 2, 10, 1, 12, 13, 14 ]
 }
 
 function setup_standard() {
@@ -4474,7 +4474,22 @@ CODE[2 * 2 + 0] = [
 
 // SHADED 2
 CODE[2 * 2 + 1] = [
-	[ vm_log, "NOT IMPLEMENTED" ],
+	[ 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)) ],
+	[ vm_free_attack ],
+	[ vm_endspace ],
+	[ vm_prompt, "Choose a Space with which to rearrange Units with Mountain Passes and Punjab" ],
+	[ vm_space, true, 1, 1, (s)=>(s !== S_MOUNTAIN_PASSES && s !== S_PUNJAB) ],
+	[ vm_mark_space ],
+	[ vm_endspace ],
+	[ vm_prompt, ()=>`Move up to ${6-game.vm.pp.length} Units between the selected Spaces.` ],
+	[ vm_piece, false, 0, 6, (p,s)=>([S_MOUNTAIN_PASSES, S_PUNJAB, game.vm.m[0]].includes(piece_space(p)) && is_ds_unit(p)) ],
+	[ vm_prompt, ()=>`Move up to ${6-game.vm.pp.length+1} Units between the selected Spaces.` ],
+	[ vm_space, true, 1, 1, (s)=>((s === S_MOUNTAIN_PASSES || s === S_PUNJAB || s === game.vm.m[0]) && s !== piece_space(game.vm.p)) ],
+	[ vm_move ],
+	[ vm_endspace ],
+	[ vm_endpiece ],
 	[ vm_return ],
 ]