summaryrefslogtreecommitdiff
path: root/rules.js
diff options
context:
space:
mode:
Diffstat (limited to 'rules.js')
-rw-r--r--rules.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/rules.js b/rules.js
index dfdceec..eedc4b0 100644
--- a/rules.js
+++ b/rules.js
@@ -2505,7 +2505,7 @@ function has_locale_to_muster(lord) {
// Else, can muster at any friendly seat (of a friendly lord who is also in play)
for (let other of all_friendly_lords()) {
let other_seat = get_lord_seat(other);
- if (is_lord_in_play(other) && is_friendly_locale(other_seat))
+ if (is_lord_in_play(other) && is_friendly_locale(other_seat) && !has_enemy_lord(other_seat))
if (is_move_allowed(lord, other_seat))
return true;
}
@@ -2830,11 +2830,11 @@ states.levy_lord_at_seat = {
found = true;
}
if (!found) {
- for (let lord of all_friendly_lords()) {
- let seat = get_lord_seat(lord);
- if ((is_lord_on_map(lord) || is_lord_on_calendar(lord)) && (is_friendly_locale(seat) && !has_enemy_lord(seat))) {
- if (is_move_allowed(game.who, seat))
- gen_action_locale(seat);
+ for (let other of all_friendly_lords()) {
+ let other_seat = get_lord_seat(other);
+ if (is_lord_in_play(other) && is_friendly_locale(other_seat) && !has_enemy_lord(other_seat)) {
+ if (is_move_allowed(game.who, other_seat))
+ gen_action_locale(other_seat);
}
}
}
@@ -7890,7 +7890,7 @@ function tow(n, what) {
return n;
}
function goto_tides_of_war() {
- set_active(BOTH);
+ set_active(P1);
log_h2_common("Tides of War");
let cities = count_favour(all_city_locales);
let towns = count_favour(all_town_locales);