From 42790f78e5b6775e5702f4ba5b602ac9c500aa12 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 3 Apr 2025 21:10:25 +0200 Subject: Tweak Event 20 behavior. --- events.txt | 8 ++++---- rules.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/events.txt b/events.txt index b4ff4ef..78d1e94 100644 --- a/events.txt +++ b/events.txt @@ -456,10 +456,10 @@ EVENT 20 prompt "In Orissa or an adjacent Province, you may Migrate, Rally and then Build." space 1 (is_adjacent_to_city(C_WARANGAL, s) || s === S_BENGAL) mark_space - endspace - prompt "Migrate in selected Province." - space_opt 1 (game.vm.m[0] === s && can_migrate_in_space(s)) - free_migrate + prompt "Migrate in selected Province." + if (can_migrate_in_space(game.vm.s)) + free_migrate + endif endspace prompt "Rally in selected Province." space_opt 1 (game.vm.m[0] === s && can_rally_in_space(s)) diff --git a/rules.js b/rules.js index c1b366e..4c3ac9e 100644 --- a/rules.js +++ b/rules.js @@ -6392,10 +6392,10 @@ CODE[20 * 2 + 0] = [ [ vm_prompt, "In Orissa or an adjacent Province, you may Migrate, Rally and then Build." ], [ vm_space, true, 1, 1, (s)=>(is_adjacent_to_city(C_WARANGAL, s) || s === S_BENGAL) ], [ vm_mark_space ], - [ vm_endspace ], [ vm_prompt, "Migrate in selected Province." ], - [ vm_space, true, 0, 1, (s)=>(game.vm.m[0] === s && can_migrate_in_space(s)) ], + [ vm_if, ()=>(can_migrate_in_space(game.vm.s)) ], [ vm_free_migrate ], + [ vm_endif ], [ vm_endspace ], [ vm_prompt, "Rally in selected Province." ], [ vm_space, true, 0, 1, (s)=>(game.vm.m[0] === s && can_rally_in_space(s)) ], -- cgit v1.2.3