From bf3f910437c312ce0d5e581d5b1b99c14fb8e84e Mon Sep 17 00:00:00 2001 From: Codex Date: Sun, 25 Oct 2026 10:23:53 +0100 Subject: [PATCH] Port lineup and transfer market to the native Modern UI (by Codex) --- .github/workflows/modern-ui.yml | 4 +- assets/modern/lineup.rcss | 107 ++++ assets/modern/modern.rml | 2 +- assets/modern/transfer.rcss | 182 ++++++ docs/new_ui/NATIVE_STATUS.md | 15 +- docs/new_ui/README.md | 3 +- docs/new_ui/desktop/lineup/README.md | 13 + docs/new_ui/desktop/tactics/README.md | 8 +- docs/new_ui/desktop/transfer/README.md | 181 ++++++ docs/new_ui/menu-qa.md | 20 +- docs/new_ui/qa-findings.md | 13 +- src/modern/ui/CMakeLists.txt | 6 +- src/modern/ui/controls.inc | 23 +- src/modern/ui/demo_lineup.cpp | 233 +++++++ src/modern/ui/demo_lineup.hpp | 17 + src/modern/ui/demo_sports.cpp | 20 +- src/modern/ui/demo_sports.hpp | 3 +- src/modern/ui/demo_transfer.cpp | 307 +++++++++ src/modern/ui/demo_transfer.hpp | 20 + src/modern/ui/lineup_controls.inc | 193 ++++++ src/modern/ui/lineup_screens.inc | 195 ++++++ src/modern/ui/model.cpp | 13 + src/modern/ui/nation_flags.inc | 35 ++ src/modern/ui/screens.inc | 4 + src/modern/ui/sports_screens.inc | 2 +- src/modern/ui/transfer_controls.inc | 612 ++++++++++++++++++ src/modern/ui/transfer_screens.inc | 827 +++++++++++++++++++++++++ src/modern/ui/view.cpp | 78 ++- tests/modern_control_layout_tests.cpp | 2 +- tests/modern_lineup_ui_tests.cpp | 99 +++ tests/modern_transfer_ui_tests.cpp | 62 ++ tests/modern_ui_core_tests.cpp | 65 ++ tools/modern_ui/prepare_gui_assets.py | 4 + 33 files changed, 3339 insertions(+), 29 deletions(-) create mode 100644 assets/modern/lineup.rcss create mode 100644 assets/modern/transfer.rcss create mode 100644 docs/new_ui/desktop/lineup/README.md create mode 100644 docs/new_ui/desktop/transfer/README.md create mode 100644 src/modern/ui/demo_lineup.cpp create mode 100644 src/modern/ui/demo_lineup.hpp create mode 100644 src/modern/ui/demo_transfer.cpp create mode 100644 src/modern/ui/demo_transfer.hpp create mode 100644 src/modern/ui/lineup_controls.inc create mode 100644 src/modern/ui/lineup_screens.inc create mode 100644 src/modern/ui/nation_flags.inc create mode 100644 src/modern/ui/transfer_controls.inc create mode 100644 src/modern/ui/transfer_screens.inc create mode 100644 tests/modern_lineup_ui_tests.cpp create mode 100644 tests/modern_transfer_ui_tests.cpp diff --git a/.github/workflows/modern-ui.yml b/.github/workflows/modern-ui.yml index 4fe0ca7..d475c98 100644 --- a/.github/workflows/modern-ui.yml +++ b/.github/workflows/modern-ui.yml @@ -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 --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 --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_)" --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_)" --output-on-failure --output-junit modern-ui-results.xml - name: Upload test report if: always() uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/assets/modern/lineup.rcss b/assets/modern/lineup.rcss new file mode 100644 index 0000000..ebe3aac --- /dev/null +++ b/assets/modern/lineup.rcss @@ -0,0 +1,107 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +.lineup-screen {position:absolute;left:0;top:0;width:2612dp;height:1864dp;color:var(--text);} +.lineup-roster {position:absolute;left:0;top:0;width:2612dp;height:660dp;} +.lineup-roster-scroll {position:absolute;left:0;top:48dp;width:2612dp;height:612dp;overflow:auto;} +.lineup-row {display:flex;width:2612dp;height:37dp;border-bottom:1dp #c5d9e712;align-items:center;font-size:30dp;} +.lineup-row.even {background-color:#e3edf605;} +.lineup-row.selected {background-color:var(--selected);border-left-width:0;} +.lineup-row.reserve-start {margin-top:12dp;} +.lineup-cell {display:flex;align-items:center;justify-content:center;flex-shrink:0;width:217.555556dp;height:36dp;padding:0 6dp;border:0;background-color:transparent;border-radius:0;white-space:nowrap;overflow:hidden;min-width:0;} +.lineup-cell.control-button:hover {background-color:var(--hover);} +.lineup-cell:focus-visible {border:2dp var(--accent);} +.lineup-cell>span {display:block;max-width:100%;width:100%;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:center;} +.lineup-cell .control-label {width:100%;max-width:100%;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align:center;} +.lineup-col-0 {width:64dp;} +.lineup-col-1 {width:390dp;justify-content:flex-start;text-align:left;} +.lineup-col-1 .control-label {text-align:left;} +.lineup-col-7 {width:200dp;} +.lineup-name {font-size:30dp;} +.lineup-detail {font-size:28dp;} +.lineup-status {display:block;width:100%;font-size:21dp;letter-spacing:1dp;white-space:nowrap;} +.lineup-head {height:48dp;background-color:#2b3946;border-bottom:2dp var(--border);color:var(--muted);font-size:26dp;} +.lineup-head .lineup-cell {height:46dp;} +.lineup-head .lineup-col-1>span {text-align:left;} +.lineup-empty {padding:30dp;color:var(--muted);font-size:30dp;} +.lineup-pitch {position:absolute;left:0;top:700dp;width:1490dp;height:889.4375dp;border:2dp var(--border);border-radius:16dp;background-color:#2d6447;overflow:hidden;} +.lineup-field-art,.lineup-order-zone {position:absolute;left:0;top:0;width:1486dp;height:885.4375dp;pointer-events:none;} +.lineup-order-zone {z-index:1;} +.lineup-player {position:absolute;padding:0;border:0;border-radius:12dp;background-color:transparent;display:block;width:126dp;height:126dp;overflow:visible;z-index:2;} +.lineup-player:hover {background-color:transparent;} +.lineup-player[aria-pressed=true] {border:3dp #b4ddce;} +.lineup-player:focus-visible {border:3dp var(--accent);} +.lineup-jersey {position:absolute;left:0;top:113.4dp;width:126dp;height:28dp;text-align:center;font-size:25dp;line-height:1.1;font-weight:bold;color:#f7fbff;pointer-events:none;} +.lineup-ghost {display:none;position:absolute;width:126dp;height:126dp;z-index:4;pointer-events:none;opacity:.7;} +.lineup-controls {position:absolute;left:1538dp;top:700dp;width:1074dp;height:1040dp;} +.lineup-tabs {display:flex;width:1074dp;height:70dp;} +.lineup-tab {width:205.2dp;height:70dp;margin-right:12dp;padding:6dp;border:2dp var(--border);border-radius:12dp;font-size:27dp;flex-shrink:0;} +.lineup-tab:last-child {margin-right:0;} +.lineup-tab .control-label {width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.lineup-tab[aria-pressed=true] {background-color:var(--selected);border-color:var(--accent);} +.lineup-side {position:absolute;left:0;top:110dp;width:1074dp;height:750dp;} +.lineup-formation-cell {position:absolute;} +.lineup-formation {position:absolute;left:0;top:0;width:528dp;height:218dp;padding:5dp 14dp;border:2dp var(--border);border-radius:12dp;background-color:var(--panel);display:block;font-size:29dp;} +.lineup-formation[aria-pressed=true] {border-color:var(--accent);background-color:var(--selected);} +.lineup-mini {position:absolute;left:132dp;top:12dp;width:260dp;height:156dp;} +.lineup-formation-label {position:absolute;left:14dp;top:168dp;width:496dp;height:36dp;text-align:center;white-space:nowrap;} +.lineup-formation-cell.custom .lineup-formation-label {text-align:left;} +.lineup-save {position:absolute;right:10dp;bottom:8dp;height:45dp;min-width:117dp;padding:6dp 14dp;border:1dp var(--border);border-radius:7dp;background-color:var(--panel);font-size:26dp;} +.lineup-save .control-label {white-space:nowrap;} +.lineup-pages {position:absolute;left:0;top:466dp;width:1074dp;height:59dp;display:flex;align-items:center;justify-content:space-between;color:var(--muted);font-size:27dp;} +.lineup-pages>span {display:block;width:880dp;text-align:center;white-space:nowrap;} +.lineup-page {width:64dp;height:59dp;padding:6dp;border-radius:12dp;flex-shrink:0;} +.lineup-weights {position:absolute;left:0;top:545dp;width:1074dp;height:83dp;display:flex;} +.lineup-weight {position:relative;width:348.666667dp;height:83dp;padding:10dp 4dp;margin-right:14dp;border:2dp var(--border);border-radius:10dp;background-color:var(--panel);font-size:24dp;display:block;} +.lineup-weight:last-child {margin-right:0;} +.lineup-weight-label {display:block;width:100%;height:29dp;white-space:nowrap;text-align:center;} +.lineup-weight-bars {display:flex;width:84dp;height:26dp;margin:2dp auto 0;align-items:center;} +.lineup-weight-bar {display:block;width:24dp;height:9dp;margin-right:4dp;border:1dp var(--muted);transform:skewX(-15deg);} +.lineup-weight-bar.active {background-color:var(--accent);border-color:var(--accent);} +.lineup-bench {position:absolute;left:0;top:870dp;width:1074dp;height:170dp;} +.lineup-bench h2 {height:32dp;margin:0 0 10dp;font-size:27dp;font-weight:normal;color:var(--muted);} +.lineup-bench-scroll {width:1074dp;height:128dp;overflow:auto;display:flex;flex-wrap:wrap;align-content:flex-start;} +.lineup-bench-player {height:54dp;max-width:1054dp;min-width:0;flex-shrink:0;margin:0 10dp 10dp 0;padding:8dp 12dp;font-size:25dp;border-radius:12dp;} +.lineup-bench-player[aria-pressed=true] {background-color:var(--selected);border-color:var(--accent);} +.lineup-bench-position {font-size:21dp;color:var(--muted);margin-right:8dp;white-space:nowrap;flex-shrink:0;} +.lineup-bench-name {min-width:0;max-width:850dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.lineup-bench-empty {font-size:25dp;color:var(--muted);} +.lineup-orders,.lineup-takers {position:absolute;left:8dp;top:18dp;width:1058dp;} +.lineup-orders h2,.lineup-takers h2 {margin:0 0 22dp;height:39dp;font-size:34dp;font-weight:normal;} +.lineup-order-name {position:absolute;left:0;top:69dp;width:1058dp;height:34dp;font-size:30dp;margin:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.lineup-order-row {position:absolute;left:0;display:flex;align-items:center;height:51dp;width:1058dp;margin:0;} +.lineup-order-icon {display:block;width:55dp;margin-right:20dp;flex-shrink:0;} +.lineup-order-row input {width:903dp;height:16dp;margin:0 20dp 0 0;} +.lineup-order-row input[type=range] slidertrack {height:4dp;margin:6dp 0;} +.lineup-order-row input[type=range] sliderbar {width:16dp;height:16dp;margin-top:0;border:0;border-radius:8dp;} +.lineup-order-value {display:block;width:60dp;flex-shrink:0;font-size:30dp;} +.lineup-hint {position:absolute;left:0;top:135dp;width:1058dp;margin:0;font-size:29dp;line-height:1.6;color:var(--muted);} +.lineup-taker-label {display:block;width:1058dp;height:108dp;margin-bottom:28dp;font-size:29dp;} +.lineup-taker-label>span {display:block;height:33dp;margin-bottom:14dp;} +.lineup-taker {width:1058dp;height:61dp;padding:12dp 16dp;border:2dp var(--border);border-radius:10dp;background-color:var(--input);font-size:28dp;} +.lineup-taker selectbox {max-height:480dp;padding:10dp;border:2dp var(--border);margin-top:8dp;overflow:auto;background-color:#293744fa;} +.lineup-taker option {display:block;position:relative;height:72dp;min-height:72dp;padding:10dp 14dp 10dp 54dp;line-height:52dp;font-size:28dp;} +.lineup-option-mark {display:block;position:absolute;left:14dp;top:10dp;width:28dp;height:52dp;} +.lineup-option-check {display:none;position:absolute;left:9dp;top:17dp;width:10dp;height:18dp;border-right:3dp #afdccf;border-bottom:3dp #afdccf;transform:rotate(45deg);} +.lineup-taker option:checked .lineup-option-check {display:block;} +.lineup-option-text {display:block;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.lineup-taker option .lineup-option-text {width:100%;line-height:52dp;} +.lineup-taker selectvalue .lineup-option-mark {display:none;} +.lineup-taker selectvalue .lineup-option-text {width:100%;} +body.silver .lineup-option-check,body.matchday .lineup-option-check {border-color:var(--accent);} +.lineup-auto {margin-top:4dp;height:61dp;width:204dp;padding:12dp 20dp;font-size:29dp;border-radius:12dp;} +.lineup-auto .control-label {width:100%;white-space:nowrap;} +.team-view .lineup-roster {height:1520dp;} +.team-view .lineup-roster-scroll {height:1472dp;} +.team-view .lineup-row {height:82dp;} +.team-view .lineup-head {height:48dp;} +.team-view .lineup-row .lineup-cell {height:76dp;} +.team-view .lineup-head .lineup-cell {height:46dp;} +.lineup-team-actions {position:absolute;left:0;top:1770dp;width:2612dp;height:94dp;display:flex;align-items:center;} +.lineup-team-actions .lineup-tab {width:280dp;height:94dp;font-size:32dp;margin-right:24dp;} +.lineup-team-actions>span {display:block;flex:1;text-align:right;font-size:26dp;color:var(--muted);white-space:nowrap;} +body.silver .lineup-head {background-color:#dfe8ef;} +body.matchday .lineup-head {background-color:#35343a;} +body.silver .lineup-row.even {background-color:#315b7106;} +body.matchday .lineup-row.even {background-color:#f9f4ed05;} + +body.silver .lineup-taker selectbox {background-color:#f3f7fcfc;} +body.matchday .lineup-taker selectbox {background-color:#303037fc;} diff --git a/assets/modern/modern.rml b/assets/modern/modern.rml index 9414c9d..ccb6518 100644 --- a/assets/modern/modern.rml +++ b/assets/modern/modern.rml @@ -1,6 +1,6 @@ OpenBMH - +
diff --git a/assets/modern/transfer.rcss b/assets/modern/transfer.rcss new file mode 100644 index 0000000..81f510d --- /dev/null +++ b/assets/modern/transfer.rcss @@ -0,0 +1,182 @@ +/* SPDX-License-Identifier: GPL-3.0-only */ +.transfer-overview {position:absolute;left:0;right:0;top:0;bottom:0;font-size:34dp;color:var(--text);} +.transfer-heading {position:absolute;left:0;right:0;top:0;height:106dp;display:flex;align-items:center;justify-content:space-between;} +.transfer-heading h2 {font-size:36dp;font-weight:normal;line-height:41dp;} +.transfer-heading>div {text-align:right;} +.transfer-heading>div>span {display:block;width:100%;font-size:25dp;line-height:29dp;color:var(--muted);} +.transfer-heading>div>strong {display:block;width:100%;margin-top:8dp;font-size:40dp;line-height:46dp;font-weight:normal;color:var(--accent);} +.transfer-columns {position:absolute;left:0;right:0;top:134dp;bottom:132dp;} +.transfer-roster {position:absolute;left:0;top:0;bottom:0;width:1480.96875dp;} +.transfer-complete .transfer-roster {width:2612dp;} +.transfer-roster>header {position:absolute;left:0;right:0;top:0;height:50dp;display:flex;align-items:center;justify-content:space-between;gap:20dp;} +.transfer-roster h2,.transfer-market header h2 {font-size:30dp;font-weight:normal;line-height:35dp;} +.transfer-roster>header>span {display:block;font-size:23dp;line-height:27dp;color:var(--muted);white-space:nowrap;} +.transfer-roster-scroll {position:absolute;left:0;right:0;top:58dp;bottom:48dp;border:2dp var(--border);border-radius:16dp;background-color:var(--soft);overflow:auto;} +.transfer-roster-table {min-width:1250dp;width:100%;font-size:34dp;} +.transfer-roster-row {display:flex;height:86dp;align-items:center;} +.transfer-roster-row.head {height:62dp;font-size:30dp;line-height:35dp;color:var(--muted);border-bottom:2dp var(--border);} +.transfer-roster-row.striped {background-color:#e3edf605;} +.transfer-roster-row.selected {background-color:var(--selected);} +.transfer-roster-row>div {height:100%;padding:6dp 8dp;flex-shrink:0;display:flex;align-items:center;justify-content:center;min-width:0;} +.transfer-roster-row>div>span {display:block;width:100%;text-align:center;white-space:nowrap;} +.transfer-roster-row>div:first-child {justify-content:flex-start;} +.transfer-roster-row.head>div:first-child>span {text-align:left;} +.transfer-name-cell button {width:100%;padding:4dp 0;font-size:34dp;text-align:left;display:flex;align-items:center;gap:12dp;border:0dp;background-color:transparent;min-width:0;} +.transfer-player-rank {display:block;width:45dp;flex-shrink:0;text-align:right;color:var(--muted);} +.transfer-player-name {display:block;flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-listed {color:#df9990;} +.transfer-list-marker {display:block;width:20dp;flex-shrink:0;color:#d68e85;font-size:16dp;} +.transfer-roster-note {position:absolute;left:0;right:0;bottom:0;font-size:23dp;line-height:27dp;color:var(--muted);} +.transfer-trait {display:inline-block;min-width:32dp;text-align:center;font-size:27dp;color:var(--muted);} +.transfer-nation {display:inline-block;width:36dp;height:24dp;flex-shrink:0;text-transform:uppercase;font-size:20dp;line-height:24dp;color:var(--muted);} +.transfer-market {position:absolute;left:1514.96875dp;top:0;bottom:0;width:1097.03125dp;overflow:auto;} +.transfer-market-content {position:relative;width:1087.03125dp;height:1598dp;} +.transfer-market-content>header {position:absolute;left:0;right:0;top:0;height:60dp;display:flex;align-items:center;justify-content:space-between;gap:20dp;} +.transfer-market-content>header>span {font-size:27dp;line-height:31dp;color:var(--muted);white-space:nowrap;} +.transfer-name-search {position:absolute;left:0;right:0;top:72dp;height:78dp;display:flex;gap:16dp;} +.transfer-name-search input {flex:1;min-width:0;width:0;padding:12dp 20dp;font-size:32dp;border:2dp var(--border);border-radius:12dp;background-color:#111f2a80;color:var(--text);} +.transfer-name-search button {width:142dp;flex-shrink:0;font-size:25dp;} +.transfer-offers {position:absolute;left:0;right:0;top:162dp;height:764.71875dp;} +.transfer-market-player {position:absolute;display:flex;flex-direction:column;align-items:stretch;justify-content:center;gap:8dp;padding:10dp 22dp;border:2dp var(--border);border-radius:12dp;background-color:var(--soft);color:var(--text);text-align:left;} +.transfer-market-player:hover {background-color:#c5d9e712;} +.transfer-market-player.selected {border-color:var(--accent);background-color:var(--selected);} +.transfer-market-name {display:flex;align-items:center;gap:16dp;width:100%;font-size:34dp;line-height:39dp;} +.transfer-market-name>strong {display:block;flex:1;min-width:0;font-weight:normal;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-market-name>span:not(.transfer-trait):not(.transfer-nation) {display:block;width:55dp;flex-shrink:0;font-size:28dp;color:var(--muted);} +.transfer-market-attributes {display:flex;justify-content:space-between;gap:20dp;width:100%;padding-left:52dp;font-size:29dp;line-height:34dp;color:var(--muted);} +.transfer-market-attributes>span {display:block;white-space:nowrap;} +.transfer-market-attributes strong {font-weight:normal;color:var(--text);} +.transfer-empty {position:absolute;left:0;right:0;top:180dp;text-align:center;font-size:29dp;color:var(--text);} +.transfer-empty small {display:block;width:100%;margin-top:20dp;font-size:24dp;color:var(--muted);} +.transfer-market-pages {position:absolute;left:0;right:0;top:938.71875dp;height:54dp;display:flex;align-items:center;justify-content:space-between;gap:16dp;font-size:23dp;color:var(--muted);} +.transfer-market-pages>span {display:block;white-space:nowrap;} +.transfer-market-pages button {min-width:70dp;height:46dp;padding:0;font-size:33dp;} +.transfer-preview {position:absolute;left:0;right:0;top:1004.71875dp;height:159.28125dp;padding:14dp 22dp;border:2dp var(--border);border-radius:12dp;background-color:var(--soft);} +.transfer-preview>p {font-size:33dp;line-height:38dp;height:38dp;white-space:nowrap;margin-bottom:12dp;overflow:hidden;} +.transfer-preview .club-label {width:100%;min-width:0;gap:12dp;} +.transfer-preview .club-label>span {display:block;min-width:0;flex:1;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-preview>div {display:flex;gap:20dp;} +.transfer-preview>div>section {flex:1;min-width:0;} +.transfer-preview section>span {display:block;width:100%;font-size:28dp;line-height:32dp;color:var(--muted);white-space:nowrap;} +.transfer-preview section>strong {display:block;width:100%;margin-top:5dp;font-size:33dp;line-height:38dp;font-weight:normal;color:var(--accent);white-space:nowrap;} +.transfer-negative {color:#e79b92;} +.transfer-filters {position:absolute;left:0;right:0;top:1208dp;height:76dp;display:flex;gap:12dp;} +.transfer-filters button {flex:1;min-width:0;padding:8dp;font-size:25dp;} + +.transfer-strengths {position:absolute;left:0;right:0;top:1296dp;height:160dp;} +.transfer-strengths>header {height:54dp;display:flex;align-items:center;justify-content:space-between;gap:20dp;} +.transfer-strengths>header>nav {display:flex;gap:12dp;} +.transfer-strengths button {height:50dp;min-width:128dp;padding:6dp 16dp;font-size:24dp;} +.transfer-strengths p {font-size:23dp;color:var(--muted);white-space:nowrap;} +.transfer-strengths p>strong {font-weight:normal;color:var(--text);margin-left:10dp;} +.transfer-strengths>div {display:flex;gap:12dp;margin-top:12dp;} +.transfer-strengths>div>section {flex:1;min-width:0;text-align:center;border-left:1dp var(--border);} +.transfer-strengths>div>section:first-child {border:0dp;} +.transfer-strengths section>span {display:block;width:100%;font-size:27dp;line-height:31dp;color:var(--muted);white-space:nowrap;} +.transfer-strengths section>strong {display:block;width:100%;margin-top:10dp;font-size:42dp;line-height:48dp;font-weight:normal;color:var(--accent);} +.transfer-business {position:absolute;left:0;right:0;top:1468dp;height:130dp;} +.transfer-business>p {position:absolute;left:0;right:0;bottom:74dp;font-size:23dp;color:var(--muted);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-business>div {position:absolute;left:0;right:0;bottom:0;height:62dp;display:flex;gap:18dp;} +.transfer-business button {flex:1;min-width:0;height:62dp;font-size:28dp;} +.transfer-actions {position:absolute;left:0;right:0;bottom:0;height:94dp;display:flex;gap:18dp;} +.transfer-actions button {flex:1;min-width:0;height:94dp;font-size:27dp;} +.transfer-complete .transfer-roster-table {font-size:28dp;} +.transfer-complete .transfer-roster-row.head {font-size:25dp;} +.transfer-layer {position:absolute;left:0;right:0;top:0;bottom:0;z-index:35;display:flex;align-items:center;justify-content:center;background-color:#08101980;} +.transfer-dialog {position:relative;width:2200dp;flex-shrink:0;border:2dp var(--border);border-radius:22dp;background-color:#283542f5;font-size:30dp;} +.transfer-dialog>h2 {text-align:center;position:absolute;left:52dp;right:52dp;top:40dp;height:45dp;font-size:40dp;line-height:45dp;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-dialog-scroll {position:absolute;left:52dp;right:52dp;top:113dp;bottom:154dp;overflow:visible;} +.transfer-dialog-actions {position:absolute;left:52dp;right:52dp;bottom:40dp;height:82dp;display:flex;gap:22dp;} +.transfer-dialog-button {flex:1;min-width:0;height:82dp;font-size:29dp;} +.transfer-dialog h3 {font-size:28dp;line-height:32dp;font-weight:normal;color:var(--text);} +.transfer-offer-layout {position:relative;width:2092dp;height:939.5dp;} +.transfer-offer-layout>header {position:absolute;left:0;right:0;top:0;height:111dp;padding-bottom:26dp;border-bottom:2dp var(--border);display:flex;align-items:center;gap:26dp;} +.transfer-offer-person {flex:1;min-width:0;} +.transfer-offer-person>strong {display:block;width:100%;font-size:36dp;line-height:42dp;font-weight:normal;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-offer-person>span {display:block;width:100%;margin-top:10dp;font-size:26dp;line-height:30dp;color:var(--muted);white-space:nowrap;} +.transfer-offer-club {width:44%;max-width:44%;flex-shrink:0;min-width:0;font-size:29dp;display:flex;justify-content:flex-end;} +.transfer-offer-club .club-label {width:100%;min-width:0;max-width:100%;justify-content:flex-end;} +.transfer-offer-club .image-frame {flex-shrink:0;} +.transfer-offer-club .club-label>span {display:block;flex:0 1 auto;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-demands {position:absolute;left:0;right:0;top:137dp;height:140dp;display:flex;gap:24dp;} +.transfer-demands>section {flex:1;min-width:0;padding:24dp 28dp;border:2dp var(--border);border-radius:14dp;background-color:var(--soft);} +.transfer-demands span {display:block;width:100%;font-size:26dp;line-height:30dp;color:var(--muted);white-space:nowrap;} +.transfer-demands strong {display:block;width:100%;margin-top:14dp;font-size:38dp;line-height:44dp;font-weight:normal;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-offer-your {position:absolute;left:0;right:0;top:301dp;} +.transfer-offer-inputs {position:absolute;left:0;right:0;top:349dp;height:129dp;display:flex;gap:26dp;} +.transfer-offer-inputs>div {flex:1;min-width:0;} +.transfer-offer-inputs>div>span {display:block;width:100%;font-size:26dp;line-height:31dp;white-space:nowrap;} +.transfer-offer-inputs button,.transfer-offer-inputs select {display:block;width:100%;height:82dp;margin-top:16dp;padding:12dp 20dp;border:2dp var(--border);border-radius:12dp;background-color:#111f2a80;color:var(--text);font-size:30dp;text-align:right;} +.transfer-offer-inputs select {text-align:left;padding-right:40dp;} +.transfer-offer-premiums {position:absolute;left:0;right:0;top:502dp;height:376dp;} +.transfer-premium-row {position:absolute;display:flex;align-items:center;justify-content:space-between;gap:24dp;border-bottom:2dp var(--border);font-size:27dp;} +.transfer-premium-row>span {display:block;flex:1;min-width:0;white-space:nowrap;} +.transfer-premium-row button {width:150dp;flex-shrink:0;height:60dp;font-size:30dp;} +.transfer-offer-note {position:absolute;left:0;right:0;top:902dp;font-size:25dp;line-height:37.5dp;color:var(--muted);} +.transfer-search-editor {position:relative;width:2092dp;height:628dp;} +.transfer-search-kind {position:absolute;left:0;right:0;top:0;height:116dp;} +.transfer-search-kind>nav,.transfer-search-traits>nav {display:flex;gap:18dp;margin-top:14dp;} +.transfer-search-kind button,.transfer-search-traits button {flex:1;min-width:0;height:70dp;font-size:28dp;} + +.transfer-search-ranges {position:absolute;left:0;right:0;top:138dp;height:128dp;} +.transfer-search-ranges>div {position:absolute;display:flex;align-items:center;gap:20dp;font-size:27dp;line-height:31dp;} +.transfer-search-ranges span {display:block;width:160dp;flex-shrink:0;white-space:nowrap;} +.transfer-search-ranges input {display:block;flex:1;min-width:0;height:16dp;} +.transfer-search-ranges output {display:block;width:60dp;flex-shrink:0;text-align:right;color:#e1b3aa;} +.transfer-search-traits {position:absolute;left:0;right:0;top:288dp;height:116dp;} +.transfer-search-space {position:absolute;left:0;right:0;top:426dp;height:76dp;display:flex;gap:45dp;} +.transfer-search-space>div {display:flex;align-items:center;justify-content:space-between;gap:20dp;flex:1;min-width:0;font-size:27dp;} +.transfer-search-space span {display:block;white-space:nowrap;} +.transfer-search-space select {width:63%;height:76dp;padding:12dp 40dp 12dp 20dp;font-size:30dp;border:2dp var(--border);border-radius:12dp;background-color:#111f2a80;color:var(--text);text-align:left;} +.transfer-search-budget {position:absolute;left:0;right:0;top:524dp;height:104dp;border-top:2dp var(--border);padding-top:20dp;display:flex;align-items:center;justify-content:space-between;font-size:29dp;} +.transfer-search-budget>span {display:block;white-space:nowrap;} +.transfer-search-budget button {width:490dp;height:82dp;font-size:30dp;text-align:right;padding:12dp 20dp;} +.transfer-player-info {position:relative;width:2092dp;height:551dp;} +.transfer-info-photo {position:absolute;left:0;top:0;width:440dp;height:550dp;border-radius:20dp;overflow:hidden;background-color:var(--soft);display:flex;align-items:center;justify-content:center;} +.transfer-info-photo>span {display:block;font-size:50dp;} +.transfer-info-facts {position:absolute;left:485dp;right:0;top:0;height:551dp;} +.transfer-info-facts>div {position:absolute;border-bottom:2dp var(--border);padding-bottom:16dp;} +.transfer-info-facts span {display:block;width:100%;font-size:25dp;line-height:29dp;color:var(--muted);white-space:nowrap;} +.transfer-info-facts strong {display:block;width:100%;font-size:30dp;line-height:35dp;font-weight:normal;margin-top:10dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-team-info>h3 {font-size:34dp;margin:20dp 0;} +.transfer-info-table-row {display:flex;height:92dp;align-items:center;font-size:30dp;} +.transfer-info-table-row.head {height:66dp;color:var(--muted);} +.transfer-info-table-row>span {display:block;width:27.5%;text-align:center;} +.transfer-info-table-row>span:first-child {width:45%;text-align:left;} +.transfer-poach {position:relative;width:2092dp;height:869dp;} +.transfer-poach>p {font-size:28dp;line-height:42dp;color:var(--muted);} +.transfer-poach-pickers {position:absolute;left:0;right:0;top:68dp;height:94dp;display:flex;gap:24dp;} +.transfer-poach-pickers select {width:1034dp;height:94dp;border:2dp var(--border);border-radius:12dp;background-color:var(--soft);font-size:30dp;padding:12dp 40dp 12dp 24dp;text-align:left;} +.transfer-poach-clubs {position:absolute;left:0;right:0;top:186dp;height:684dp;overflow:auto;} +.transfer-poach-clubs button {position:absolute;padding:16dp 20dp;text-align:left;} +.transfer-poach-clubs .club-label {width:100%;min-width:0;gap:18dp;} +.transfer-poach-clubs .club-label>span {display:block;flex:1;min-width:0;font-size:26dp;white-space:normal;} +.transfer-poach-roster,.transfer-order-list {position:relative;max-height:1030dp;overflow:auto;} +.transfer-poach-row {display:flex;height:74dp;align-items:center;font-size:30dp;} +.transfer-poach-row.head,.transfer-order-row.head {color:var(--muted);border-bottom:2dp var(--border);} +.transfer-poach-row>button,.transfer-poach-row>span:first-child {display:block;width:38%;flex-shrink:0;font-size:30dp;text-align:left;} +.transfer-poach-row>span {display:block;width:15.5%;flex-shrink:0;text-align:center;white-space:nowrap;} +.transfer-order-row {display:flex;height:74dp;align-items:center;font-size:30dp;} +.transfer-order-row>span {display:block;width:20%;padding:6dp 8dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.transfer-order-row>span:first-child {width:31%;} +.transfer-order-row>span:nth-child(4) {width:22%;} +.transfer-order-row>span:last-child {width:7%;} +.transfer-order-row>button {width:56dp;height:56dp;font-size:36dp;} +.transfer-notice {font-size:30dp;line-height:45dp;} +body.silver .transfer-dialog {background-color:#eaf1f7fc;} +body.silver .transfer-name-search input,body.silver .transfer-offer-inputs button,body.silver .transfer-offer-inputs select,body.silver .transfer-search-space select {background-color:#ffffffad;} +body.silver .transfer-negative {color:#a54135;} +body.matchday .transfer-dialog {background-color:#2c2c32fc;} +body.matchday .transfer-name-search input,body.matchday .transfer-offer-inputs button,body.matchday .transfer-offer-inputs select,body.matchday .transfer-search-space select {background-color:#191a208a;} +.transfer-dialog select selectbox {padding:10dp;border:2dp var(--border);margin-top:8dp;max-height:600dp;overflow:auto;} +.transfer-dialog select option {height:72dp;min-height:72dp;padding:10dp 14dp;line-height:52dp;font-size:30dp;} + +.transfer-offer-flag {width:60dp;height:40dp;flex-shrink:0;overflow:hidden;} +.transfer-nation {overflow:hidden;border-radius:3dp;} +#transfer-submit {background-color:var(--selected);border-color:var(--accent);color:var(--accent);} +.transfer-search-ranges input slidertrack {height:4dp;margin-top:6dp;margin-bottom:6dp;} +.transfer-search-ranges input sliderbar {width:16dp;height:16dp;margin-top:0;} + +.transfer-filters button[aria-pressed=true],.transfer-strengths button[aria-pressed=true],.transfer-search-kind button[aria-pressed=true],.transfer-search-traits button[aria-pressed=true],.transfer-actions button[aria-pressed=true] {background-color:#9cafc240;border-color:#dce9f047;color:#f5f8fc;} +body.silver .transfer-filters button[aria-pressed=true],body.silver .transfer-strengths button[aria-pressed=true],body.silver .transfer-search-kind button[aria-pressed=true],body.silver .transfer-search-traits button[aria-pressed=true],body.silver .transfer-actions button[aria-pressed=true] {background-color:#a3c3dd54;border-color:#356f966e;color:#193b52;} +body.matchday .transfer-filters button[aria-pressed=true],body.matchday .transfer-strengths button[aria-pressed=true],body.matchday .transfer-search-kind button[aria-pressed=true],body.matchday .transfer-search-traits button[aria-pressed=true],body.matchday .transfer-actions button[aria-pressed=true] {background-color:#d48c7b26;border-color:#e5a19770;color:#ffe5de;} diff --git a/docs/new_ui/NATIVE_STATUS.md b/docs/new_ui/NATIVE_STATUS.md index e782204..7ce8a72 100644 --- a/docs/new_ui/NATIVE_STATUS.md +++ b/docs/new_ui/NATIVE_STATUS.md @@ -1,6 +1,6 @@ # Native Modern UI · erster Umsetzungsstand -Stand: 24. Oktober 2026. **Experimenteller RmlUI-Unterbau und erster +Stand: 25. Oktober 2026. **Experimenteller RmlUI-Unterbau und erster bedienbarer Durchlauf. Noch keine vollständige Umsetzung des HTML-Mockups.** Die normale Classic-Konfiguration bleibt unverändert; die neue Oberfläche wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut. @@ -76,6 +76,15 @@ wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut. - [TOTO](desktop/toto/README.md): roter Elferwette-Schein mit sechs unabhängigen Spalten, Gesamteinsatz, Tippvorschlag, Vormerkung und letztem Schein. +- [Aufstellung](desktop/lineup/README.md): vollständiger Kader, Spielfeld und + Datenansicht, Tausch und Ziehen, vier Vorgaben und vier eigene Formationen, + Anweisungen mit rotem Bereich sowie Schützenwahl. Die Taktik liest dieselben + Aufstellungspositionen. +- [Transfermarkt](desktop/transfer/README.md): Kader und Marktseiten, + Suchprofil/Positionsfilter, Vorschlag und Abwerben, Angebotsentwürfe, + Listings und vorgemerkte Aufträge. Die numerische Stärkeübersicht verwendet + wahlweise die aktive Elf oder den gesamten Kader. + **Anstoß führt keine Aktion aus**, weder per Maus noch per Tastatur. Das gilt auch für die direkte Aktionsschnittstelle des Demoanbieters. @@ -113,8 +122,8 @@ python3 tools/modern_ui/prepare_gui_assets.py \ --mockup /path/to/bmh_4k_ui --output /path/to/gui-resources cmake -S . -B build-modern -DOPENBMH_BUILD_MODERN_UI=ON \ -DBMH_MODERN_GUI_ASSETS=/path/to/gui-resources -cmake --build build-modern --target openbmh_play modern_ui_core_tests modern_reports_tests modern_finance_ui_tests modern_ticket_document_tests -ctest --test-dir build-modern -R '^modern_(ui_core|reports_|finance_ui_|ticket_)' --output-on-failure +cmake --build build-modern --target openbmh_play modern_ui_core_tests modern_reports_tests modern_finance_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_ticket_document_tests +ctest --test-dir build-modern -R '^modern_(ui_core|reports_|finance_ui_|lineup_ui_|transfer_ui_|ticket_)' --output-on-failure ./build-modern/OpenBMH --modern-ui-demo --mod /path/to/Diamond_Modern.obw ``` diff --git a/docs/new_ui/README.md b/docs/new_ui/README.md index eae29df..6368931 100644 --- a/docs/new_ui/README.md +++ b/docs/new_ui/README.md @@ -17,6 +17,7 @@ Implementierung in der Spiel-Engine. | Eintrittspreis | [Kompakter Schieberegler im Konto-Widget](desktop/entry-price/README.md) | | Trainingslager | [Alle 18 Angebote, Qualitätswerte und Bedienung](desktop/trainingcamp/README.md) | | Training | [Übungen, Kader, Intensität und Demo-Automatik](desktop/training/README.md) | +| Aufstellung | [Kader, Spielfeld, Formationen und Schützen](desktop/lineup/README.md) | | Taktik | [Interaktive Diagramme und Einsatzregler](desktop/tactics/README.md) | | Kalender | [Zwölf Monate, transponierte Wochen und Ligavorschau](desktop/calendar/README.md) | | Zahleneingabe | [Entwurf, Vorschläge und Bestätigung](desktop/number-entry/README.md) | @@ -32,7 +33,7 @@ Implementierung in der Spiel-Engine. | Freundschaftsspiele | [Gegner, Austragungsort, Kostenbestätigung und Vormerkungen](desktop/friendlies/README.md) | | Verlegen | [Kalendergestützte Verlegung mit Rücknahme](desktop/postpone/README.md) | | Hallentabellen | [16 Vereine, Sortierung und Hallenmasters-Info](desktop/indoor/README.md) | -| Transfers | [Ablöse-Kasten und Positionsfilter](desktop/transfers/README.md) | +| Transfermarkt | [Suche, Angebote, Listings und Vormerkungen](desktop/transfer/README.md) | Jeder Bereich nennt die geprüfte Quelle, bestehende Funktionen und offene Entscheidungen für die Engine-Anbindung. Die Architekturgrundlage bleibt der diff --git a/docs/new_ui/desktop/lineup/README.md b/docs/new_ui/desktop/lineup/README.md new file mode 100644 index 0000000..fba62d2 --- /dev/null +++ b/docs/new_ui/desktop/lineup/README.md @@ -0,0 +1,13 @@ +# Aufstellung + +Die native Aufstellung übernimmt den Desktop-Goldstand `23845730`: zwei Kaderdatenseiten, Teamansicht, Spielfeld, vier vorgegebene und vier eigene Aufstellungen, drei Gewichtungen, vier Anweisungen pro Spieler sowie Freistoß-, Elfmeter- und Eckballschützen. Die Hauptgeometrie verwendet 2612 × 1864 logische Pixel mit einem 1490 Pixel breiten Spielfeld. Midnight, Silver und Matchday verwenden dieselben Bedienelemente und die getrennt bereitgestellten GUI-Grafiken. + +Spieler-IDs, Namen, Positionen, Geburtsdaten und vorhandene Attribute werden unverändert aus dem schreibgeschützten OBW-Katalog gelesen. Fehlende Werte erscheinen als Gedankenstrich, bekannte Nullwerte bleiben erhalten. Der vollständige Kader wird angezeigt; bei 20 oder 24 Spielern sind Kaderliste und Ersatzbank scrollbar. Leere und kurze Kader erhalten weder erfundene Namen noch zusätzliche Spieler. Die anfängliche Rollenverteilung sowie Positionspunkte, Gewichtungen und Anweisungen sind ausdrücklich lokale Demoeinstellungen und keine berechnete Spielstärke oder Engineentscheidung. + +Ein Spieler wird durch Anklicken ausgewählt. Ein zweiter Spieler tauscht mit ihm den Platz. Startspieler können auf das Spielfeld gezogen, durch Anklicken einer Position versetzt oder mit den Pfeiltasten bewegt werden. Ein belegter Gitterpunkt tauscht die Spieler. Ersatzspieler wechseln durch Tauschen in die Startelf. Escape verwirft zuerst einen Ziehvorgang oder die Auswahl. Spielerinformationen öffnen die vorhandene Profilauflage. Reine Ansichtswechsel, Blättern und Auswahl verändern keine Quelldatenrevision. + +Der kanonische Demozustand `lineup` enthält den verwalteten Verein, alle stabilen Kader-IDs in `order`, elf eindeutige Gitterpunkte, die gewählte Formation, vier eigene Positionssätze, drei Gewichtungen, drei Schützen-IDs und vier Anweisungswerte je Spieler-ID. Die ersten höchstens elf IDs bilden auch für andere Vorschauen die gemeinsame aktive Mannschaft. Ein Wechsel auf die Ersatzbank entfernt unzulässige Schützenzuordnungen. Eigene Aufstellungen speichern ausschließlich Positionspunkte; Anweisungen bleiben an die Spieler-ID gebunden. + +Nur vollständig fehlende Aufstellungen werden bei alten Demo-Checkpoints ergänzt. Vorhandene unvollständige, fremde oder widersprüchliche Daten werden atomar abgelehnt. Ziehvorgänge sind an Katalog, Verein und die beim Beginn gelesene Quellrevision gebunden. Ein zwischenzeitlicher Wechsel kann daher keinen anderen Spieler oder Verein stillschweigend verändern. Der Demo-Checkpoint speichert Einstellungen; Auswahl, Seitenansicht und Ziehgeist sind flüchtig. Das OBW und seine Spielerattribute bleiben unverändert. Es gibt keine Classic-, Engine-, Geld- oder Spielzeitaktion. + +Synthetische Providerprüfungen decken leere, kurze und vollständige Kader, die gemeinsame Elf, Tauschen, Positionskollisionen, eigene Aufstellungen, Schützenbereinigung, echte Nullwerte, fehlende Attribute sowie ungültige Aktionen und Checkpoints ab. Der gemeinsame Linux-Build und alle 26 zugehörigen Regressionstests sind bestanden. Die native Prüfung umfasst alle drei Themes bei 1920 × 1080 und 1280 × 720, eigene Aufstellungen, Tastaturbedienung, Schützenvorschau und Escape, beide Ziehrichtungen zwischen Startelf und Bank, Außenabbruch sowie einen echten Checkpoint-Neustart mit identischem vollständigem Demozustand. Ein unabhängiger 24er-Kaderfall bestätigt auch den letzten Spieler, die letzte Reserve und deren Profile in beiden Ansichten. Die abschließende Sichtprüfung kontrolliert zusätzlich die Schützenmarkierungen, Länderflaggen und die auswahlbedingte horizontale Scrollleiste. Dies ist eine native Linux-Prüfung; eine Windows- oder macOS-Laufzeitabnahme wird daraus nicht abgeleitet. diff --git a/docs/new_ui/desktop/tactics/README.md b/docs/new_ui/desktop/tactics/README.md index 9593092..bede05c 100644 --- a/docs/new_ui/desktop/tactics/README.md +++ b/docs/new_ui/desktop/tactics/README.md @@ -30,9 +30,11 @@ an den Demoanbieter. Die HTML-Startwerte sind `[2, 1, 1, 0, 1, 0, 1, 6]`; Speichern, Laden und Wiederöffnen erhalten Änderungen. Keine Matchfunktion wird ausgeführt. -Die Formation ist derzeit dieselbe feste Vorschau wie im HTML-POC. Sie ist -noch nicht mit einer nativen Aufstellungsansicht verbunden. Der Sessionadapter -liefert später Formation, erlaubte Werte und Wirkungen. Die Kreideschrift +Seit dem Aufstellungspaket vom 25. Oktober liest das Diagramm die elf +Positionspunkte derselben [nativen Aufstellung](../lineup/README.md). +Verschieben und eigene Formationen aktualisieren dadurch auch die Taktiktafel; +die acht Taktikwerte bleiben davon unabhängig. Der Sessionadapter +liefert später erlaubte Werte und Wirkungen. Die Kreideschrift nutzt verfügbare Systemschriften mit Rückfall auf die mitgelieferte UI-Schrift; geringe Metrikunterschiede zwischen Betriebssystemen sind noch zu prüfen. diff --git a/docs/new_ui/desktop/transfer/README.md b/docs/new_ui/desktop/transfer/README.md new file mode 100644 index 0000000..9f78e0a --- /dev/null +++ b/docs/new_ui/desktop/transfer/README.md @@ -0,0 +1,181 @@ +# Kader und Transfermarkt · native Modern UI + +Stand: 25. Oktober 2026. Maßgeblich ist der aktuelle private HTML-Stand +`bmh_4k_ui`, Referenz `23845730`: `desktop/transfer-menu.js`, +`transfer-window.css`, `career-menus.css` und die Einbindung in +`management-menus.js`. Die späteren Regeln in `transfer-window.css` +überschreiben frühere Größen. Die aktuelle Vorlage zeigt vier numerische +Mannschaftsstärken; frühere Zylinderdiagramme werden nicht reaktiviert. + +Native Quellen sind +[demo_transfer.hpp](../../../../src/modern/ui/demo_transfer.hpp), +[demo_transfer.cpp](../../../../src/modern/ui/demo_transfer.cpp), +[transfer_screens.inc](../../../../src/modern/ui/transfer_screens.inc), +[transfer_controls.inc](../../../../src/modern/ui/transfer_controls.inc) +und [transfer.rcss](../../../../assets/modern/transfer.rcss). +Private Bilder, Namenstabellen und Weltdateien gehören nicht in öffentliche +Tests oder dieses Dokument. + +## Übersicht und Auswahl + +Links steht der gesamte eigene Kader mit stabilen Spieler-IDs in der +Katalogreihenfolge. Es gibt keinen Schnitt bei sechzehn Spielern: +20er- und 24er-Kader bleiben vollständig auswählbar und scrollbar. +„Daten A“ zeigt Position, Fuß, Typ, Kondition, Technik, Form und Stärke; +„Daten B“ Alter und die sieben vorhandenen Fähigkeiten. „Komplett“ +verbreitert den Kaderbereich und zeigt weitere vorhandene Werte. +Unbekannte Angaben erscheinen als „—“, bekannte Nullen als `0`. + +Rechts stehen sechs Marktangebote pro Seite, Namenfeld und Finden, +Preis-/Restkapitalvorschau, Positionsfilter, Mannschaftsstärken und die +Geschäftsaktionen. Die Seitenpfeile und Rechtsklick auf die Angebotsfläche +wechseln die Seite. Maus- und Tastaturfokus auf einer Angebotszeile ändern +nur die Vorschau. Der gewählte Spieler bleibt davon getrennt. + +Tippen im Namenfeld verändert zunächst ausschließlich den lokalen +Texteingabeentwurf. Erst Finden oder Enter übernimmt die Suche. +Die Suche unterstützt bis zu vierzig Unicodezeichen und berücksichtigt +Groß-/Kleinschreibung sowie geläufige lateinische Akzente, etwa +Müller/Muller, Öztürk/Ozturk und François/Francois. + +Der Suchdialog bietet Positionen, Alters- und Stärkeintervalle, +Kondition/Technik/Form als Vergleichsgrundlage, Spielweise, Spielseite und +maximale Preisvorstellung. Mindestens eine Position und ein Vergleichswert +bleiben ausgewählt. „Vorschlag“ setzt einen bearbeitbaren Entwurf anhand +der aktiven Mannschaft auf. „Aktive“ verwendet ausschließlich die von der +Aufstellung gelieferten aktiven IDs; „Team“ den vollständigen eigenen +Kader. Der Transfermarkt erzeugt keine zweite Startelf. + +## Angebote und Vormerkungen + +Eigene Spieler lassen sich zum Verkauf oder Verleihen vormerken. +Ein zum Verkauf bereits gelisteter Spieler wird mit „Vom Markt nehmen“ +wieder aus der eigenen Transferliste entfernt. Es können höchstens drei +eigene Spieler gleichzeitig gelistet sein. Kaufen und Ausleihen öffnen +Angebote für fremde Marktspieler; Abwerben öffnet Land, Liga, Verein und +dessen vollständigen tatsächlichen Kader. + +Der Angebotsdialog enthält Spieler-/Vereinsdaten, fiktiven Marktwert oder +Leihgebühr, Gehaltswunsch beziehungsweise vorhandenes Demomonatsgehalt, +Ablöse/Leihgebühr, Monatsgehalt, Dauer und sieben Prämien. Bei Leihe sind +12/24 Monate, sonst 12/24/36/48 Monate zulässig. Spieler-Info und Team-Info +führen zurück zum unveränderten Angebot. Kader-, Angebots- und +Dialogscrollpositionen werden dabei lokal erhalten. + +Geldfelder öffnen die gemeinsame Zahleneingabe mit zweiter Bestätigung. +Ablöse verwendet Vorschläge in 100.000er-Schritten, Monatsgehalt 5.000, +Suchbudget 500.000 und Prämien 1. Die Werte bleiben nach Bestätigung ein +lokaler Entwurf. Erst „Angebot“ speichert den vorläufigen Transferauftrag. +Abbruch verwirft ihn vollständig. Ein alter Welt-/Club-/Revisionsbezug +berechtigt keine spätere Bestätigung auf einem veränderten Stand. + +Die Auftragsliste hält höchstens fünfzig Aufträge und erlaubt Rücknahme. +Ein erneutes eigenes Verkaufs-/Verleihangebot ersetzt den Auftrag dieses +Spielers; Kauf und Leihe bleiben wie im HTML getrennte Auftragsarten. +Die Rücknahme des eigenen Auftrags entfernt auch dessen Listierung. +Es gibt keinen zusätzlichen Tauschhandler, weil die aktuelle Vorlage +keinen solchen Ablauf enthält. + +**Vormerkungen führen keinen Transfer aus.** Sie verändern weder echte +Kaderzuordnung, Spieler-/Vereinsdaten, Konto, Sparbuch, Schuld, +Spielerverträge noch Mannschaftsaufstellung. Ein Angebot über dem +verfügbaren Kapital bleibt als negative Vorschau und bloßer Auftrag +zulässig; es wird keine neue Zahlungsregel erfunden. + +## Zustand und Währung + +`state.transfer` besitzt ausschließlich: + +```text +club, query, positions, criteria, listed, orders +``` + +`club` bindet den Zustand an den ersten verwalteten Verein. `listed` +enthält eigene stabile Spieler-IDs. Ein Auftrag enthält +`kind`, `player`, `source_club`, `fee`, `salary`, `months`, `bonuses` und +`poached`. Die Quelle muss zum tatsächlichen Katalogspieler passen. +Fremde Spieler außerhalb des Demo-Markts können nur über das ausdrücklich +markierte Abwerben vorgemerkt werden. + +Alle gespeicherten Geldwerte einschließlich Suchbudget und Prämien sind +Minor Units aus `manifest.currency`. Bei null Nachkommastellen gilt +Faktor 1, bei zwei Faktor 100. Editoraktionen übergeben ganze angezeigte +Währungseinheiten; der Provider rechnet genau einmal um. Ablösen liegen +zwischen 0 und 99.999.999, Monatsgehälter zwischen 0 und 200.000, +Prämien zwischen 0 und 100 angezeigten Einheiten. Ein bestätigter Entwurf +schreibt ausschließlich `state.transfer`. + +Suche und übernommenes Suchprofil bleiben im UI-Demostand erhalten. +Änderungen von Suche, Profil oder Positionsfilter erhalten vorhandene +Aufträge und Listierungen. Tab, Komplettansicht, Stärkengrundlage, +Seitennummer, Auswahl, Hovervorschau und sämtliche Dialogentwürfe sind +flüchtige App-Daten. Beim Wechsel des ersten verwalteten Vereins setzt +die Datenquelle den Transferzustand für den neuen Verein zurück. + +`migrate_demo_transfer()` ergänzt nur ein vollständig fehlendes +Transferfeld. Vorhandene beschädigte Bestände, unbekannte Felder, +fehlerhafte IDs, doppelte Auftragsziele, unzulässige Laufzeiten und +überschrittene Limits werden atomar abgewiesen. Bestehende gültige +Minorwerte werden dabei nicht still gerundet. + +## Datenquelle und Referenzgrenzen + +Namen, Spieler-/Vereins-IDs, Fotos, Positionen, Nationalitäten, +Geburtsdaten und vorhandene Attribute kommen aus dem unveränderten +Katalog. Alter wird aus `born` zum Demodatum berechnet. Ein im Datensatz +klar fiktiv erzeugtes Geburtsdatum bleibt eine Datensatzangabe, keine +Behauptung einer unabhängig verifizierten Biografie. + +**OpenBMH deviates from the original:** Die zwölf erfundenen +HTML-Marktpersonen werden durch einen deterministischen zwölfköpfigen +Ausschnitt tatsächlicher fremder Katalogspieler ersetzt. Kleinere oder +leere Kataloge erzeugen entsprechend weniger Angebote. Eigene +Listierungen kommen zusätzlich hinzu. Abwerben zeigt alle tatsächlichen +Spieler des gewählten Vereins. Fehlende Werte werden nicht aus den +HTML-Formeln für Kondition, Technik, Fähigkeiten oder Saisonstatistik +erfunden. Preise, Gehaltsforderungen und vorläufige Angebote bleiben +hingegen ausdrücklich fiktive UI-Daten. + +Die logische Inhaltsfläche beträgt 2612 × 1864. Der Kaderbereich ist +1480,96875 breit; rechts folgt nach 34 Abstand der 1097,03125 breite +Marktbereich. Die sechs Angebote stehen über Vorschau, Filtern und vier +numerischen Stärkewerten. Der Angebotsdialog ist 2200 × 1210,5 groß, +der Suchdialog 2200 × 899. Native Auswahllisten verwenden die bestehenden +RmlUI-Steuerelemente und erhalten den Fokus nach dem Schließen. + +## Prüfstand und Enginegrenze + +Synthetische Prüfungen in +[modern_transfer_ui_tests.cpp](../../../../tests/modern_transfer_ui_tests.cpp) +sind erfolgreich: 0/2/20/24 eigene Spieler, volle fremde Kader, +beide Währungspräzisionen, drei Listierungen, fünfzig Aufträge, +Ersetzung/Rücknahme, Unicode-/Akzentsuche, korrekte `born`-Verwendung, +unbekannte Werte, ungültige Aktionen, strenge Migration, +Speicher-Roundtrip und unveränderte Welt-/Fremdmodelldaten. +Eine isolierte Syntaxprüfung der integrierten Ansicht ist ebenfalls grün. + +Die gemeinsame Integration und alle 26 Regressionstests sind grün. Die +native Linux-Prüfung deckt Midnight, Silver und Matchday jeweils in +1920 × 1080 und 1280 × 720 ab. Geprüft sind Geldentwurf und zweite +Bestätigung, Info/Zurück/Abbruch, Angebot und Auftragsrücknahme, drei +eigene Listierungen mit atomarer Ablehnung der vierten, vollständiges +Abwerben, Suchbudget null, Suche erst bei Enter, Pickerabbruch und +Rechtsklick-Seitenwechsel. Ein echter UI-Checkpoint mit vorgemerktem +Auftrag wurde in einem neuen Prozess mit identischem Modell geladen. + +Ein gezielter Nutzerscroll erreicht den zwanzigsten eigenen Spieler. +Auswahl und Scrolloffset bleiben nach Angebot → Spielerinfo → Zurück → +Abbruch erhalten. Die Wiederherstellung läuft genau einmal nach einem +DOM-Neuaufbau; ein flüchtiger interner `restore_scroll`-Schalter verhindert, +dass spätere Frames den Nutzeroffset zurücksetzen. Dieses Feld gehört +ausschließlich zur lokalen Ansicht und wird nicht im Demomodell gespeichert. + +Private Bilder, passende Diagnose-Snapshots, echte UI-Checkpoints, JSONL- +Abläufe, Hashmetadaten und ein portabler Replay-Helfer liegen ausschließlich +im privaten Paket `bmh_4k_ui/docs/qa/squad-batch-2026-10-25/transfer/`. +Diagnose-Snapshots sind keine ladbaren Spielstände; die sichtbare flüchtige +Dialogauswahl wird durch den jeweiligen Ablauf reproduziert. + +Der spätere Modern-Sessionadapter muss echte Transferregeln, Zustimmung, +Kaderwechsel und Buchungen liefern; dieses Paket ruft keine Engine, +Classic-Initialisierung oder Zufallsquelle auf. diff --git a/docs/new_ui/menu-qa.md b/docs/new_ui/menu-qa.md index 0b22489..4a9ca41 100644 --- a/docs/new_ui/menu-qa.md +++ b/docs/new_ui/menu-qa.md @@ -101,8 +101,26 @@ Laufzeitdarstellung wird dadurch nicht als abgenommen ausgegeben. Echte Checkpoints und Neustarts ergänzen die Browser-/Rendererprüfung. Die 24 Regressionstests bestehen. Private Nachweise: `docs/qa/club-batch-2026-10-24/`. - Aktueller Katalog: **25 native und 12 noch offene Routen**. + Nach diesem Paket: **25 native und 12 noch offene Routen**. CSS-Hintergrundbilder werden in der HTML-QA zusätzlich vollständig dekodiert, bevor Screenshots entstehen. Das verhindert falsche Meldungen über fehlende oder abgeschnittene Atlaskacheln im Umfeld beziehungsweise in Werbung. + +- [Aufstellung](desktop/lineup/README.md) und + [Transfermarkt](desktop/transfer/README.md): gemeinsames Kaderpaket vom + 25. Oktober, HTML-Gold `23845730`, drei Themes bei 720p/1080p. Formationen, + Anweisungen, Schützen, Ziehen zwischen Startelf/Bank, Angebotsentwürfe, + Suchfilter, Abwerben und Auftragsgrenzen wurden tatsächlich bedient. + Echte Checkpoint-Neustarts erhalten den vollständigen Demozustand. + Ein unabhängiger 24er-Kaderfall ergänzt die tatsächlichen 20er-Kader. + Korrigiert sind Popup-Markierung/Textmitte, ausgewählte Rosterzeilen ohne + horizontalen Überlauf sowie das Zurücksetzen von Nutzerscrollen pro Frame. + Reine Navigation und Dialogabbruch lassen Quellrevision und Dirty-Zustand + unverändert; Transferaufträge buchen kein Geld und ändern keinen Kader. + Die 26 ausgewählten Regressionstests bestehen. Private Nachweise mit + Screenshots, Eingabeskripten und ladbaren UI-Demoständen: + `docs/qa/squad-batch-2026-10-25/`. + Aktueller Katalog: **27 native und 10 noch offene Routen**. Diese + Routenzahl bezeichnet keine vollständige visuelle Abnahme oder + Engine-Anbindung; Anstoß bleibt ohne Aktion. diff --git a/docs/new_ui/qa-findings.md b/docs/new_ui/qa-findings.md index e5a6dca..c34de6d 100644 --- a/docs/new_ui/qa-findings.md +++ b/docs/new_ui/qa-findings.md @@ -1,6 +1,6 @@ # Offene native UI-Befunde -Stand: 24. Oktober 2026. Diese Liste betrifft die ausdrücklich aktivierte, +Stand: 25. Oktober 2026. Diese Liste betrifft die ausdrücklich aktivierte, noch unfertige Modern-Vorschau. Sie ist keine Abnahme der kompletten UI. Verbindliche Quelle ist das private HTML-Mockup; echte Rendererbilder und Bedienungsnachweise bleiben im privaten QA-Paket. @@ -32,7 +32,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 25 native Routen und 12 offene Ports. +der aktuelle Runner erfasst 27 native Routen und 10 offene Ports. Spätere Meilensteine erfassen denselben Gesamtkatalog erneut. Siehe [QA-Ablauf](menu-qa.md), [Typografie](typography-qa.md) und @@ -51,3 +51,12 @@ Themes bei 720p/1080p geprüft. Korrigiert sind die Bandennummernausrichtung, der Abstand der Werbehinweise, die TOTO-Saisonzeile und die Bildbox der Kreuze. Die Referenzaufnahme wartet jetzt auch auf vollständig dekodierte CSS-Hintergrundbilder; frühe Teilbilder gelten nicht als Produktabweichung. + +Im Aufstellungs-/Transferpaket behoben: Schützenmarkierung und Beschriftung +in derselben Popupzeile, ausgewählte Kaderzeilen ohne zusätzlichen +horizontalen Balken, Länderflaggen und Dialogkopf-Ausrichtung. Der +Transfermarkt stellt gespeicherte Scrollpositionen nur einmal nach dem +DOM-Neuaufbau her; anschließendes Nutzerscrollen bleibt frei. Letzte +Kaderzeilen, Schützenabbruch und Rückkehr aus Spielerinformationen werden +gezielt mitgeprüft. Nicht vorhandene OBW-Attribute werden als fehlend +angezeigt und nicht aus den erfundenen HTML-Spielerwerten ergänzt. diff --git a/src/modern/ui/CMakeLists.txt b/src/modern/ui/CMakeLists.txt index 9f63aec..ba46c9a 100644 --- a/src/modern/ui/CMakeLists.txt +++ b/src/modern/ui/CMakeLists.txt @@ -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) +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) 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) +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) configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY) endforeach() file(GLOB modern_icons CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/assets/modern/icons/*.svg") @@ -80,7 +80,7 @@ if(MSVC) endif() add_test(NAME modern_control_layout_tests COMMAND modern_control_layout_tests "${modern_assets}") -foreach(component environment advertising toto) +foreach(component environment advertising toto lineup transfer) 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) diff --git a/src/modern/ui/controls.inc b/src/modern/ui/controls.inc index a1f3878..5f87301 100644 --- a/src/modern/ui/controls.inc +++ b/src/modern/ui/controls.inc @@ -131,6 +131,10 @@ void App::drag_event(Rml::Event &event) { } void App::ProcessEvent(Rml::Event &event) try { const auto type = event.GetType(); + // Native widgets can emit intermediate selected values while their options + // are being constructed. Opening a squad menu must stay read-only. + if (setting_menu_markup_ && (menu_ == "lineup" || menu_ == "transfer") && + (type == "change" || type == "input")) return; if (type == "keydown") keyboard_navigation_ = true; else if (type == "mousedown") @@ -150,7 +154,16 @@ void App::ProcessEvent(Rml::Event &event) try { if (n->GetId() == "native-ticket-layer") return; if (amount_event(event)) return; + if ((menu_ == "lineup" || menu_ == "transfer") && (type == "change" || type == "input")) { + if (auto *select = dynamic_cast(event.GetTargetElement()); + select && select->IsSelectBoxVisible()) { + pending_selects_.insert(select->GetId()); + dirty_ = true; + return; + } + } 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() && contracts_event(event)) return; if (popup_.empty() && (advertising_event(event) || toto_event(event))) return; if (popup_.empty() && (bank_event(event) || finance_event(event))) return; @@ -396,7 +409,10 @@ void App::ProcessEvent(Rml::Event &event) try { controls[size_t(next)]->GetId().starts_with("report-club-") || controls[size_t(next)]->GetId().starts_with("friendly-opponent-") || controls[size_t(next)]->GetId().starts_with("alm-match-") || - controls[size_t(next)]->GetId().starts_with("contract-player-")) + controls[size_t(next)]->GetId().starts_with("contract-player-") || + controls[size_t(next)]->GetId().starts_with("lineup-name-") || + controls[size_t(next)]->GetId().starts_with("lineup-detail-") || + controls[size_t(next)]->GetId().starts_with("lineup-bench-")) controls[size_t(next)]->ScrollIntoView( Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest)); event.StopImmediatePropagation(); @@ -436,6 +452,7 @@ void App::ProcessEvent(Rml::Event &event) try { void App::dispatch(const std::string &action, Rml::Element *target) { const auto id = target ? target->GetAttribute("data-id", "") : std::string(); + if (lineup_action(action, target) || transfer_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; @@ -1049,7 +1066,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) { } static const std::set available = { "tables", "strengths", "camp", "settings", - "save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto"}; + "save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer"}; if (!available.contains(route)) { message("Diese native Ansicht wird im nächsten Menüpaket übertragen."); return; @@ -1438,6 +1455,8 @@ void App::script() { {"balance_future", balance_future_}, {"advertising_view", {{"selected", advertising_selected_}, {"offer", advertising_offer_}}}, {"toto_view", {{"column", toto_column_}, {"dialog", toto_dialog_}}}, + {"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_}, {"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()}, diff --git a/src/modern/ui/demo_lineup.cpp b/src/modern/ui/demo_lineup.cpp new file mode 100644 index 0000000..a14d5bf --- /dev/null +++ b/src/modern/ui/demo_lineup.cpp @@ -0,0 +1,233 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/demo_lineup.hpp" +#include +#include +#include +#include +#include + +namespace bmh::modern_ui { +namespace { +bool keys(const Json &v, std::initializer_list list) { + return v.is_object() && v.size() == list.size() && std::all_of(list.begin(), list.end(), + [&](auto key) { return v.contains(key); }); +} +bool integer(const Json &v, int lo, int hi) { + if (v.is_number_unsigned()) return v.get() <= uint64_t(hi) && + (lo <= 0 || v.get() >= uint64_t(lo)); + return v.is_number_integer() && v.get() >= lo && v.get() <= hi; +} +bool integers(const Json &v, size_t count, int lo, int hi) { + return v.is_array() && v.size() == count && std::all_of(v.begin(), v.end(), + [&](const auto &n) { return integer(n, lo, hi); }); +} +bool points(const Json &v) { + if (!v.is_array() || v.size() != 11) return false; + std::set> seen; + for (const auto &p : v) { + if (!p.is_array() || p.size() != 2 || !integer(p[0], 0, 18) || !integer(p[1], 0, 8) || + !seen.emplace(p[0].get(), p[1].get()).second) return false; + } + return true; +} +std::string own(const Catalog &world, const std::string &club, const Json *state = nullptr) { + if (!club.empty()) return world.manageable(club) ? club : std::string(); + if (state && state->is_object() && state->contains("managers")) { + const auto &m = state->at("managers"); + if (!m.is_array() || m.empty() || !m[0].is_object() || !m[0].contains("club") || + !m[0]["club"].is_string()) return {}; + const auto id = m[0]["club"].get(); + return world.manageable(id) ? id : std::string(); + } + for (auto *c : world.clubs()) if (world.manageable(c->value("id", ""))) return c->value("id", ""); + return {}; +} +std::string position(const Json &p) { + if (!p.contains("positions") || !p.at("positions").is_array()) return {}; + const auto &pos = p.at("positions"); + if (std::find(pos.begin(), pos.end(), "gk") != pos.end()) return "gk"; + for (const auto &v : pos) if (v.is_string()) return v.get(); + return {}; +} +Json attribute(const Json &p, const char *key) { + if (!p.contains("attributes") || !p.at("attributes").is_object()) return nullptr; + const auto found = p.at("attributes").find(key); + return found != p.at("attributes").end() && found->is_number() && + std::isfinite(found->get()) ? *found : Json(nullptr); +} +bool date(const Json &v) { + if (!v.is_string()) return false; + const auto &s = v.get_ref(); + if (s.size() != 10 || s[4] != '-' || s[7] != '-') return false; + for (size_t i = 0; i < s.size(); ++i) if (i != 4 && i != 7 && (s[i] < '0' || s[i] > '9')) return false; + return std::chrono::year_month_day{std::chrono::year{std::stoi(s.substr(0,4))}, + std::chrono::month{unsigned(std::stoi(s.substr(5,2)))}, + std::chrono::day{unsigned(std::stoi(s.substr(8,2)))}}.ok(); +} +Json age(const Json &p, const Json &reference) { + const Json born = p.value("born", p.value("birth_date", Json())); + if (date(born) && date(reference)) { + const auto b = born.get(), r = reference.get(); + const int n = std::stoi(r.substr(0,4)) - std::stoi(b.substr(0,4)) - int(r.substr(5) < b.substr(5)); + return n >= 0 && n <= 100 ? Json(n) : Json(nullptr); + } + const auto initial = p.value("age_at_start", Json()); + return integer(initial, 0, 100) ? initial : Json(nullptr); +} +void clean_takers(Json &lineup) { + const auto &order = lineup.at("order"); + for (auto &taker : lineup["takers"]) { + bool active = false; + for (size_t i = 0; i < std::min(size_t(11), order.size()); ++i) if (order[i] == taker) active = true; + if (!active) taker = ""; + } +} +} // namespace +Json demo_lineup_formations() { + return Json::array({ + {{0,4},{5,1},{5,3},{5,5},{5,7},{10,1},{10,3},{10,5},{10,7},{16,3},{16,5}}, + {{0,4},{5,1},{5,3},{5,5},{5,7},{10,2},{10,4},{10,6},{16,1},{16,4},{16,7}}, + {{0,4},{5,2},{5,4},{5,6},{10,0},{10,2},{10,4},{10,6},{10,8},{16,3},{16,5}}, + {{0,4},{4,0},{4,2},{4,4},{4,6},{4,8},{10,2},{10,4},{10,6},{16,3},{16,5}} + }); +} +Json demo_lineup(const Catalog &world, const std::string &managed) { + const auto club = own(world, managed); + Json order = Json::array(), orders = Json::object(); + const auto squad = world.squad(club); + std::set used; + for (const auto &[role, count] : std::array,4>{{{"gk",1},{"def",4},{"mid",4},{"fwd",2}}}) { + int n = 0; + for (auto *p : squad) if (position(*p) == role && n < count && used.insert(p->at("id").get()).second) { + order.push_back(p->at("id")); ++n; + } + } + for (auto *p : squad) if (used.insert(p->at("id").get()).second) order.push_back(p->at("id")); + for (auto *p : squad) orders[p->at("id").get()] = {20,20,20,20}; + return {{"club", club}, {"order", order}, {"points", demo_lineup_formations()[0]}, + {"formation", 0}, {"custom", {nullptr,nullptr,nullptr,nullptr}}, + {"weights", {1,2,2}}, {"takers", {"","",""}}, {"orders", orders}}; +} +Json demo_lineup_active(const Json &state) { + Json active = Json::array(); + if (!state.is_object() || !state.contains("lineup") || !state.at("lineup").is_object() || + !state.at("lineup").contains("order") || !state.at("lineup").at("order").is_array()) return active; + const auto &order = state.at("lineup").at("order"); + for (size_t i = 0; i < std::min(size_t(11), order.size()); ++i) { + if (!order[i].is_string()) return Json::array(); + active.push_back(order[i]); + } + return active; +} +bool valid_demo_lineup(const Json &state, const Catalog &world, const std::string &managed) { + try { + if (!state.is_object() || !state.contains("lineup")) return false; + const auto &l = state.at("lineup"); + const auto club = own(world, managed, &state); + if (club.empty() || !keys(l, {"club","order","points","formation","custom","weights","takers","orders"}) || + l.at("club") != club || !l.at("order").is_array() || !points(l.at("points")) || + !integer(l.at("formation"), -1, 7) || !l.at("custom").is_array() || l.at("custom").size() != 4 || + !integers(l.at("weights"), 3, 0, 3) || !l.at("takers").is_array() || l.at("takers").size() != 3 || + !l.at("orders").is_object()) return false; + for (const auto &p : l.at("custom")) if (!p.is_null() && !points(p)) return false; + const int formation = l.at("formation").get(); + if (formation >= 0 && l.at("points") != (formation < 4 ? demo_lineup_formations()[size_t(formation)] : l.at("custom")[size_t(formation-4)])) return false; + std::set expected, actual; + for (auto *p : world.squad(club)) expected.insert(p->at("id").get()); + if (l.at("order").size() != expected.size() || l.at("orders").size() != expected.size()) return false; + for (const auto &id : l.at("order")) if (!id.is_string() || !actual.insert(id.get()).second) return false; + if (actual != expected) return false; + for (const auto &id : expected) if (!l.at("orders").contains(id) || !integers(l.at("orders").at(id), 4, 2, 40)) return false; + const auto active = demo_lineup_active(state); + for (const auto &id : l.at("takers")) if (!id.is_string() || (id != "" && std::find(active.begin(), active.end(), id) == active.end())) return false; + return true; + } catch (const std::exception &) { return false; } +} +bool migrate_demo_lineup(Json &state, const Catalog &world, const std::string &managed) { + if (!state.is_object()) return false; + auto next = state; + if (!next.contains("lineup")) next["lineup"] = demo_lineup(world, own(world, managed, &state)); + if (!valid_demo_lineup(next, world, managed)) return false; + state = std::move(next); + return true; +} +std::string edit_demo_lineup(Json &state, const Json &action, const Catalog &world, const std::string &managed) { + if (!valid_demo_lineup(state, world, managed)) return "invalid_lineup_state"; + if (!action.is_object() || !action.contains("kind") || !action.at("kind").is_string()) return "invalid_lineup_action"; + auto next = state; + auto &l = next["lineup"]; + const auto kind = action.at("kind").get(); + const auto slot = [&](const Json &id) -> int { + if (!id.is_string()) return -1; + const auto it = std::find(l.at("order").begin(), l.at("order").end(), id); + return it == l.at("order").end() ? -1 : int(it - l.at("order").begin()); + }; + if (kind == "swap") { + if (!keys(action, {"kind","a","b"})) return "invalid_lineup_action"; + const int a = slot(action.at("a")), b = slot(action.at("b")); + if (a < 0 || b < 0) return "invalid_lineup_player"; + std::swap(l["order"][size_t(a)], l["order"][size_t(b)]); + clean_takers(l); + } else if (kind == "move") { + if (!keys(action, {"kind","player","point"})) return "invalid_lineup_action"; + const int from = slot(action.at("player")); + const auto &p = action.at("point"); + if (from < 0 || from >= 11 || !p.is_array() || p.size() != 2 || !integer(p[0],0,18) || !integer(p[1],0,8)) return "invalid_lineup_point"; + const auto it = std::find(l.at("points").begin(), l.at("points").end(), p); + const int hit = int(it - l.at("points").begin()); + if (hit != from && hit < int(std::min(size_t(11), l.at("order").size()))) { + std::swap(l["order"][size_t(from)], l["order"][size_t(hit)]); + clean_takers(l); + } else if (hit < 11 && hit != from) { std::swap(l["points"][size_t(from)],l["points"][size_t(hit)]); l["formation"]=-1; } + else { l["points"][size_t(from)] = p; l["formation"] = -1; } + } else if (kind == "formation") { + if (!keys(action, {"kind","value"}) || !integer(action.at("value"),0,7)) return "invalid_lineup_formation"; + const int i = action.at("value").get(); + const auto p = i < 4 ? demo_lineup_formations()[size_t(i)] : l.at("custom")[size_t(i-4)]; + if (p.is_null()) return "missing_lineup_formation"; + l["points"] = p; l["formation"] = i; + } else if (kind == "custom-save") { + if (!keys(action, {"kind","index"}) || !integer(action.at("index"),0,3)) return "invalid_lineup_formation"; + const int i = action.at("index").get(); + l["custom"][size_t(i)] = l.at("points"); l["formation"] = i + 4; + } else if (kind == "weight") { + if (!keys(action, {"kind","index"}) || !integer(action.at("index"),0,2)) return "invalid_lineup_weight"; + const size_t i = action.at("index").get(); + l["weights"][i] = (l.at("weights")[i].get()+1)%4; + } else if (kind == "order") { + if (!keys(action, {"kind","player","index","value"}) || slot(action.at("player")) < 0 || slot(action.at("player")) >= 11 || + !integer(action.at("index"),0,3) || !integer(action.at("value"),2,40)) return "invalid_lineup_order"; + l["orders"][action.at("player").get()][action.at("index").get()] = action.at("value"); + } else if (kind == "taker") { + if (!keys(action, {"kind","index","player"}) || !integer(action.at("index"),0,2) || !action.at("player").is_string()) return "invalid_lineup_taker"; + const int n = slot(action.at("player")); + if (action.at("player") != "" && (n < 0 || n >= 11)) return "invalid_lineup_taker"; + l["takers"][action.at("index").get()] = action.at("player"); + } else if (kind == "takers-auto") { + if (!keys(action, {"kind"})) return "invalid_lineup_action"; + l["takers"] = {"","",""}; + } else return "unknown_lineup_action"; + if (!valid_demo_lineup(next, world, managed)) return "invalid_lineup_state"; + state = std::move(next); + return {}; +} +Json demo_lineup_rows(const Json &state, const Catalog &world, const std::string &managed) { + if (!valid_demo_lineup(state, world, managed)) return {{"ok",false},{"error","invalid_lineup_state"}}; + Json rows = Json::array(); + const auto reference = state.value("date", world.manifest().value("start_date",Json())); + const auto &l = state.at("lineup"); + size_t slot = 0; + for (const auto &id : l.at("order")) { + const auto *p = world.find("players", id.get()); + if (!p) return {{"ok",false},{"error","missing_lineup_player"}}; + Json row = {{"id",id},{"name",world.name(*p)},{"position",position(*p)}, + {"slot",slot},{"starter",slot < 11},{"age",age(*p,reference)}, + {"nation",p->value("nationalities",Json::array()).is_array() && !p->value("nationalities",Json::array()).empty() ? p->at("nationalities")[0] : p->value("nation",Json())}, {"positions",p->value("positions",Json::array())}}; + for (const auto *key : {"condition","technique","form","strength","motivation","goals","assists", + "corner","free_kick","tackling","passing","shooting","speed","teamplay","games","grade"}) + row[key] = attribute(*p,key); + rows.push_back(std::move(row)); ++slot; + } + return {{"ok",true},{"club",l.at("club")},{"rows",rows}}; +} +} // namespace bmh::modern_ui diff --git a/src/modern/ui/demo_lineup.hpp b/src/modern/ui/demo_lineup.hpp new file mode 100644 index 0000000..f78affd --- /dev/null +++ b/src/modern/ui/demo_lineup.hpp @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-3.0-only +#pragma once +#include "modern/ui/catalog.hpp" + +namespace bmh::modern_ui { +// Presentation-only lineup. Stable catalogue IDs, all real squad members, no +// squad-size cap or world/engine mutation. FULL state is used by all editors. +Json demo_lineup(const Catalog &, const std::string &club = {}); +Json demo_lineup_formations(); +bool migrate_demo_lineup(Json &, const Catalog &, const std::string &club = {}); +bool valid_demo_lineup(const Json &, const Catalog &, const std::string &club = {}); +std::string edit_demo_lineup(Json &, const Json &, const Catalog &, const std::string &club = {}); +// Shared read-side starting eleven; missing/empty lineups yield an empty array. +Json demo_lineup_active(const Json &); +// {ok,club,rows:[{id,name,position,...actual nullable catalogue attributes}]}. +Json demo_lineup_rows(const Json &, const Catalog &, const std::string &club = {}); +} // namespace bmh::modern_ui diff --git a/src/modern/ui/demo_sports.cpp b/src/modern/ui/demo_sports.cpp index 4afa9d4..f333c17 100644 --- a/src/modern/ui/demo_sports.cpp +++ b/src/modern/ui/demo_sports.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only #include "modern/ui/demo_sports.hpp" #include +#include #include #include #include @@ -179,7 +180,8 @@ std::string edit_demo_tactics(Json &state, const Json &action) { return "unknown_tactic_action"; return {}; } -std::string tactics_diagram(const Json &state, const std::string &theme) { +std::string tactics_diagram(const Json &state, const std::string &theme, + const Json &lineup_points) { const auto values = state.at("values").get>(); const std::string line = theme == "silver" ? "#536f66" : "#dfe8bf"; const auto field_line = theme == "silver" ? "#536f66" : "#d7edbf", @@ -217,7 +219,7 @@ std::string tactics_diagram(const Json &state, const std::string &theme) { field(19, 82, 104, 62); field(137, 10, 58, 37); field(205, 10, 58, 37); - const std::array, 10> formation = {{{5, 1}, + std::array, 10> formation = {{{5, 1}, {5, 3}, {5, 5}, {5, 7}, @@ -227,6 +229,20 @@ std::string tactics_diagram(const Json &state, const std::string &theme) { {10, 7}, {16, 3}, {16, 5}}}; + if (!lineup_points.is_null()) { + if (!lineup_points.is_array() || lineup_points.size() != 11) + throw editor::Error("invalid_lineup_points"); + std::set> occupied; + for (size_t i = 0; i < lineup_points.size(); ++i) { + const auto &p = lineup_points[i]; + if (!p.is_array() || p.size() != 2 || !p[0].is_number_integer() || + !p[1].is_number_integer() || p[0] < 0 || p[0] > 18 || p[1] < 0 || p[1] > 8) + throw editor::Error("invalid_lineup_points"); + const std::pair point{p[0].get(), p[1].get()}; + if (!occupied.insert(point).second) throw editor::Error("invalid_lineup_points"); + if (i) formation[i - 1] = point; + } + } for (const auto &[x, y] : formation) { const double px = 25 + x / 18.0 * 82, py = 16 + y / 8.0 * 49; arrow(px, py, std::array{-16, -7, 7, 16}[size_t(values[0])], 0); diff --git a/src/modern/ui/demo_sports.hpp b/src/modern/ui/demo_sports.hpp index cceb1c0..70a916f 100644 --- a/src/modern/ui/demo_sports.hpp +++ b/src/modern/ui/demo_sports.hpp @@ -11,5 +11,6 @@ std::string edit_demo_training(Json &, const Json &action); Json demo_tactics(); bool valid_demo_tactics(const Json &); std::string edit_demo_tactics(Json &, const Json &action); -std::string tactics_diagram(const Json &, const std::string &theme); +std::string tactics_diagram(const Json &, const std::string &theme, + const Json &lineup_points = Json()); } // namespace bmh::modern_ui diff --git a/src/modern/ui/demo_transfer.cpp b/src/modern/ui/demo_transfer.cpp new file mode 100644 index 0000000..fa4f093 --- /dev/null +++ b/src/modern/ui/demo_transfer.cpp @@ -0,0 +1,307 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/demo_transfer.hpp" +#include "modern/ui/demo_finance.hpp" +#include +#include +#include +#include +#include +#include + +namespace bmh::modern_ui { +namespace { +constexpr int64_t cap = 99999999, salary_cap = 200000; +constexpr std::array positions{"gk","def","mid","fwd"}; +constexpr std::array skills{"corner","free_kick","tackling","passing","shooting","speed","teamplay"}; +bool keys(const Json &v, std::initializer_list expected) { + return v.is_object() && v.size() == expected.size() && std::all_of(expected.begin(),expected.end(),[&](auto *k){return v.contains(k);}); +} +bool integer(const Json &v, int64_t lo, int64_t hi) { + if (v.is_number_unsigned()) return hi >= 0 && v.get() <= uint64_t(hi) && (lo <= 0 || v.get() >= uint64_t(lo)); + return v.is_number_integer() && v.get() >= lo && v.get() <= hi; +} +Json error(const char *code) { return {{"ok",false},{"error",code}}; } +std::string own(const Catalog &world, const std::string &club) { + if (!club.empty()) { + if (!world.manageable(club)) throw editor::Error("invalid_transfer_club"); + return club; + } + for (auto *c : world.clubs()) if (world.manageable(c->value("id",""))) return c->value("id",""); + return ""; +} +std::string position(const Json &p) { + const auto found = p.find("positions"); + if (found == p.end() || !found->is_array()) return ""; + for (auto *role : positions) if (std::find(found->begin(),found->end(),role) != found->end()) return role; + return ""; +} +int role_index(const std::string &p) { + const auto it = std::find(positions.begin(),positions.end(),p); + return int(it - positions.begin()); +} +bool iso(const Json &v) { + if (!v.is_string()) return false; + const auto s = v.get(); + if (s.size()!=10 || s[4]!='-' || s[7]!='-') return false; + for (size_t i=0;i<10;++i) if(i!=4 && i!=7 && (s[i]<'0'||s[i]>'9')) return false; + return std::stoi(s.substr(0,4))>0 && std::chrono::year_month_day{std::chrono::year{std::stoi(s.substr(0,4))},std::chrono::month{unsigned(std::stoi(s.substr(5,2)))},std::chrono::day{unsigned(std::stoi(s.substr(8,2)))}}.ok(); +} +Json age(const Json &p, const Json &state, const Catalog &world) { + const auto when = state.value("date",world.manifest().value("start_date",Json())); + if (p.contains("born") && iso(p.at("born")) && iso(when)) { + const auto born=p.at("born").get(), day=when.get(); + const int years=std::stoi(day.substr(0,4))-std::stoi(born.substr(0,4))-(day.substr(5)=0 && years<=100 ? Json(years):Json(); + } + const auto initial=p.value("age_at_start",Json()); + if(integer(initial,0,100)) return initial; + if(initial.is_object() && initial.contains("years") && integer(initial.at("years"),0,100) && initial.value("on",Json())==when) return initial.at("years"); + return nullptr; +} +Json attribute(const Json &p, const char *key) { + const auto a=p.find("attributes"); + if(a==p.end()||!a->is_object()) return nullptr; + const auto v=a->find(key); + return v!=a->end() && v->is_number() && std::isfinite(v->get()) && *v>=0 && *v<=100 ? *v:Json(); +} +Json criteria(int64_t factor) { + return {{"age_min",16},{"age_max",40},{"strength_min",0},{"strength_max",100},{"traits",7},{"foot",0},{"type",0},{"price_max",cap*factor}}; +} +bool valid_criteria(const Json &c, int64_t factor) { + return keys(c,{"age_min","age_max","strength_min","strength_max","traits","foot","type","price_max"}) && + integer(c.at("age_min"),16,40) && integer(c.at("age_max"),16,40) && c.at("age_min")<=c.at("age_max") && + integer(c.at("strength_min"),0,100) && integer(c.at("strength_max"),0,100) && c.at("strength_min")<=c.at("strength_max") && + integer(c.at("traits"),1,7) && integer(c.at("foot"),0,3) && integer(c.at("type"),0,3) && integer(c.at("price_max"),0,cap*factor); +} +bool query_text(const Json &v) { + if(!v.is_string()) return false; + const auto &s=v.get_ref(); size_t chars=0; + for(size_t i=0;i(s[i]); size_t n= c<128?1:c>=194&&c<=223?2:c>=224&&c<=239?3:c>=240&&c<=244?4:0; + if(!n || i+n>s.size() || c<32) return false; + for(size_t k=1;k(s[i+k])&192)!=128) return false; + if((c==224 && static_cast(s[i+1])<160)||(c==237 && static_cast(s[i+1])>=160)||(c==240 && static_cast(s[i+1])<144)||(c==244 && static_cast(s[i+1])>=144)) return false; + i+=n; if(++chars>40) return false; + } + return true; +} +std::string fold(std::string s) { + for(const auto &[a,b]:std::initializer_list>{ + {"Ä","a"},{"ä","a"},{"Ö","o"},{"ö","o"},{"Ü","u"},{"ü","u"},{"ẞ","ss"},{"ß","ss"}, + {"É","e"},{"é","e"},{"È","e"},{"è","e"},{"Ê","e"},{"ê","e"},{"Ë","e"},{"ë","e"}, + {"Á","a"},{"á","a"},{"À","a"},{"à","a"},{"Â","a"},{"â","a"},{"Ã","a"},{"ã","a"},{"Å","a"},{"å","a"}, + {"Í","i"},{"í","i"},{"Ì","i"},{"ì","i"},{"Î","i"},{"î","i"},{"İ","i"}, + {"Ñ","n"},{"ñ","n"},{"Ç","c"},{"ç","c"},{"Ł","l"},{"ł","l"}, + {"Ó","o"},{"ó","o"},{"Ò","o"},{"ò","o"},{"Ô","o"},{"ô","o"},{"Õ","o"},{"õ","o"},{"Ø","o"},{"ø","o"}, + {"Ú","u"},{"ú","u"},{"Ù","u"},{"ù","u"},{"Û","u"},{"û","u"},{"Æ","ae"},{"æ","ae"},{"Œ","oe"},{"œ","oe"}, + {"Ś","s"},{"ś","s"},{"Ć","c"},{"ć","c"},{"Ź","z"},{"ź","z"},{"Ż","z"},{"ż","z"}}) { + size_t at=0;while((at=s.find(a,at))!=std::string::npos){s.replace(at,a.size(),b);at+=b.size();} + } + for(auto &c:s) if(c>='A'&&c<='Z') c=char(c-'A'+'a'); + return s; +} +std::vector market_players(const Catalog &world, const std::string &club) { + if(club.empty()) return {}; + std::vector clubs; + for(auto *c:world.clubs()) { + auto *l=world.find("competitions",c->value("competition","")); + if(c->at("id")!=club && l && l->value("type","")=="league") clubs.push_back(c); + } + std::vector out;std::set used; + for(int slot=0;slot<12 && !clubs.empty();++slot) { + const Json *chosen=nullptr; + for(size_t offset=0;offsetat("id")); + for(auto *p:squad) if(!used.contains(p->at("id")) && position(*p)==positions[size_t(slot)%4]) {chosen=p;break;} + if(!chosen) for(auto *p:squad) if(!used.contains(p->at("id"))) {chosen=p;break;} + } + if(!chosen) break; + used.insert(chosen->at("id").get());out.push_back(chosen); + } + return out; +} +bool available(const Catalog &world, const Json *p) { + if(!p) return false; + auto *c=world.find("clubs",p->value("team","")); + auto *l=c?world.find("competitions",c->value("competition","")):nullptr; + return c && c->value("type","club")=="club" && l && l->value("type","")=="league"; +} +Json row(const Json &state, const Catalog &world, const std::string &club, const Json &p, const std::vector *cached_market = nullptr) { + const auto factor=finance_currency_factor(world); + const auto id=p.at("id").get(), team=p.value("team",""); + const bool is_own=team==club; + auto squad=world.squad(team);auto at=std::find(squad.begin(),squad.end(),&p); + size_t ordinal=at==squad.end()?0:size_t(at-squad.begin()); + const auto market=cached_market?*cached_market:market_players(world,club);auto candidate=std::find(market.begin(),market.end(),&p); + if(candidate!=market.end()) ordinal=size_t(candidate-market.begin()); + const int64_t fee=std::min(cap,(is_own?600000:450000)+int64_t(std::min(ordinal,500))* (is_own?95000:170000))*factor; + Json strength=attribute(p,"strength"); + const auto cond=attribute(p,"condition"),tech=attribute(p,"technique"),form=attribute(p,"form"); + if(strength.is_null()&&!cond.is_null()&&!tech.is_null()&&!form.is_null()) strength=int(std::floor((cond.get()+tech.get()+form.get())/3)); + Json salary=nullptr; + if(is_own&&state.contains("contracts")&&state.at("contracts").is_object()) { + const auto players=state.at("contracts").find("players"); + if(players!=state.at("contracts").end()&&players->is_object()&&players->contains(id)) { + const auto &c=players->at(id);if(c.is_object()&&c.contains("salary")&&integer(c.at("salary"),0,salary_cap*factor)) salary=c.at("salary"); + } + } + const auto *c=world.find("clubs",team); + Json nation=nullptr; const auto ns=p.find("nationalities"); + if(ns!=p.end()&&ns->is_array()&&!ns->empty()&&(*ns)[0].is_string()&&world.find("nations",(*ns)[0])) nation=(*ns)[0]; + Json skill=Json::array();for(auto *key:skills)skill.push_back(attribute(p,key)); + Json foot=attribute(p,"foot"),type=attribute(p,"type"); + if(!integer(foot,1,3))foot=nullptr; + if(!integer(type,1,3))type=nullptr; + return {{"id",id},{"name",world.name(p)},{"club",team},{"club_name",c?world.name(*c):""},{"crest",c?c->value("crest",Json()):Json()}, + {"photo",p.value("photo",Json())},{"position",position(p).empty()?Json():Json(position(p))},{"age",age(p,state,world)}, + {"condition",cond},{"technique",tech},{"form",form},{"strength",strength},{"foot",foot},{"type",type}, + {"nation",nation},{"nation_name",nation.is_string()?world.nation_name(nation.get()):""},{"skills",skill}, + {"games",attribute(p,"games")},{"goals",attribute(p,"goals")},{"assists",attribute(p,"assists")}, + {"league_games",attribute(p,"league_games")},{"cup_games",attribute(p,"cup_games")},{"europe_games",attribute(p,"europe_games")}, + {"fee",fee},{"salary",salary},{"own",is_own}}; +} +bool valid_order(const Json &o, const Catalog &world, const std::string &club, int64_t factor) { + if(!keys(o,{"kind","player","source_club","fee","salary","months","bonuses","poached"}) ||!o.at("kind").is_string()||!o.at("player").is_string()||!o.at("source_club").is_string()||!o.at("poached").is_boolean())return false; + const auto kind=o.at("kind").get();const bool is_own=kind=="sell"||kind=="lend",loan=kind=="loan"||kind=="lend"; + const auto *p=world.find("players",o.at("player")); + if(!(is_own||kind=="buy"||kind=="loan")||!available(world,p)||p->value("team","")!=o.at("source_club").get()||is_own!=(p->value("team","")==club))return false; + if(is_own&&o.at("poached")!=false)return false; + if(!is_own&&o.at("poached")==false) { + const auto market=market_players(world,club);if(std::find(market.begin(),market.end(),p)==market.end())return false; + } + if(!integer(o.at("fee"),0,cap*factor)||!integer(o.at("salary"),0,salary_cap*factor)||!integer(o.at("months"),12,48)|| + !(o.at("months")==12||o.at("months")==24||(!loan&&(o.at("months")==36||o.at("months")==48)))||!o.at("bonuses").is_array()||o.at("bonuses").size()!=7)return false; + return std::all_of(o.at("bonuses").begin(),o.at("bonuses").end(),[&](const auto &v){return integer(v,0,100*factor);}); +} +bool same_order_target(const Json &a,const Json &b) { + const bool own=a.at("kind")=="sell"||a.at("kind")=="lend"; + return a.at("player")==b.at("player")&&a.at("source_club")==b.at("source_club")&& + (own?(b.at("kind")=="sell"||b.at("kind")=="lend"):a.at("kind")==b.at("kind")); +} +} // namespace +Json demo_transfer(const Catalog &world,const std::string &requested) { + const auto club=own(world,requested);return {{"club",club},{"query",""},{"positions",15},{"criteria",criteria(finance_currency_factor(world))},{"listed",Json::array()},{"orders",Json::array()}}; +} +bool valid_demo_transfer(const Json &state,const Catalog &world,const std::string &requested) { + try { + const auto club=own(world,requested); + const auto factor=finance_currency_factor(world);const auto &t=state.at("transfer"); + if(!keys(t,{"club","query","positions","criteria","listed","orders"})||t.at("club")!=club||!query_text(t.at("query"))||!integer(t.at("positions"),1,15)||!valid_criteria(t.at("criteria"),factor)||!t.at("listed").is_array()||t.at("listed").size()>3||!t.at("orders").is_array()||t.at("orders").size()>50)return false; + std::set listed,required; + for(const auto &p:t.at("listed")){if(!p.is_string()||!listed.insert(p.get()).second)return false;const auto *r=world.find("players",p);if(!r||r->value("team","")!=club)return false;} + std::vector accepted; + for(const auto &o:t.at("orders")) { + if(!valid_order(o,world,club,factor)||std::any_of(accepted.begin(),accepted.end(),[&](const auto&a){return same_order_target(a,o);}))return false; + if(o.at("kind")=="sell"||o.at("kind")=="lend")required.insert(o.at("player").get()); + accepted.push_back(o); + } + return listed==required; + }catch(const std::exception&){return false;} +} +bool migrate_demo_transfer(Json &state,const Catalog &world,const std::string &club) { + try{if(!state.is_object())return false;if(state.contains("transfer"))return valid_demo_transfer(state,world,club);auto next=state;next["transfer"]=demo_transfer(world,club);if(!valid_demo_transfer(next,world,club))return false;state=std::move(next);return true;}catch(const std::exception&){return false;} +} +std::string edit_demo_transfer(Json &state,const Json &action,const Catalog &world,const std::string &requested) { + if(!valid_demo_transfer(state,world,requested))return "invalid_transfer_state"; + try { + if(!action.is_object()||!action.contains("kind")||!action.at("kind").is_string())return "invalid_transfer_action"; + auto next=state;auto &t=next["transfer"];const auto club=own(world,requested);const auto factor=finance_currency_factor(world);const auto kind=action.at("kind").get(); + if(kind=="search") {if(!keys(action,{"kind","query"})||!query_text(action.at("query")))return "invalid_transfer_query"; + t["query"]=action.at("query");} + else if(kind=="criteria") { + if(!keys(action,{"kind","value","positions"})||!integer(action.at("positions"),1,15))return "invalid_transfer_criteria"; + auto c=action.at("value");if(!c.is_object()||!c.contains("price_max")||!integer(c.at("price_max"),0,cap))return "invalid_transfer_criteria"; + c["price_max"]=c.at("price_max").get()*factor;if(!valid_criteria(c,factor))return "invalid_transfer_criteria"; + t["criteria"]=c;t["positions"]=action.at("positions");t["query"]=""; + } else if(kind=="positions") {if(!keys(action,{"kind","value"})||!integer(action.at("value"),1,15))return "invalid_transfer_criteria"; + t["positions"]=action.at("value");} + else if(kind=="unlist") { + if(!keys(action,{"kind","player"})||!action.at("player").is_string())return "invalid_transfer_player"; + const auto id=action.at("player").get();auto &ls=t["listed"];auto it=std::find(ls.begin(),ls.end(),id);if(it==ls.end())return "transfer_not_listed"; + ls.erase(it);auto &os=t["orders"];os.erase(std::remove_if(os.begin(),os.end(),[&](const auto&o){return o.at("player")==id&&(o.at("kind")=="sell"||o.at("kind")=="lend");}),os.end()); + } else if(kind=="remove") { + if(!keys(action,{"kind","index"})||!integer(action.at("index"),0,int64_t(t["orders"].size())-1))return "invalid_transfer_order"; + const auto index=action.at("index").get();const auto removed=t["orders"][index];t["orders"].erase(t["orders"].begin()+ptrdiff_t(index));if(removed.at("kind")=="sell"||removed.at("kind")=="lend"){auto &ls=t["listed"];auto it=std::find(ls.begin(),ls.end(),removed.at("player"));if(it!=ls.end())ls.erase(it);} + } else if(kind=="submit") { + if(!keys(action,{"kind","order"}))return "invalid_transfer_order"; + auto o=action.at("order"); + if(!keys(o,{"kind","player","source_club","fee","salary","months","bonuses","poached"})||!integer(o.at("fee"),0,cap)||!integer(o.at("salary"),0,salary_cap)||!o.at("bonuses").is_array()||o.at("bonuses").size()!=7)return "invalid_transfer_order"; + for(auto &b:o["bonuses"]){if(!integer(b,0,100))return "invalid_transfer_order"; + b=b.get()*factor;} + o["fee"]=o.at("fee").get()*factor;o["salary"]=o.at("salary").get()*factor;if(!valid_order(o,world,club,factor))return "invalid_transfer_order"; + const bool is_own=o.at("kind")=="sell"||o.at("kind")=="lend";auto &os=t["orders"];auto it=std::find_if(os.begin(),os.end(),[&](const auto&a){return same_order_target(a,o);}); + if(it==os.end()){if(os.size()>=50)return "transfer_orders_full"; + os.push_back(o);}else *it=o; + if(is_own&&std::find(t["listed"].begin(),t["listed"].end(),o.at("player"))==t["listed"].end()){if(t["listed"].size()>=3)return "transfer_list_full"; + t["listed"].push_back(o.at("player"));} + }else return "unknown_transfer_action"; + if(!valid_demo_transfer(next,world,requested))return "invalid_transfer_state"; + state=std::move(next);return {}; + }catch(const std::exception&){return "invalid_transfer_action";} +} +Json demo_transfer_player(const Json &state,const Catalog &world,const std::string &requested,const std::string &id) { + if(!valid_demo_transfer(state,world,requested))return error("invalid_transfer_state"); + const auto *p=world.find("players",id);if(!available(world,p))return error("invalid_transfer_player"); + return {{"ok",true},{"row",row(state,world,own(world,requested),*p)}}; +} +Json demo_transfer_view(const Json &state,const Catalog &world,const std::string &requested) { + if(!valid_demo_transfer(state,world,requested))return error("invalid_transfer_state"); + const auto club=own(world,requested);const auto &t=state.at("transfer"),&c=t.at("criteria");Json ours=Json::array(),market=Json::array(),orders=Json::array(); + const auto candidates=market_players(world,club); + if(!club.empty())for(auto *p:world.squad(club))ours.push_back(row(state,world,club,*p,&candidates)); + std::vector pool;for(auto *p:candidates)pool.push_back(row(state,world,club,*p,&candidates));for(const auto &id:t.at("listed"))pool.push_back(row(state,world,club,*world.find("players",id),&candidates)); + const auto inrange=[](const Json&v,int low,int high,int defaultlow,int defaulthigh){return v.is_null()?(low==defaultlow&&high==defaulthigh):v>=low&&v<=high;}; + std::erase_if(pool,[&](const auto&p){ + const int index=role_index(p.at("position").is_string()?p.at("position").template get():"");const int mask=t.at("positions");if(index==4?mask!=15:!(mask&(1<()).find(fold(t.at("query").template get()))==std::string::npos)return true; + if(!inrange(p.at("age"),c.at("age_min"),c.at("age_max"),16,40))return true; + Json strength=nullptr;double sum=0;int count=0;bool known=true;int bit=0; + for(auto *field:{"condition","technique","form"}){if(c.at("traits").template get()&(1<();++count;}}++bit;} + if(known&&count)strength=int(std::floor(sum/count)); + if(!inrange(strength,c.at("strength_min"),c.at("strength_max"),0,100))return true; + return (c.at("foot")!=0&&c.at("foot")!=p.at("foot"))||(c.at("type")!=0&&c.at("type")!=p.at("type"))||p.at("fee")>c.at("price_max"); + }); + std::stable_sort(pool.begin(),pool.end(),[](const auto&a,const auto&b){const int pa=role_index(a.at("position").is_string()?a.at("position").template get():""),pb=role_index(b.at("position").is_string()?b.at("position").template get():"");if(pa!=pb)return pab.at("strength");return a.at("own")==false&&b.at("own")==true;}); + for(const auto &p:pool)market.push_back(p); + for(const auto &o:t.at("orders")){auto display=o;auto *p=world.find("players",o.at("player"));display["name"]=world.name(*p);orders.push_back(display);} + return {{"ok",true},{"club",club},{"own",ours},{"market",market},{"orders",orders},{"criteria",c},{"positions",t.at("positions")},{"query",t.at("query")}}; +} +Json demo_transfer_roster(const Json &state,const Catalog &world,const std::string &requested,const std::string &team) { + if(!valid_demo_transfer(state,world,requested))return error("invalid_transfer_state"); + const auto *c=world.find("clubs",team); + if(!c||c->value("type","club")!="club")return error("invalid_transfer_club"); + const auto club=own(world,requested);const auto candidates=market_players(world,club);Json rows=Json::array(); + for(auto *p:world.squad(team))if(available(world,p))rows.push_back(row(state,world,club,*p,&candidates)); + return {{"ok",true},{"club",team},{"rows",rows}}; +} +Json demo_transfer_quote(const Json &state,const Json &request,const Catalog &world,const std::string &requested) { + if(!valid_demo_transfer(state,world,requested))return error("invalid_transfer_state"); + try { + if(!keys(request,{"kind","player","poached"})||!request.at("kind").is_string()||!request.at("player").is_string()||!request.at("poached").is_boolean())return error("invalid_transfer_quote"); + const auto club=own(world,requested),kind=request.at("kind").get();const auto factor=finance_currency_factor(world);const bool is_own=kind=="sell"||kind=="lend",loan=kind=="loan"||kind=="lend";auto *p=world.find("players",request.at("player"));if(!available(world,p))return error("invalid_transfer_player"); + auto r=row(state,world,club,*p); + Json order={{"kind",kind},{"player",request.at("player")},{"source_club",p->at("team")},{"fee",0},{"salary",0},{"months",12},{"bonuses",{0,0,0,0,0,0,0}},{"poached",request.at("poached")}}; + if(!valid_order(order,world,club,factor))return error("invalid_transfer_player"); + if(is_own&&std::find(state.at("transfer").at("listed").begin(),state.at("transfer").at("listed").end(),request.at("player"))==state.at("transfer").at("listed").end()&&state.at("transfer").at("listed").size()>=3)return error("transfer_list_full"); + const auto value=r.at("fee").get();const int64_t price=request.at("poached")==true?std::min(cap*factor,((value/factor*3+1)/2)*factor):value; + const Json salary=is_own?r.at("salary"):Json(25000*factor);order["fee"]=loan?50000*factor:price;order["salary"]=salary.is_null()?Json(0):salary;order["months"]=loan?12:24; + for(const auto&o:state.at("transfer").at("orders"))if(o.at("kind")==kind&&o.at("player")==request.at("player")&&o.at("source_club")==p->at("team")){order=o;break;} + const auto &orders=state.at("transfer").at("orders"); + const bool can_submit=orders.size()<50||std::any_of(orders.begin(),orders.end(),[&](const auto &saved){return same_order_target(saved,order);}); + return {{"ok",true},{"can_submit",can_submit},{"row",r},{"kind",kind},{"source_club",p->at("team")},{"poached",request.at("poached")}, + {"demand_fee",loan?Json(50000*factor):Json(price)},{"demand_salary",salary},{"fee",order.at("fee")},{"salary",order.at("salary")},{"months",order.at("months")},{"bonuses",order.at("bonuses")}}; + }catch(const std::exception&){return error("invalid_transfer_quote");} +} +Json demo_transfer_strengths(const Json &state,const Catalog &world,const std::string &requested,const Json &active) { + if(!valid_demo_transfer(state,world,requested))return error("invalid_transfer_state"); + const auto club=own(world,requested);std::set selected;if(active.is_array())for(const auto&id:active)if(id.is_string())selected.insert(id.get()); + std::array sa{},st{};std::array ca{},ct{};const auto candidates=market_players(world,club); + if(!club.empty())for(auto *p:world.squad(club)){const auto r=row(state,world,club,*p,&candidates);if(r.at("strength").is_null())continue;const auto strength=r.at("strength").get();const auto pos=role_index(position(*p));st[4]+=strength;++ct[4];if(pos<4){st[size_t(pos)]+=strength;++ct[size_t(pos)];}if(selected.contains(p->at("id"))){sa[4]+=strength;++ca[4];if(pos<4){sa[size_t(pos)]+=strength;++ca[size_t(pos)];}}} + Json a=Json::array(),t=Json::array();for(size_t i=0;i<4;++i){a.push_back(ca[i]?Json(int(std::floor(sa[i]/ca[i]))):Json());t.push_back(ct[i]?Json(int(std::floor(st[i]/ct[i]))):Json());} + return {{"ok",true},{"active",a},{"team",t},{"active_average",ca[4]?Json(int(std::floor(sa[4]/ca[4]))):Json()},{"team_average",ct[4]?Json(int(std::floor(st[4]/ct[4]))):Json()}}; +} +Json demo_transfer_suggestion(const Json &state,const Catalog &world,const std::string &club,const Json &active) { + const auto values=demo_transfer_strengths(state,world,club,active);if(!values.value("ok",false))return values;int weakest=0;int score=101;for(int i=0;i<4;++i)if(values.at("active")[size_t(i)].is_number_integer()&&values.at("active")[size_t(i)].get()(cash.get(),3000000*factor)):Json(0);return {{"ok",true},{"criteria",c},{"positions",1<SetProperty("display","none"); + if (refresh_view) refresh(); +} +bool App::lineup_action(const std::string &action,Rml::Element *target) { + if (!action.starts_with("lineup-") || menu_!="lineup") return false; + if (!source_ || !target || !popup_.empty() || amount_ || !report_detail_kind_.empty()) return true; + if (lineup_ignore_click_ && action=="lineup-player") {lineup_ignore_click_=false;return true;} + const auto id=target->GetAttribute("data-id",""); + const auto s=snap(); + if (!s.world || !valid_demo_lineup(s.state,*s.world,lineup_managed(s))) return true; + const auto &l=s.state.at("lineup"); + const auto small=[&](int max)->int {return id.size()==1 && id[0]>='0' && id[0]<='0'+max ? id[0]-'0':-1;}; + const auto commit=[&](const Json &payload,const std::string &focus) { + const auto result=source_->apply({s.revision,"lineup",payload}); + if (!result.ok) {message("Die Aufstellung konnte nicht übernommen werden. Bitte die Ansicht erneut öffnen.");return false;} + focus_after_render_=focus; refresh(); return true; + }; + const auto player_focus=[&](const std::string &p) { + const int slot=lineup_slot(l,p); + return std::string(lineup_pitch_?(slot<11?"lineup-player-":"lineup-bench-"):"lineup-name-")+p; + }; + if (action=="lineup-player") { + if (lineup_slot(l,id)<0) return true; + if (lineup_selected_==id) lineup_selected_.clear(); + else if (!lineup_selected_.empty()) { + const auto selected=lineup_selected_; lineup_selected_.clear(); + const int destination=lineup_slot(l,selected); + const auto focus=std::string(lineup_pitch_?(destination<11?"lineup-player-":"lineup-bench-"):"lineup-name-")+id; + commit({{"kind","swap"},{"a",selected},{"b",id}},focus); return true; + } else lineup_selected_=id; + focus_after_render_=player_focus(id); refresh(); return true; + } + if (action=="lineup-data") {lineup_data_=1-lineup_data_;focus_after_render_="lineup-data";refresh();return true;} + if (action=="lineup-view") {cancel_lineup_drag(false);lineup_pitch_=!lineup_pitch_;lineup_reset_scroll_=true;focus_after_render_="lineup-view";refresh();return true;} + if (action=="lineup-side") { + if (id=="formations" || id=="orders" || id=="takers") {lineup_side_=id;focus_after_render_="lineup-side-"+id;refresh();} + return true; + } + if (action=="lineup-page") {const int n=small(1);if(n>=0) {lineup_page_=n;focus_after_render_=n?"lineup-page-prev":"lineup-page-next";refresh();}return true;} + if (action=="lineup-formation") {const int n=small(7);if(n>=0) {lineup_selected_.clear();commit({{"kind","formation"},{"value",n}},"lineup-formation-"+id);}return true;} + if (action=="lineup-save") {const int n=small(3);if(n>=0)commit({{"kind","custom-save"},{"index",n}},"lineup-save-"+id);return true;} + if (action=="lineup-weight") {const int n=small(2);if(n>=0)commit({{"kind","weight"},{"index",n}},"lineup-weight-"+id);return true;} + if (action=="lineup-auto") {commit({{"kind","takers-auto"}},"lineup-auto");return true;} + return true; +} +bool App::lineup_event(Rml::Event &event) { + if (menu_!="lineup" || !source_ || !popup_.empty() || amount_ || !report_detail_kind_.empty()) return false; + const auto type=event.GetType(); + auto *target=event.GetTargetElement(); + const auto ancestor=[&](const std::string &attribute)->Rml::Element* { + for(auto *n=target;n && n!=doc_;n=n->GetParentNode()) if(n->HasAttribute(attribute))return n; + return nullptr; + }; + auto *player_node=ancestor("data-squad-player"); + auto *pitch=element("lineup-pitch"); + const auto s=snap(); + if (!s.world || !valid_demo_lineup(s.state,*s.world,lineup_managed(s))) {cancel_lineup_drag(false);return false;} + const auto &l=s.state.at("lineup"); + const auto stop=[&]() {event.StopImmediatePropagation();}; + const auto commit=[&](const Json &payload,uint64_t revision) { + const auto result=source_->apply({revision,"lineup",payload}); + if(!result.ok)message("Die Aufstellung hat sich geändert. Bitte den Spieler erneut auswählen."); + return result.ok; + }; + const auto point=[&](float x,float y)->Json { + if(!pitch)return Json(); + const auto origin=pitch->GetAbsoluteOffset(Rml::BoxArea::Border), size=pitch->GetBox().GetSize(Rml::BoxArea::Border); + if(size.x<=0 || size.y<=0)return Json(); + return Json::array({std::clamp(int(std::round(((x-origin.x)/size.x*100-8)/84*18)),0,18),std::clamp(int(std::round(((y-origin.y)/size.y*100-10)/80*8)),0,8)}); + }; + const auto in_pitch=[&](float x,float y) { + if(!pitch)return false; + const auto origin=pitch->GetAbsoluteOffset(Rml::BoxArea::Border), size=pitch->GetBox().GetSize(Rml::BoxArea::Border); + return x>=origin.x && y>=origin.y && x<=origin.x+size.x && y<=origin.y+size.y; + }; + const float mx=event.GetParameter("mouse_x",0),my=event.GetParameter("mouse_y",0); + if(type=="keydown") { + lineup_ignore_click_=false; + const auto key=Rml::Input::KeyIdentifier(event.GetParameter("key_identifier",0)); + if(key==Rml::Input::KI_ESCAPE) { + for(auto *n=target;n && n!=doc_;n=n->GetParentNode()) + if(auto *select=dynamic_cast(n);select && select->IsSelectBoxVisible())return false; + if(!lineup_drag_.is_null()) {cancel_lineup_drag(true);stop();return true;} + if(!lineup_selected_.empty()) {lineup_selected_.clear();refresh();stop();return true;} + return false; + } + if(pitch && player_node && player_node->IsClassSet("lineup-player") && (key==Rml::Input::KI_LEFT || key==Rml::Input::KI_RIGHT || key==Rml::Input::KI_UP || key==Rml::Input::KI_DOWN)) { + const auto id=player_node->GetAttribute("data-squad-player",""); + const int slot=lineup_slot(l,id); + if(slot>=0 && slot<11) { + auto p=l.at("points")[size_t(slot)]; + p[0]=std::clamp(p[0].get()+(key==Rml::Input::KI_RIGHT?1:key==Rml::Input::KI_LEFT?-1:0),0,18); + p[1]=std::clamp(p[1].get()+(key==Rml::Input::KI_DOWN?1:key==Rml::Input::KI_UP?-1:0),0,8); + lineup_selected_=id;commit({{"kind","move"},{"player",id},{"point",p}},s.revision); + focus_after_render_="lineup-player-"+id;refresh();stop();return true; + } + } + } + if((type=="change" || type=="input") && target) { + if(auto *control=dynamic_cast(target)) { + if(target->HasAttribute("data-lineup-taker")) { + const auto index=target->GetAttribute("data-lineup-taker",""); + if(index.size()!=1 || index[0]<'0' || index[0]>'2')return true; + const auto value=control->GetValue(); const int i=index[0]-'0'; + if(l.at("takers")[size_t(i)]!=value) {commit({{"kind","taker"},{"index",i},{"player",value}},s.revision);focus_after_render_=target->GetId();refresh();} + stop();return true; + } + if(target->HasAttribute("data-lineup-order")) { + const auto index=target->GetAttribute("data-lineup-order",""); + const auto id=target->GetAttribute("data-player",""); + const auto text=control->GetValue(); + if(index.size()!=1 || index[0]<'0' || index[0]>'3' || text.empty() || text.size()>2 || std::any_of(text.begin(),text.end(),[](char c){return c<'0'||c>'9';}))return true; + const int value=std::stoi(text),i=index[0]-'0'; + if(value<2 || value>40 || lineup_slot(l,id)<0 || lineup_slot(l,id)>=11)return true; + if(l.at("orders").at(id)[size_t(i)]!=value && commit({{"kind","order"},{"player",id},{"index",i},{"value",value}},s.revision)) { + if(auto *output=element("lineup-order-value-"+index))output->SetInnerRML(std::to_string(value)); + if(auto *zone=element("lineup-zone")) { + const auto now=snap(); + zone->SetInnerRML(picture(renderer_.diagram("lineup-zone",lineup_zone(now.state.at("lineup"),id),1600),1486,885.4375)); + } + dirty_=true; + } + stop();return true; + } + } + } + if(type=="mousedown" && event.GetParameter("button",0)==0) { + lineup_ignore_click_=false; + if(pitch && player_node) { + const auto id=player_node->GetAttribute("data-squad-player","");const int slot=lineup_slot(l,id); + if(slot>=0) {lineup_drag_={{"player",id},{"club",lineup_managed(s)},{"source_slot",slot},{"start_x",mx},{"start_y",my},{"ghost",point(mx,my)},{"moved",false}};lineup_drag_revision_=s.revision;lineup_drag_world_=s.world;} + } + return false; + } + if(type=="mousemove" && lineup_drag_.is_object()) { + if(!lineup_drag_.value("moved",false) && std::hypot(mx-lineup_drag_.at("start_x").get(),my-lineup_drag_.at("start_y").get())<5)return false; + lineup_drag_["moved"]=true; + const auto p=point(mx,my);lineup_drag_["ghost"]=p; + if(p.is_array())if(auto *ghost=element("lineup-ghost")) { + ghost->SetProperty("display","block"); + ghost->SetProperty("left",scalar((8+p[0].get()/18.0*84)*14.86-63)+"dp"); + ghost->SetProperty("top",scalar((10+p[1].get()/8.0*80)*8.854375-76.86)+"dp"); + dirty_=true; + } + stop();return true; + } + if(type=="mouseup" && lineup_drag_.is_object()) { + const auto drag=lineup_drag_; const auto revision=lineup_drag_revision_;const auto world=lineup_drag_world_; + const bool moved=drag.value("moved",false);cancel_lineup_drag(false); + if(!moved)return false; + lineup_ignore_click_=true; + const auto id=drag.at("player").get(); + if(s.world!=world || s.revision!=revision || lineup_managed(s)!=drag.at("club").get() || lineup_slot(l,id)!=drag.at("source_slot").get()) { + message("Die Aufstellung hat sich geändert. Bitte den Spieler erneut auswählen.");stop();return true; + } + // Resolve the physical drop target independently of the active mouse + // element: Rml may continue dispatching mouseup to the drag origin. + std::string drop; + for(auto *n=context_->GetElementAtPoint({mx,my});n && n!=doc_;n=n->GetParentNode()) { + if(n->HasAttribute("data-squad-player")) {drop=n->GetAttribute("data-squad-player","");break;} + } + const int drop_slot=lineup_slot(l,drop); + if(drop_slot>=0 && drop!=id) { + commit({{"kind","swap"},{"a",id},{"b",drop}},revision); + lineup_selected_.clear(); + focus_after_render_=std::string(drop_slot<11?"lineup-player-":"lineup-bench-")+id; + } else if(drop_slot<0 && in_pitch(mx,my)) { + const int slot=lineup_slot(l,id); const auto p=point(mx,my); + if(slot<11) {lineup_selected_=id;commit({{"kind","move"},{"player",id},{"point",p}},revision);} + else { + const auto &points=l.at("points");const auto hit=std::find(points.begin(),points.end(),p);const int n=int(hit-points.begin()); + if(nGetParentNode())if(n==pitch)inside=true; + if(inside) { + const int slot=lineup_slot(l,lineup_selected_); + if(slot>=0 && slot<11) {const auto id=lineup_selected_;commit({{"kind","move"},{"player",id},{"point",point(mx,my)}},s.revision);focus_after_render_="lineup-player-"+id;refresh();} + else message("Einen Ersatzspieler auf einen Spieler der Startelf ziehen oder beide nacheinander anklicken."); + stop();return true; + } + } + return false; +} diff --git a/src/modern/ui/lineup_screens.inc b/src/modern/ui/lineup_screens.inc new file mode 100644 index 0000000..6785f76 --- /dev/null +++ b/src/modern/ui/lineup_screens.inc @@ -0,0 +1,195 @@ +// SPDX-License-Identifier: GPL-3.0-only +namespace { +std::string lineup_managed(const Snapshot &s) { + const auto m = s.state.value("managers",Json::array()); + return m.is_array() && !m.empty() && m[0].is_object() ? m[0].value("club","") : ""; +} +std::string lineup_position(const Json &v) { + if (!v.is_string()) return "—"; + const auto code = v.get(); + return code == "gk" ? "TW" : code == "def" ? "ABW" : code == "mid" ? "MIT" : code == "fwd" ? "STU" : code.empty() ? "—" : code; +} +std::string lineup_value(const Json &v) { + if (!v.is_number()) return "—"; + if (v.is_number_integer()) return number(v.get()); + if (!std::isfinite(v.get())) return "—"; + std::ostringstream out; out << std::setprecision(5) << v.get(); + auto text = out.str(); std::replace(text.begin(),text.end(),'.',','); return text; +} +int lineup_slot(const Json &l, const std::string &id) { + if (!l.is_object() || !l.contains("order") || !l.at("order").is_array()) return -1; + const auto &a = l.at("order"); const auto p = std::find(a.begin(),a.end(),id); + return p == a.end() ? -1 : int(p-a.begin()); +} +std::string lineup_svg(const std::string &body, const std::string &box="0 0 120 72") { + return ""+body+""; +} +std::string lineup_mini(const Json &points, const std::string &theme) { + const auto line = theme == "silver" ? "#536f66" : "#c3e8cb"; + std::string body = ""; + if (points.is_array()) for (const auto &p : points) { + const int depth=p[0].get(), lane=p[1].get(); + const auto color = theme == "silver" ? (depth<7?"#85600c":depth<13?"#a46914":"#b44931") : (depth<7?"#ffdc69":depth<13?"#ecac4b":"#f07852"); + body += ""; + } + return lineup_svg(body); +} +std::string lineup_field() { + std::string body; + for (int x=0;x<196;x+=15) body += ""; + body += "" + "" + ""; + return lineup_svg(body,"0 0 196 117"); +} +std::string lineup_zone(const Json &l, const std::string &id) { + const int row = lineup_slot(l,id); + if (row<0 || row>=11) return ""; + const auto &point = l.at("points")[size_t(row)], &orders = l.at("orders").at(id); + const double forward=orders[0].get(), width=orders[1].get(), coverage=orders[2].get(); + const double x=(8+point[0].get()/18.0*84)*1.96, y=(10+point[1].get()/8.0*80)*1.17; + double x0=x-(width/2+46-forward), x1=x+width/2+forward+8; + std::string body=""; + for (int n=0;n<=int(coverage/2);++n) { + if (n) { const int bend=(n==8?3:0)+(n==6?2:0)+(n==3?1:0); if (x0lo) for (const auto yy : {std::max(2.0,y-n-1),std::min(114.0,y+n+1)}) + body += ""; + } + return lineup_svg(body+"","0 0 196 117"); +} +} // namespace + +std::string App::render_lineup() { + const auto s=snap(); + if (!s.world) return "

Die Aufstellung ist derzeit nicht verfügbar.

"; + const auto projection=demo_lineup_rows(s.state,*s.world,lineup_managed(s)); + if (!projection.value("ok",false)) return "

Die Aufstellung ist derzeit nicht verfügbar.

"; + const auto &l=s.state.at("lineup"), &rows=projection.at("rows"); + if (lineup_slot(l,lineup_selected_)<0) lineup_selected_.clear(); + lineup_data_=lineup_data_==1?1:0; lineup_page_=lineup_page_==1?1:0; + if (lineup_side_!="orders" && lineup_side_!="takers") lineup_side_="formations"; + const auto attr=[](const std::string &key,const std::string &value) {return " "+key+"=\""+esc(value)+"\"";}; + const auto player_attrs=[&](const Json &row,const std::string &prefix) { + const auto id=row.at("id").get(); + return attr("id",prefix+id)+attr("data-id",id)+attr("data-squad-player",id)+ + attr("data-slot",std::to_string(row.at("slot").get()))+attr("aria-pressed",lineup_selected_==id?"true":"false")+ + attr("aria-label",row.at("name").get()+", "+lineup_position(row.at("position"))); + }; + std::string out="
"; + const std::array,2> headings{{ + {{"Nr.","Name","Pos.","Ko","Te","Fo","Stärke","Status","Land","Mot.","Tore","Ass."}}, + {{"Nr.","Name","Alter","Eck.","Frei.","Zwei.","Pass","Schuss","Schn.","Team","Spiele","Note"}}}}; + for (int c=0;c<12;++c) out+=""+headings[size_t(lineup_data_)][size_t(c)]+""; + out+="
"; + for (const auto &row:rows) { + const auto slot=row.at("slot").get(); const auto id=row.at("id").get(); + out+="
"; + out+=""+(slot<11?std::to_string(slot+1):"–")+""; + out+=btn("lineup-player",esc(row.at("name").get()),"lineup-cell lineup-col-1 lineup-name",player_attrs(row,"lineup-name-")); + std::vector fields; + if (!lineup_data_) fields={lineup_position(row.at("position")),lineup_value(row.at("condition")),lineup_value(row.at("technique")),lineup_value(row.at("form")),lineup_value(row.at("strength")),slot<11?"STARTELF":"BANK",row.at("nation").is_string()?row.at("nation").get():"—",lineup_value(row.at("motivation")),lineup_value(row.at("goals")),lineup_value(row.at("assists"))}; + else for (const auto *key:{"age","corner","free_kick","tackling","passing","shooting","speed","teamplay","games","grade"}) fields.push_back(lineup_value(row.at(key))); + for (size_t f=0;f(); + if (code.starts_with("nation:")) code=code.substr(7); + if (code=="de") value=picture(renderer_.diagram("lineup-flag-de",lineup_svg("","0 0 40 24"),80),40,24); + else { + const auto flag=ui_nation_flag_svg(code); + if (!flag.empty()) value=picture(renderer_.diagram("lineup-flag-"+code,flag,80),40,24); + else { std::transform(code.begin(),code.end(),code.begin(),[](unsigned char c){return char(std::toupper(c));}); value=esc(code); } + } + } + if (!lineup_data_ && f==5) value=""+value+""; + out+=btn("player-detail",value,"lineup-cell lineup-col-"+std::to_string(f+2)+" lineup-detail", + attr("id","lineup-detail-"+id+"-"+std::to_string(f))+attr("data-id",id)+attr("aria-label",row.at("name").get()+", Spielerinformationen")); + } + out+="
"; + } + if (rows.empty()) out+="

Für diesen Verein sind keine Spieler überliefert.

"; + out+="
"; + const auto data_btn=[&]() {return btn("lineup-data",lineup_data_?"Daten A":"Daten B","lineup-tab","id=\"lineup-data\"");}; + const auto view_btn=[&]() {return btn("lineup-view",lineup_pitch_?"Team":"Spielfeld","lineup-tab","id=\"lineup-view\"");}; + if (lineup_pitch_) { + out+="
"+picture(renderer_.diagram("lineup-field",lineup_field(),1600),1486,885.4375)+"
"; + if (lineup_side_=="orders" && !lineup_selected_.empty()) { + const auto zone=lineup_zone(l,lineup_selected_); + if (!zone.empty()) out+="
"+picture(renderer_.diagram("lineup-zone",zone,1600),1486,885.4375)+"
"; + } + for (size_t i=0;i(); + const auto x=(8+point[0].get()/18.0*84)*14.86-63; + const auto y=(10+point[1].get()/8.0*80)*8.854375-76.86; + out+=btn("lineup-player",img(selected?"lineup.player.selected":"lineup.player.normal",126,126)+""+std::to_string(i+1)+"","lineup-player",player_attrs(row,"lineup-player-")+attr("style",rect(x,y,126,126))); + } + out+="
"+img("lineup.player.ghost",126,126)+"
"; + } else { + out+="
"+data_btn()+view_btn()+""+std::to_string(std::min(size_t(11),rows.size()))+" Spieler auf dem Feld · "+std::to_string(rows.size()>11?rows.size()-11:0)+" Kaderplätze auf der Bank
"; + } + out+="
"; + return out+render_report_detail(); +} diff --git a/src/modern/ui/model.cpp b/src/modern/ui/model.cpp index d5b4edc..584c782 100644 --- a/src/modern/ui/model.cpp +++ b/src/modern/ui/model.cpp @@ -8,6 +8,8 @@ #include "modern/ui/demo_calendar.hpp" #include "modern/ui/demo_reports.hpp" #include "modern/ui/demo_sports.hpp" +#include "modern/ui/demo_lineup.hpp" +#include "modern/ui/demo_transfer.hpp" #include "modern/ui/desktop.hpp" #include #include @@ -92,6 +94,8 @@ DemoSource::DemoSource(std::shared_ptr catalog) throw editor::Error("invalid_demo_finance"); if (!migrate_demo_environment(state_, *catalog_) || !migrate_demo_advertising(state_, *catalog_) || !migrate_demo_toto(state_, *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"); saved_ = state_; } Snapshot DemoSource::snapshot() const { return {revision_, catalog_, state_}; } @@ -131,6 +135,8 @@ ActionResult DemoSource::apply(const Action &action) { next["training"] = demo_training(*catalog_, first); next["tactics"] = demo_tactics(); next["contracts"] = demo_contracts(*catalog_, first); + next["lineup"] = demo_lineup(*catalog_, first); + next["transfer"] = demo_transfer(*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_); @@ -141,6 +147,11 @@ ActionResult DemoSource::apply(const Action &action) { : action.kind == "advertising" ? edit_demo_advertising(next, action.value, *catalog_) : edit_demo_toto(next, action.value, *catalog_); if (!error.empty()) return {false, revision_, error}; + } else if (action.kind == "lineup" || action.kind == "transfer") { + const auto club = next["managers"][0]["club"].get(); + 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 == "finance") { const auto error = edit_demo_finance(next, action.value, *catalog_, next["managers"][0]["club"]); if (!error.empty()) return {false, revision_, error}; @@ -267,6 +278,8 @@ Json DemoSource::load(const fs::path &file) { throw editor::Error("invalid_demo_finance"); if (!migrate_demo_environment(data, *catalog_) || !migrate_demo_advertising(data, *catalog_) || !migrate_demo_toto(data, *catalog_)) 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"); auto next = data; auto desktop = next.value("desktop", Json::object()); if (!migrate_desktop(desktop)) diff --git a/src/modern/ui/nation_flags.inc b/src/modern/ui/nation_flags.inc new file mode 100644 index 0000000..a7a8cc7 --- /dev/null +++ b/src/modern/ui/nation_flags.inc @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-3.0-only +namespace { +// Small UI flags, sharing the muted palette of the HTML reference. Unknown +// identifiers deliberately return no image; callers retain a neutral label. +std::string ui_nation_flag_svg(const std::string &value) { + std::string code=value.starts_with("nation:")?value.substr(7):value; + for(auto &c:code)if(c>='A'&&c<='Z')c=char(c-'A'+'a'); + const std::map aliases{{"x-eng","en"},{"eng","en"},{"ger","de"},{"deu","de"},{"fra","fr"},{"ita","it"},{"esp","es"},{"ned","nl"},{"nld","nl"},{"jpn","jp"},{"swe","se"},{"den","dk"},{"dnk","dk"},{"nga","ng"},{"bra","br"},{"mar","ma"},{"alg","dz"},{"dza","dz"}}; + if(auto it=aliases.find(code);it!=aliases.end())code=it->second; + const auto rect=[](double x,double y,double w,double h,const char*fill){return "";}; + std::string body; + const std::map> bars{ + {"de",{"#262b30","#c85a52","#d9bf65"}},{"fr",{"#5685b6","#e6ebee","#c7625b"}}, + {"it",{"#679b83","#e6ebee","#c7625b"}},{"es",{"#c75b50","#e3c66b","#c75b50"}}, + {"nl",{"#bf5c56","#e6ebee","#5b83b1"}},{"be",{"#262b30","#e3c66b","#c7625b"}}, + {"ie",{"#679b83","#e6ebee","#d69455"}},{"ro",{"#5685b6","#e3c66b","#c7625b"}}, + {"ng",{"#38865d","#e6ebee","#38865d"}},{"at",{"#c7625b","#e6ebee","#c7625b"}}, + {"ru",{"#e6ebee","#5685b6","#c7625b"}},{"hu",{"#c7625b","#e6ebee","#679b83"}}}; + if(auto it=bars.find(code);it!=bars.end()){ + const bool vertical=code=="fr"||code=="it"||code=="be"||code=="ie"||code=="ro"||code=="ng"; + for(int i=0;i<3;++i)body+=rect(vertical?i*10.:0,vertical?0:i*20./3,vertical?10:30,vertical?20:20./3,it->second[size_t(i)]); + }else if(code=="pl"||code=="ua")body=rect(0,0,30,10,code=="pl"?"#e6ebee":"#5685b6")+rect(0,10,30,10,code=="pl"?"#c7625b":"#e3c66b"); + else if(code=="jp")body=rect(0,0,30,20,"#e6ebee")+""; + else if(code=="en"||code=="dk"||code=="se"||code=="fi"){ + const auto bg=code=="dk"?"#c7625b":code=="se"?"#5685b6":"#e6ebee"; + const auto cross=code=="en"?"#c7625b":code=="se"?"#e3c66b":code=="fi"?"#5685b6":"#e6ebee"; + body=rect(0,0,30,20,bg)+rect(code=="en"?13:8,0,4,20,cross)+rect(0,8,30,4,cross); + }else if(code=="ch")body=rect(0,0,30,20,"#c7625b")+rect(13,4,4,12,"#e6ebee")+rect(9,8,12,4,"#e6ebee"); + else if(code=="ma")body=rect(0,0,30,20,"#c7625b")+""; + else if(code=="dz")body=rect(0,0,15,20,"#38865d")+rect(15,0,15,20,"#e6ebee")+""; + else if(code=="br")body=rect(0,0,30,20,"#38865d")+""; + else return {}; + return ""+body+""; +} +} // namespace diff --git a/src/modern/ui/screens.inc b/src/modern/ui/screens.inc index b057104..5412c4d 100644 --- a/src/modern/ui/screens.inc +++ b/src/modern/ui/screens.inc @@ -883,6 +883,10 @@ std::string App::render_menu(const std::string &key) { body = render_friendlies(); else if (key == "indoor") body = render_indoor(); + else if (key == "lineup") + body = render_lineup(); + else if (key == "transfer") + body = render_transfer(); else if (key == "environment") body = render_environment(); else if (key == "advertising") diff --git a/src/modern/ui/sports_screens.inc b/src/modern/ui/sports_screens.inc index 29370df..70ee5b4 100644 --- a/src/modern/ui/sports_screens.inc +++ b/src/modern/ui/sports_screens.inc @@ -154,7 +154,7 @@ std::string App::render_tactics() { {205, 10, 58, 37}}}; std::string body = "
" + - picture(renderer_.diagram("tactics", tactics_diagram(t, theme_)), 2300, + picture(renderer_.diagram("tactics", tactics_diagram(t, theme_, snap().state.value("lineup", Json::object()).value("points", Json()))), 2300, 1864); for (size_t i = 0; i < 7; ++i) { const auto a = areas[i]; diff --git a/src/modern/ui/transfer_controls.inc b/src/modern/ui/transfer_controls.inc new file mode 100644 index 0000000..1d8bf1a --- /dev/null +++ b/src/modern/ui/transfer_controls.inc @@ -0,0 +1,612 @@ +// SPDX-License-Identifier: GPL-3.0-only +void App::close_transfer(bool restore) { + transfer_remember_scroll(); + transfer_dialog_.clear(); + transfer_draft_ = Json(); + transfer_search_draft_ = Json(); + transfer_picker_.clear(); + transfer_world_.reset(); + if (restore) + focus_after_render_ = transfer_return_focus_; + refresh(); +} +bool App::transfer_action(const std::string &action, Rml::Element *target) { + if (!action.starts_with("transfer-")) + return false; + if (menu_ != "transfer" || !world_ || !source_) + return true; + transfer_remember_scroll(); + const auto snapshot = snap(); + const auto actor = transfer_ui_club(snapshot); + const auto world = world_; + const auto factor = finance_currency_factor(*world_); + const auto id = + target ? target->GetAttribute("data-player", "") : ""; + const auto index = target ? target->GetAttribute("data-index", -1) : -1; + const auto change = [&](const Json &value, uint64_t revision) { + const auto r = source_->apply({revision, "transfer", value}); + if (!r.ok) { + message("Die Eingabe konnte nicht übernommen werden. Bitte den aktuellen " + "Stand erneut auswählen. (" + + r.error + ")"); + return false; + } + return true; + }; + const auto begin_offer = [&](const std::string &kind, + const std::string &player, bool poached) { + const auto q = demo_transfer_quote( + snapshot.state, + {{"kind", kind}, {"player", player}, {"poached", poached}}, *world_, + actor); + if (!q.value("ok", false)) { + transfer_dialog_ = "notice"; + transfer_notice_ = q.value("error", std::string()) == "transfer_list_full" + ? "Es können höchstens drei eigene Spieler " + "gleichzeitig auf dem Markt stehen." + : "Für diese Auswahl ist kein Angebot verfügbar."; + transfer_return_focus_ = + target ? target->GetId() : "transfer-offer-buy-sell"; + focus_after_render_ = "transfer-close"; + refresh(); + return; + } + transfer_draft_ = q; + transfer_draft_["player"] = player; + transfer_draft_["fee"] = q.at("fee").get() / factor; + transfer_draft_["salary"] = q.at("salary").get() / factor; + for (auto &b : transfer_draft_["bonuses"]) + b = b.get() / factor; + transfer_dialog_ = "offer"; + transfer_revision_ = snapshot.revision; + transfer_world_ = world_; + transfer_return_focus_ = (kind == "loan" || kind == "lend") + ? "transfer-offer-loan-lend" + : "transfer-offer-buy-sell"; + focus_after_render_ = "transfer-fee"; + refresh(); + }; + if (action == "transfer-close") { + close_transfer(); + return true; + } + if (action == "transfer-offer-back") { + transfer_dialog_ = "offer"; + focus_after_render_ = "transfer-fee"; + refresh(); + return true; + } + if (action == "transfer-own" || action == "transfer-market") { + const auto p = demo_transfer_player(snapshot.state, *world_, actor, id); + if (!p.value("ok", false)) + return true; + const bool mine = p.at("row").at("own"); + transfer_view_[mine ? "own" : "market"] = id; + transfer_view_["side"] = mine ? "own" : "market"; + transfer_view_["hover"] = ""; + focus_after_render_ = target->GetId(); + refresh(); + return true; + } + if (action == "transfer-data" || action == "transfer-all" || + action == "transfer-scope") { + if (action == "transfer-data") + transfer_view_["tab"] = 1 - transfer_view_.value("tab", 0); + else if (action == "transfer-all") { + transfer_view_["complete"] = !transfer_view_.value("complete", false); + transfer_view_["roster_left"] = 0; + } else { + const auto scope = + target ? target->GetAttribute("data-scope", "") : ""; + if (scope != "active" && scope != "team") + return true; + transfer_view_["scope"] = scope; + } + focus_after_render_ = target ? target->GetId() : "transfer-data"; + refresh(); + return true; + } + if (action == "transfer-filter") { + if (index < 0 || index > 4) + return true; + const int old = snapshot.state.at("transfer").at("positions"), + mask = index == 0 ? 15 : old ^ (1 << (index - 1)); + if (!mask) + return true; + if (change({{"kind", "positions"}, {"value", mask}}, snapshot.revision)) { + transfer_view_["page"] = 0; + transfer_view_["market"] = ""; + transfer_view_["hover"] = ""; + focus_after_render_ = target->GetId(); + refresh(); + } + return true; + } + if (action == "transfer-page") { + const int step = target ? target->GetAttribute("data-step", 0) : 0; + if (step != -1 && step != 1) + return true; + const auto pool = + demo_transfer_view(snapshot.state, *world_, actor).at("market"); + const int page = std::clamp(transfer_view_.value("page", 0) + step, 0, + std::max(0, int((pool.size() + 5) / 6) - 1)); + transfer_view_["page"] = page; + if (size_t(page) * 6 < pool.size()) { + const auto &r = pool[size_t(page) * 6]; + const bool mine = r.at("own"); + transfer_view_[mine ? "own" : "market"] = r.at("id"); + transfer_view_["side"] = mine ? "own" : "market"; + } + transfer_view_["hover"] = ""; + focus_after_render_ = target ? target->GetId() : "transfer-page-next"; + refresh(); + return true; + } + if (action == "transfer-search") { + const auto query = transfer_view_.value("query", std::string()); + if (change({{"kind", "search"}, {"query", query}}, snapshot.revision)) { + transfer_view_["page"] = 0; + transfer_view_["market"] = ""; + transfer_view_["hover"] = ""; + focus_after_render_ = "transfer-search"; + refresh(); + } + return true; + } + if (action == "transfer-offer") { + const auto kind = + target ? target->GetAttribute("data-kind", "") : ""; + const bool mine = kind == "sell" || kind == "lend"; + const auto player = + transfer_view_.value(mine ? "own" : "market", std::string()); + if (player.empty()) + return true; + const auto &listed = snapshot.state.at("transfer").at("listed"); + if (kind == "sell" && + std::find(listed.begin(), listed.end(), player) != listed.end()) { + if (change({{"kind", "unlist"}, {"player", player}}, snapshot.revision)) { + focus_after_render_ = "transfer-own-" + player; + refresh(); + } + return true; + } + begin_offer(kind, player, false); + return true; + } + if (action == "transfer-amount" || action == "transfer-bonus" || + action == "transfer-search-budget") { + const bool search = action == "transfer-search-budget", + bonus = action == "transfer-bonus"; + if ((search && transfer_dialog_ != "search") || + (!search && transfer_dialog_ != "offer") || transfer_world_ != world_) + return true; + const auto field = + search ? std::string("price_max") + : bonus ? std::string("bonuses") + : target->GetAttribute("data-field", ""); + if (!search && !bonus && field != "fee" && field != "salary") + return true; + if (bonus && (index < 0 || index > 6)) + return true; + if (snapshot.revision != transfer_revision_) { + message("Die Daten haben sich geändert. Bitte das Angebot schließen und " + "erneut öffnen."); + return true; + } + const auto revision = transfer_revision_; + const auto *source = source_.get(); + const auto player = search + ? std::string() + : transfer_draft_.at("player").get(); + AmountRequest request; + request.title = search ? "Maximale Ablösesumme" + : bonus ? transfer_ui_bonuses[size_t(index)] + : field == "fee" ? ((transfer_draft_.at("kind") == "loan" || + transfer_draft_.at("kind") == "lend") + ? "Leihgebühr" + : "Ablöse") + : "Monatsgehalt"; + request.unit = money_unit(); + request.return_focus = target->GetId(); + request.min = 0; + request.max = bonus ? 100 : field == "salary" ? 200000 : 99999999; + request.step = 1; + request.suggestion_step = search ? 500000 + : bonus ? 1 + : field == "salary" ? 5000 + : 100000; + request.review = true; + request.value = + search ? transfer_search_draft_.at(field).get() + : bonus ? transfer_draft_.at("bonuses")[size_t(index)].get() + : transfer_draft_.at(field).get(); + request.accept = [this, world, source, revision, player, field, index, + search, bonus](int64_t value) { + if (world_ != world || source_.get() != source || menu_ != "transfer" || + transfer_world_ != world || transfer_revision_ != revision || + snap().revision != revision) + return false; + if (search) { + if (transfer_dialog_ != "search") + return false; + transfer_search_draft_[field] = value; + } else { + if (transfer_dialog_ != "offer" || + transfer_draft_.at("player") != player) + return false; + if (bonus) + transfer_draft_["bonuses"][size_t(index)] = value; + else + transfer_draft_[field] = value; + } + refresh(); + return true; + }; + open_amount(std::move(request)); + return true; + } + if (action == "transfer-submit") { + if (transfer_dialog_ != "offer" || transfer_world_ != world_) + return true; + Json order = Json::object(); + for (auto *key : {"kind", "player", "source_club", "fee", "salary", + "months", "bonuses", "poached"}) + order[key] = transfer_draft_.at(key); + if (change({{"kind", "submit"}, {"order", order}}, transfer_revision_)) { + transfer_dialog_ = "booked"; + transfer_notice_ = + "Der fiktive Transferauftrag liegt in der Auftragsliste."; + transfer_draft_ = Json(); + transfer_world_.reset(); + focus_after_render_ = "transfer-close"; + refresh(); + } + return true; + } + if (action == "transfer-player-info" || action == "transfer-team-info") { + if (transfer_dialog_ != "offer") + return true; + transfer_dialog_ = + action == "transfer-player-info" ? "player-info" : "team-info"; + focus_after_render_ = "transfer-offer-back"; + refresh(); + return true; + } + if (action == "transfer-criteria" || action == "transfer-suggest" || + action == "transfer-search-reset") { + if (action == "transfer-search-reset" && transfer_dialog_ != "search") + return true; + Json criteria = snapshot.state.at("transfer").at("criteria"); + int mask = snapshot.state.at("transfer").at("positions"); + if (action == "transfer-suggest") { + const auto suggestion = demo_transfer_suggestion( + snapshot.state, *world_, actor, demo_lineup_active(snapshot.state)); + criteria = suggestion.at("criteria"); + mask = suggestion.at("positions"); + } + if (action == "transfer-search-reset") { + const auto defaults = demo_transfer(*world_, actor); + criteria = defaults.at("criteria"); + mask = 15; + } + criteria["price_max"] = criteria.at("price_max").get() / factor; + transfer_search_draft_ = criteria; + transfer_search_draft_["positions"] = mask; + transfer_dialog_ = "search"; + transfer_revision_ = snapshot.revision; + transfer_world_ = world_; + if (target && action != "transfer-search-reset") + transfer_return_focus_ = target->GetId(); + focus_after_render_ = "transfer-search-position-0"; + refresh(); + return true; + } + if (action == "transfer-search-position" || + action == "transfer-search-trait") { + if (transfer_dialog_ != "search" || index < 0 || + index > (action == "transfer-search-position" ? 3 : 2)) + return true; + const auto key = + action == "transfer-search-position" ? "positions" : "traits"; + const int mask = transfer_search_draft_.at(key).get() ^ (1 << index); + if (mask) + transfer_search_draft_[key] = mask; + focus_after_render_ = target->GetId(); + refresh(); + return true; + } + if (action == "transfer-search-apply") { + if (transfer_dialog_ != "search" || transfer_world_ != world_) + return true; + auto criteria = transfer_search_draft_; + const auto mask = criteria.at("positions"); + criteria.erase("positions"); + if (change({{"kind", "criteria"}, {"value", criteria}, {"positions", mask}}, + transfer_revision_)) { + transfer_view_["query"] = ""; + transfer_view_["page"] = 0; + transfer_view_["market"] = ""; + transfer_view_["hover"] = ""; + close_transfer(); + } + return true; + } + if (action == "transfer-orders") { + transfer_dialog_ = "orders"; + transfer_revision_ = snapshot.revision; + transfer_world_ = world_; + transfer_return_focus_ = target ? target->GetId() : "transfer-orders"; + focus_after_render_ = "transfer-close"; + refresh(); + return true; + } + if (action == "transfer-order-delete") { + if (transfer_dialog_ != "orders" || transfer_world_ != world_ || index < 0) + return true; + if (change({{"kind", "remove"}, {"index", index}}, transfer_revision_)) { + transfer_revision_ = snap().revision; + focus_after_render_ = "transfer-close"; + refresh(); + } + return true; + } + if (action == "transfer-poach") { + transfer_dialog_ = "poach-clubs"; + const auto *c = world_->find("clubs", actor); + transfer_poach_league_ = c ? c->value("competition", "") : ""; + transfer_poach_club_.clear(); + transfer_view_["poach_top"] = 0; + transfer_revision_ = snapshot.revision; + transfer_world_ = world_; + transfer_return_focus_ = target ? target->GetId() : "transfer-poach"; + focus_after_render_ = "transfer-poach-country"; + refresh(); + return true; + } + if (action == "transfer-poach-club" && target) { + const auto club = target->GetAttribute("data-club", ""); + if (club == actor || !world_->find("clubs", club)) + return true; + transfer_poach_club_ = club; + transfer_dialog_ = "poach-roster"; + transfer_view_["poach_top"] = 0; + focus_after_render_ = "transfer-poach-back"; + refresh(); + return true; + } + if (action == "transfer-poach-back") { + transfer_dialog_ = "poach-clubs"; + focus_after_render_ = "transfer-poach-club-" + transfer_poach_club_; + refresh(); + return true; + } + if (action == "transfer-poach-player") { + if (transfer_dialog_ != "poach-roster" || transfer_world_ != world_) + return true; + const auto p = demo_transfer_player(snapshot.state, *world_, actor, id); + if (!p.value("ok", false) || p.at("row").at("club") != transfer_poach_club_) + return true; + begin_offer("buy", id, true); + return true; + } + return true; +} +bool App::transfer_event(Rml::Event &event) { + if (menu_ != "transfer" || !source_ || amount_ || !popup_.empty() || + !report_detail_kind_.empty()) + return false; + const auto type = event.GetType(); + auto *target = event.GetTargetElement(); + const bool keyboard = type == "keydown"; + const auto key = keyboard ? Rml::Input::KeyIdentifier( + event.GetParameter("key_identifier", 0)) + : Rml::Input::KI_UNKNOWN; + if ((type == "input" || type == "change") && + target->GetId() == "transfer-search") { + auto *p = dynamic_cast(target); + if (p) + transfer_view_["query"] = p->GetValue(); + return true; + } + if (keyboard && key == Rml::Input::KI_RETURN && + target->GetId() == "transfer-search") { + transfer_action("transfer-search", target); + event.StopImmediatePropagation(); + return true; + } + if ((type == "input" || type == "change") && (!transfer_dialog_.empty())) { + auto *p = dynamic_cast(target); + if (!p) + return false; + const auto raw = p->GetValue(); + if (target->GetId() == "transfer-poach-country") { + const auto leagues = world_->leagues(raw); + if (leagues.empty()) + return true; + const auto next = leagues[0]->at("id").get(); + if (next != transfer_poach_league_) { + transfer_poach_league_ = next; + transfer_view_["poach_top"] = 0; + focus_after_render_ = "transfer-poach-country"; + refresh(); + } + return true; + } + if (target->GetId() == "transfer-poach-league") { + const auto *league = world_->find("competitions", raw); + if (league && league->value("type", "") == "league" && + raw != transfer_poach_league_) { + transfer_poach_league_ = raw; + transfer_view_["poach_top"] = 0; + focus_after_render_ = "transfer-poach-league"; + refresh(); + } + return true; + } + if (raw.empty() || raw.size() > 3 || + raw.find_first_not_of("0123456789") != raw.npos) + return true; + const int value = std::stoi(raw); + if (target->GetId() == "transfer-months" && transfer_dialog_ == "offer") { + const bool loan = transfer_draft_.at("kind") == "loan" || + transfer_draft_.at("kind") == "lend"; + if (value == 12 || value == 24 || (!loan && (value == 36 || value == 48))) + transfer_draft_["months"] = value; + return true; + } + if (transfer_dialog_ == "search" && + target->HasAttribute("data-criterion")) { + const auto field = + target->GetAttribute("data-criterion", ""); + const int maximum = (field == "age_min" || field == "age_max") ? 40 + : (field == "foot" || field == "type") ? 3 + : 100; + const int minimum = (field == "age_min" || field == "age_max") ? 16 : 0; + if (value < minimum || value > maximum || + !transfer_search_draft_.contains(field)) + return true; + int next = value; + if (field.ends_with("_min")) + next = + std::min(next, transfer_search_draft_ + .at(field.substr(0, field.size() - 4) + "_max") + .get()); + if (field.ends_with("_max")) + next = + std::max(next, transfer_search_draft_ + .at(field.substr(0, field.size() - 4) + "_min") + .get()); + transfer_search_draft_[field] = next; + if (next != value) + p->SetValue(std::to_string(next)); + if (auto *out = element("transfer-range-value-" + field)) + out->SetInnerRML("" + std::to_string(next) + ""); + dirty_ = true; + return true; + } + } + if (!transfer_dialog_.empty()) { + if ((keyboard && key == Rml::Input::KI_ESCAPE) || + (type == "mouseup" && event.GetParameter("button", 0) == 1)) { + if (keyboard) { + Rml::ElementList selects; + if (auto *d = element("transfer-dialog")) + d->QuerySelectorAll(selects, "select"); + for (auto *n : selects) + if (auto *s = dynamic_cast(n); + s && s->IsSelectBoxVisible()) { + s->CancelSelectBox(); + s->Focus(true); + event.StopImmediatePropagation(); + dirty_ = true; + return true; + } + } + if (transfer_dialog_ == "player-info" || transfer_dialog_ == "team-info") + transfer_action("transfer-offer-back", nullptr); + else if (transfer_dialog_ == "poach-roster") + transfer_action("transfer-poach-back", nullptr); + else + close_transfer(); + event.StopImmediatePropagation(); + return true; + } + if (keyboard && key == Rml::Input::KI_TAB) { + Rml::ElementList fields; + if (auto *d = element("transfer-dialog")) + d->QuerySelectorAll(fields, "button,input,select"); + std::erase_if(fields, [](auto *n) { + return !n->IsVisible(true) || n->HasAttribute("disabled"); + }); + if (!fields.empty()) { + const auto at = std::find(fields.begin(), fields.end(), + context_->GetFocusElement()); + const int old = at == fields.end() ? -1 : int(at - fields.begin()), + count = int(fields.size()); + const bool back = event.GetParameter("shift_key", 0) != 0; + fields[size_t(old < 0 ? (back ? count - 1 : 0) + : (old + (back ? -1 : 1) + count) % count)] + ->Focus(true); + } + event.StopImmediatePropagation(); + return true; + } + bool inside = false; + for (auto *n = target; n && n != doc_; n = n->GetParentNode()) + if (n->GetId() == "transfer-dialog") + inside = true; + if (!inside && (type == "click" || type == "mousedown" || + type == "mouseup" || type == "dblclick" || keyboard)) { + event.StopImmediatePropagation(); + return true; + } + return false; + } + if (type == "mouseup" && event.GetParameter("button", 0) == 1) { + bool offers = false; + for (auto *n = target; n && n != doc_; n = n->GetParentNode()) + if (n->GetId() == "transfer-offers") + offers = true; + if (offers) { + const auto pool = + demo_transfer_view(snap().state, *world_, transfer_ui_club(snap())) + .at("market"); + const int pages = std::max(1, int((pool.size() + 5) / 6)); + transfer_view_["page"] = (transfer_view_.value("page", 0) + 1) % pages; + if (!pool.empty()) { + const auto &r = pool[size_t(transfer_view_.at("page").get()) * 6]; + const bool own = r.at("own"); + transfer_view_[own ? "own" : "market"] = r.at("id"); + transfer_view_["side"] = own ? "own" : "market"; + } + transfer_view_["hover"] = ""; + refresh(); + event.StopImmediatePropagation(); + return true; + } + } + if (type == "mousemove" || type == "focus") { + std::string hover; + for (auto *n = target; n && n != doc_; n = n->GetParentNode()) + if (n->HasAttribute("data-preview")) { + hover = n->GetAttribute("data-preview", ""); + break; + } + if (type == "focus" && hover.empty()) + return false; + if (transfer_view_.value("hover", std::string()) != hover) { + transfer_view_["hover"] = hover; + const auto snapshot = snap(); + const auto rows = demo_transfer_view(snapshot.state, *world_, + transfer_ui_club(snapshot)); + auto row = transfer_ui_find(rows.at("market"), hover); + if (row.is_null()) + row = transfer_view_.value("side", std::string()) == "own" + ? transfer_ui_find(rows.at("own"), + transfer_view_.value("own", std::string())) + : transfer_ui_find( + rows.at("market"), + transfer_view_.value("market", std::string())); + std::string body = "

Wähle einen angebotenen Spieler.

"; + if (row.is_object()) { + const auto fee = row.at("fee").get(), + remaining = snapshot.state.at("cash").get() + + (row.at("own") == true ? fee : -fee); + body = "

" + label(world_->find("clubs", row.at("club")), 32) + + "

" + + std::string(row.at("own") == true ? "Marktwert" + : "Geforderte Ablöse") + + "" + esc(cash(fee)) + + "
Restkapital nach " + + std::string(row.at("own") == true ? "Verkauf" : "Kauf") + + "" + + esc(cash(remaining)) + "
"; + } + if (auto *preview = element("transfer-preview")) + preview->SetInnerRML(body); + dirty_ = true; + } + } + return false; +} diff --git a/src/modern/ui/transfer_screens.inc b/src/modern/ui/transfer_screens.inc new file mode 100644 index 0000000..60fb96a --- /dev/null +++ b/src/modern/ui/transfer_screens.inc @@ -0,0 +1,827 @@ +// SPDX-License-Identifier: GPL-3.0-only +namespace { +const Json &transfer_ui_field(const Json &v, const char *key) { + static const Json empty; + if (v.is_object()) { + auto i = v.find(key); + if (i != v.end()) + return *i; + } + return empty; +} +std::string transfer_ui_text(const Json &v, const std::string &fallback = "—") { + return v.is_string() && !v.get_ref().empty() + ? v.get() + : fallback; +} +std::string transfer_ui_number(const Json &v) { + if (v.is_number_integer()) + return number(v.get()); + if (!v.is_number()) + return "—"; + std::ostringstream s; + s.imbue(std::locale::classic()); + s << std::setprecision(4) << v.get(); + auto out = s.str(); + std::replace(out.begin(), out.end(), '.', ','); + return out; +} +std::string transfer_ui_role(const Json &v) { + const auto p = transfer_ui_text(v, ""); + return p == "gk" ? "TW" + : p == "def" ? "ABW" + : p == "mid" ? "MIT" + : p == "fwd" ? "STU" + : "—"; +} +std::string transfer_ui_club(const Snapshot &s) { + return s.state.at("managers")[0].at("club").get(); +} +Json transfer_ui_find(const Json &rows, const std::string &id) { + if (rows.is_array()) + for (const auto &r : rows) + if (r.at("id") == id) + return r; + return nullptr; +} +const std::array transfer_ui_bonuses{ + "Torprämie", "Punktprämie", "Auflaufprämie", "Meisterprämie", + "Prämie Pl. 2–5", "Prämie Pl. 6–10", "Nichtabstiegsprämie"}; +} // namespace + +void App::transfer_remember_scroll() { + if (!transfer_view_.is_object()) + return; + for (const auto &[id, key] : + std::array, 4>{ + {{"transfer-roster-scroll", "roster_top"}, + {"transfer-market-scroll", "market_top"}, + {"transfer-poach-scroll", "poach_top"}, + {"transfer-orders-scroll", "orders_top"}}}) + if (auto *node = element(id)) { + transfer_view_[key] = node->GetScrollTop(); + if (std::string(id) == "transfer-roster-scroll") + transfer_view_["roster_left"] = node->GetScrollLeft(); + } + if (auto *node = element("transfer-poach-scroll")) { + const auto key = node->GetAttribute("data-scope", ""); + if (!key.empty()) + transfer_view_["poach_scrolls"][key] = node->GetScrollTop(); + } + if (auto *node = element("transfer-dialog-scroll")) { + const auto kind = node->GetAttribute("data-dialog", ""); + if (!kind.empty()) + transfer_view_["dialog_scrolls"][kind] = node->GetScrollTop(); + } +} +void App::transfer_restore_scroll() { + if (menu_ != "transfer" || !transfer_view_.is_object() || + !transfer_view_.value("restore_scroll", false)) + return; + transfer_view_["restore_scroll"] = false; + for (const auto &[id, key] : + std::array, 4>{ + {{"transfer-roster-scroll", "roster_top"}, + {"transfer-market-scroll", "market_top"}, + {"transfer-poach-scroll", "poach_top"}, + {"transfer-orders-scroll", "orders_top"}}}) + if (auto *node = element(id)) { + const auto &v = transfer_ui_field(transfer_view_, key); + if (v.is_number()) + node->SetScrollTop(v.get()); + if (std::string(id) == "transfer-roster-scroll" && + transfer_view_.contains("roster_left")) + node->SetScrollLeft(transfer_view_.at("roster_left").get()); + } + if (auto *node = element("transfer-poach-scroll")) { + const auto key = node->GetAttribute("data-scope", ""); + const auto &v = transfer_ui_field( + transfer_ui_field(transfer_view_, "poach_scrolls"), key.c_str()); + if (v.is_number()) + node->SetScrollTop(v.get()); + } + if (auto *node = element("transfer-dialog-scroll")) { + const auto kind = node->GetAttribute("data-dialog", ""); + const auto &v = transfer_ui_field( + transfer_ui_field(transfer_view_, "dialog_scrolls"), kind.c_str()); + if (v.is_number()) + node->SetScrollTop(v.get()); + } +} +std::string App::render_transfer() { + transfer_remember_scroll(); + const auto snapshot = snap(); + const auto own = transfer_ui_club(snapshot); + const auto data = demo_transfer_view(snapshot.state, *world_, own); + if (!data.value("ok", false)) + return {}; + if (!transfer_view_.is_object() || !transfer_view_.contains("tab")) + transfer_view_ = {{"tab", 0}, + {"complete", false}, + {"scope", "active"}, + {"page", 0}, + {"side", "market"}, + {"own", ""}, + {"market", ""}, + {"hover", ""}, + {"query", data.at("query")}, + {"dialog_scrolls", Json::object()}}; + if (transfer_view_.value("applied_query", std::string()) != + data.at("query").get()) { + transfer_view_["query"] = data.at("query"); + transfer_view_["applied_query"] = data.at("query"); + } + const auto &ours = data.at("own"), &pool = data.at("market"); + if (transfer_ui_find(ours, transfer_view_.value("own", std::string())) + .is_null()) + transfer_view_["own"] = ours.empty() ? Json("") : ours[0].at("id"); + if (transfer_ui_find(pool, transfer_view_.value("market", std::string())) + .is_null()) { + transfer_view_["market"] = ""; + for (const auto &r : pool) + if (r.at("own") == false) { + transfer_view_["market"] = r.at("id"); + break; + } + } + const bool complete = transfer_view_.value("complete", false), + b = transfer_view_.value("tab", 0) == 1; + const int pages = std::max(1, int((pool.size() + 5) / 6)), + page = std::clamp(transfer_view_.value("page", 0), 0, pages - 1); + transfer_view_["page"] = page; + Json chosen = + transfer_view_.value("side", std::string("market")) == "own" + ? transfer_ui_find(ours, transfer_view_.value("own", std::string())) + : transfer_ui_find(pool, + transfer_view_.value("market", std::string())); + const auto hovered = transfer_view_.value("hover", std::string()); + auto preview = transfer_ui_find(pool, hovered); + if (preview.is_null()) + preview = chosen; + const auto listed = [&](const std::string &id) { + const auto &ls = snapshot.state.at("transfer").at("listed"); + return std::find(ls.begin(), ls.end(), id) != ls.end(); + }; + const auto trait = [&](const Json &v, bool foot) { + if (!v.is_number_integer()) + return std::string("—"); + const int n = v.get(); + const std::array fl{"", "Links", "Beidfüßig", "Rechts"}, + ty{"", "Defensiv", "Ausgeglichen", "Offensiv"}; + const std::string path = n == 2 ? "M16 4L28 16L16 28L4 16Z" + : foot + ? (n == 1 ? "M28 16H4M4 16L14 6M4 16L14 26" + : "M4 16H28M28 16L18 6M28 16L18 26") + : (n == 1 ? "M16 4V28M16 28L6 18M16 28L26 18" + : "M16 28V4M16 4L6 14M16 4L26 14"); + const auto svg = + ""; + return "" + + picture(renderer_.diagram("transfer-trait-" + + std::to_string(int(foot)) + "-" + + std::to_string(n), + svg, 64), + 32, 32) + + ""; + }; + const auto nation = [&](const Json &r) { + const auto code = transfer_ui_text(r.at("nation"), ""); + const auto svg = ui_nation_flag_svg(code); + return "" + + (svg.empty() ? std::string("—") + : picture(renderer_.diagram( + "transfer-flag-" + + content::sha256(svg).substr(0, 12), + svg, 120), + 36, 24)) + + ""; + }; + std::string out = + "

Kader und " + "Transfermarkt

Verfügbares Kapital" + + esc(cash(snapshot.state.at("cash").get())) + + "

Dein Kader

" + + std::to_string(ours.size()) + " Spieler · Daten " + (b ? "B" : "A") + + "
"; + std::vector headers = + b ? std::vector{"Spieler", "Alter", "Ecke", + "Frei", "Zwei", "Pass", + "Schuss", "Schnell", "Team"} + : std::vector{"Spieler", "Pos.", "Fuß", "Typ", + "Kond.", "Tech.", "Form", "Stärke"}; + if (complete) { + const std::vector extras = + b ? std::vector{"Liga", "Pokal", "Europa", "Tore", + "Vorlagen"} + : std::vector{"Alter", "Land", "Spiele", "Tore", + "Vorlagen"}; + headers.insert(headers.end(), extras.begin(), extras.end()); + } + const double namewidth = complete ? 22. : 33., + width = (100 - namewidth) / (headers.size() - 1); + out += "
"; + for (size_t i = 0; i < headers.size(); ++i) + out += "
" + headers[i] + "
"; + out += "
"; + for (size_t i = 0; i < ours.size(); ++i) { + const auto &r = ours[i]; + const auto id = r.at("id").get(); + std::vector values; + if (b) { + values.push_back(transfer_ui_number(r.at("age"))); + for (const auto &v : r.at("skills")) + values.push_back(transfer_ui_number(v)); + } else + values = {transfer_ui_role(r.at("position")), + trait(r.at("foot"), true), + trait(r.at("type"), false), + transfer_ui_number(r.at("condition")), + transfer_ui_number(r.at("technique")), + transfer_ui_number(r.at("form")), + transfer_ui_number(r.at("strength"))}; + if (complete) { + if (b) { + for (auto *key : + {"league_games", "cup_games", "europe_games", "goals", "assists"}) + values.push_back(transfer_ui_number(r.at(key))); + } else { + values.push_back(transfer_ui_number(r.at("age"))); + values.push_back(nation(r)); + for (auto *key : {"games", "goals", "assists"}) + values.push_back(transfer_ui_number(r.at(key))); + } + } + out += "
" + + btn("transfer-own", + "" + std::to_string(i + 1) + + "." + + esc(r.at("name").get()) + "" + + (listed(id) ? "●" + : ""), + listed(id) ? "transfer-listed" : "", + "id=\"transfer-own-" + esc(id) + "\" data-player=\"" + esc(id) + + "\" aria-pressed=\"" + + (transfer_view_.value("side", std::string()) == "own" && + transfer_view_.at("own") == id + ? "true" + : "false") + + "\"") + + "
"; + for (const auto &v : values) + out += "
" + v + + "
"; + out += "
"; + } + if (ours.empty()) + out += "

Keine Kaderspieler vorhanden.

"; + out += "

" + + std::string( + complete + ? "Vollständige Kaderdaten" + : "Spieler links wählen, um zu verkaufen oder zu verleihen") + + "

"; + if (!complete) { + out += + "

AngeboteKondition · Technik · Form (Stärke)

())) + + "\" aria-label=\"Spielername suchen\" placeholder=\"Spielername " + "suchen\"/>" + + btn("transfer-search", "Finden", "", "id=\"transfer-find\"") + + "
"; + for (size_t i = size_t(page) * 6; + i < std::min(pool.size(), size_t(page + 1) * 6); ++i) { + const auto &r = pool[i]; + const auto id = r.at("id").get(); + const bool mine = r.at("own"); + out += btn( + mine ? "transfer-own" : "transfer-market", + "" + nation(r) + "" + + esc(r.at("name").get()) + "" + + transfer_ui_role(r.at("position")) + "" + + trait(r.at("foot"), true) + trait(r.at("type"), false) + + "" + + transfer_ui_number(r.at("condition")) + " · " + + transfer_ui_number(r.at("technique")) + " · " + + transfer_ui_number(r.at("form")) + " (" + + transfer_ui_number(r.at("strength")) + ")" + + transfer_ui_number(r.at("age")) + " Jahre", + "transfer-market-player " + + std::string(mine ? "transfer-own-listing " : "") + + ((mine ? transfer_view_.at("own") + : transfer_view_.at("market")) == id && + transfer_view_.value("side", std::string()) == + (mine ? "own" : "market") + ? "selected" + : ""), + "id=\"transfer-market-" + esc(id) + "\" data-player=\"" + esc(id) + + "\" data-preview=\"" + esc(id) + "\" aria-pressed=\"" + + (((mine ? transfer_view_.at("own") + : transfer_view_.at("market")) == id) + ? "true" + : "false") + + "\" style=\"" + + rect(0, (i - size_t(page) * 6) * 128.7864583, 1087.03125, + 120.7864583) + + "\""); + } + if (pool.empty()) + out += + "

