From 0edf208405cd68db9456fa2b720a6258f6c5c8d8 Mon Sep 17 00:00:00 2001 From: Codex Date: Thu, 29 Oct 2026 06:09:10 +0100 Subject: [PATCH] Bind stadium construction and historical data to scoped engine offers (by Codex) --- .github/workflows/modern-ui.yml | 2 +- assets/modern/stadium.rcss | 3 + docs/new_engine/ui-schnittstelle.md | 16 + docs/new_ui/NATIVE_STATUS.md | 2 +- docs/new_ui/desktop/stadium/README.md | 64 +++ docs/new_ui/integration/ENGINE_ENTRY.md | 10 + src/modern/app/modern_session.cpp | 43 +- src/modern/game/desk_actions.cpp | 2 + src/modern/game/desk_actions.hpp | 1 + src/modern/ui/CMakeLists.txt | 4 +- src/modern/ui/engine_bridge.hpp | 5 + src/modern/ui/engine_controls.inc | 7 +- src/modern/ui/engine_files.inc | 2 +- src/modern/ui/engine_screens.inc | 6 +- src/modern/ui/engine_stadium.cpp | 208 +++++++++ src/modern/ui/engine_stadium.inc | 491 ++++++++++++++++++++++ src/modern/ui/engine_state.inc | 14 + src/modern/ui/stadium_controls.inc | 3 + src/modern/ui/stadium_screens.inc | 32 +- src/modern/ui/view.cpp | 1 + tests/modern_engine_bridge_probe.cpp | 19 +- tests/modern_stadium_projection_tests.cpp | 142 +++++++ 22 files changed, 1037 insertions(+), 40 deletions(-) create mode 100644 src/modern/ui/engine_stadium.cpp create mode 100644 src/modern/ui/engine_stadium.inc create mode 100644 tests/modern_stadium_projection_tests.cpp diff --git a/.github/workflows/modern-ui.yml b/.github/workflows/modern-ui.yml index 8ea3bde..7783a6d 100644 --- a/.github/workflows/modern-ui.yml +++ b/.github/workflows/modern-ui.yml @@ -52,7 +52,7 @@ jobs: - name: Configure opt-in UI without external assets run: cmake -S . -B build-ui -G Ninja -DCMAKE_BUILD_TYPE=Release -DOPENBMH_BUILD_MODERN_UI=ON -DOPENBMH_BUILD_EDITOR=OFF -DBMH_DATA= - name: Compile native frontend and synthetic checks - run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_career_files_tests modern_statistics_projection_tests modern_toto_projection_tests modern_toto_quote_tests modern_stadium_ui_tests modern_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests modern_desktop_ui_tests modern_files_ui_tests modern_mods_ui_tests modern_entry_ui_tests modern_opening_ui_tests modern_select_menu_tests modern_career_ui_tests modern_live_ui_tests modern_national_ui_tests modern_news_catalog_tests modern_post_match_ui_tests modern_engine_dto_tests modern_report_read_tests modern_other_read_tests modern_rankings_read_tests modern_winners_read_tests modern_manager_presentation_tests modern_coach_identity_tests --parallel 2 + run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_career_files_tests modern_statistics_projection_tests modern_toto_projection_tests modern_toto_quote_tests modern_stadium_ui_tests modern_stadium_projection_tests modern_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests modern_desktop_ui_tests modern_files_ui_tests modern_mods_ui_tests modern_entry_ui_tests modern_opening_ui_tests modern_select_menu_tests modern_career_ui_tests modern_live_ui_tests modern_national_ui_tests modern_news_catalog_tests modern_post_match_ui_tests modern_engine_dto_tests modern_report_read_tests modern_other_read_tests modern_rankings_read_tests modern_winners_read_tests modern_manager_presentation_tests modern_coach_identity_tests --parallel 2 - name: Check controls, fonts, density and draft cancellation run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|statistics_ui_|news_ui_|settings_ui_|desktop_ui_|files_ui_|mods_ui_|entry_ui_|opening_ui_|select_menu_|career_ui_|live_ui_|national_ui_|news_catalog_|post_match_ui_|engine_dto_|report_read_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml - name: Upload test report diff --git a/assets/modern/stadium.rcss b/assets/modern/stadium.rcss index b693a17..c9f1992 100644 --- a/assets/modern/stadium.rcss +++ b/assets/modern/stadium.rcss @@ -145,3 +145,6 @@ body.silver .stadium-block[disabled],body.matchday .stadium-block[disabled] {opa .stadium-nav-button.half {width:1295dp;} .stadium-screen.periphery .stadium-nav {top:1704.625dp;} + +body.midnight .stadium-summary strong.money-amount,body.silver .stadium-summary strong.money-amount,body.matchday .stadium-summary strong.money-amount {color:var(--money);} +body .stadium-summary strong.money-amount.is-negative {color:var(--danger);} diff --git a/docs/new_engine/ui-schnittstelle.md b/docs/new_engine/ui-schnittstelle.md index a947b75..9d5594e 100644 --- a/docs/new_engine/ui-schnittstelle.md +++ b/docs/new_engine/ui-schnittstelle.md @@ -111,3 +111,19 @@ hier ausschließlich über `ModernSession::ui_read`. `available`-/`reason`-Verhalten bleiben erhalten. Vorhandene aktuelle Transfer- und Analytics-Projektionen ergänzen die belegten Almanachauswertungen. Der Read ist rein; weder OBS-/OBW-Format noch Spielregeln werden geändert. + +### Stadionangebote bearbeiten + +`quote.request` kann ein bestehendes Block-/Ausstattungsangebot mit dessen +`quoteId` erneut adressieren. Kennung, Art und Block/Ausstattung müssen zum +aktuellen Besitzer passen. Der vorhandene Firmenpreis bleibt erhalten; +reine Ziel-/Stufenwahl zieht keine neue Zufallszahl. Ohne `quoteId` bleibt +es eine neue Anfrage, die vorhandene offene Angebote weiterhin abweist. +`stadium.commit` bestätigt bzw. verwirft das genaue Angebot und schließt es. +Der UI-Standardbau verwendet den bereits vorhandenen Weg ohne Beschleunigung. + +Der Stadion-Read ergänzt tatsächliche geplante Kapazität/Ausstattung und +vorhandene Messreihen/Tabellen. Bei Ausbau sind aktuelle und geplante Werte +getrennt. Weitere Parkplatzstufen aus der Grafikstudie werden nicht erfunden: +die aktuelle Engine kennt neben der mehrstufigen Anbindung binäre Außenobjekte. +Kein neues Welt-/Spielstandformat und keine neue Bau- oder Finanzregel. diff --git a/docs/new_ui/NATIVE_STATUS.md b/docs/new_ui/NATIVE_STATUS.md index cf8b3ed..b51b7f5 100644 --- a/docs/new_ui/NATIVE_STATUS.md +++ b/docs/new_ui/NATIVE_STATUS.md @@ -6,7 +6,7 @@ Die normale Classic-Konfiguration bleibt unverändert; die neue Oberfläche wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut. Der [Engine-Einstieg](integration/ENGINE_ENTRY.md) erzeugt über den -vorhandenen Wizard eine echte Karriere oder lädt eine Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele, den Almanach sowie Tabellen, Stärken, Ligaspiele, übrige Spiele, Spielerstatistiken, Fairplay, die große Statistikansicht und Toto an die +vorhandenen Wizard eine echte Karriere oder lädt eine Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele, den Almanach sowie Tabellen, Stärken, Ligaspiele, übrige Spiele, Spielerstatistiken, Fairplay, die große Statistikansicht, Toto und die Stadionansichten samt Bauangeboten an die Session. Kader und Profile zeigen die tatsächlichen Sessionwerte; Spielertausch verwendet die bestätigte Engineaktion. Preisbestätigung, Buchung und Speichern als neue OBS-Datei sind echte Engineoperationen. Die vorhandenen Speichern-/Laden-Fenster verwalten echte OBS-Dateien diff --git a/docs/new_ui/desktop/stadium/README.md b/docs/new_ui/desktop/stadium/README.md index 12ef117..c3433be 100644 --- a/docs/new_ui/desktop/stadium/README.md +++ b/docs/new_ui/desktop/stadium/README.md @@ -215,3 +215,67 @@ gehört zur nativen UI-Demo; sie ändert weder Classic noch eine Engineberechnun Baufortschritt, Fertigstellung und Abbruch eines gebuchten Auftrags bleiben offene Engineentscheidungen. Die Prüfung belegt keine Windows-/macOS-Laufzeitabnahme und keine neue Classic-Freigabe. + +## Reale Modern-Karriere (29.10.2026) + +Der Engine-Einstieg verwendet dieselben Ansichten und GUI-Bilder mit tatsächlichen +Stadiondaten. Acht Blöcke A–H, acht Ausstattungskategorien und vierzehn Außenobjekte +kommen aus dem Session-Read. Aktuelle und geplante Plätze, Sitzplätze, Dach und +Ausstattungsstufen bleiben getrennt. Ein gesperrter Block trägt aktuell keine +verfügbaren Plätze bei; die Zukunftsansicht verwendet dessen beauftragtes Ziel. +Das Superstadion setzt die tatsächlichen Maxima aller Blöcke mit Sitzplätzen und +Dach voraus. Ausreichende Gesamtkapazität allein schaltet es nicht frei. + +Bauangebote werden durch `quote.request` erzeugt. Beim Bearbeiten des gleichen +Blocks bzw. der gleichen Ausstattung nennt die Anfrage die vorhandene `quoteId`. +Die Engine behält Firma, Preisfaktor und Besitzer bei; reine Ziel-/Stufenänderungen +ziehen keine weiteren Zufallszahlen. Fremde oder veraltete Angebote werden +abgewiesen. Die UI verwendet keine Preis- oder Bauzeitvorlagen aus dem POC. +Grundpreise und Firmenkondition sind erkennbar; der tatsächliche Gesamtbetrag wird +vor `stadium.commit` bestätigt. Die Standardbauzeit wird ohne die optionale +Beschleunigung beauftragt. Deren zusätzlicher Dialog ist hier noch nicht angebunden. + +Eine neue Angebotsöffnung verwendet die originalen Zufallsziehungen. Verwerfen +bucht kein Geld und dreht diese Ziehungen nicht zurück. Innen-/Außenansicht, +Zukunftsschalter und Stadionstatistik sind reine Ansichten. Beim Beenden mit +offenem Angebot verwirft die UI zuerst genau dieses Angebot und bietet danach +Speichern/Verwerfen an; es bleibt kein Modalbesitzer beim Speichern hängen. + +Die Außenansicht verwendet die kalibrierte Grafikstudie. Hover nennt das Objekt +bzw. seine restliche Bauzeit aus dem tatsächlichen Enginezählwert. Die Anbindung +wird jeweils um eine Stufe erweitert. Die derzeitige Engine kennt bei den übrigen +Außenobjekten nur einmaligen Bau; zusätzliche Parkplatzstufen der Grafikstudie +werden nicht als echte Ausbauten angeboten. Die vorhandene GUI-Komposition erhält +nur tatsächliche Kapazitäten, Ausbaustufen und Bauaufträge, keine POC-Finanzdaten. + +Stadiondaten zeigen die gespeicherten Messreihen mit den tatsächlichen Original- +Beschriftungen und Skalen sowie die vorhandenen Zuschauer-/Einnahmenrekorde. +Zahlen-Füllzeichen des ursprünglichen Bitmapformatters werden entfernt; Gegner- +texte bleiben die gespeicherten historischen Texte. Einzelne Messpunkte bleiben +auch vor einer zweiten Beobachtung sichtbar. Der Eintritt verwendet die aktuelle +Engine-Spanne und wird vor der tatsächlichen Änderung bestätigt. Erforderlicher +Zuschauerschnitt und Tabellenwerte werden von der Engine neu gelesen. + +Alle Engine-Beträge werden ausdrücklich mit EUR und zwei Nachkommastellen +angezeigt. Das ganzzahlige Importwährungsformat des Weltpakets ist keine Einheit +für diese Werte. Die Kassenfarbe entspricht der Infoleiste, auch im Matchday-Theme. +Anstoß und Spielregeln werden durch dieses Paket nicht verändert. + +### Prüfung des Engine-Meilensteins + +61 synthetische Regressionstests, 132 Haupt-GUI-Prüfungen, 21 zusätzliche +Bau-/Eingabe-/Beenden-Prüfungen, zehn Abschluss-/Einzelmesspunktprüfungen, +1.252 Positionsprüfungen und zwei native Demo-Prüfungen bestanden. Drei Themes +in 1080p, Silver zusätzlich in 720p. Drei abschließende Layout-/Stadiontests +sind ebenfalls grün. Der direkte Session-Gegenfall belegt dieselben Zufallsstände +und dieselbe Angebotskennung vor/nach Block- und Ausstattungsänderungen; falsche +Angebotskennungen bleiben wirkungslos. Echte Bauaufträge, Zahleneditor, +Sitz-/Dachoptionen, Eintrittsbestätigung und OBS-Neustart sind geprüft. + +Reguläres Betriebssystem-Schließen während eines offenen Angebots gibt den +Besitzer frei und ermöglicht danach Speichern und Beenden. Ein Außenobjekt +wurde über tatsächliche `session.advance`-Aufrufe fertiggestellt und anschließend +in der aktuellen und zukünftigen Ansicht gleich dargestellt. Die Statistik +nach dem ersten echten Heimspiel prüft auch einzelne Messpunkte. Linux x64/SDL2 +wurde ausgeführt; native Windows-/macOS-Ausführung ist offen. Private Bilder, +Rohantworten, Prüfsummen und passende OBS: `bmh_4k_ui/docs/qa/engine-stadium-2026-10-29/`. diff --git a/docs/new_ui/integration/ENGINE_ENTRY.md b/docs/new_ui/integration/ENGINE_ENTRY.md index d662610..4070bdf 100644 --- a/docs/new_ui/integration/ENGINE_ENTRY.md +++ b/docs/new_ui/integration/ENGINE_ENTRY.md @@ -372,3 +372,13 @@ Die bestehende Sechs-Spalten-Oberfläche ist an den tatsächlichen [Toto-Read und die Abgabe](../desktop/toto/README.md) angebunden. Entwürfe, Vorschläge und Kostenprüfungen sind rein; erst die bestätigte Abgabe oder Rücknahme ändert die Karriere. Die Abrechnung bleibt am Spieltagsende. + + +## Stadionangebote und Bauzustand + +[Stadion](../desktop/stadium/README.md) verwendet tatsächliche Blöcke, +Ausstattungen, Außenobjekte und Statistikdaten. Exakte Angebote können innerhalb +ihres Besitzers bearbeitet, bestätigt oder verworfen werden. Der Firmenpreis +bleibt bei Zieländerungen erhalten; Kosten und Bauzeiten kommen aus der Session. +Die GUI hält keine eigene Bau- oder Finanzsimulation. Beim Beenden werden +Angebotsbesitzer vor dem Speichern freigegeben. diff --git a/src/modern/app/modern_session.cpp b/src/modern/app/modern_session.cpp index 8b3e015..9eb74bc 100644 --- a/src/modern/app/modern_session.cpp +++ b/src/modern/app/modern_session.cpp @@ -9141,33 +9141,38 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co const auto& f = st.investments[i]; facilities.push_back(O{{"id", std::string("facility:") + kFacilities[i]}, {"name", text(734 + i)}, {"level", int(f.current_level)}, {"maxLevel", i == 2 || i == 3 ? 2 : 4}, - {"constructionWeeks", int(f.construction_weeks)}, {"upgradeAvailable", f.available}}); + {"constructionWeeks", int(f.construction_weeks)}, {"plannedLevel", int(f.construction_weeks?((f.current_status>>4)&7):f.current_level)}, {"upgradeAvailable", f.available}}); } for (size_t b = 0; b < st.blocks.size(); ++b) { const auto& k = st.blocks[b]; blocks.push_back(O{{"id", "block:" + std::string(1, char('a' + b))}, {"name", text(742 + b)}, {"places", int64_t(k.capacity_level) * 1000}, {"maxPlaces", int64_t(exe_.u8(::bmh::layout::CareerSession_Invalid_RuntimeField + uint32_t(b))) * 1000}, - {"seats", (k.flags & 1) != 0}, {"roof", (k.flags & 2) != 0}, + {"seats", (k.flags & 1) != 0}, {"roof", (k.flags & 2) != 0}, {"seatsAfterConstruction", (k.flags & (k.construction_weeks?0x10:1)) != 0}, {"roofAfterConstruction", (k.flags & (k.construction_weeks?0x20:2)) != 0}, {"constructionWeeks", int(k.construction_weeks)}, {"placesAfterConstruction", int64_t(k.capacity) * 1000}}); } + A history,table; + for(size_t curve=0;curve<6;++curve){A values,absolute,relative;for(const auto value:data.series[curve])values.push_back(int64_t(value));auto graph=data;bool absolute_ok=true,relative_ok=true;try{graph.flags=0x7f;for(const auto& [x,y]:ui::stadium_data_points(graph,exe_,int(curve)))absolute.push_back(A{cli::Json(x),cli::Json(y)});}catch(const std::exception&){absolute_ok=false;}try{graph.flags=0xbf;for(const auto& [x,y]:ui::stadium_data_points(graph,exe_,int(curve)))relative.push_back(A{cli::Json(x),cli::Json(y)});}catch(const std::exception&){relative_ok=false;}history.push_back(O{{"name",ui::original_to_utf8(exe_.cstring(exe_.u32(::bmh::layout::Analytics_FormatError_ExecutableField+(6+uint32_t(curve))*4)))},{"values",std::move(values)},{"absolute",std::move(absolute)},{"relative",std::move(relative)},{"absoluteAvailable",absolute_ok},{"relativeAvailable",relative_ok}});} + for(size_t row=0;rowfirst)}, - {"price", modern::ui_money(stadium_.periphery_quote->second)}}; - else if (stadium_.investment && stadium_.option) - quote = O{{"id", id}, {"kind", "facility"}, {"facilityId", std::string("facility:") + kFacilities[size_t(*stadium_.investment)]}, - {"toLevel", int(stadium_.option->target_level)}, {"price", modern::ui_money(stadium_.option->base_price)}, - {"weeks", int(stadium_.option->base_weeks)}, {"tipPercent", O{{"min", 6}, {"max", 14}}}}; + {"price", modern::ui_money(stadium_.periphery_quote->second)},{"weeks",modern::periphery_build_weeks(stadium_.periphery_quote->first)}}; + else if (stadium_.investment && stadium_.option) { + StadiumInvestmentConstants constants;for(unsigned i=0;i<8;++i){constants.price[i]=exe_.u32(::bmh::layout::CareerSession_DispatchStadium_RuntimeField+i*4);constants.weeks[i]=exe_.u8(::bmh::layout::CareerSession_DispatchStadium_RuntimeField2+(14+i)*5);} + A options;for(const auto& option:modern::stadium_investment_options_source(g_,manager,*stadium_.investment,stadium_.price_percent,constants))options.push_back(O{{"toLevel",int(option.target_level)},{"price",modern::ui_money(option.base_price)},{"weeks",int(option.base_weeks)}}); + quote=O{{"id",id},{"kind","facility"},{"facilityId",std::string("facility:")+kFacilities[size_t(*stadium_.investment)]},{"toLevel",int(stadium_.option->target_level)},{"price",modern::ui_money(stadium_.option->base_price)},{"pricePercent",stadium_.price_percent},{"weeks",int(stadium_.option->base_weeks)},{"options",std::move(options)},{"tipPercent",O{{"min",6},{"max",14}}}}; + } else if (stadium_.block_expansion) { const auto& q = stadium_.block_expansion->quote; quote = O{{"id", id}, {"kind", "block"}, {"blockId", "block:" + std::string(1, char('a' + int(q.slot)))}, {"places", int64_t(q.total_target_places)}, {"maxPlaces", int64_t(q.max_places)}, {"newPlaces", int64_t(q.new_places)}, {"seats", (stadium_.block_expansion->desired_features & 1) != 0}, {"roof", (stadium_.block_expansion->desired_features & 2) != 0}, - {"price", modern::ui_money(q.base_price)}, + {"price", modern::ui_money(q.base_price)}, {"pricePercent",stadium_.price_percent}, {"breakdown", A{O{{"code", "places"}, {"amount", modern::ui_money(q.new_places_cost)}}, O{{"code", "seats"}, {"amount", modern::ui_money(q.seats_cost)}}, O{{"code", "roof"}, {"amount", modern::ui_money(q.roof_cost)}}}}, @@ -9175,9 +9180,9 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co } } return modern::ui_snapshot(g_, context, request_id, - O{{"kind", "stadium"}, {"teamId", modern::ui_team_id(g_, team)}, {"quote", std::move(quote)}, {"periphery", std::move(periphery)}, + O{{"kind", "stadium"}, {"name",stadium_name}, {"teamId", modern::ui_team_id(g_, team)}, {"quote", std::move(quote)}, {"periphery", std::move(periphery)}, {"facilities", std::move(facilities)}, {"blocks", std::move(blocks)}, - {"ticketPrice", modern::ui_money(data.ticket_price)}, {"ticketPriceRange", O{{"min", modern::ui_money(8)}, {"max", modern::ui_money(25)}}}}); + {"history",std::move(history)},{"table",std::move(table)},{"requiredAttendanceText",ui::original_to_utf8(data.required_attendance_text)},{"ticketPrice", modern::ui_money(data.ticket_price)}, {"ticketPriceRange", O{{"min", modern::ui_money(8)}, {"max", modern::ui_money(25)}}}}); } if (kind == "advertising") { // the 14 boards, the shirt and the TV rights with their contract, the open offers per place, @@ -9941,18 +9946,20 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision static constexpr const char* kFacilities[8] = {"floodlights", "scoreboard", "pitch_heating", "vip_lounge", "pitch", "comfort", "condition", "safety"}; if (kind == "quote.request" && ui_text(*payload, "kind") == "block") { // {blockId: "block:a".."block:h", places: target total, seats?, roof?} - if (stadium_.opened && (stadium_.periphery_quote || stadium_.investment || stadium_.block_expansion)) - return refuse("quote_open", "Ein Stadionangebot ist noch offen (stadium.commit)."); + const auto quote_id=ui_text(*payload,"quoteId");const bool updating=!quote_id.empty(); + if(updating){if(!stadium_.opened||!stadium_.block_expansion||quote_id!="quote:stadium-"+std::to_string(stadium_.scope))return refuse("stale_quote","Dieses Stadionangebot gilt nicht mehr.");} + else if(stadium_.opened&&(stadium_.periphery_quote||stadium_.investment||stadium_.block_expansion))return refuse("quote_open","Ein Stadionangebot ist noch offen (stadium.commit)."); const std::string id = ui_text(*payload, "blockId"); const int slot = id.size() == 7 && id.starts_with("block:") && id[6] >= 'a' && id[6] <= 'h' ? id[6] - 'a' : -1; const cli::Json* places = ui_field(*payload, "places"); - if (slot < 0 || !places || !places->integer() || *places->integer() < 0) return refuse("invalid_payload", "blockId und places nötig."); + if (slot < 0 || !places || !places->integer() || (*places->integer() < 0 || *places->integer()>UINT32_MAX)) return refuse("invalid_payload", "blockId und places nötig."); const auto flag = [&](const char* key) { const cli::Json* v = ui_field(*payload, key); return v && std::holds_alternative(v->value) && std::get(v->value); }; + if(updating&&int(stadium_.block_expansion->quote.slot)!=slot)return refuse("stale_quote","Das Angebot gehört zu einem anderen Block."); if (!stadium_.opened) step(ui::StadiumRequestKind::open); - block_step(ui::StadiumRequestKind::expansion_select, slot, 0, 0); + if(!updating)block_step(ui::StadiumRequestKind::expansion_select, slot, 0, 0); if (ok) { auto& d = *stadium_.block_expansion; const uint32_t total = uint32_t(*places->integer()); @@ -9972,8 +9979,9 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision answer = modern::ui_command_result(request_id, previous, revision, {"stadium"}, "Angebot liegt vor."); std::get(answer.value)["outcome"] = "offer_pending"; } else if (kind == "quote.request") { - if (stadium_.opened && (stadium_.periphery_quote || stadium_.investment || stadium_.block_expansion)) - return refuse("quote_open", "Ein Stadionangebot ist noch offen (stadium.commit)."); + const auto quote_id=ui_text(*payload,"quoteId");const bool updating=!quote_id.empty(); + if(updating){if(ui_text(*payload,"kind")!="facility"||!stadium_.opened||!stadium_.investment||!stadium_.option||quote_id!="quote:stadium-"+std::to_string(stadium_.scope))return refuse("stale_quote","Dieses Stadionangebot gilt nicht mehr.");} + else if(stadium_.opened&&(stadium_.periphery_quote||stadium_.investment||stadium_.block_expansion))return refuse("quote_open","Ein Stadionangebot ist noch offen (stadium.commit)."); if (!stadium_.opened) step(ui::StadiumRequestKind::open); if (ui_text(*payload, "kind") == "periphery") { int object = -1; @@ -9989,7 +9997,8 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision if (facility < 0 || !inc || !inc->integer() || *inc->integer() < 1 || *inc->integer() > 3) { restore(); return refuse("invalid_payload", "facilityId und increment (1 bis 3) nötig."); } - step(ui::StadiumRequestKind::select_investment, facility); + if(updating&&int(*stadium_.investment)!=facility)return refuse("stale_quote","Das Angebot gehört zu einer anderen Ausstattung."); + if(!updating)step(ui::StadiumRequestKind::select_investment, facility); if (ok) { StadiumInvestmentConstants constants; for (unsigned i = 0; i < 8; ++i) { diff --git a/src/modern/game/desk_actions.cpp b/src/modern/game/desk_actions.cpp index 868ab51..cc48fee 100644 --- a/src/modern/game/desk_actions.cpp +++ b/src/modern/game/desk_actions.cpp @@ -1672,6 +1672,8 @@ bool pay_construction(ModernState& g, int manager, uint32_t price, bool sponsor, return paid; } +int periphery_build_weeks(int object) {if(object<0||object>=14)throw FormatError("stadium: invalid periphery object");return kPeripheryDays[object];} + bool build_periphery(ModernState& g, int manager, int object, uint32_t price, WatcomRandom& rand, const ConstructionNoticeHook& notice) { if (!modern::pay_construction(g, manager, price, true, rand, notice)) return false; diff --git a/src/modern/game/desk_actions.hpp b/src/modern/game/desk_actions.hpp index 2de17f8..685b6ed 100644 --- a/src/modern/game/desk_actions.hpp +++ b/src/modern/game/desk_actions.hpp @@ -227,6 +227,7 @@ bool pay_construction(ModernState& g, int manager, uint32_t price, bool sponsor, // "Ja" on the offer: pay_construction(price, sponsor) and the construction time of the // object (CareerSession_DispatchStadium_RuntimeField2[object * 5]) is entered at record +0x1e + object. +int periphery_build_weeks(int object); bool build_periphery(ModernState& g, int manager, int object, uint32_t price, WatcomRandom& rand, const ConstructionNoticeHook& notice = {}); diff --git a/src/modern/ui/CMakeLists.txt b/src/modern/ui/CMakeLists.txt index 5068c6c..fad7d74 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 crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp model.cpp demo_career.cpp demo_national_ui.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_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp) +add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp model.cpp demo_career.cpp demo_national_ui.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_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.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_mods STATIC mod_library.cpp) @@ -49,7 +49,7 @@ foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss report configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY) endforeach() -foreach(component career_reports rankings career_files statistics_projection toto_projection) +foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection) add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp) target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core) if(MSVC) diff --git a/src/modern/ui/engine_bridge.hpp b/src/modern/ui/engine_bridge.hpp index 35ec6db..408e00f 100644 --- a/src/modern/ui/engine_bridge.hpp +++ b/src/modern/ui/engine_bridge.hpp @@ -62,6 +62,11 @@ Json engine_other_projection(const Json &bundle,const Json &index,const Json &re Json engine_rankings_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int scope); Json engine_fairplay_projection(const Json &bundle,const Json &index,const Json &read); +Json engine_stadium_projection(const Json &bundle,bool future); +Json engine_stadium_quote(const Json &bundle,const Json &draft); +Json engine_stadium_request(const Json &bundle,const Json &draft,const std::string &request_id,bool update=false); +Json engine_stadium_commit(const Json &bundle,bool accept,const std::string &request_id); + Json engine_toto_projection(const Json &bundle); Json engine_toto_command(const Json &bundle,const Json "e,const std::string &request_id); diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index 82c59ad..0ef9b6a 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -30,6 +30,7 @@ void App::engine_accept(EngineReply result) { engine_almanac_sync(); engine_ticket_bind(); engine_toto_poll(); + engine_stadium_poll(); engine_contracts_poll(); engine_calendar_sync(); engine_friendly_sync(); @@ -133,6 +134,7 @@ void App::engine_save() { engine_start("Spielstand wird gespeichert …", [link, output] { auto response = link->save_copy(output); return EngineReply{link, link->snapshot(), response, nullptr}; }); } void App::engine_quit() { + if(!engine_busy_&&engine_data_.value("stadium",Json()).is_object()&&engine_data_.at("stadium").value("messageType","")=="snapshot"&&engine_data_.at("stadium").at("data").at("quote").is_object()){engine_stadium_exit_=true;engine_stadium_send(engine_stadium_commit(engine_data_,false,editor::new_id("request:ui-")),"cancel");return;} if (engine_busy_ || engine_files_busy_) { engine_notice_ = "Bitte den laufenden Vorgang abwarten."; dirty_ = true; return; } if (engine_dirty_) { confirmation("Die Partie enthält ungespeicherte Änderungen. Vor dem Beenden speichern?",[this]{closed_=true;}); @@ -163,6 +165,7 @@ void App::engine_event(Rml::Event &event) { if (engine_reports_event(event)) return; if(menu_=="statistics"&&statistics_event(event))return; if(menu_=="toto"&&toto_event(event))return; + if(menu_=="stadium"&&stadium_event(event))return; if(!engine_busy_&&popup_.empty()&&rankings_event(event))return; if (!engine_busy_ && popup_.empty() && engine_friendly_event(event)) return; if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && report_picker_event(event)) return; @@ -256,6 +259,7 @@ void App::engine_event(Rml::Event &event) { if (engine_reports_action(action,node)) return; if(menu_=="statistics"&&statistics_action(action,node))return; if(menu_=="toto"&&toto_action(action,node))return; + if(menu_=="stadium"&&stadium_action(action,node))return; if (almanac_action(action,node)) return; if (engine_friendly_action(action, node)) return; if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && report_picker_action(action,node)) return; @@ -272,6 +276,7 @@ void App::engine_event(Rml::Event &event) { ticket_->open(node, device_ratio_, price.at("min"), price.at("max")); dirty_ = true; } else if (action == "engine-open" && (id == "environment" || id == "advertising")) { menu_ = id; advertising_selected_ = -1; advertising_offer_ = 0; refresh(); } + else if(action=="engine-open"&&id=="stadium"){menu_=id;stadium_view_=Json::object();stadium_view_defaults(stadium_view_);engine_stadium_sync();refresh();} else if(action=="engine-open"&&id=="toto"){menu_=id;engine_toto_sync();refresh();} else if(action=="engine-open"&&id=="statistics"){menu_=id;engine_reports_sync();engine_statistics_load();} else if(action=="engine-open"&&id=="load"){engine_files_begin("load");} @@ -305,5 +310,5 @@ void App::engine_event(Rml::Event &event) { } Json App::engine_snapshot() const { return {{"mode", engine_mode_}, {"creation_busy",engine_creation_busy_}, {"busy", engine_busy_}, {"dirty", engine_dirty_}, {"fresh", engine_fresh_}, {"bundle", engine_data_}, - {"response", engine_response_}, {"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}}; + {"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}}; } diff --git a/src/modern/ui/engine_files.inc b/src/modern/ui/engine_files.inc index 3d64af8..7a34680 100644 --- a/src/modern/ui/engine_files.inc +++ b/src/modern/ui/engine_files.inc @@ -21,7 +21,7 @@ void App::engine_files_poll() { try { auto result=engine_files_job_.get(); if(result.operation=="loaded") { - engine_toto_context_=Json();engine_toto_quote_=Json();engine_reports_context_=Json();engine_almanac_context_=Json();engine_friendly_read_=Json();engine_friendly_stage_=0;engine_calendar_season_.clear();engine_calendar_day_=-1;engine_move_id_.clear();report_detail_kind_.clear();engine_player_.clear();lineup_selected_.clear();engine_opening_state_=Json();engine_opening_read_=Json(); + stadium_view_=Json::object();engine_stadium_context_=Json();engine_toto_context_=Json();engine_toto_quote_=Json();engine_reports_context_=Json();engine_almanac_context_=Json();engine_friendly_read_=Json();engine_friendly_stage_=0;engine_calendar_season_.clear();engine_calendar_day_=-1;engine_move_id_.clear();report_detail_kind_.clear();engine_player_.clear();lineup_selected_.clear();engine_opening_state_=Json();engine_opening_read_=Json(); engine_mode_=true;engine_dirty_=engine_base_dirty_=false;engine_accept(std::move(*result.engine));source_.reset();entry_catalog_.reset();engine_files_current_id_=result.selected;engine_files_pending_load_.reset();scene_="engine";menu_.clear();reset_files();refresh();return; } files_rows_=std::move(result.rows);if(result.metadata.is_object())engine_files_metadata_=std::move(result.metadata); diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index 905abb5..e05b777 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -120,7 +120,7 @@ void App::engine_render() { const auto route = id.substr(4); const bool camp_allowed = desk.at("menuAvailability").at("camps").value("status", "") == "available"; const auto commands = meta.at("scope").value("allowedCommands", Json::array()); - const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end()); + const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end()); out += desktop_button(id, o, "engine-open", supported && !engine_busy_); } } @@ -129,6 +129,7 @@ void App::engine_render() { if(menu_=="scorers")out+="
"+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"
"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"
")+"
"; if(menu_=="fairplay")out+="
"+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"
"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"
")+"
"; if(menu_=="other")out+="
"+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"
"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"
")+"
"; + if(menu_=="stadium")out+="
"+window("Stadion",render_stadium())+"
"; if(menu_=="toto")out+="
"+window("Toto",render_toto())+"
"; if(menu_=="statistics")out+="
"+window("Statistiken",engine_statistics_value_.is_object()?render_statistics():"
"+esc(engine_busy_?"Statistik wird geladen …":engine_notice_)+"
")+"
"; if(menu_=="league")out+="
"+window("Ligaspiele",engine_fixtures_value_.is_object()?render_reports("league"):"
"+esc(engine_busy_?"Ligaspiele werden geladen …":engine_notice_)+"
")+"
"; @@ -146,7 +147,7 @@ void App::engine_render() { if (menu_ == "lineup") out += "
" + window("Aufstellung", render_lineup()) + "
"; if (menu_ == "camp") out += "
" + window("Trainingslager", render_camp()) + "
"; } - if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="fairplay") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; + if ((menu_ == "stadium" || menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="fairplay") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; if (menu_.empty() || engine_data_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; if(menu_=="statistics")out+=render_statistics_trophy(); element("canvas")->SetProperty("overflow",statistics_trophy_.contains("asset")?"visible":"hidden"); @@ -172,6 +173,7 @@ void App::engine_render() { for (auto *node : underlay) { node->SetProperty("pointer-events", "none"); node->SetProperty("filter", "blur(10dp)"); } } if(!report_detail_kind_.empty()&&(menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other"||menu_=="scorers"||menu_=="fairplay"||menu_=="statistics")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#report-underlay button,.rankings-scorers button,.rankings-fairplay button,.statistics-native button,#window-close");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}} + if(menu_=="stadium"&&stadium_view_.value("dialog",std::string())!=""){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#stadium-underlay button,.window>.titlebar button");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}} if(!toto_dialog_.empty()){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#toto-underlay button,.window>.titlebar button");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}} if(statistics_trophy_.contains("asset")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".window button,.window input");for(auto *n:nodes)n->SetAttribute("disabled",true);} if (engine_busy_) { diff --git a/src/modern/ui/engine_stadium.cpp b/src/modern/ui/engine_stadium.cpp new file mode 100644 index 0000000..5d6e996 --- /dev/null +++ b/src/modern/ui/engine_stadium.cpp @@ -0,0 +1,208 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/engine_bridge.hpp" +#include +#include +namespace bmh::modern_ui { +namespace { +void check(bool yes, const char *message) { + if (!yes) + throw editor::Error(message); +} +const Json &read(const Json &bundle) { + validate_engine_desk(bundle); + const auto &r = bundle.at("stadium"); + check(r.value("messageType", "") == "snapshot" && r.at("data").value("kind", "") == "stadium", + "Stadion ist derzeit nicht verfügbar."); + for (const auto *key : {"careerId", "worldId", "worldRevision", "stateRevision", "scope"}) + check(r.at("meta").at(key) == bundle.at("desktop").at("meta").at(key), + "Der Stadionkontext hat sich geändert."); + return r.at("data"); +} +Json command(const Json &b, const std::string &kind, const Json &payload, const std::string &id) { + const auto &m = b.at("desktop").at("meta"); + const auto &allowed = m.at("scope").at("allowedCommands"); + check(std::find(allowed.begin(), allowed.end(), Json(kind)) != allowed.end(), + "Diese Stadionaktion ist derzeit gesperrt."); + return {{"messageType", "command"}, + {"contractVersion", m.at("contractVersion")}, + {"careerId", m.at("careerId")}, + {"requestId", id}, + {"expectedRevision", m.at("stateRevision")}, + {"owner", {{"managerId", m.at("scope").at("managerId")}}}, + {"kind", kind}, + {"payload", payload}}; +} +} // namespace +Json engine_stadium_projection(const Json &bundle, bool future) { + const auto &d = read(bundle); + check(d.at("blocks").size() == 8 && d.at("facilities").size() == 8 && + d.at("periphery").size() == 14, + "Unvollständiges Stadion."); + Json blocks = Json::array(), facilities = Json::array(), periphery = Json::array(); + int64_t available = 0, planned = 0, physical = 0; + bool super = true; + for (size_t i = 0; i < 8; ++i) { + const auto &b = d.at("blocks")[i]; + const int weeks = b.at("constructionWeeks"); + const bool busy = weeks > 0; + const int64_t current = b.at("places"), + target = busy ? b.at("placesAfterConstruction").get() : current; + const bool seats = future && busy ? b.at("seatsAfterConstruction").get() + : b.at("seats").get(), + roof = future && busy ? b.at("roofAfterConstruction").get() + : b.at("roof").get(); + const int64_t display = busy && !future ? 0 : future ? target : current; + blocks.push_back({{"id", b.at("id")}, + {"index", i}, + {"letter", std::string(1, char('A' + i))}, + {"name", b.at("name")}, + {"places", current}, + {"max_places", b.at("maxPlaces")}, + {"seats", b.at("seats")}, + {"roof", b.at("roof")}, + {"building", busy}, + {"display_places", display}, + {"display_seats", seats}, + {"display_roof", roof}, + {"weeks", 0}, + {"job", busy ? Json{{"places", target}, + {"seats", b.at("seatsAfterConstruction")}, + {"roof", b.at("roofAfterConstruction")}, + {"weeks", weeks}} + : Json()}}); + available += busy ? 0 : current; + physical += current; + planned += target; + super = + super && (future ? target : current) == b.at("maxPlaces").get() && seats && roof; + } + for (size_t i = 0; i < 8; ++i) { + const auto &f = d.at("facilities")[i]; + const int level = f.at("level"), weeks = f.at("constructionWeeks"), + target = f.value("plannedLevel", level), shown = future && weeks > 0 ? target : level; + Json labels = i == 2 || i == 3 ? Json({"—", "nicht vorhanden", "vorhanden"}) + : i < 2 ? Json({"—", "klein", "mittel", "groß", "mega"}) + : Json({"—", "schlecht", "ausreichend", "gut", "sehr gut"}); + check(shown >= 0 && shown < int(labels.size()), "Ungültige Ausstattungsstufe."); + facilities.push_back({{"id", f.at("id")}, + {"index", i}, + {"name", f.at("name")}, + {"level", level}, + {"max_level", f.at("maxLevel")}, + {"display_level", shown}, + {"display_label", labels[size_t(shown)]}, + {"levels", labels}, + {"weeks", 0}, + {"rate", nullptr}, + {"building", weeks > 0}, + {"available", f.at("upgradeAvailable")}, + {"job", weeks > 0 ? Json{{"level", target}, {"weeks", weeks}} : Json()}}); + } + for (size_t i = 0; i < 14; ++i) { + const auto &p = d.at("periphery")[i]; + const int level = i == 0 ? p.at("stage").get() + : p.at("built") == true ? 1 + : 0, + max = i == 0 ? p.at("maxStage").get() : 1, days = p.at("constructionDays"); + const bool busy = days > 0; + const int target = std::min(max, level + 1); + periphery.push_back({{"id", p.at("id")}, + {"index", i}, + {"name", p.at("name")}, + {"level", level}, + {"max_level", max}, + {"display_level", future && busy ? target : level}, + {"building", busy}, + {"job", busy ? Json{{"level", target}, {"weeks", days}} : Json()}}); + } + return {{"ok", true}, + {"club", d.at("teamId")}, + {"name", d.value("name", std::string("Stadion"))}, + {"budget", engine_money_minor(bundle.at("desktop").at("data").at("accounts").at("cash"))}, + {"blocks", blocks}, + {"facilities", facilities}, + {"periphery", periphery}, + {"available_capacity", available}, + {"planned_capacity", planned}, + {"physical_capacity", future ? planned : physical}, + {"capacity", future ? planned : available}, + {"super_stadium", super}}; +} +Json engine_stadium_quote(const Json &bundle, const Json &draft) { + const auto &d = read(bundle); + const auto &q = d.at("quote"); + if (!q.is_object()) + return {{"ok", false}, {"can_build", false}}; + const auto kind = draft.at("kind").get(); + check(q.at("kind") == kind, "Das Angebot gehört zu einer anderen Ausbauart."); + const int index = draft.at("index"); + const auto &row = d.at(kind == "block" ? "blocks" + : kind == "facility" ? "facilities" + : "periphery") + .at(size_t(index)); + check(q.at(kind == "block" ? "blockId" + : kind == "facility" ? "facilityId" + : "objectId") == row.at("id"), + "Das Angebot gehört zu einem anderen Objekt."); + const int64_t cost = engine_money_minor(q.at("price")); + Json result = {{"ok", true}, + {"can_build", cost > 0}, + {"cost", cost}, + {"company_percent", q.value("pricePercent", 100)}, + {"weeks", q.value("weeks", 0)}, + {"options", Json::array()}}; + if (kind == "block") { + check(q.at("places") == draft.at("places") && q.at("seats") == draft.at("seats") && + q.at("roof") == draft.at("roof"), + "Das Blockangebot passt nicht zum Entwurf."); + for (const auto &part : q.at("breakdown")) { + const auto code = part.at("code").get(); + result[code == "places" ? "placesCost" + : code == "seats" ? "seatsCost" + : "roofCost"] = engine_money_minor(part.at("amount")); + } + } + if (kind == "facility") { + check(q.at("toLevel") == draft.at("level"), "Die Angebotsstufe hat sich geändert."); + for (const auto &option : q.at("options")) + result["options"].push_back( + {{"level", option.at("toLevel")}, {"cost", engine_money_minor(option.at("price"))}}); + } + return result; +} +Json engine_stadium_request(const Json &bundle, const Json &draft, const std::string &id, + bool update) { + const auto &d = read(bundle); + const auto kind = draft.at("kind").get(); + check(kind == "block" || kind == "facility" || kind == "periphery", "Unbekannte Ausbauart."); + const int index = draft.at("index"); + const auto &rows = d.at(kind == "block" ? "blocks" + : kind == "facility" ? "facilities" + : "periphery"); + check(index >= 0 && size_t(index) < rows.size(), "Unbekanntes Stadionobjekt."); + const auto &row = rows[size_t(index)]; + Json payload = {{"kind", kind}}; + if (kind == "block") { + payload["blockId"] = row.at("id"); + payload["places"] = draft.at("places"); + payload["seats"] = draft.at("seats"); + payload["roof"] = draft.at("roof"); + } else if (kind == "facility") { + payload["facilityId"] = row.at("id"); + payload["increment"] = draft.at("level").get() - row.at("level").get(); + } else + payload["objectId"] = row.at("id"); + if (update) { + check(kind != "periphery" && d.at("quote").is_object(), + "Kein bearbeitbares Angebot vorhanden."); + payload["quoteId"] = d.at("quote").at("id"); + } + return command(bundle, "quote.request", payload, id); +} +Json engine_stadium_commit(const Json &bundle, bool accept, const std::string &id) { + const auto &d = read(bundle); + check(d.at("quote").is_object(), "Kein Stadionangebot vorhanden."); + return command(bundle, "stadium.commit", + {{"quoteId", d.at("quote").at("id")}, {"accept", accept}, {"tip", false}}, id); +} +} // namespace bmh::modern_ui diff --git a/src/modern/ui/engine_stadium.inc b/src/modern/ui/engine_stadium.inc new file mode 100644 index 0000000..7c9fa96 --- /dev/null +++ b/src/modern/ui/engine_stadium.inc @@ -0,0 +1,491 @@ +// SPDX-License-Identifier: GPL-3.0-only +Json App::stadium_overview(bool future) const { + if (!engine_mode_) { + const auto s = snap(); + return demo_stadium_view(s.state, *s.world, future, stadium_managed(s)); + } + auto value = engine_stadium_projection(engine_data_, future); + const auto club = value.at("club").get(); + const auto *team = world_->find("clubs", club); + const Json *stadium = nullptr; + if (team && team->value("stadium", Json()).is_string()) + stadium = world_->find("stadiums", team->at("stadium")); + if (!stadium) + for (const auto &row : world_->rows("stadiums")) + if (row.value("owner", Json()) == club) { + stadium = &row; + break; + } + if (stadium) + value["name"] = world_->name(*stadium); + return value; +} +Json App::stadium_quote_value() const { + if (engine_mode_) { + try { + return engine_stadium_quote(engine_data_, stadium_view_.at("draft")); + } catch (const std::exception &) { + return {{"ok", false}, {"can_build", false}}; + } + } + const auto s = snap(); + return demo_stadium_quote(s.state, stadium_view_.at("draft"), *s.world, stadium_managed(s)); +} +std::string App::stadium_cash(const Json &value) const { + return engine_mode_ ? (value.is_number_integer() + ? money(value.get(), {{"code", "EUR"}, {"minor_units", 2}}) + : "—") + : stadium_money(value, *world_); +} +std::string App::stadium_offer_feedback(const Json "e, bool invalid) const { + if (!engine_mode_) + return stadium_feedback(quote, invalid); + if (invalid) + return "Bitte die Anzahl der Plätze prüfen."; + if (!quote.value("ok", false)) + return "Angebot wird aktualisiert …"; + if (!quote.value("can_build", false)) + return "Bitte einen Ausbau auswählen."; + const int percent = quote.value("company_percent", 100); + return percent != 100 ? "Firmenangebot: " + std::to_string(percent) + + " % des Grundpreises. Bauauftrag erst nach Bestätigung." + : "Bauauftrag erst nach Bestätigung des Gesamtbetrags."; +} +void App::engine_stadium_sync() { + stadium_view_defaults(stadium_view_); + engine_stadium_value_ = Json(); + try { + engine_stadium_value_ = stadium_overview(stadium_view_.at("future")); + } catch (const std::exception &) { + } + engine_stadium_context_ = engine_data_.at("desktop").at("meta"); +} +void App::engine_stadium_poll() { + engine_stadium_sync(); + if (engine_stadium_operation_.empty()) + return; + const auto operation = std::exchange(engine_stadium_operation_, std::string()); + const bool success = engine_response_.value("messageType", "") == "command_result"; + if (!success) { + engine_stadium_exit_ = false; + if (engine_stadium_confirmed_.is_object()) + stadium_view_["draft"] = engine_stadium_confirmed_; + stadium_view_["feedback"] = engine_notice_; + return; + } + if (operation == "quote" || operation == "update") { + engine_stadium_confirmed_ = stadium_view_.at("draft"); + stadium_view_["feedback"] = ""; + focus_after_render_ = + stadium_view_.at("dialog") == "block" ? "stadium-place-range" : "stadium-build"; + return; + } + if (operation == "build" || operation == "cancel") { + const auto focus = stadium_view_.value("return_focus", std::string("stadium-data")); + bool built = true; + if (operation == "build") { + const auto &d = stadium_view_.at("draft"); + const auto now = stadium_overview(false); + built = now.at(d.at("kind") == "block" ? "blocks" + : d.at("kind") == "facility" ? "facilities" + : "periphery") + .at(d.at("index").get()) + .at("building"); + if (!built) { + auto reason = engine_text(engine_response_.at("feedback")); + if (reason.empty() || reason == "Der Bau beginnt." || reason == "—") + reason = "Der Ausbau wurde nicht begonnen."; + engine_notice_ = reason; + message(reason); + } + if (built && d.at("kind") != "periphery") + stadium_view_["future"] = true; + } + stadium_view_["dialog"] = ""; + stadium_view_["draft"] = Json(); + stadium_view_["feedback"] = ""; + stadium_view_["invalid_places"] = false; + stadium_view_["hint"] = ""; + engine_stadium_confirmed_ = Json(); + focus_after_render_ = focus; + if (engine_stadium_exit_) { + engine_stadium_exit_ = false; + engine_quit(); + } + } +} +void App::engine_stadium_send(const Json &request, const std::string &operation) { + if (engine_busy_ || !engine_fresh_) + return; + engine_stadium_operation_ = operation; + auto link = engine_link_; + engine_start(operation == "build" ? "Stadionbau wird beauftragt …" + : operation == "cancel" ? "Angebot wird geschlossen …" + : "Stadionangebot wird berechnet …", + [link, request] { + const auto response = link->command(request); + return EngineReply{link, link->snapshot(), response, nullptr}; + }); +} +std::string App::engine_stadium_data() { + const auto &data = engine_data_.at("stadium").at("data"); + std::string svg = ""; + constexpr std::array colors{"#8fbaa6", "#8cacc9", "#adb7c1", + "#cf9088", "#c5b384", "#729aae"}, + names{"Zuschauer", "Eintritt", "Stadionwert", "Zus. Stadion-Einnahmen", + "Einnahmen", "Stadionkosten"}; + for (size_t curve = 0; curve < 6; ++curve) + if (stadium_view_.at("curves")[curve] == true) { + svg += ""; + const auto &points = data.at("history")[curve].at( + stadium_view_.at("relative") == true ? "relative" : "absolute"); + if (points.size() == 1) + svg += ""; + } + svg += ""; + std::string out = "
" + + picture(renderer_.diagram("stadium-engine-graph", svg, 5120), 2560, 456) + + "
"; + for (size_t i = 0; i < 6; ++i) + out += btn("stadium-curve", + "" + + esc(data.at("history")[i].value("name", std::string(names[i]))) + "", + "stadium-curve", + "id=\"stadium-curve-" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + + "\" aria-pressed=\"" + + (stadium_view_.at("curves")[i] == true ? "true" : "false") + "\" style=\"" + + rect((i % 3) * 754.666666667, 660 + (i / 3) * 90, 732.666666667, 74) + "\""); + for (int i = 0; i < 2; ++i) + out += btn("stadium-scale", i ? "Relativ" : "Absolut", "stadium-scale", + "id=\"stadium-scale-" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + + "\" aria-pressed=\"" + + (stadium_view_.at("relative") == bool(i) ? "true" : "false") + "\" style=\"" + + rect(2282, 660 + i * 90, 330, 74) + "\""); + const std::array labels{"", "Max. Zuschauer", "Max. Einnahmen (€)", + "Heimspiele", "Ø Zuschauer", "Ges. Einnahmen (€)"}; + out += "
"; + for (size_t row = 0; row < 6; ++row) { + out += "
"; + for (size_t col = 0; col < 4; ++col) { + std::string value; + if (!col) + value = labels[row]; + else if (!row) + value = col == 1 ? "Liga" : col == 2 ? "DFB-Pokal" : "Europapokal"; + else { + const size_t source = row == 1 ? 0 : row == 2 ? 2 : row + 1; + value = data.at("table")[source][col - 1]; + if (row <= 2) { + const auto other = data.at("table")[source + 1][col - 1].get(); + if (!other.empty()) + value += " · " + other; + } + } + out += "
" + + esc(value) + "
"; + } + out += "
"; + } + out += "
"; + const int ticket = int(engine_money_minor(data.at("ticketPrice")) / 100); + out += "

