diff options
author | Tor Andersson <tor@ccxvii.net> | 2021-07-22 11:34:27 +0200 |
---|---|---|
committer | Tor Andersson <tor@ccxvii.net> | 2022-11-16 19:19:39 +0100 |
commit | c5bd03c1c31830e027ff75134ad80f5e2a8caf84 (patch) | |
tree | ae75fa7063cd9494254831c9cdc6a9cbed1e0db9 /rules.js | |
parent | d29767d6c588c6ed049b9c62fe84cfbc05ce1b1e (diff) | |
download | crusader-rex-c5bd03c1c31830e027ff75134ad80f5e2a8caf84.tar.gz |
crusader: Fix bug in Jihad selection and display.
Enemy of null is null!
Diffstat (limited to 'rules.js')
-rw-r--r-- | rules.js | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -136,7 +136,9 @@ function print_summary(text, skip_if_empty = false) { } function enemy(p) { - return (p === FRANKS) ? SARACENS : FRANKS; + if (p === FRANKS) return SARACENS; + if (p === SARACENS) return FRANKS; + return null; } function is_inactive_player(current) { @@ -3644,6 +3646,7 @@ function make_battle_view() { round: game.combat_round, show_castle: game.show_castle, show_field: game.show_field, + town: game.where, }; if (is_under_siege(game.where) && !is_contested_battle_field(game.where)) @@ -3654,10 +3657,8 @@ function make_battle_view() { battle.title += " \u2014 Combat Deployment"; else battle.title += " \u2014 Round " + game.combat_round + " of 3"; - if (game.where === game.jihad) { - battle.jihad = game.attacker[game.where]; + if (game.where === game.jihad) battle.title += " \u2014 Jihad!"; - } function fill_cell(cell, owner, fn) { for (let b in BLOCKS) |