From 6ac0edad275b7750f861442af18e7f801e2d058c Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 25 Jan 2023 23:48:48 +0100 Subject: Don't show "moved/fought" markers during Wastage. --- play.js | 5 +++-- rules.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/play.js b/play.js index bb25d4c..b8bf7d8 100644 --- a/play.js +++ b/play.js @@ -1167,8 +1167,6 @@ function update_lord_mat(ix) { update_vassals(ui.ready_vassals[ix], ui.mustered_vassals[ix], ix) update_forces(ui.forces[ix], view.pieces.forces[ix], ix, false) update_forces(ui.routed[ix], view.pieces.routed[ix], ix, true) - ui.lord_moved1[ix].classList.toggle("hide", is_levy_phase() || get_lord_moved(ix) < 1) - ui.lord_moved2[ix].classList.toggle("hide", is_levy_phase() || get_lord_moved(ix) < 2) ui.lord_feed_x2[ix].classList.toggle("hide", count_lord_all_forces(ix) <= 6) } else { ui.lord_mat[ix].classList.add("hidden") @@ -1181,6 +1179,9 @@ function update_lord_mat(ix) { ui.lord_moved2[ix].classList.add("hide") ui.lord_feed_x2[ix].classList.add("hide") } + let m = get_lord_moved(ix) + ui.lord_moved1[ix].classList.toggle("hide", is_levy_phase() || (m !== 1 && m !== 2)) + ui.lord_moved2[ix].classList.toggle("hide", is_levy_phase() || (m !== 2)) } function is_lord_command(ix) { diff --git a/rules.js b/rules.js index 3d6c735..4dbe95b 100644 --- a/rules.js +++ b/rules.js @@ -10466,7 +10466,7 @@ function goto_wastage() { let done = true for (let lord = first_friendly_lord; lord <= last_friendly_lord; ++lord) { if (check_lord_wastage(lord)) { - set_lord_moved(lord, 1) + set_lord_moved(lord, 3) done = false } } -- cgit v1.2.3