Benötigter Zuschauerschnitt bei " + + std::to_string(ticket) + " € Eintritt: " + + esc(data.at("requiredAttendanceText").get()) + + "

Eintritt:"; + const int low = int(engine_money_minor(data.at("ticketPriceRange").at("min")) / 100), + high = int(engine_money_minor(data.at("ticketPriceRange").at("max")) / 100); + for (int price = low; price <= high; ++price) + out += btn( + "stadium-ticket", (price < 10 ? "0" : "") + std::to_string(price), "stadium-ticket-price", + "id=\"stadium-ticket-" + std::to_string(price) + "\" data-id=\"" + std::to_string(price) + + "\" aria-pressed=\"" + (ticket == price ? "true" : "false") + "\""); + return out + "
"; +} +bool App::engine_stadium_action(const std::string &action, Rml::Element *target) { + if (!action.starts_with("stadium-")) + return false; + if (menu_ != "stadium" || engine_busy_ || !engine_fresh_ || !engine_stadium_value_.is_object() || + amount_ || !popup_.empty()) + return true; + stadium_view_defaults(stadium_view_); + const auto value = target ? target->GetAttribute("data-id", "") : std::string(); + const auto index = stadium_integer(value, 255); + if (action == "stadium-cancel") { + if (engine_data_.at("stadium").at("data").at("quote").is_object()) + engine_stadium_send(engine_stadium_commit(engine_data_, false, editor::new_id("request:ui-")), + "cancel"); + else { + stadium_view_["dialog"] = ""; + stadium_view_["draft"] = Json(); + refresh(); + } + return true; + } + if (action == "stadium-build") { + const auto q = stadium_quote_value(); + if (!q.value("can_build", false)) + return true; + const auto request = engine_stadium_commit(engine_data_, true, editor::new_id("request:ui-")), + context = engine_data_.at("desktop").at("meta"); + confirmation("Diesen Ausbau für " + stadium_cash(q.at("cost")) + " beauftragen?", + [this, request, context] { + if (engine_data_.at("desktop").at("meta") != context) { + message("Das Angebot hat sich geändert. Bitte erneut öffnen."); + return; + } + engine_stadium_send(request, "build"); + }); + return true; + } + if (action == "stadium-option" && stadium_view_.at("dialog") == "facility" && index) { + auto d = stadium_view_.at("draft"); + d["level"] = *index; + stadium_view_["draft"] = d; + engine_stadium_send( + engine_stadium_request(engine_data_, d, editor::new_id("request:ui-"), true), "update"); + return true; + } + if (action == "stadium-places-editor" && stadium_view_.at("dialog") == "block") { + const auto overview = stadium_overview(false); + const auto row = overview.at("blocks").at(stadium_view_.at("draft").at("index").get()); + const auto context = engine_data_.at("desktop").at("meta"); + AmountRequest r; + r.title = "Neue Gesamtplätze"; + r.unit = "Plätze"; + r.value = stadium_view_.at("draft").at("places"); + r.min = row.at("places"); + r.max = row.at("max_places"); + r.step = 1000; + r.suggestion_step = 1000; + r.return_focus = "stadium-place-number"; + r.review = false; + r.accept = [this, context](int64_t places) { + if (engine_data_.at("desktop").at("meta") != context || places % 1000) + return false; + stadium_view_["draft"]["places"] = places; + engine_stadium_send(engine_stadium_request(engine_data_, stadium_view_.at("draft"), + editor::new_id("request:ui-"), true), + "update"); + return true; + }; + open_amount(std::move(r)); + return true; + } + if (stadium_view_.at("dialog") != "") + return true; + if (action == "stadium-view") { + stadium_view_["view"] = "panorama"; + stadium_view_["hint"] = ""; + refresh(); + return true; + } + if (action == "stadium-back") { + stadium_view_["view"] = "inside"; + stadium_view_["hint"] = ""; + refresh(); + return true; + } + if (action == "stadium-future") { + stadium_view_["future"] = !stadium_view_.at("future").get(); + refresh(); + return true; + } + if (action == "stadium-data") { + stadium_view_["view"] = "data"; + refresh(); + return true; + } + if (action == "stadium-curve" && index && *index < 6) { + stadium_view_["curves"][size_t(*index)] = + !stadium_view_.at("curves")[size_t(*index)].get(); + refresh(); + return true; + } + if (action == "stadium-scale" && index && *index < 2) { + stadium_view_["relative"] = bool(*index); + refresh(); + return true; + } + if (action == "stadium-ticket" && index) { + const auto request = engine_ticket_command(engine_data_, *index, editor::new_id("request:ui-")); + confirmation("Eintritt auf " + std::to_string(*index) + " € ändern?", + [this, request] { engine_stadium_send(request, "ticket"); }); + return true; + } + const bool block = action == "stadium-block", facility = action == "stadium-facility", + periphery = action == "stadium-periphery"; + if (!block && !facility && !periphery) + return true; + if (!index || *index >= (periphery ? 14 : 8)) + return true; + const auto overview = stadium_overview(false); + const auto &row = overview.at(block ? "blocks" + : facility ? "facilities" + : "periphery")[size_t(*index)]; + if (row.at("building") == true) + return true; + if (facility && row.at("available") != true) + return true; + if (periphery && row.at("level").get() >= row.at("max_level").get()) + return true; + Json d = {{"kind", block ? "block" : facility ? "facility" : "periphery"}, {"index", *index}}; + if (block) { + d["places"] = row.at("places"); + d["seats"] = row.at("seats"); + d["roof"] = row.at("roof"); + } else + d["level"] = row.at("level").get() + 1; + stadium_view_["draft"] = d; + stadium_view_["dialog"] = d.at("kind"); + stadium_view_["feedback"] = ""; + stadium_view_["return_focus"] = target->GetId(); + engine_stadium_confirmed_ = Json(); + engine_stadium_send(engine_stadium_request(engine_data_, d, editor::new_id("request:ui-")), + "quote"); + return true; +} +bool App::engine_stadium_event(Rml::Event &event) { + if (menu_ != "stadium" || amount_ || !popup_.empty()) + return false; + stadium_view_defaults(stadium_view_); + const auto type = event.GetType(); + auto *target = event.GetTargetElement(); + const bool key_event = type == "keydown"; + const auto key = key_event + ? Rml::Input::KeyIdentifier(event.GetParameter("key_identifier", 0)) + : Rml::Input::KI_UNKNOWN; + const bool dialog = stadium_view_.at("dialog") != ""; + if (engine_busy_) { + event.StopImmediatePropagation(); + return true; + } + if ((key_event && key == Rml::Input::KI_ESCAPE) || + (dialog && type == "mouseup" && event.GetParameter("button", 0) == 1)) { + if (dialog) + engine_stadium_action("stadium-cancel", nullptr); + else if (stadium_view_.at("view") != "inside") + engine_stadium_action("stadium-back", nullptr); + else + return false; + event.StopImmediatePropagation(); + return true; + } + if (!dialog && stadium_view_.at("view") == "panorama" && + (type == "mousemove" || type == "focus" || type == "blur")) { + std::string hint; + for (auto *n = target; n && n != doc_; n = n->GetParentNode()) + if (n->HasAttribute("data-stadium-hint")) { + hint = n->GetAttribute("data-stadium-hint", ""); + break; + } + if (type == "blur") + hint.clear(); + if (stadium_view_.at("hint") != hint) { + stadium_view_["hint"] = hint; + if (auto *n = element("stadium-interaction-hint")) + n->SetInnerRML("" + + esc(hint.empty() ? "Ein Element im Stadionumfeld auswählen." : hint) + + ""); + dirty_ = true; + } + } + Rml::Element *range = nullptr; + for (auto *n = target; n && n != doc_; n = n->GetParentNode()) + if (n->GetId() == "stadium-place-range") { + range = n; + break; + } + const auto update = [&] { + engine_stadium_send(engine_stadium_request(engine_data_, stadium_view_.at("draft"), + editor::new_id("request:ui-"), true), + "update"); + }; + if (dialog && stadium_view_.at("dialog") == "block") { + if (range && (type == "input" || type == "change")) { + if (auto *control = dynamic_cast(range)) { + const auto places = stadium_integer(control->GetValue(), 255000); + if (places) { + stadium_view_["draft"]["places"] = *places; + sync_stadium_draft(); + } + } + event.StopImmediatePropagation(); + return true; + } + if (range && type == "mouseup") { + if (stadium_view_.at("draft") != engine_stadium_confirmed_) + update(); + event.StopImmediatePropagation(); + return true; + } + if (range && key_event && + (key == Rml::Input::KI_HOME || key == Rml::Input::KI_END || key == Rml::Input::KI_LEFT || + key == Rml::Input::KI_RIGHT || key == Rml::Input::KI_UP || key == Rml::Input::KI_DOWN)) { + const auto row = stadium_overview(false).at("blocks").at( + stadium_view_.at("draft").at("index").get()); + int places = stadium_view_.at("draft").at("places"); + places = key == Rml::Input::KI_HOME ? row.at("places").get() + : key == Rml::Input::KI_END + ? row.at("max_places").get() + : places + ((key == Rml::Input::KI_LEFT || key == Rml::Input::KI_DOWN) ? -1000 + : 1000); + stadium_view_["draft"]["places"] = + std::clamp(places, row.at("places").get(), row.at("max_places").get()); + update(); + event.StopImmediatePropagation(); + return true; + } + if (type == "change" && target && target->HasAttribute("data-stadium-feature")) { + const auto field = target->GetAttribute("data-stadium-feature", ""); + if (field == "seats" || field == "roof") { + stadium_view_["draft"][field] = target->HasAttribute("checked"); + update(); + event.StopImmediatePropagation(); + return true; + } + } + } + if (dialog && key_event && key == Rml::Input::KI_TAB) { + Rml::ElementList nodes; + if (auto *root = element("stadium-draft")) + root->QuerySelectorAll(nodes, "button,input"); + std::erase_if(nodes, + [](auto *n) { return n->HasAttribute("disabled") || !n->IsVisible(true); }); + if (!nodes.empty()) { + const auto at = std::find(nodes.begin(), nodes.end(), context_->GetFocusElement()); + const int current = at == nodes.end() ? -1 : int(at - nodes.begin()), + count = int(nodes.size()); + nodes[size_t((current + count + (event.GetParameter("shift_key", 0) ? -1 : 1)) % count)] + ->Focus(true); + } + event.StopImmediatePropagation(); + return true; + } + if (dialog) { + bool inside = false; + for (auto *n = target; n && n != doc_; n = n->GetParentNode()) + if (n->GetId() == "stadium-modal") + inside = true; + if (!inside && (type == "click" || type == "mousedown" || type == "mouseup" || key_event)) { + event.StopImmediatePropagation(); + return true; + } + } + return false; +} diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc index 7f0eb4d..6c91e73 100644 --- a/src/modern/ui/engine_state.inc +++ b/src/modern/ui/engine_state.inc @@ -112,3 +112,17 @@ Json toto_value() const; Json toto_summary() const; Json toto_programme() const; + + Json engine_stadium_context_,engine_stadium_value_,engine_stadium_confirmed_; + std::string engine_stadium_operation_; + bool engine_stadium_exit_=false; + Json stadium_overview(bool) const; + Json stadium_quote_value() const; + std::string stadium_cash(const Json &) const; + std::string stadium_offer_feedback(const Json &,bool) const; + std::string engine_stadium_data(); + void engine_stadium_sync(); + void engine_stadium_poll(); + void engine_stadium_send(const Json &,const std::string &); + bool engine_stadium_action(const std::string &,Rml::Element *); + bool engine_stadium_event(Rml::Event &); diff --git a/src/modern/ui/stadium_controls.inc b/src/modern/ui/stadium_controls.inc index a1983ba..e2d9d84 100644 --- a/src/modern/ui/stadium_controls.inc +++ b/src/modern/ui/stadium_controls.inc @@ -8,6 +8,7 @@ std::optional stadium_integer(const std::string &text,int maximum) { } } // namespace void App::sync_stadium_draft() { + if(engine_mode_){if(auto *button=element("stadium-build"))button->SetAttribute("disabled",true);for(const auto *id:{"stadium-quote-total","stadium-cost-placesCost","stadium-cost-seatsCost","stadium-cost-roofCost"})if(auto *n=element(id))n->SetInnerRML("—");if(auto *n=element("stadium-draft-feedback"))n->SetInnerRML("Angebot für die geänderte Auswahl wird aktualisiert.");if(auto *n=element("stadium-place-number"))n->SetInnerRML(""+std::to_string(stadium_view_.at("draft").at("places").get())+"");dirty_=true;return;} stadium_view_defaults(stadium_view_);if(stadium_view_.at("dialog")==""||!stadium_view_.at("draft").is_object())return; const auto s=snap();const bool fresh=s.world==stadium_world_&&source_.get()==stadium_source_&&s.revision==stadium_revision_&&stadium_managed(s)==stadium_view_.value("bound_club",std::string()); const auto q=fresh?demo_stadium_quote(s.state,stadium_view_.at("draft"),*s.world,stadium_managed(s)):Json{{"ok",false}}; @@ -25,6 +26,7 @@ void App::sync_stadium_draft() { dirty_=true; } bool App::stadium_action(const std::string &action,Rml::Element *target) { + if(engine_mode_)return engine_stadium_action(action,target); if(!action.starts_with("stadium-"))return false; if(menu_!="stadium"||!source_||!world_||amount_||!popup_.empty()||!report_detail_kind_.empty())return true; stadium_view_defaults(stadium_view_);const auto s=snap();const auto club=stadium_managed(s); @@ -101,6 +103,7 @@ bool App::stadium_action(const std::string &action,Rml::Element *target) { refresh();return true; } bool App::stadium_event(Rml::Event &event) { + if(engine_mode_)return engine_stadium_event(event); if(menu_!="stadium"||!source_||!report_detail_kind_.empty())return false; stadium_view_defaults(stadium_view_);const auto type=event.GetType();auto *target=event.GetTargetElement(); const auto key=type=="keydown"?Rml::Input::KeyIdentifier(event.GetParameter("key_identifier",0)):Rml::Input::KI_UNKNOWN; diff --git a/src/modern/ui/stadium_screens.inc b/src/modern/ui/stadium_screens.inc index 348a2e8..8aa42b8 100644 --- a/src/modern/ui/stadium_screens.inc +++ b/src/modern/ui/stadium_screens.inc @@ -59,11 +59,11 @@ std::string stadium_graph_svg(const Json &curves,bool relative,const std::string } // namespace std::string App::render_stadium() { - stadium_view_defaults(stadium_view_);const auto snapshot=snap();const auto club=stadium_managed(snapshot); - if(!snapshot.world||club.empty())return "

