diff --git a/docs/DIFFERENCES.md b/docs/DIFFERENCES.md index ecc4056..8ab173d 100644 --- a/docs/DIFFERENCES.md +++ b/docs/DIFFERENCES.md @@ -50,6 +50,7 @@ describe deliberate changes; they are not a list of every known compatibility li - [src/modern/game/weekly.cpp](../src/modern/game/weekly.cpp): uses the supported weekly-event configuration, with its rule switch disabled. - [src/modern/game/weekly.hpp](../src/modern/game/weekly.hpp): uses the supported weekly processing and transfer rule profile. - [src/modern/ui/demo_calendar.cpp](../src/modern/ui/demo_calendar.cpp): the native season follows its saved start year (including leap days), rather than the HTML's fixed 2027/28. +- [src/modern/ui/engine_achievements.cpp](../src/modern/ui/engine_achievements.cpp): shows recorded manager history between seasons without inventing future results. - [src/ui/league_table.hpp](../src/ui/league_table.hpp): uses three points for a win in the supported rule profile. - [src/ui/pitch.cpp](../src/ui/pitch.cpp): supports owner-bound designated set-piece selection in the extended manager record. - [src/ui/save_load.cpp](../src/ui/save_load.cpp): focuses the host save filename on entry and selects an existing name for replacement. diff --git a/docs/new_engine/ui-anbindung.md b/docs/new_engine/ui-anbindung.md index 217c186..00b550d 100644 --- a/docs/new_engine/ui-anbindung.md +++ b/docs/new_engine/ui-anbindung.md @@ -34,6 +34,7 @@ Revision kommt vom Aufrufer (Konsole bzw. AppController), der Read ändert nicht | `contracts` | je Spieler Restlaufzeit, Monatsgehalt, Versicherung, Prämien; das offene Angebot (`quote`: ID, Spieler, Monatsforderung für 1–4 Jahre, Höchstgehalt 200.000 €) | | `advertising` | 14 Banden (`ad:board/`), Trikot (`ad:shirt`), TV-Rechte (`ad:tv`) je mit Vertrag (Sponsor, Monatsbetrag, Restmonate, Verlängerung, Option) und den offenen Angeboten (`offer:ad--`, Sponsor, Betrag, Banden, Monate, `allowed`); die drei Budgets (Merchandising, Presse, Fanarbeit) mit Stand, Höchstbetrag, Lieferwochen; die Finanzvorschau des Originals | | `stadium` | Umfeld (14 Objekte mit Namen und Bautagen; Verkehrsanbindung mit `stage` und `maxStage`: Classic 3, Modern-Welt 4; sonst `built`), die acht Anlagen (Stufe, Höchststufe, Bauwochen, ob ausbaubar), die acht Tribünenblöcke (Plätze, Höchstplätze, Sitzplätze, Dach, Bauwochen, Plätze nach dem Bau), Eintrittspreis (8–25 €); das offene Angebot des Stadion-Dialogs (`quote`: Umfeld mit Preis, oder Anlage mit Zielstufe, Preis, Bauwochen und dem Trinkgeld-Bereich 6–14 %) | +| `achievements` | Reine Manager-Saisonhistorie am Vereinsschreibtisch: `managerId`, aktuelles `teamId`, `currentSeasonYear`, `records` mit Jahr/Abschlussstatus, Liga-ID/Platz/Teilnehmerzahl und ursprünglichen Pokal-/Europapokalständen samt Text. Keine historische Vereinszuordnung erfinden. `available` bedeutet vorhandene Aufzeichnungen; `originalMenuAvailable` nennt zusätzlich die bisherige Ligaspiel-Sperre. Abgeschlossene Daten bleiben in der Modern UI auch zwischen Saisons lesbar; ungespielte neue Saisons werden nicht ergänzt. Kein RNG oder Schreibvorgang. | | `transfer` | die Transferliste (`listing:`: Spieler, Alter, Position, Stärke, Verkäufer, Ablöseforderung, Gehaltsreferenz pro Monat, Gehaltsforderung in %, Zahl der Angebote, eigene Listung, eigenes Gebot), der eigene Kader (gelistet oder nicht), Kontostand, Kreditrahmen; `details` je Spieler mit vollständigem Namen, Nationalität, Foto, Kondition/Technik/Form und sieben Fähigkeiten; `activeStrengths`/`teamStrengths` enthalten vier Positionen und Gesamtschnitt. `ownBid.monthlySalary` ist das gespeicherte Monatsgehalt; `annualSalary` bleibt als früher irreführend benannter Alias erhalten. `salaryReferencePeriod: month`. `loanAvailable` sperrt vereinslose Anbieter; `offerTerms` liefert Kauf-/Leihgebühr, jeweilige maximale Gebühr und maximales Monatsgehalt aus den Original-Editorgrenzen. `ownBid.loan` bezeichnet die gespeicherte Leihart. `ownBid.bonuses` sind sieben gespeicherte Prämienstufen. Die Projektion und Gebotsprüfung verwenden den weltabhängigen Modern-Pool, nicht Classic `0xb70` (#24). | | `news` | Presseereignisse eines Teams (`teamId`, Vorgabe das Team am Schreibtisch), `from`/`until` (ISO, Vorgabe bis heute), `limit` (Vorgabe 50, die neuesten): `events` je `{id, type, date, scope, data, variant: null}` nach [Pressevertrag](../new_ui/integration/PRESS.md), `total`. Quelle ist der Almanach, darum gleich bei jedem Lesen und mit stabiler ID (`press-event:::`). Typen: `match.result`, `cup.round_result`, `cup.final_result`, `cup.extra_time`, `cup.penalties`, `player.sent_off`, `player.injury`, `run.wins` (3/5/8/10/15), `run.unbeaten` (5/10/15/20/30), `run.winless` (5/8/10/15), `run.losses` (3/5/8/10), `league.position`, `league.champion`, `cup.won`, `indoor.won`. Fakten: `team`, `opponent`, `competition` (mit `kind`, `season`), `matchId`, `score {for, against}` aus Sicht des Teams, `venue`, `trailed`, `minute` (das entscheidende Tor), `outcome`, `round`, `shootout`, `player`, `matches`, `position`, `points`. Dazu Geschäftsereignisse aus dem Pressejournal im Spielstand (`state/modern.json`, `press`): beim Anstoß aus dem Kadervergleich der menschlichen Vereine `transfer.signed` (`fromClub`), `transfer.free`, `transfer.sold` (`toClub`; auch ein freigegebener Spieler, der im selben Anstoß woanders unterschreibt), `contract.ended`; `toto.win`/`toto.loss` (`amount`); `career.season_finished`/`career.season_started`; beim Saisonwechsel `league.promoted`/`league.relegated` (`competition` die neue, `from` die alte Liga); aus bestätigten Befehlen `contract.extended` (`years`, `wage`), `advertising.signed` (`company`, `amount` monatlich, `months`, `place` boards/shirt/tv), `finance.loan_approved`/`finance.loan_repaid` (`amount`, `bank`), `stadium.expansion_planned` (`block`, `seats` Ziel insgesamt) und `career.manager_resigned`. Ablösen kennt der Kadervergleich nicht (`fee: null`). Ohne Welt-IDs (Classic-Daten) heißt ein Verein `team:`, die sich zum Saisonstart ändern kann. Monatlich `finance.profit`/`finance.loss` (`amount` die Veränderung des Kontostands im abgelaufenen Monat, alles Gebuchte eingeschlossen, `month` als JJJJ-MM; vermerkt beim ersten Anstoß im neuen Monat). Beim Anstoß `stadium.expansion_finished` (`count` die Plätze des Stadions danach), wenn die Bauzeit eines Tribünenblocks abläuft. Noch nicht: Derby, Aktien. Dazu `messages`: das Postfach des Managers am Schreibtisch (die Nachrichten des Originals; `id` stabil `message:-`, auch wenn das Original seine Einträge zusammenschiebt; `subject` die erste Zeile, `paragraphs` der Text, `read`, `folder` inbox/archive/trash); `articles` leer (die UI rendert und hält ihre Artikel), `dedupePolicyId` | | `calendar` | der Saisonkalender des Teams am Schreibtisch, `from`/`until` (ISO, Vorgabe der laufende Monat): `days` (Datum, `seasonDay`, `today`, `eventKinds`: `league`, `cup:`, `replay`, `indoor`, `special`, `national`, `friendly`; `fixtureIds`) und `fixtures` (die eigenen Ligaspiele: `fixture:league---`, Wettbewerb, Runde, `originalDate`, `scheduledDate`, Heim/Gast, `status` `scheduled`/`played`/`rescheduled`/`postponed`, `result`). Verlegte und im Winter ausgefallene Spiele stehen am Nachholtag. Pokalspiele nur als `eventKinds`; Fehler `invalid_range` | diff --git a/docs/new_ui/desktop/achievements/README.md b/docs/new_ui/desktop/achievements/README.md index ffaaa10..6364271 100644 --- a/docs/new_ui/desktop/achievements/README.md +++ b/docs/new_ui/desktop/achievements/README.md @@ -1,5 +1,43 @@ # Erfolge +## Tatsächliche Engine-Anbindung · 29. Oktober 2026 + +Der native Engine-Einstieg verwendet `ui_read("achievements")` und denselben +Gold-Presenter. Die Session liest die vorhandenen Manager-Saisonaufzeichnungen +über `achievements_from_game`; weder ein Legacy-Bildschirm noch eine alternative +Spielberechnung wird gestartet. Die Tripel für Meisterschaft, DFB-Pokal und +Europapokal, deren ursprüngliche Bezeichnungen, Ligazugehörigkeit und Plätze +stammen aus den gespeicherten Daten. Die vier Spielklassen und ihre Bezeichnungen +kommen aus den unveränderten `competition.tier`-Angaben der aktiven Welt. +Die beiden parallelen Regionalligen können im selben Farbbereich erscheinen. + +Es gibt bis zu 50 tatsächliche Saisons und höchstens acht Beobachtungen pro Seite. +Älter/Neuer blättert zwischen diesen Blöcken; die letzte Seite wird nicht mit +fiktiven Jahren aufgefüllt. Unbekannte oder besondere Pokalzustände behalten ihre +Originalbezeichnung und erhalten keine erfundene Diagrammhöhe. Nichtteilnahme +bleibt von einem unbekannten Wert unterscheidbar. Die laufende Saison ist als +**Zwischenstand** gekennzeichnet; abgeschlossene Daten bleiben zwischen zwei +Saisons lesbar, auch wenn die ursprüngliche Menüsperre mangels neuer Ligaspiele +gerade greift. Eine noch nicht gespielte neue Saison wird dabei nicht ergänzt. + +Die ursprünglichen Tripel gehören zum Manager. Daher heißt der bisherige +Demo-Button im echten Einstieg **Karriereverlauf**. Der Dialog zeigt den +laufenden und abgeschlossenen Verlauf dieses Managers und behauptet keine +historische Vereinszuordnung, die in diesen Aufzeichnungen fehlt. Eine künftige +vollständige Vereinsgeschichte kann separat aus dem Almanach ergänzt werden. +Modalverhalten, Escape/Rechtsklick, Tabführung und Rückfokus bleiben erhalten. + +Öffnen, Blättern und Schließen verändern weder Partie noch Revision oder RNG. +Keine Welt-/Spielstandformatänderung und keine Änderung der Saisonlogik. Beim +Speichern eines älteren Referenzspiels darf der bereits vorhandene Writer die +fehlende optionale `manager_presentations`-Angabe als leere Liste ergänzen; +der Nachweis prüft genau diese Normalisierung und die zugehörigen Prüfsummen, +alle anderen Zustandsdaten bleiben unverändert. Am Nationaltrainer-Schreibtisch +ist diese Vereinsansicht weiterhin nicht freigeschaltet. + +Die folgenden Abschnitte beschreiben die weiterhin separat verfügbare +**Demoansicht** und deren ausdrücklich erfundene Werte. + Die native Ansicht übernimmt die Saisonbilanz aus dem HTML-Gold `787df640`: drei übereinander angeordnete Diagramme für Meisterschaft, DFB-Pokal und Europapokal. Jedes Diagramm zeigt acht Saisons, die Meisterschaft zusätzlich vier farbige Ligaabschnitte. Ältere beziehungsweise neuere Saisons verschieben das Fenster um ein Jahr, begrenzt auf die fünf lokalen Seiten 0 bis 4. Die Diagramme werden proportional dargestellt; ihr freier vertikaler Raum gehört zur Referenzgeometrie. Der erste Manager und dessen Verein werden aus dem aktuellen Snapshot gelesen. Vereinsnamen, IDs und Wappen stammen ausschließlich aus dem schreibgeschützten Katalog. Saisonplätze, Pokalrunden und Titelmarkierungen sind deterministische fiktive Beispieldaten. Die jüngste abgeschlossene Saison ergibt sich aus dem Snapshotdatum, ersatzweise dem Weltstartdatum; vor Juli endet die Vorschau entsprechend ein Jahr früher. Es werden keine tatsächlichen historischen Vereinsleistungen behauptet. diff --git a/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md b/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md index c24d339..120c4b5 100644 --- a/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md +++ b/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md @@ -3,10 +3,10 @@ Dies ist eine Routenübersicht des nativen Engine-Einstiegs auf `0.3`, keine Fertigstellungsquote des gesamten Spiels. HTML-/Demo-Presenter sind getrennt -von echten Karrierewerten. Stand einschließlich der tatsächlichen Transferanbindung. +von echten Karrierewerten. Stand einschließlich Transfermarkt und Erfolgsverlauf. -Von 32 Desktoprouten sind 24 an Sessiondaten bzw. tatsächliche Aktionen -angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Sieben weitere +Von 32 Desktoprouten sind 25 an Sessiondaten bzw. tatsächliche Aktionen +angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Sechs weitere Routen besitzen ihre Präsentation, sind im echten Einstieg aber noch nicht freigeschaltet. Rollen-, Termin- und Angebotssperren können auch eine angebundene Route vorübergehend deaktivieren; insbesondere hat der Nationaltrainer weniger @@ -23,6 +23,7 @@ Vereinsmenüs. | Kalender, Verlegen, Freundschaftsspiele | Tatsächlicher Kalender, belegte Verlegungen, Vereins-/Nationalangebote | Kein POC-Spielplan als Ersatz | | Spielerstatistik und Fairplay | Aktuelle Saisonereignisse aus dem Almanach | Heutige unbekannte Spielerwerte bleiben unbekannt | | Transfermarkt | Tatsächliche Kader-/Marktwerte und Gebote, lokale Suche, bestätigte Listung und Kauf-/Leihangebote | Abwerben, Entfernen und Zurücknehmen sind sichtbar gesperrt; ursprüngliche Prämienstufen bleiben erhalten | +| Erfolge | Tatsächliche Manager-Saisonaufzeichnungen, Ligafarben aus Weltregeln, aktueller Zwischenstand und Karriereverlauf | Keine fiktiven Vorjahre oder erfundene historische Vereinszuordnung; Nationaltrainer gesperrt | | Große Statistik | Vorhandene Almanachauswertungen, tatsächliche Transfer-/Analyticswerte | Titelchancen, fehlende Saisonfinanzen und nicht aufgezeichnete Turnierbereiche bleiben leer | | Almanach | Tatsächlich aufgezeichnete Spiele, Details und Ereignisse | Keine Rekonstruktion unbekannter historischer Werte | | Toto | Echte elf Spiele, sechs Spalten, Kostenprüfung, bestätigte Abgabe/Rücknahme und letzte Abrechnung | Abrechnung am Spieltagsende; unvollständiges Programm gesperrt | @@ -33,7 +34,6 @@ Vereinsmenüs. | Route | Vorhandene Grundlage | Nächster Integrationsschritt | |---|---|---| -| Erfolge | Gemeinsamer Karriere-/Erfolgspresenter und ursprüngliche Rekordprojektion | Aktive Managerhistorie autoritativ liefern und binden | | Hallentabellen | HTML-/RmlUI-Ansicht und Indoor-Presenter | Tatsächliche Turnierphase und Tabellen/Teilnehmer liefern | | Einstellungen im Karriere-Desktop | Gemeinsamer globaler/lokaler Einstellungsdialog | Spiel-/Automatikwerte und Plattformwirkung sauber anbinden; Hauptmenüpräferenzen sind separat vorhanden | | Highscore | Gemeinsamer Presenter und ursprüngliche Ranglistenprojektion | Tatsächlichen Ranglistenbesitzer und Speicherweg anbinden | diff --git a/src/modern/app/modern_session.cpp b/src/modern/app/modern_session.cpp index ad641f3..50eef20 100644 --- a/src/modern/app/modern_session.cpp +++ b/src/modern/app/modern_session.cpp @@ -7,6 +7,7 @@ #include "modern/content/world_package.hpp" #include "modern/content/toto_quote.hpp" #include "modern/content/transfer_market.hpp" +#include "ui/achievements.hpp" #include "modern/content/world_save.hpp" #include "modern/game/balance_plan.hpp" #include "modern/game/bank_credit.hpp" @@ -8999,12 +9000,35 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co return answer; } if (manager < 0 || size_t(manager) >= g_.manager_teams.size() || - (kind != "statistics" && kind != "opening" && kind != "lineup" && kind != "tactics" && kind != "training" && kind != "bank" && kind != "contracts" && + (kind != "achievements" && kind != "statistics" && kind != "opening" && kind != "lineup" && kind != "tactics" && kind != "training" && kind != "bank" && kind != "contracts" && kind != "advertising" && kind != "stadium" && kind != "transfer" && kind != "postmatch" && kind != "credit" && !(kind == "friendly" && g_.manager_teams[size_t(manager)] == no_team()))) return modern::ui_read(g_, context, request); if (const std::string wanted = ui_text(request, "managerId"); !wanted.empty() && wanted != modern::ui_manager_id(g_, manager)) return modern::ui_error(request_id, "manager_not_active", "Dieser Manager sitzt nicht am Schreibtisch.", revision, false); + if(kind=="achievements") { + const int team=g_.manager_teams[size_t(manager)]; + if(team<0||team>=league_clubs()||manager>3)return modern::ui_error(request_id,"no_club","Erfolge sind am Vereinsschreibtisch verfügbar.",revision,false); + const bool original_available=ui::achievements_available(g_);A rows; + try { + ui::DeskRequest owner;owner.kind=ui::DeskRequestKind::open_menu;owner.menu_kind=4;owner.manager_slot=manager;owner.revision=revision; + Image underlay;underlay.width=320;underlay.height=240;underlay.pixels.resize(320*240); + const auto records=ui::achievements_from_game(g_,exe_,owner,underlay); + const size_t at=size_t(manager)*0xb0c+0x2aa;const int joined=int(g_.manager_records.at(at))|(int(g_.manager_records.at(at+1))<<8); + const int current_year=g_.display_start_year+g_.season; + for(int i=0;icurrent_year)break; + if(year==current_year&&!original_available)continue; + const auto &record=records.seasons[size_t(i)]; + if(record.league_result==0xff&&record.cup_result==0&&record.europe_result==0)continue; + O league{{"raw",int(record.league_result)},{"leagueId",nullptr},{"position",nullptr},{"teams",nullptr},{"label",ui::original_to_utf8(record.league_text)}}; + if(record.league_result>0&&record.league_result<=german_clubs()) {const int index=team_league(int(record.league_result)-1);if(index>=0&&index<5&&size_t(index)object())return modern::ui_error(request_id,"invalid_statistics_request","Eine Statistikabfrage wird benötigt.",revision,false); diff --git a/src/modern/ui/CMakeLists.txt b/src/modern/ui/CMakeLists.txt index a5202d4..be58aca 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 engine_stadium.cpp engine_transfer.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 engine_transfer.cpp engine_achievements.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 stadium_projection transfer_projection) +foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_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/career_report_controls.inc b/src/modern/ui/career_report_controls.inc index ce8e16a..fb55a73 100644 --- a/src/modern/ui/career_report_controls.inc +++ b/src/modern/ui/career_report_controls.inc @@ -2,7 +2,7 @@ bool App::career_report_action(const std::string &action,Rml::Element *target) { if(action!="career-report-page"&&action!="career-history"&&action!="career-history-close")return false; if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return true; - const int page=career_page(career_view_); + const int page=career_page(career_view_,career_max_page()); if(action=="career-history-close") { if(career_view_.at("dialog")!="history")return true; focus_after_render_=career_view_.at("return_focus").get(); @@ -11,9 +11,7 @@ bool App::career_report_action(const std::string &action,Rml::Element *target) { refresh();return true; } if(career_view_.at("dialog")!=""||!target)return true; - const auto snapshot=snap(); - if(!snapshot.world)return true; - const auto data=demo_achievements(*snapshot.world,snapshot.state,page); + const auto data=achievements_data(page); if(!data.value("ok",false)||!data.value("available",false))return true; if(action=="career-history") { career_view_["dialog"]="history";career_view_["return_focus"]=target->GetId(); @@ -22,15 +20,15 @@ bool App::career_report_action(const std::string &action,Rml::Element *target) { } const auto id=target->GetAttribute("data-id",""); if(id!="older"&&id!="newer")return true; - const int next=std::clamp(page+(id=="older"?1:-1),0,4); + const int next=std::clamp(page+(id=="older"?1:-1),0,career_max_page()); if(next==page)return true; career_view_["page"]=next; - focus_after_render_=(id=="older"&&next==4)?"career-page-newer":(id=="newer"&&next==0)?"career-page-older":target->GetId(); + focus_after_render_=(id=="older"&&next==career_max_page())?"career-page-newer":(id=="newer"&&next==0)?"career-page-older":target->GetId(); refresh();return true; } bool App::career_report_event(Rml::Event &event) { if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return false; - career_page(career_view_); + career_page(career_view_,career_max_page()); if(career_view_.at("dialog")!="history")return false; const auto type=event.GetType();const bool keyboard=type=="keydown"; const auto key=keyboard?Rml::Input::KeyIdentifier(event.GetParameter("key_identifier",0)):Rml::Input::KI_UNKNOWN; diff --git a/src/modern/ui/career_report_screens.inc b/src/modern/ui/career_report_screens.inc index 9081288..103fbea 100644 --- a/src/modern/ui/career_report_screens.inc +++ b/src/modern/ui/career_report_screens.inc @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-3.0-only namespace { -int career_page(Json &view) { +int career_page(Json &view,int maximum=4) { if(!view.is_object())view=Json::object(); - if(!view.contains("page")||!view.at("page").is_number_integer()||view.at("page")<0||view.at("page")>4)view["page"]=0; + if(!view.contains("page")||!view.at("page").is_number_integer()||view.at("page")<0||view.at("page")>maximum)view["page"]=0; for(const auto *key:{"dialog","return_focus","bound_club"})if(!view.contains(key)||!view.at(key).is_string())view[key]=""; if(view.at("dialog")!=""&&view.at("dialog")!="history")view["dialog"]=""; return view.at("page").get(); @@ -21,12 +21,13 @@ std::string career_svg(const Json &chart,const std::string &theme) { std::string svg=""; if(!kind) { constexpr std::array names{"Bundesliga","2. Bundesliga","3. Bundesliga","Regionalliga"}; - for(int i=0;i<4;++i)svg+=""+names[size_t(i)]+""; + for(int i=0;i<4;++i)svg+=""+(chart.contains("bands")?chart.at("bands")[size_t(i)].get():std::string(names[size_t(i)]))+""; } else svg+=""; size_t i=0; for(const auto &row:chart.at("seasons")) { + if(!row.at("value").is_number_integer()||(!kind&&!row.at("tier").is_number_integer())) {const int x=171+int(i++)*232;svg+="—"+esc(row.at("season").get())+"";continue;} const int value=row.at("value").get(),tier=!kind?row.at("tier").get():1; - const double height=!kind?std::max(8.0,218-((tier-1)*49+18+(value-1)/19.0*29)) + const double height=!kind?std::max(8.0,218-((tier-1)*49+18+(value-1)/(row.contains("max_position")?std::max(1.,row.at("max_position").get()-1):19.0)*29)) :value?22+(6-std::log2(double(value)))*27:3; const int x=124+int(i)*232; const std::string fill=!kind?bar_tiers[size_t(tier-1)]:kind==1?"#8cacc9":"#c5b384"; @@ -41,8 +42,8 @@ std::string career_cell(const std::string &text,const std::string &css) { } // namespace std::string App::render_achievements() { - const auto snapshot=snap();const int page=career_page(career_view_); - const auto data=snapshot.world?demo_achievements(*snapshot.world,snapshot.state,page):Json{{"ok",false},{"available",false}}; + const int page=career_page(career_view_,career_max_page()); + const auto data=achievements_data(page); const bool ready=data.value("ok",false)&&data.value("available",false); const auto club=ready?data.at("club").get():std::string(); if(career_view_.at("dialog")=="history"&&career_view_.at("bound_club")!=club) { @@ -52,14 +53,14 @@ std::string App::render_achievements() { if(ready) { for(const auto &chart:data.at("charts")) { const int kind=chart.at("kind").get();const auto &last=chart.at("latest"); - const auto summary=(kind==0?last.at("tier_name").get()+" · ":std::string())+last.at("label").get(); + const auto summary=(kind==0?last.at("tier_name").get()+" · ":std::string())+last.at("label").get()+(engine_mode_&&last.at("completed")==false?" · Zwischenstand":""); const auto svg=career_svg(chart,theme_); - out+="

