summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--events.txt11
-rw-r--r--rules.js11
2 files changed, 14 insertions, 8 deletions
diff --git a/events.txt b/events.txt
index 98bb77a..1ed1796 100644
--- a/events.txt
+++ b/events.txt
@@ -454,16 +454,19 @@ EVENT 20
current REBEL_FACTIONS
add_influence (game.current)
prompt "In Orissa or an adjacent Province, you may Migrate, Rally and then Build."
- space_opt 1 (is_adjacent_to_city(C_WARANGAL, s) || s === S_BENGAL && can_migrate_in_space(s))
- free_migrate
+ 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
+ endspace
prompt "Rally in selected Province."
- space 1 (game.vm.m[0] === s && can_rally_in_space(s))
+ space_opt 1 (game.vm.m[0] === s && can_rally_in_space(s))
free_rally
endspace
prompt "Build in selected Province."
- space 1 (game.vm.m[0] === s && can_build_in_space(s))
+ space_opt 1 (game.vm.m[0] === s && can_build_in_space(s))
free_build
endspace
diff --git a/rules.js b/rules.js
index b0797a0..29d459d 100644
--- a/rules.js
+++ b/rules.js
@@ -6377,16 +6377,19 @@ CODE[20 * 2 + 0] = [
[ vm_current, REBEL_FACTIONS ],
[ vm_add_influence, ()=>(game.current) ],
[ vm_prompt, "In Orissa or an adjacent Province, you may Migrate, Rally and then Build." ],
- [ vm_space, true, 0, 1, (s)=>(is_adjacent_to_city(C_WARANGAL, s) || s === S_BENGAL && can_migrate_in_space(s)) ],
- [ vm_free_migrate ],
+ [ 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_free_migrate ],
+ [ vm_endspace ],
[ vm_prompt, "Rally in selected Province." ],
- [ vm_space, true, 1, 1, (s)=>(game.vm.m[0] === s && can_rally_in_space(s)) ],
+ [ vm_space, true, 0, 1, (s)=>(game.vm.m[0] === s && can_rally_in_space(s)) ],
[ vm_free_rally ],
[ vm_endspace ],
[ vm_prompt, "Build in selected Province." ],
- [ vm_space, true, 1, 1, (s)=>(game.vm.m[0] === s && can_build_in_space(s)) ],
+ [ vm_space, true, 0, 1, (s)=>(game.vm.m[0] === s && can_build_in_space(s)) ],
[ vm_free_build ],
[ vm_endspace ],
[ vm_return ],