Die Stadionvorschau ist derzeit nicht verfügbar.

"; + stadium_view_defaults(stadium_view_);if(!world_)return ""; const bool future=stadium_view_.at("future").get(); - const auto overview=demo_stadium_view(snapshot.state,*snapshot.world,future,club); + const auto overview=stadium_overview(future);const auto club=overview.value("club",std::string()); if(!overview.value("ok",false))return "

Die Stadionvorschau ist derzeit nicht verfügbar.

"; + if(engine_mode_)engine_stadium_value_=overview; const auto view=stadium_view_.at("view").get(); const auto feature=[&](const std::string &kind,bool built,double size) {return picture(renderer_.diagram("stadium-feature-"+kind+(built?"-built-":"-empty-")+theme_,stadium_feature_svg(kind,built,theme_),232),size,size);}; const auto art_overlay=[&](int i,int level,double w,double natural_h) { @@ -87,7 +87,7 @@ std::string App::render_stadium() { return ""+picture(renderer_.diagram("stadium-card-overlay-"+std::to_string(i)+"-"+std::to_string(level)+"-"+theme_,stadium_svg(body,w,viewport_h),1564),w,viewport_h)+""; }; std::string out="
"; - if(view!="panorama")out+="

"+esc(overview.at("name").get())+"

"+(view=="inside"?"Innenansicht":"Stadiondaten")+"

