From e1db7534f6360c7b83131e049e913038d595080e Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Sun, 18 Jun 2023 20:29:27 +0200 Subject: Fix stacking check for Riverines event. Check the stacking of the _destination_ space not the source space. --- events.txt | 4 ++-- rules.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/events.txt b/events.txt index 13a6d43..be3315b 100644 --- a/events.txt +++ b/events.txt @@ -1156,13 +1156,13 @@ EVENT 69 space 1 game.vm.m && (s !== game.vm.m[0]) && is_within_adjacent_depts(s, game.vm.m[0], 3) && can_stack_any(s, game.current) if game.current === GOVT prompt "Move cubes to destination." - piece_undo_opt all (s === game.vm.m[0]) && is_cube(p) && can_stack_any(s, GOVT) + piece_undo_opt all (s === game.vm.m[0]) && is_cube(p) && can_stack_any(game.vm.s, GOVT) move endpiece free_train_sweep_assault else prompt "Move Guerrillas to destination." - piece_undo_opt all (s === game.vm.m[0]) && is_piece(p, game.current, GUERRILLA) && can_stack_any(s, game.current) + piece_undo_opt all (s === game.vm.m[0]) && is_piece(p, game.current, GUERRILLA) && can_stack_any(game.vm.s, game.current) move endpiece free_rally_attack_terror diff --git a/rules.js b/rules.js index d84f14b..4846196 100644 --- a/rules.js +++ b/rules.js @@ -9968,13 +9968,13 @@ CODE[69 * 2 + 0] = [ [ vm_space, true, 1, 1, (s)=>game.vm.m && (s !== game.vm.m[0]) && is_within_adjacent_depts(s, game.vm.m[0], 3) && can_stack_any(s, game.current) ], [ vm_if, ()=>game.current === GOVT ], [ vm_prompt, "Move cubes to destination." ], - [ vm_piece, true, 0, 999, (p,s)=>(s === game.vm.m[0]) && is_cube(p) && can_stack_any(s, GOVT) ], + [ vm_piece, true, 0, 999, (p,s)=>(s === game.vm.m[0]) && is_cube(p) && can_stack_any(game.vm.s, GOVT) ], [ vm_move ], [ vm_endpiece ], [ vm_free_train_sweep_assault ], [ vm_else ], [ vm_prompt, "Move Guerrillas to destination." ], - [ vm_piece, true, 0, 999, (p,s)=>(s === game.vm.m[0]) && is_piece(p, game.current, GUERRILLA) && can_stack_any(s, game.current) ], + [ vm_piece, true, 0, 999, (p,s)=>(s === game.vm.m[0]) && is_piece(p, game.current, GUERRILLA) && can_stack_any(game.vm.s, game.current) ], [ vm_move ], [ vm_endpiece ], [ vm_free_rally_attack_terror ], -- cgit v1.2.3