Keine Spieler für diese " + "Auswahl.Name, Positionen oder Suchprofil ändern.

"; + out += + "
" + + btn("transfer-page", "‹", "", + "id=\"transfer-page-previous\" data-step=\"-1\" " + + std::string(page == 0 ? "disabled" : "")) + + "" + + (pool.empty() + ? std::string("Keine Angebote") + : std::to_string(page * 6 + 1) + "–" + + std::to_string(std::min(pool.size(), size_t(page + 1) * 6)) + + " von " + std::to_string(pool.size())) + + "" + + btn("transfer-page", "›", "", + "id=\"transfer-page-next\" data-step=\"1\" " + + std::string(page + 1 >= pages ? "disabled" : "")) + + "
"; + if (preview.is_object()) { + const auto *source = world_->find("clubs", preview.at("club")); + const auto fee = preview.at("fee").get(); + const auto remaining = snapshot.state.at("cash").get() + + (preview.at("own") == true ? fee : -fee); + out += "

" + label(source, 32) + "

" + + std::string(preview.at("own") == true ? "Marktwert" + : "Geforderte Ablöse") + + "" + esc(cash(fee)) + + "
Restkapital nach " + + std::string(preview.at("own") == true ? "Verkauf" : "Kauf") + + "" + + esc(cash(remaining)) + "
"; + } else + out += "