"+(future?"Geplante Kapazität":"Verfügbare Kapazität")+std::string("")+number(overview.at("capacity").get())+" Plätze
Ausbaubudget"+esc(stadium_money(overview.at("budget"),*snapshot.world))+"
"; + if(view!="panorama")out+="

"+esc(overview.at("name").get())+"

"+(view=="inside"?"Innenansicht":"Stadiondaten")+"

"+(future?"Geplante Kapazität":"Verfügbare Kapazität")+std::string("")+number(overview.at("capacity").get())+" Plätze
"+std::string(engine_mode_?"Vereinskasse":"Ausbaubudget")+"()):"")+"\">"+esc(stadium_cash(overview.at("budget")))+"
"; if(view=="inside") { constexpr double bowl_h=1430.0*1045/1505; out+="
"+img("art.stadium-interior-v1.png",1426,bowl_h-4,false,false,2048); @@ -126,6 +126,8 @@ std::string App::render_stadium() { } catch(const std::exception &) {out+="

Die Stadionumfeld-Grafiken sind unvollständig.

";} out+="

"+esc(stadium_view_.at("hint").get().empty()?"Ein Element im Stadionumfeld auswählen.":stadium_view_.at("hint").get())+"

"; } else { + if(engine_mode_)out+=engine_stadium_data(); + else {const auto snapshot=snap(); const auto graph=stadium_graph_svg(stadium_view_.at("curves"),stadium_view_.at("relative").get(),theme_); out+="
"+picture(renderer_.diagram("stadium-graph",graph,7200),2560,456)+"
"; constexpr std::array colors{"#8fbaa6","#8cacc9","#adb7c1","#cf9088","#c5b384","#729aae"},names{"Zuschauer","Eintritt","Stadionwert","Zus. Stadion-Einnahmen","Einnahmen","Stadionkosten"}; @@ -140,6 +142,7 @@ std::string App::render_stadium() { out+="

Benötigter Zuschauerschnitt bei "+esc(cash(ticket))+" Eintritt: "+(ticket?number((94000+ticket-1)/ticket):"–")+"

Eintritt:"; for(int price=0;price<=25;++price)out+=btn("stadium-ticket",(price<10?"0":"")+std::to_string(price),"stadium-ticket-price","id=\"stadium-ticket-"+std::to_string(price)+"\" data-id=\""+std::to_string(price)+"\" aria-pressed=\""+(price==ticket?"true":"false")+"\" aria-label=\"Eintritt "+std::to_string(price)+" "+esc(money_unit())+"\""); out+="
"; + } } out+="