Preserve human manager identity through national coach record swaps (by Codex)

This commit is contained in:
Codex committed 2026-10-29 01:56:31 +01:00
1 parent ce1535fe2d
commit 693744a961
16 files changed
+203 -21

No files matched your search

+1 -1
View File
@@ -52,7 +52,7 @@ jobs:
- name: Configure opt-in UI without external assets - 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= 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 - 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_stadium_ui_tests modern_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests modern_desktop_ui_tests modern_files_ui_tests modern_mods_ui_tests modern_entry_ui_tests modern_opening_ui_tests modern_select_menu_tests modern_career_ui_tests modern_live_ui_tests modern_national_ui_tests modern_news_catalog_tests modern_post_match_ui_tests modern_engine_dto_tests modern_report_read_tests modern_other_read_tests modern_rankings_read_tests modern_manager_presentation_tests --parallel 2 run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_stadium_ui_tests 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_manager_presentation_tests modern_coach_identity_tests --parallel 2
- name: Check controls, fonts, density and draft cancellation - name: Check controls, fonts, density and draft cancellation
run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|statistics_ui_|news_ui_|settings_ui_|desktop_ui_|files_ui_|mods_ui_|entry_ui_|opening_ui_|select_menu_|career_ui_|live_ui_|national_ui_|news_catalog_|post_match_ui_|engine_dto_|report_read_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|statistics_ui_|news_ui_|settings_ui_|desktop_ui_|files_ui_|mods_ui_|entry_ui_|opening_ui_|select_menu_|career_ui_|live_ui_|national_ui_|news_catalog_|post_match_ui_|engine_dto_|report_read_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml
- name: Upload test report - name: Upload test report
+4
View File
@@ -1217,6 +1217,10 @@ add_test(NAME modern_camp_tests COMMAND modern_camp_tests)
add_executable(modern_almanac_tests tests/modern_almanac_tests.cpp) add_executable(modern_almanac_tests tests/modern_almanac_tests.cpp)
target_link_libraries(modern_almanac_tests PRIVATE bmh_modern_content) target_link_libraries(modern_almanac_tests PRIVATE bmh_modern_content)
add_test(NAME modern_almanac_tests COMMAND modern_almanac_tests) add_test(NAME modern_almanac_tests COMMAND modern_almanac_tests)
add_executable(modern_coach_identity_tests tests/modern_coach_identity_tests.cpp)
target_link_libraries(modern_coach_identity_tests PRIVATE bmh_modern_content)
add_test(NAME modern_coach_identity_tests COMMAND modern_coach_identity_tests)
add_executable(modern_manager_presentation_tests tests/modern_manager_presentation_tests.cpp) add_executable(modern_manager_presentation_tests tests/modern_manager_presentation_tests.cpp)
target_link_libraries(modern_manager_presentation_tests PRIVATE bmh_modern_content) target_link_libraries(modern_manager_presentation_tests PRIVATE bmh_modern_content)
add_test(NAME modern_manager_presentation_tests COMMAND modern_manager_presentation_tests) add_test(NAME modern_manager_presentation_tests COMMAND modern_manager_presentation_tests)
+1 -1
View File
@@ -60,6 +60,6 @@ Für 0.3 gilt außerdem:
| M6 | Modern-Spielstände (`modern-career-v1`), Projektionen für die UI | Spielstände und native Neuanlage vorhanden (Rundreisen geprüft); UI-Projektionen schrittweise angebunden (u. a. Tabellen, Stärken, Liga-/Pokalspiele, Spielerstatistiken/Fairplay, Almanach) | | M6 | Modern-Spielstände (`modern-career-v1`), Projektionen für die UI | Spielstände und native Neuanlage vorhanden (Rundreisen geprüft); UI-Projektionen schrittweise angebunden (u. a. Tabellen, Stärken, Liga-/Pokalspiele, Spielerstatistiken/Fairplay, Almanach) |
| M7 | Balance-Läufe und Anpassungen | erledigt: Spielerwerte nach Rangfolge, Langläufe über 12 Saisons ohne Drift gegenüber Classic ([Balance](balance.md)); offen nur Läufe mit aktivem Manager | | M7 | Balance-Läufe und Anpassungen | erledigt: Spielerwerte nach Rangfolge, Langläufe über 12 Saisons ohne Drift gegenüber Classic ([Balance](balance.md)); offen nur Läufe mit aktivem Manager |
| M8 | Fußball-Almanach: alle Spiele mit Ereignissen und Aufstellungen ([Almanach](almanach.md)) | Engine und Leseprojektionen vorhanden; nativer Almanach angeschlossen; Elfmeterschuss-Aufzeichnung und belegte Altarchive korrigiert (#18) | | M8 | Fußball-Almanach: alle Spiele mit Ereignissen und Aufstellungen ([Almanach](almanach.md)) | Engine und Leseprojektionen vorhanden; nativer Almanach angeschlossen; Elfmeterschuss-Aufzeichnung und belegte Altarchive korrigiert (#18) |
| M9 | Nationalteams mit echten Kadern ([Nationalteams](nationalteams.md)) | Engine erledigt: 24 von 61 Nationen des Diamond-Datensatzes spielen mit Spielern | | 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). Details und Abnahmekriterien stehen in [Phasen](phasen.md).
+37
View File
@@ -26,3 +26,40 @@ Stand: 25. Oktober 2026 (M9).
- Nationen mit zu wenigen Spielern im Datensatz: Der Datensatz kann sie mit Spielern ohne Verein ergänzen, oder die Engine füllt mit erzeugten Spielern auf. - Nationen mit zu wenigen Spielern im Datensatz: Der Datensatz kann sie mit Spielern ohne Verein ergänzen, oder die Engine füllt mit erzeugten Spielern auf.
- Die Länder- und Amateurteams im DFB-Pokal und die Pokal-Ausländer spielen weiter ohne Spieler. - Die Länder- und Amateurteams im DFB-Pokal und die Pokal-Ausländer spielen weiter ohne Spieler.
## Stabile Manageridentität während der Coachphase · #20, 29.10.2026
Der bestehende Core tauscht weiterhin Record 4/0 und verkürzt manager_teams
vorübergehend auf das Nationalteam. Die UI darf diese Recordposition nicht als
Identität des ersten Menschen interpretieren. Eine reine Zuordnung liest
CoachActive, OriginalManagerCount und die eingefrorenen ursprünglichen
Eignungsflags: Der zuerst berechtigte Mensch bleibt der Nationaltrainer; in
World-only/einem Einspielerspiel ist es wie im bestehenden Core der erste.
Namen oder Porträts werden ausdrücklich nicht als Identitätsheuristik benutzt.
Manager.slot bezeichnet den logischen menschlichen Slot (0–3); das optionale
runtimeSlot nennt den tatsächlichen Record (0–4). Die erste verdrängte
Vereinsakte liegt vorübergehend in Record 4. Session und Desktop liefern die
stabile ID/Anzeige des richtigen Menschen sowie die Vereinszuordnungen der
wartenden Menschen. Commands werden weiterhin über die Manager-ID des aktuellen
Scopes autorisiert. Speichern verwendet intern den aktiven Runtime-Record.
Neue Almanach-Managereinträge verwenden den logischen Menschen statt des
vorübergehenden Coachslots 0. Alte Archivdaten werden nicht rückwirkend geraten
oder umgeschrieben. Coachwahl, Recordtausch, Spiele, Zufallsverbrauch und OBS-
Layout ändern sich nicht. Die Zuordnung funktioniert auch ohne neue Manager-
Darstellungen in älteren Spielständen. Der Schemaentwurf kennt runtimeSlot
optional; der Welteditor benötigt keine Anpassung.
Private Vorher-/Nachher-Projektionen und kontrollierte Mehrspieler-Karriere:
bmh_4k_ui/docs/qa/coach-identity-2026-10-29/.
Abnahme: 55 synthetische CTests und 23 native GUI-Prüfungen bestanden. Ein
kontrollierter Vier-Manager-Gegenfall benennt den dritten Menschen zum Coach;
Takeover/Handback, späterer echter National-Schreibtisch über session.advance,
OBS-Neustart (mit und ohne Darstellungsdaten) und eine tatsächlich aufgezeichnete
Nationalpartie sind geprüft. Die Aufzeichnung nennt Index 2 und den richtigen
Namen. Alle Read-/Save-Rundreisen bewahren RNG-/Archivbytes. Native Ausführung
Linux x64; Windows/macOS wurden nicht ausgeführt. National-Aufstellung/Taktik
bleiben vom gegenwärtigen Runtime-API noch gesperrt und sind kein Teil dieses
Identitätsfixes.
+9
View File
@@ -174,3 +174,12 @@ Ein/zwei/vier Menschen, drei Themes, 720p/1080p, reine Nationalwahl und
OBS-Neustarts sind geprüft. 54 synthetische CTests und private Bytevergleiche OBS-Neustarts sind geprüft. 54 synthetische CTests und private Bytevergleiche
bestehen. Anstoß bleibt gesperrt. Private QA: bestehen. Anstoß bleibt gesperrt. Private QA:
bmh_4k_ui/docs/qa/engine-new-career-2026-10-29/. bmh_4k_ui/docs/qa/engine-new-career-2026-10-29/.
### M9 · Nationaltrainer und stabile Menschenidentität, 29. Oktober 2026
#20: Session-/Desktop-Metadaten trennen logischen Menschen und aktuellen Record.
Der dritte Mensch bleibt beim bestehenden 4/0-Tausch dieselbe Person; wartende
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.
+9
View File
@@ -96,3 +96,12 @@ Neustart. Vor und nach den Läufen bleiben Binary und Eingabewelt bytegleich.
Die Bilder wurden auf sichtbare Überschriften, Wochentage, lesbare Themefarben Die Bilder wurden auf sichtbare Überschriften, Wochentage, lesbare Themefarben
und passende Inhaltsgrenzen geprüft. Eine numerische Glyphen-/Pixelparität zur und passende Inhaltsgrenzen geprüft. Eine numerische Glyphen-/Pixelparität zur
HTML-Referenz wird nicht behauptet. HTML-Referenz wird nicht behauptet.
## Mehrspieler-Coachphase · 29. Oktober 2026
Die aktive Nationalansicht verwendet die tatsächliche stabile Menschen-ID auch
bei einem Coach aus einem anderen Slot als dem ersten (#20). Name und Foto- oder
Illustrationsart gehören derselben Person. Die wartenden Menschen behalten ihre
Vereinszuordnungen im Session-Read. Logischer Slot und vorübergehender Recordslot
sind getrennt; die Oberfläche erfindet keine zweite Coachwahl und verändert keine
Spiele. Private Belege: bmh_4k_ui/docs/qa/coach-identity-2026-10-29/.
+10
View File
@@ -345,3 +345,13 @@ und beenden sowie Ohne Speichern beenden zur Auswahl. Ein abgebrochener oder
fehlgeschlagener Save schließt die Partie nicht; vorhandene Zieldateien werden fehlgeschlagener Save schließt die Partie nicht; vorhandene Zieldateien werden
weiterhin nicht überschrieben. Der vollständige moderne Dateibibliotheksdialog weiterhin nicht überschrieben. Der vollständige moderne Dateibibliotheksdialog
ist ein getrenntes Folgepaket. ist ein getrenntes Folgepaket.
## Nationaltrainer und menschliche Identität · 29. Oktober 2026
Beim temporären Recordtausch hält die Session nun die stabile Identität des
wirklich ausgewählten Menschen (#20). Manager.slot ist der logische Mensch,
runtimeSlot der tatsächliche aktuelle Record. Der Schreibtisch/Scope verwenden
die passende Manager-ID, Name und Porträtart; wartende Menschen verlieren ihre
Vereinszuordnungen nicht. UI-Commands verwenden wie bisher IDs und Revisionen,
keine aus der Anzeige geratenen Recordnummern. Alte OBS ohne Darstellungsfelder
bleiben unterstützt. Details: [Nationalteams](../../new_engine/nationalteams.md).
@@ -545,6 +545,12 @@
}, },
"minItems": 0, "minItems": 0,
"maxItems": 200 "maxItems": 200
},
"runtimeSlot": {
"type": "integer",
"minimum": 0,
"maximum": 4,
"description": "Optional runtime record slot; record 4 is a preserved club record while coaching. slot remains the logical human slot."
} }
}, },
"required": [ "required": [
@@ -30,6 +30,7 @@ D['Competition']=obj({'id':ref('Id'),'name':ref('Text'),'kind':enum('league','do
D['Season']=obj({'id':ref('Id'),'startDate':ref('Date'),'endDate':ref('Date'),'label':string(20),'completed':{'type':'boolean'}}) D['Season']=obj({'id':ref('Id'),'startDate':ref('Date'),'endDate':ref('Date'),'label':string(20),'completed':{'type':'boolean'}})
D['Employment']=obj({'id':ref('Id'),'managerId':ref('Id'),'teamId':ref('Id'),'role':enum('club_manager','national_coach'),'from':ref('Date'),'until':nullable(ref('Date')),'endReason':nullable(enum('resigned','dismissed','retired','career_end'))}) D['Employment']=obj({'id':ref('Id'),'managerId':ref('Id'),'teamId':ref('Id'),'role':enum('club_manager','national_coach'),'from':ref('Date'),'until':nullable(ref('Date')),'endReason':nullable(enum('resigned','dismissed','retired','career_end'))})
D['Manager']=obj({'id':ref('Id'),'slot':integer(0,3),'name':string(100),'control':enum('human','ai','archived'),'status':enum('active','resigned','dismissed','retired'),'teamId':nullable(ref('Id')),'portraitGuiKey':nullable(ref('Id')),'portraitStyle':enum('photo','painted'),'strengthChoice':integer(0,2),'employments':arr(ref('Employment'),0,200)}) D['Manager']=obj({'id':ref('Id'),'slot':integer(0,3),'name':string(100),'control':enum('human','ai','archived'),'status':enum('active','resigned','dismissed','retired'),'teamId':nullable(ref('Id')),'portraitGuiKey':nullable(ref('Id')),'portraitStyle':enum('photo','painted'),'strengthChoice':integer(0,2),'employments':arr(ref('Employment'),0,200)})
D['Manager']['properties']['runtimeSlot']=dict(integer(0,4),description='Optional runtime record slot; record 4 is a preserved club record while coaching. slot remains the logical human slot.')
D['Ownership']=obj({'teamId':ref('Id'),'controller':enum('human','ai'),'managerId':nullable(ref('Id')),'sinceRevision':ref('Revision')}) D['Ownership']=obj({'teamId':ref('Id'),'controller':enum('human','ai'),'managerId':nullable(ref('Id')),'sinceRevision':ref('Revision')})
D['Scope']=obj({'managerId':nullable(ref('Id')),'teamId':nullable(ref('Id')),'role':enum('club','national','observer','session'),'scopeId':ref('Id'),'allowedCommands':arr(string(100),0,100)}) D['Scope']=obj({'managerId':nullable(ref('Id')),'teamId':nullable(ref('Id')),'role':enum('club','national','observer','session'),'scopeId':ref('Id'),'allowedCommands':arr(string(100),0,100)})
D['Page']=obj({'limit':integer(1,200),'cursor':nullable(string(2048)),'nextCursor':nullable(string(2048)),'snapshotRevision':ref('Revision'),'total':nullable(integer()),'sort':arr(obj({'field':string(100),'direction':enum('asc','desc')}),1,5)}) D['Page']=obj({'limit':integer(1,200),'cursor':nullable(string(2048)),'nextCursor':nullable(string(2048)),'snapshotRevision':ref('Revision'),'total':nullable(integer()),'sort':arr(obj({'field':string(100),'direction':enum('asc','desc')}),1,5)})
+24 -15
View File
@@ -109,27 +109,36 @@ J team_ref(const ModernState& g, int team, const std::string& as_of) {
{"crestAssetId", text_or_null(club ? &club->crest : nullptr)}, {"nameAsOf", as_of}}; {"crestAssetId", text_or_null(club ? &club->crest : nullptr)}, {"nameAsOf", as_of}};
} }
std::string manager_id(const ModernState& g, int manager) { std::string human_manager_id(const ModernState& g, int human) {
const std::string& id = entry(g.manager_ids, size_t(manager)); const std::string& id = entry(g.manager_ids, size_t(human));
return id.empty() ? "manager:slot-" + std::to_string(manager) : id; return id.empty() ? "manager:slot-" + std::to_string(human) : id;
}
std::string manager_id(const ModernState& g, int runtime) {
return human_manager_id(g, g.human_manager_slot(runtime));
}
int human_team(const ModernState& g, int human) {
const int record = g.manager_record_slot(human);
if (record >= 0 && size_t(record) < g.manager_teams.size()) return g.manager_teams[size_t(record)];
const size_t at = size_t(record) * kRecord + 0x290;
return record >= 0 && at + 1 < g.manager_records.size() ? int(uint16_t(g.manager_records[at]) | uint16_t(g.manager_records[at + 1]) << 8) : -1;
} }
// A human manager (Manager of the contract). After the career's end he is archived: resigned // A human manager (Manager of the contract). After the career's end he is archived: resigned
// when he gave up, retired when the set duration ran out. // when he gave up, retired when the set duration ran out.
J manager_json(const ModernState& g, int manager, bool at_desk) { J manager_json(const ModernState& g, int human) {
(void)at_desk; // who is at the desk is the session's activeManagerId const int manager = g.manager_record_slot(human);
const int team = team_of(g, manager); const int team = human_team(g, human);
const size_t at = size_t(manager) * kRecord; const size_t at = size_t(manager) * kRecord;
const int portrait = at + 0x221 < g.manager_records.size() ? g.manager_records[at + 0x221] : 0; const int portrait = at + 0x221 < g.manager_records.size() ? g.manager_records[at + 0x221] : 0;
const auto* presentation = g.manager_presentation(manager); const auto* presentation = g.manager_presentation_for_human(human);
const std::string style = presentation ? presentation->portrait_style : "photo"; const std::string style = presentation ? presentation->portrait_style : "photo";
const bool ended = !g.career_end_reason.empty(); const bool ended = !g.career_end_reason.empty();
const char* status = !ended ? "active" : g.career_end_reason == "last_human_resigned" ? "resigned" : "retired"; const char* status = !ended ? "active" : g.career_end_reason == "last_human_resigned" ? "resigned" : "retired";
return O{{"id", manager_id(g, manager)}, {"slot", manager}, {"name", manager_name(g, manager)}, return O{{"id", human_manager_id(g, human)}, {"slot", human}, {"runtimeSlot", manager}, {"name", manager_name(g, manager)},
{"control", ended ? "archived" : "human"}, {"status", status}, {"control", ended ? "archived" : "human"}, {"status", status},
{"teamId", team >= 0 ? J(team_id(g, team)) : J(nullptr)}, {"teamId", team >= 0 ? J(team_id(g, team)) : J(nullptr)},
{"portraitGuiKey", "gui:manager/" + style + "/" + std::to_string(portrait)}, {"portraitStyle", style}, {"portraitGuiKey", "gui:manager/" + style + "/" + std::to_string(portrait)}, {"portraitStyle", style},
{"strengthChoice", nullptr}, {"employments", manager_employments(g, manager, manager_id(g, manager))}}; {"strengthChoice", nullptr}, {"employments", manager_employments(g, human, human_manager_id(g, human))}};
} }
// The commands the desk accepts now (the session refuses the others): none after the career's // The commands the desk accepts now (the session refuses the others): none after the career's
@@ -192,15 +201,15 @@ J session_data(const ModernState& g, const UiContext& c) {
const bool ended = c.career_ended || !g.career_end_reason.empty(); const bool ended = c.career_ended || !g.career_end_reason.empty();
bool national = false, club = false; bool national = false, club = false;
for (int m = 0; m < human_managers(g); ++m) { for (int m = 0; m < human_managers(g); ++m) {
const int team = team_of(g, m); const int team = human_team(g, m);
(team == no_team() ? national : club) = true; (team == no_team() ? national : club) = true;
if (ended) { if (ended) {
archived_ids.push_back(manager_id(g, m)); archived_ids.push_back(human_manager_id(g, m));
continue; continue;
} }
managers.push_back(manager_json(g, m, m == c.manager)); managers.push_back(manager_json(g, m));
if (team >= 0) if (team >= 0)
ownership.push_back(O{{"teamId", team_id(g, team)}, {"controller", "human"}, {"managerId", manager_id(g, m)}, ownership.push_back(O{{"teamId", team_id(g, team)}, {"controller", "human"}, {"managerId", human_manager_id(g, m)},
{"sinceRevision", "0"}}); {"sinceRevision", "0"}});
} }
const std::string reason = !g.career_end_reason.empty() ? g.career_end_reason : ended ? "career_completed" : ""; const std::string reason = !g.career_end_reason.empty() ? g.career_end_reason : ended ? "career_completed" : "";
@@ -216,7 +225,7 @@ J session_data(const ModernState& g, const UiContext& c) {
J desktop_data(const ModernState& g, const UiContext& c, const std::string& today) { J desktop_data(const ModernState& g, const UiContext& c, const std::string& today) {
const int team = team_of(g, c.manager); const int team = team_of(g, c.manager);
const bool national = team == no_team(); const bool national = team == no_team();
O data{{"kind", "desktop"}, {"manager", manager_json(g, c.manager, true)}, {"team", team_ref(g, team, today)}}; O data{{"kind", "desktop"}, {"manager", manager_json(g, g.human_manager_slot(c.manager))}, {"team", team_ref(g, team, today)}};
// the account: the bank's savings and credit follow with the bank read // the account: the bank's savings and credit follow with the bank read
data["accounts"] = O{{"cash", ui_money(money_of(g, c.manager))}, {"savings", nullptr}, {"debt", nullptr}, data["accounts"] = O{{"cash", ui_money(money_of(g, c.manager))}, {"savings", nullptr}, {"debt", nullptr},
{"netAssets", nullptr}}; {"netAssets", nullptr}};
@@ -465,7 +474,7 @@ cli::Json ui_snapshot(const ModernState& g, const UiContext& c, const std::strin
} }
std::string ui_team_id(const ModernState& g, int team) { return team_id(g, team); } std::string ui_team_id(const ModernState& g, int team) { return team_id(g, team); }
cli::Json ui_manager(const ModernState& g, int manager) { return manager_json(g, manager, false); } cli::Json ui_manager(const ModernState& g, int manager) { return manager_json(g, g.human_manager_slot(manager)); }
std::string ui_player_id(const ModernState& g, int player) { std::string ui_player_id(const ModernState& g, int player) {
std::string id = entry(g.world_player_id, size_t(player)); std::string id = entry(g.world_player_id, size_t(player));
+1 -1
View File
@@ -63,7 +63,7 @@ AlmanacClub club_of(const ModernState& g, int team) {
AlmanacManager manager_of(const ModernState& g, int manager) { AlmanacManager manager_of(const ModernState& g, int manager) {
AlmanacManager m; AlmanacManager m;
m.index = manager; m.index = g.human_manager_slot(manager);
if (const auto* p = g.manager_presentation(manager)) { m.name = p->name; return m; } if (const auto* p = g.manager_presentation(manager)) { m.name = p->name; return m; }
const size_t at = size_t(manager) * kManagerRecord + 0xa8; // the manager's name (30 bytes) const size_t at = size_t(manager) * kManagerRecord + 0xa8; // the manager's name (30 bytes)
for (size_t i = 0; i < 30 && at + i < g.manager_records.size() && g.manager_records[at + i]; ++i) for (size_t i = 0; i < 30 && at + i < g.manager_records.size() && g.manager_records[at + i]; ++i)
+8 -1
View File
@@ -89,11 +89,18 @@ struct ModernState : GameState {
bool operator==(const ManagerPresentation&) const = default; bool operator==(const ManagerPresentation&) const = default;
}; };
std::vector<ManagerPresentation> manager_presentations; std::vector<ManagerPresentation> manager_presentations;
const ManagerPresentation* manager_presentation(int slot) const { // Runtime slot zero temporarily contains the national coach. These read-only
// mappings recover the human identity and its original/backup record.
int human_manager_slot(int runtime_slot) const;
int manager_record_slot(int human_slot) const;
const ManagerPresentation* manager_presentation_for_human(int slot) const {
if (slot < 0 || size_t(slot) >= manager_ids.size()) return nullptr; if (slot < 0 || size_t(slot) >= manager_ids.size()) return nullptr;
for (const auto& p : manager_presentations) if (p.id == manager_ids[size_t(slot)]) return &p; for (const auto& p : manager_presentations) if (p.id == manager_ids[size_t(slot)]) return &p;
return nullptr; return nullptr;
} }
const ManagerPresentation* manager_presentation(int runtime_slot) const {
return manager_presentation_for_human(human_manager_slot(runtime_slot));
}
// The press journal (content/press_journal.hpp): business events the almanac cannot give // The press journal (content/press_journal.hpp): business events the almanac cannot give
// (transfers, contracts, toto, seasons, managers), noted once when they happen and saved, so // (transfers, contracts, toto, seasons, managers), noted once when they happen and saved, so
// the interface's news keep their ids. `data` is the event's facts as JSON text. // the interface's news keep their ids. `data` is the event's facts as JSON text.
+22
View File
@@ -221,6 +221,28 @@ void set_manager_count(ModernState& g, int managers) {
} // namespace } // namespace
int ModernState::human_manager_slot(int runtime_slot) const {
if (runtime_slot < 0 || !memory.has(::bmh::layout::CoachActive) || memory.u8(::bmh::layout::CoachActive) == 0) return runtime_slot;
if (runtime_slot == 4) return 0;
if (runtime_slot != 0) return runtime_slot;
const int count = memory.u8(::bmh::layout::OriginalManagerCount);
if (count == 1 || memory.u32(::bmh::layout::CompetitionSelection) == 2) return 0;
// The source chose the first eligible original record. While coaching,
// record four preserves original human zero; the other records are frozen.
// Read those flags, rather than guessing from a possibly duplicated name.
for (int human = 0; human < count && human < 4; ++human) {
const size_t record = size_t(human == 0 ? 4 : human) * kManagerRecord;
if (record + 0x21c < manager_records.size() && manager_records[record + 0x21c] != 0) return human;
}
throw FormatError("national coach identity is unavailable");
}
int ModernState::manager_record_slot(int human_slot) const {
if (!memory.has(::bmh::layout::CoachActive) || memory.u8(::bmh::layout::CoachActive) == 0) return human_slot;
const int coach = human_manager_slot(0);
if (human_slot == coach) return 0;
return human_slot == 0 ? 4 : human_slot;
}
void national_coach_take_over(ModernState& g, int active_manager, uint16_t source_season_day) { void national_coach_take_over(ModernState& g, int active_manager, uint16_t source_season_day) {
StaticMemory& mem = g.memory; StaticMemory& mem = g.memory;
int managers = int(g.manager_teams.size()); int managers = int(g.manager_teams.size());
+2 -1
View File
@@ -83,7 +83,8 @@ Json EngineBridge::save_copy(const fs::path &path) {
if (fs::weakly_canonical(path) == impl_->input || fs::exists(path)) if (fs::weakly_canonical(path) == impl_->input || fs::exists(path))
throw editor::Error("Bitte eine neue Datei wählen. Der geladene Spielstand wird nicht überschrieben."); throw editor::Error("Bitte eine neue Datei wählen. Der geladene Spielstand wird nicht überschrieben.");
const auto bundle = snapshot(); const auto bundle = snapshot();
const auto slot = bundle.at("desktop").at("data").at("manager").at("slot").get<int>(); const auto &manager = bundle.at("desktop").at("data").at("manager");
const auto slot = manager.value("runtimeSlot", manager.at("slot").get<int>());
std::string error; std::string error;
if (!impl_->session->save_game(path, slot, false, error)) throw editor::Error(error); if (!impl_->session->save_game(path, slot, false, error)) throw editor::Error(error);
return {{"messageType", "saved"}, {"path", editor::utf8(path)}}; return {{"messageType", "saved"}, {"path", editor::utf8(path)}};
+27
View File
@@ -0,0 +1,27 @@
// SPDX-License-Identifier: GPL-3.0-only
// Authored frozen coach records; no original data or simulated game decisions.
#include "modern/content/ui_contract.hpp"
#include "formats/executable_layout.hpp"
#include <iostream>
#include <set>
#include <stdexcept>
using namespace bmh;
namespace {using J=cli::Json;using O=J::Object;const J& at(const J& j,const char* k){return j.object()->at(k);}void check(bool ok,const char* why){if(!ok)throw std::runtime_error(why);}}
int main() try {
modern::ModernState g;g.manager_records.resize(5*0xb0c);g.manager_ids={"manager:1","manager:2","manager:3","manager:4"};g.manager_serial=4;g.manager_teams={no_team()};g.world_club_id.resize(no_team()+1);g.world_club_name.resize(no_team()+1);
for(int i=0;i<4;++i){g.world_club_id[i]="club:"+std::to_string(i);g.world_club_name[i]="Club "+std::to_string(i);g.manager_presentations.push_back({g.manager_ids[i],"Human "+std::string(1,char('A'+i)),i%2?"photo":"painted"});}
g.world_club_id[no_team()]="nation:de";g.world_club_name[no_team()]="Synthetic Nation";
for(int r=0;r<5;++r){const auto team=r==0?no_team():r==4?0:r;const auto record=size_t(r)*0xb0c;g.manager_records[record+0x290]=team&255;g.manager_records[record+0x291]=(team>>8)&255;const std::string name=r==0?"Raw C":r==4?"Raw A":"Raw "+std::string(1,char('A'+r));for(size_t n=0;n<name.size();++n)g.manager_records[record+0xa8+n]=name[n];g.manager_records[record+0x221]=r==0?2:r==4?0:r;}
g.manager_records[2*0xb0c+0x21c]=1;
g.memory.add_block(layout::CoachActive,1);g.memory.set8(layout::CoachActive,1);g.memory.add_block(layout::OriginalManagerCount,1);g.memory.set8(layout::OriginalManagerCount,4);g.memory.add_block(layout::CompetitionSelection,4);g.memory.set32(layout::CompetitionSelection,3);
check(g.human_manager_slot(0)==2&&g.manager_record_slot(2)==0&&g.manager_record_slot(0)==4&&g.human_manager_slot(4)==0,"coach/backup record mapping wrong");
const auto bytes=g.manager_records;modern::UiContext c;c.manager=0;const auto session=modern::ui_read(g,c,O{{"kind","session"}});check(*at(at(session,"meta"),"scope").object()->at("managerId").string()=="manager:3","scope owns wrong human");
const auto &people=*at(at(session,"data"),"managers").array();check(people.size()==4,"waiting humans disappeared");std::set<std::string> ids;
for(int i=0;i<4;++i){const auto &m=people.at(size_t(i));check(*at(m,"id").string()==g.manager_ids[i],"human IDs reordered");ids.insert(*at(m,"id").string());check(*at(m,"teamId").string()==(i==2?"nation:de":"club:"+std::to_string(i)),"waiting human club lost");}
check(ids.size()==4&&*at(people[0],"name").string()=="Human A"&&*at(people[2],"name").string()=="Human C","canonical coach names mixed");
const auto desk=modern::ui_read(g,c,O{{"kind","desktop"},{"managerId","manager:3"}});const auto &manager=at(at(desk,"data"),"manager");check(*at(manager,"id").string()=="manager:3"&&*at(manager,"portraitGuiKey").string()=="gui:manager/painted/2","coach portrait/name belongs to wrong person");check(*at(manager,"slot").integer()==2&&*at(manager,"runtimeSlot").integer()==0,"human and runtime slot conflated");
const auto wrong=modern::ui_read(g,c,O{{"kind","desktop"},{"managerId","manager:1"}});check(*at(wrong,"code").string()=="manager_not_active","displaced human may own coach request");
g.manager_presentations.clear();const auto old=modern::ui_read(g,c,O{{"kind","desktop"}});check(*at(at(at(old,"data"),"manager"),"name").string()=="Raw C"&&*at(at(at(old,"data"),"manager"),"id").string()=="manager:3","older save fallback lost coach identity");check(bytes==g.manager_records,"projection changed original records");
g.memory.set32(layout::CompetitionSelection,2);check(g.human_manager_slot(0)==0,"world-only source chooser is not first human");g.memory.set8(layout::CoachActive,0);g.manager_teams={0,1,2,3};check(g.human_manager_slot(2)==2&&g.manager_record_slot(0)==0,"normal club mapping changed");
std::cout<<"coach stable identity, backup clubs, older metadata and read-only projection passed\n";return 0;
} catch(const std::exception& e){std::cerr<<e.what()<<'\n';return 1;}
+41 -1
View File
@@ -4,6 +4,7 @@
#include "modern/app/modern_session.hpp" #include "modern/app/modern_session.hpp"
#include "modern/content/world_package.hpp" #include "modern/content/world_package.hpp"
#include "modern/ui/demo_opening.hpp" #include "modern/ui/demo_opening.hpp"
#include "modern/game/national.hpp"
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
#include <set> #include <set>
@@ -12,7 +13,7 @@ using namespace bmh::modern_ui;
int main(int argc, char **argv) { int main(int argc, char **argv) {
try { try {
const std::string mode=argc>1?argv[1]:""; 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"}; 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"};
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>"); 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 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)); }; const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
@@ -85,6 +86,45 @@ int main(int argc, char **argv) {
} }
write("receipt.json",{{"status","passed"},{"cases",cases},{"invalidRequests",7},{"nationalOnly",true}});std::cout<<"real career creation, multiple managers, UTF-8, portrait styles and reload passed\n";return 0; write("receipt.json",{{"status","passed"},{"cases",cases},{"invalidRequests",7},{"nationalOnly",true}});std::cout<<"real career creation, multiple managers, UTF-8, portrait styles and reload passed\n";return 0;
} }
if(mode=="inspect-coach-identity") {
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);
auto &g=session.state();modern::UiContext context;context.manager=0;
const auto before=Json::parse(cli::dump_json(modern::ui_read(g,context,cli::Json::Object{{"kind","session"}})));write("before.json",before);const auto expected=before.at("data").at("managers").at(2);
for(int i=0;i<4;++i)g.manager_records[size_t(i)*0xb0c+0x21c]=i==2?1:0;
modern::national_coach_take_over(g,0,2);
const auto after=Json::parse(cli::dump_json(modern::ui_read(g,context,cli::Json::Object{{"kind","desktop"}})));write("after.json",after);
const auto session_after=Json::parse(cli::dump_json(modern::ui_read(g,context,cli::Json::Object{{"kind","session"}})));write("session-after.json",session_after);
write("observations.json",{{"qa_only_eligibility_flags",true},{"chosenHumanSlot",2},{"expected",expected},{"actual",after.at("data").at("manager")},{"ownerMatches",after.at("meta").at("scope").at("managerId")==expected.at("id")},{"nameMatches",after.at("data").at("manager").at("name")==expected.at("name")}});
const auto records=g.manager_records;const auto repeated=Json::parse(cli::dump_json(modern::ui_read(g,context,cli::Json::Object{{"kind","desktop"}})));if(repeated!=after||g.manager_records!=records)throw std::runtime_error("coach projection changed records");
modern::national_coach_hand_back(g);const auto returned=Json::parse(cli::dump_json(modern::ui_read(g,context,cli::Json::Object{{"kind","session"}})));write("returned.json",returned);
if(after.at("meta").at("scope").at("managerId")!=expected.at("id")||after.at("data").at("manager").at("name")!=expected.at("name")||returned.at("data")!=before.at("data"))throw std::runtime_error("coach identity or handback changed humans");
if(session_after.at("data").at("managers").size()!=4)throw std::runtime_error("waiting human managers disappeared");
modern::set_current_world(nullptr);std::cout<<"coach identity and handback verified\n";return 0;
}
if(mode=="prepare-coach-identity") {
{
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);uint64_t revision=0;Json expiry=Json::object(),log=Json::array();bool found=false;
for(int turn=0;turn<400;++turn) {
auto &g=session.state();if(g.manager_teams.size()==4)for(int i=0;i<4;++i)g.manager_records[size_t(i)*0xb0c+0x21c]=i==2?1:0;
const auto desk=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},revision)));
if(desk.at("meta").at("scope").at("role")=="national") {write("national.json",desk);if(desk.at("data").at("manager").at("id")!="manager:3")throw std::runtime_error("unexpected coach in controlled career");found=true;break;}
const auto &meta=desk.at("meta");const Json command={{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:coach-advance-"+std::to_string(turn)},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};
const auto reply=Json::parse(cli::dump_json(session.ui_command(cli::parse_json(command.dump()),revision)));log.push_back(reply);
if(reply.value("messageType","")=="command_result")continue;if(reply.value("code","")=="decision_pending"){expiry[reply.at("message").at("args").at("playerId").get<std::string>()]={{"action","release"}};continue;}throw std::runtime_error(reply.dump());
}
write("advance.json",log);if(!found)throw std::runtime_error("controlled national desk not reached");std::string error;if(!session.save_game(out/"national.obs",0,false,error))throw std::runtime_error(error);
const auto presentations=session.state().manager_presentations;session.state().manager_presentations.clear();if(!session.save_game(out/"national-legacy.obs",0,false,error))throw std::runtime_error(error);session.state().manager_presentations=presentations;
}
modern::set_current_world(nullptr);auto loaded=EngineBridge::open(world,out/"national.obs");const auto read=loaded->snapshot();write("loaded.json",read);if(read.at("desktop").at("data").at("manager").at("id")!="manager:3"||read.at("session").at("data").at("managers").size()!=4)throw std::runtime_error("coach identity lost on reload");std::cout<<"controlled real national desk with third human saved and reloaded\n";return 0;
}
if(mode=="verify-coach-almanac") {
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);uint64_t revision=0;
const auto initial=session.state().almanac.current.matches.size();const auto desk=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},revision)));const auto &meta=desk.at("meta");
const Json command={{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:coach-match"},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",Json::object()}};
const auto reply=Json::parse(cli::dump_json(session.ui_command(cli::parse_json(command.dump()),revision)));write("advance.json",reply);if(reply.value("messageType","")!="command_result")throw std::runtime_error(reply.dump());
const auto &season=session.state().almanac.current;bool found=false;Json recorded=Json::array();for(size_t i=initial;i<season.matches.size();++i){const auto &match=season.matches[i];for(int manager:{int(match.home_manager),int(match.away_manager)})if(manager>=0){const auto &person=season.managers.at(size_t(manager));recorded.push_back({{"managerIndex",person.index},{"name",person.name},{"matchType",match.type}});if(match.type==7||match.type==8){if(person.index!=2||person.name!="Alex Berger")throw std::runtime_error("national archive used another human");found=true;}}}
if(!found)throw std::runtime_error("no human national match recorded");write("recorded-managers.json",recorded);write("returned.json",Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","session"}},revision))));std::string error;const int active=session.state().memory.u8(::bmh::layout::ActiveManager);if(!session.save_game(out/"after-national.obs",active,false,error))throw std::runtime_error(error);modern::set_current_world(nullptr);std::cout<<"national archive attributed to third human\n";return 0;
}
auto link = EngineBridge::open(world, out / "input.obs"); auto link = EngineBridge::open(world, out / "input.obs");
const auto before = link->snapshot(); write("before.json", before); const auto before = link->snapshot(); write("before.json", before);
if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection"); if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection");