Bind native manager actions and preserve ongoing Modern standings (by Codex)
This commit is contained in:
1 parent
f9f950fc7f
commit
cf424b6be1
31 files changed
+466
-100
No files matched your search
@@ -52,9 +52,9 @@ jobs:
|
||||
- name: Configure opt-in UI without external assets
|
||||
run: cmake -S . -B build-ui -G Ninja -DCMAKE_BUILD_TYPE=Release -DOPENBMH_BUILD_MODERN_UI=ON -DOPENBMH_BUILD_EDITOR=OFF -DBMH_DATA=
|
||||
- name: Compile native frontend and synthetic checks
|
||||
run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests 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 modern_transfer_read_tests modern_transfer_projection_tests modern_achievements_projection_tests modern_news_projection_tests modern_balance_projection_tests modern_widgets_projection_tests modern_indoor_projection_tests modern_settings_projection_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 modern_transfer_read_tests modern_transfer_projection_tests modern_achievements_projection_tests modern_news_projection_tests modern_balance_projection_tests modern_widgets_projection_tests modern_indoor_projection_tests modern_settings_projection_tests modern_managers_projection_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_|career_files_|statistics_projection_|toto_projection_|toto_quote_|stadium_projection_|transfer_projection_|transfer_read_|achievements_projection_|news_projection_|balance_projection_|widgets_projection_|indoor_projection_|settings_projection_|other_read_|winners_read_|manager_presentation_|coach_identity_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml
|
||||
run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|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_|career_files_|statistics_projection_|toto_projection_|toto_quote_|stadium_projection_|transfer_projection_|transfer_read_|achievements_projection_|news_projection_|balance_projection_|widgets_projection_|indoor_projection_|settings_projection_|managers_projection_|other_read_|winners_read_|manager_presentation_|coach_identity_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml
|
||||
- name: Upload test report
|
||||
if: always()
|
||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||
|
||||
@@ -33,6 +33,7 @@ describe deliberate changes; they are not a list of every known compatibility li
|
||||
- [src/modern/content/world_expand.cpp](../src/modern/content/world_expand.cpp): Modern worlds have league sizes, clubs and players of their own; players whose nation has no single-byte nationality code carry a substitute foreign code.
|
||||
- [src/modern/game/career.cpp](../src/modern/game/career.cpp): in a Modern world a club's place in the strength band of its league follows the data set's ranking of the squads instead of the table place, and its players keep their relative values (balance.md).
|
||||
- [src/modern/game/career.cpp](../src/modern/game/career.cpp): skips reserved calendar positions when assigning a joining manager to a club.
|
||||
- [src/modern/game/career.cpp](../src/modern/game/career.cpp): retains an existing Modern club's league slot when a human joins, preserving its played results.
|
||||
- [src/modern/game/career.hpp](../src/modern/game/career.hpp): uses the supported player-generation ranges and excludes reserved calendar positions when assigning managers.
|
||||
- [src/modern/game/desk_actions.cpp](../src/modern/game/desk_actions.cpp): uses the supported transfer-fee arithmetic and designated set-piece fields.
|
||||
- [src/modern/game/desk_actions.cpp](../src/modern/game/desk_actions.cpp): Modern training camps have grades up to six stars with a capped step, a higher limit and recovery extras.
|
||||
|
||||
@@ -63,3 +63,5 @@ Für 0.3 gilt außerdem:
|
||||
| M9 | Nationalteams mit echten Kadern ([Nationalteams](nationalteams.md)) | Engine erledigt: 24 von 61 Nationen spielen mit Spielern; Mehrspieler-Coachidentität in Session/Archiv korrigiert (#20) |
|
||||
|
||||
Details und Abnahmekriterien stehen in [Phasen](phasen.md).
|
||||
|
||||
Native Manageranbindung (29.10.): reiner Hub-/Vereinskontext, atomarer bestätigter Beitritt über die vorhandenen Sessionmethoden, stabile Namen/Porträts/IDs und Ein-Mensch-Endpfad. Mehrspieler-KI-Übergabe bleibt offen. Die bewusste Modern-Korrektur der Beitrittsplatzierung (#29) ist im Abweichungskatalog dokumentiert. Siehe [Manager-UI](../new_ui/desktop/manager/ENGINE.md).
|
||||
@@ -183,3 +183,7 @@ Vereinszuordnungen bleiben sichtbar. Neue Almanach-Managereinträge nutzen den
|
||||
logischen Menschen. Keine Änderung an Auswahl/Spielen/RNG oder an persistierten
|
||||
Originalrecords. Alte Spielstände brauchen keine neuen Felder; runtimeSlot ist
|
||||
ein optionales Read-Feld. Details und private QA: nationalteams.md.
|
||||
|
||||
### Native Manageranbindung · 29.10.2026
|
||||
|
||||
Hub, aktuelle Vereinszuordnung und atomarer bestätigter Beitritt sind über die vorhandenen Sessionmethoden gebunden. Aktive und archivierte Besitzer bleiben getrennt; Ein-Mensch-Aufgeben und anschließende neue Karriere wurden nativ geprüft. Mehrspieler-KI-Übergabe sowie endgültiger Archivspeicherweg nach dem Karriereende bleiben offen. Modern hält den bestehenden Erstligaplatz beim Beitritt fest (#29), damit gespielte Wertungen nicht durch die ursprüngliche Platzierung vertauscht werden. Classic und Neuanlage unverändert. Siehe [Manager-UI](../new_ui/desktop/manager/ENGINE.md) und [UI-Vertrag](ui-anbindung.md).
|
||||
@@ -120,3 +120,11 @@ Nach der Übergabe (MVP_FOR_CLAUDE.md): A Schreibtisch (dieser Stand) → B Vorb
|
||||
- `indoor-standings`: reiner Club-Read aus der vorhandenen Originalprojektion. `teamId`, `tournaments`, `rows[{rank, points, team:{id,name}}]` (16 beziehungsweise leer vor dem ersten Turnier), `footer`, `indoor`, `scoring: null | {value, places:[{rank,points}]}`. Die Wertung sind Punkte, keine Geldbeträge; Slot-/Spriteformatierung bleibt aus dem Transport. Keine Qualifikations- oder Ziehungsmutatoren, keine zusätzlichen Commands.
|
||||
|
||||
- `settings`: `leagueGroups[{row,competitionId,name}]` bindet A–E an die fünf tatsächlichen deutschen Ligaindizes und ihre Sessionnamen (ID/Name beide `null`, falls unbekannt). Anzeige und Suche verwenden dieselben Namen; keine POC-Namen als tatsächliche Weltbezeichnung. Daneben reine 180-Zellen-Projektion mit `code/raw/displayRaw/value/editable/min/max/step/reason`, fünf Automatiken, vorhandenen Aufstellungsslots und Auswahl. Verfügbarkeitsbits/Spezialwerte bleiben getrennt von booleschen Werten; originale Schalter speichern 0 für An/1 für Aus, `value` und Commandwerte sind semantisch 1 für An/0 für Aus. Neunte Spalte angezeigt halbiert, Rohparität erhalten. `settings.commit` übergibt sparse `edits[{code,value}]` und `automation[{id,enabled,formation?}]`; alle Schritte durch bestehende Dispatcher, gesamte Änderung atomar, eine Revision beziehungsweise echter No-op. Nationale Trainingssperre und vorhandene Aufstellungsmasken bleiben bindend. Kein OBW-/OBS-Formatwechsel.
|
||||
|
||||
### Managerverwaltung (nativer Einstieg)
|
||||
|
||||
`manager-menu` ist ein reiner Read mit `managers`, aktuellen `clubs[{id,leagueId,playable}]`, `canJoin/canResign` und Gründen. `ownerManagerId` ist der Besitzer der Ansicht, auch nach dem Ende. `activeManagerId` ist dann `null`; die Menschen sind archiviert, passend zum Session-Read. Die fünf aktuellen deutschen Spielklassen und die bestehenden ursprünglichen Auswahlkontexte bestimmen die Beitrittsfähigkeit. Keine UI-Zuordnung über die anfängliche OBW-Liga eines inzwischen aufgestiegenen Vereins.
|
||||
|
||||
`manager.join.commit`: `payload {confirmed:true, managers:[{name,club,portrait,portrait_style,strength_choice}]}`. Nur neue Menschen übergeben; vorhandene Menschen sind keine bearbeitbaren Nutzdaten dieses Auftrags. Die Session leitet das Zielvolumen aus ihrer Menschenzahl ab, bewahrt ihre übrigen Startoptionen und durchläuft ihren vorhandenen Beitrittsentwurf atomar. Harter Grenzwert vier; Prüfung von Besitzer/Revision, aktueller deutscher Vereinszugehörigkeit, eindeutigen Vereinen/Porträts, Stil und Unicode-Namen. Eine Revision pro erfolgreichem Auftrag. Die UI bietet jeweils einen neuen Menschen an.
|
||||
|
||||
`manager.resign.commit` bleibt der bestehende bestätigte Ein-Mensch-Endpfad. Mehrspieler-KI-Übergabe bleibt ausdrücklich nicht unterstützt. Moderne Beitritte behalten den aktuellen Erstligaplatz statt der ursprünglichen Neuplatzierung (#29); Classic und Neuanlage unverändert, in `DIFFERENCES.md` markiert.
|
||||
@@ -0,0 +1,24 @@
|
||||
<!-- SPDX-License-Identifier: GPL-3.0-only -->
|
||||
# Tatsächliche Managerverwaltung · 29.10.2026
|
||||
|
||||
Der native Einstieg verwendet denselben Manager-Hub, dieselben Bildkarten und denselben Auswahl-/Bestätigungsdialog wie der Gold-Presenter. Der zusätzliche `manager-menu`-Read liefert Menschen, stabile Identitäten, Porträtindizes/-stile, Rollen, Freigaben und aktuelle Vereins-/Ligazuordnungen. Die Oberfläche greift nicht auf `GameState` zu.
|
||||
|
||||
## Beitritt
|
||||
|
||||
Die Auswahl bleibt vollständig lokal. Belegte Vereine und Porträts sind gesperrt, ausländische Vereine sichtbar und gesperrt. Die Vereinslisten verwenden die **aktuelle** Liga aus der Session, nicht die ursprüngliche OBW-Zuordnung: Ein inzwischen aufgestiegener Verein wird in seiner jetzigen Spielklasse angezeigt und bestätigt. Die bisherigen Menschen bleiben unverändert. Die Oberfläche fügt jeweils einen Menschen hinzu; die Session kann einen atomaren Auftrag mit mehreren neuen Menschen annehmen, insgesamt höchstens vier.
|
||||
|
||||
Erst die abschließende Bestätigung sendet `manager.join.commit` mit `confirmed: true` und den neuen Auswahlen. Besitzer, Karriere und Revision müssen stimmen. Die Session verwendet ihre vorhandenen `begin_manager_join`-, `confirm_manager_join`- und `commit_manager_join`-Methoden. Fehler nehmen den gesamten Entwurf einschließlich Zuständen und Zufallsfolgen zurück. Ein erfolgreicher Auftrag erzeugt eine Revision. Wiederholungen desselben Auftrags sind idempotent; veraltete Aufträge werden abgewiesen.
|
||||
|
||||
Die gemeinsame Namensprüfung bleibt auf 24 Unicode-Zeichen begrenzt. Eine für die alten internen Namensbytes nicht darstellbare Zeichenfolge erhält dort wie bei der Neuanlage einen Ersatz; der tatsächliche UTF-8-Name und der Porträtstil bleiben an der stabilen modernen Manageridentität gespeichert. Es gibt keine neue OBS-Struktur.
|
||||
|
||||
## Aufgeben und Ende
|
||||
|
||||
Aufgeben braucht eine ausdrückliche Bestätigung. Die bestehende Engine unterstützt derzeit das Ende einer Partie mit einem einzigen Menschen. Beim Nationaltrainer gelten dieselben echten Fähigkeiten; Beitritt bleibt dort gesperrt. Bei mehreren Menschen ist Aufgeben sichtbar deaktiviert, weil die Engine die KI-Übergabe noch nicht unterstützt. Vereinssuche bleibt deaktiviert.
|
||||
|
||||
Nach dem Ende gibt es keinen aktiven Menschen. Die Manageransicht behält ihren archivierten Besitzer und seine Identität für die Anzeige; ein archivierter Mensch wird nicht als weiterhin aktiv ausgegeben. Die bestehende Session verweigert reguläres Speichern nach dem Karriereende (`career_complete`); ein abschließender Archivspeicherweg ist hier noch nicht angebunden. Die Ansicht behauptet deshalb keine nachträgliche OBS-Sicherung des Endzustands. Der Rückweg ins Hauptmenü gibt die bisherige Session frei, sodass ein neues Spiel unabhängig angelegt werden kann. Die Rollen-/Hallen-Vorschau des Demo-Hubs wird nicht als wirksamer Karriereumschalter angeboten.
|
||||
|
||||
## Bewusste Modern-Korrektur · #29
|
||||
|
||||
Der ursprüngliche Beitritt verschiebt einen Erstligaverein auf einen vorgesehenen Startplatz. In einem laufenden Winterfall übernimmt er dadurch Punkte und Ergebnisse des anderen Platzes. Modern behält beim Beitritt zu einem bereits in seiner aktuellen Liga befindlichen Verein den bestehenden Platz. Die vorhandenen Wertungen bleiben damit bei ihren stabilen Vereinsidentitäten. Diese Abweichung ist in `modern/game/career.cpp` markiert und im generierten `DIFFERENCES.md` aufgeführt. Classic und die ursprüngliche Neuanlage bleiben unverändert; übrige ursprüngliche Beitrittsinitialisierungen werden wiederverwendet.
|
||||
|
||||
Anstoß bleibt gesperrt. Keine Änderung der Matchdarstellung oder Sound-Engine.
|
||||
@@ -141,3 +141,5 @@ Neustart vor/nach Game End. Ein anschließender enger nativer Lauf bestätigt de
|
||||
Hauptmenü→Neues-Spiel-Anschluss mit sichtbaren Karrieresentinels und unverändert
|
||||
übernommenen bestätigten Optionen. Frühere versiegelte QA-Kohorten werden diesem
|
||||
Folgepatch nicht rückwirkend zugerechnet.
|
||||
|
||||
Die tatsächliche Sessionanbindung beschreibt [ENGINE.md](ENGINE.md). Der getrennte Demo-Hub und seine Vorschau bleiben erhalten; unterstützte Karriereaktionen und noch gesperrte Mehrspieler-Abgabe werden dort ausdrücklich unterschieden.
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
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 Transfermarkt, Erfolgsverlauf, Nachrichtenpostfach, Bilanz, Hallenansichten und Einstellungen/Automatik.
|
||||
von echten Karrierewerten. Stand einschließlich Transfermarkt, Erfolgsverlauf, Nachrichtenpostfach, Bilanz, Hallenansichten, Einstellungen/Automatik und Managerverwaltung.
|
||||
|
||||
Von 32 Desktoprouten sind 29 an Sessiondaten bzw. tatsächliche Aktionen
|
||||
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Zwei weitere
|
||||
Routen besitzen ihre Präsentation, sind im echten Einstieg aber noch nicht
|
||||
Von 32 Desktoprouten sind 30 an Sessiondaten bzw. tatsächliche Aktionen
|
||||
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Eine weitere
|
||||
Route besitzt ihre Präsentation, ist 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
|
||||
Vereinsmenüs.
|
||||
@@ -32,6 +32,7 @@ Vereinsmenüs.
|
||||
| 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 |
|
||||
| Stadion | Acht Blöcke, acht Ausstattungen, Außenansicht, tatsächliche Angebote/Bauzustände und Statistik | Standardbau; optionaler Beschleunigungsdialog noch offen; Parkplatz aktuell binär |
|
||||
| Manager | Tatsächlicher Hub, aktuelle Vereinszuordnung, bestätigter atomarer Beitritt, Ein-Mensch-Aufgeben und Archividentität | Vier Menschen; Nationalbeitritt, Mehrspieler-KI-Übergabe und Vereinssuche gesperrt; [Details](../desktop/manager/ENGINE.md) |
|
||||
| Speichern und Laden | Echte OBS-Dateibibliothek, Metadaten, Ersetzen/Umbenennen/Löschen und Import/Export | Gleiche Welt-ID und Datenrevision; Demo-JSON bleibt separat |
|
||||
|
||||
Die konkreten verbleibenden Besitzer-/Transportlücken und vorhandenen
|
||||
@@ -42,7 +43,6 @@ Dispatcher beschreibt [Nächste Sessionanbindungen](NEXT_ENGINE_BINDINGS.md).
|
||||
| Route | Vorhandene Grundlage | Nächster Integrationsschritt |
|
||||
|---|---|---|
|
||||
| Highscore | Gemeinsamer Presenter und ursprüngliche Ranglistenprojektion | Tatsächlichen Ranglistenbesitzer und Speicherweg anbinden |
|
||||
| Manager | Präsentation für Hinzufügen, Aufgeben und spätere Vereinssuche; Sessionaktionen vorhanden | Join/Abgabe an aktuelle Menschen und Besitzwechsel binden |
|
||||
|
||||
Desktop-Widgets sind ebenfalls noch nicht vollständig gebunden. Statusleiste,
|
||||
Porträt, Kalender, Kasse, bestätigter nächster Gegner, Begegnung, Warnlampen,
|
||||
|
||||
@@ -4,15 +4,15 @@
|
||||
Ausgangspunkt ist `0.3` / `98cff21`. Dies beschreibt offene Arbeit, keine bereits
|
||||
freigegebene API. Der HTML-/Demo-Presenter bleibt die Gestaltungsvorlage.
|
||||
|
||||
## Managerverwaltung
|
||||
## Managerverwaltung · Teilanbindung am 29.10.2026 erfolgt
|
||||
|
||||
Der native Manager-Presenter ist vorhanden. Die tatsächliche Karriere soll ihn
|
||||
Die tatsächliche Hub-/Join-/Ein-Mensch-Endanbindung beschreibt [Manager ENGINE](../desktop/manager/ENGINE.md). Die folgenden Ausgangsbefunde bleiben für die noch offene Mehrspieler-KI-Übergabe relevant. Der native Manager-Presenter ist vorhanden. Die tatsächliche Karriere soll ihn
|
||||
über denselben Sessionbesitzer öffnen; keine Demo-Menschen oder lokalen
|
||||
Besitzwechsel in einer echten Partie.
|
||||
|
||||
- `ModernSession::begin_manager_join`, `manager_join_context`,
|
||||
`confirm_manager_join` und `commit_manager_join` existieren. Der JSON-Adapter
|
||||
fehlt. Auswahl und Entwurf müssen an Besitzer, Revision und aktuelle
|
||||
ist inzwischen über `manager.join.commit` angebunden. Auswahl und Entwurf müssen an Besitzer, Revision und aktuelle
|
||||
Startoptionen gebunden bleiben. Bereits belegte Vereine und Porträts sowie
|
||||
die tatsächlich noch verfügbaren Plätze kommen aus dem Auswahlkontext.
|
||||
- Die erste Bestätigung darf noch keine laufende Karriere überschreiben.
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include "modern/game/modern_state.hpp"
|
||||
#include "modern/app/modern_session.hpp"
|
||||
#include "modern/content/press_journal.hpp"
|
||||
#include "modern/content/manager_name.hpp"
|
||||
#include "modern/content/world_expand.hpp"
|
||||
#include "modern/content/world_package.hpp"
|
||||
#include "modern/content/toto_quote.hpp"
|
||||
@@ -8827,6 +8828,8 @@ cli::Json ModernSession::read_statistics_screen(const cli::Json& request) const
|
||||
return answer;
|
||||
}
|
||||
|
||||
#include "modern/app/ui_managers.inc"
|
||||
|
||||
cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) const {
|
||||
using O = cli::Json::Object;
|
||||
using A = cli::Json::Array;
|
||||
@@ -8840,6 +8843,14 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
|
||||
context.career_ended = career_complete();
|
||||
const std::string kind = ui_text(request, "kind"), request_id = ui_text(request, "requestId");
|
||||
const int manager = context.manager;
|
||||
if (kind == "manager-menu") {
|
||||
if (manager < 0 || size_t(manager) >= g_.manager_teams.size())
|
||||
return modern::ui_error(request_id, "no_manager", "Kein aktiver Manager.", revision, false);
|
||||
if (const auto 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);
|
||||
try { return modern::ui_snapshot(g_,context,request_id,ui_manager_menu_data(revision)); }
|
||||
catch(const std::exception &e) { return modern::ui_error(request_id,"manager_menu_unavailable",e.what(),revision,false); }
|
||||
}
|
||||
if (kind == "settings") {
|
||||
if (manager < 0 || manager > 3 || size_t(manager) >= g_.manager_teams.size())
|
||||
return modern::ui_error(request_id, "no_manager", "Kein aktiver Manager.", revision, false);
|
||||
@@ -10493,6 +10504,9 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
|
||||
if (result == EnvironmentResult::changed) revision = previous + 1;
|
||||
answer = modern::ui_command_result(request_id, previous, revision, {"environment", "desktop"},
|
||||
message.empty() ? "Umfeld geändert." : ui::original_to_utf8(message));
|
||||
} else if (kind == "manager.join.commit") {
|
||||
answer = ui_join_managers(*payload,request_id,revision);
|
||||
if (ui_text(answer,"messageType")=="error") return answer;
|
||||
} else if (kind == "manager.resign.commit") {
|
||||
// payload {confirmed: true}. A Modern feature (the original has no resigning): when the last
|
||||
// human manager resigns the career ends (outcome career_ended, sessionState "ended"). With
|
||||
|
||||
@@ -992,6 +992,8 @@ private:
|
||||
int runtime_club(int master) const;
|
||||
int runtime_club(const ModernState&, int master) const;
|
||||
ui::SelectionContext selection_context_for(const ModernState&, uint64_t revision) const;
|
||||
cli::Json ui_manager_menu_data(uint64_t revision) const;
|
||||
cli::Json ui_join_managers(const cli::Json&, const std::string&, uint64_t&);
|
||||
struct ManagerJoinDraft {
|
||||
ModernState state;
|
||||
WatcomRandom rand;
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
cli::Json ModernSession::ui_manager_menu_data(uint64_t revision) const {
|
||||
using O=cli::Json::Object;using A=cli::Json::Array;
|
||||
const int manager=int(g_.memory.u8(::bmh::layout::ActiveManager));
|
||||
UiContext context;context.manager=manager;context.state_revision=revision;context.career_ended=career_complete();
|
||||
const auto session=modern::ui_read(g_,context,O{{"kind","session"}});
|
||||
const auto *data=ui_field(session,"data");
|
||||
const auto *humans=data?ui_field(*data,"managers"):nullptr;
|
||||
if(!humans||!humans->array())throw FormatError("manager identities unavailable");
|
||||
A archived;
|
||||
if(context.career_ended) {
|
||||
const auto *ids=ui_field(*data,"archivedManagerIds");
|
||||
if(!ids||!ids->array()||ids->array()->size()>4)throw FormatError("archived manager identities unavailable");
|
||||
for(size_t i=0;i<ids->array()->size();++i) {
|
||||
auto person=modern::ui_manager(g_,g_.manager_record_slot(int(i)));
|
||||
if(ui_text(person,"id")!=*ids->array()->at(i).string())throw FormatError("archived manager identity mismatch");
|
||||
archived.push_back(std::move(person));
|
||||
}
|
||||
}
|
||||
A people,clubs;
|
||||
const auto &rows=context.career_ended?archived:*humans->array();
|
||||
for(const auto &person:rows) {
|
||||
const auto *slot=ui_field(person,"runtimeSlot");
|
||||
if(!person.object()||!slot||!slot->integer()||*slot->integer()<0||*slot->integer()>4)throw FormatError("invalid manager identity");
|
||||
O row=*person.object();row["portrait"]=int(g_.manager_records.at(size_t(*slot->integer())*0xb0c+0x221));people.push_back(std::move(row));
|
||||
}
|
||||
const bool blocked=live_||calendar_advance_active_||manager_join_||contract_quote_||transfer_offer_editor_||poach_||
|
||||
stadium_.investment||stadium_.tip||stadium_.periphery_quote||stadium_.block_expansion||desk_settings_owner_||live_settings_owner_||
|
||||
balance_draft_||strengths_owner_||top_scorers_owner_||opportunities_owner_||other_games_owner_||league_family_owner_||league_pairings_draft_;
|
||||
bool join=!context.career_ended&&!blocked&&g_.manager_teams.at(size_t(manager))!=no_team()&&people.size()<4;
|
||||
try { join=join&&manager_choices(revision).size()==people.size(); }catch(const std::exception &){join=false;}
|
||||
const auto *world=modern::current_world();
|
||||
const auto selection=selection_context(revision);
|
||||
for(int team=0;world&&team<league_clubs();++team) {
|
||||
const auto id=modern::ui_team_id(g_,team);const auto *club=world->club(id);const int league=team_league(team);
|
||||
if(!club||league<0||size_t(league)>=g_.world_league_id.size())continue;
|
||||
const bool playable=team<german_clubs()&&club->legacy_index>=0&&size_t(team)<selection.club_order.size()&&selection.club_order[size_t(team)]==club->legacy_index;
|
||||
clubs.push_back(O{{"id",id},{"leagueId",g_.world_league_id[size_t(league)]},{"playable",playable}});
|
||||
}
|
||||
return O{{"kind","manager-menu"},{"activeManagerId",context.career_ended?cli::Json(nullptr):cli::Json(modern::ui_manager_id(g_,manager))},{"ownerManagerId",modern::ui_manager_id(g_,manager)},
|
||||
{"ended",context.career_ended},{"canJoin",join},{"canResign",!context.career_ended&&!blocked&&people.size()==1},
|
||||
{"joinReason",join?"":people.size()>=4?"Es können höchstens vier Menschen mitspielen.":"In dieser Phase kann kein Mitspieler hinzugefügt werden."},
|
||||
{"resignReason",people.size()>1?"Die Übergabe an die KI bei mehreren Menschen ist noch nicht verfügbar.":blocked?"Bitte die offene Entscheidung zuerst abschließen.":""},
|
||||
{"surface",g_.indoor?"indoor":"outdoor"},{"managers",std::move(people)},{"clubs",std::move(clubs)}};
|
||||
}
|
||||
cli::Json ModernSession::ui_join_managers(const cli::Json &payload,const std::string &request_id,uint64_t &revision) {
|
||||
const auto previous=revision;
|
||||
auto checkpoint=manager_join_checkpoint();
|
||||
try {
|
||||
const auto menu=ui_manager_menu_data(revision);const auto *can=ui_field(menu,"canJoin");
|
||||
if(!can||!std::holds_alternative<bool>(can->value)||!std::get<bool>(can->value))throw FormatError(ui_text(menu,"joinReason"));
|
||||
const auto *confirmed=ui_field(payload,"confirmed"),*offered=ui_field(payload,"managers");
|
||||
const size_t old_count=ui_field(menu,"managers")->array()->size();
|
||||
if(!confirmed||!std::holds_alternative<bool>(confirmed->value)||!std::get<bool>(confirmed->value)||
|
||||
!offered||!offered->array()||offered->array()->empty()||old_count+offered->array()->size()>4)throw FormatError("confirmed manager choices required");
|
||||
const auto desk=desktop_projection(revision);auto options=desk.options;options.managers=int(old_count+offered->array()->size());
|
||||
ui::DeskRequest origin;origin.kind=ui::DeskRequestKind::open_menu;origin.menu_kind=29;origin.manager_slot=desk.manager_slot;origin.revision=revision;
|
||||
std::string error;if(!begin_manager_join(origin,options,revision,error))throw FormatError(error);
|
||||
std::vector<std::string> names,styles;
|
||||
for(const auto &person:*offered->array()) {
|
||||
const auto name=modern::normalized_manager_name(ui_text(person,"name"));const auto id=ui_text(person,"club"),style=ui_text(person,"portrait_style");
|
||||
const auto *portrait=ui_field(person,"portrait"),*strength=ui_field(person,"strength_choice");
|
||||
if(!name||(style!="photo"&&style!="painted")||!portrait||!portrait->integer()||*portrait->integer()<0||*portrait->integer()>11||
|
||||
!strength||!strength->integer()||*strength->integer()<0||*strength->integer()>2)throw FormatError("invalid manager choice");
|
||||
const auto *world=modern::current_world();const auto *club=world?world->club(id):nullptr;
|
||||
if(!club||club->legacy_index<0)throw FormatError("unknown selectable club");
|
||||
const auto context=manager_join_context();const auto found=std::find(context.club_order.begin(),context.club_order.end(),club->legacy_index);
|
||||
if(found==context.club_order.end())throw FormatError("club no longer selectable");
|
||||
const auto selected=int(found-context.club_order.begin());
|
||||
if(selected>=german_clubs())throw FormatError("only current domestic league clubs are selectable");
|
||||
const int league=team_league(selected);
|
||||
if(league<0||league>4)throw FormatError("only current domestic league clubs are selectable");
|
||||
ui::ManagerChoice choice;choice.slot=int(old_count+names.size());choice.master_club=club->legacy_index;choice.selection_club=selected;
|
||||
choice.start_league=league;choice.roster_revision=context.revision;choice.portrait=int(*portrait->integer());choice.strength=int(*strength->integer());
|
||||
try {choice.name=ui::utf8_to_original(*name);}catch(const std::exception &){choice.name="Manager "+std::to_string(choice.slot+1);}
|
||||
if(choice.name.empty()||choice.name.size()>24)choice.name="Manager "+std::to_string(choice.slot+1);
|
||||
if(!confirm_manager_join(choice,error))throw FormatError(error);names.push_back(*name);styles.push_back(style);
|
||||
}
|
||||
ui::CareerInitializationResult result;if(!commit_manager_join(result,revision,error))throw FormatError(error);
|
||||
for(size_t i=0;i<names.size();++i) {
|
||||
if(modern::ui_team_id(g_,g_.manager_teams.at(old_count+i))!=ui_text(offered->array()->at(i),"club"))throw FormatError("manager assigned to a different club");
|
||||
g_.manager_presentations.push_back({g_.manager_ids.at(old_count+i),names[i],styles[i]});
|
||||
}
|
||||
return modern::ui_command_result(request_id,previous,revision,{"session","desktop","manager-menu","squad","lineup"},"Mitspieler hinzugefügt.");
|
||||
}catch(const std::exception &e){restore_manager_join_checkpoint(std::move(checkpoint));revision=previous;return modern::ui_error(request_id,"manager_join_refused",e.what(),revision,false);}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#pragma once
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
namespace bmh::modern {
|
||||
inline std::optional<std::string> normalized_manager_name(std::string_view raw) {
|
||||
const auto whitespace = [](uint32_t c) {
|
||||
return c == 0x20 || c == 0xa0 || c == 0x1680 ||
|
||||
(c >= 0x2000 && c <= 0x200a) || c == 0x2028 || c == 0x2029 ||
|
||||
c == 0x202f || c == 0x205f || c == 0x3000 || c == 0xfeff;
|
||||
};
|
||||
size_t first = raw.size(), last = 0, count = 0, pending_spaces = 0;
|
||||
for (size_t at = 0; at < raw.size();) {
|
||||
const auto start = at;
|
||||
const auto byte = uint8_t(raw[at++]);
|
||||
uint32_t value = byte;
|
||||
int remaining = 0;
|
||||
if (byte >= 0xc2 && byte <= 0xdf) {
|
||||
value &= 31;
|
||||
remaining = 1;
|
||||
} else if (byte >= 0xe0 && byte <= 0xef) {
|
||||
value &= 15;
|
||||
remaining = 2;
|
||||
} else if (byte >= 0xf0 && byte <= 0xf4) {
|
||||
value &= 7;
|
||||
remaining = 3;
|
||||
} else if (byte >= 128)
|
||||
return {};
|
||||
const auto encoded_length = remaining;
|
||||
while (remaining--) {
|
||||
if (at == raw.size() || (uint8_t(raw[at]) & 0xc0) != 0x80)
|
||||
return {};
|
||||
value = value * 64 + (uint8_t(raw[at++]) & 63);
|
||||
}
|
||||
if ((encoded_length == 1 && value < 0x80) ||
|
||||
(encoded_length == 2 && value < 0x800) ||
|
||||
(encoded_length == 3 && value < 0x10000) || value > 0x10ffff ||
|
||||
(value >= 0xd800 && value <= 0xdfff) || value < 32 ||
|
||||
(value >= 127 && value <= 159))
|
||||
return {};
|
||||
if (whitespace(value)) {
|
||||
if (count)
|
||||
pending_spaces = std::min(size_t(25), pending_spaces + 1);
|
||||
continue;
|
||||
}
|
||||
if (!count)
|
||||
first = start;
|
||||
count += pending_spaces + 1;
|
||||
pending_spaces = 0;
|
||||
if (count > 24)
|
||||
return {};
|
||||
last = at;
|
||||
}
|
||||
if (!count)
|
||||
return {};
|
||||
return std::string(raw.substr(first, last - first));
|
||||
}
|
||||
}
|
||||
@@ -154,7 +154,7 @@ A allowed_commands(const ModernState& g, const UiContext& c) {
|
||||
"session.advance", "lineup.commit", "tactics.commit", "friendly.book", "manager.resign.commit",
|
||||
"training.commit", "camp.book", "bank.commit", "toto.submit", "quote.request", "contract.offer",
|
||||
"stadium.commit", "advertising.accept", "budget.commit", "ticket.commit", "transfer.submit",
|
||||
"sponsor.answer", "environment.commit", "fixture.reschedule", "contract.cancel", "news.update", "balance.commit", "settings.commit"};
|
||||
"sponsor.answer", "environment.commit", "fixture.reschedule", "contract.cancel", "news.update", "balance.commit", "settings.commit", "manager.join.commit"};
|
||||
A out;
|
||||
for (size_t i = 0; i < std::size(kAll); ++i)
|
||||
if (!national || i < 5 || std::string(kAll[i]) == "settings.commit") out.push_back(kAll[i]);
|
||||
|
||||
@@ -571,7 +571,10 @@ bool career_add_manager(ModernState& g, const LeImage& exe, int m, const CareerM
|
||||
set_club_strength(g, team, 0, rand);
|
||||
place = 0;
|
||||
}
|
||||
if (league == 0 && place != 0) {
|
||||
// OpenBMH deviates from the original: retains an existing Modern club's
|
||||
// league slot when a human joins, preserving its played results.
|
||||
const bool keep_existing_slot = adding && !g.world_club_id.empty() && team_league(team) == league;
|
||||
if (league == 0 && place != 0 && !keep_existing_slot) {
|
||||
if (adding) remove_join_transfers(g, place);
|
||||
modern::clubs_change_places(g, int16_t(team_of(g, m)), place);
|
||||
}
|
||||
|
||||
@@ -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 engine_achievements.cpp engine_news.cpp engine_balance.cpp engine_widgets.cpp engine_indoor.cpp engine_settings.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 engine_news.cpp engine_balance.cpp engine_widgets.cpp engine_indoor.cpp engine_settings.cpp engine_managers.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)
|
||||
@@ -165,3 +165,7 @@ if(MSVC)
|
||||
target_compile_options(modern_engine_dto_tests PRIVATE /utf-8)
|
||||
target_compile_options(modern_engine_bridge_probe PRIVATE /utf-8 /bigobj)
|
||||
endif()
|
||||
|
||||
add_executable(modern_managers_projection_tests "${CMAKE_SOURCE_DIR}/tests/modern_managers_projection_tests.cpp")
|
||||
target_link_libraries(modern_managers_projection_tests PRIVATE bmh_modern_ui_core)
|
||||
add_test(NAME modern_managers_projection_tests COMMAND modern_managers_projection_tests)
|
||||
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
bool App::career_action(const std::string &action, Rml::Element *target) {
|
||||
if (scene_ != "managerhub" || !source_ || !popup_.empty())
|
||||
if(engine_mode_)return engine_manager_action(action,target);
|
||||
if (scene_ != "managerhub" || (!source_&&!engine_mode_) || !popup_.empty())
|
||||
return false;
|
||||
const auto id =
|
||||
target ? target->GetAttribute<Rml::String>("data-id", "") : "";
|
||||
@@ -91,7 +92,7 @@ bool App::career_action(const std::string &action, Rml::Element *target) {
|
||||
return false;
|
||||
}
|
||||
bool App::career_event(Rml::Event &event) {
|
||||
if (scene_ != "managerhub" || !source_ || !popup_.empty())
|
||||
if (scene_ != "managerhub" || (!source_&&!engine_mode_) || !popup_.empty())
|
||||
return false;
|
||||
const auto type = event.GetType();
|
||||
const bool keyboard = type == "keydown";
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
std::string App::render_career() {
|
||||
const auto s = snap();
|
||||
const auto c = demo_career_context(s.state, *s.world);
|
||||
const auto c = engine_mode_?engine_career_context():demo_career_context(snap().state,*snap().world);
|
||||
const bool ended = c.at("ended");
|
||||
const auto &m = manager(s);
|
||||
const Json m = engine_mode_?engine_manager_value_.at("active"):manager(snap());
|
||||
std::string body =
|
||||
"<section class=\"career-hub\"><header><div><h2>" +
|
||||
esc(ended ? "Karriere beendet" : m.value("name", "")) + "</h2><p>" +
|
||||
@@ -16,7 +15,7 @@ std::string App::render_career() {
|
||||
person.value("portrait", 0) == m.value("portrait", 0) ? "selected" : "",
|
||||
"id=\"career-manager-" + std::to_string(person.value("portrait", 0)) +
|
||||
"\" data-id=\"" + std::to_string(person.value("portrait", 0)) +
|
||||
"\" aria-pressed=\"" +
|
||||
"\" " + (engine_mode_?"disabled ":"") + "aria-pressed=\"" +
|
||||
(person.value("portrait", 0) == m.value("portrait", 0) ? "true"
|
||||
: "false") +
|
||||
"\"");
|
||||
@@ -33,11 +32,11 @@ std::string App::render_career() {
|
||||
"id=\"" + action + "\" " + (disabled ? "disabled" : ""));
|
||||
};
|
||||
body += card("career-resign", "manager.resign", "Aufgeben",
|
||||
"Dein Amt abgeben", "career-resign", ended) +
|
||||
engine_mode_&&engine_manager_value_.at("can_resign")!=true?"Mehrspieler folgt":"Dein Amt abgeben", "career-resign", ended||(engine_mode_&&engine_manager_value_.at("can_resign")!=true)) +
|
||||
card("career-search", "manager.search", "Vereinssuche", "Später",
|
||||
"career-search", true) +
|
||||
card("career-add", "manager.add", "Neuer Spieler",
|
||||
"Weiteren Menschen einrichten", "career-add", ended) +
|
||||
"Weiteren Menschen einrichten", "career-add", ended||(engine_mode_&&engine_manager_value_.at("can_join")!=true)) +
|
||||
"</div><footer><section><span>Dein Aufgabenbereich</span><div>";
|
||||
for (const auto &role : c.at("available_roles")) {
|
||||
const auto id = role.get<std::string>();
|
||||
@@ -46,21 +45,23 @@ std::string App::render_career() {
|
||||
"id=\"career-role-" + id + "\" data-id=\"" + id +
|
||||
"\" aria-pressed=\"" +
|
||||
(c.at("role") == role ? "true" : "false") + "\" " +
|
||||
(ended ? "disabled" : ""));
|
||||
(ended||engine_mode_ ? "disabled" : ""));
|
||||
}
|
||||
body += "</div></section><section><span>Aufstellung · Vorschau</span><div>";
|
||||
for (const auto *surface : {"outdoor", "indoor"})
|
||||
for (const auto *surface : {"outdoor", "indoor"}) {
|
||||
if(engine_mode_&&c.at("surface")!=surface)continue;
|
||||
body += btn("career-surface",
|
||||
std::string(surface) == "indoor" ? "Halle · 6 Spieler"
|
||||
std::string(surface) == "indoor" ? (engine_mode_?"Halle · Wechselpaare":"Halle · 6 Spieler")
|
||||
: "Rasen · 11 Spieler",
|
||||
c.at("surface") == surface ? "selected" : "",
|
||||
"id=\"career-surface-" + std::string(surface) +
|
||||
"\" data-id=\"" + surface + "\" aria-pressed=\"" +
|
||||
(c.at("surface") == surface ? "true" : "false") + "\" " +
|
||||
(ended || (std::string(surface) == "indoor" &&
|
||||
(ended || engine_mode_ || (std::string(surface) == "indoor" &&
|
||||
c.at("role") == "national")
|
||||
? "disabled"
|
||||
: ""));
|
||||
}
|
||||
body += "</div></section></footer></section>";
|
||||
if (career_resign_open_ || career_game_end_) {
|
||||
body = "<div id=\"career-underlay\" aria-hidden=\"true\">" + body +
|
||||
@@ -79,12 +80,12 @@ std::string App::render_career() {
|
||||
else {
|
||||
std::vector<std::pair<std::string, std::string>> people;
|
||||
for (const auto &person : c.at("active_managers")) {
|
||||
const auto *club = s.world->find("clubs", person.value("club", ""));
|
||||
const auto *club = world_->find("clubs", person.value("club", ""));
|
||||
people.emplace_back(
|
||||
std::to_string(person.value("portrait", 0)),
|
||||
person.value("name", "") + " · " +
|
||||
(s.state.at("edits").at("setup").value("league", true)
|
||||
? (club ? s.world->name(*club) : "")
|
||||
((engine_mode_?c.at("role")!="national":snap().state.at("edits").at("setup").value("league", true))
|
||||
? (club ? world_->name(*club) : "")
|
||||
: "Deutschland"));
|
||||
}
|
||||
body +=
|
||||
|
||||
@@ -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","achievements","news","balance","desktop-widgets","indoor-standings","settings"})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","news","balance","desktop-widgets","indoor-standings","settings","manager-menu"})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<std::string>()},{"until",season.at("endDate").get<std::string>()}},revision));
|
||||
bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle;
|
||||
|
||||
@@ -74,6 +74,8 @@ Json engine_statistics_projection(const Json &bundle,const Json &read);
|
||||
|
||||
Json engine_widgets_projection(const Json &bundle);
|
||||
Json engine_indoor_projection(const Json &bundle);
|
||||
Json engine_manager_projection(const Json &);
|
||||
Json engine_manager_command(const Json &, const Json &, const std::string &, bool resign = false);
|
||||
Json engine_settings_projection(const Json &bundle);
|
||||
Json engine_settings_command(const Json &bundle, const Json &draft, const std::string &request_id);
|
||||
Json engine_balance_projection(const Json &,const Json &);
|
||||
|
||||
@@ -36,6 +36,7 @@ void App::engine_accept(EngineReply result) {
|
||||
engine_balance_sync();
|
||||
engine_indoor_sync();
|
||||
engine_settings_sync();
|
||||
engine_manager_sync();
|
||||
engine_contracts_poll();
|
||||
engine_calendar_sync();
|
||||
engine_friendly_sync();
|
||||
@@ -163,6 +164,20 @@ void App::engine_event(Rml::Event &event) {
|
||||
if (node->GetId() == "native-ticket-layer") return; // owned by the compact control
|
||||
if (ticket_ && ticket_->is_open()) return;
|
||||
if (amount_event(event)) return;
|
||||
if(menu_=="newplayer"&&popup_.empty()) {
|
||||
if(engine_busy_){event.StopImmediatePropagation();return;}
|
||||
if(scene_=="manager") {
|
||||
if(entry_event(event))return;
|
||||
if(type=="change"&&(entry_change(target)||entry_input(target)))return;
|
||||
if(type=="input"&&entry_input(target))return;
|
||||
} else if(career_event(event))return;
|
||||
if(type=="keydown") {
|
||||
const auto key=Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier",0));
|
||||
if(key==Rml::Input::KI_RETURN||key==Rml::Input::KI_SPACE)for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->GetTagName()=="button"&&!n->HasAttribute("disabled")){n->DispatchEvent("click",{});event.StopImmediatePropagation();return;}
|
||||
}
|
||||
if(type=="click")for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->HasAttribute("data-action")&&!n->HasAttribute("disabled")){const auto action=n->GetAttribute<Rml::String>("data-action","");if(scene_=="manager")entry_action(action,n);else career_action(action,n);event.StopImmediatePropagation();return;}
|
||||
return;
|
||||
}
|
||||
if (menu_ == "settings") {
|
||||
if (engine_busy_) { event.StopImmediatePropagation(); return; }
|
||||
if (settings_event(event)) return;
|
||||
@@ -320,6 +335,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=="newplayer"){menu_=id;scene_="managerhub";career_resign_open_=career_game_end_=false;engine_manager_context_=engine_data_.at("desktop").at("meta");focus_after_render_="career-add";refresh();}
|
||||
else if(action=="engine-open"&&id=="settings"){reset_settings();menu_=id;refresh();}
|
||||
else if(action=="engine-open"&&id=="indoor"){menu_=id;engine_reports_sync();refresh();}
|
||||
else if(action=="engine-open"&&id=="balance"){menu_=id;balance_future_=false;engine_balance_feedback_="Gebuchte Saisonwerte.";refresh();}
|
||||
@@ -360,5 +376,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_},
|
||||
{"settings_value",engine_settings_value_},{"settings_context",engine_settings_context_},{"indoor_value",engine_indoor_value_},{"balance_future",engine_balance_future_},{"balance_edits",engine_balance_edits_},{"balance_view_future",balance_future_},{"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"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_}};
|
||||
{"manager_value",engine_manager_value_},{"manager_context",engine_manager_context_},{"manager_operation",engine_manager_operation_},{"settings_value",engine_settings_value_},{"settings_context",engine_settings_context_},{"indoor_value",engine_indoor_value_},{"balance_future",engine_balance_future_},{"balance_edits",engine_balance_edits_},{"balance_view_future",balance_future_},{"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"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_}};
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include "modern/ui/model.hpp"
|
||||
#include <set>
|
||||
#include <algorithm>
|
||||
namespace bmh::modern_ui {
|
||||
namespace { void manager_require(bool yes,const char *text){if(!yes)throw editor::Error(text);} }
|
||||
Json engine_manager_projection(const Json &bundle) {
|
||||
validate_engine_desk(bundle);
|
||||
const auto &read=bundle.at("manager-menu"),&meta=bundle.at("desktop").at("meta");
|
||||
manager_require(read.value("messageType","")=="snapshot"&&read.at("data").value("kind","")=="manager-menu","Managerverwaltung nicht verfügbar.");
|
||||
for(auto *key:{"contractVersion","careerId","worldId","worldRevision","stateRevision","scope"})manager_require(read.at("meta").at(key)==meta.at(key),"Die Manageransicht ist veraltet.");
|
||||
const auto &d=read.at("data");
|
||||
manager_require(d.at("activeManagerId")== (d.at("ended")==true?Json():meta.at("scope").at("managerId"))&&d.at("managers").is_array()&&!d.at("managers").empty()&&d.at("managers").size()<=4&&d.at("clubs").is_array(),"Ungültiger Managerkontext.");
|
||||
manager_require(d.at("ownerManagerId").is_string()&&d.at("ownerManagerId")==meta.at("scope").at("managerId")&&(d.at("ended")==true||d.at("ownerManagerId")==d.at("activeManagerId")),"Ungültiger Besitzer der Manageransicht.");
|
||||
for(auto *key:{"ended","canJoin","canResign"})manager_require(d.at(key).is_boolean(),"Ungültige Managerfreigabe.");
|
||||
manager_require(!d.at("ended").get<bool>()||(!d.at("canJoin").get<bool>()&&!d.at("canResign").get<bool>()),"Beendete Karriere hat Schreibrechte.");
|
||||
manager_require(!d.at("canResign").get<bool>()||d.at("managers").size()==1,"Mehrspieler-Abgabe ist nicht unterstützt.");
|
||||
manager_require(!d.at("canJoin").get<bool>()||(d.at("managers").size()<4&&meta.at("scope").at("role")=="club"),"Unzulässiger Mitspielereintritt.");
|
||||
manager_require(d.at("surface")=="outdoor"||d.at("surface")=="indoor","Ungültige Spielfeldoberfläche.");
|
||||
Json draft=Json::array(),clubs=Json::object(),active;std::set<std::string> ids;
|
||||
for(const auto &person:d.at("managers")) {
|
||||
manager_require(person.at("id").is_string()&&ids.insert(person.at("id").get<std::string>()).second&&person.at("name").is_string()&&person.at("portrait").is_number_integer()&&person.at("portrait")>=0&&person.at("portrait")<12&&person.at("portraitStyle").is_string(),"Ungültige Manageridentität.");
|
||||
const auto style=person.at("portraitStyle").get<std::string>();manager_require(style=="photo"||style=="painted","Ungültiger Porträtstil.");
|
||||
if(person.at("id")==d.at("ownerManagerId"))active=person;
|
||||
draft.push_back({{"id",person.at("id")},{"name",person.at("name")},{"club",person.at("teamId").is_string()?person.at("teamId"):Json("")},{"portrait",person.at("portrait")},{"portrait_style",style},{"strength_choice",1}});
|
||||
}
|
||||
manager_require(active.is_object(),"Aktiver Manager fehlt.");
|
||||
for(const auto &c:d.at("clubs")) {
|
||||
manager_require(c.at("id").is_string()&&!c.at("id").get<std::string>().empty()&&!clubs.contains(c.at("id").get<std::string>())&&c.at("leagueId").is_string()&&!c.at("leagueId").get<std::string>().empty()&&c.at("playable").is_boolean(),"Ungültige aktuelle Vereinszuordnung.");
|
||||
clubs[c.at("id").get<std::string>()]=c;
|
||||
}
|
||||
return {{"ended",d.at("ended")},{"can_join",d.at("canJoin")},{"can_resign",d.at("canResign")},{"join_reason",d.at("joinReason")},{"resign_reason",d.at("resignReason")},{"active",active},{"people",d.at("managers")},{"draft_managers",draft},{"clubs",clubs},{"role",meta.at("scope").at("role")},{"surface",d.at("surface")}};
|
||||
}
|
||||
Json engine_manager_command(const Json &bundle,const Json &candidate,const std::string &request_id,bool resign) {
|
||||
const auto value=engine_manager_projection(bundle),&meta=bundle.at("desktop").at("meta");const auto kind=resign?"manager.resign.commit":"manager.join.commit";
|
||||
const auto commands=meta.at("scope").at("allowedCommands");manager_require(!request_id.empty()&&std::find(commands.begin(),commands.end(),Json(kind))!=commands.end(),"Diese Manageraktion ist gesperrt.");
|
||||
Json payload={{"confirmed",true}};
|
||||
if(resign)manager_require(value.at("can_resign")==true,"Aufgeben ist hier nicht verfügbar.");
|
||||
else {
|
||||
manager_require(value.at("can_join")==true&&candidate.is_array()&&candidate.size()==value.at("draft_managers").size()+1,"Ungültige Mitspielerauswahl.");
|
||||
std::set<int> portraits;std::set<std::string> clubs;
|
||||
for(size_t i=0;i<value.at("draft_managers").size();++i){manager_require(candidate[i]==value.at("draft_managers")[i],"Bestehende Manager dürfen nicht geändert werden.");portraits.insert(candidate[i].at("portrait").get<int>());clubs.insert(candidate[i].at("club").get<std::string>());}
|
||||
const auto &m=candidate.back();const auto name=normalized_manager_name(m.at("name").get<std::string>());const auto id=m.at("club").get<std::string>();
|
||||
manager_require(name&&value.at("clubs").contains(id)&&value.at("clubs").at(id).at("playable")==true&&!clubs.contains(id)&&m.at("portrait").is_number_integer()&&m.at("portrait")>=0&&m.at("portrait")<12&&!portraits.contains(m.at("portrait").get<int>())&&m.at("strength_choice").is_number_integer()&&m.at("strength_choice")>=0&&m.at("strength_choice")<=2,"Nicht verfügbare Managerauswahl.");
|
||||
const auto style=m.at("portrait_style").get<std::string>();manager_require(style=="photo"||style=="painted","Ungültiger Porträtstil.");
|
||||
payload["managers"]=Json::array({{{"name",*name},{"club",id},{"portrait",m.at("portrait")},{"portrait_style",style},{"strength_choice",m.at("strength_choice")}}});
|
||||
}
|
||||
return {{"messageType","command"},{"requestId",request_id},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind",kind},{"payload",payload}};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
void App::engine_manager_sync() {
|
||||
engine_manager_value_=Json();
|
||||
try {engine_manager_value_=engine_manager_projection(engine_data_);}catch(const std::exception &){}
|
||||
if(engine_manager_operation_.empty())return;
|
||||
const auto operation=std::exchange(engine_manager_operation_,std::string());
|
||||
if(engine_response_.value("messageType","")=="command_result") {
|
||||
engine_manager_context_=engine_data_.at("desktop").at("meta");
|
||||
if(operation=="join") {
|
||||
managers_draft_=engine_manager_value_.at("draft_managers");manager_confirm_=false;manager_success_=true;focus_after_render_="manager-success-close";
|
||||
} else {career_resign_open_=false;career_game_end_=true;focus_after_render_="career-game-end";}
|
||||
} else {manager_confirm_=false;career_resign_open_=false;}
|
||||
}
|
||||
Json App::engine_career_context() const {
|
||||
const auto &v=engine_manager_value_;Json people=Json::array();
|
||||
for(const auto &p:v.at("people"))people.push_back({{"name",p.at("name")},{"portrait",p.at("portrait")},{"id",p.at("id")},{"club",p.at("teamId").is_string()?p.at("teamId"):Json("")}});
|
||||
return {{"ended",v.at("ended")},{"current_team",{{"name",engine_text(engine_data_.at("desktop").at("data").at("team").at("name"))}}},{"active_managers",people},{"role",v.at("role")},{"surface",v.at("surface")},{"available_roles",Json::array({v.at("role")})}};
|
||||
}
|
||||
bool App::entry_manageable(const std::string &id) const {
|
||||
if(engine_mode_&&adding_manager_)return engine_manager_value_.at("clubs").contains(id)&&engine_manager_value_.at("clubs").at(id).at("playable")==true;
|
||||
return entry_world()&&entry_world()->manageable(id);
|
||||
}
|
||||
std::string App::entry_club_league(const std::string &id) const {
|
||||
if(engine_mode_&&adding_manager_)return engine_manager_value_.at("clubs").contains(id)?engine_manager_value_.at("clubs").at(id).at("leagueId").get<std::string>():std::string();
|
||||
const auto *club=entry_world()?entry_world()->find("clubs",id):nullptr;return club?club->value("competition",std::string()):std::string();
|
||||
}
|
||||
std::vector<const Json*> App::entry_clubs(const std::string &league) const {
|
||||
if(!engine_mode_||!adding_manager_)return entry_world()->clubs(league);
|
||||
std::vector<const Json*> rows;
|
||||
for(const auto &[id,c]:engine_manager_value_.at("clubs").items())if(c.at("leagueId")==league)if(const auto *club=entry_world()->find("clubs",id))rows.push_back(club);
|
||||
return rows;
|
||||
}
|
||||
void App::engine_manager_add() {
|
||||
if(!engine_fresh_||engine_busy_||engine_manager_value_.at("can_join")!=true)return;
|
||||
engine_manager_context_=engine_data_.at("desktop").at("meta");entry_catalog_.reset();managers_draft_=engine_manager_value_.at("draft_managers");manager_index_=int(managers_draft_.size());
|
||||
adding_manager_=true;country_="nation:de";league_.clear();entry_choose_defaults();scene_="manager";menu_="newplayer";focus_after_render_="manager-name";refresh();
|
||||
}
|
||||
void App::engine_manager_join(const Json &candidate) {
|
||||
if(engine_busy_||!engine_fresh_)return;
|
||||
try {
|
||||
if(engine_manager_context_!=engine_data_.at("desktop").at("meta"))throw editor::Error("Die Partie hat sich geändert. Bitte die Auswahl erneut öffnen.");
|
||||
const auto command=engine_manager_command(engine_data_,candidate,editor::new_id("request:ui-"));auto link=engine_link_;engine_manager_operation_="join";
|
||||
engine_start("Mitspieler wird hinzugefügt …",[link,command]{auto response=link->command(command);return EngineReply{link,link->snapshot(),response,nullptr};},true);
|
||||
}catch(const std::exception &e){message(e.what());}
|
||||
}
|
||||
void App::engine_manager_main() {
|
||||
ticket_.reset();ticket_engine_bound_=false;engine_link_.reset();engine_data_=Json();engine_manager_value_=Json();engine_mode_=engine_fresh_=engine_dirty_=false;
|
||||
career_game_end_=career_resign_open_=adding_manager_=false;auto catalog=world_;publish_world(catalog,std::make_unique<DemoSource>(catalog));scene_="main";menu_.clear();focus_after_render_="front-new";refresh();
|
||||
}
|
||||
bool App::engine_manager_action(const std::string &action,Rml::Element *) {
|
||||
if(engine_busy_)return true;
|
||||
if(action=="career-game-end"){engine_manager_main();return true;}
|
||||
if(action=="career-resign-cancel"){career_resign_open_=false;focus_after_render_="career-resign";refresh();return true;}
|
||||
if(action=="career-resign"&&engine_fresh_&&engine_manager_value_.at("can_resign")==true){engine_manager_context_=engine_data_.at("desktop").at("meta");career_resign_open_=true;career_resign_portrait_=engine_manager_value_.at("active").at("portrait");focus_after_render_="career-resign-owner";refresh();return true;}
|
||||
if(action=="career-resign-confirm") {
|
||||
try {
|
||||
if(engine_manager_context_!=engine_data_.at("desktop").at("meta"))throw editor::Error("Die Partie hat sich geändert.");
|
||||
const auto command=engine_manager_command(engine_data_,Json(),editor::new_id("request:ui-"),true);auto link=engine_link_;engine_manager_operation_="resign";
|
||||
engine_start("Manageramt wird abgegeben …",[link,command]{auto response=link->command(command);return EngineReply{link,link->snapshot(),response,nullptr};},true);
|
||||
}catch(const std::exception &e){message(e.what());}return true;
|
||||
}
|
||||
if(action=="career-add"){engine_manager_add();return true;}
|
||||
if(action=="close"){if(engine_manager_value_.at("ended")==true)engine_manager_main();else{menu_.clear();scene_="engine";focus_after_render_="object-app-newplayer";refresh();}return true;}
|
||||
return action.starts_with("career-");
|
||||
}
|
||||
@@ -132,8 +132,8 @@ 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=="settings"&&engine_fresh_&&engine_settings_value_.is_object()) || (route=="indoor"&&engine_fresh_&&engine_indoor_value_.is_object()) || ((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=="balance"&&engine_fresh_&&engine_data_.at("balance").value("messageType","")=="snapshot") || (route=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (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_);
|
||||
const bool supported = (route=="newplayer"&&engine_fresh_&&engine_manager_value_.is_object()) || (route=="settings"&&engine_fresh_&&engine_settings_value_.is_object()) || (route=="indoor"&&engine_fresh_&&engine_indoor_value_.is_object()) || ((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=="balance"&&engine_fresh_&&engine_data_.at("balance").value("messageType","")=="snapshot") || (route=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (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_ && (!engine_manager_value_.is_object() || engine_manager_value_.at("ended")!=true || route=="save" || route=="load" || route=="newplayer"));
|
||||
}
|
||||
}
|
||||
out += "</div>";
|
||||
@@ -141,6 +141,7 @@ void App::engine_render() {
|
||||
if(menu_=="scorers")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"<div class=\"fill center\">"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"</div>")+"</div>";
|
||||
if(menu_=="fairplay")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"<div class=\"fill center\">"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"</div>")+"</div>";
|
||||
if(menu_=="other")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"<div class=\"fill center\">"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"</div>")+"</div>";
|
||||
if(menu_=="newplayer")out+="<div class=\"fill\" style=\"z-index:100;\">"+(scene_=="manager"?render_manager():render_career())+"</div>";
|
||||
if(menu_=="settings")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Einstellungen",render_settings())+"</div>";
|
||||
if(menu_=="indoor")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Hallentabellen",render_indoor())+"</div>";
|
||||
if(menu_=="balance")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Bilanz",render_balance())+"</div>";
|
||||
|
||||
@@ -166,3 +166,15 @@
|
||||
void engine_settings_apply();
|
||||
bool engine_settings_valid() const;
|
||||
bool engine_settings_editable(const std::string &, const std::string &) const;
|
||||
|
||||
Json engine_manager_value_,engine_manager_context_;
|
||||
std::string engine_manager_operation_;
|
||||
void engine_manager_sync();
|
||||
Json engine_career_context() const;
|
||||
void engine_manager_add();
|
||||
void engine_manager_join(const Json &);
|
||||
void engine_manager_main();
|
||||
bool engine_manager_action(const std::string &,Rml::Element *);
|
||||
bool entry_manageable(const std::string &) const;
|
||||
std::string entry_club_league(const std::string &) const;
|
||||
std::vector<const Json*> entry_clubs(const std::string &) const;
|
||||
@@ -24,13 +24,13 @@ void App::entry_sync_club() {
|
||||
[&](auto *l) { return l->value("id", "") == league_; }))
|
||||
league_ = leagues.empty() ? "" : leagues.front()->value("id", "");
|
||||
const auto *current = catalog->find("clubs", selected_club_);
|
||||
if (current && current->value("competition", "") == league_ &&
|
||||
catalog->manageable(selected_club_) && !entry_used_club(selected_club_))
|
||||
if (current && entry_club_league(selected_club_) == league_ &&
|
||||
entry_manageable(selected_club_) && !entry_used_club(selected_club_))
|
||||
return;
|
||||
selected_club_.clear();
|
||||
for (const auto *c : catalog->clubs(league_)) {
|
||||
for (const auto *c : entry_clubs(league_)) {
|
||||
const auto id = c->value("id", "");
|
||||
if (catalog->manageable(id) && !entry_used_club(id)) {
|
||||
if (entry_manageable(id) && !entry_used_club(id)) {
|
||||
selected_club_ = id;
|
||||
break;
|
||||
}
|
||||
@@ -51,10 +51,10 @@ void App::entry_choose_defaults() {
|
||||
if (selected_club_.empty() && catalog)
|
||||
for (auto *c : catalog->clubs()) {
|
||||
const auto id = c->value("id", "");
|
||||
if (catalog->manageable(id) && !entry_used_club(id)) {
|
||||
if (entry_manageable(id) && !entry_used_club(id)) {
|
||||
selected_club_ = id;
|
||||
country_ = "nation:de";
|
||||
league_ = c->value("competition", "");
|
||||
league_ = entry_club_league(id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -130,6 +130,8 @@ void App::entry_add() {
|
||||
refresh();
|
||||
}
|
||||
void App::entry_cancel() {
|
||||
if(engine_mode_&&adding_manager_){manager_confirm_=manager_success_=manager_picker_=adding_manager_=false;managers_draft_=Json::array();manager_index_=0;scene_="managerhub";menu_="newplayer";focus_after_render_="career-add";refresh();return;}
|
||||
|
||||
entry_catalog_.reset();
|
||||
bind_world(world_);
|
||||
manager_confirm_ = manager_success_ = manager_picker_ = false;
|
||||
@@ -142,7 +144,7 @@ void App::entry_cancel() {
|
||||
selected_club_ = manager(snap()).value("club", "");
|
||||
const auto *c = world_->find("clubs", selected_club_);
|
||||
if (c)
|
||||
league_ = c->value("competition", "");
|
||||
league_ = entry_club_league(selected_club_);
|
||||
country_ = "nation:de";
|
||||
}
|
||||
focus_after_render_ =
|
||||
@@ -156,7 +158,7 @@ void App::entry_confirm() {
|
||||
const auto catalog = entry_world();
|
||||
const int portrait =
|
||||
selections_["portrait"].empty() ? 0 : std::stoi(selections_["portrait"]);
|
||||
if (!name || !catalog || !catalog->manageable(selected_club_) ||
|
||||
if (!name || !catalog || !entry_manageable(selected_club_) ||
|
||||
entry_used_club(selected_club_) || portrait < 0 || portrait >= 12 ||
|
||||
entry_used_portrait(portrait))
|
||||
return;
|
||||
@@ -179,6 +181,7 @@ void App::entry_confirm() {
|
||||
refresh();
|
||||
return;
|
||||
}
|
||||
if (adding_manager_ && engine_mode_) {engine_manager_join(candidate);return;}
|
||||
if (adding_manager_) {
|
||||
if (source_.get() != entry_source_) {
|
||||
message(
|
||||
@@ -325,18 +328,18 @@ bool App::entry_action(const std::string &action, Rml::Element *target) {
|
||||
selections_["portrait"] = id;
|
||||
focus_after_render_ = "manager-portrait-" + id;
|
||||
} else if (action == "manager-club") {
|
||||
if (entry_full() || !entry_world()->manageable(id) || entry_used_club(id))
|
||||
if (entry_full() || !entry_manageable(id) || entry_used_club(id))
|
||||
return true;
|
||||
selected_club_ = id;
|
||||
country_ = "nation:de";
|
||||
league_ = entry_world()->find("clubs", id)->value("competition", league_);
|
||||
league_ = entry_club_league(id);
|
||||
manager_picker_ = false;
|
||||
focus_after_render_ = "manager-clubs";
|
||||
} else if (action == "manager-next") {
|
||||
if (entry_full())
|
||||
return true;
|
||||
selections_["manager-name"] = field("manager-name");
|
||||
if (!entry_name_valid() || !entry_world()->manageable(selected_club_) ||
|
||||
if (!entry_name_valid() || !entry_manageable(selected_club_) ||
|
||||
entry_used_club(selected_club_))
|
||||
return true;
|
||||
selections_["manager-name"] =
|
||||
@@ -401,7 +404,7 @@ bool App::entry_input(Rml::Element *target) {
|
||||
if (kind == "manager-name") {
|
||||
selections_["manager-name"] = value;
|
||||
if (auto *next = element("manager-next")) {
|
||||
if (entry_name_valid() && entry_world()->manageable(selected_club_) &&
|
||||
if (entry_name_valid() && entry_manageable(selected_club_) &&
|
||||
!entry_used_club(selected_club_))
|
||||
next->RemoveAttribute("disabled");
|
||||
else
|
||||
|
||||
@@ -130,7 +130,7 @@ std::string App::render_manager() {
|
||||
return window("Neuer Spieler",
|
||||
"<p>Bitte zuerst eine Modern-Mod aktivieren.</p>");
|
||||
const bool national = career_national_entry();
|
||||
if(engine_creation_busy_)return window("Neues Spiel","<div class=\"fill center\"><h2>Die Partie wird vorbereitet …</h2></div>",false);
|
||||
if(engine_creation_busy_||(engine_mode_&&engine_busy_))return window(adding_manager_?"Neuer Spieler":"Neues Spiel","<div class=\"fill center\"><h2>"+std::string(adding_manager_?"Mitspieler wird hinzugefügt …":"Die Partie wird vorbereitet …")+"</h2></div>",false);
|
||||
const bool full = entry_full(), modal = manager_confirm_ || manager_success_;
|
||||
const int limit =
|
||||
adding_manager_ ? (national ? 1 : 4) : start_options_.value("players", 1);
|
||||
@@ -166,7 +166,7 @@ std::string App::render_manager() {
|
||||
if (national)
|
||||
return std::string("Nationalmannschaft");
|
||||
const auto *l =
|
||||
c ? catalog->find("competitions", c->value("competition", ""))
|
||||
c ? catalog->find("competitions", entry_club_league(c->value("id", "")))
|
||||
: nullptr;
|
||||
return l ? catalog->name(*l) : std::string();
|
||||
};
|
||||
@@ -195,7 +195,7 @@ std::string App::render_manager() {
|
||||
if (manager_picker_ && !national) {
|
||||
const auto query = settings_search_key(club_search_);
|
||||
std::vector<const Json *> clubs;
|
||||
for (const auto *c : catalog->clubs(league_))
|
||||
for (const auto *c : entry_clubs(league_))
|
||||
if (query.empty() || settings_search_key(catalog->name(*c)).find(query) !=
|
||||
std::string::npos)
|
||||
clubs.push_back(c);
|
||||
@@ -223,7 +223,7 @@ std::string App::render_manager() {
|
||||
for (size_t i = 0; i < clubs.size(); ++i) {
|
||||
const auto *c = clubs[i];
|
||||
const auto id = c->value("id", "");
|
||||
const bool locked = !catalog->manageable(id), used = entry_used_club(id),
|
||||
const bool locked = !entry_manageable(id), used = entry_used_club(id),
|
||||
chosen = id == selected_club_;
|
||||
const std::string note = locked ? "Nicht spielbar · nur deutsche Vereine"
|
||||
: used ? "Bereits vergeben"
|
||||
@@ -385,7 +385,7 @@ std::string App::render_manager() {
|
||||
"primary",
|
||||
"id=\"manager-next\" " +
|
||||
std::string(full || !entry_name_valid() || !selected ||
|
||||
!catalog->manageable(selected_club_) ||
|
||||
!entry_manageable(selected_club_) ||
|
||||
entry_used_club(selected_club_) ||
|
||||
entry_used_portrait(portrait)
|
||||
? "disabled"
|
||||
|
||||
+3
-50
@@ -1,5 +1,6 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/model.hpp"
|
||||
#include "modern/content/manager_name.hpp"
|
||||
#include "modern/ui/demo_advertising.hpp"
|
||||
#include "modern/ui/demo_almanac.hpp"
|
||||
#include "modern/ui/demo_calendar.hpp"
|
||||
@@ -25,57 +26,9 @@
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
std::optional<std::string> normalized_manager_name(std::string_view raw) {
|
||||
const auto whitespace = [](uint32_t c) {
|
||||
return c == 0x20 || c == 0xa0 || c == 0x1680 ||
|
||||
(c >= 0x2000 && c <= 0x200a) || c == 0x2028 || c == 0x2029 ||
|
||||
c == 0x202f || c == 0x205f || c == 0x3000 || c == 0xfeff;
|
||||
};
|
||||
size_t first = raw.size(), last = 0, count = 0, pending_spaces = 0;
|
||||
for (size_t at = 0; at < raw.size();) {
|
||||
const auto start = at;
|
||||
const auto byte = uint8_t(raw[at++]);
|
||||
uint32_t value = byte;
|
||||
int remaining = 0;
|
||||
if (byte >= 0xc2 && byte <= 0xdf) {
|
||||
value &= 31;
|
||||
remaining = 1;
|
||||
} else if (byte >= 0xe0 && byte <= 0xef) {
|
||||
value &= 15;
|
||||
remaining = 2;
|
||||
} else if (byte >= 0xf0 && byte <= 0xf4) {
|
||||
value &= 7;
|
||||
remaining = 3;
|
||||
} else if (byte >= 128)
|
||||
return {};
|
||||
const auto encoded_length = remaining;
|
||||
while (remaining--) {
|
||||
if (at == raw.size() || (uint8_t(raw[at]) & 0xc0) != 0x80)
|
||||
return {};
|
||||
value = value * 64 + (uint8_t(raw[at++]) & 63);
|
||||
}
|
||||
if ((encoded_length == 1 && value < 0x80) ||
|
||||
(encoded_length == 2 && value < 0x800) ||
|
||||
(encoded_length == 3 && value < 0x10000) || value > 0x10ffff ||
|
||||
(value >= 0xd800 && value <= 0xdfff) || value < 32 ||
|
||||
(value >= 127 && value <= 159))
|
||||
return {};
|
||||
if (whitespace(value)) {
|
||||
if (count)
|
||||
pending_spaces = std::min(size_t(25), pending_spaces + 1);
|
||||
continue;
|
||||
}
|
||||
if (!count)
|
||||
first = start;
|
||||
count += pending_spaces + 1;
|
||||
pending_spaces = 0;
|
||||
if (count > 24)
|
||||
return {};
|
||||
last = at;
|
||||
}
|
||||
if (!count)
|
||||
return {};
|
||||
return std::string(raw.substr(first, last - first));
|
||||
return modern::normalized_manager_name(raw);
|
||||
}
|
||||
|
||||
namespace {
|
||||
bool bounded_integer(const Json &value, int low, int high) {
|
||||
if (!value.is_number_integer())
|
||||
|
||||
@@ -49,6 +49,7 @@
|
||||
#include <RmlUi/Core.h>
|
||||
#include <cstring>
|
||||
#include <tuple>
|
||||
#include <utility>
|
||||
#include <RmlUi/Core/Elements/ElementFormControl.h>
|
||||
#include <RmlUi/Core/Elements/ElementFormControlInput.h>
|
||||
#include <RmlUi/Core/Elements/ElementFormControlSelect.h>
|
||||
@@ -1554,6 +1555,7 @@ public:
|
||||
#include "modern/ui/engine_widgets.inc"
|
||||
#include "modern/ui/engine_indoor.inc"
|
||||
#include "modern/ui/engine_settings.inc"
|
||||
#include "modern/ui/engine_managers.inc"
|
||||
} // namespace
|
||||
bool is_modern_world(const fs::path &file) {
|
||||
try {
|
||||
|
||||
@@ -15,7 +15,7 @@ using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
const std::string mode=argc>1?argv[1]:"";
|
||||
const std::set<std::string> 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","verify-balance","verify-balance-warning","verify-settings"};
|
||||
const std::set<std::string> 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","verify-balance","verify-balance-warning","verify-settings","verify-managers"};
|
||||
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
|
||||
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)); };
|
||||
@@ -285,6 +285,32 @@ int main(int argc, char **argv) {
|
||||
link = EngineBridge::open(world, out / "lineup.obs"); const auto loaded = link->snapshot(); write("lineup-loaded.json", loaded);
|
||||
if (loaded.at("lineup").at("data").at("order") != order) throw std::runtime_error("lineup lost during OBS round trip");
|
||||
}
|
||||
if(mode=="verify-managers") {
|
||||
Json log=Json::array();const auto initial=engine_manager_projection(before);const auto old_owner=before.at("desktop").at("meta").at("scope").at("managerId");
|
||||
if(initial.at("can_join")!=true||initial.at("people").size()!=1)throw std::runtime_error("one-manager club fixture required");
|
||||
link->save_copy(out/"read-only.obs");if(link->snapshot()!=before)throw std::runtime_error("manager read changed source");
|
||||
auto tables=[&](){Json all=Json::object();const auto index=link->read({{"kind","report-index"}});for(const auto &l:index.at("data").at("leagues")){const auto read=link->read({{"kind","league-report"},{"leagueId",l.at("id")},{"filter",0}});for(auto row:read.at("data").at("table")){const auto id=row.at("team").at("id").get<std::string>();row.erase("original");all[id]=row;}}return all;};
|
||||
auto choose=[&](const Json &value,int ordinal){auto candidate=value.at("draft_managers");std::set<std::string> used;std::set<int> portraits;for(const auto &p:candidate){used.insert(p.at("club").get<std::string>());portraits.insert(p.at("portrait").get<int>());}std::string club;bool promoted=false;
|
||||
std::string top;for(const auto &league:modern::current_world()->leagues)if(league.index==0)top=league.id;
|
||||
for(const auto &[id,c]:value.at("clubs").items())if(c.at("playable")==true&&!used.contains(id)&&c.at("leagueId")==top){club=id;const auto *record=modern::current_world()->club(id);if(record&&record->competition!=c.at("leagueId").get<std::string>()){promoted=true;break;}}
|
||||
|
||||
if(club.empty())throw std::runtime_error("no available club");int portrait=0;while(portraits.contains(portrait))++portrait;
|
||||
const std::array<const char*,3> names{"Mina Öztürk","Zoë García","山田 太郎"};candidate.push_back({{"name",names.at(size_t(ordinal))},{"club",club},{"portrait",portrait},{"portrait_style",ordinal%2?"painted":"photo"},{"strength_choice",1}});return std::make_pair(candidate,promoted);};
|
||||
const auto original_tables=tables();const auto first=choose(initial,0);const auto valid=engine_manager_command(before,first.first,"request:manager-join");
|
||||
auto bad=valid;bad["requestId"]="request:invalid-batch";bad["payload"]["managers"].push_back({{"name","Invalid second"},{"club",initial.at("draft_managers")[0].at("club")},{"portrait",11},{"portrait_style","photo"},{"strength_choice",1}});
|
||||
const auto refused=link->command(bad);write("invalid.json",refused);if(refused.value("messageType","")!="error"||link->snapshot()!=before||tables()!=original_tables)throw std::runtime_error("failed manager draft changed source");link->save_copy(out/"failed-unchanged.obs");
|
||||
for(int n=0;n<3;++n){const auto current=link->snapshot(),view=engine_manager_projection(current);const auto selection=choose(view,n);const auto prior_tables=tables();const auto command=engine_manager_command(current,selection.first,"request:add-"+std::to_string(n));const auto response=link->command(command);log.push_back({{"command",command},{"response",response},{"currentMembershipDiffersFromInitialWorld",selection.second}});if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());const auto after=link->snapshot(),actual=engine_manager_projection(after);if(actual.at("people").size()!=size_t(n+2)||after.at("desktop").at("meta").at("scope").at("managerId")!=old_owner||after.at("desktop").at("meta").at("date")!=before.at("desktop").at("meta").at("date"))throw std::runtime_error("join changed current owner/date/count");
|
||||
for(size_t i=0;i<view.at("people").size();++i)if(view.at("people")[i]!=actual.at("people")[i])throw std::runtime_error("join changed existing manager identity");
|
||||
if(actual.at("people").back().at("name")!=selection.first.back().at("name")||actual.at("people").back().at("teamId")!=selection.first.back().at("club")||actual.at("people").back().at("portraitStyle")!=selection.first.back().at("portrait_style"))throw std::runtime_error("new manager presentation/club lost");
|
||||
if(tables()!=prior_tables){write("tables-before-failure.json",prior_tables);write("tables-after-failure.json",tables());write("join-failure.json",after);write("join-commands.json",log);link->save_copy(out/"changed-standings.obs");throw std::runtime_error("joining changed existing league standings");}if(link->command(command)!=response||link->snapshot()!=after)throw std::runtime_error("join replay changed state");auto stale=command;stale["requestId"]="request:stale-"+std::to_string(n);if(link->command(stale).value("code","")!="stale_revision"||link->snapshot()!=after)throw std::runtime_error("stale join changed state");
|
||||
const auto path=out/("managers-"+std::to_string(n+2)+".obs");link->save_copy(path);link->load_same_world(path);if(link->snapshot().at("session").at("data")!=after.at("session").at("data"))throw std::runtime_error("manager OBS roundtrip lost people");write(("after-"+std::to_string(n+2)+".json").c_str(),link->snapshot());
|
||||
}
|
||||
const auto full=link->snapshot();if(engine_manager_projection(full).at("can_join")!=false)throw std::runtime_error("fifth manager enabled");auto fifth=valid;fifth["requestId"]="request:fifth";fifth["expectedRevision"]=full.at("desktop").at("meta").at("stateRevision");if(link->command(fifth).value("messageType","")!="error"||link->snapshot()!=full)throw std::runtime_error("fifth manager changed state");
|
||||
const auto &meta=full.at("desktop").at("meta");Json quit={{"messageType","command"},{"requestId","request:multi-resign"},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","manager.resign.commit"},{"payload",{{"confirmed",true}}}};if(link->command(quit).value("code","")!="resign_not_supported_yet"||link->snapshot()!=full)throw std::runtime_error("unsupported multi-resign changed state");
|
||||
link.reset();link=EngineBridge::open(world,out/"input.obs");const auto single=link->snapshot();auto no=engine_manager_command(single,Json(),"request:unconfirmed",true);no["payload"]["confirmed"]=false;if(link->command(no).value("code","")!="confirmation_required"||link->snapshot()!=single)throw std::runtime_error("unconfirmed resignation changed source");const auto end=link->command(engine_manager_command(single,Json(),"request:resign",true));write("resign.json",end);if(end.value("outcome","")!="career_ended"||engine_manager_projection(link->snapshot()).at("ended")!=true)throw std::runtime_error("single resignation did not end career");bool end_save_refused=false;try{link->save_copy(out/"ended.obs");}catch(const std::exception &e){end_save_refused=std::string(e.what())=="career_complete";}if(!end_save_refused||fs::exists(out/"ended.obs"))throw std::runtime_error("unexpected ended-save capability");
|
||||
write("commands.json",log);write("tables-before.json",original_tables);write("receipt.json",{{"status","passed"},{"pureRead",true},{"atomicInvalidBatch",true},{"currentMembershipUsed",first.second},{"oldOwnerAndPeoplePreserved",true},{"standingsUnchanged",true},{"people",4},{"unicodeAndPortraitsPreserved",true},{"replayAndStale",true},{"threeActualObsRoundtrips",true},{"fifthRefused",true},{"multiResignStillRefused",true},{"singleResign",true},{"endedSaveUnavailable",true}});std::cout<<"actual manager joins, current league memberships, standings, identities, resign and OBS passed\n";return 0;
|
||||
}
|
||||
|
||||
if (mode == "verify-settings") {
|
||||
const auto projected=engine_settings_projection(before);
|
||||
write("read-only-save.json",link->save_copy(out/"read-only.obs"));
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
using namespace bmh::modern_ui;
|
||||
namespace {
|
||||
void check(bool b,const char *s){if(!b)throw std::runtime_error(s);}
|
||||
template<class F>void rejects(F f){bool bad=false;try{f();}catch(const std::exception&){bad=true;}check(bad,"invalid manager command accepted");}
|
||||
}
|
||||
int main()try{
|
||||
Json meta={{"contractVersion","bmh-modern-ui@draft1"},{"careerId","career:one"},{"worldId","world:one"},{"worldRevision","1"},{"stateRevision","8"},{"scope",{{"managerId","manager:one"},{"teamId","club:one"},{"role","club"},{"allowedCommands",{"manager.join.commit","manager.resign.commit"}}}}};Json b;
|
||||
for(auto *kind:{"session","desktop","camps","manager-menu"})b[kind]={{"messageType","snapshot"},{"meta",meta},{"data",{{"kind",kind}}}};
|
||||
b["desktop"]["data"].update({{"manager",{{"id","manager:one"}}},{"team",{{"id","club:one"}}},{"accounts",{{"cash",{{"minor","0"},{"currency","EUR"},{"minorUnits",2}}}}}});b["camps"]["data"]["camps"]=Json::array();
|
||||
auto &d=b["manager-menu"]["data"];d.update({{"activeManagerId","manager:one"},{"ownerManagerId","manager:one"},{"ended",false},{"canJoin",true},{"canResign",true},{"joinReason",""},{"resignReason",""},{"surface","outdoor"},{"managers",Json::array({{{"id","manager:one"},{"name","Old Manager"},{"teamId","club:one"},{"portrait",3},{"portraitStyle","photo"}}})},{"clubs",Json::array({{{"id","club:one"},{"leagueId","league:current"},{"playable",true}},{{"id","club:promoted"},{"leagueId","league:current"},{"playable",true}},{{"id","club:foreign"},{"leagueId","league:foreign"},{"playable",false}}})}});
|
||||
const auto original=b;auto v=engine_manager_projection(b);check(b==original&&v.at("clubs").at("club:promoted").at("leagueId")=="league:current","projection changed source or lost current membership");auto candidate=v.at("draft_managers");candidate.push_back({{"name"," Mina Öztürk "},{"club","club:promoted"},{"portrait",4},{"portrait_style","painted"},{"strength_choice",2}});
|
||||
const auto cmd=engine_manager_command(b,candidate,"request:join");check(cmd.at("payload").at("managers").size()==1&&cmd.at("payload").at("managers")[0].at("name")=="Mina Öztürk"&&cmd.at("owner").at("managerId")=="manager:one"&&cmd.at("expectedRevision")=="8","join lost normalized name or owner");
|
||||
const auto quit=engine_manager_command(b,Json(),"request:quit",true);check(quit.at("payload").at("confirmed")==true,"resign lacks explicit confirmation");
|
||||
auto bad=candidate;bad[0]["name"]="Changed old manager";rejects([&]{engine_manager_command(b,bad,"request:bad");});bad=candidate;bad[1]["portrait"]=3;rejects([&]{engine_manager_command(b,bad,"request:bad");});bad=candidate;bad[1]["club"]="club:one";rejects([&]{engine_manager_command(b,bad,"request:bad");});bad=candidate;bad[1]["club"]="club:foreign";rejects([&]{engine_manager_command(b,bad,"request:bad");});
|
||||
auto foreign=b;foreign["manager-menu"]["meta"]["worldRevision"]="2";rejects([&]{engine_manager_projection(foreign);});foreign=b;foreign["manager-menu"]["data"]["clubs"].push_back(d.at("clubs")[0]);rejects([&]{engine_manager_projection(foreign);});foreign=b;foreign["manager-menu"]["data"]["canJoin"]=false;rejects([&]{engine_manager_command(foreign,candidate,"request:bad");});foreign=b;foreign["manager-menu"]["data"]["managers"].push_back({{"id","manager:two"},{"name","Second"},{"teamId","club:promoted"},{"portrait",4},{"portraitStyle","photo"}});foreign["manager-menu"]["data"]["canResign"]=false;rejects([&]{engine_manager_command(foreign,Json(),"request:bad",true);});
|
||||
foreign=b;foreign["manager-menu"]["data"]["ended"]=true;foreign["manager-menu"]["data"]["canJoin"]=false;foreign["manager-menu"]["data"]["canResign"]=false;foreign["manager-menu"]["data"]["activeManagerId"]=nullptr;check(engine_manager_projection(foreign).at("active").at("id")=="manager:one","archived view owner lost on game end");
|
||||
std::cout<<"manager ownership, current membership, immutable participants and capabilities passed\n";return 0;
|
||||
}catch(const std::exception &e){std::cerr<<e.what()<<'\n';return 1;}
|
||||
Reference in new issue
Block a user