diff options
| -rw-r--r-- | events.txt | 4 | ||||
| -rw-r--r-- | rules.js | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -441,7 +441,7 @@ 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) + space_opt 1 (is_adjacent_to_city(C_WARANGAL, s) || s === S_BENGAL && can_migrate_in_space(s)) free_migrate free_rally free_build @@ -664,7 +664,7 @@ SHADED 30 EVENT 31 current REBEL_FACTIONS prompt "Free Migrate in a Province adjacent to Vijayanagara." - space_opt 1 (is_adjacent_to_city(C_VIJAYANAGARA, s)) + space_opt 1 (is_adjacent_to_city(C_VIJAYANAGARA, s) && can_migrate_in_space(s)) mark_space free_migrate clean_p @@ -1881,7 +1881,6 @@ function goto_rally_space() { } function end_rally_space() { - log_space(game.cmd.where, "Rally") pop_summary() game.state = "rally" } @@ -1906,6 +1905,7 @@ states.rally = { space(s) { push_undo() select_cmd_space(s, 1) + log_space(s, "Rally") goto_rally_space() }, end_rally: end_command, @@ -6239,7 +6239,7 @@ 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) ], + [ 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_free_rally ], [ vm_free_build ], @@ -6525,7 +6525,7 @@ CODE[30 * 2 + 1] = [ CODE[31 * 2 + 0] = [ [ vm_current, REBEL_FACTIONS ], [ vm_prompt, "Free Migrate in a Province adjacent to Vijayanagara." ], - [ vm_space, true, 0, 1, (s)=>(is_adjacent_to_city(C_VIJAYANAGARA, s)) ], + [ vm_space, true, 0, 1, (s)=>(is_adjacent_to_city(C_VIJAYANAGARA, s) && can_migrate_in_space(s)) ], [ vm_mark_space ], [ vm_free_migrate ], [ vm_clean_p ], |