"+esc(chart.at("title").get())+"

"+esc(last.at("season").get())+""+esc(summary)+"
()+"-Ergebnisse")+"\">"+picture(renderer_.diagram("career-chart-"+std::to_string(kind),svg,4480),2548,403.333333333)+"
"; + out+="

"+esc(chart.at("title").get())+"

"+esc(last.at("season").get())+""+esc(summary)+"
()+"-Ergebnisse")+"\">"+picture(renderer_.diagram("career-chart-"+std::to_string(kind),svg,4480),2548,403.333333333)+"
"; } - } else out+="

Für den aktuellen Verein ist keine Saisonvorschau verfügbar.

"; - out+=""; + } else out+="

"+std::string(engine_mode_?"Noch keine Saisonergebnisse erfasst.":"Für den aktuellen Verein ist keine Saisonvorschau verfügbar.")+"

"; + out+=""; if(ready&&career_view_.at("dialog")=="history") { - out+="

Vereinsgeschichte

"+report_club_button(club)+"Zwölf abgeschlossene Saisons · fiktive Ergebnisse
"; + out+="

"+std::string(engine_mode_?"Karriereverlauf":"Vereinsgeschichte")+"

"+(engine_mode_?std::string():report_club_button(club))+""+(engine_mode_?esc(data.at("history_caption").get()):"Zwölf abgeschlossene Saisons · fiktive Ergebnisse")+"
"; const std::array heads{"Saison","Meisterschaft","DFB-Pokal","Europapokal"}; for(int i=0;i<4;++i)out+=career_cell(heads[size_t(i)],i?"history-result":"history-season history-heading-season"); out+="
"; diff --git a/src/modern/ui/engine_achievements.cpp b/src/modern/ui/engine_achievements.cpp new file mode 100644 index 0000000..6381b38 --- /dev/null +++ b/src/modern/ui/engine_achievements.cpp @@ -0,0 +1,179 @@ +// SPDX-License-Identifier: GPL-3.0-only +// OpenBMH deviates from the original: shows recorded manager history between +// seasons without inventing future results. +#include "modern/ui/engine_bridge.hpp" +#include +#include +#include +namespace bmh::modern_ui { +namespace { +void check(bool yes, const char *text) { + if (!yes) + throw editor::Error(text); +} +std::string season(int year) { + return std::to_string(year) + "/" + ((year + 1) % 100 < 10 ? "0" : "") + + std::to_string((year + 1) % 100); +} +} // namespace +Json engine_achievements_projection(const Json &bundle, const Json &leagues, + int page) { + validate_engine_desk(bundle); + const auto &read = bundle.at("achievements"), + &meta = bundle.at("desktop").at("meta"); + check(read.value("messageType", "") == "snapshot" && + read.at("data").value("kind", "") == "achievements", + "Erfolge sind hier nicht verfügbar."); + for (const auto *key : {"contractVersion", "careerId", "worldId", + "worldRevision", "stateRevision", "scope"}) + check(read.at("meta").at(key) == meta.at(key), + "Der Karrierekontext hat sich geändert."); + const auto &d = read.at("data"); + check(meta.at("scope").at("role") == "club" && + d.at("managerId") == meta.at("scope").at("managerId") && + d.at("teamId") == meta.at("scope").at("teamId"), + "Die Erfolgsaufzeichnungen gehören einem anderen Manager."); + check(d.at("records").is_array() && d.at("records").size() <= 50, + "Ungültiger Karriereumfang."); + const int max_page = + d.at("records").empty() ? 0 : int((d.at("records").size() - 1) / 8); + check(page >= 0 && page <= max_page, "Diese Karriereseite existiert nicht."); + Json result = { + {"ok", true}, + {"available", d.at("available") == true && !d.at("records").empty()}, + {"fictional", false}, + {"club", d.at("teamId")}, + {"manager", bundle.at("desktop").at("data").at("manager").at("name")}, + {"page", page}, + {"max_page", max_page}, + {"charts", Json::array()}, + {"history", Json::array()}, + {"range", "—"}}; + if (!result.at("available").get()) + return result; + const int current = d.at("currentSeasonYear"); + std::set years; + std::array, 4> bands; + for (const auto &[id, l] : leagues.items()) { + (void)id; + const auto t = l.value("tier", Json()); + if (t.is_number_integer() && t >= 1 && t <= 4) + bands[size_t(t.get() - 1)].insert(l.at("name").get()); + } + Json history = Json::array(); + for (const auto &record : d.at("records")) { + const int year = record.at("year"); + check(year >= 1 && year <= current && years.insert(year).second, + "Doppeltes oder zukünftiges Karrierejahr."); + check(record.at("completed") == Json(year < current), + "Der Saisonstatus ist widersprüchlich."); + const auto label = season(year); + Json values = Json::array(); + const auto &league = record.at("league"); + Json value = league.at("position"), tier = nullptr; + std::string league_name = "—", + placement = league.value("label", std::string()); + if (placement.empty()) + placement = "Nicht erfasst"; + if (!league.at("leagueId").is_null()) { + const auto id = league.at("leagueId").get(); + check(leagues.contains(id), + "Historische Liga fehlt im aktuellen Regelprofil."); + const auto &l = leagues.at(id); + check( + l.at("tier").is_number_integer() && l.at("tier").get() >= 1 && + l.at("tier").get() <= 4, + "Die Spielklasse kann in diesem Diagramm nicht dargestellt werden."); + tier = l.at("tier"); + league_name = l.at("name"); + check(value.is_number_integer() && + league.at("teams").is_number_integer() && value >= 1 && + value <= league.at("teams"), + "Ungültige historische Platzierung."); + placement = std::to_string(value.get()) + ". Platz"; + bands[size_t(tier.get() - 1)].insert(league_name); + } else + check(value.is_null(), "Platzierung ohne Liga."); + values.push_back({{"year", year}, + {"season", label}, + {"value", value}, + {"max_position", league.at("teams")}, + {"tier", tier}, + {"tier_name", league_name}, + {"label", placement}, + {"caption", value.is_number_integer() + ? std::to_string(value.get()) + "." + : "—"}, + {"winner", value == 1}, + {"completed", record.at("completed")}, + {"fictional", false}}); + for (const auto *key : {"cup", "europe"}) { + const auto &cup = record.at(key); + const int stage = cup.at("stage"); + check(stage >= 0 && stage <= 31 && cup.at("winner") == Json(stage == 7), + "Ungültiger Pokalstatus."); + Json progress = stage == 0 ? Json(0) + : stage <= 7 ? Json(1 << (7 - stage)) + : Json(); + const auto text = cup.at("label").get(); + const std::array captions{ + "–", "1. Runde", "2. Runde", "Achtelfinale", "Viertelfinale", + "Halbfinale", "Finale", "Sieger"}; + values.push_back({{"year", year}, + {"season", label}, + {"value", progress}, + {"tier", nullptr}, + {"tier_name", nullptr}, + {"label", text.empty() ? "Nicht erfasst" : text}, + {"caption", stage <= 7 ? captions[size_t(stage)] : "—"}, + {"winner", cup.at("winner")}, + {"completed", record.at("completed")}, + {"fictional", false}}); + } + history.push_back({{"year", year}, + {"season", label}, + {"completed", record.at("completed")}, + {"results", values}}); + } + std::sort(history.begin(), history.end(), [](const auto &a, const auto &b) { + return a.at("year") < b.at("year"); + }); + const size_t end = history.size() - size_t(page) * 8, + start = end > 8 ? end - 8 : 0; + result["range"] = + start + 1 == end + ? history[start].at("season") + : Json(history[start].at("season").get() + " – " + + history[end - 1].at("season").get()); + const std::array titles{"Meisterschaft", "DFB-Pokal", + "Europapokal"}; + Json labels = Json::array(); + for (size_t i = 0; i < 4; ++i) { + std::string name; + for (const auto &n : bands[i]) { + if (!name.empty()) + name += " · "; + name += n; + } + labels.push_back(name.empty() ? "Spielklasse " + std::to_string(i + 1) + : name); + } + for (size_t kind = 0; kind < 3; ++kind) { + Json rows = Json::array(); + for (size_t i = start; i < end; ++i) + rows.push_back(history[i].at("results")[kind]); + result["charts"].push_back({{"kind", kind}, + {"title", titles[kind]}, + {"latest", rows.back()}, + {"seasons", rows}, + {"bands", labels}}); + } + std::reverse(history.begin(), history.end()); + result["history"] = history; + result["history_caption"] = + std::to_string(history.size()) + " erfasste Saison" + + (history.size() == 1 ? "" : "s") + " · Karriere von " + + result.at("manager").get(); + return result; +} +} // namespace bmh::modern_ui diff --git a/src/modern/ui/engine_achievements.inc b/src/modern/ui/engine_achievements.inc new file mode 100644 index 0000000..e6ac0d7 --- /dev/null +++ b/src/modern/ui/engine_achievements.inc @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-3.0-only +int App::career_max_page() const { + if (!engine_mode_) + return 4; + const auto &r = engine_data_.at("achievements"); + return r.value("messageType", "") == "snapshot" && + !r.at("data").at("records").empty() + ? int((r.at("data").at("records").size() - 1) / 8) + : 0; +} +Json App::achievements_data(int page) const { + if (!engine_mode_) { + const auto s = snap(); + return s.world ? demo_achievements(*s.world, s.state, page) + : Json{{"ok", false}, {"available", false}}; + } + const auto *club = world_->find( + "clubs", engine_data_.at("desktop").at("meta").at("scope").at("teamId")); + const auto nation = club ? club->value("nation", Json()) : Json(); + Json leagues = Json::object(); + for (const auto &l : world_->rows("competitions")) + if (l.value("type", "") == "league" && l.value("nation", Json()) == nation) + leagues[l.at("id").get()] = { + {"name", world_->name(l)}, {"tier", l.value("tier", Json())}}; + return engine_achievements_projection(engine_data_, leagues, page); +} diff --git a/src/modern/ui/engine_bridge.cpp b/src/modern/ui/engine_bridge.cpp index 3b91066..793d3f8 100644 --- a/src/modern/ui/engine_bridge.cpp +++ b/src/modern/ui/engine_bridge.cpp @@ -17,7 +17,7 @@ Json from_engine(const cli::Json &v) { return Json::parse(cli::dump_json(v)); } namespace { Json session_snapshot(modern::app::ModernSession &session,uint64_t revision) { Json bundle=Json::object(); - for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision)); + for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision)); validate_engine_desk(bundle);const auto &season=bundle.at("desktop").at("meta").at("season"); bundle["calendar"]=from_engine(session.ui_read(cli::Json::Object{{"kind","calendar"},{"from",season.at("startDate").get()},{"until",season.at("endDate").get()}},revision)); bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle; diff --git a/src/modern/ui/engine_bridge.hpp b/src/modern/ui/engine_bridge.hpp index ed9fa9c..3e0290e 100644 --- a/src/modern/ui/engine_bridge.hpp +++ b/src/modern/ui/engine_bridge.hpp @@ -72,6 +72,8 @@ Json engine_toto_command(const Json &bundle,const Json "e,const std::string Json engine_statistics_projection(const Json &bundle,const Json &read); +Json engine_achievements_projection(const Json &,const Json &,int page); + Json engine_transfer_filters(); Json engine_transfer_projection(const Json &,const Json &); Json engine_transfer_command(const Json &,const Json &,const std::string &); diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index ed5518c..bd009a3 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -169,6 +169,7 @@ void App::engine_event(Rml::Event &event) { if(menu_=="toto"&&toto_event(event))return; if(menu_=="stadium"&&stadium_event(event))return; if(menu_=="transfer"&&transfer_event(event))return; + if(menu_=="achievements"&&career_report_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; @@ -264,6 +265,7 @@ void App::engine_event(Rml::Event &event) { if(menu_=="toto"&&toto_action(action,node))return; if(menu_=="stadium"&&stadium_action(action,node))return; if(menu_=="transfer"&&transfer_action(action,node))return; + if(menu_=="achievements"&&career_report_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; @@ -280,6 +282,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=="achievements"){menu_=id;career_view_=Json::object();refresh();} else if(action=="engine-open"&&id=="transfer"){menu_=id;transfer_view_=Json::object();transfer_dialog_.clear();engine_transfer_sync();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();} @@ -315,5 +318,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_}, - {"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"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_}}; + {"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"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_screens.inc b/src/modern/ui/engine_screens.inc index f6ecd49..71b801f 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=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (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()); + 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=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (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_=="achievements")out+="
"+window("Erfolge",render_achievements())+"
"; if(menu_=="transfer")out+="
"+window("Transfers",render_transfer())+"
"; if(menu_=="stadium")out+="
"+window("Stadion",render_stadium())+"
"; if(menu_=="toto")out+="
"+window("Toto",render_toto())+"
"; @@ -177,6 +178,7 @@ void App::engine_render() { 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(menu_=="achievements"&&career_view_.value("dialog",std::string())=="history"){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#career-report-underlay button,#window-close");for(auto*n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}} if(menu_=="transfer"&&!transfer_dialog_.empty()){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".transfer-overview button,.transfer-overview input,#window-close");for(auto*n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}if(transfer_dialog_=="search"){for(auto*id:{"transfer-criterion-foot","transfer-criterion-type","transfer-search-trait-0","transfer-search-trait-1","transfer-search-trait-2"})if(auto*n=element(id))n->SetAttribute("disabled",true);}} if (engine_busy_) { Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input"); diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc index f704843..7084ec6 100644 --- a/src/modern/ui/engine_state.inc +++ b/src/modern/ui/engine_state.inc @@ -133,3 +133,6 @@ Json transfer_data() const; std::string transfer_money(const Json &) const; bool engine_transfer_action(const std::string &,Rml::Element *); + + int career_max_page() const; + Json achievements_data(int) const; diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index 0841714..db3e8f9 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -1547,6 +1547,7 @@ public: #include "modern/ui/engine_toto.inc" #include "modern/ui/engine_stadium.inc" #include "modern/ui/engine_transfer.inc" +#include "modern/ui/engine_achievements.inc" } // namespace bool is_modern_world(const fs::path &file) { try { diff --git a/tests/modern_achievements_projection_tests.cpp b/tests/modern_achievements_projection_tests.cpp new file mode 100644 index 0000000..0ebaccd --- /dev/null +++ b/tests/modern_achievements_projection_tests.cpp @@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/engine_bridge.hpp" +#include +#include +using namespace bmh::modern_ui; +namespace { +void check(bool yes, const char *why) { + if (!yes) + throw std::runtime_error(why); +} +template void rejected(F f) { + bool caught = false; + try { + f(); + } catch (const std::exception &) { + caught = true; + } + check(caught, "invalid career accepted"); +} +Json fixture(int count) { + const Json meta = {{"contractVersion", "bmh-modern-ui@draft1"}, + {"careerId", "career:test"}, + {"worldId", "world:test"}, + {"worldRevision", "1"}, + {"stateRevision", "7"}, + {"scope", + {{"role", "club"}, + {"managerId", "manager:test"}, + {"teamId", "club:test"}}}}; + Json b; + for (auto *k : {"session", "desktop", "camps", "achievements"}) + b[k] = { + {"messageType", "snapshot"}, {"meta", meta}, {"data", {{"kind", k}}}}; + b["desktop"]["data"].update( + {{"manager", {{"id", "manager:test"}, {"name", "Synthetic Manager"}}}, + {"team", {{"id", "club:test"}}}, + {"accounts", + {{"cash", + {{"currency", "EUR"}, {"minorUnits", 2}, {"minor", "100"}}}}}}); + b["camps"]["data"]["camps"] = Json::array(); + auto &d = b["achievements"]["data"]; + d.update({{"available", count > 0}, + {"managerId", "manager:test"}, + {"teamId", "club:test"}, + {"currentSeasonYear", 2049}, + {"records", Json::array()}}); + for (int i = 0; i < count; ++i) { + const int year = 2000 + i; + d["records"].push_back( + {{"year", year}, + {"completed", year < 2049}, + {"league", + {{"leagueId", "league:test"}, + {"position", 1 + i % 18}, + {"teams", 18}, + {"label", "Original position"}}}, + {"cup", + {{"stage", 7}, {"winner", true}, {"label", "Synthetic cup winner"}}}, + {"europe", + {{"stage", 8}, + {"winner", false}, + {"label", "Original special status"}}}}); + } + return b; +} +Json leagues() { + return {{"league:test", {{"name", "Synthetic third division"}, {"tier", 3}}}}; +} +} // namespace +int main() try { + auto b = fixture(50); + const auto original = b; + auto v = engine_achievements_projection(b, leagues(), 0); + check(b == original, "read mutated source"); + check(v.at("history").size() == 50 && + v.at("charts")[0].at("seasons").size() == 8 && + v.at("max_page") == 6, + "career page size wrong"); + check(v.at("charts")[0].at("seasons")[0].at("year") == 2042 && + v.at("charts")[0].at("latest").at("year") == 2049, + "recent eight seasons wrong"); + auto last = engine_achievements_projection(b, leagues(), 6); + check(last.at("charts")[0].at("seasons").size() == 2 && + last.at("charts")[0].at("seasons")[0].at("year") == 2000, + "oldest page invented missing years"); + check(v.at("charts")[0].at("latest").at("tier") == 3 && + v.at("charts")[0].at("latest").at("max_position") == 18, + "rule tier/position extent lost"); + check(v.at("charts")[1].at("latest").at("value") == 1 && + v.at("charts")[1].at("latest").at("winner") == true, + "cup winner normalization wrong"); + check(v.at("charts")[2].at("latest").at("value").is_null() && + v.at("charts")[2].at("latest").at("label") == + "Original special status", + "unknown special stage invented progress"); + check(!v.at("history")[0].contains("club"), + "manager history attributed to current club"); + auto one = engine_achievements_projection(fixture(1), leagues(), 0); + check(one.at("charts")[0].at("seasons").size() == 1 && + one.at("max_page") == 0, + "single real season padded with fiction"); + check(!engine_achievements_projection(fixture(0), leagues(), 0) + .at("available") + .get(), + "empty history invented"); + auto bad = b; + bad["achievements"]["meta"]["stateRevision"] = "8"; + rejected([&] { engine_achievements_projection(bad, leagues(), 0); }); + bad = b; + bad["achievements"]["data"]["managerId"] = "manager:foreign"; + rejected([&] { engine_achievements_projection(bad, leagues(), 0); }); + bad = b; + bad["achievements"]["data"]["records"][0]["year"] = 2050; + rejected([&] { engine_achievements_projection(bad, leagues(), 0); }); + bad = b; + bad["achievements"]["data"]["records"][1]["year"] = 2000; + rejected([&] { engine_achievements_projection(bad, leagues(), 0); }); + bad = b; + bad["achievements"]["data"]["records"][0]["league"]["position"] = 19; + rejected([&] { engine_achievements_projection(bad, leagues(), 0); }); + rejected([&] { engine_achievements_projection(b, Json::object(), 0); }); + rejected([&] { engine_achievements_projection(b, leagues(), 7); }); + std::cout << "actual manager history: 50 seasons, paging, unknowns, source " + "scope and read purity passed\n"; + return 0; +} catch (const std::exception &e) { + std::cerr << e.what() << '\n'; + return 1; +} diff --git a/tests/modern_engine_bridge_probe.cpp b/tests/modern_engine_bridge_probe.cpp index eb71d91..85b68d2 100644 --- a/tests/modern_engine_bridge_probe.cpp +++ b/tests/modern_engine_bridge_probe.cpp @@ -15,10 +15,15 @@ using namespace bmh::modern_ui; int main(int argc, char **argv) { try { const std::string mode=argc>1?argv[1]:""; - const std::set modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto","verify-stadium","complete-stadium","verify-transfer"}; + const std::set modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto","verify-stadium","complete-stadium","verify-transfer","prepare-achievements"}; if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe "); const fs::path world = argv[2], out = argv[3]; fs::create_directories(out); const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); }; + if(mode=="prepare-achievements") { + auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),17u);ui::SetupOptions options;options.mode=3;options.duration=5;options.difficulty=0;options.world=false;options.managers=1;ui::ManagerChoice manager;manager.name="Career History QA";manager.master_club=0;manager.strength=2;std::string error;ui::CareerInitializationResult result;if(!session.confirm_manager(options,manager,error)||!session.finish(result,error))throw std::runtime_error(error);uint64_t revision=0;Json expiry=Json::object(),log=Json::array();bool reached=false; + for(int step=0;step<1600;++step){if(session.state().season>=9){reached=true;break;}const auto desk=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},revision)));const auto &m=desk.at("meta");const Json command={{"messageType","command"},{"contractVersion",m.at("contractVersion")},{"requestId","request:history-"+std::to_string(step)},{"careerId",m.at("careerId")},{"expectedRevision",m.at("stateRevision")},{"owner",{{"managerId",m.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};const auto response=Json::parse(cli::dump_json(session.ui_command(cli::parse_json(command.dump()),revision)));log.push_back(response);if(response.value("messageType","")!="command_result"){if(response.value("code","")=="decision_pending"){const auto player=response.at("message").at("args").at("playerId").get();expiry[player]={{"action","renew"},{"years",4},{"monthlySalary",{{"currency","EUR"},{"minorUnits",2},{"minor","20000000"}}}};continue;}write("advance.json",log);throw std::runtime_error(response.dump());}} + write("advance.json",log);if(!reached)throw std::runtime_error("nine actual seasons not reached");write("achievements.json",Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","achievements"}},revision))));if(!session.save_game(out/"input.obs",0,false,error))throw std::runtime_error(error);write("receipt.json",{{"status","passed"},{"seasons",session.state().season},{"commands",log.size()},{"gameRulesModified",false},{"policy","mode III, difficulty 0, unlimited duration, club only; four-year renewals at 200000 monthly euros"}});modern::set_current_world(nullptr);std::cout<<"nine actual seasons saved for history paging QA\n";return 0; + } if (mode == "prepare-toto" || mode == "prepare-statistics" || mode == "prepare-almanac" || std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") { auto package = modern::open_world_package(world); content::Mount mount(world, package.classic); modern::set_current_world(package.world);