Port stadium blocks and facilities without periphery construction (by Codex)
This commit is contained in:
1 parent
0f36b507d4
commit
349c416f3a
21 files changed
+1185
-12
No files matched your search
@@ -52,9 +52,9 @@ jobs:
|
||||
- name: Configure opt-in UI without external assets
|
||||
run: cmake -S . -B build-ui -G Ninja -DCMAKE_BUILD_TYPE=Release -DOPENBMH_BUILD_MODERN_UI=ON -DOPENBMH_BUILD_EDITOR=OFF -DBMH_DATA=
|
||||
- name: Compile native frontend and synthetic checks
|
||||
run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests --parallel 2
|
||||
run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_stadium_ui_tests --parallel 2
|
||||
- name: Check controls, fonts, density and draft cancellation
|
||||
run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_)" --output-on-failure --output-junit modern-ui-results.xml
|
||||
run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_)" --output-on-failure --output-junit modern-ui-results.xml
|
||||
- name: Upload test report
|
||||
if: always()
|
||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<rml>
|
||||
<head><title>OpenBMH</title><link type="text/rcss" href="theme.rcss"/><link type="text/rcss" href="ticket.rcss"/><link type="text/rcss" href="sports.rcss"/><link type="text/rcss" href="calendar.rcss"/><link type="text/rcss" href="reports.rcss"/><link type="text/rcss" href="report_details.rcss"/><link type="text/rcss" href="report_pickers.rcss"/><link type="text/rcss" href="indoor.rcss"/><link type="text/rcss" href="planning.rcss"/><link type="text/rcss" href="almanac.rcss"/><link type="text/rcss" href="finance.rcss"/>
|
||||
<link type="text/rcss" href="bank.rcss"/><link type="text/rcss" href="contracts.rcss"/><link type="text/rcss" href="amount.rcss"/><link type="text/rcss" href="environment.rcss"/><link type="text/rcss" href="advertising.rcss"/><link type="text/rcss" href="toto.rcss"/><link type="text/rcss" href="lineup.rcss"/><link type="text/rcss" href="transfer.rcss"/><link type="text/rcss" href="career_reports.rcss"/><link type="text/rcss" href="rankings.rcss"/></head>
|
||||
<link type="text/rcss" href="bank.rcss"/><link type="text/rcss" href="contracts.rcss"/><link type="text/rcss" href="amount.rcss"/><link type="text/rcss" href="environment.rcss"/><link type="text/rcss" href="advertising.rcss"/><link type="text/rcss" href="toto.rcss"/><link type="text/rcss" href="lineup.rcss"/><link type="text/rcss" href="transfer.rcss"/><link type="text/rcss" href="career_reports.rcss"/><link type="text/rcss" href="rankings.rcss"/><link type="text/rcss" href="stadium.rcss"/></head>
|
||||
<body class="midnight">
|
||||
<div id="background"></div>
|
||||
<div id="canvas"></div>
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-only */
|
||||
.stadium-screen {position:absolute;left:0;top:0;width:2612dp;height:1864dp;color:var(--text);}
|
||||
.stadium-empty {font-size:30dp;padding:40dp;color:var(--muted);}
|
||||
.stadium-heading {position:absolute;left:0;top:0;width:2612dp;height:106dp;display:flex;align-items:center;justify-content:space-between;color:#d4e2ed;}
|
||||
.stadium-heading-copy {height:83dp;}
|
||||
.stadium-heading h2 {font-size:36dp;font-weight:normal;line-height:41dp;height:41dp;margin:0 0 12dp;white-space:nowrap;}
|
||||
.stadium-heading p {font-size:25dp;color:#91adbf;line-height:30dp;height:30dp;margin:0;}
|
||||
.stadium-summary {display:flex;align-items:center;}
|
||||
.stadium-summary>div {display:flex;flex-direction:column;align-items:flex-end;margin-left:65dp;}
|
||||
.stadium-summary>div>span {display:block;font-size:24dp;color:#91adbf;height:28dp;line-height:28dp;}
|
||||
.stadium-summary strong {display:block;font-size:38dp;font-weight:normal;color:#b8dfd0;height:44dp;line-height:44dp;margin-top:10dp;white-space:nowrap;}
|
||||
.stadium-summary small {font-size:25dp;color:#b7cddc;}
|
||||
.stadium-bowl {position:absolute;left:100dp;top:134dp;width:1430dp;height:992.923588dp;border:2dp #c5d9e726;border-radius:18dp;overflow:hidden;}
|
||||
.stadium-letter {position:absolute;display:flex;align-items:center;justify-content:center;width:96dp;height:92dp;padding:0;border:2dp #e4b3a06b;border-radius:18dp;background-color:#14222ae6;color:#f0a99b;font-size:58dp;line-height:1;font-weight:bold;}
|
||||
.stadium-letter .control-label {width:100%;text-align:center;white-space:nowrap;}
|
||||
.stadium-letter:hover {background-color:#33434ae6;border-color:#f6c6ba;color:#ffdbcf;}
|
||||
.stadium-letter.building {border-color:#d8b77f;color:#e9cb9b;opacity:.85;}
|
||||
.stadium-block {position:absolute;display:block;padding:18dp 28dp;border:2dp #c5d9e726;border-radius:14dp;background-color:#12243140;color:#b8d0e0;font-size:28dp;text-align:left;}
|
||||
.stadium-block:hover {background-color:#c5d9e712;}
|
||||
.stadium-block:disabled {opacity:.85;border-color:#d8b77f52;background-color:#b6955d0d;}
|
||||
.stadium-block-copy {position:absolute;left:28dp;width:540dp;height:116dp;}
|
||||
.stadium-block-copy strong {position:absolute;left:0;top:0;display:block;width:540dp;height:36dp;line-height:36dp;font-size:31dp;font-weight:normal;color:#d7e5ef;white-space:nowrap;}
|
||||
.stadium-block-copy>span {position:absolute;left:0;top:46dp;display:block;width:540dp;height:32dp;line-height:32dp;white-space:nowrap;}
|
||||
.stadium-block-copy small {position:absolute;left:0;top:88dp;display:block;width:540dp;height:28dp;line-height:28dp;font-size:24dp;color:#8faabd;white-space:nowrap;}
|
||||
.stadium-block-icons {position:absolute;right:20dp;top:22dp;display:flex;width:162dp;height:76dp;}
|
||||
.stadium-block-icons .image-frame {margin-right:10dp;flex-shrink:0;}
|
||||
.stadium-block-icons .image-frame:last-child {margin-right:0;}
|
||||
.stadium-facility {position:absolute;display:block;padding:0;border:2dp #c5d9e726;border-radius:14dp;background-color:#12243140;color:#cbdde9;overflow:hidden;}
|
||||
.stadium-facility:hover {background-color:#c5d9e712;border-color:#c5d9e752;}
|
||||
.stadium-facility:disabled {opacity:.7;}
|
||||
.stadium-facility-picture {position:absolute;left:0;top:0;display:block;width:391dp;height:125dp;overflow:hidden;background-color:#10232e60;}
|
||||
.stadium-facility-art {position:absolute;display:block;}
|
||||
.stadium-art-overlay {position:absolute;display:block;pointer-events:none;}
|
||||
.stadium-facility>strong {position:absolute;left:0;top:133dp;display:block;width:391dp;height:31.2dp;line-height:31.2dp;font-size:26dp;font-weight:normal;text-align:center;white-space:nowrap;color:#d3e2ed;}
|
||||
.stadium-facility-caption {position:absolute;left:0;top:168.2dp;display:block;width:391dp;height:25.3dp;line-height:25.3dp;font-size:23dp;text-align:center;white-space:nowrap;color:#95b7c2;}
|
||||
.stadium-nav {position:absolute;left:0;top:1772dp;width:2612dp;height:92dp;display:flex;}
|
||||
.stadium-nav-button {width:856dp;height:92dp;padding:12dp 24dp;margin-right:22dp;font-size:29dp;border:2dp #c5d9e726;border-radius:12dp;background-color:#b6cad510;flex-shrink:0;}
|
||||
.stadium-nav-button:last-child {margin-right:0;}
|
||||
.stadium-nav-button.wide {width:2612dp;}
|
||||
.stadium-nav-button .control-label {width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
|
||||
.stadium-panorama {position:absolute;left:0;top:134dp;width:2612dp;height:1470.031100478dp;border:2dp #c5d9e726;border-radius:18dp;overflow:hidden;}
|
||||
.stadium-graph {position:absolute;left:0;top:134dp;width:2612dp;height:500dp;border:2dp #c5d9e726;border-radius:18dp;background-color:#12243140;}
|
||||
.stadium-graph-art {position:absolute;left:24dp;top:20dp;width:2560dp;height:456dp;pointer-events:none;}
|
||||
.stadium-curve,.stadium-scale {position:absolute;padding:10dp 20dp 10dp 38dp;height:74dp;border:2dp #c5d9e726;border-radius:12dp;background-color:#b6cad510;font-size:25dp;color:#cbdde9;}
|
||||
.stadium-curve {display:flex;align-items:center;justify-content:center;}
|
||||
.stadium-curve[aria-pressed=false] {opacity:.5;}
|
||||
.stadium-curve[aria-pressed=true],.stadium-scale[aria-pressed=true] {background-color:#b6cad51f;border-color:#c5d9e744;}
|
||||
.stadium-curve-color {position:absolute;left:12dp;top:16dp;width:6dp;height:34dp;border-radius:3dp;}
|
||||
.stadium-curve-label {display:block;width:100%;white-space:nowrap;text-align:center;}
|
||||
.stadium-scale {padding:12dp 24dp;font-size:28dp;}
|
||||
.stadium-scale .control-label {width:100%;white-space:nowrap;}
|
||||
.stadium-data-table {position:absolute;left:0;top:875dp;width:2612dp;height:432dp;}
|
||||
.stadium-data-row {display:flex;align-items:center;width:2612dp;height:72dp;font-size:29dp;color:#d0e0eb;}
|
||||
.stadium-data-row.head {font-size:27dp;color:#95afc2;border-bottom:2dp #c5d9e72b;}
|
||||
.stadium-data-row.striped {background-color:#e3edf605;}
|
||||
.stadium-data-cell {display:flex;align-items:center;justify-content:center;width:661.706667dp;height:72dp;padding:12dp 14dp;flex-shrink:0;min-width:0;}
|
||||
.stadium-data-cell.first {width:626.88dp;justify-content:flex-start;}
|
||||
.stadium-data-cell>span {display:block;width:100%;white-space:nowrap;text-align:center;overflow:hidden;text-overflow:ellipsis;}
|
||||
.stadium-data-cell.first>span {text-align:left;color:#a7c1d3;}
|
||||
.stadium-required {position:absolute;left:0;top:1335dp;width:2612dp;height:34dp;line-height:34dp;margin:0;display:flex;align-items:center;justify-content:center;font-size:29dp;color:#a1bccc;}
|
||||
.stadium-required>span {display:block;white-space:nowrap;}
|
||||
.stadium-required-value {color:#b8dfd0;margin-left:8dp;}
|
||||
.stadium-ticket {position:absolute;left:0;top:1415dp;width:2612dp;height:80dp;display:flex;align-items:center;font-size:28dp;color:#bed3e1;}
|
||||
.stadium-ticket>strong {display:block;width:87.14dp;flex-shrink:0;margin-right:20dp;font-size:28dp;font-weight:normal;}
|
||||
.stadium-ticket-price {width:88.6484615dp;height:66dp;padding:8dp 0;margin-right:8dp;border:2dp #c5d9e726;border-radius:10dp;background-color:#b6cad510;font-size:26dp;color:#bed3e1;flex-shrink:0;}
|
||||
.stadium-ticket-price:last-child {margin-right:0;}
|
||||
.stadium-ticket-price .control-label {width:100%;white-space:nowrap;}
|
||||
.stadium-ticket-price[aria-pressed=true] {background-color:#78b9a52b;border-color:#a9dccb73;color:#c8e8dc;}
|
||||
.stadium-modal {position:absolute;left:0;top:0;width:2612dp;height:1864dp;background-color:#08101980;z-index:20;}
|
||||
.stadium-draft {position:absolute;border:2dp #e1ecf429;border-radius:22dp;background-color:#283542f5;color:#d2e2ed;font-size:30dp;overflow:hidden;}
|
||||
.stadium-draft h2 {position:absolute;left:52dp;top:40dp;width:2052dp;height:45dp;line-height:45dp;font-size:40dp;font-weight:bold;text-align:center;margin:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#e3ecf3;}
|
||||
.stadium-draft-summary {position:absolute;left:52dp;top:113dp;width:2052dp;height:31dp;line-height:31dp;display:flex;align-items:center;justify-content:space-between;font-size:27dp;color:#9db7ca;}
|
||||
.stadium-draft-summary>span {display:block;white-space:nowrap;}
|
||||
.stadium-place-field {position:absolute;left:52dp;top:174dp;width:1233.230769dp;height:307dp;padding:26dp 30dp;border:2dp #c5d9e726;border-radius:14dp;background-color:#12243140;}
|
||||
.stadium-place-field>strong {position:absolute;left:30dp;top:26dp;font-size:34dp;font-weight:normal;height:39dp;line-height:39dp;}
|
||||
.stadium-place-field>p {position:absolute;left:30dp;top:83dp;font-size:26dp;height:30dp;line-height:30dp;color:#9db7ca;margin:0;}
|
||||
.stadium-place-label {position:absolute;left:30dp;top:140dp;display:flex;align-items:center;width:789.230769dp;height:80dp;line-height:80dp;font-size:28dp;white-space:nowrap;}
|
||||
.stadium-place-number {position:absolute;right:30dp;top:140dp;width:340dp;height:80dp;padding:12dp 20dp;border:2dp #c5d9e738;border-radius:12dp;background-color:#111f2a80;color:#e3ecf5;font-size:34dp;text-align:right;justify-content:flex-end;}
|
||||
.stadium-place-number .control-label {width:100%;white-space:nowrap;text-align:right;}
|
||||
#stadium-place-range {position:absolute;left:30dp;top:252dp;width:1169.230769dp;height:18dp;margin:0;padding:0;}
|
||||
#stadium-place-range slidertrack {height:4dp;margin:7dp 0;}
|
||||
#stadium-place-range sliderbar {width:18dp;height:18dp;margin:0;border:0;border-radius:9dp;}
|
||||
.stadium-features {position:absolute;left:1333.230769dp;top:196.5dp;width:770.769231dp;height:262dp;}
|
||||
.stadium-feature-row {display:flex;align-items:center;width:770.769231dp;height:116dp;margin-bottom:30dp;font-size:32dp;}
|
||||
.stadium-feature-row>input {width:38dp;height:38dp;flex-shrink:0;margin-right:24dp;}
|
||||
.stadium-feature-image {display:block;width:116dp;height:116dp;margin-right:24dp;flex-shrink:0;}
|
||||
.stadium-feature-row>span:last-child {display:block;white-space:nowrap;}
|
||||
.stadium-costs {position:absolute;left:52dp;top:511dp;width:2052dp;height:146.5dp;margin:0;}
|
||||
.stadium-cost-row {position:absolute;left:0;width:2052dp;height:43.5dp;}
|
||||
.stadium-cost-row dt,.stadium-cost-row dd {position:absolute;top:0;height:43.5dp;line-height:43.5dp;width:1022dp;font-size:29dp;margin:0;}
|
||||
.stadium-cost-row dt {left:0;color:#a9c1d2;}
|
||||
.stadium-cost-row dd {right:0;text-align:right;color:#d2e4ee;}
|
||||
.stadium-draft-total {position:absolute;left:52dp;width:2052dp;height:69dp;border-top:2dp #c5d9e726;padding-top:25dp;display:flex;align-items:center;justify-content:space-between;font-size:36dp;}
|
||||
.stadium-draft-total>span {display:block;white-space:nowrap;}
|
||||
#stadium-quote-total {color:#b8dfd0;}
|
||||
#stadium-draft-feedback {position:absolute;left:52dp;width:2052dp;height:48dp;font-size:25dp;line-height:1.4;color:#94afc3;margin:0;}
|
||||
.stadium-draft-actions {position:absolute;left:52dp;width:2052dp;height:84dp;display:flex;}
|
||||
.stadium-dialog-action {width:1014dp;height:84dp;padding:12dp 24dp;margin-right:24dp;border:2dp #c5d9e726;border-radius:12dp;font-size:30dp;background-color:#12243140;flex-shrink:0;}
|
||||
.stadium-dialog-action:last-child {margin-right:0;}
|
||||
.stadium-dialog-action .control-label {width:100%;white-space:nowrap;}
|
||||
.stadium-option {position:absolute;padding:22dp;display:block;border:2dp #c5d9e726;border-radius:16dp;background-color:#12243140;overflow:hidden;}
|
||||
.stadium-option[aria-pressed=true] {background-color:#78b9a51f;border-color:#a9dccb73;}
|
||||
.stadium-option-art {position:absolute;left:22dp;top:22dp;display:block;width:592dp;overflow:hidden;border-radius:10dp;}
|
||||
.stadium-option>strong {position:absolute;left:22dp;width:592dp;height:37dp;line-height:37dp;font-size:32dp;font-weight:normal;white-space:nowrap;text-align:center;}
|
||||
.stadium-option-price {position:absolute;left:22dp;width:592dp;height:34dp;line-height:34dp;font-size:30dp;white-space:nowrap;text-align:center;color:#b8dfd0;}
|
||||
body.silver .stadium-heading,body.matchday .stadium-heading,body.silver .stadium-block,body.matchday .stadium-block,body.silver .stadium-block-copy strong,body.matchday .stadium-block-copy strong,body.silver .stadium-facility>strong,body.matchday .stadium-facility>strong,body.silver .stadium-summary small,body.matchday .stadium-summary small,body.silver .stadium-data-row,body.matchday .stadium-data-row,body.silver .stadium-data-cell.first>span,body.matchday .stadium-data-cell.first>span {color:var(--text);}
|
||||
body.silver .stadium-heading p,body.matchday .stadium-heading p,body.silver .stadium-summary>div>span,body.matchday .stadium-summary>div>span,body.silver .stadium-block-copy small,body.matchday .stadium-block-copy small,body.silver .stadium-facility-caption,body.matchday .stadium-facility-caption,body.silver .stadium-required,body.matchday .stadium-required,body.silver .stadium-draft-summary,body.matchday .stadium-draft-summary,body.silver .stadium-place-field>p,body.matchday .stadium-place-field>p,body.silver #stadium-draft-feedback,body.matchday #stadium-draft-feedback {color:var(--muted);}
|
||||
body.silver .stadium-summary strong,body.matchday .stadium-summary strong,body.silver .stadium-required-value,body.matchday .stadium-required-value,body.silver .stadium-option-price,body.matchday .stadium-option-price,body.silver #stadium-quote-total,body.matchday #stadium-quote-total {color:var(--accent);}
|
||||
body.silver .stadium-bowl,body.matchday .stadium-bowl,body.silver .stadium-panorama,body.matchday .stadium-panorama,body.silver .stadium-graph,body.matchday .stadium-graph,body.silver .stadium-block,body.matchday .stadium-block,body.silver .stadium-facility,body.matchday .stadium-facility,body.silver .stadium-option,body.matchday .stadium-option,body.silver .stadium-place-field,body.matchday .stadium-place-field {border-color:var(--border);background-color:var(--panel);}
|
||||
body.silver .stadium-facility-picture,body.matchday .stadium-facility-picture {background-color:var(--panel);}
|
||||
body.silver .stadium-nav-button,body.matchday .stadium-nav-button,body.silver .stadium-curve,body.matchday .stadium-curve,body.silver .stadium-scale,body.matchday .stadium-scale,body.silver .stadium-ticket-price,body.matchday .stadium-ticket-price,body.silver .stadium-dialog-action,body.matchday .stadium-dialog-action {border-color:var(--border);background-color:var(--soft);color:var(--text);}
|
||||
body.silver .stadium-nav-button:hover,body.matchday .stadium-nav-button:hover,body.silver .stadium-curve:hover,body.matchday .stadium-curve:hover,body.silver .stadium-scale:hover,body.matchday .stadium-scale:hover {background-color:var(--hover);}
|
||||
body.silver .stadium-curve[aria-pressed=true],body.matchday .stadium-curve[aria-pressed=true],body.silver .stadium-scale[aria-pressed=true],body.matchday .stadium-scale[aria-pressed=true],body.silver .stadium-ticket-price[aria-pressed=true],body.matchday .stadium-ticket-price[aria-pressed=true],body.silver .stadium-option[aria-pressed=true],body.matchday .stadium-option[aria-pressed=true] {background-color:var(--selected);border-color:var(--accent);}
|
||||
body.silver .stadium-draft {background-color:#eaf1f7fc;border-color:var(--border);color:var(--text);}
|
||||
body.matchday .stadium-draft {background-color:#2c2c32fc;border-color:var(--border);color:var(--text);}
|
||||
body.silver .stadium-draft h2,body.matchday .stadium-draft h2,body.silver .stadium-place-number,body.matchday .stadium-place-number,body.silver .stadium-cost-row dt,body.matchday .stadium-cost-row dt,body.silver .stadium-cost-row dd,body.matchday .stadium-cost-row dd {color:var(--text);}
|
||||
body.silver .stadium-place-number,body.matchday .stadium-place-number {background-color:var(--input);border-color:var(--border);}
|
||||
body.silver .stadium-data-row.head,body.matchday .stadium-data-row.head {color:var(--muted);border-color:var(--border);}
|
||||
body.silver .stadium-data-row.striped {background-color:#42627d09;}
|
||||
body.matchday .stadium-data-row.striped {background-color:#f8e7e00a;}
|
||||
/* Ordinary Gold buttons retain their gradient; construction previews use separate palettes. */
|
||||
.stadium-nav-button,.stadium-scale,.stadium-dialog-action {background-color:transparent;decorator:linear-gradient(180deg,#c1d1e31c,#869eb312);color:#e0e6ec;}
|
||||
.stadium-nav-button:hover,.stadium-scale:hover,.stadium-dialog-action:hover {decorator:none;background-color:#d0e2f226;}
|
||||
.stadium-nav-button[aria-pressed=true],.stadium-scale[aria-pressed=true] {decorator:none;background-color:#9cafc240;border-color:#dce9f047;color:#f5f8fc;}
|
||||
.stadium-dialog-action.primary:not([disabled]) {decorator:none;background-color:#78b9a533;border-color:#a9dccb52;color:#d7efe5;}
|
||||
.stadium-block[disabled] {opacity:.85;border-color:#d8b77f52;background-color:#b6955d0d;}
|
||||
.stadium-facility[disabled] {opacity:.7;}
|
||||
body.silver .stadium-nav-button,body.silver .stadium-scale,body.silver .stadium-dialog-action {decorator:linear-gradient(180deg,#ffffffb0,#bfd0e259);background-color:transparent;color:var(--text);border-color:var(--border);}
|
||||
body.matchday .stadium-nav-button,body.matchday .stadium-scale,body.matchday .stadium-dialog-action {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);background-color:transparent;color:var(--text);border-color:var(--border);}
|
||||
body.silver .stadium-nav-button:hover,body.silver .stadium-scale:hover,body.silver .stadium-dialog-action:hover,body.matchday .stadium-nav-button:hover,body.matchday .stadium-scale:hover,body.matchday .stadium-dialog-action:hover {decorator:none;background-color:var(--hover);}
|
||||
body.silver .stadium-nav-button[aria-pressed=true],body.silver .stadium-scale[aria-pressed=true] {decorator:none;background-color:#a3c3dd54;border-color:#356f966e;color:#193b52;}
|
||||
body.matchday .stadium-nav-button[aria-pressed=true],body.matchday .stadium-scale[aria-pressed=true] {decorator:none;background-color:#d48c7b26;border-color:#e5a19770;color:#ffe5de;}
|
||||
body.silver .stadium-dialog-action.primary:not([disabled]) {decorator:none;background-color:#a3c3dd54;border-color:#356f966e;color:#25617a;}
|
||||
body.matchday .stadium-dialog-action.primary:not([disabled]) {decorator:none;background-color:#d48c7b26;border-color:#e5a19770;color:#efb2aa;}
|
||||
body.silver .stadium-block[disabled],body.matchday .stadium-block[disabled] {opacity:.85;border-color:#d8b77f52;background-color:#b6955d0d;}
|
||||
|
||||
.stadium-place-label>span {display:block;width:100%;white-space:nowrap;}
|
||||
@@ -102,6 +102,13 @@ wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut.
|
||||
Diese vier Ansichten verwenden fiktive Statistikwerte und lokale
|
||||
Ansichtsfilter; sie verändern weder Spielrevision noch Spiel-Dirty-Zustand.
|
||||
|
||||
- [Stadion](desktop/stadium/README.md): Innenansicht mit acht Blöcken,
|
||||
Sitzplätzen und Überdachung, acht Ausstattungsbereiche mit eigenen
|
||||
Stufengrafiken, lokalen Bauentwürfen, Kostenprüfung und Vormerkungen.
|
||||
Aktuell/Zukunft, Stadiondaten mit sechs Demo-Kurven und der gemeinsame
|
||||
Eintrittspreis sind umgesetzt. Der Peripherieausbau bleibt ausdrücklich
|
||||
für das angekündigte Redesign zurückgestellt; das Panorama ist nur Ansicht.
|
||||
|
||||
**Anstoß führt keine Aktion aus**, weder per Maus noch per Tastatur. Das gilt
|
||||
auch für die direkte Aktionsschnittstelle des Demoanbieters.
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ Implementierung in der Spiel-Engine.
|
||||
| Spielerstatistiken | [Tore, Vorlagen, Karten, Fotokarten und Bereichsauswahl](desktop/scorers/README.md) |
|
||||
| Fairplay | [Strafpunkte, Karten und Vereinsprofile](desktop/fairplay/README.md) |
|
||||
| Highscore | [Manager-Rangliste und zentrierte Kennzahlen](desktop/highscore/README.md) |
|
||||
| Stadion | [Blöcke A–H, Ausstattung und Stadiondaten ohne Peripherieausbau](desktop/stadium/README.md) |
|
||||
|
||||
Jeder Bereich nennt die geprüfte Quelle, bestehende Funktionen und offene
|
||||
Entscheidungen für die Engine-Anbindung. Die Architekturgrundlage bleibt der
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
# Stadion · native Modern UI
|
||||
|
||||
<!-- provider:start -->
|
||||
## Demo-Datenprovider und Bauvormerkungen
|
||||
|
||||
Stand: 25. Oktober 2026. Die Preis- und Bauvorlagen stammen aus dem
|
||||
privaten HTML-Stand `69eec91c`, `desktop/stadium-menus.js`. Der native
|
||||
Provider in [demo_stadium.hpp](../../../../src/modern/ui/demo_stadium.hpp)
|
||||
und [demo_stadium.cpp](../../../../src/modern/ui/demo_stadium.cpp) übernimmt
|
||||
ausschließlich die acht Stadionblöcke und acht Ausstattungseinträge.
|
||||
**Sämtlicher Peripheriebau ist ausdrücklich ausgeschlossen.**
|
||||
|
||||
`state.stadium` enthält genau `club`, `budget`, `blocks` und `facilities`.
|
||||
Ein Block besitzt `places`, `seats`, `roof` und `job`; eine Einrichtung
|
||||
`level` und `job`. Laufende Aufträge enthalten Zielwerte, Wochen und
|
||||
Kosten. Eintritt bleibt ausschließlich im gemeinsamen obersten
|
||||
Modellfeld `ticket`. Ansicht, Zukunftsschalter, Kurven, Filter und
|
||||
Dialogentwürfe gehören zur lokalen App-Navigation.
|
||||
|
||||
Der fiktive Ausgangsbestand umfasst ein separates Baubudget von
|
||||
50.000.000 angezeigten Währungseinheiten, die acht Blockkapazitäten
|
||||
3.000/6.000/3.000/5.000/3.000/6.000/3.000/7.000 und die
|
||||
Ausstattungsstufen 1/2/1/1/2/2/2/1. Gespeicherte Geldwerte und Quotes
|
||||
sind Minor Units aus dem Währungsmanifest: Faktor 1 bei null und Faktor
|
||||
100 bei zwei Nachkommastellen. Das echte Vereinsguthaben wird nicht als
|
||||
Baubudget verwendet oder verändert.
|
||||
|
||||
Blöcke bleiben in Tausenderschritten zwischen dem Istbestand und ihrem
|
||||
individuellen Maximum. Die acht Höchstkapazitäten betragen
|
||||
8.000/18.000/8.000/14.000/8.000/18.000/8.000/14.000. Je zusätzliche
|
||||
tausend Plätze gelten 300.000/375.000/300.000/350.000/300.000/375.000/
|
||||
300.000/350.000 sowie 30/37/30/25/30/37/30/25 angezeigte Bauwochen.
|
||||
Sitzplätze kosten zusätzlich 45 Prozent, Überdachung 30 Prozent der
|
||||
jeweiligen Blockrate. Ein neues Merkmal wird für sämtliche Zielplätze
|
||||
berechnet; ein vorhandenes Merkmal nur für zusätzliche Plätze. Bereits
|
||||
vorhandene Sitze oder Dächer können nicht entfernt werden. Ein reiner
|
||||
Merkmalsausbau ohne Platzplus ist zulässig; ein unveränderter oder
|
||||
kostenloser Entwurf bleibt gesperrt.
|
||||
|
||||
Flutlicht, Anzeigetafel, Rasenheizung, V.I.P.-Lounge, Rasenzustand,
|
||||
Stadionkomfort, Stadionzustand und Stadionsicherheit verwenden ihre
|
||||
jeweiligen festen HTML-Raten und Wochen. Heizung und V.I.P.-Lounge sind
|
||||
auf Stufe 2, die übrigen Einrichtungen auf Stufe 4 begrenzt. Mehrere
|
||||
Stufen können in einem Auftrag übersprungen werden; Kosten zählen die
|
||||
Stufendifferenz, Wochen bleiben die feste Vorlage des Eintrags.
|
||||
|
||||
Der einzige Providerbefehl lautet `{kind:"build",request:...}`. Der
|
||||
Blockrequest enthält genau `kind`, `index`, `places`, `seats`, `roof`,
|
||||
der Ausstattungsrequest `kind`, `index`, `level`. Beim Commit wird die
|
||||
Quote erneut aus dem aktuellen Bestand berechnet. Ungültige Stufen,
|
||||
Abbau, laufende Aufträge, No-op, Doppelbuchung oder unzureichendes
|
||||
Baubudget werden atomar abgewiesen. Zusätzliche fremde Aktions- oder
|
||||
Zustandsfelder werden nicht still übernommen. Restbudget plus Summe
|
||||
sämtlicher korrekt bepreister laufender Aufträge bleibt stets exakt
|
||||
50.000.000 angezeigte Einheiten.
|
||||
|
||||
`migrate_demo_stadium()` ergänzt nur ein vollständig fehlendes
|
||||
Stadionobjekt. Ein bestehender fehlerhafter Bestand wird unverändert
|
||||
abgewiesen, nicht repariert. Verein und Stadionname werden über echte
|
||||
Katalogreferenzen gebunden; ohne vorhandenen Stadionnamen erscheint
|
||||
„Stadion“. Die fiktiven Blöcke und Stufen werden weder aus der OBW-
|
||||
Kapazität noch aus einer Classic-Initialisierung berechnet. Ein leerer
|
||||
Katalog benötigt keine erfundenen Vereins- oder Stadion-IDs.
|
||||
|
||||
**OpenBMH deviates from the original:** Native Baukosten sind ausdrücklich
|
||||
an die Währungspräzision gebunden und Aufträge werden streng gegen die
|
||||
Preisformeln sowie die Budgetsumme validiert. Die Ansicht verwendet
|
||||
vorhandene Katalogidentität statt des festen HTML-Stadionnamens. Es gibt
|
||||
keinen Peripheriezustand und keine Peripherieaktion in diesem Paket.
|
||||
|
||||
Ein vorgemerkter Block zählt in der aktuellen Kapazität als gesperrt
|
||||
mit null Plätzen; die Zukunftsansicht zählt seine Zielkapazität. Dies
|
||||
gilt auch für einen reinen Sitz-/Dachumbau. Aufträge werden nur vorgemerkt:
|
||||
Wochen laufen nicht ab, Blöcke werden nicht fertiggestellt und keine
|
||||
Engine, Sitzung, Zufallsquelle, Spielzeit, Weltdatei oder fremde
|
||||
Finanz-/Vertragsdaten werden verändert. Eine spätere Modern-Session-
|
||||
Anbindung muss tatsächliche Bauabwicklung und deren Regeln liefern.
|
||||
|
||||
Synthetische Prüfungen stehen in
|
||||
[modern_stadium_ui_tests.cpp](../../../../tests/modern_stadium_ui_tests.cpp).
|
||||
Der isolierte Komponententest ist grün: acht Blockvorlagen, sämtliche
|
||||
legalen Ausstattungsstufen, Sitz-/Dachkosten, Tausenderschritte, EUR mit
|
||||
null und zwei Nachkommastellen, Budgeterhaltung, Stale-Quote-Ablehnung,
|
||||
Rollback, strenge Migration, JSON-Checkpoint-Roundtrip, leere Kataloge
|
||||
und unveränderte Welt-/Fremdmodelldaten. Ein Datumwechsel stellt keine
|
||||
Aufträge fertig. Der tatsächliche native Prüfstand folgt im UI-Abschnitt;
|
||||
diese Providerprüfung behauptet keine native Plattformabnahme.
|
||||
<!-- provider:end -->
|
||||
|
||||
## Native Ansichten und Bedienung
|
||||
|
||||
Die native Oberfläche folgt dem HTML-Gold `69eec91c`, insbesondere `stadium-menus.js`, `stadium-window.css`, `stadium-menus.css` und den Themeüberschreibungen. Acht Innenblöcke A–H sind sowohl über die unveränderten Buchstaben-Hitregionen auf der proportional dargestellten Innenansicht als auch über die acht rechten Karten erreichbar. Darunter stehen die acht Ausstattungen mit den gemessenen Stufengrafiken. Midnight, Silver und Matchday teilen die Geometrie und Schriftgrößen. Die Bilddateien und die 28 stufenbezogenen Zuschnitte liegen ausschließlich im getrennten GUI-Paket.
|
||||
|
||||
Die Block- und Ausstattungsdialoge verwenden lokale Entwürfe. Neue Plätze lassen sich in Tausenderschritten über den gemeinsamen Mengeneditor oder den direkten Regler ändern. Sitzplätze und Überdachung bleiben nach einem vorhandenen Ausbau aktiviert; ein Abbau wird nicht angeboten. Stufenkarten zeigen Vorschau, Mehrkosten und die aktuelle Auswahl. Der Kostenüberblick wird aus dem Provider nachgerechnet, bevor „Bauen“ einen einzigen Auftrag verbindlich vormerkt. Abbrechen und Escape verwerfen den Entwurf ohne Buchung. Auch während der Rückkehr aus dem Mengeneditor bleiben Sourceinstanz, Welt und Quellrevision gebunden. Ein zwischenzeitlich geänderter Stand darf keinen anderen Auftrag stillschweigend erhalten.
|
||||
|
||||
Nach dem Vormerken zeigt „Zukunft“ Zielplätze beziehungsweise Zielstufen, „Aktuell“ den unveränderten Bestand und die im Bau gesperrte Kapazität. Die Wochenangabe ist eine unveränderliche fiktive Vorschau, kein laufender Fortschritt. Eine Ausstattungsstufe wird nicht fertiggestellt. Das Ausbaubudget ist die separate Demogröße des Providers, das sichtbare Desktopkonto bleibt davon unberührt.
|
||||
|
||||
Die Stadiondaten besitzen sechs deterministische Vorschaukurven über 24 Spieltage, Kurvenumschalter, absolute und relative Darstellung sowie die Referenztabelle. Relative Kurven verwenden ihr eigenes Maximum; absolut gilt das Maximum aller sechs Datensätze, auch wenn eine Reihe ausgeblendet ist. Die Einnahmenkurve bleibt wie im Gold `Zuschauer×13`; ein Ticketwechsel berechnet nur den benötigten Zuschauerschnitt `ceil(94000/Preis)` neu. Bei Preis 0 erscheint ein Gedankenstrich. Der tatsächliche Eingangs-Ticketwert des Snapshots wird beibehalten, nicht für Referenzbilder auf 13 zurückgesetzt.
|
||||
|
||||
Die Preisknöpfe 00–25 verwenden den gemeinsamen obersten Sourcewert `ticket`. Ein anderer Preis öffnet eine explizite Bestätigung; erst deren Annahme führt den gebundenen Ticketbefehl aus. Auswahl des bereits aktuellen Preises ist ein No-op. Abbruch verändert weder Ticket noch Revision. Der gemeinsame Ticketpopover wird nicht zur Vorabzuweisung eines angeklickten Preises missbraucht; es gibt keinen zweiten Stadion-Ticketzustand.
|
||||
|
||||
Die Panoramaansicht ist ausschließlich ein unverändertes Bild mit proportionaler Darstellung. „Peripherie bauen“ bleibt dort deaktiviert und hat keinen Actionhandler. Es gibt keine Peripherie-Hotspots, Bauentwürfe, Kräne, Modellfelder oder Jobs. Die ausdrückliche Nutzer-Ausnahme zur Peripherie bleibt vollständig gewahrt.
|
||||
|
||||
View, Zukunftswahl, sechs Kurvenschalter, Skala, Dialog und Entwurf liegen nur in `stadium_view_`. Der gemeinsame Build einschließlich der parallel übernommenen M9-Engineänderungen und alle 29 Regressionstests bestehen. Die native Grundmatrix umfasst alle drei Themes bei 720p/1080p, sämtliche Block-/Facility-Zuordnungen, alle Stufenzuschnitte, aktuelle/geplante Darstellung und Datenansichten. Fünf funktionale Läufe prüfen lokale Entwürfe, Schrittfehler, genau eine Budgetbuchung, Pending-Sperren, gemeinsame Ticketwerte 0/25 in Desktop/Bilanz und einen echten Checkpoint-Neustart. Die gezielten Abschlussläufe bestätigen den Bildbeschnitt, die sichtbare Kapazitätsbeschriftung und Home/End am tatsächlich per Maus fokussierten Regler; die Navigation zum richtigen Range erfolgt über dessen interne Vorfahren. Ein eigener unabhängiger Abschluss besteht 27/27 Prüfungen mit identischem Quellmodell und Checkpoint nach Cancel. Alle früheren Aufnahmen behalten ihre tatsächlichen Runtimehashes. Die privaten Bilder, UI-Demostände und Replays liegen unter `docs/qa/stadium-batch-2026-10-25/`. Dies ist eine Linux-/OpenGL-Bildprüfung; eine visuelle Windows-/macOS-Laufzeitabnahme wird daraus nicht abgeleitet.
|
||||
@@ -158,3 +158,18 @@ Private Screenshots, UI-Demostände, Replays und Quell-/Runtimehashes:
|
||||
`docs/qa/statistics-batch-2026-10-25/`.
|
||||
Der Gesamtkatalog umfasst damit **31 native und 6 offene Routen**;
|
||||
die allgemeine Ansicht „Statistiken“ bleibt ein eigenes späteres Paket.
|
||||
|
||||
Das [Stadionpaket](desktop/stadium/README.md) umfasst Innenansicht, acht
|
||||
Blöcke A–H, Sitzplätze/Überdachung, acht Ausstattungsbereiche und deren
|
||||
Stufenbilder sowie Stadiondaten. Peripherieausbau ist ausdrücklich vom
|
||||
Nutzer zurückgestellt; im Panorama gibt es weder aktive Bauflächen noch
|
||||
Ausbauaktionen. Bauaufträge sind lokale Demo-Vormerkungen mit eigenem
|
||||
Ausbaubudget. Der Eintrittspreis bleibt mit Desktop und Finanzansicht
|
||||
gemeinsam. Die Quellen-/Modelltests prüfen auch alte Demostände,
|
||||
Clubwechsel, doppelte Aufträge und atomare Ablehnung ausgeschlossener
|
||||
Peripherieanfragen. Private Folgebelege liegen unter
|
||||
`docs/qa/stadium-batch-2026-10-25/`.
|
||||
Der Katalog umfasst **32 native und 5 noch offene Routen**, zusätzlich zu
|
||||
bewusst zurückgestellten Teilbereichen wie der Stadionperipherie.
|
||||
|
||||
Der Stadionabschluss besteht 29 Regressionstests. Die unabhängige native Zusatzprüfung besteht 27/27 Fälle, zusätzlich zu 26 Gold-Browser-Behaviors und dem Abgleich aller 28 GUI-Stufenreferenzen. Korrigiert wurden der innere Facility-Bildbeschnitt, die Kapazitätsbeschriftung und die Home/End-Zuordnung nach Mausfokus. Die funktionalen Nachweise enthalten getrennte ursprüngliche und korrigierte Runtimekohorten sowie echte Speicher-Neustarts.
|
||||
@@ -11,6 +11,7 @@ Bedienungsnachweise bleiben im privaten QA-Paket.
|
||||
| Länder-Picker außerhalb des Berichtpakets | P2 | Bewusste Neuwahl derselben Nation setzt in HTML auf deren erste Liga zurück. In Berichtmenüs, Kalender und Freundschaftsspielen umgesetzt; Manager noch gesondert angleichen. Abbrechen muss die Unterliga erhalten. |
|
||||
| Desktop/Rahmen | P2 | Vollständiger Bild-, Widgetinhalt- und Glasvergleich noch ausstehend; aktuelle Teilprüfungen betreffen einzelne Komponenten. |
|
||||
| Weitere Untermenüs | Offen | Noch nicht portierte Routen im Gesamtkatalog bleiben ausdrücklich `UNIMPLEMENTED`. |
|
||||
| Stadionperipherie | Zurückgestellt | Auf ausdrücklichen Nutzerwunsch vom Stadionpaket ausgenommen. Größeres Redesign folgt; das vorhandene Panorama ist nur Ansicht, seine Ausbau-Schaltfläche bleibt gesperrt. |
|
||||
|
||||
Mit dem [Berichtpaket](desktop/reports/README.md) sind Sortierung und
|
||||
Richtungshinweis, „Gesamt“, Formspalte, Qualifikationsfarben/-legende,
|
||||
@@ -32,7 +33,7 @@ gemeinsamen Controländerungen zusätzlich in mehreren Menüs nachgeprüft.
|
||||
Die erste Gesamterfassung enthält 36 Routen, davon zwölf native Aufnahmen
|
||||
und 24 ausstehende Ports. Diese historische Matrix bleibt unverändert.
|
||||
Der anschließend übertragene Kalender bekommt einen eigenen Vergleich;
|
||||
der aktuelle Runner erfasst 31 native Routen und 6 offene Ports.
|
||||
der aktuelle Runner erfasst 32 native Routen und 5 offene Ports.
|
||||
Spätere Meilensteine erfassen denselben Gesamtkatalog erneut.
|
||||
|
||||
Siehe [QA-Ablauf](menu-qa.md), [Typografie](typography-qa.md) und
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp)
|
||||
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp)
|
||||
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
|
||||
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
|
||||
add_library(bmh_modern_ui STATIC view.cpp ticket_popover.cpp)
|
||||
@@ -14,7 +14,7 @@ endif()
|
||||
set(modern_assets "${CMAKE_BINARY_DIR}/assets/modern")
|
||||
FetchContent_GetProperties(rmlui)
|
||||
file(MAKE_DIRECTORY "${modern_assets}")
|
||||
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss)
|
||||
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss)
|
||||
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
|
||||
endforeach()
|
||||
|
||||
@@ -91,7 +91,7 @@ if(MSVC)
|
||||
endif()
|
||||
add_test(NAME modern_control_layout_tests COMMAND modern_control_layout_tests "${modern_assets}")
|
||||
|
||||
foreach(component environment advertising toto lineup transfer)
|
||||
foreach(component environment advertising toto lineup transfer stadium)
|
||||
add_executable(modern_${component}_ui_tests ../../../tests/modern_${component}_ui_tests.cpp)
|
||||
target_link_libraries(modern_${component}_ui_tests PRIVATE bmh_modern_ui_core)
|
||||
if(MSVC)
|
||||
|
||||
@@ -165,6 +165,7 @@ void App::ProcessEvent(Rml::Event &event) try {
|
||||
if (popup_.empty() && amount_trigger_event(event)) return;
|
||||
if (popup_.empty() && report_detail_kind_.empty() && (lineup_event(event) || transfer_event(event))) return;
|
||||
if (popup_.empty() && report_detail_kind_.empty() && (career_report_event(event) || rankings_event(event))) return;
|
||||
if (report_detail_kind_.empty() && stadium_event(event)) return;
|
||||
if (popup_.empty() && contracts_event(event)) return;
|
||||
if (popup_.empty() && (advertising_event(event) || toto_event(event))) return;
|
||||
if (popup_.empty() && (bank_event(event) || finance_event(event))) return;
|
||||
@@ -388,9 +389,10 @@ void App::ProcessEvent(Rml::Event &event) try {
|
||||
: !planning_dialog_.empty() ? element("planning-layer")
|
||||
: !report_detail_kind_.empty() ? element("report-detail-layer")
|
||||
: !career_view_.value("dialog", "").empty() ? element("career-history-layer")
|
||||
: !stadium_view_.value("dialog", "").empty() ? element("stadium-modal")
|
||||
: element("canvas");
|
||||
root->QuerySelectorAll(
|
||||
controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty() || !career_view_.value("dialog", "").empty()
|
||||
controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty() || !career_view_.value("dialog", "").empty() || !stadium_view_.value("dialog", "").empty()
|
||||
? "button,input,select"
|
||||
: ".window button,.window input,.window select");
|
||||
controls.erase(std::remove_if(controls.begin(), controls.end(),
|
||||
@@ -458,6 +460,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
|
||||
target ? target->GetAttribute<Rml::String>("data-id", "") : std::string();
|
||||
if (lineup_action(action, target) || transfer_action(action, target)) return;
|
||||
if (career_report_action(action, target) || rankings_action(action, target)) return;
|
||||
if (stadium_action(action, target)) return;
|
||||
if (environment_action(action, target) || advertising_action(action, target) || toto_action(action, target)) return;
|
||||
if (amount_action(action, target) || bank_action(action, target) || finance_action(action, target) || contracts_action(action, target)) return;
|
||||
if (almanac_action(action, target) || planning_action(action, target) || indoor_action(action, target)) return;
|
||||
@@ -1071,7 +1074,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
|
||||
}
|
||||
static const std::set<std::string> available = {
|
||||
"tables", "strengths", "camp", "settings",
|
||||
"save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer", "achievements", "scorers", "fairplay", "highscore"};
|
||||
"save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer", "achievements", "scorers", "fairplay", "highscore", "stadium"};
|
||||
if (!available.contains(route)) {
|
||||
message("Diese native Ansicht wird im nächsten Menüpaket übertragen.");
|
||||
return;
|
||||
@@ -1463,6 +1466,7 @@ void App::script() {
|
||||
{"lineup_view", {{"pitch", lineup_pitch_}, {"data", lineup_data_}, {"page", lineup_page_}, {"side", lineup_side_}, {"selected", lineup_selected_}, {"drag", lineup_drag_}}},
|
||||
{"transfer_view", transfer_view_}, {"transfer_dialog", transfer_dialog_}, {"transfer_draft", transfer_draft_},
|
||||
{"career_view", career_view_}, {"rankings_view", rankings_view_},
|
||||
{"stadium_view", stadium_view_},
|
||||
{"contracts_view", {{"dialog", contracts_dialog_}, {"player", contracts_player_}, {"tab", contracts_tab_}, {"draft", contract_draft_}}},
|
||||
{"amount_editor", amount_ ? Json{{"title", amount_->request.title}, {"raw", amount_->raw}, {"review", amount_->review}, {"error", amount_error()}} : Json()},
|
||||
{"source_revision", source_ ? Json(snap().revision) : Json()},
|
||||
|
||||
@@ -0,0 +1,261 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include "modern/ui/demo_finance.hpp"
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
constexpr int64_t budget_units = 50000000;
|
||||
constexpr std::array<int, 8> capacities{8000,18000,8000,14000,8000,18000,8000,14000};
|
||||
constexpr std::array<int, 8> initial_places{3000,6000,3000,5000,3000,6000,3000,7000};
|
||||
constexpr std::array<int, 8> initial_levels{1,2,1,1,2,2,2,1};
|
||||
constexpr std::array<int, 8> block_rates{300000,375000,300000,350000,300000,375000,300000,350000};
|
||||
constexpr std::array<int, 8> block_weeks{30,37,30,25,30,37,30,25};
|
||||
constexpr std::array<const char *, 8> block_names{
|
||||
"Nordwest-Kurve", "Nord-Tribüne", "Nordost-Kurve", "Ost-Block",
|
||||
"Südost-Kurve", "Süd-Tribüne", "Südwest-Kurve", "West-Block"};
|
||||
constexpr std::array<const char *, 8> facility_names{
|
||||
"Flutlichtanlage", "Anzeigetafel", "Rasenheizung", "V.I.P.-Lounge",
|
||||
"Rasenzustand", "Stadionkomfort", "Stadionzustand", "Stadionsicherheit"};
|
||||
constexpr std::array<int, 8> facility_rates{250000,350000,850000,1200000,180000,200000,300000,400000};
|
||||
constexpr std::array<int, 8> facility_weeks{12,15,16,18,8,5,10,14};
|
||||
bool keys(const Json &value, std::initializer_list<const char *> expected) {
|
||||
return value.is_object() && value.size() == expected.size() &&
|
||||
std::all_of(expected.begin(), expected.end(), [&](auto *key) { return value.contains(key); });
|
||||
}
|
||||
bool integer(const Json &value, int64_t low, int64_t high) {
|
||||
if (value.is_number_unsigned())
|
||||
return high >= 0 && value.get<uint64_t>() <= uint64_t(high) &&
|
||||
(low <= 0 || value.get<uint64_t>() >= uint64_t(low));
|
||||
return value.is_number_integer() && value.get<int64_t>() >= low && value.get<int64_t>() <= high;
|
||||
}
|
||||
int facility_cap(size_t index) { return index == 2 || index == 3 ? 2 : 4; }
|
||||
Json error(const char *code) { return {{"ok", false}, {"can_build", false}, {"error", code}}; }
|
||||
std::string owner(const Catalog &world, const Json *state, std::string requested) {
|
||||
if (requested.empty() && state && state->is_object()) {
|
||||
const auto managers = state->find("managers");
|
||||
if (managers != state->end() && managers->is_array() && !managers->empty() && (*managers)[0].is_object()) {
|
||||
const auto club = (*managers)[0].find("club");
|
||||
if (club != (*managers)[0].end() && club->is_string()) requested = club->get<std::string>();
|
||||
}
|
||||
}
|
||||
if (!requested.empty()) {
|
||||
if (!world.manageable(requested)) throw editor::Error("invalid_stadium_club");
|
||||
return requested;
|
||||
}
|
||||
for (const auto *club : world.clubs())
|
||||
if (world.manageable(club->at("id").get<std::string>())) return club->at("id").get<std::string>();
|
||||
return {};
|
||||
}
|
||||
bool block_target(const Json &base, const Json &target, size_t index) {
|
||||
return integer(target.at("places"), base.at("places").get<int64_t>(), capacities[index]) &&
|
||||
target.at("places").get<int64_t>() % 1000 == 0 &&
|
||||
target.at("seats").is_boolean() && target.at("roof").is_boolean() &&
|
||||
!(base.at("seats").get<bool>() && !target.at("seats").get<bool>()) &&
|
||||
!(base.at("roof").get<bool>() && !target.at("roof").get<bool>());
|
||||
}
|
||||
Json block_price(const Json &base, const Json &target, size_t index, int64_t factor) {
|
||||
const auto added = target.at("places").get<int64_t>() - base.at("places").get<int64_t>();
|
||||
const int64_t rate = block_rates[index] * factor;
|
||||
const int64_t places = added / 1000 * rate;
|
||||
// All fixed rates and legal thousand-place steps divide exactly. This is
|
||||
// Gold's nearest-integer calculation without floating-point currency drift.
|
||||
const int64_t seats = target.at("seats").get<bool>()
|
||||
? (base.at("seats").get<bool>() ? added : target.at("places").get<int64_t>()) / 1000 * rate * 45 / 100 : 0;
|
||||
const int64_t roof = target.at("roof").get<bool>()
|
||||
? (base.at("roof").get<bool>() ? added : target.at("places").get<int64_t>()) / 1000 * rate * 30 / 100 : 0;
|
||||
return {{"cost", places + seats + roof}, {"weeks", block_weeks[index]},
|
||||
{"placesCost", places}, {"seatsCost", seats}, {"roofCost", roof}};
|
||||
}
|
||||
} // namespace
|
||||
|
||||
Json demo_stadium(const Catalog &world, const std::string &club) {
|
||||
Json blocks = Json::array(), facilities = Json::array();
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
blocks.push_back({{"places", initial_places[i]}, {"seats", false}, {"roof", false}, {"job", nullptr}});
|
||||
facilities.push_back({{"level", initial_levels[i]}, {"job", nullptr}});
|
||||
}
|
||||
return {{"club", owner(world, nullptr, club)}, {"budget", budget_units * finance_currency_factor(world)},
|
||||
{"blocks", blocks}, {"facilities", facilities}};
|
||||
}
|
||||
|
||||
bool valid_demo_stadium(const Json &state, const Catalog &world, const std::string &club) {
|
||||
try {
|
||||
if (!state.is_object()) return false;
|
||||
const int64_t factor = finance_currency_factor(world), cap = budget_units * factor;
|
||||
const auto &stadium = state.at("stadium");
|
||||
if (!keys(stadium, {"club", "budget", "blocks", "facilities"}) ||
|
||||
!stadium.at("club").is_string() || stadium.at("club") != owner(world, &state, club) ||
|
||||
!integer(stadium.at("budget"), 0, cap) ||
|
||||
!stadium.at("blocks").is_array() || stadium.at("blocks").size() != 8 ||
|
||||
!stadium.at("facilities").is_array() || stadium.at("facilities").size() != 8) return false;
|
||||
int64_t pending = 0;
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("blocks")[i];
|
||||
if (!keys(base, {"places", "seats", "roof", "job"}) ||
|
||||
!integer(base.at("places"), 0, capacities[i]) || base.at("places").get<int64_t>() % 1000 ||
|
||||
!base.at("seats").is_boolean() || !base.at("roof").is_boolean()) return false;
|
||||
const auto &job = base.at("job");
|
||||
if (job.is_null()) continue;
|
||||
if (!keys(job, {"places", "seats", "roof", "weeks", "cost"}) ||
|
||||
!block_target(base, job, i) || !integer(job.at("cost"), 1, cap)) return false;
|
||||
const auto quote = block_price(base, job, i, factor);
|
||||
if (!integer(job.at("weeks"), block_weeks[i], block_weeks[i]) ||
|
||||
job.at("cost") != quote.at("cost")) return false;
|
||||
const auto cost = job.at("cost").get<int64_t>();
|
||||
if (cost > cap - pending) return false;
|
||||
pending += cost;
|
||||
}
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("facilities")[i];
|
||||
if (!keys(base, {"level", "job"}) || !integer(base.at("level"), 1, facility_cap(i))) return false;
|
||||
const auto &job = base.at("job");
|
||||
if (job.is_null()) continue;
|
||||
if (!keys(job, {"level", "weeks", "cost"}) ||
|
||||
!integer(job.at("level"), base.at("level").get<int64_t>() + 1, facility_cap(i)) ||
|
||||
!integer(job.at("weeks"), facility_weeks[i], facility_weeks[i]) ||
|
||||
!integer(job.at("cost"), 1, cap)) return false;
|
||||
const int64_t cost = (job.at("level").get<int64_t>() - base.at("level").get<int64_t>()) * facility_rates[i] * factor;
|
||||
if (job.at("cost") != cost || cost > cap - pending) return false;
|
||||
pending += cost;
|
||||
}
|
||||
return stadium.at("budget").get<int64_t>() == cap - pending;
|
||||
} catch (const std::exception &) { return false; }
|
||||
}
|
||||
|
||||
bool migrate_demo_stadium(Json &state, const Catalog &world, const std::string &club) {
|
||||
try {
|
||||
if (!state.is_object()) return false;
|
||||
if (state.contains("stadium")) return valid_demo_stadium(state, world, club);
|
||||
auto next = state;
|
||||
next["stadium"] = demo_stadium(world, owner(world, &state, club));
|
||||
if (!valid_demo_stadium(next, world, club)) return false;
|
||||
state = std::move(next);
|
||||
return true;
|
||||
} catch (const std::exception &) { return false; }
|
||||
}
|
||||
|
||||
Json demo_stadium_quote(const Json &state, const Json &request, const Catalog &world, const std::string &club) {
|
||||
if (!valid_demo_stadium(state, world, club)) return error("invalid_stadium_state");
|
||||
try {
|
||||
if (!request.is_object() || !request.contains("kind") || !request.at("kind").is_string() ||
|
||||
!request.contains("index") || !integer(request.at("index"), 0, 7)) return error("invalid_stadium_request");
|
||||
const auto kind = request.at("kind").get<std::string>();
|
||||
const auto index = request.at("index").get<size_t>();
|
||||
const auto &stadium = state.at("stadium");
|
||||
const int64_t factor = finance_currency_factor(world);
|
||||
Json quote;
|
||||
bool pending = false;
|
||||
if (kind == "block") {
|
||||
const auto &base = stadium.at("blocks")[index];
|
||||
if (!keys(request, {"kind", "index", "places", "seats", "roof"}) ||
|
||||
!block_target(base, request, index)) return error("invalid_stadium_block_target");
|
||||
quote = block_price(base, request, index, factor);
|
||||
pending = !base.at("job").is_null();
|
||||
} else if (kind == "facility") {
|
||||
const auto &base = stadium.at("facilities")[index];
|
||||
if (!keys(request, {"kind", "index", "level"}) ||
|
||||
!integer(request.at("level"), base.at("level").get<int64_t>(), facility_cap(index)))
|
||||
return error("invalid_stadium_facility_target");
|
||||
quote = {{"cost", (request.at("level").get<int64_t>() - base.at("level").get<int64_t>()) * facility_rates[index] * factor},
|
||||
{"weeks", facility_weeks[index]}, {"placesCost", 0}, {"seatsCost", 0}, {"roofCost", 0}};
|
||||
pending = !base.at("job").is_null();
|
||||
} else return error("unknown_stadium_request");
|
||||
const auto cost = quote.at("cost").get<int64_t>(), budget = stadium.at("budget").get<int64_t>();
|
||||
const auto reason = pending ? "stadium_pending" : !cost ? "stadium_no_change"
|
||||
: cost > budget ? "stadium_budget_exceeded" : "";
|
||||
quote["ok"] = true; quote["can_build"] = !*reason; quote["error"] = reason;
|
||||
quote["kind"] = kind; quote["index"] = index; quote["request"] = request;
|
||||
quote["budget"] = budget; quote["remaining"] = budget - cost;
|
||||
return quote;
|
||||
} catch (const std::exception &) { return error("invalid_stadium_request"); }
|
||||
}
|
||||
|
||||
std::string edit_demo_stadium(Json &state, const Json &action, const Catalog &world, const std::string &club) {
|
||||
if (!valid_demo_stadium(state, world, club)) return "invalid_stadium_state";
|
||||
try {
|
||||
if (!keys(action, {"kind", "request"}) || action.at("kind") != "build") return "invalid_stadium_action";
|
||||
const auto quote = demo_stadium_quote(state, action.at("request"), world, club);
|
||||
if (!quote.value("ok", false) || !quote.value("can_build", false)) return quote.value("error", std::string("invalid_stadium_request"));
|
||||
const auto &request = quote.at("request");
|
||||
const auto index = quote.at("index").get<size_t>();
|
||||
Json job = {{"weeks", quote.at("weeks")}, {"cost", quote.at("cost")}};
|
||||
auto next = state;
|
||||
if (quote.at("kind") == "block") {
|
||||
for (const auto *key : {"places", "seats", "roof"}) job[key] = request.at(key);
|
||||
next["stadium"]["blocks"][index]["job"] = job;
|
||||
} else {
|
||||
job["level"] = request.at("level");
|
||||
next["stadium"]["facilities"][index]["job"] = job;
|
||||
}
|
||||
next["stadium"]["budget"] = quote.at("remaining");
|
||||
if (!valid_demo_stadium(next, world, club)) return "invalid_stadium_state";
|
||||
state = std::move(next);
|
||||
return {};
|
||||
} catch (const std::exception &) { return "invalid_stadium_action"; }
|
||||
}
|
||||
|
||||
Json demo_stadium_rules(const Catalog &world) {
|
||||
const auto factor = finance_currency_factor(world);
|
||||
Json blocks = Json::array(), facilities = Json::array();
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
blocks.push_back({{"index", i}, {"letter", std::string(1, char('A' + i))}, {"name", block_names[i]},
|
||||
{"max_places", capacities[i]}, {"rate", block_rates[i] * factor}, {"weeks", block_weeks[i]}});
|
||||
const Json levels = i == 2 || i == 3 ? Json({"", "nicht vorhanden", "vorhanden"})
|
||||
: i < 2 ? Json({"", "klein", "mittel", "groß", "mega"})
|
||||
: Json({"", "schlecht", "ausreichend", "gut", "sehr gut"});
|
||||
facilities.push_back({{"index", i}, {"name", facility_names[i]}, {"max_level", facility_cap(i)},
|
||||
{"rate", facility_rates[i] * factor}, {"weeks", facility_weeks[i]}, {"levels", levels}});
|
||||
}
|
||||
return {{"budget_cap", budget_units * factor}, {"blocks", blocks}, {"facilities", facilities}};
|
||||
}
|
||||
|
||||
Json demo_stadium_view(const Json &state, const Catalog &world, bool future, const std::string &club) {
|
||||
if (!valid_demo_stadium(state, world, club)) return error("invalid_stadium_state");
|
||||
const auto &stadium = state.at("stadium");
|
||||
const auto id = stadium.at("club").get<std::string>();
|
||||
const auto *team = world.find("clubs", id);
|
||||
const Json *record = nullptr;
|
||||
if (team) {
|
||||
if (auto ref = team->find("stadium"); ref != team->end() && ref->is_string()) record = world.find("stadiums", ref->get<std::string>());
|
||||
if (!record) for (const auto &candidate : world.rows("stadiums")) {
|
||||
const auto ref = candidate.find("owner");
|
||||
if (ref != candidate.end() && ref->is_string() && ref->get<std::string>() == id) { record = &candidate; break; }
|
||||
}
|
||||
}
|
||||
auto rules = demo_stadium_rules(world);
|
||||
int64_t pending = 0, available = 0, planned = 0;
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("blocks")[i];
|
||||
const auto &job = base.at("job");
|
||||
const bool building = !job.is_null();
|
||||
const auto &display = future && building ? job : base;
|
||||
auto &row = rules["blocks"][i];
|
||||
for (const auto *key : {"places", "seats", "roof", "job"}) row[key] = base.at(key);
|
||||
row["building"] = building;
|
||||
row["display_places"] = building && !future ? Json(0) : display.at("places");
|
||||
row["display_seats"] = display.at("seats"); row["display_roof"] = display.at("roof");
|
||||
available += building ? 0 : base.at("places").get<int64_t>();
|
||||
planned += building ? job.at("places").get<int64_t>() : base.at("places").get<int64_t>();
|
||||
if (building) pending += job.at("cost").get<int64_t>();
|
||||
}
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("facilities")[i]; const auto &job = base.at("job");
|
||||
const bool building = !job.is_null();
|
||||
auto &row = rules["facilities"][i];
|
||||
row["level"] = base.at("level"); row["job"] = job; row["building"] = building;
|
||||
const int level = (future && building ? job : base).at("level").get<int>();
|
||||
row["display_level"] = level; row["display_label"] = row.at("levels")[size_t(level)];
|
||||
if (building) pending += job.at("cost").get<int64_t>();
|
||||
}
|
||||
rules["ok"] = true; rules["club"] = id; rules["club_name"] = team ? world.name(*team) : "—";
|
||||
rules["stadium"] = record ? record->at("id") : Json();
|
||||
const auto name = record ? world.name(*record) : "";
|
||||
rules["name"] = name.empty() ? "Stadion" : name;
|
||||
rules["budget"] = stadium.at("budget"); rules["pending_cost"] = pending;
|
||||
rules["available_capacity"] = available; rules["planned_capacity"] = planned;
|
||||
rules["capacity"] = future ? planned : available;
|
||||
return rules;
|
||||
}
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,42 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#pragma once
|
||||
#include "modern/ui/catalog.hpp"
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
// Presentation-only construction ledger. Only state.stadium is owned here:
|
||||
// {club,budget,blocks:[{places,seats,roof,job}],facilities:[{level,job}]}.
|
||||
// All money is currency minor units. No periphery, ticket, navigation, engine,
|
||||
// random stream, world edit, legacy initialization, or completion timer.
|
||||
Json demo_stadium(const Catalog &, const std::string &club = {});
|
||||
bool valid_demo_stadium(const Json &state, const Catalog &,
|
||||
const std::string &club = {});
|
||||
// Initialize only an entirely absent stadium object. Existing invalid data is
|
||||
// rejected unchanged; budget plus all correctly priced pending jobs is 50M.
|
||||
bool migrate_demo_stadium(Json &state, const Catalog &,
|
||||
const std::string &club = {});
|
||||
// Only {kind:"build",request:{kind:"block",index,places,seats,roof}} or
|
||||
// {kind:"build",request:{kind:"facility",index,level}}. Recompute the quote,
|
||||
// atomically debit only local stadium budget and stage a pending job.
|
||||
std::string edit_demo_stadium(Json &state, const Json &action, const Catalog &,
|
||||
const std::string &club = {});
|
||||
// {ok,can_build,error,request,kind,index,cost,weeks,budget,remaining,
|
||||
// placesCost,seatsCost,roofCost}. All monetary values are raw minor units.
|
||||
// Invalid input/downgrades => ok=false; no-op, pending target or insufficient
|
||||
// budget => ok=true,can_build=false with a precise error and usable quote.
|
||||
// Explicit club wins; otherwise full state.managers[0].club, then legacy first
|
||||
// manageable club, or "" for a catalogue without manageable clubs.
|
||||
Json demo_stadium_quote(const Json &state, const Json &request, const Catalog &,
|
||||
const std::string &club = {});
|
||||
// {budget_cap,blocks:[index,letter,name,max_places,rate,weeks],
|
||||
// facilities:[index,name,max_level,rate,weeks,levels]}. Rates are raw; level
|
||||
// labels are 1-based with an empty entry at index 0. No artwork is required.
|
||||
Json demo_stadium_rules(const Catalog &);
|
||||
// {ok,club,club_name,name,stadium,budget,budget_cap,pending_cost,
|
||||
// available_capacity,planned_capacity,capacity,blocks,facilities}.
|
||||
// Rule rows above are augmented with unchanged base values/job/building plus
|
||||
// display_places/seats/roof or display_level/label for the requested view.
|
||||
// Current capacity excludes a block with any pending job; future uses its target.
|
||||
// Stadium identity comes from the catalogue, not its initialization policies.
|
||||
Json demo_stadium_view(const Json &state, const Catalog &, bool future = false,
|
||||
const std::string &club = {});
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "modern/ui/demo_sports.hpp"
|
||||
#include "modern/ui/demo_lineup.hpp"
|
||||
#include "modern/ui/demo_transfer.hpp"
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include "modern/ui/desktop.hpp"
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
@@ -96,6 +97,8 @@ DemoSource::DemoSource(std::shared_ptr<const Catalog> catalog)
|
||||
throw editor::Error("invalid_demo_club");
|
||||
if (!migrate_demo_lineup(state_, *catalog_, club) || !migrate_demo_transfer(state_, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_squad");
|
||||
if (!migrate_demo_stadium(state_, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_stadium");
|
||||
saved_ = state_;
|
||||
}
|
||||
Snapshot DemoSource::snapshot() const { return {revision_, catalog_, state_}; }
|
||||
@@ -137,6 +140,7 @@ ActionResult DemoSource::apply(const Action &action) {
|
||||
next["contracts"] = demo_contracts(*catalog_, first);
|
||||
next["lineup"] = demo_lineup(*catalog_, first);
|
||||
next["transfer"] = demo_transfer(*catalog_, first);
|
||||
next["stadium"] = demo_stadium(*catalog_, first);
|
||||
next["calendar"] = demo_calendar(*catalog_, next.at("date"), first);
|
||||
const auto error = edit_demo_reports(next["reports"],
|
||||
{{"kind", "league"}, {"value", next["calendar"]["league"]}}, *catalog_);
|
||||
@@ -152,6 +156,9 @@ ActionResult DemoSource::apply(const Action &action) {
|
||||
const auto error = action.kind == "lineup" ? edit_demo_lineup(next, action.value, *catalog_, club)
|
||||
: edit_demo_transfer(next, action.value, *catalog_, club);
|
||||
if (!error.empty()) return {false, revision_, error};
|
||||
} else if (action.kind == "stadium") {
|
||||
const auto error = edit_demo_stadium(next, action.value, *catalog_, next["managers"][0]["club"]);
|
||||
if (!error.empty()) return {false, revision_, error};
|
||||
} else if (action.kind == "finance") {
|
||||
const auto error = edit_demo_finance(next, action.value, *catalog_, next["managers"][0]["club"]);
|
||||
if (!error.empty()) return {false, revision_, error};
|
||||
@@ -280,6 +287,8 @@ Json DemoSource::load(const fs::path &file) {
|
||||
throw editor::Error("invalid_demo_club");
|
||||
if (!migrate_demo_lineup(data, *catalog_, club) || !migrate_demo_transfer(data, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_squad");
|
||||
if (!migrate_demo_stadium(data, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_stadium");
|
||||
auto next = data;
|
||||
auto desktop = next.value("desktop", Json::object());
|
||||
if (!migrate_desktop(desktop))
|
||||
|
||||
@@ -895,6 +895,8 @@ std::string App::render_menu(const std::string &key) {
|
||||
body = render_fairplay();
|
||||
else if (key == "highscore")
|
||||
body = render_highscore();
|
||||
else if (key == "stadium")
|
||||
body = render_stadium();
|
||||
else if (key == "environment")
|
||||
body = render_environment();
|
||||
else if (key == "advertising")
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
std::optional<int> stadium_integer(const std::string &text,int maximum) {
|
||||
const auto dot=text.find('.');const auto whole=text.substr(0,dot);
|
||||
if(whole.empty()||whole.size()>8||std::any_of(whole.begin(),whole.end(),[](char c){return c<'0'||c>'9';}))return {};
|
||||
if(dot!=std::string::npos&&(dot+1==text.size()||std::any_of(text.begin()+std::ptrdiff_t(dot+1),text.end(),[](char c){return c!='0';})))return {};
|
||||
const auto value=std::stoll(whole);return value<=maximum?std::optional<int>(int(value)):std::optional<int>();
|
||||
}
|
||||
} // namespace
|
||||
void App::sync_stadium_draft() {
|
||||
stadium_view_defaults(stadium_view_);if(stadium_view_.at("dialog")==""||!stadium_view_.at("draft").is_object())return;
|
||||
const auto s=snap();const bool fresh=s.world==stadium_world_&&source_.get()==stadium_source_&&s.revision==stadium_revision_&&stadium_managed(s)==stadium_view_.value("bound_club",std::string());
|
||||
const auto q=fresh?demo_stadium_quote(s.state,stadium_view_.at("draft"),*s.world,stadium_managed(s)):Json{{"ok",false}};
|
||||
auto feedback=stadium_view_.at("feedback").get<std::string>();
|
||||
if(!fresh)feedback="Der Stadionstand hat sich geändert. Bitte den Ausbau erneut öffnen.";
|
||||
if(feedback.empty())feedback=stadium_feedback(q,stadium_view_.at("invalid_places").get<bool>());
|
||||
if(auto *n=element("stadium-draft-feedback"))n->SetInnerRML(esc(feedback));
|
||||
if(auto *n=element("stadium-quote-total"))n->SetInnerRML(s.world?esc(stadium_money(stadium_field(q,"cost"),*s.world)):"—");
|
||||
for(const auto *key:{"placesCost","seatsCost","roofCost"})if(auto *n=element("stadium-cost-"+std::string(key)))n->SetInnerRML(s.world?esc(stadium_money(stadium_field(q,key),*s.world)):"—");
|
||||
if(auto *button=element("stadium-build")) {
|
||||
if(!fresh||!q.value("can_build",false)||stadium_view_.at("invalid_places").get<bool>())button->SetAttribute("disabled",true);
|
||||
else button->RemoveAttribute("disabled");
|
||||
}
|
||||
if(stadium_view_.at("dialog")=="block")if(auto *button=element("stadium-place-number"))button->SetInnerRML("<span class=\"control-label\">"+std::to_string(stadium_view_.at("draft").at("places").get<int64_t>())+"</span>");
|
||||
dirty_=true;
|
||||
}
|
||||
bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
if(!action.starts_with("stadium-"))return false;
|
||||
if(menu_!="stadium"||!source_||!world_||amount_||!popup_.empty()||!report_detail_kind_.empty())return true;
|
||||
stadium_view_defaults(stadium_view_);const auto s=snap();const auto club=stadium_managed(s);
|
||||
if(club.empty()||!s.world)return true;
|
||||
const auto overview=demo_stadium_view(s.state,*s.world,stadium_view_.at("future").get<bool>(),club);if(!overview.value("ok",false))return true;
|
||||
const auto id=target?target->GetAttribute<Rml::String>("data-id",""):std::string();
|
||||
const auto index=stadium_integer(id,25);
|
||||
const auto fresh=[&](){const auto now=snap();return stadium_world_&&now.world==stadium_world_&&source_.get()==stadium_source_&&now.revision==stadium_revision_&&stadium_managed(now)==stadium_view_.value("bound_club",std::string());};
|
||||
const auto cancel=[&](){const auto restore=stadium_view_.at("return_focus").get<std::string>();stadium_view_["dialog"]="";stadium_view_["draft"]=Json();stadium_view_["feedback"]="";stadium_view_["invalid_places"]=false;stadium_view_["return_focus"]="";stadium_world_.reset();stadium_source_=nullptr;stadium_revision_=0;focus_after_render_=restore.empty()?"stadium-data":restore;refresh();};
|
||||
if(action=="stadium-cancel"){cancel();return true;}
|
||||
if(action=="stadium-ticket") {
|
||||
if(!index||stadium_view_.at("dialog")!="")return true;
|
||||
if(s.state.at("ticket")==*index)return true;
|
||||
const auto world=s.world;const auto *source=source_.get();const auto revision=s.revision;const int value=*index;const auto focus=target->GetId();
|
||||
stadium_view_["ticket_return_focus"]=focus;
|
||||
confirmation("Eintritt auf "+std::to_string(value)+" "+money_unit()+" ändern?",[this,world,source,revision,value,focus] {
|
||||
if(menu_!="stadium"||source_.get()!=source||snap().world!=world) {message("Der Eintritt konnte nicht übernommen werden. Bitte den aktuellen Stadionstand erneut öffnen.");return;}
|
||||
const auto result=source_->apply({revision,"ticket",value});
|
||||
if(!result.ok){message("Der Eintritt konnte nicht übernommen werden. Bitte den aktuellen Stadionstand erneut öffnen.");return;}
|
||||
stadium_view_["ticket_return_focus"]="";focus_after_render_=focus;refresh();
|
||||
});
|
||||
return true;
|
||||
}
|
||||
if(action=="stadium-build") {
|
||||
if(stadium_view_.at("dialog")==""||!stadium_view_.at("draft").is_object())return true;
|
||||
if(!fresh()){stadium_view_["feedback"]="Der Stadionstand hat sich geändert. Bitte den Ausbau erneut öffnen.";sync_stadium_draft();return true;}
|
||||
const auto q=demo_stadium_quote(s.state,stadium_view_.at("draft"),*s.world,club);
|
||||
if(!q.value("can_build",false)||stadium_view_.at("invalid_places").get<bool>()){sync_stadium_draft();return true;}
|
||||
const auto result=source_->apply({stadium_revision_,"stadium",{{"kind","build"},{"request",stadium_view_.at("draft")}}});
|
||||
if(!result.ok){stadium_view_["feedback"]="Der Bauauftrag konnte nicht übernommen werden. Bitte den aktuellen Stand erneut öffnen.";sync_stadium_draft();return true;}
|
||||
stadium_view_["future"]=true;stadium_view_["return_focus"]="stadium-future";cancel();return true;
|
||||
}
|
||||
if(action=="stadium-option") {
|
||||
if(stadium_view_.at("dialog")!="facility"||!index||!fresh())return true;
|
||||
const int i=stadium_view_.at("draft").at("index").get<int>();const auto &row=overview.at("facilities")[size_t(i)];
|
||||
if(*index<=row.at("level").get<int>()||*index>row.at("max_level").get<int>())return true;
|
||||
stadium_view_["draft"]["level"]=*index;stadium_view_["feedback"]="";focus_after_render_="stadium-option-"+id;refresh();return true;
|
||||
}
|
||||
if(action=="stadium-places-editor") {
|
||||
if(stadium_view_.at("dialog")!="block"||!fresh())return true;
|
||||
const int i=stadium_view_.at("draft").at("index").get<int>();const auto &row=overview.at("blocks")[size_t(i)];
|
||||
const auto world=stadium_world_;const auto *source=stadium_source_;const auto revision=stadium_revision_;
|
||||
AmountRequest request;request.title="Neue Gesamtplätze";request.unit="Plätze";request.return_focus="stadium-place-number";request.value=stadium_view_.at("draft").at("places").get<int64_t>();request.min=row.at("places").get<int64_t>();request.max=row.at("max_places").get<int64_t>();request.step=1000;request.suggestion_step=1000;request.review=false;
|
||||
request.accept=[this,world,source,revision,i](int64_t value) {
|
||||
if(menu_!="stadium"||stadium_view_.value("dialog",std::string())!="block"||source_.get()!=source||snap().world!=world||snap().revision!=revision||stadium_revision_!=revision||!stadium_view_.at("draft").is_object()||stadium_view_.at("draft").value("index",-1)!=i||value%1000)return false;
|
||||
stadium_view_["draft"]["places"]=value;stadium_view_["invalid_places"]=false;stadium_view_["feedback"]="";refresh();return true;
|
||||
};
|
||||
open_amount(std::move(request));return true;
|
||||
}
|
||||
if(stadium_view_.at("dialog")!="")return true;
|
||||
if(action=="stadium-block"||action=="stadium-facility") {
|
||||
if(!index||*index>7||!target)return true;
|
||||
const bool block=action=="stadium-block";
|
||||
const auto &row=overview.at(block?"blocks":"facilities")[size_t(*index)];
|
||||
if(row.at("building").get<bool>())return true;
|
||||
if(!block&&row.at("level").get<int>()>=row.at("max_level").get<int>()){message("Diese Ausstattung ist bereits vollständig ausgebaut oder im Bau.");return true;}
|
||||
stadium_view_["draft"]=block?Json{{"kind","block"},{"index",*index},{"places",std::min(row.at("max_places").get<int>(),row.at("places").get<int>()+1000)},{"seats",row.at("seats")},{"roof",row.at("roof")}}:Json{{"kind","facility"},{"index",*index},{"level",row.at("level").get<int>()+1}};
|
||||
stadium_view_["dialog"]=block?"block":"facility";stadium_view_["bound_club"]=club;stadium_view_["feedback"]="";stadium_view_["invalid_places"]=false;stadium_view_["return_focus"]=target->GetId();stadium_world_=s.world;stadium_revision_=s.revision;stadium_source_=source_.get();focus_after_render_=block?"stadium-place-number":"stadium-option-"+std::to_string(row.at("level").get<int>()+1);refresh();return true;
|
||||
}
|
||||
if(action=="stadium-view"){stadium_view_["view"]=stadium_view_.at("view")=="inside"?"panorama":"inside";focus_after_render_="stadium-view";}
|
||||
else if(action=="stadium-future"){if(stadium_view_.at("view")!="inside")return true;stadium_view_["future"]=!stadium_view_.at("future").get<bool>();focus_after_render_="stadium-future";}
|
||||
else if(action=="stadium-data"){stadium_view_["view"]="data";focus_after_render_="stadium-back";}
|
||||
else if(action=="stadium-back"){stadium_view_["view"]="inside";focus_after_render_="stadium-data";}
|
||||
else if(action=="stadium-curve"){if(!index||*index>5)return true;stadium_view_["curves"][size_t(*index)]=!stadium_view_.at("curves")[size_t(*index)].get<bool>();focus_after_render_="stadium-curve-"+id;}
|
||||
else if(action=="stadium-scale"){if(!index||*index>1)return true;stadium_view_["relative"]=bool(*index);focus_after_render_="stadium-scale-"+id;}
|
||||
else return true;
|
||||
refresh();return true;
|
||||
}
|
||||
bool App::stadium_event(Rml::Event &event) {
|
||||
if(menu_!="stadium"||!source_||!report_detail_kind_.empty())return false;
|
||||
stadium_view_defaults(stadium_view_);const auto type=event.GetType();auto *target=event.GetTargetElement();
|
||||
const auto key=type=="keydown"?Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier",0)):Rml::Input::KI_UNKNOWN;
|
||||
if(!popup_.empty()) {
|
||||
if(stadium_view_.at("ticket_return_focus")!="") {
|
||||
std::string action;for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->HasAttribute("data-action")){action=n->GetAttribute<Rml::String>("data-action","");break;}
|
||||
if(key==Rml::Input::KI_ESCAPE||(type=="click"&&action=="popup-close")) {focus_after_render_=stadium_view_.at("ticket_return_focus").get<std::string>();stadium_view_["ticket_return_focus"]="";refresh();}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if(amount_)return false;
|
||||
const bool dialog=stadium_view_.at("dialog")!="";
|
||||
if((type=="keydown"&&key==Rml::Input::KI_ESCAPE)||(dialog&&type=="mouseup"&&event.GetParameter<int>("button",0)==1)) {
|
||||
if(dialog)stadium_action("stadium-cancel",nullptr);
|
||||
else if(stadium_view_.at("view")=="data")stadium_action("stadium-back",nullptr);
|
||||
else return false;
|
||||
event.StopImmediatePropagation();return true;
|
||||
}
|
||||
Rml::Element *place_range=nullptr;
|
||||
for(auto *node=target;node&&node!=doc_;node=node->GetParentNode())if(node->GetId()=="stadium-place-range"){place_range=node;break;}
|
||||
if(dialog&&type=="keydown"&&place_range&&stadium_view_.at("dialog")=="block"&&(key==Rml::Input::KI_HOME||key==Rml::Input::KI_END)) {
|
||||
const auto s=snap();
|
||||
if(s.world==stadium_world_&&source_.get()==stadium_source_&&s.revision==stadium_revision_) {
|
||||
const auto current=demo_stadium_view(s.state,*s.world,false,stadium_managed(s));
|
||||
if(current.value("ok",false)) {
|
||||
const auto &row=current.at("blocks")[stadium_view_.at("draft").at("index").get<size_t>()];
|
||||
const int value=row.at(key==Rml::Input::KI_HOME?"places":"max_places").get<int>();
|
||||
if(value>=row.at("places").get<int>()&&value<=row.at("max_places").get<int>()&&value%1000==0) {
|
||||
stadium_view_["draft"]["places"]=value;stadium_view_["invalid_places"]=false;stadium_view_["feedback"]="";
|
||||
if(auto *range=dynamic_cast<Rml::ElementFormControl*>(place_range))range->SetValue(std::to_string(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
sync_stadium_draft();event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(dialog&&type=="keydown"&&key==Rml::Input::KI_TAB) {
|
||||
Rml::ElementList controls;if(auto *modal=element("stadium-modal"))modal->QuerySelectorAll(controls,"button,input");controls.erase(std::remove_if(controls.begin(),controls.end(),[](auto *n){return n->HasAttribute("disabled")||!n->IsVisible(true);}),controls.end());
|
||||
if(!controls.empty()){const auto it=std::find(controls.begin(),controls.end(),context_->GetFocusElement());const bool back=event.GetParameter<int>("shift_key",0)!=0;const int old=it==controls.end()?(back?0:-1):int(it-controls.begin());controls[size_t((old+(back?-1:1)+int(controls.size()))%int(controls.size()))]->Focus(true);}event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(dialog&&(type=="input"||type=="change")&&target&&stadium_view_.at("dialog")=="block") {
|
||||
if(auto *control=dynamic_cast<Rml::ElementFormControl*>(target)) {
|
||||
if(target->GetId()=="stadium-place-range") {
|
||||
const auto value=stadium_integer(control->GetValue(),18000);const auto s=snap();const int i=stadium_view_.at("draft").at("index").get<int>();const auto current=demo_stadium_view(s.state,*s.world,false,stadium_managed(s));const auto &row=current.at("blocks")[size_t(i)];
|
||||
if(!value||*value%1000||*value<row.at("places").get<int>()||*value>row.at("max_places").get<int>())stadium_view_["invalid_places"]=true;
|
||||
else {stadium_view_["draft"]["places"]=*value;stadium_view_["invalid_places"]=false;stadium_view_["feedback"]="";}sync_stadium_draft();event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(target->HasAttribute("data-stadium-feature")) {
|
||||
const auto field=target->GetAttribute<Rml::String>("data-stadium-feature","");if(field!="seats"&&field!="roof")return true;
|
||||
stadium_view_["draft"][field]=target->HasAttribute("checked");stadium_view_["feedback"]="";
|
||||
if(auto *image=element("stadium-feature-image-"+field)){const bool checked=stadium_view_.at("draft").at(field).get<bool>();image->SetInnerRML(picture(renderer_.diagram("stadium-feature-"+field+(checked?"-built-":"-empty-")+theme_,stadium_feature_svg(field,checked,theme_),232),116,116));}
|
||||
sync_stadium_draft();event.StopImmediatePropagation();return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(dialog) {
|
||||
bool inside=false;for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->GetId()=="stadium-modal")inside=true;
|
||||
if(!inside&&(type=="click"||type=="dblclick"||type=="mousedown"||type=="mouseup"||type=="keydown")){event.StopImmediatePropagation();return true;}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
const Json &stadium_field(const Json &j,const char *key) {
|
||||
static const Json absent;
|
||||
if(j.is_object())if(const auto i=j.find(key);i!=j.end())return *i;
|
||||
return absent;
|
||||
}
|
||||
void stadium_view_defaults(Json &v) {
|
||||
if(!v.is_object())v=Json::object();
|
||||
if(!v.contains("view")||!v.at("view").is_string()||(v.at("view")!="inside"&&v.at("view")!="panorama"&&v.at("view")!="data"))v["view"]="inside";
|
||||
for(const auto *key:{"future","relative","invalid_places"})if(!v.contains(key)||!v.at(key).is_boolean())v[key]=std::string(key)=="relative";
|
||||
if(!v.contains("curves")||!v.at("curves").is_array()||v.at("curves").size()!=6||!std::all_of(v.at("curves").begin(),v.at("curves").end(),[](const auto &x){return x.is_boolean();}))v["curves"]={true,true,true,true,true,true};
|
||||
for(const auto *key:{"dialog","return_focus","ticket_return_focus","feedback"})if(!v.contains(key)||!v.at(key).is_string())v[key]="";
|
||||
if(v.at("dialog")!=""&&v.at("dialog")!="block"&&v.at("dialog")!="facility")v["dialog"]="";
|
||||
if(!v.contains("draft"))v["draft"]=Json();
|
||||
}
|
||||
std::string stadium_managed(const Snapshot &s) {
|
||||
const auto &m=stadium_field(s.state,"managers");
|
||||
return m.is_array()&&!m.empty()&&stadium_field(m[0],"club").is_string()?m[0].at("club").get<std::string>():"";
|
||||
}
|
||||
std::string stadium_money(const Json &value,const Catalog &world) {
|
||||
return value.is_number_integer()?money(value.get<int64_t>(),world.manifest().value("currency",Json::object())):"—";
|
||||
}
|
||||
std::string stadium_feedback(const Json "e,bool invalid) {
|
||||
if(invalid)return "Bitte eine gültige Gesamtzahl in Tausenderschritten eingeben.";
|
||||
if(!quote.value("ok",false))return "Bitte einen gültigen Ausbau auswählen.";
|
||||
const auto error=quote.value("error",std::string());
|
||||
if(error.find("budget")!=std::string::npos||quote.value("cost",int64_t(0))>quote.value("budget",int64_t(0)))return "Das POC-Budget reicht für diesen Ausbau nicht aus.";
|
||||
if(!quote.value("can_build",false))return "Bitte einen Ausbau auswählen.";
|
||||
return "Fiktiver Bauauftrag; Spielzeit und Desktopkonto bleiben unverändert.";
|
||||
}
|
||||
std::string stadium_svg(const std::string &body,double w,double h) {
|
||||
return "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 "+scalar(w)+" "+scalar(h)+"\">"+body+"</svg>";
|
||||
}
|
||||
std::string stadium_feature_svg(const std::string &kind,bool built,const std::string &theme) {
|
||||
const std::string color=theme=="silver"?"#25617a":theme=="matchday"?"#efb2aa":built?"#b7e0d1":"#a8cbbd";
|
||||
const auto path=kind=="seats"?"M7 4h16v13H7zM5 20h22v5H5zM8 25v5M24 25v5M9 9h14":"M2 16 16 4l14 12M6 15v14M26 15v14M10 17h12v12H10";
|
||||
return stadium_svg("<path d=\""+std::string(path)+"\" fill=\"none\" stroke=\""+color+"\" stroke-width=\"1.7\" stroke-linecap=\"round\" stroke-linejoin=\"round\" opacity=\""+(built?"1":".32")+"\"/>",32,32);
|
||||
}
|
||||
std::string stadium_graph_svg(const Json &curves,bool relative,const std::string &theme) {
|
||||
constexpr std::array<const char*,6> colors{"#8fbaa6","#8cacc9","#adb7c1","#cf9088","#c5b384","#729aae"};
|
||||
std::array<std::array<double,24>,6> values{};double maximum=0;
|
||||
for(int i=0;i<24;++i) {
|
||||
const double attendance=std::round(24000+7000*std::sin(i*.7)+i*130);
|
||||
const std::array<double,6> row{attendance,double(11+i/8),double(12000000+i*220000),double(18000+i*750),attendance*13,double(70000+i*1500)};
|
||||
for(size_t k=0;k<6;++k){values[k][size_t(i)]=row[k];maximum=std::max(maximum,row[k]);}
|
||||
}
|
||||
const std::string divider=theme=="silver"?"#6c879c28":theme=="matchday"?"#ead9da16":"#9eb6c44d";
|
||||
std::string svg="<path d=\"M50 20V590H3570\" fill=\"none\" stroke=\""+divider+"\" stroke-width=\"2\"/>";
|
||||
for(double x:{.25,.5,.75})svg+="<path d=\"M55 "+scalar(570-x*530)+"H3570\" fill=\"none\" stroke=\""+divider+"\" stroke-width=\"2\" stroke-dasharray=\"12 16\"/>";
|
||||
for(size_t k=0;k<6;++k)if(curves[k].get<bool>()) {
|
||||
const double scale=relative?*std::max_element(values[k].begin(),values[k].end()):maximum;
|
||||
svg+="<polyline fill=\"none\" stroke=\""+std::string(colors[k])+"\" stroke-width=\"6\" points=\"";
|
||||
for(size_t i=0;i<24;++i)svg+=scalar(70+i*3460.0/23)+","+scalar(570-values[k][i]/scale*530)+" ";
|
||||
svg+="\"/>";
|
||||
}
|
||||
return stadium_svg(svg,3600,620);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
std::string App::render_stadium() {
|
||||
stadium_view_defaults(stadium_view_);const auto snapshot=snap();const auto club=stadium_managed(snapshot);
|
||||
if(!snapshot.world||club.empty())return "<p class=\"stadium-empty\">Die Stadionvorschau ist derzeit nicht verfügbar.</p>";
|
||||
const bool future=stadium_view_.at("future").get<bool>();
|
||||
const auto overview=demo_stadium_view(snapshot.state,*snapshot.world,future,club);
|
||||
if(!overview.value("ok",false))return "<p class=\"stadium-empty\">Die Stadionvorschau ist derzeit nicht verfügbar.</p>";
|
||||
const auto view=stadium_view_.at("view").get<std::string>();
|
||||
const auto feature=[&](const std::string &kind,bool built,double size) {return picture(renderer_.diagram("stadium-feature-"+kind+(built?"-built-":"-empty-")+theme_,stadium_feature_svg(kind,built,theme_),232),size,size);};
|
||||
const auto art_overlay=[&](int i,int level,double w,double natural_h) {
|
||||
// Texture cover handles the base art. This independent125dp SVG viewport
|
||||
// clips overlays at the same boundary, even for absolutely positioned text.
|
||||
constexpr double viewport_h=125;const double dy=(viewport_h-natural_h)/2;std::string body;
|
||||
if(i==1) {
|
||||
const double x=level==1?.28:level==3?.13:level==4?.12:.10,y=level==3?.24:level==4?.63:.30,rw=level==1?.40:level==3?.72:level==4?.74:.60,rh=level==1?.28:level==3?.24:level==4?.18:.45;
|
||||
const std::string color=level==2?"#ff593e":theme_=="silver"?(level==4?"#233443":"#805b18"):theme_=="matchday"?(level==4?"#efeded":"#e1c68b"):level==1?"#edc960":level==3?"#dfdc67":"#d9e8ef";
|
||||
body+="<text x=\""+scalar(w*(x+rw/2))+"\" y=\""+scalar(dy+natural_h*(y+rh/2))+"\" dominant-baseline=\"central\" text-anchor=\"middle\" font-family=\"monospace\" font-size=\"33\" letter-spacing=\"4\" fill=\""+color+"\">2 : 1</text>";
|
||||
}
|
||||
if(((i==2||i==3)&&level<2)||(i==5&&level==1)) {
|
||||
const std::string color=theme_=="silver"?"#a23f45":theme_=="matchday"?"#f0a6a7":"#df8c80";
|
||||
body+="<g transform=\"translate("+scalar((w-100)/2)+" "+scalar(dy+(natural_h-100)/2)+")\"><path d=\"M14 14L86 86M86 14L14 86\" stroke=\""+color+"\" stroke-width=\"9\" fill=\"none\"/></g>";
|
||||
}
|
||||
if(i==5&&level>1) {
|
||||
const std::string color=theme_=="silver"?"#805b18":theme_=="matchday"?"#e1c68b":"#e0c99b";
|
||||
const int n=level-1;for(int k=0;k<n;++k)body+="<g transform=\"translate("+scalar((w-(n*52+(n-1)*8))/2+k*60)+" "+scalar(dy+(natural_h-52)/2)+") scale("+scalar(52.0/48)+")\"><path d=\"m24 3 6 13 15 2-11 11 3 15-13-7-13 7 3-15L3 18l15-2Z\" fill=\""+color+"\"/></g>";
|
||||
}
|
||||
if(body.empty())return std::string();
|
||||
return "<span class=\"stadium-art-overlay\" style=\""+rect(0,0,w,viewport_h)+"\">"+picture(renderer_.diagram("stadium-card-overlay-"+std::to_string(i)+"-"+std::to_string(level)+"-"+theme_,stadium_svg(body,w,viewport_h),1564),w,viewport_h)+"</span>";
|
||||
};
|
||||
std::string out="<div class=\"stadium-screen\" id=\"stadium-underlay\"><header class=\"stadium-heading\"><div class=\"stadium-heading-copy\"><h2>"+esc(overview.at("name").get<std::string>())+"</h2><p>"+(view=="inside"?"Innenansicht":view=="panorama"?"Panorama":"Stadiondaten")+"</p></div><div class=\"stadium-summary\"><div><span>"+(future?"Geplante Kapazität":"Verfügbare Kapazität")+std::string("</span><strong>")+number(overview.at("capacity").get<int64_t>())+" <small>Plätze</small></strong></div><div><span>Ausbaubudget</span><strong>"+esc(stadium_money(overview.at("budget"),*snapshot.world))+"</strong></div></div></header>";
|
||||
if(view=="inside") {
|
||||
constexpr double bowl_h=1430.0*1045/1505;
|
||||
out+="<div class=\"stadium-bowl\">"+img("art.stadium-interior-v1.png",1426,bowl_h-4,false,false,2048);
|
||||
constexpr std::array<std::array<double,2>,8> letters{{{{21,20}},{{50,11}},{{80,20}},{{91,50}},{{81,80}},{{50,84}},{{20,80}},{{9,50}}}};
|
||||
for(size_t i=0;i<8;++i) {
|
||||
const auto &b=overview.at("blocks")[i];const bool building=b.at("building").get<bool>();
|
||||
out+=btn("stadium-block",b.at("letter").get<std::string>(),std::string("stadium-letter ")+(building?"building":""),"id=\"stadium-letter-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" style=\""+rect(letters[i][0]*14.26-48,letters[i][1]*(bowl_h-4)/100-46,96,92)+"\" aria-label=\"Block "+b.at("letter").get<std::string>()+", "+esc(b.at("name").get<std::string>())+"\" "+(building?"disabled=\"disabled\"":""));
|
||||
}
|
||||
out+="</div>";
|
||||
for(size_t i=0;i<8;++i) {
|
||||
const auto &b=overview.at("blocks")[i];const bool building=b.at("building").get<bool>();
|
||||
const auto &j=b.at("job");const auto detail=future?(building?"Im Bau: "+number(j.at("places").get<int64_t>())+" Plätze":"kein Bau"):number(b.at("display_places").get<int64_t>())+" Plätze";
|
||||
const auto note=future?(building?"Bauzeit: "+std::to_string(j.at("weeks").get<int>())+" Wochen":""):("max. "+number(b.at("max_places").get<int64_t>()));
|
||||
const double top=note.empty()?48.625:34.625;
|
||||
out+=btn("stadium-block","<span class=\"stadium-block-copy\" style=\"top:"+scalar(top)+"dp;\"><strong>Block "+b.at("letter").get<std::string>()+"</strong><span>"+esc(detail)+"</span><small>"+esc(note)+"</small></span><span class=\"stadium-block-icons\">"+feature("seats",b.at("display_seats").get<bool>(),76)+feature("roof",b.at("display_roof").get<bool>(),76)+"</span>","stadium-block "+std::string(building?"building":""),"id=\"stadium-block-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" style=\""+rect(1822,134+i*201.25,790,189.25)+"\" "+(building?"disabled=\"disabled\"":""));
|
||||
}
|
||||
for(size_t i=0;i<8;++i) {
|
||||
const auto &f=overview.at("facilities")[i];const int level=f.at("display_level").get<int>();const auto art=renderer_.image("stadium.facility."+std::to_string(i)+".level."+std::to_string(level),false,2048);const double h=art.width?391.0*art.height/art.width:215;
|
||||
const auto caption=f.at("display_label").get<std::string>()+(f.at("building").get<bool>()?" · "+std::to_string(f.at("job").at("weeks").get<int>())+" W.":"");
|
||||
out+=btn("stadium-facility","<span class=\"stadium-facility-picture\">"+picture(art,391,125,true)+art_overlay(int(i),level,391,h)+"</span><strong>"+esc(f.at("name").get<std::string>())+"</strong><span class=\"stadium-facility-caption\">"+esc(caption)+"</span>","stadium-facility","id=\"stadium-facility-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" style=\""+rect((i%4)*411,1148+(i/4)*214,395,198)+"\" aria-label=\""+esc(f.at("name").get<std::string>()+", "+caption)+"\" "+(f.at("building").get<bool>()?"disabled=\"disabled\"":""));
|
||||
}
|
||||
} else if(view=="panorama") {
|
||||
constexpr double panorama_h=2612.0*941/1672;
|
||||
out+="<div class=\"stadium-panorama\">"+img("art.stadium-panorama-v2.png",2608,panorama_h-4,false,false,2880)+"</div>";
|
||||
} else {
|
||||
const auto graph=stadium_graph_svg(stadium_view_.at("curves"),stadium_view_.at("relative").get<bool>(),theme_);
|
||||
out+="<div class=\"stadium-graph\"><div class=\"stadium-graph-art\">"+picture(renderer_.diagram("stadium-graph",graph,7200),2560,456)+"</div></div>";
|
||||
constexpr std::array<const char*,6> colors{"#8fbaa6","#8cacc9","#adb7c1","#cf9088","#c5b384","#729aae"},names{"Zuschauer","Eintritt","Stadionwert","Zus. Stadion-Einnahmen","Einnahmen","Stadionkosten"};
|
||||
for(size_t i=0;i<6;++i)out+=btn("stadium-curve","<span class=\"stadium-curve-color\" style=\"background-color:"+std::string(colors[i])+";\"></span><span class=\"stadium-curve-label\">"+names[i]+"</span>","stadium-curve","id=\"stadium-curve-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" aria-pressed=\""+(stadium_view_.at("curves")[i].get<bool>()?"true":"false")+"\" style=\""+rect((i%3)*754.666666667,660+(i/3)*90,732.666666667,74)+"\"");
|
||||
for(int i=0;i<2;++i)out+=btn("stadium-scale",i?"Relativ":"Absolut","stadium-scale","id=\"stadium-scale-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" aria-pressed=\""+(stadium_view_.at("relative").get<bool>()==bool(i)?"true":"false")+"\" style=\""+rect(2282,660+i*90,330,74)+"\"");
|
||||
const auto factor=finance_currency_factor(*snapshot.world);const auto currency=snapshot.world->manifest().value("currency",Json::object());const auto cash=[&](int64_t n){return money(n*factor,currency);};
|
||||
std::vector<std::string> other_clubs;for(const auto *c:snapshot.world->clubs())if(c->value("id","")!=club&&other_clubs.size()<2&&c->value("type",std::string("club"))=="club")other_clubs.push_back(snapshot.world->name(*c));
|
||||
const std::array<std::array<std::string,4>,6> rows{{{{"","Liga","DFB-Pokal","Europapokal"}},{{"Max. Zuschauer","34.800 · "+(other_clubs.size()>0?other_clubs[0]:"—"),"35.200 · "+(other_clubs.size()>1?other_clubs[1]:"—"),"–"}},{{"Max. Einnahmen",cash(452400),cash(457600),"–"}},{{"Heimspiele","15","3","0"}},{{"Ø Zuschauer","28.450","31.200","–"}},{{"Ges. Einnahmen",cash(5547750),cash(1216800),"–"}}}};
|
||||
out+="<div class=\"stadium-data-table\">";
|
||||
for(size_t i=0;i<6;++i){out+="<div class=\"stadium-data-row "+std::string(i==0?"head":i%2?"striped":"")+"\">";for(size_t k=0;k<4;++k)out+="<div class=\"stadium-data-cell "+std::string(k?"":"first")+"\"><span>"+esc(rows[i][k])+"</span></div>";out+="</div>";}out+="</div>";
|
||||
const int ticket=snapshot.state.at("ticket").get<int>();
|
||||
out+="<p class=\"stadium-required\"><span>Benötigter Zuschauerschnitt bei "+esc(cash(ticket))+" Eintritt: </span><span class=\"stadium-required-value\">"+(ticket?number((94000+ticket-1)/ticket):"–")+"</span></p><div class=\"stadium-ticket\"><strong>Eintritt:</strong>";
|
||||
for(int price=0;price<=25;++price)out+=btn("stadium-ticket",(price<10?"0":"")+std::to_string(price),"stadium-ticket-price","id=\"stadium-ticket-"+std::to_string(price)+"\" data-id=\""+std::to_string(price)+"\" aria-pressed=\""+(price==ticket?"true":"false")+"\" aria-label=\"Eintritt "+std::to_string(price)+" "+esc(money_unit())+"\"");
|
||||
out+="</div>";
|
||||
}
|
||||
out+="<nav class=\"stadium-nav\">";
|
||||
if(view=="data")out+=btn("stadium-back","Zurück zum Stadion","stadium-nav-button wide","id=\"stadium-back\"");
|
||||
else {
|
||||
out+=btn("stadium-view",view=="inside"?"Sicht: Panorama":"Sicht: Innen","stadium-nav-button","id=\"stadium-view\"");
|
||||
out+=view=="inside"?btn("stadium-future",std::string("Ausbau: ")+(future?"Zukunft":"Aktuell"),"stadium-nav-button","id=\"stadium-future\" aria-pressed=\""+std::string(future?"true":"false")+"\""):"<button class=\"stadium-nav-button control-button\" disabled=\"disabled\"><span class=\"control-label\">Peripherie bauen</span></button>";
|
||||
out+=btn("stadium-data","Stadion-Daten","stadium-nav-button","id=\"stadium-data\"");
|
||||
}
|
||||
return out+"</nav></div>"+render_stadium_dialog();
|
||||
}
|
||||
|
||||
std::string App::render_stadium_dialog() {
|
||||
stadium_view_defaults(stadium_view_);if(stadium_view_.at("dialog")=="")return "";
|
||||
const auto s=snap();if(!s.world||!stadium_view_.at("draft").is_object())return "";
|
||||
const auto &d=stadium_view_.at("draft");const bool block=d.at("kind")=="block";const int index=d.at("index").get<int>();
|
||||
const auto overview=demo_stadium_view(s.state,*s.world,false,stadium_managed(s));if(!overview.value("ok",false))return "";
|
||||
const auto &row=overview.at(block?"blocks":"facilities")[size_t(index)];const auto q=demo_stadium_quote(s.state,d,*s.world,stadium_managed(s));
|
||||
struct Option {int level;Picture art;double height;};std::vector<Option> options;double option_h=0;
|
||||
if(!block)for(int level=row.at("level").get<int>()+1;level<=row.at("max_level").get<int>();++level){const auto a=renderer_.image("stadium.facility."+std::to_string(index)+".level."+std::to_string(level),false,2048);const double h=a.width?592.0*a.height/a.width:325;options.push_back({level,a,h});option_h=std::max(option_h,h+159);}
|
||||
const double height=block?982.5:option_h+499,total_top=block?687.5:option_h+204,feedback_top=block?776.5:option_h+293,actions_top=block?854.5:option_h+371;
|
||||
const auto title=block?"Block "+row.at("letter").get<std::string>()+" · "+row.at("name").get<std::string>():row.at("name").get<std::string>();
|
||||
std::string out="<div class=\"stadium-modal\" id=\"stadium-modal\"><section class=\"stadium-draft\" id=\"stadium-draft\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"stadium-draft-title\" style=\""+rect(226,(1864-height)/2,2160,height)+"\"><h2 id=\"stadium-draft-title\">"+esc(title)+" ausbauen</h2><div class=\"stadium-draft-summary\"><span>POC-Budget: "+esc(stadium_money(overview.at("budget"),*s.world))+"</span><span>Bauzeit: "+std::to_string(q.value("weeks",row.at("weeks").get<int>()))+" Wochen</span></div>";
|
||||
if(block) {
|
||||
out+="<section class=\"stadium-place-field\"><strong>Block "+row.at("letter").get<std::string>()+"</strong><p>Aktuell: "+number(row.at("places").get<int64_t>())+" Plätze</p><span class=\"stadium-place-label\"><span>Neue Gesamtplätze</span></span>"+btn("stadium-places-editor",std::to_string(d.at("places").get<int64_t>()),"stadium-place-number amount-trigger","id=\"stadium-place-number\"")+"<input type=\"range\" id=\"stadium-place-range\" min=\""+std::to_string(row.at("places").get<int>())+"\" max=\""+std::to_string(row.at("max_places").get<int>())+"\" step=\"1000\" value=\""+std::to_string(d.at("places").get<int>())+"\" aria-label=\"Neue Gesamtplätze\"/></section><div class=\"stadium-features\">";
|
||||
const std::array<const char*,2> features{"seats","roof"},labels{"Sitzplätze","Überdachung"};
|
||||
for(size_t i=0;i<2;++i){const bool built=row.at(features[i]).get<bool>();const bool checked=d.at(features[i]).get<bool>();out+="<label class=\"stadium-feature-row\"><input type=\"checkbox\" id=\"stadium-feature-"+std::string(features[i])+"\" data-stadium-feature=\""+features[i]+"\" "+(checked?"checked=\"checked\" ":"")+(built?"disabled=\"disabled\" ":"")+"/><span class=\"stadium-feature-image\" id=\"stadium-feature-image-"+std::string(features[i])+"\">"+picture(renderer_.diagram("stadium-feature-"+std::string(features[i])+(checked?"-built-":"-empty-")+theme_,stadium_feature_svg(features[i],checked,theme_),232),116,116)+"</span><span>"+labels[i]+"</span></label>";}
|
||||
out+="</div><dl class=\"stadium-costs\">";
|
||||
const std::array<const char*,3> keys{"placesCost","seatsCost","roofCost"},names{"Neue Plätze","Sitzplätze","Überdachung"};
|
||||
for(size_t i=0;i<3;++i)out+="<div class=\"stadium-cost-row\" style=\"top:"+scalar(i*51.5)+"dp;\"><dt>"+std::string(names[i])+"</dt><dd id=\"stadium-cost-"+keys[i]+"\">"+esc(stadium_money(stadium_field(q,keys[i]),*s.world))+"</dd></div>";
|
||||
out+="</dl>";
|
||||
} else {
|
||||
const double total=options.size()*640+(options.size()-1)*28,left=52+(2052-total)/2;
|
||||
for(size_t i=0;i<options.size();++i) {
|
||||
const auto &o=options[i];const bool selected=d.at("level")==o.level;const double group_offset=(option_h-o.height-159)/2;
|
||||
// Facility options share the same source cells; overlays are rendered at the natural art size.
|
||||
std::string art=picture(o.art,592,o.height);
|
||||
if(index==1) {
|
||||
const double x=o.level==1?.28:o.level==3?.13:o.level==4?.12:.10,y=o.level==3?.24:o.level==4?.63:.30,rw=o.level==1?.40:o.level==3?.72:o.level==4?.74:.60,rh=o.level==1?.28:o.level==3?.24:o.level==4?.18:.45;
|
||||
const std::string color=o.level==2?"#ff593e":theme_=="silver"?(o.level==4?"#233443":"#805b18"):theme_=="matchday"?(o.level==4?"#efeded":"#e1c68b"):o.level==3?"#dfdc67":"#d9e8ef";
|
||||
const auto svg=stadium_svg("<text x=\"50%\" y=\"50%\" text-anchor=\"middle\" dominant-baseline=\"central\" font-family=\"monospace\" font-size=\"33\" letter-spacing=\"4\" fill=\""+color+"\">2 : 1</text>",592*rw,o.height*rh);
|
||||
art+="<span class=\"stadium-art-overlay\" style=\""+rect(592*x,o.height*y,592*rw,o.height*rh)+"\">"+picture(renderer_.diagram("stadium-option-score-"+std::to_string(o.level)+"-"+theme_,svg,1536),592*rw,o.height*rh)+"</span>";
|
||||
}
|
||||
if(index==5){const std::string color=theme_=="silver"?"#805b18":theme_=="matchday"?"#e1c68b":"#e0c99b";const auto svg=stadium_svg("<path d=\"m24 3 6 13 15 2-11 11 3 15-13-7-13 7 3-15L3 18l15-2Z\" fill=\""+color+"\"/>",48,48);const int n=o.level-1;for(int j=0;j<n;++j)art+="<span class=\"stadium-art-overlay\" style=\""+rect((592-(n*52+(n-1)*8))/2+j*60,(o.height-52)/2,52,52)+"\">"+picture(renderer_.diagram("stadium-option-star-"+theme_,svg,104),52,52)+"</span>";}
|
||||
out+=btn("stadium-option","<span class=\"stadium-option-art\" style=\"height:"+scalar(o.height)+"dp;top:"+scalar(22+group_offset)+"dp;\">"+art+"</span><strong style=\"top:"+scalar(22+o.height+20+group_offset)+"dp;\">"+esc(row.at("levels")[size_t(o.level)].get<std::string>())+"</strong><span class=\"stadium-option-price\" style=\"top:"+scalar(22+o.height+20+37+20+group_offset)+"dp;\">"+esc(stadium_money(Json(int64_t(o.level-row.at("level").get<int>())*row.at("rate").get<int64_t>()),*s.world))+"</span>","stadium-option","id=\"stadium-option-"+std::to_string(o.level)+"\" data-id=\""+std::to_string(o.level)+"\" aria-pressed=\""+(selected?"true":"false")+"\" style=\""+rect(left+i*668,174,640,option_h)+"\"");
|
||||
}
|
||||
}
|
||||
const auto custom=stadium_view_.at("feedback").get<std::string>();const auto feedback=custom.empty()?stadium_feedback(q,stadium_view_.at("invalid_places").get<bool>()):custom;
|
||||
out+="<div class=\"stadium-draft-total\" style=\"top:"+scalar(total_top)+"dp;\"><span>Gesamtbetrag:</span><span id=\"stadium-quote-total\">"+esc(stadium_money(stadium_field(q,"cost"),*s.world))+"</span></div><p id=\"stadium-draft-feedback\" style=\"top:"+scalar(feedback_top)+"dp;\">"+esc(feedback)+"</p><nav class=\"stadium-draft-actions\" style=\"top:"+scalar(actions_top)+"dp;\">"+btn("stadium-build","Bauen","stadium-dialog-action primary","id=\"stadium-build\" "+std::string(!q.value("can_build",false)||stadium_view_.at("invalid_places").get<bool>()?"disabled=\"disabled\"":""))+btn("stadium-cancel","Abbrechen","stadium-dialog-action","id=\"stadium-cancel\"")+"</nav></section></div>";
|
||||
return out;
|
||||
}
|
||||
+20
-2
@@ -16,6 +16,7 @@
|
||||
#include "modern/ui/demo_transfer.hpp"
|
||||
#include "modern/ui/demo_career_reports.hpp"
|
||||
#include "modern/ui/demo_rankings.hpp"
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include "modern/ui/desktop.hpp"
|
||||
#include "modern/ui/gui_assets.hpp"
|
||||
#include "modern/ui/model.hpp"
|
||||
@@ -369,6 +370,10 @@ class App final : public Rml::EventListener {
|
||||
uint64_t transfer_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> transfer_world_;
|
||||
Json career_view_ = Json::object(), rankings_view_ = Json::object();
|
||||
Json stadium_view_ = Json::object();
|
||||
uint64_t stadium_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> stadium_world_;
|
||||
const DataSource *stadium_source_ = nullptr;
|
||||
float device_ratio_ = 1.f;
|
||||
Json desktop_ = Json::object(), saved_desktop_ = Json::object(),
|
||||
options_ = Json::object();
|
||||
@@ -588,6 +593,8 @@ class App final : public Rml::EventListener {
|
||||
transfer_dialog_.clear(); transfer_picker_.clear(); transfer_notice_.clear(); transfer_return_focus_.clear();
|
||||
transfer_poach_league_.clear(); transfer_poach_club_.clear(); transfer_world_.reset(); transfer_revision_ = 0;
|
||||
career_view_ = Json::object(); rankings_view_ = Json::object();
|
||||
stadium_view_ = Json::object(); stadium_revision_ = 0;
|
||||
stadium_world_.reset(); stadium_source_ = nullptr;
|
||||
advertising_selected_ = -1; advertising_offer_ = 0; advertising_revision_ = 0; advertising_world_.reset();
|
||||
toto_column_ = 0; toto_dialog_.clear();
|
||||
for (auto &focus : toto_focus_) focus = {0, 1};
|
||||
@@ -758,6 +765,11 @@ class App final : public Rml::EventListener {
|
||||
bool rankings_event(Rml::Event &);
|
||||
void rankings_remember_scroll();
|
||||
void rankings_restore_scroll();
|
||||
std::string render_stadium();
|
||||
std::string render_stadium_dialog();
|
||||
void sync_stadium_draft();
|
||||
bool stadium_action(const std::string &, Rml::Element *);
|
||||
bool stadium_event(Rml::Event &);
|
||||
std::string render_almanac();
|
||||
bool almanac_action(const std::string &, Rml::Element *);
|
||||
std::string render_indoor();
|
||||
@@ -833,6 +845,10 @@ class App final : public Rml::EventListener {
|
||||
if (menu_ != last_rendered_menu_) {
|
||||
planning_dialog_.clear();
|
||||
career_view_["dialog"] = ""; career_view_["return_focus"] = "";
|
||||
stadium_view_["dialog"] = ""; stadium_view_["draft"] = Json();
|
||||
stadium_view_["return_focus"] = ""; stadium_revision_ = 0;
|
||||
stadium_view_["ticket_return_focus"] = "";
|
||||
stadium_world_.reset(); stadium_source_ = nullptr;
|
||||
lineup_drag_ = Json(); lineup_drag_world_.reset(); lineup_ignore_click_ = false;
|
||||
transfer_dialog_.clear(); transfer_draft_ = transfer_search_draft_ = Json(); transfer_picker_.clear();
|
||||
transfer_world_.reset(); transfer_revision_ = 0; transfer_return_focus_.clear();
|
||||
@@ -886,10 +902,10 @@ class App final : public Rml::EventListener {
|
||||
setting_menu_markup_ = true;
|
||||
element("canvas")->SetInnerRML(markup);
|
||||
setting_menu_markup_ = false;
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty()) {
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty() || !stadium_view_.value("dialog", "").empty()) {
|
||||
Rml::ElementList behind;
|
||||
doc_->QuerySelectorAll(behind,
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,.window .titlebar button");
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,#stadium-underlay button,#stadium-underlay input,#stadium-underlay select,.window .titlebar button");
|
||||
for (auto *node : behind)
|
||||
node->SetProperty("pointer-events", "none");
|
||||
}
|
||||
@@ -1316,6 +1332,8 @@ public:
|
||||
#include "modern/ui/career_report_controls.inc"
|
||||
#include "modern/ui/rankings_screens.inc"
|
||||
#include "modern/ui/rankings_controls.inc"
|
||||
#include "modern/ui/stadium_screens.inc"
|
||||
#include "modern/ui/stadium_controls.inc"
|
||||
} // namespace
|
||||
bool is_modern_world(const fs::path &file) {
|
||||
try {
|
||||
|
||||
@@ -100,7 +100,7 @@ int main(int argc, char **argv) try {
|
||||
std::ostringstream css;
|
||||
for (const auto *name : {"theme.rcss", "ticket.rcss", "sports.rcss",
|
||||
"calendar.rcss", "reports.rcss", "report_details.rcss",
|
||||
"report_pickers.rcss", "indoor.rcss", "planning.rcss", "almanac.rcss", "finance.rcss", "bank.rcss", "contracts.rcss", "amount.rcss", "environment.rcss", "advertising.rcss", "toto.rcss", "lineup.rcss", "transfer.rcss", "career_reports.rcss", "rankings.rcss"}) {
|
||||
"report_pickers.rcss", "indoor.rcss", "planning.rcss", "almanac.rcss", "finance.rcss", "bank.rcss", "contracts.rcss", "amount.rcss", "environment.rcss", "advertising.rcss", "toto.rcss", "lineup.rcss", "transfer.rcss", "career_reports.rcss", "rankings.rcss", "stadium.rcss"}) {
|
||||
std::ifstream input(root / name);
|
||||
require(bool(input), "Production stylesheet missing");
|
||||
css << input.rdbuf() << '\n';
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include <array>
|
||||
#include <chrono>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
|
||||
using namespace bmh::modern_ui;
|
||||
namespace {
|
||||
void require(bool ok, const char *reason) { if (!ok) throw std::runtime_error(reason); }
|
||||
const std::string first = "club:stadium-test-a", second = "club:stadium-test-b";
|
||||
struct Fixture {
|
||||
fs::path root; std::shared_ptr<const Catalog> world;
|
||||
Fixture(int precision = 0, bool clubs = true) {
|
||||
root = fs::temp_directory_path() / ("openbmh-stadium-ui-" + std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));
|
||||
fs::create_directories(root / "world");
|
||||
const auto write = [&](const std::string &path, const Json &value) { std::ofstream file(root / path); file << value.dump(); require(bool(file), "Cannot write synthetic stadium fixture"); };
|
||||
write("manifest.json", {{"format", "openbmh-world"}, {"kind", "world"}, {"format_version", "1.1"}, {"id", "world:stadium-test"}, {"start_date", "2026-07-01"}, {"currency", {{"code", "EUR"}, {"minor_units", precision}}}, {"requires", {"runtime:modern-v1"}}});
|
||||
write("world/nations.json", {{"items", {{{"id", "nation:de"}, {"name", "Synthetic country"}}}}});
|
||||
write("world/competitions.json", {{"items", {{{"id", "competition:stadium-test"}, {"type", "league"}, {"nation", "nation:de"}, {"name", "Synthetic competition"}}}}});
|
||||
Json teams = Json::array(), stadiums = Json::array();
|
||||
if (clubs) {
|
||||
for (const auto &id : {first, second}) {
|
||||
teams.push_back({{"id", id}, {"name", "Synthetic " + id}, {"competition", "competition:stadium-test"}, {"nation", "nation:de"}, {"stadium", "stadium:" + id}});
|
||||
stadiums.push_back({{"id", "stadium:" + id}, {"owner", id}, {"name", "Synthetic ground " + id}, {"capacity", 98765}, {"initialization", {{"policy", "test-must-not-run"}}}});
|
||||
}
|
||||
}
|
||||
write("world/clubs.json", {{"items", teams}}); write("world/stadiums.json", {{"items", stadiums}});
|
||||
write("world/players.json", {{"items", Json::array()}}); world = Catalog::open(root);
|
||||
}
|
||||
~Fixture() { std::error_code error; fs::remove_all(root, error); }
|
||||
};
|
||||
Json block(int index, int places, bool seats = false, bool roof = false) { return {{"kind", "block"}, {"index", index}, {"places", places}, {"seats", seats}, {"roof", roof}}; }
|
||||
Json facility(int index, int level) { return {{"kind", "facility"}, {"index", index}, {"level", level}}; }
|
||||
Json without_stadium(Json state) { state.erase("stadium"); return state; }
|
||||
void build(Json &state, const Json &request, const Catalog &world) {
|
||||
const auto result = edit_demo_stadium(state, {{"kind", "build"}, {"request", request}}, world);
|
||||
if (!result.empty()) throw std::runtime_error("Unexpected construction rejection: " + result + " " + request.dump());
|
||||
require(valid_demo_stadium(state, world), "Accepted construction invalidated stadium");
|
||||
}
|
||||
void reject(Json &state, const Json &action, const Catalog &world) {
|
||||
const auto before = state;
|
||||
require(!edit_demo_stadium(state, action, world).empty() && state == before, "Rejected construction accepted or mutated state");
|
||||
}
|
||||
void reject_build(Json &state, const Json &request, const Catalog &world) { reject(state, {{"kind", "build"}, {"request", request}}, world); }
|
||||
void conserved(const Json &state, const Catalog &world, int64_t factor) {
|
||||
const auto view = demo_stadium_view(state, world);
|
||||
require(view.at("budget").get<int64_t>() + view.at("pending_cost").get<int64_t>() == 50000000 * factor, "Local budget plus pending orders not conserved");
|
||||
}
|
||||
void currency(int precision) {
|
||||
Fixture fixture(precision); const auto &world = *fixture.world; const int64_t factor = precision ? 100 : 1;
|
||||
Json state = {{"managers", {{{"club", second}, {"name", "Synthetic manager"}}}}, {"cash", 12450000 * factor}, {"deposit", 600000 * factor}, {"debt", 0}, {"ticket", 13}, {"date", "2026-07-01"}, {"contracts", {{"untouched", {1,2,3}}}}};
|
||||
const auto unrelated = state, world_clubs = world.rows("clubs"), world_stadiums = world.rows("stadiums"), manifest = world.manifest();
|
||||
require(!valid_demo_stadium(state, world) && migrate_demo_stadium(state, world) && valid_demo_stadium(state, world) && without_stadium(state) == unrelated, "Missing-state migration altered unrelated fields or failed");
|
||||
const auto defaults = state;
|
||||
require(state.at("stadium").size() == 4 && state.at("stadium").at("club") == second && state.at("stadium").at("budget") == 50000000 * factor, "Canonical fields, manager binding or raw budget wrong");
|
||||
require(!state.at("stadium").contains("periphery") && !state.at("stadium").contains("ticket"), "Excluded construction/navigation leaked into canonical model");
|
||||
const auto overview = demo_stadium_view(state, world);
|
||||
require(overview.at("capacity") == 36000 && overview.at("planned_capacity") == 36000 && overview.at("available_capacity") == 36000 && overview.at("name") == "Synthetic ground " + second && overview.at("stadium") == "stadium:" + second, "Overview lost identity or incorrectly derived capacity from OBW initialization");
|
||||
const std::array<int, 8> base{3000,6000,3000,5000,3000,6000,3000,7000}, caps{8000,18000,8000,14000,8000,18000,8000,14000}, rates{300000,375000,300000,350000,300000,375000,300000,350000}, weeks{30,37,30,25,30,37,30,25};
|
||||
const auto rules = demo_stadium_rules(world);
|
||||
for (int i = 0; i < 8; ++i) {
|
||||
require(rules.at("blocks")[size_t(i)].at("max_places") == caps[size_t(i)] && rules.at("blocks")[size_t(i)].at("rate") == rates[size_t(i)] * factor, "Pinned block caps/rates changed");
|
||||
auto next = defaults; const auto request = block(i, base[size_t(i)] + 1000); const auto q = demo_stadium_quote(next, request, world);
|
||||
require(q.at("ok") == true && q.at("can_build") == true && q.at("cost") == rates[size_t(i)] * factor && q.at("placesCost") == q.at("cost") && q.at("seatsCost") == 0 && q.at("roofCost") == 0 && q.at("weeks") == weeks[size_t(i)] && next == defaults, "Block quote changed state, units or weeks");
|
||||
build(next, request, world); conserved(next, world, factor);
|
||||
const auto current = demo_stadium_view(next, world), future = demo_stadium_view(next, world, true);
|
||||
require(next.at("stadium").at("blocks")[size_t(i)].at("places") == base[size_t(i)] && current.at("capacity") == 36000 - base[size_t(i)] && future.at("capacity") == 37000 && current.at("blocks")[size_t(i)].at("display_places") == 0 && future.at("blocks")[size_t(i)].at("display_places") == base[size_t(i)] + 1000, "Pending block completed early or current/future capacity wrong");
|
||||
require(demo_stadium_quote(next, request, world).at("error") == "stadium_pending", "Pending target not locked"); reject_build(next, request, world);
|
||||
const auto noop = demo_stadium_quote(defaults, block(i, base[size_t(i)]), world);
|
||||
require(noop.at("ok") == true && noop.at("can_build") == false && noop.at("cost") == 0 && noop.at("error") == "stadium_no_change", "No-op not quoted as disabled");
|
||||
auto unmodified = defaults; reject_build(unmodified, block(i, base[size_t(i)]), world); reject_build(unmodified, block(i, base[size_t(i)] - 1000), world); reject_build(unmodified, block(i, caps[size_t(i)] + 1000), world); reject_build(unmodified, block(i, base[size_t(i)] + 1), world);
|
||||
for (int seats = 0; seats < 2; ++seats) for (int roof = 0; roof < 2; ++roof) {
|
||||
const auto f = demo_stadium_quote(defaults, block(i, base[size_t(i)] + 1000, bool(seats), bool(roof)), world);
|
||||
const int64_t total = rates[size_t(i)] + int64_t(base[size_t(i)] / 1000 + 1) * rates[size_t(i)] * (seats * 45 + roof * 30) / 100;
|
||||
require(f.at("cost") == total * factor, "New features not charged for all target places");
|
||||
}
|
||||
}
|
||||
auto features = defaults;
|
||||
require(demo_stadium_quote(features, block(0, 3000, true, true), world).at("cost") == 675000 * factor, "Feature-only upgrade disallowed or priced incorrectly");
|
||||
build(features, block(0, 3000, true, true), world);
|
||||
require(demo_stadium_view(features, world).at("capacity") == 33000 && demo_stadium_view(features, world, true).at("capacity") == 36000, "Feature-only pending block not closed in current view");
|
||||
auto imported = defaults; imported["stadium"]["blocks"][0]["seats"] = true;
|
||||
require(valid_demo_stadium(imported, world) && demo_stadium_quote(imported, block(0, 4000, true, true), world).at("cost") == 795000 * factor, "Existing seats should charge added places only");
|
||||
imported["stadium"]["blocks"][0]["roof"] = true;
|
||||
require(demo_stadium_quote(imported, block(0, 4000, true, true), world).at("cost") == 525000 * factor, "Existing seats/roof charged entire block again");
|
||||
reject_build(imported, block(0, 4000, false, true), world); reject_build(imported, block(0, 4000, true, false), world);
|
||||
const std::array<int, 8> levels{1,2,1,1,2,2,2,1}, f_rates{250000,350000,850000,1200000,180000,200000,300000,400000}, f_weeks{12,15,16,18,8,5,10,14};
|
||||
for (int i = 0; i < 8; ++i) {
|
||||
const int cap = i == 2 || i == 3 ? 2 : 4;
|
||||
require(rules.at("facilities")[size_t(i)].at("max_level") == cap && rules.at("facilities")[size_t(i)].at("rate") == f_rates[size_t(i)] * factor && rules.at("facilities")[size_t(i)].at("levels").size() == size_t(cap + 1), "Facility caps, rates or level labels wrong");
|
||||
for (int level = levels[size_t(i)] + 1; level <= cap; ++level) {
|
||||
auto next = defaults; const auto q = demo_stadium_quote(next, facility(i, level), world);
|
||||
require(q.at("cost") == (level - levels[size_t(i)]) * f_rates[size_t(i)] * factor && q.at("weeks") == f_weeks[size_t(i)] && q.at("can_build") == true, "Facility target skip or fixed weeks wrong");
|
||||
build(next, facility(i, level), world); conserved(next, world, factor);
|
||||
require(demo_stadium_view(next, world).at("facilities")[size_t(i)].at("display_level") == levels[size_t(i)] && demo_stadium_view(next, world, true).at("facilities")[size_t(i)].at("display_level") == level, "Facility job applied before completion");
|
||||
reject_build(next, facility(i, level), world);
|
||||
}
|
||||
auto next = defaults; reject_build(next, facility(i, levels[size_t(i)]), world); reject_build(next, facility(i, 0), world); reject_build(next, facility(i, cap + 1), world);
|
||||
for (int existing = 1; existing <= cap; ++existing) {
|
||||
auto saved = defaults; saved["stadium"]["facilities"][size_t(i)]["level"] = existing;
|
||||
require(valid_demo_stadium(saved, world), "Legal imported facility level rejected");
|
||||
for (int target = existing; target <= cap; ++target) {
|
||||
const auto q = demo_stadium_quote(saved, facility(i, target), world);
|
||||
require(q.at("ok") == true && q.at("can_build") == (target > existing) && q.at("cost") == (target - existing) * f_rates[size_t(i)] * factor, "Facility quote failed a legal current/target level combination");
|
||||
}
|
||||
}
|
||||
}
|
||||
auto spent = defaults; const auto old_quote = demo_stadium_quote(spent, facility(6, 4), world);
|
||||
for (int i = 0; i < 8; ++i) build(spent, block(i, caps[size_t(i)], true, true), world);
|
||||
require(spent.at("stadium").at("budget") == 4725000 * factor && demo_stadium_view(spent, world).at("capacity") == 0 && demo_stadium_view(spent, world, true).at("capacity") == 96000, "All-eight max construction pricing/capacity changed");
|
||||
for (int i = 0; i < 6; ++i) build(spent, facility(i, i == 2 || i == 3 ? 2 : 4), world);
|
||||
require(spent.at("stadium").at("budget") == 465000 * factor && old_quote.at("can_build") == true && demo_stadium_quote(spent, facility(6, 4), world).at("error") == "stadium_budget_exceeded", "Stale quote not revalidated against remaining local budget");
|
||||
reject_build(spent, facility(6, 4), world); conserved(spent, world, factor);
|
||||
for (const auto &action : std::vector<Json>{nullptr, Json::array(), Json::object(), {{"kind", "complete"}}, {{"kind", "ticket"}, {"value", 0}}, {{"kind", "periphery"}, {"index", 0}}, {{"kind", "build"}, {"request", facility(7, 2)}, {"cost", 1}}}) reject(spent, action, world);
|
||||
for (const auto &request : std::vector<Json>{nullptr, {{"kind", "periphery"}, {"index", 0}, {"level", 1}}, {{"kind", "block"}, {"index", -1}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", true}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", uint64_t(-1)}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", 0}, {"places", uint64_t(-1)}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", 0}, {"places", 4000.0}, {"seats", false}, {"roof", false}}, {{"kind", "facility"}, {"index", 0}, {"level", 2}, {"weeks", 1}}}) { auto next = defaults; reject_build(next, request, world); }
|
||||
std::vector<Json> corrupt;
|
||||
auto bad = defaults; bad["stadium"]["budget"] = 1; corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["periphery"] = Json::array(); corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"].erase("club"); corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["club"] = first; corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["blocks"][0]["places"] = 3333; corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["facilities"][2]["level"] = 3; corrupt.push_back(bad);
|
||||
bad = features; bad["stadium"]["blocks"][0]["job"]["cost"] = 675001 * factor; bad["stadium"]["budget"] = (50000000 - 675001) * factor; corrupt.push_back(bad);
|
||||
bad = features; bad["stadium"]["blocks"][0]["job"]["weeks"] = 29; corrupt.push_back(bad);
|
||||
bad = features; bad["stadium"]["blocks"][0]["job"]["places"] = 2000; corrupt.push_back(bad);
|
||||
bad = spent; bad["stadium"]["facilities"][0]["job"]["level"] = 1; corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["blocks"].push_back(bad["stadium"]["blocks"][0]); corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["blocks"][0]["seats"] = 1; corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["blocks"][0]["roof"] = "false"; corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["facilities"].erase(bad["stadium"]["facilities"].begin()); corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["budget"] = uint64_t(-1); corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"] = nullptr; corrupt.push_back(bad);
|
||||
for (auto &value : corrupt) {
|
||||
const auto saved = value;
|
||||
require(!valid_demo_stadium(value, world) && !migrate_demo_stadium(value, world) && value == saved && demo_stadium_quote(value, block(0, 4000), world).at("ok") == false, "Invalid existing state silently repaired or queried");
|
||||
reject_build(value, block(0, 4000), world);
|
||||
}
|
||||
const auto keep = spent;
|
||||
require(migrate_demo_stadium(spent, world) && spent == keep && valid_demo_stadium(Json::parse(spent.dump()), world) && without_stadium(spent) == unrelated, "Current migration/checkpoint roundtrip changed jobs or unrelated model");
|
||||
auto copied = demo_stadium_view(spent, world, true); copied["blocks"][0]["places"] = 0;
|
||||
require(demo_stadium_view(spent, world, true).at("blocks")[0].at("places") == 3000 && spent == keep, "Projection aliases saved state");
|
||||
auto later = spent; later["date"] = "2036-07-01";
|
||||
require(valid_demo_stadium(later, world) && demo_stadium_view(later, world).at("pending_cost") == demo_stadium_view(spent, world).at("pending_cost") && later.at("stadium") == spent.at("stadium"), "Presentation date implicitly completed pending jobs");
|
||||
require(world.rows("clubs") == world_clubs && world.rows("stadiums") == world_stadiums && world.manifest() == manifest, "Provider mutated original world records");
|
||||
require(demo_stadium(world, first).at("club") == first && !valid_demo_stadium(defaults, world, first), "Explicit manager binding ignored");
|
||||
}
|
||||
} // namespace
|
||||
int main() try {
|
||||
currency(0); currency(2);
|
||||
Fixture empty(0, false); Json state = {{"cash", 77}, {"ticket", 13}};
|
||||
require(migrate_demo_stadium(state, *empty.world) && valid_demo_stadium(state, *empty.world) && state.at("stadium").at("club") == "" && demo_stadium_view(state, *empty.world).at("stadium").is_null() && demo_stadium_view(state, *empty.world).at("name") == "Stadion", "Zero-club fixture invented identity or crashed");
|
||||
const auto saved = state; require(!migrate_demo_stadium(state, *empty.world, "club:missing") && state == saved, "Invalid explicit club accepted");
|
||||
Fixture precision(1); Json unsupported = {{"untouched", true}}; const auto original = unsupported;
|
||||
require(!migrate_demo_stadium(unsupported, *precision.world) && unsupported == original, "Unsupported currency precision initialized guessed prices");
|
||||
std::cout << "Modern UI stadium checks passed\n"; return 0;
|
||||
} catch (const std::exception &error) { std::cerr << error.what() << '\n'; return 1; }
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "modern/ui/demo_toto.hpp"
|
||||
#include "modern/ui/demo_lineup.hpp"
|
||||
#include "modern/ui/demo_transfer.hpp"
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include <chrono>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
@@ -115,6 +116,53 @@ void check_squad_source(const fs::path &root, const std::shared_ptr<const Catalo
|
||||
source.snapshot().state.at("cash") == changed.state.at("cash"),
|
||||
"Legacy squad migration reset finances or failed to initialize defaults");
|
||||
}
|
||||
void check_stadium_source(const fs::path &root, const std::shared_ptr<const Catalog> &world) {
|
||||
DemoSource source(world);
|
||||
const auto initial = source.snapshot();
|
||||
const auto club = initial.state.at("managers")[0].at("club").get<std::string>();
|
||||
require(valid_demo_stadium(initial.state, *world, club), "Stadium initialization failed");
|
||||
const Json request = {{"kind", "block"}, {"index", 0}, {"places", 4000},
|
||||
{"seats", false}, {"roof", false}};
|
||||
const Json action = {{"kind", "build"}, {"request", request}};
|
||||
const auto quote = demo_stadium_quote(initial.state, request, *world, club);
|
||||
require(quote.value("can_build", false), "Synthetic stadium quote unavailable");
|
||||
require(source.apply({initial.revision, "stadium", action}).ok,
|
||||
"Stadium build did not cross source boundary");
|
||||
const auto built = source.snapshot();
|
||||
require(built.revision == initial.revision + 1 && source.dirty() &&
|
||||
built.state.at("stadium").at("blocks")[0].at("job").at("places") == 4000 &&
|
||||
built.state.at("stadium").at("budget") == quote.at("remaining"),
|
||||
"Stadium build did not atomically reserve its local budget");
|
||||
for (const auto &[key, value] : initial.state.items())
|
||||
if (key != "stadium") require(built.state.at(key) == value, "Stadium build changed unrelated state");
|
||||
require(!source.apply({initial.revision, "stadium", action}).ok &&
|
||||
!source.apply({built.revision, "stadium", action}).ok &&
|
||||
!source.apply({built.revision, "stadium", {{"kind", "build"}, {"request",
|
||||
{{"kind", "periphery"}, {"index", 0}, {"level", 1}}}}}).ok &&
|
||||
source.snapshot().state == built.state && source.snapshot().revision == built.revision,
|
||||
"Stale, duplicate or excluded periphery build changed state");
|
||||
const auto file = root / "stadium.ui.json";
|
||||
source.save(file, default_desktop());
|
||||
require(source.apply({source.snapshot().revision, "ticket", 9}).ok &&
|
||||
source.snapshot().state.at("stadium") == built.state.at("stadium"),
|
||||
"Shared ticket action changed construction ledger");
|
||||
source.load(file);
|
||||
require(source.snapshot().state == built.state && !source.dirty(), "Stadium job did not roundtrip");
|
||||
auto malformed = Json::parse(bmh::editor::read_file(file));
|
||||
malformed["stadium"]["budget"] = malformed["stadium"]["budget"].get<int64_t>() + 1;
|
||||
write(root, "invalid-stadium.ui.json", malformed);
|
||||
const auto accepted = source.snapshot(); bool rejected = false;
|
||||
try { source.load(root / "invalid-stadium.ui.json"); } catch (const std::exception &) { rejected = true; }
|
||||
require(rejected && source.snapshot().state == accepted.state &&
|
||||
source.snapshot().revision == accepted.revision && !source.dirty(),
|
||||
"Invalid stadium checkpoint partially replaced source");
|
||||
auto legacy = Json::parse(bmh::editor::read_file(file)); legacy.erase("stadium");
|
||||
write(root, "legacy-stadium.ui.json", legacy); source.load(root / "legacy-stadium.ui.json");
|
||||
require(source.snapshot().state.at("stadium") == initial.state.at("stadium") &&
|
||||
source.snapshot().state.at("cash") == built.state.at("cash") &&
|
||||
source.snapshot().state.at("ticket") == built.state.at("ticket"),
|
||||
"Legacy stadium migration reset unrelated values");
|
||||
}
|
||||
void check_finance_source(const fs::path &root,
|
||||
const std::shared_ptr<const Catalog> &base) {
|
||||
const auto folder = root / "finance-source";
|
||||
@@ -220,6 +268,7 @@ void check_finance_source(const fs::path &root,
|
||||
changed.state["contracts"] == demo_contracts(*world, "club:finance-next") &&
|
||||
changed.state["lineup"] == demo_lineup(*world, "club:finance-next") &&
|
||||
changed.state["transfer"] == demo_transfer(*world, "club:finance-next") &&
|
||||
changed.state["stadium"] == demo_stadium(*world, "club:finance-next") &&
|
||||
changed.state["contracts"]["players"].contains("player:finance-next") &&
|
||||
!changed.state["contracts"]["players"].contains("player:a") &&
|
||||
changed.state["cash"] == accepted.state["cash"] &&
|
||||
@@ -685,6 +734,7 @@ int main(int argc, char **argv) try {
|
||||
check_finance_source(root, world);
|
||||
check_club_views(root, world);
|
||||
check_squad_source(root, world);
|
||||
check_stadium_source(root, world);
|
||||
GuiAssets absent(root / "missing-gui");
|
||||
require(!absent.available(),
|
||||
"World resources were mistaken for GUI resources");
|
||||
|
||||
@@ -14,6 +14,7 @@ from pathlib import Path
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import struct
|
||||
|
||||
|
||||
def silver_highscore_svg(source):
|
||||
@@ -103,6 +104,35 @@ def main():
|
||||
for path in sorted((source / folder).rglob('*')):
|
||||
if path.is_file() and path.suffix.lower() in ('.png', '.svg', '.jpg', '.webp'):
|
||||
add('art.' + path.relative_to(source / folder).as_posix(), path.relative_to(source).as_posix())
|
||||
# Exact approved panel bounds exclude tier-atlas seams. These are GUI
|
||||
# references only; they never become world assets or periphery actions.
|
||||
stadium_source = (source / 'desktop/stadium-menus.js').read_text()
|
||||
tier_match = re.search(r'const tierArtwork=(\{.*?\});', stadium_source, re.S)
|
||||
if not tier_match:
|
||||
raise ValueError('Missing measured stadium tier artwork')
|
||||
tiers = json.loads(tier_match[1])
|
||||
tier_kinds = {0: 'floodlights', 1: 'scoreboards', 4: 'pitch',
|
||||
6: 'condition', 7: 'safety'}
|
||||
for index in range(8):
|
||||
cap = 2 if index in (2, 3) else 4
|
||||
for level in range(1, cap + 1):
|
||||
key = f'stadium.facility.{index}.level.{level}'
|
||||
if index in tier_kinds:
|
||||
sheet = tiers[tier_kinds[index]]
|
||||
sw, sh = sheet['size']
|
||||
header = (source / sheet['file']).read_bytes()[:24]
|
||||
if header[:8] != b'\x89PNG\r\n\x1a\n' or struct.unpack('>II', header[16:24]) != (sw, sh):
|
||||
raise ValueError('Stadium tier dimensions differ from measured reference')
|
||||
x, y, width, height = sheet['rects'][level - 1]
|
||||
if min(x, y) < 0 or min(width, height) <= 0 or x + width > sw or y + height > sh:
|
||||
raise ValueError('Invalid measured stadium tier rectangle')
|
||||
add(key, sheet['file'], [x / sw, y / sh, width / sw, height / sh])
|
||||
items[key]['source_rect'] = [x, y, width, height]
|
||||
else:
|
||||
atlas = 'a' if index < 4 else 'b'
|
||||
cell = index % 4
|
||||
add(key, f'assets/studies/submenus/stadium-facilities-{atlas}-v1.png',
|
||||
[(cell % 2) / 2, (cell // 2) / 2, .5, .5])
|
||||
# The native compatibility renderer has no CSS image-filter implementation.
|
||||
# Keep the approved original untouched; supply its exact colour-only variant.
|
||||
logo_source = source / 'assets/vector/highscore-mark-v1.svg'
|
||||
|
||||
Reference in new issue
Block a user