diff options
| -rw-r--r-- | rules.js | 50 |
1 files changed, 25 insertions, 25 deletions
@@ -6011,19 +6011,15 @@ function pay_bps(n) { game.allied_bps -= n } -function count_secret_minefields() { +function count_friendly_minefields() { + let net = friendly_buildup_network() let n = 0 - if (is_axis_player()) { - let network = game.buildup.axis_network - for (let x of game.minefields[MF_AXIS]) - if (network[x]) - ++n - } else { - let network = game.buildup.allied_network - for (let x of game.minefields[MF_ALLIED]) - if (network[x]) - ++n - } + for (let x of friendly_minefields()) + if (net[x] && !is_battle_hex(x)) + ++n + for (let x of game.minefields[MF_VISIBLE]) + if (net[x] && !is_battle_hex(x)) + ++n return n } @@ -6147,7 +6143,7 @@ states.spending_bps = { if (game.selected < 0) { if (game.month >= 11 && has_friendly_unit_in_raw_hex(MALTA)) gen_action_hex(MALTA) - if (count_secret_minefields() >= 2 || bps >= 15) + if (count_friendly_minefields() >= 2 || bps >= 15) gen_action('minefield') if (bps >= 10) gen_action('extra_supply_card') @@ -6288,7 +6284,7 @@ states.minefield = { prompt() { view.prompt = `Buildup: Build a minefield.` let mfs = friendly_minefields() - if (mfs.length >= 2) + if (count_friendly_minefields() >= 2) gen_action('dismantle') if (available_bps() >= 15) { let net = friendly_buildup_network() @@ -6314,15 +6310,17 @@ states.dismantle1 = { inactive: "buildup", prompt() { view.prompt = `Buildup: Dismantle first minefield to build a new one.` - let mfs = friendly_minefields() let net = friendly_buildup_network() - for (let x of mfs) - if (net[x]) + for (let x of friendly_minefields()) + if (net[x] && !is_battle_hex(x)) + gen_action_hex(x) + for (let x of game.minefields[MF_VISIBLE]) + if (net[x] && !is_battle_hex(x)) gen_action_hex(x) }, hex(x) { - let mfs = friendly_minefields() - set_delete(mfs, x) + set_delete(friendly_minefields(), x) + set_delete(game.minefields[MF_VISIBLE], x) game.state = 'dismantle2' }, } @@ -6331,15 +6329,17 @@ states.dismantle2 = { inactive: "buildup", prompt() { view.prompt = `Buildup: Dismantle second minefield to build a new one.` - let mfs = friendly_minefields() let net = friendly_buildup_network() - for (let x of mfs) - if (net[x]) + for (let x of friendly_minefields()) + if (net[x] && !is_battle_hex(x)) + gen_action_hex(x) + for (let x of game.minefields[MF_VISIBLE]) + if (net[x] && !is_battle_hex(x)) gen_action_hex(x) }, hex(x) { - let mfs = friendly_minefields() - set_delete(mfs, x) + set_delete(friendly_minefields(), x) + set_delete(game.minefields[MF_VISIBLE], x) game.state = 'dismantle3' }, } @@ -6351,7 +6351,7 @@ states.dismantle3 = { let mfs = friendly_minefields() let net = friendly_buildup_network() for (let x of all_hexes) - if (net[x] && !is_battle_hex(x) && !set_has(mfs, x)) + if (net[x] && !is_battle_hex(x) && !set_has(mfs, x) && !set_has(game.minefields[MF_VISIBLE], x)) gen_action_hex(x) }, hex(x) { |