Wähle einen angebotenen Spieler.

"; + out += "
"; + const auto strengths = demo_transfer_strengths( + snapshot.state, *world_, own, demo_lineup_active(snapshot.state)); + const auto scope = transfer_view_.value("scope", std::string("active")); + out += + "

Durchschnitt " + + transfer_ui_number( + strengths.at(scope == "team" ? "team_average" : "active_average")) + + "

"; + for (int i = 0; i < 4; ++i) + out += "
" + + std::string(std::array{ + "Tor", "Abwehr", "Mittelfeld", "Sturm"}[size_t(i)]) + + "" + + transfer_ui_number(strengths.at(scope)[size_t(i)]) + + "
"; + out += "

" + + (chosen.is_object() + ? std::string(chosen.at("own") == true ? "Eigener Spieler: " + : "Marktspieler: ") + + esc(chosen.at("name").get()) + : "Kein Marktspieler ausgewählt") + + "

"; + const bool mine = chosen.is_object() && chosen.at("own") == true; + out += + btn("transfer-offer", + mine && listed(chosen.at("id")) ? "Vom Markt nehmen" : "Ver-kaufen", + "", + "id=\"transfer-offer-buy-sell\" data-kind=\"" + + std::string(mine ? "sell" : "buy") + "\" " + + std::string(chosen.is_object() ? "" : "disabled")) + + btn("transfer-offer", "Ver-leihen", "", + "id=\"transfer-offer-loan-lend\" data-kind=\"" + + std::string(mine ? "lend" : "loan") + "\" " + + std::string(chosen.is_object() ? "" : "disabled")) + + "
"; + } + out += "
" + render_transfer_dialog(); +} + +std::string App::render_transfer_dialog() { + if (transfer_dialog_.empty()) + return {}; + const auto snapshot = snap(); + const auto actor = transfer_ui_club(snapshot); + std::string title, body, actions; + double height = 500; + const auto button = [&](const char *action, const std::string &caption, + const std::string &attrs = "") { + return btn(action, esc(caption), "transfer-dialog-button", attrs); + }; + const auto close = [&](const std::string &caption = "Abbruch") { + return button("transfer-close", caption, "id=\"transfer-close\""); + }; + if (transfer_dialog_ == "offer") { + height = 1210.5; + const auto &d = transfer_draft_; + const auto &r = d.at("row"); + const auto kind = d.at("kind").get(); + const bool loan = kind == "loan" || kind == "lend", mine = r.at("own"); + const std::map kinds{{"buy", "Kaufen"}, + {"loan", "Ausleihen"}, + {"sell", "Verkaufen"}, + {"lend", "Verleihen"}}; + title = + (d.at("poached") == true ? std::string("Abwerben") : kinds.at(kind)) + + " · " + r.at("name").get(); + const auto flag = ui_nation_flag_svg(transfer_ui_text(r.at("nation"), "")); + const auto flag_image = + flag.empty() + ? std::string("—") + : picture(renderer_.diagram("transfer-offer-flag", flag, 180), 60, + 40); + body = "
" + + flag_image + "
" + + esc(r.at("name").get()) + "" + + transfer_ui_role(r.at("position")) + " · " + + transfer_ui_number(r.at("age")) + " Jahre · Stärke " + + transfer_ui_number(r.at("strength")) + + "
" + + label(world_->find("clubs", r.at("club")), 58) + + "
" + + std::string(loan ? "Fiktive Leihgebühr" : "Ungefährer Marktwert") + + "" + esc(cash(d.at("demand_fee").get())) + + "
" + + std::string(mine ? "Aktuelles Monatsgehalt" : "Gehaltswunsch") + + "" + + (d.at("demand_salary").is_number_integer() + ? esc(cash(d.at("demand_salary").get())) + : "—") + + "

Dein " + "Angebot

"; + for (int i = 0; i < 3; ++i) { + const auto field = i == 0 ? "fee" : i == 1 ? "salary" : "months"; + const std::string caption = i == 0 ? (loan ? "Leihgebühr" : "Ablöse") + : i == 1 ? "Monatsgehalt" + : "Vertragsdauer"; + body += "
" + caption + ""; + if (i < 2) + body += btn("transfer-amount", + esc(std::to_string(d.at(field).get())), + "transfer-amount-input amount-trigger", + "id=\"transfer-" + std::string(field) + "\" data-field=\"" + + field + "\" aria-label=\"" + caption + "\""); + else { + body += ""; + } + body += "
"; + } + body += "

