summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2024-10-26 20:25:29 +0200
committerTor Andersson <tor@ccxvii.net>2024-10-26 20:25:29 +0200
commit6c52bbb9e39c111dee0c1d5f845876496c54c42f (patch)
tree727a37aaaa03afbf8f548bead9f11c56a9974691
parenta39dd33d3d21a21cece01cc16d16d81526f90965 (diff)
downloadmaria-6c52bbb9e39c111dee0c1d5f845876496c54c42f.tar.gz
fix turn display and end_supply
-rw-r--r--play.js4
-rw-r--r--rules.js10
2 files changed, 2 insertions, 12 deletions
diff --git a/play.js b/play.js
index 0083dfd..c76d8c6 100644
--- a/play.js
+++ b/play.js
@@ -987,8 +987,8 @@ function layout_combat_marker() {
function layout_turn_marker() {
if (view.turn > 0) {
let t = view.turn - 1
- let row = (t / 3) | 0
- let col = (t % 3)
+ let row = (t / 4) | 0
+ let col = (t % 4)
let x = 2267 + col * 45
let y = 79 + row * 52
ui.turn.style.left = x - 16 + "px"
diff --git a/rules.js b/rules.js
index f5afb73..34d82c8 100644
--- a/rules.js
+++ b/rules.js
@@ -1858,16 +1858,6 @@ states.supply_done = {
function end_supply() {
delete game.supply
-
- // NOTE: Austria tactical card and supply steps after pragmatic
- if (game.power === P_AUSTRIA) {
- set_active_to_power(P_PRAGMATIC)
- goto_tactical_cards()
- return
- }
- if (game.power === P_PRAGMATIC)
- set_active_to_power(P_AUSTRIA)
-
next_sequence_of_play()
}