summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--play.html2
-rw-r--r--play.js15
-rw-r--r--rules.js2
3 files changed, 10 insertions, 9 deletions
diff --git a/play.html b/play.html
index e25990b..64c695b 100644
--- a/play.html
+++ b/play.html
@@ -69,7 +69,7 @@
<div id="pieces">
<div id="turn" class="marker circle turn levy"></div>
- <div id="turn" class="marker circle end"></div>
+ <div id="end" class="marker circle end"></div>
<div id="ip_y" class="marker square ip york"></div>
<div id="ip_l" class="marker square ip lancaster"></div>
<div id="towns_y" class="marker square towns york"></div>
diff --git a/play.js b/play.js
index 71b81e5..4cf1ec0 100644
--- a/play.js
+++ b/play.js
@@ -737,11 +737,12 @@ function build_map() {
data.lords.forEach((lord, ix) => {
let e = ui.lord_cylinder[ix] = document.createElement("div")
- e.className = "cylinder lord lord" + ix + " hide"
+ let name = clean_name(lord.name)
+ e.className = "cylinder lord lord_" + name + " hide"
register_action(e, "lord", ix)
register_tooltip(e, on_focus_cylinder)
document.getElementById("pieces").appendChild(e)
- build_lord_mat(lord, ix, clean_name(lord.side), clean_name(lord.name))
+ build_lord_mat(lord, ix, clean_name(lord.side), name)
})
data.vassals.forEach((vassal, ix) => {
@@ -758,7 +759,7 @@ function build_map() {
let y = original_boxes[name][1]
let w = original_boxes[name][2] - 8
let h = original_boxes[name][3] - 8
- calendar_xy[i] = [ x + w / 2, y + h / 2 ]
+ calendar_xy[i] = [ x + w, y ]
let e = ui.calendar[i] = document.createElement("div")
e.className = "calendar box " + name
e.style.left = x + "px"
@@ -1291,10 +1292,10 @@ function on_update() {
} else {
ui.turn.className = `marker circle turn levy`
}
- ui.turn.style.left = (calendar_xy[view.turn >> 1][0] - 5) + "px"
- ui.turn.style.top = (calendar_xy[view.turn >> 1][1] + 20) + "px"
- ui.end.style.left = calendar_xy[view.end][0] - 5
- ui.end.style.top = calendar_xy[view.end][1] + 20
+ ui.turn.style.left = (calendar_xy[view.turn >> 1][0] - 52) + "px"
+ ui.turn.style.top = (calendar_xy[view.turn >> 1][1] + 100) + "px"
+ ui.end.style.left = (calendar_xy[view.end][0] - 52) + "px"
+ ui.end.style.top = (calendar_xy[view.end][1] + 100) + "px"
ui.held1.textContent = `${view.held1} Held`
ui.held2.textContent = `${view.held2} Held`
diff --git a/rules.js b/rules.js
index b220314..180a0d6 100644
--- a/rules.js
+++ b/rules.js
@@ -7548,7 +7548,7 @@ exports.view = function (state, current) {
log: game.log,
reveal: 0,
- scenario: (scenario_first_turn[game.scenario] << 5) + (scenario_last_turn[game.scenario]),
+ end: scenario_last_turn[game.scenario],
turn: game.turn,
events: game.events,
pieces: game.pieces,