From 618b0908a7fe355eb87646ffae1ab5c78a57fe7c Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 29 Apr 2024 20:46:39 +0200 Subject: relax can lord muster check --- play.js | 2 +- rules.ts | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/play.js b/play.js index b3b3d95..d198f0a 100644 --- a/play.js +++ b/play.js @@ -1610,7 +1610,7 @@ function on_update() { ui.fortress.classList.toggle("york", fortress < 0) ui.fortress.classList.toggle("lancaster", fortress >= 0) - ui.influence.style.top = (track_xy[Math.min(45,Math.abs(view.influence))][1]) + "px" + ui.influence.style.top = (track_xy[Math.min(45,Math.abs(view.influence))][1] - 20) + "px" ui.influence.style.left = (track_xy[Math.min(45,Math.abs(view.influence))][0]) + "px" ui.influence.classList.toggle("york", view.influence < 0) ui.influence.classList.toggle("lancaster", view.influence >= 0) diff --git a/rules.ts b/rules.ts index 9f07ba2..1c30ee8 100644 --- a/rules.ts +++ b/rules.ts @@ -2898,19 +2898,7 @@ function end_muster() { } function can_lord_muster(lord: Lord) { - if (get_lord_moved(lord)) - return false - - // must be on map - if (is_lord_on_map(lord)) { - // can use lordship - if (is_lord_at_friendly_locale(lord)) - return true - // can only parley - if (can_parley_at(get_lord_locale(lord))) - return true - } - return false + return is_lord_on_map(lord) && !get_lord_moved(lord) } function has_locale_to_muster(lord: Lord) { -- cgit v1.2.3