Mannschaftsprämien für " + "diesen Vertrag

"; + for (int i = 0; i < 7; ++i) + body += + "
" + + std::string(transfer_ui_bonuses[size_t(i)]) + "" + + btn("transfer-bonus", transfer_ui_number(d.at("bonuses")[size_t(i)]), + "amount-trigger", + "id=\"transfer-bonus-" + std::to_string(i) + "\" data-index=\"" + + std::to_string(i) + "\"") + + "
"; + body += "

" + + std::string(mine ? "Der Spieler wird zum " + + std::string(loan ? "Verleihen" : "Verkauf") + + " auf dem Markt vorgemerkt." + : "Das Angebot wird vorgemerkt; die Entscheidung " + "des Spielers folgt später.") + + "

"; + actions = + button("transfer-team-info", "Team-Info", "id=\"transfer-team-info\"") + + button("transfer-player-info", "Spieler-Info", + "id=\"transfer-player-info\"") + + close() + + button("transfer-submit", "Angebot", + "id=\"transfer-submit\" " + + std::string(d.value("can_submit", true) ? "" : "disabled")); + } else if (transfer_dialog_ == "search") { + height = 899; + title = "Spieler suchen"; + const auto &d = transfer_search_draft_; + body = "

Art

"; + const std::array, 4> ranges{ + {{"age_min", "Alter von"}, + {"age_max", "Alter bis"}, + {"strength_min", "Stärke von"}, + {"strength_max", "Stärke bis"}}}; + for (int i = 0; i < 4; ++i) { + const auto [key, caption] = ranges[size_t(i)]; + body += "
" + caption + + "" + + transfer_ui_number(d.at(key)) + "
"; + } + body += "

Typ · " + "darauf achten

"; + for (int i = 0; i < 2; ++i) { + const auto field = i ? "foot" : "type"; + const std::array names = + i ? std::array{"Beliebig", "Links", "Beidfüßig", + "Rechts"} + : std::array{"Beliebig", "Defensiv", + "Ausgeglichen", "Offensiv"}; + body += "
" + std::string(i ? "Spielseite" : "Spielweise") + + "
"; + } + body += + "
Preisvorstellung bis" + + btn("transfer-search-budget", + esc(std::to_string(d.at("price_max").get())), + "amount-trigger", + "id=\"transfer-search-budget\" aria-label=\"Maximale " + "Ablösesumme\"") + + "
"; + actions = close() + + button("transfer-search-reset", "Zurücksetzen", + "id=\"transfer-search-reset\"") + + button("transfer-search-apply", "Suchen", + "id=\"transfer-search-apply\""); + } else if (transfer_dialog_ == "player-info") { + height = 822; + const auto &r = transfer_draft_.at("row"); + title = r.at("name").get(); + body = "
" + + (r.at("photo").is_string() + ? img(r.at("photo"), 440, 550, true, true, 650) + : "—") + + "
"; + const std::vector> facts{ + {"Verein", r.at("club_name")}, + {"Position", transfer_ui_role(r.at("position"))}, + {"Alter", transfer_ui_number(r.at("age")) + " Jahre"}, + {"Kondition", transfer_ui_number(r.at("condition"))}, + {"Technik", transfer_ui_number(r.at("technique"))}, + {"Form", transfer_ui_number(r.at("form"))}, + {"Stärke", transfer_ui_number(r.at("strength"))}, + {"Fuß", r.at("foot").is_number_integer() + ? std::array{"—", "Links", "Beidfüßig", + "Rechts"}[size_t( + r.at("foot").get())] + : "—"}, + {"Typ", r.at("type").is_number_integer() + ? std::array{"—", "Defensiv", "Ausgeglichen", + "Offensiv"}[size_t(r.at("type").get())] + : "—"}}; + for (size_t i = 0; i < facts.size(); ++i) + body += "
" + + esc(facts[i].first) + "" + esc(facts[i].second) + + "
"; + body += "
"; + actions = button("transfer-offer-back", "Zurück zum Angebot", + "id=\"transfer-offer-back\""); + } else if (transfer_dialog_ == "team-info") { + height = 800; + title = "Team-Info"; + const auto values = demo_transfer_strengths( + snapshot.state, *world_, actor, demo_lineup_active(snapshot.state)); + body = "

" + + label(world_->find("clubs", actor), 58) + + "

MannschaftsteilAktiveTeam
"; + for (int i = 0; i < 4; ++i) + body += + "
" + + std::string(std::array{"Tor", "Abwehr", "Mittelfeld", + "Sturm"}[size_t(i)]) + + "" + transfer_ui_number(values.at("active")[size_t(i)]) + + "" + transfer_ui_number(values.at("team")[size_t(i)]) + + "
"; + body += "
"; + actions = button("transfer-offer-back", "Zurück zum Angebot", + "id=\"transfer-offer-back\""); + } else if (transfer_dialog_ == "poach-clubs") { + height = 1141; + title = "Spieler abwerben"; + const auto leagues = world_->leagues(); + if (transfer_poach_league_.empty() && !leagues.empty()) + transfer_poach_league_ = leagues[0]->at("id").get(); + const auto *league = world_->find("competitions", transfer_poach_league_); + const auto country = league ? league->value("nation", "") : ""; + body = "

Verein wählen, danach einen " + "Spieler aus dessen Beispielkader.

"; + const auto clubs = world_->clubs(transfer_poach_league_); + for (size_t i = 0; i < clubs.size(); ++i) + body += btn( + "transfer-poach-club", label(clubs[i], 52), "", + "id=\"transfer-poach-club-" + + esc(clubs[i]->at("id").get()) + "\" data-club=\"" + + esc(clubs[i]->at("id").get()) + "\" style=\"" + + rect((i % 4) * 527, (i / 4) * 140, 511, 124) + "\" " + + std::string(clubs[i]->at("id") == actor ? "disabled" : "")); + body += "
"; + actions = close(); + } else if (transfer_dialog_ == "poach-roster") { + height = 1400; + const auto *club = world_->find("clubs", transfer_poach_club_); + title = "Abwerben · " + std::string(club ? world_->name(*club) : "—"); + const auto rows = demo_transfer_roster(snapshot.state, *world_, actor, + transfer_poach_club_); + body = "
SpielerPos.AlterStärkeMarktwert
"; + if (rows.value("ok", false)) + for (const auto &r : rows.at("rows")) + body += + "
" + + btn("transfer-poach-player", esc(r.at("name").get()), + "", + "id=\"transfer-poach-player-" + + esc(r.at("id").get()) + "\" data-player=\"" + + esc(r.at("id").get()) + "\"") + + "" + transfer_ui_role(r.at("position")) + "" + + transfer_ui_number(r.at("age")) + "" + + transfer_ui_number(r.at("strength")) + "" + + esc(cash((r.at("fee").get() * 3 + 1) / 2)) + + "
"; + body += "
"; + actions = button("transfer-poach-back", "Zurück zu Vereinen", + "id=\"transfer-poach-back\"") + + close(); + } else if (transfer_dialog_ == "orders") { + title = "Vorgemerkte Transferaufträge"; + const auto rows = + demo_transfer_view(snapshot.state, *world_, actor).at("orders"); + height = rows.empty() ? 430 : std::min(1450., 352. + rows.size() * 74.); + body = "
"; + if (rows.empty()) + body += "

Noch keine Transferaufträge vorgemerkt.

"; + else { + body += "
SpielerArtBetragLaufzeit
"; + const std::map kinds{{"buy", "Kaufen"}, + {"loan", "Ausleihen"}, + {"sell", "Verkaufen"}, + {"lend", "Verleihen"}}; + for (size_t i = 0; i < rows.size(); ++i) { + const auto &o = rows[i]; + body += + "
" + + esc(o.at("name").get()) + "" + + esc(o.at("poached") == true ? "Abwerben" : kinds.at(o.at("kind"))) + + "" + esc(cash(o.at("fee").get())) + + "" + std::to_string(o.at("months").get()) + + " Monate" + + btn("transfer-order-delete", "×", "", + "id=\"transfer-order-delete-" + std::to_string(i) + + "\" data-index=\"" + std::to_string(i) + + "\" aria-label=\"Auftrag zurücknehmen\"") + + "
"; + } + } + body += "
"; + actions = close("Zurück"); + } else { + title = transfer_dialog_ == "booked" ? "Auftrag vorgemerkt" + : "Transferliste voll"; + body = "

