summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--play.js103
-rw-r--r--rules.js20
2 files changed, 102 insertions, 21 deletions
diff --git a/play.js b/play.js
index dc917f8..628e8fe 100644
--- a/play.js
+++ b/play.js
@@ -1,5 +1,7 @@
"use strict"
+// TODO: sort selected generals above deselected generals when detaching?
+
function toggle_pieces() {
document.getElementById("pieces").classList.toggle("hide")
}
@@ -121,6 +123,15 @@ const ui = {
markers_element: document.getElementById("markers"),
clock_of_fate: document.getElementById("clock_of_fate"),
power_panel_list: document.getElementById("power_panel_list"),
+ power_panel: [
+ document.getElementById("hand_prussia_panel"),
+ document.getElementById("hand_hanover_panel"),
+ document.getElementById("hand_russia_panel"),
+ document.getElementById("hand_sweden_panel"),
+ document.getElementById("hand_austria_panel"),
+ document.getElementById("hand_imperial_panel"),
+ document.getElementById("hand_france_panel"),
+ ],
hand: [
document.getElementById("hand_prussia"),
document.getElementById("hand_hanover"),
@@ -221,6 +232,16 @@ function make_fate_card(fc) {
return e
}
+function has_removed_all_pieces(pow) {
+ for (let p of all_power_generals[pow])
+ if (view.pos[p] !== REMOVED)
+ return false
+ for (let p of all_power_trains[pow])
+ if (view.pos[p] !== REMOVED)
+ return false
+ return true
+}
+
function on_init() {
ui.pieces = [
create_piece("piece", 0, "piece cylinder prussia prussia_1"),
@@ -376,6 +397,47 @@ function on_init() {
ui.spaces_element.appendChild(e)
}
+ ui.power_panel_list.replaceChildren()
+ switch (params.role) {
+ default:
+ case "Friedrich":
+ ui.power_panel_list.appendChild(ui.power_panel[P_PRUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_HANOVER])
+ ui.power_panel_list.appendChild(ui.power_panel[P_RUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_SWEDEN])
+ ui.power_panel_list.appendChild(ui.power_panel[P_AUSTRIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_IMPERIAL])
+ ui.power_panel_list.appendChild(ui.power_panel[P_FRANCE])
+ break
+ case "Elisabeth":
+ ui.power_panel_list.appendChild(ui.power_panel[P_RUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_SWEDEN])
+ ui.power_panel_list.appendChild(ui.power_panel[P_AUSTRIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_IMPERIAL])
+ ui.power_panel_list.appendChild(ui.power_panel[P_FRANCE])
+ ui.power_panel_list.appendChild(ui.power_panel[P_PRUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_HANOVER])
+ break
+ case "Maria Theresa":
+ ui.power_panel_list.appendChild(ui.power_panel[P_AUSTRIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_IMPERIAL])
+ ui.power_panel_list.appendChild(ui.power_panel[P_FRANCE])
+ ui.power_panel_list.appendChild(ui.power_panel[P_PRUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_HANOVER])
+ ui.power_panel_list.appendChild(ui.power_panel[P_RUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_SWEDEN])
+ break
+ case "Pompadour":
+ ui.power_panel_list.appendChild(ui.power_panel[P_FRANCE])
+ ui.power_panel_list.appendChild(ui.power_panel[P_PRUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_HANOVER])
+ ui.power_panel_list.appendChild(ui.power_panel[P_RUSSIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_SWEDEN])
+ ui.power_panel_list.appendChild(ui.power_panel[P_AUSTRIA])
+ ui.power_panel_list.appendChild(ui.power_panel[P_IMPERIAL])
+ break
+ }
+
update_favicon()
}
@@ -383,9 +445,13 @@ function on_init() {
function layout_general_offset(g, s) {
let n = 0
- for (let i = g+1; i < 24; ++i)
- if (view.pos[i] === s)
+ for (let i = g+1; i < 24; ++i) {
+ if (view.pos[i] === s) {
++n
+ if (is_action("piece", i))
+ ++n
+ }
+ }
return n
}
@@ -522,6 +588,12 @@ function update_favicon() {
}
}
+function cmp_tc(a, b) {
+ let ax = (to_suit(a) << 7) + (to_value(a) << 3) + to_deck(a)
+ let bx = (to_suit(b) << 7) + (to_value(b) << 3) + to_deck(b)
+ return ax - bx
+}
+
function on_update() {
ui.header.classList.toggle("prussia", view.power === P_PRUSSIA)
ui.header.classList.toggle("hanover", view.power === P_HANOVER)
@@ -542,7 +614,10 @@ function on_update() {
ui.turns[i].classList.toggle("hide", (typeof view.fate === "object") || (i + 1 < view.fate))
for (let pow = 0; pow < 7; ++pow) {
+ ui.power_panel[pow].classList.toggle("hide", has_removed_all_pieces(pow))
+
ui.hand[pow].replaceChildren()
+ view.hand[pow].sort(cmp_tc)
for (let c of view.hand[pow]) {
if ((c & 15) === 0)
ui.hand[pow].appendChild(ui.tc_back[c>>7][back[c>>7]++])
@@ -551,22 +626,12 @@ function on_update() {
}
}
- if (false) {
- if (view.draw) {
- ui.draw_panel.classList.remove("hide")
- ui.draw.replaceChildren()
- for (let c of view.draw)
- ui.draw.appendChild(ui.tc[c])
- } else {
- ui.draw_panel.classList.add("hide")
- }
- } else {
- if (view.draw) {
- if (view.hand[view.power].length > 0)
- ui.hand[view.power].appendChild(ui.tcbreak)
- for (let c of view.draw)
- ui.hand[view.power].appendChild(ui.tc[c])
- }
+ if (view.draw) {
+ view.draw.sort(cmp_tc)
+ if (view.hand[view.power].length > 0)
+ ui.hand[view.power].appendChild(ui.tcbreak)
+ for (let c of view.draw)
+ ui.hand[view.power].appendChild(ui.tc[c])
}
ui.clock_of_fate.replaceChildren()
@@ -596,7 +661,7 @@ function on_update() {
action_button("next", "Next")
action_button("done", "Done")
- action_button("end_cards", "End cards")
+ action_button("end_cards", "End card draw")
action_button("end_setup", "End setup")
action_button("end_recruit", "End recruit")
action_button("end_movement", "End movement")
diff --git a/rules.js b/rules.js
index 254de35..01f9c7f 100644
--- a/rules.js
+++ b/rules.js
@@ -111,6 +111,8 @@ const max_power_troops_4 = [ 32, 12, 16, 4, 30, 6, 20 ]
function max_power_troops(pow) {
if (game.scenario === 1 && pow === P_PRUSSIA)
return 3
+ if (game.scenario === 2 && pow === P_PRUSSIA)
+ return 24
return max_power_troops_4[pow]
}
@@ -813,6 +815,10 @@ function next_tactics_deck() {
}
log("Discards " + held.map(x=>50-x).join(", "))
+ log("Deck 1: " + make_tactics_discard(0).map(x=>"C"+x).join(" "))
+ log("Deck 2: " + make_tactics_discard(1).map(x=>"C"+x).join(" "))
+ log("Deck 3: " + make_tactics_discard(2).map(x=>"C"+x).join(" "))
+ log("Deck 4: " + make_tactics_discard(3).map(x=>"C"+x).join(" "))
// find two largest discard piles
let a = find_largest_discard(held)
@@ -883,6 +889,7 @@ states.tactical_cards = {
},
card(c) {
push_undo()
+ log("Discarded 1 TC.")
set_delete(game.draw, c)
end_tactical_cards()
},
@@ -2355,6 +2362,8 @@ function remove_power_from_play(pow) {
game.pos[p] = REMOVED
for (let s of full_objective[pow])
set_delete(game.conquest, s)
+ if (game.hand[pow].length > 0)
+ log("Discarded " + game.hand[pow].length + " TCs.")
game.hand[pow] = []
}
@@ -2371,9 +2380,14 @@ function setup_the_war_in_the_west() {
}
function setup_the_austrian_theatre() {
+ remove_power_from_play(P_HANOVER)
remove_power_from_play(P_RUSSIA)
remove_power_from_play(P_SWEDEN)
remove_power_from_play(P_FRANCE)
+
+ game.pos[5] = REMOVED
+ game.pos[6] = REMOVED
+ game.pos[7] = REMOVED
}
states.setup = {
@@ -2382,8 +2396,10 @@ states.setup = {
let done = true
for (let p of all_power_generals[game.power]) {
if (game.pos[p] < ELIMINATED && game.troops[p] === 0) {
- gen_action_piece(p)
- done = false
+ if (is_supreme_commander(p)) {
+ gen_action_piece(p)
+ done = false
+ }
}
}
if (done)