summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2024-11-23 23:57:21 +0100
committerTor Andersson <tor@ccxvii.net>2024-11-23 23:57:35 +0100
commit090b2edecbc7bb5dad76d5ed50570f6b413ff462 (patch)
treecf9ff34e41affd951a3ebcbcae1b3561e86988f3
parent1d4a75ac24781f07d152199a5ec1468d8bcb0585 (diff)
downloadmaria-090b2edecbc7bb5dad76d5ed50570f6b413ff462.tar.gz
WIP political display at top
-rw-r--r--play.html44
-rw-r--r--play.js14
2 files changed, 28 insertions, 30 deletions
diff --git a/play.html b/play.html
index 95dae1a..09b9854 100644
--- a/play.html
+++ b/play.html
@@ -65,6 +65,28 @@
</div>
</div>
+ <!-- Political Display -->
+
+ <div id="political_panel" class="panel">
+ <div id="political_header" class="panel_header">Political Display</div>
+ <div id="political_body">
+ <div id="political_display">
+ <div id="pol_tracks"></div>
+ <div class="pc_pile card_pile" id="placed_prussia"></div>
+ <div class="pc_pile card_pile" id="placed_france"></div>
+ <div class="pc_pile card_pile" id="placed_pragmatic"></div>
+ <div class="pc_pile card_pile" id="placed_austria"></div>
+ </div>
+ <div style="display:flex;flex-wrap:wrap;gap:18px;margin:18px;">
+ <div id="pc_deck" class="card_pile"></div>
+ <div id="pc_show" style="display:flex;flex-wrap:wrap;gap:18px;">
+ </div>
+ </div>
+ <div class="deal" id="active_deal_list"></div>
+ <div class="deal" id="proposed_deal_list"></div>
+ </div>
+ </div>
+
<div id="power_panel_list">
<!-- Louis XV -->
@@ -109,28 +131,6 @@
</div>
</div>
- <!-- Political Display -->
-
- <div id="political_panel" class="panel">
- <div id="political_header" class="panel_header">Political Display</div>
- <div id="political_body">
- <div id="political_display">
- <div id="pol_tracks"></div>
- <div class="pc_pile card_pile" id="placed_prussia"></div>
- <div class="pc_pile card_pile" id="placed_france"></div>
- <div class="pc_pile card_pile" id="placed_pragmatic"></div>
- <div class="pc_pile card_pile" id="placed_austria"></div>
- </div>
- <div style="display:flex;flex-wrap:wrap;gap:18px;margin:18px;">
- <div id="pc_deck" class="card_pile"></div>
- <div id="pc_show" style="display:flex;flex-wrap:wrap;gap:18px;">
- </div>
- </div>
- <div class="deal" id="active_deal_list"></div>
- <div class="deal" id="proposed_deal_list"></div>
- </div>
- </div>
-
</div>
<div id="discard_pile_panel" class="panel">
diff --git a/play.js b/play.js
index e2238ba..c8bcaeb 100644
--- a/play.js
+++ b/play.js
@@ -504,23 +504,21 @@ function sort_power_panel(animate) {
let start = panel_start[params.role] | 0
if (animate)
- for (let i = 0; i < 7; ++i)
+ for (let i = 0; i < 6; ++i)
remember_position(ui.power_panel[i])
ui.power_panel_list.replaceChildren()
- for (let i = 0; i < 7; ++i) {
- let p = panel_order[(i + start) % 7]
+ for (let i = 0; i < 6; ++i) {
+ let p = panel_order[(i + start) % 6]
ui.power_panel_list.appendChild(ui.power_panel[p])
}
if (view && view.actions)
ui.power_panel_list.prepend(ui.power_panel[view.power])
- if (view && (view.political || (view.actions && view.actions.shift)))
- ui.power_panel_list.prepend(ui.power_panel[6])
if (animate)
- for (let i = 0; i < 7; ++i)
+ for (let i = 0; i < 6; ++i)
animate_position(ui.power_panel[i])
}
@@ -535,6 +533,7 @@ const ui = {
pieces_element: document.getElementById("pieces"),
markers_element: document.getElementById("markers"),
pol_tracks: document.getElementById("pol_tracks"),
+ political_display: document.getElementById("political_panel"),
pc_deck: document.getElementById("pc_deck"),
pc_show: document.getElementById("pc_show"),
pc_placed: [
@@ -566,7 +565,6 @@ const ui = {
document.getElementById("hand_austria_panel"),
document.getElementById("hand_bavaria_panel"),
document.getElementById("hand_saxony_panel"),
- document.getElementById("political_panel"),
],
hand: [
document.getElementById("hand_france"),
@@ -1432,7 +1430,7 @@ function on_update() {
sort_power_panel(true)
if (is_intro()) {
ui.power_panel[P_PRAGMATIC].style.display = "none"
- ui.power_panel[6].style.display = "none"
+ ui.political_display.style.display = "none"
}
for (let p = 0; p < 20; ++p)