" + esc(transfer_notice_) + "

"; + actions = close("Verstanden"); + } + return "

" + + esc(title) + + "

" + body + + "
"; +} diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index cb91e29..a531c1c 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -12,6 +12,8 @@ #include "modern/ui/demo_toto.hpp" #include "modern/ui/demo_reports.hpp" #include "modern/ui/demo_sports.hpp" +#include "modern/ui/demo_lineup.hpp" +#include "modern/ui/demo_transfer.hpp" #include "modern/ui/desktop.hpp" #include "modern/ui/gui_assets.hpp" #include "modern/ui/model.hpp" @@ -324,7 +326,7 @@ class App final : public Rml::EventListener { bool focus_ticket_ = false; std::set pending_selects_; std::string focus_after_render_; - bool keyboard_navigation_ = false; + bool keyboard_navigation_ = false, setting_menu_markup_ = false; std::string last_rendered_menu_; std::optional training_scroll_; std::optional report_scroll_; @@ -352,6 +354,18 @@ class App final : public Rml::EventListener { int toto_column_ = 0; std::array, 6> toto_focus_{{{0,1},{0,1},{0,1},{0,1},{0,1},{0,1}}}; std::string toto_dialog_, toto_return_focus_; + bool lineup_pitch_ = true; + int lineup_data_ = 0, lineup_page_ = 0; + std::string lineup_side_ = "formations", lineup_selected_; + Json lineup_drag_; + uint64_t lineup_drag_revision_ = 0; + std::shared_ptr lineup_drag_world_; + bool lineup_ignore_click_ = false, lineup_reset_scroll_ = false; + std::optional lineup_roster_scroll_, lineup_bench_scroll_; + Json transfer_view_ = Json::object(), transfer_draft_, transfer_search_draft_; + std::string transfer_dialog_, transfer_return_focus_, transfer_notice_, transfer_poach_league_, transfer_poach_club_, transfer_picker_; + uint64_t transfer_revision_ = 0; + std::shared_ptr transfer_world_; float device_ratio_ = 1.f; Json desktop_ = Json::object(), saved_desktop_ = Json::object(), options_ = Json::object(); @@ -565,6 +579,11 @@ class App final : public Rml::EventListener { renderer_.world(next); world_ = std::move(next); source_ = std::move(demo); + lineup_drag_ = Json(); lineup_drag_world_.reset(); lineup_selected_.clear(); lineup_ignore_click_ = false; + lineup_pitch_ = true; lineup_data_ = lineup_page_ = 0; lineup_side_ = "formations"; + transfer_view_ = Json::object(); transfer_draft_ = transfer_search_draft_ = Json(); + 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; 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}; @@ -714,6 +733,17 @@ class App final : public Rml::EventListener { std::string render_toto(); bool toto_action(const std::string &, Rml::Element *); bool toto_event(Rml::Event &); + std::string render_lineup(); + bool lineup_action(const std::string &, Rml::Element *); + bool lineup_event(Rml::Event &); + void cancel_lineup_drag(bool refresh_view = true); + std::string render_transfer(); + std::string render_transfer_dialog(); + bool transfer_action(const std::string &, Rml::Element *); + bool transfer_event(Rml::Event &); + void close_transfer(bool restore = true); + void transfer_remember_scroll(); + void transfer_restore_scroll(); std::string render_almanac(); bool almanac_action(const std::string &, Rml::Element *); std::string render_indoor(); @@ -742,8 +772,13 @@ class App final : public Rml::EventListener { } for (const auto &id : ready) { pending_selects_.erase(id); - if (auto *select = element(id)) - change(select); + if (auto *select = element(id)) { + // Menu-local select handlers receive only a committed/cancelled value. + if ((menu_ == "lineup" && id.starts_with("lineup-")) || + (menu_ == "transfer" && id.starts_with("transfer-"))) + select->DispatchEvent("change", {}); + else change(select); + } } } void input(Rml::Element *); @@ -783,6 +818,9 @@ class App final : public Rml::EventListener { // open. Never keep that menu's modal/input gate in the destination view. if (menu_ != last_rendered_menu_) { planning_dialog_.clear(); + 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(); toto_dialog_.clear(); if (menu_ == "toto" && source_) for (size_t c = 0; c < toto_focus_.size(); ++c) { @@ -795,6 +833,15 @@ class App final : public Rml::EventListener { report_detail_kind_.clear(); report_picker_.clear(); } + lineup_roster_scroll_.reset(); + lineup_bench_scroll_.reset(); + if (menu_ == "lineup" && last_rendered_menu_ == "lineup") { + if (auto *roster = element("lineup-roster-scroll")) + lineup_roster_scroll_ = lineup_reset_scroll_ ? 0.f : roster->GetScrollTop(); + if (auto *bench = element("lineup-bench-scroll")) + lineup_bench_scroll_ = bench->GetScrollTop(); + } + lineup_reset_scroll_ = false; training_scroll_.reset(); if (menu_ == "training" && last_rendered_menu_ == "training") if (auto *roster = element("training-roster")) @@ -824,11 +871,13 @@ class App final : public Rml::EventListener { markup = render_desktop(); if (!menu_.empty()) markup += render_menu(menu_); + setting_menu_markup_ = true; element("canvas")->SetInnerRML(markup); - if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty()) { + setting_menu_markup_ = false; + if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty()) { Rml::ElementList behind; doc_->QuerySelectorAll(behind, - "#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay 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,.window .titlebar button"); for (auto *node : behind) node->SetProperty("pointer-events", "none"); } @@ -867,7 +916,10 @@ class App final : public Rml::EventListener { if (focus_after_render_.starts_with("report-option-") || focus_after_render_.starts_with("friendly-opponent-") || focus_after_render_.starts_with("alm-match-") || - focus_after_render_.starts_with("contract-player-")) + focus_after_render_.starts_with("contract-player-") || + focus_after_render_.starts_with("lineup-name-") || + focus_after_render_.starts_with("lineup-detail-") || + focus_after_render_.starts_with("lineup-bench-")) report_option_to_scroll_ = focus_after_render_; focus_after_render_.clear(); } @@ -973,6 +1025,15 @@ class App final : public Rml::EventListener { list->SetScrollTop(*report_scroll_); report_scroll_.reset(); } + if (lineup_roster_scroll_) { + if (auto *roster = element("lineup-roster-scroll")) roster->SetScrollTop(*lineup_roster_scroll_); + lineup_roster_scroll_.reset(); + } + if (lineup_bench_scroll_) { + if (auto *bench = element("lineup-bench-scroll")) bench->SetScrollTop(*lineup_bench_scroll_); + lineup_bench_scroll_.reset(); + } + if (menu_ == "transfer") transfer_restore_scroll(); if (!report_option_to_scroll_.empty()) { if (auto *node = element(report_option_to_scroll_)) node->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest)); @@ -1238,6 +1299,11 @@ public: #include "modern/ui/advertising_controls.inc" #include "modern/ui/toto_screens.inc" #include "modern/ui/toto_controls.inc" +#include "modern/ui/nation_flags.inc" +#include "modern/ui/lineup_screens.inc" +#include "modern/ui/lineup_controls.inc" +#include "modern/ui/transfer_screens.inc" +#include "modern/ui/transfer_controls.inc" } // namespace bool is_modern_world(const fs::path &file) { try { diff --git a/tests/modern_control_layout_tests.cpp b/tests/modern_control_layout_tests.cpp index ae6fcd8..3c9968c 100644 --- a/tests/modern_control_layout_tests.cpp +++ b/tests/modern_control_layout_tests.cpp @@ -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"}) { + "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"}) { std::ifstream input(root / name); require(bool(input), "Production stylesheet missing"); css << input.rdbuf() << '\n'; diff --git a/tests/modern_lineup_ui_tests.cpp b/tests/modern_lineup_ui_tests.cpp new file mode 100644 index 0000000..0e23107 --- /dev/null +++ b/tests/modern_lineup_ui_tests.cpp @@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/demo_lineup.hpp" +#include +#include +#include +#include +using namespace bmh::modern_ui; +namespace { +void require(bool v,const char *text) {if(!v)throw std::runtime_error(text);} +std::string id(int i) {return "player:lineup-"+std::to_string(i);} +struct Fixture { + fs::path root; std::shared_ptr world; + explicit Fixture(int count) { + root=fs::temp_directory_path()/("openbmh-lineup-ui-"+std::to_string(std::chrono::steady_clock::now().time_since_epoch().count())); + fs::create_directories(root/"world"); + const auto write=[&](const std::string &file,const Json &j){bmh::editor::write_atomic(root/file,j.dump());}; + write("manifest.json",{{"format","openbmh-world"},{"kind","world"},{"format_version","1.1"},{"id","world:lineup-synthetic"},{"start_date","2026-07-01"},{"requires",{"editor:world-v1"}},{"x-editor",{{"profile","editor-world-v1"}}}}); + write("world/nations.json",{{"items",{{{"id","nation:de"},{"name","Synthetic nation"}}}}}); + write("world/competitions.json",{{"items",{{{"id","competition:synthetic"},{"name","Synthetic league"},{"nation","nation:de"},{"type","league"}}}}}); + write("world/clubs.json",{{"items",{{{"id","club:home"},{"name","Synthetic home"},{"nation","nation:de"},{"competition","competition:synthetic"}},{{"id","club:away"},{"name","Synthetic away"},{"nation","nation:de"},{"competition","competition:synthetic"}}}}}); + Json players=Json::array(); + for(int i=0;i1) { + const auto second=state.at("lineup").at("order")[1]; + const auto points=state.at("lineup").at("points"); + action(state,*f.world,{{"kind","move"},{"player",first},{"point",points[1]}}); + require(state.at("lineup").at("order")[1]==first && state.at("lineup").at("order")[0]==second && state.at("lineup").at("points")==points,"Occupied point did not swap stable players"); + } + if(count>11) { + const auto bench=state.at("lineup").at("order")[11]; + action(state,*f.world,{{"kind","swap"},{"a",first},{"b",bench}}); + require(state.at("lineup").at("takers")[1]=="","Benched taker remained selectable"); + require(state.at("lineup").at("orders").at(first.get())[3]==40,"Player instructions followed slot instead of player ID"); + } + } + const auto stable=state; + const std::vector bad={nullptr,Json::array(),{{"kind","unknown"}},{{"kind","weight"},{"index",true}},{{"kind","weight"},{"index",3}},{{"kind","weight"},{"index",1.0}},{{"kind","formation"},{"value",4}},{{"kind","custom-save"},{"index",4}},{{"kind","swap"},{"a","player:foreign"},{"b",id(0)}},{{"kind","move"},{"player",id(0)},{"point",{19,0}}},{{"kind","taker"},{"index",0},{"player","player:foreign"}},{{"kind","order"},{"player",id(0)},{"index",0},{"value",41}},{{"kind","weight"},{"index",1},{"cash",0}}}; + for(const auto &a:bad)require(!edit_demo_lineup(state,a,*f.world,"club:home").empty() && state==stable,"Bad action partially changed state"); + std::vector broken; + auto b=stable;b["lineup"]["club"]="club:away";broken.push_back(b); + b=stable;b["lineup"]["points"][1]=b["lineup"]["points"][0];broken.push_back(b); + b=stable;b["lineup"]["custom"][0]=Json::array();broken.push_back(b); + b=stable;b["lineup"]["weights"][0]=true;broken.push_back(b); + b=stable;b["lineup"]["orders"]["player:foreign"]={20,20,20,20};broken.push_back(b); + b=stable;b["lineup"]["takers"][0]="player:foreign";broken.push_back(b); + b=stable;b["lineup"]["formation"]=0;b["lineup"]["points"]=demo_lineup_formations()[1];broken.push_back(b); + b=stable;b["lineup"]["view"]="pitch";broken.push_back(b); + if(count){b=stable;b["lineup"]["order"][0]="player:foreign";broken.push_back(b);} + if(count>1){b=stable;b["lineup"]["order"][1]=b["lineup"]["order"][0];broken.push_back(b);} + for(auto invalid:broken){const auto original=invalid;require(!valid_demo_lineup(invalid,*f.world,"club:home") && !migrate_demo_lineup(invalid,*f.world,"club:home") && invalid==original && !edit_demo_lineup(invalid,{{"kind","weight"},{"index",0}},*f.world,"club:home").empty() && invalid==original,"Broken checkpoint repaired or changed atomically");} + require(!valid_demo_lineup(stable,*f.world,"club:away"),"Foreign manager reused home lineup"); + remainder=state;remainder.erase("lineup");require(remainder==before,"Lineup edits changed wallet or unrelated settings"); +} +} // namespace +int main()try{for(int count:{0,2,10,16,20,24})test(count);std::cout<<"Modern lineup preview checks passed\n";return 0;}catch(const std::exception &e){std::cerr< +#include +#include +#include + +using namespace bmh::modern_ui; +namespace { +void require(bool value,const char *message){if(!value)throw std::runtime_error(message);} +std::string pid(int team,int i){return "player:transfer-test-"+std::to_string(team)+"-"+std::to_string(i);} +struct Fixture { + fs::path root;std::shared_ptr world; + Fixture(int own_count=24,int precision=0,int foreign_count=30){ + root=fs::temp_directory_path()/("openbmh-transfer-ui-"+std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));fs::create_directories(root/"world"); + const auto write=[&](const std::string&file,const Json&v){std::ofstream f(root/file);f<{"gk","def","mid","fwd"}[size_t(i)%4];std::string name="Synthetic player "+std::to_string(team)+" "+std::to_string(i);if(team==1&&i==0)name="Änne Müller";if(team==2&&i==1)name="François Öztürk"; + Json p={{"id",pid(team,i)},{"team",club},{"name",name},{"positions",{role}},{"squad_order",i},{"nationalities",{"nation:de"}},{"born","1995-01-01"},{"attributes",{{"strength",70+i%15},{"condition",68+i%15},{"technique",72+i%15},{"form",70+i%15},{"corner",0},{"free_kick",0},{"tackling",0},{"passing",0},{"shooting",0},{"speed",0},{"teamplay",0}}}}; + if(team==0&&i==1){p.erase("born");p["birth_date"]="1995-01-01";p["attributes"].erase("form");}players.push_back(p); + } + } + write("world/clubs.json",{{"items",clubs}});write("world/players.json",{{"items",players}});world=Catalog::open(root); + } + ~Fixture(){std::error_code e;fs::remove_all(root,e);} +}; +Json strip(Json state){state.erase("transfer");return state;} +void edit(Json&s,const Json&a,const Catalog&w){auto e=edit_demo_transfer(s,a,w,"club:transfer-test-0");if(!e.empty())throw std::runtime_error("Unexpected transfer rejection "+e+" "+a.dump());require(valid_demo_transfer(s,w,"club:transfer-test-0"),"Accepted action invalidated transfer state");} +void reject(Json&s,const Json&a,const Catalog&w){auto before=s;require(!edit_demo_transfer(s,a,w,"club:transfer-test-0").empty()&&s==before,"Rejected transfer action changed state or accepted");} +Json quote(const Json&s,const Catalog&w,const char*kind,const std::string&id,bool poach=false){auto q=demo_transfer_quote(s,{{"kind",kind},{"player",id},{"poached",poach}},w,"club:transfer-test-0");if(!q.value("ok",false))throw std::runtime_error("Unexpected quote rejection "+q.dump());return q;} +Json order(const Json&q,int factor){Json o={{"kind",q.at("kind")},{"player",q.at("row").at("id")},{"source_club",q.at("source_club")},{"fee",q.at("fee").get()/factor},{"salary",q.at("salary").get()/factor},{"months",q.at("months")},{"bonuses",q.at("bonuses")},{"poached",q.at("poached")}};for(auto&b:o["bonuses"])b=b.get()/factor;return o;} +void check_currency(int precision){ + Fixture f(24,precision);const auto&w=*f.world;const int factor=precision?100:1;Json state={{"cash",1000000LL*factor},{"date","2026-07-01"},{"contracts",{{"players",{{pid(0,0),{{"salary",12000*factor}}}}}}},{"lineup",{{"order",Json::array()}}},{"unrelated",{1,2,3}}};const auto before=state,world_players=w.rows("players"); + require(migrate_demo_transfer(state,w,"club:transfer-test-0")&&valid_demo_transfer(state,w,"club:transfer-test-0")&&strip(state)==before,"Transfer migration failed or altered outside fields"); + auto initial=state;auto view=demo_transfer_view(state,w,"club:transfer-test-0");require(view.at("own").size()==24&&view.at("market").size()==12,"Transfer truncated own roster or invented market count");require(view.at("own")[1].at("age").is_null()&&view.at("own")[1].at("form").is_null()&&view.at("own")[0].at("age")==31&&view.at("own")[0].at("skills")[0]==0,"Unavailable fields invented or born/zero data lost"); + const auto buy=quote(state,w,"buy",pid(1,0));require(buy.at("fee")==450000*factor&&buy.at("salary")==25000*factor&&buy.at("months")==24,"Pinned Gold demand units or terms changed");const auto sell=quote(state,w,"sell",pid(0,0));require(sell.at("demand_salary")==12000*factor,"Own current contract salary missing");require(quote(state,w,"sell",pid(0,1)).at("demand_salary").is_null(),"Missing salary invented"); + auto copied=buy;copied["fee"]=1;require(quote(state,w,"buy",pid(1,0))==buy&&state==initial,"Quote aliases or mutates state"); + auto o=order(buy,factor);o["fee"]=99999999;o["bonuses"][6]=100;edit(state,{{"kind","submit"},{"order",o}},w);require(state["transfer"]["orders"][0]["fee"]==99999999LL*factor&&state["transfer"]["orders"][0]["bonuses"][6]==100*factor&&strip(state)==before,"Staging charged cash or converted fee/bonus units incorrectly"); + auto loan=order(quote(state,w,"loan",pid(1,0)),factor);edit(state,{{"kind","submit"},{"order",loan}},w);require(state["transfer"]["orders"].size()==2,"Buy/loan were merged into one order");loan["months"]=36;reject(state,{{"kind","submit"},{"order",loan}},w); + for(int i=0;i<3;++i)edit(state,{{"kind","submit"},{"order",order(quote(state,w,i==1?"lend":"sell",pid(0,i)),factor)}},w); + auto fourth=order(sell,factor);fourth["player"]=pid(0,3);reject(state,{{"kind","submit"},{"order",fourth}},w);require(demo_transfer_quote(state,{{"kind","sell"},{"player",pid(0,3)},{"poached",false}},w,"club:transfer-test-0").at("error")=="transfer_list_full","Quote ignored three-player listing cap"); + edit(state,{{"kind","submit"},{"order",order(quote(state,w,"lend",pid(0,0)),factor)}},w);require(state["transfer"]["listed"].size()==3&&state["transfer"]["orders"].size()==5,"Sell/lend replacement duplicated own listing");edit(state,{{"kind","unlist"},{"player",pid(0,0)}},w);require(state["transfer"]["listed"].size()==2&&state["transfer"]["orders"].size()==4,"Unlisting did not remove prospective own order"); + auto criteria=state["transfer"]["criteria"];criteria["price_max"]=criteria["price_max"].get()/factor;const auto orders_before=state["transfer"]["orders"],listed_before=state["transfer"]["listed"]; + for(const auto&text:{"muller","ÖZTÜRK","francois"}){edit(state,{{"kind","search"},{"query",text}},w);require(!demo_transfer_view(state,w,"club:transfer-test-0").at("market").empty(),"Accent/Unicode search failed");} + std::string forty;for(int i=0;i<40;++i)forty+="ü";edit(state,{{"kind","search"},{"query",forty}},w);reject(state,{{"kind","search"},{"query",forty+"ü"}},w); + criteria["price_max"]=0;edit(state,{{"kind","criteria"},{"value",criteria},{"positions",15}},w);require(demo_transfer_view(state,w,"club:transfer-test-0").at("market").empty()&&state["transfer"]["orders"]==orders_before&&state["transfer"]["listed"]==listed_before,"Filter changed orders/listings or zero price did not filter"); + Json active=Json::array();for(int i=0;i<11;++i)active.push_back(pid(0,i));auto averages=demo_transfer_strengths(state,w,"club:transfer-test-0",active);require(averages.value("ok",false)&&averages.at("active").size()==4&&averages.at("team_average").is_number_integer(),"Lineup-fed strength projection failed"); + auto bulk=demo_transfer_roster(state,w,"club:transfer-test-0","club:transfer-test-1");require(bulk.at("rows").size()==30,"Poach roster truncated to Gold twelve fixtures"); + state=initial;for(int i=0;i<50;++i){const int team=i<30?1:2,index=i<30?i:i-30;edit(state,{{"kind","submit"},{"order",order(quote(state,w,"buy",pid(team,index),true),factor)}},w);}require(state["transfer"]["orders"].size()==50,"Order list did not retain fifty distinct targets");auto extra=order(quote(state,w,"buy",pid(2,29),true),factor);reject(state,{{"kind","submit"},{"order",extra}},w);edit(state,{{"kind","submit"},{"order",order(quote(state,w,"buy",pid(1,0),true),factor)}},w);require(state["transfer"]["orders"].size()==50,"Replacement blocked or duplicated at cap"); + for(const auto&a:std::vector{nullptr,Json::array(),Json::object(),{{"kind",1}},{{"kind","unknown"}},{{"kind","positions"},{"value",0}},{{"kind","positions"},{"value",true}},{{"kind","positions"},{"value",uint64_t(-1)}},{{"kind","search"},{"query",1}},{{"kind","search"},{"query",std::string(1,char(255))}},{{"kind","remove"},{"index",50}},{{"kind","remove"},{"index",-1}},{{"kind","submit"}},{{"kind","search"},{"query",""},{"cash",0}}})reject(state,a,w); + auto badorder=extra;badorder["fee"]=uint64_t(-1);reject(state,{{"kind","submit"},{"order",badorder}},w);badorder=extra;badorder["source_club"]="club:transfer-test-0";reject(state,{{"kind","submit"},{"order",badorder}},w);badorder=extra;badorder["salary"]=200001;reject(state,{{"kind","submit"},{"order",badorder}},w);badorder=extra;badorder["bonuses"][0]=101;reject(state,{{"kind","submit"},{"order",badorder}},w); + std::vector corrupt;auto bad=state;bad["transfer"]["orders"].push_back(bad["transfer"]["orders"][0]);corrupt.push_back(bad);bad=state;bad["transfer"]["listed"].push_back(pid(0,0));corrupt.push_back(bad);bad=state;bad["transfer"]["criteria"]["traits"]=0;corrupt.push_back(bad);bad=state;bad["transfer"]["club"]="club:transfer-test-1";corrupt.push_back(bad);bad=state;bad["transfer"]["extra"]=true;corrupt.push_back(bad);bad=state;bad["transfer"].erase("orders");corrupt.push_back(bad); + for(auto&v:corrupt){const auto keep=v;require(!valid_demo_transfer(v,w,"club:transfer-test-0")&&!migrate_demo_transfer(v,w,"club:transfer-test-0")&&v==keep,"Migration repaired corrupt existing transfer data");reject(v,{{"kind","search"},{"query",""}},w);} + if(precision){state["transfer"]["orders"][0]["fee"]=123;auto keep=state;require(valid_demo_transfer(state,w,"club:transfer-test-0")&&migrate_demo_transfer(state,w,"club:transfer-test-0")&&state==keep,"Migration rounded existing cents");} + require(valid_demo_transfer(Json::parse(state.dump()),w,"club:transfer-test-0")&&strip(state)==before&&w.rows("players")==world_players,"Roundtrip failed or transfer altered world/other model"); +} +} // namespace +int main()try{check_currency(0);check_currency(2);for(int count:{0,2,20}){Fixture f(count,0,0);Json state={{"date","2026-07-01"},{"cash",0}};require(migrate_demo_transfer(state,*f.world,"club:transfer-test-0")&&demo_transfer_view(state,*f.world,"club:transfer-test-0").at("own").size()==size_t(count)&&demo_transfer_view(state,*f.world,"club:transfer-test-0").at("market").empty(),"Empty/small/full real roster unsafe");}std::cout<<"Modern UI transfer checks passed\n";return 0;}catch(const std::exception&e){std::cerr< #include #include @@ -65,6 +67,54 @@ void check_club_views(const fs::path &root, std::shared_ptr world require(migrated["environment"] == initial.state["environment"] && migrated["advertising"] == initial.state["advertising"] && migrated["toto"] == initial.state["toto"], "Legacy club fields not initialized"); require(migrated["cash"] == changed.state["cash"] && migrated["finance"] == changed.state["finance"], "Legacy migration reset wallet"); } +void check_squad_source(const fs::path &root, const std::shared_ptr &world) { + DemoSource source(world); + const auto initial = source.snapshot(); + const auto club = initial.state.at("managers")[0].at("club").get(); + require(valid_demo_lineup(initial.state, *world, club) && valid_demo_transfer(initial.state, *world, club), + "Lineup/transfer initialization failed for a small synthetic squad"); + require(source.apply({initial.revision, "transfer", {{"kind", "search"}, {"query", "Synthetic"}}}).ok, + "Transfer search failed through the source boundary"); + const auto searched = source.snapshot(); + require(!source.apply({initial.revision, "lineup", {{"kind", "weight"}, {"index", 0}}}).ok && + source.snapshot().revision == searched.revision && source.snapshot().state == searched.state, + "Stale lineup request changed state"); + const auto points = searched.state.at("lineup").at("points"); + const auto &order = searched.state.at("lineup").at("order"); + require(order.size() >= 2, "Synthetic roster needs two players"); + require(source.apply({searched.revision, "lineup", {{"kind", "move"}, {"player", order[1]}, {"point", {6,1}}}}).ok, + "Lineup move failed through the source boundary"); + auto changed = source.snapshot(); + require(tactics_diagram(changed.state.at("tactics"), "midnight", points) != + tactics_diagram(changed.state.at("tactics"), "midnight", changed.state.at("lineup").at("points")), + "Tactics did not reflect edited lineup positions"); + for (const auto *key : {"cash", "deposit", "debt", "training", "tactics", "calendar", "reports", "finance", "contracts"}) + require(changed.state.at(key) == initial.state.at(key), "Squad preview changed unrelated game state"); + auto bad = Json{{"kind", "move"}, {"player", order[1]}, {"point", {19,1}}}; + require(!source.apply({changed.revision, "lineup", bad}).ok && source.snapshot().state == changed.state, + "Rejected lineup position partially committed"); + const auto file = root / "squad-checkpoint.json"; + source.save(file, default_desktop()); + require(!source.dirty(), "Squad checkpoint did not clear dirty marker"); + source.apply({source.snapshot().revision, "transfer", {{"kind", "search"}, {"query", "Different"}}}); + source.load(file); + require(source.snapshot().state == changed.state && !source.dirty(), "Squad preview did not roundtrip"); + auto invalid = changed.state; invalid["desktop"] = default_desktop(); + invalid["lineup"]["order"][0] = invalid["lineup"]["order"][1]; + {std::ofstream out(file);out << invalid.dump();} + const auto before = source.snapshot(); bool rejected = false; + try {source.load(file);} catch (const std::exception &) {rejected = true;} + require(rejected && source.snapshot().state == before.state && source.snapshot().revision == before.revision, + "Malformed squad checkpoint partially replaced the source"); + auto legacy = changed.state; legacy["desktop"] = default_desktop(); + legacy.erase("lineup"); legacy.erase("transfer"); + {std::ofstream out(file);out << legacy.dump();} + source.load(file); + require(source.snapshot().state.at("lineup") == initial.state.at("lineup") && + source.snapshot().state.at("transfer") == initial.state.at("transfer") && + source.snapshot().state.at("cash") == changed.state.at("cash"), + "Legacy squad migration reset finances or failed to initialize defaults"); +} void check_finance_source(const fs::path &root, const std::shared_ptr &base) { const auto folder = root / "finance-source"; @@ -168,6 +218,8 @@ void check_finance_source(const fs::path &root, const auto changed = source.snapshot(); require(change.ok && changed.revision == accepted.revision + 1 && 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["contracts"]["players"].contains("player:finance-next") && !changed.state["contracts"]["players"].contains("player:a") && changed.state["cash"] == accepted.state["cash"] && @@ -469,6 +521,18 @@ int main(int argc, char **argv) try { require(diagram.width == 256 && diagram.height > 0, "Tactic SVG failed to decode"); } + const Json formation_points = {{0,4},{5,1},{5,3},{5,5},{5,7},{10,1},{10,3},{10,5},{10,7},{16,3},{16,5}}; + auto moved_points = formation_points; + moved_points[1] = {6,1}; + require(tactics_diagram(demo_tactics(), "midnight", formation_points) != + tactics_diagram(demo_tactics(), "midnight", moved_points), + "Tactic projection ignored the current lineup positions"); + auto invalid_points = formation_points; + invalid_points[1] = invalid_points[0]; + bool duplicate_rejected = false; + try { tactics_diagram(demo_tactics(), "midnight", invalid_points); } + catch (const bmh::editor::Error &) { duplicate_rejected = true; } + require(duplicate_rejected, "Tactic projection silently accepted duplicate lineup positions"); const auto leap_days = calendar_days("2027-07-01"); require(leap_days.size() == 366 && leap_days.front().weekday == 3 && leap_days.back().iso == "2028-06-30" && @@ -620,6 +684,7 @@ int main(int argc, char **argv) try { "Old checkpoint lost league preview or failed planning/indoor migration"); check_finance_source(root, world); check_club_views(root, world); + check_squad_source(root, world); GuiAssets absent(root / "missing-gui"); require(!absent.available(), "World resources were mistaken for GUI resources"); diff --git a/tools/modern_ui/prepare_gui_assets.py b/tools/modern_ui/prepare_gui_assets.py index eea1c2a..4ef713b 100644 --- a/tools/modern_ui/prepare_gui_assets.py +++ b/tools/modern_ui/prepare_gui_assets.py @@ -56,6 +56,10 @@ def main(): add('button.' + route, button['src'].removeprefix('../')) add('button.news', 'assets/vector/desktop-news.svg') add('button.almanac', 'assets/vector/desktop-almanac.svg') + for key, crop in [('normal', [0, 0, .5, .5]), + ('selected', [.5, .5, .5, .5]), + ('ghost', [.5, 0, .5, .5])]: + add('lineup.player.' + key, 'assets/studies/submenus/lineup-players-v2.png', crop) for i in range(4): add('advertising.panel.' + str(i), 'assets/studies/submenus/advertising-panels-v1.png', [(i % 2) / 2, (i // 2) / 2, .5, .5])