Bind national friendly planning to engine offers and saved schedules (by Codex)
This commit is contained in:
1 parent
15d2ac0a4d
commit
d615f03e15
14 files changed
+259
-30
No files matched your search
@@ -31,6 +31,7 @@
|
||||
.friendly-row.selected {background-color:var(--selected);}
|
||||
.friendly-cell {display:flex;align-items:center;justify-content:center;flex-shrink:0;width:14%;padding:8dp 24dp;overflow:hidden;}
|
||||
.friendly-cell:first-child {width:58%;justify-content:flex-start;}
|
||||
.friendly-national-ratings {position:absolute;left:60dp;right:60dp;top:640dp;margin:0;font-size:25dp;line-height:32dp;color:var(--muted);text-align:center;}
|
||||
.friendly-opponent {display:flex;align-items:center;justify-content:flex-start;width:100%;min-width:0;padding:4dp 0;border:0dp;border-radius:6dp;background-color:transparent;font-size:35dp;}
|
||||
.friendly-opponent .club-label {min-width:0;white-space:nowrap;}
|
||||
.friendly-opponent .club-label .image-frame {flex-shrink:0;}
|
||||
@@ -111,3 +112,7 @@ body .friendly-quote-amount strong.money-amount {color:var(--money);}
|
||||
/* A saved friendly remains semantically green in the club calendar. */
|
||||
body .report-underlay .calendar-day.friendly-date {color:#a9dccb;}
|
||||
body.silver .report-underlay .calendar-day.friendly-date {color:#256a4f;}
|
||||
.engine-national-opponents {position:absolute;left:0;right:0;top:150dp;bottom:140dp;overflow-x:hidden;overflow-y:auto;}
|
||||
.engine-national-friendlies .national-opponent {flex-direction:column;justify-content:center;align-items:center;padding:32dp;gap:22dp;font-size:38dp;}
|
||||
.engine-national-friendlies .national-opponent strong {display:flex;align-items:center;justify-content:center;text-align:center;font-size:38dp;font-weight:normal;min-height:120dp;width:100%;}
|
||||
.engine-national-friendlies .national-opponent .image-frame {flex-shrink:0;}
|
||||
@@ -41,7 +41,7 @@ Implementierung in der Spiel-Engine.
|
||||
| Almanach | [Jahreskalender, Tagespartien und historische Spielberichte](desktop/almanac/README.md) |
|
||||
| Paarungsanordnung | [Mittige Ergebnisse und innenliegende Wappen](desktop/fixtures/README.md) |
|
||||
| Berichte | [Tabellen, Stärken, Ligaspiele, übrige Spiele und Profile](desktop/reports/README.md) |
|
||||
| Freundschaftsspiele | [Gegner, Austragungsort, Kostenbestätigung und Vormerkungen](desktop/friendlies/README.md) |
|
||||
| Freundschaftsspiele | [Vereins-/Nationalgegner, echte Angebote und bestätigte Buchungen](desktop/friendlies/README.md) |
|
||||
| Verlegen | [Kalendergestützte Verlegung mit Rücknahme](desktop/postpone/README.md) |
|
||||
| Hallentabellen | [16 Vereine, Sortierung und Hallenmasters-Info](desktop/indoor/README.md) |
|
||||
| Transfermarkt | [Suche, Angebote, Listings und Vormerkungen](desktop/transfer/README.md) |
|
||||
|
||||
@@ -1,5 +1,16 @@
|
||||
# Kalender · native Modern UI
|
||||
|
||||
## Nationalkalender · Engineanschluss vom 28. Oktober 2026
|
||||
|
||||
Der echte Kalender akzeptiert Vereins- und National-Schreibtische. Im
|
||||
Nationalmodus liefert die Engine ihre Qualifikations-/Turniertermine und
|
||||
eigene gespeicherte Freundschaftsspiele als `national` beziehungsweise
|
||||
`friendly`. Allgemeine Vereinswettbewerbe werden dort nicht als Nationalspiele
|
||||
markiert. Land-/Ligafilter entfallen zugunsten eines Saisonhinweises.
|
||||
Verlegungsrechte entstehen dadurch nicht. Die National-Freundschaftsplanung
|
||||
verwendet die genauen Tage ihres Engine-Angebots, unabhängig von den allgemeinen
|
||||
Kalendermarkierungen; siehe [Freundschaftsspiele](../friendlies/README.md).
|
||||
|
||||
## Echter Engine-Einstieg · 28. Oktober 2026
|
||||
|
||||
`--ui-career` verwendet jetzt denselben Zwölfmonatsrenderer mit einem vollständigen
|
||||
|
||||
@@ -34,10 +34,53 @@ erhalten Buchungen und tatsächliche Konten. Beide RNGs bleiben bei diesen
|
||||
Vereinsbuchungen unverändert.
|
||||
|
||||
Dies bindet Vereinsfreundschaftsspiele und lokale Hotseat-Zustimmung an.
|
||||
Nationalplanung und spätere Netzwerkfreigaben bleiben eigene Anschlüsse.
|
||||
Die Nationalplanung ist nachfolgend beschrieben. Spätere Netzwerkfreigaben
|
||||
bleiben ein eigener Anschluss.
|
||||
Private Screenshots mit passenden Eingangs-/Ausgangs-OBS und Negativprüfungen:
|
||||
`bmh_4k_ui/docs/qa/engine-friendlies-2026-10-28/`.
|
||||
|
||||
## Nationalplanung · echter Engine-Einstieg · 28. Oktober 2026
|
||||
|
||||
Aufbauend auf Vereinsstand `15d2ac0` unterstützt derselbe Presenter auch
|
||||
`scope.role: national`. `friendly-plan.national` benennt den Spieltyp explizit.
|
||||
Die Gegnerauswahl kommt vollständig aus der aktuellen Engine-Welt; für Diamond
|
||||
1.5 sind es 61 andere Nationalmannschaften. Die eigene Mannschaft ist nicht
|
||||
wählbar. Vereins-, Liga-, Tabellenplatz- und Spielefilter entfallen. Die großen
|
||||
Gegnerkarten stehen wie in der HTML-Referenz zu viert pro Reihe;
|
||||
der vollständige Katalog scrollt. Dialoge erhalten seine Scrollposition.
|
||||
Unten bleibt „Vorgemerkte Spiele“.
|
||||
|
||||
Nationale Angebotsstärken sind keine festen Kaderdurchschnitte: `friendly`
|
||||
liefert `national: true` und `ratings: [own, opponent]` aus einer Vorschau auf
|
||||
einer Kopie des Watcom-RNG. Die Karten zeigen deshalb keine erfundenen Stärken;
|
||||
erst der Kosten-/Ortsdialog nennt die beiden tatsächlichen Angebotsstärken.
|
||||
Das Öffnen, Wiederholen oder Abbrechen eines Angebots verbraucht keine
|
||||
Zufallszüge und ändert weder Revision noch Guthaben.
|
||||
|
||||
Auch hier stammen Terminfreigabe, Heim-/Auswärtspaarung und Kosten ausschließlich
|
||||
aus `friendly`. Die Monatsansicht mit Pfeilen und rechter Auswahl-/Buchungsübersicht
|
||||
folgt der bestehenden HTML-/RmlUI-Nationalansicht. Nur die tatsächlichen
|
||||
Angebotstage sind aktiv; der Monatswechsel verändert keinen gewählten Termin.
|
||||
Der Nationalread
|
||||
bezeichnet die von `day_competitions` gelieferten rotierenden Qualifikations-/
|
||||
Turnierbits 9–12 und WM-Endrunden als `national`; Vereinswettbewerbe werden am
|
||||
National-Schreibtisch nicht als nationale Spiele dargestellt. Es wird keine
|
||||
Datumsregel im Client nachgebaut. Der normale Nationalkalender hat einen
|
||||
Saisonhinweis statt Land-/Ligaauswahl; Vereinsverlegungen bleiben gesperrt.
|
||||
|
||||
Erst die abschließende Bestätigung schickt `friendly.book`. Die Engine darf
|
||||
bei einer erfolgreichen Nationalbuchung ihre vorgesehenen Watcom-Züge und den
|
||||
Game-RNG-Zug für den Nationalbonus übernehmen. Ein Abbruch in der UI schickt
|
||||
keinen Command; abgelehnte, veraltete oder ungültige Commands müssen vollständig
|
||||
zurückrollen. Datum, Gegner, Spielstätte, Konten und beide Zufallsströme bleiben
|
||||
in der OBS gespeichert. Bestehende Vereinsbuchungen anderer Teams bleiben
|
||||
unberührt. Eine lokale Liste ist weiterhin keine Buchungsquelle.
|
||||
|
||||
Private QA einschließlich regulär erreichtem National-Schreibtisch, allen
|
||||
Gegnerangeboten, Heim-/Auswärtsbuchung, Neustart, UI-Abbrüchen und drei Themes:
|
||||
`bmh_4k_ui/docs/qa/engine-national-2026-10-28/`. Native Windows-/macOS-Runtimes
|
||||
sind in diesem Linux-Durchlauf nicht geprüft.
|
||||
|
||||
## Getrennte Präsentationsdemo
|
||||
|
||||
Stand: 24. Oktober 2026, natives Planungspaket. Die unveränderte private
|
||||
@@ -189,7 +232,7 @@ Planungsauflage verworfen; der Speicherbildschirm bleibt per Tab bedienbar.
|
||||
|
||||
## Nationalkontext
|
||||
|
||||
Im Nationalkontext ersetzt die [eigene Nationalansicht](../national/README.md)
|
||||
In der getrennten Präsentationsdemo ersetzt die [eigene Nationalansicht](../national/README.md)
|
||||
diese Vereinsprojektion. Sie liest die aktive Manageridentität, zeigt keine
|
||||
erfundenen Vereinsleistungen oder Nationalstatistiken und hält eventuelle
|
||||
Dummy-Vormerkungen vollständig vom Vereinskalender und Geld getrennt.
|
||||
@@ -7,6 +7,21 @@ Nationalkontext diese eigene Darstellung. Die vorhandenen Vereinsansichten
|
||||
bleiben erhalten. Die Entscheidung erfolgt über die bestätigte Karriere-Rolle
|
||||
und die aktiv ausgewählte Manageridentität, nicht über Person 0.
|
||||
|
||||
## Echter Engineanschluss · 28. Oktober 2026
|
||||
|
||||
Die Freundschaftsplanung ist jetzt zusätzlich im echten National-Schreibtisch
|
||||
an `ModernSession` angebunden. Die Karten- und Monatsgestaltung bleibt erhalten;
|
||||
der reale Gegnerkatalog scrollt bei mehr als acht Nationen. Gegner-IDs, Daten,
|
||||
Heim-/Auswärtskosten, Zahler, Angebotsstärken und Termine kommen aus der Engine.
|
||||
Die Oberfläche erzeugt weder nationale Terminvorschläge noch feste Stärken.
|
||||
Erst die abschließende Bestätigung bucht verbindlich. OBS-Rundreise und beide
|
||||
Zufallsströme sind geprüft. Einzelheiten, Vertragsfelder und private Belege:
|
||||
[Freundschaftsspiele](../friendlies/README.md#nationalplanung--echter-engine-einstieg--28-oktober-2026).
|
||||
Erfolge und Spielerstatistik bleiben hier weiterhin getrennte Präsentations-
|
||||
ansichten; dieser Anschluss behauptet keine bereits angebundene Statistik.
|
||||
|
||||
Die folgenden Zustands- und Grenzbeschreibungen betreffen die **separate Demo**.
|
||||
|
||||
## Sichtbare Daten und Grenzen
|
||||
|
||||
Erfolge zeigt zwei Pokalkarten für Welt- und Europameisterschaft und eine leere
|
||||
|
||||
@@ -454,14 +454,15 @@ cli::Json ui_read(const ModernState& g, const UiContext& c, const cli::Json& req
|
||||
// Read the saved plan, never a UI-local booking log. These are the same
|
||||
// verified 30 day/team entries used by book_friendly_match.
|
||||
const int own = team_of(g, c.manager);
|
||||
if (own < 0 || own >= league_clubs())
|
||||
return failure(request_id, "no_club", "Vereinsplanung ist hier nicht verfügbar.", c.state_revision);
|
||||
const bool national = own == no_team();
|
||||
if (!national && (own < 0 || own >= league_clubs()))
|
||||
return failure(request_id, "no_club", "Freundschaftsplanung ist hier nicht verfügbar.", c.state_revision);
|
||||
constexpr uint32_t entries = 30;
|
||||
if (!g.memory.has(layout::FriendlyDays + entries * 2 - 1) ||
|
||||
!g.memory.has(layout::FriendlyTeams + entries * 4 - 1))
|
||||
return failure(request_id, "friendly_plan_unavailable", "Der Spielplan ist unvollständig.", c.state_revision);
|
||||
A opponents, bookings;
|
||||
for (int t = 0; t < first_foreign_cup(); ++t) {
|
||||
for (int t = national ? no_team() + 1 : 0; t < (national ? world_layout().total_teams() : first_foreign_cup()); ++t) {
|
||||
if (t == own) continue;
|
||||
const int league = team_league(t);
|
||||
const std::string league_id = league >= 0 && size_t(league) < g.world_league_id.size() ? g.world_league_id[size_t(league)] : std::string{};
|
||||
@@ -481,7 +482,7 @@ cli::Json ui_read(const ModernState& g, const UiContext& c, const cli::Json& req
|
||||
bookings.push_back(O{{"id", "friendly:" + date + ":" + team_id(g, home) + ":" + team_id(g, away)},
|
||||
{"date", date}, {"home", team_ref(g, home, date)}, {"away", team_ref(g, away, date)}});
|
||||
}
|
||||
return snapshot(request_id, std::move(m), O{{"kind", "friendly-plan"}, {"teamId", team_id(g, own)},
|
||||
return snapshot(request_id, std::move(m), O{{"kind", "friendly-plan"}, {"national", national}, {"teamId", team_id(g, own)},
|
||||
{"opponents", std::move(opponents)}, {"bookings", std::move(bookings)}});
|
||||
}
|
||||
if (kind == "calendar") {
|
||||
@@ -499,13 +500,19 @@ cli::Json ui_read(const ModernState& g, const UiContext& c, const cli::Json& req
|
||||
const std::string date = date_of(d.day);
|
||||
if (date < from || date > until) continue;
|
||||
A kinds, ids;
|
||||
if (d.competitions & 0x1f) kinds.push_back("league");
|
||||
for (int bit = 5; bit < 15; ++bit)
|
||||
if (d.competitions >> bit & 1) kinds.push_back("cup:" + std::to_string(bit - 5));
|
||||
if (d.competitions & 0x8000) kinds.push_back("replay");
|
||||
if (d.competitions & 0x10000) kinds.push_back("indoor");
|
||||
if (d.competitions & 0x40000) kinds.push_back("special");
|
||||
if (d.competitions & 0x800000) kinds.push_back("national");
|
||||
if (own == no_team()) {
|
||||
// day_competitions rotates the national qualifiers/finals through
|
||||
// bits 9..12. Club tournament flags do not describe this desk.
|
||||
if (d.competitions & 0x801e00) kinds.push_back("national");
|
||||
} else {
|
||||
if (d.competitions & 0x1f) kinds.push_back("league");
|
||||
for (int bit = 5; bit < 15; ++bit)
|
||||
if (d.competitions >> bit & 1) kinds.push_back("cup:" + std::to_string(bit - 5));
|
||||
if (d.competitions & 0x8000) kinds.push_back("replay");
|
||||
if (d.competitions & 0x10000) kinds.push_back("indoor");
|
||||
if (d.competitions & 0x40000) kinds.push_back("special");
|
||||
if (d.competitions & 0x800000) kinds.push_back("national");
|
||||
}
|
||||
if (d.friendly) kinds.push_back("friendly");
|
||||
for (const ClubCalendarMatch& cm : d.matches) {
|
||||
const std::string id = "fixture:league-" + std::to_string(cm.league) + "-" + std::to_string(cm.round + 1) + "-" + std::to_string(cm.match);
|
||||
|
||||
@@ -51,6 +51,7 @@ std::string App::engine_calendar_info(const Json &view) const {
|
||||
return out;
|
||||
}
|
||||
std::string App::engine_calendar_footer(const Json &view) {
|
||||
if (view.at("national")==true) return "<nav class=\"report-footer\">" + btn("engine-calendar-filter", "Nationalmannschaft · Saison " + esc(engine_data_.at("desktop").at("meta").at("season").at("label").get<std::string>()), "report-reset engine-calendar-label", "id=\"calendar-national\" disabled style=\"" + rect(0,0,2612,94) + "\"") + "</nav>";
|
||||
const auto &team = engine_data_.at("desktop").at("data").at("team");
|
||||
const auto *nation = world_->find("nations", team.value("nationId", ""));
|
||||
const auto *league = view.at("league").is_string() ? world_->find("competitions", view.at("league")) : nullptr;
|
||||
|
||||
@@ -66,10 +66,12 @@ void App::engine_poll() {
|
||||
}
|
||||
void App::engine_frame() {
|
||||
engine_poll();
|
||||
const bool rendered = needs_render_;
|
||||
if (needs_render_) engine_render();
|
||||
engine_sports_update();
|
||||
if (ticket_) ticket_->update();
|
||||
render_popup(); context_->Update();
|
||||
if (rendered && menu_ == "friendlies") if (auto *list = element("friendly-opponents")) list->SetScrollTop(engine_friendly_scroll_);
|
||||
if (menu_ == "contracts" && engine_contract_scroll_) {
|
||||
if (auto *roster = element("contracts-roster-scroll")) roster->SetScrollTop(*engine_contract_scroll_);
|
||||
engine_contract_scroll_.reset();
|
||||
@@ -226,5 +228,5 @@ void App::engine_event(Rml::Event &event) {
|
||||
}
|
||||
Json App::engine_snapshot() const {
|
||||
return {{"mode", engine_mode_}, {"busy", engine_busy_}, {"dirty", engine_dirty_}, {"fresh", engine_fresh_}, {"bundle", engine_data_},
|
||||
{"response", engine_response_}, {"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_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
|
||||
{"response", engine_response_}, {"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_}};
|
||||
}
|
||||
@@ -592,11 +592,13 @@ bool schedule_permission(const Json &bundle) {
|
||||
Json engine_calendar_projection(const Json &bundle) {
|
||||
validate_engine_desk(bundle);
|
||||
const auto &meta = bundle.at("desktop").at("meta"), &data = lineup_read(bundle, "calendar");
|
||||
require(meta.at("scope").at("role") == "club", "Der Vereinskalender ist am National-Schreibtisch nicht verfügbar.");
|
||||
const auto role = meta.at("scope").at("role");
|
||||
require(role == "club" || role == "national", "Unbekannter Kalenderkontext.");
|
||||
const bool national = role == "national";
|
||||
const auto start = meta.at("season").at("startDate").get<std::string>(), end = meta.at("season").at("endDate").get<std::string>();
|
||||
const auto days = calendar_days(start); // Gregorian geometry only; no demo fixtures or date rules.
|
||||
require(!days.empty() && days.back().iso == end && data.at("from") == start && data.at("until") == end, "Unvollständiger Saisonkalender.");
|
||||
Json view = {{"start",start},{"end",end},{"count",days.size()},{"events",Json::object()},{"fixtures",Json::array()},{"league",nullptr}};
|
||||
Json view = {{"start",start},{"end",end},{"count",days.size()},{"national",national},{"events",Json::object()},{"fixtures",Json::array()},{"league",nullptr}};
|
||||
const auto today = (calendar_iso_day(meta.at("date")) - calendar_iso_day(start)).count(); view["today"] = today >= 0 && today < int(days.size()) ? Json(today) : Json();
|
||||
require(data.at("fixtures").is_array() && data.at("days").is_array(), "Kalenderdaten fehlen.");
|
||||
const auto own = meta.at("scope").at("teamId"); std::map<std::string,Json> fixtures; std::set<std::string> leagues;
|
||||
@@ -619,7 +621,9 @@ Json engine_calendar_projection(const Json &bundle) {
|
||||
std::set<std::string> ids;
|
||||
for(const auto &id:raw.at("fixtureIds")) {require(id.is_string()&&fixtures.contains(id.get<std::string>())&&ids.insert(id.get<std::string>()).second,"Unbekannte oder doppelte Kalenderreferenz.");require(fixtures.at(id.get<std::string>()).at("day")==index,"Partie steht am falschen Datum.");}
|
||||
for(const auto &kind:raw.at("eventKinds"))require(kind.is_string(),"Ungültiger Kalendertermin.");
|
||||
view["events"][std::to_string(index)]={{"kinds",raw.at("eventKinds")},{"ids",raw.at("fixtureIds")}};
|
||||
auto kinds = raw.at("eventKinds");
|
||||
if (national) std::erase_if(kinds.get_ref<Json::array_t &>(), [](const Json &k) { return k != "national" && k != "friendly"; });
|
||||
view["events"][std::to_string(index)]={{"kinds",kinds},{"ids",raw.at("fixtureIds")}};
|
||||
}
|
||||
for(const auto &[id,f]:fixtures) {
|
||||
const auto key=std::to_string(f.at("day").get<int>());
|
||||
@@ -662,12 +666,15 @@ Json engine_reschedule_undo(const Json &bundle,const std::string &date,const std
|
||||
|
||||
Json engine_friendly_plan(const Json &bundle) {
|
||||
validate_engine_desk(bundle);const auto &data=lineup_read(bundle,"friendly-plan"),&scope=bundle.at("desktop").at("meta").at("scope");
|
||||
require(scope.at("role")=="club"&&data.at("teamId")==scope.at("teamId"),"Vereinsplanung gehört einem anderen Schreibtisch.");
|
||||
const bool national = scope.at("role") == "national";
|
||||
require((national || scope.at("role")=="club") && data.at("teamId")==scope.at("teamId"),"Freundschaftsplanung gehört einem anderen Schreibtisch.");
|
||||
require(data.value("national",false) == national,"Freundschaftsplanung gehört einem anderen Spieltyp.");
|
||||
require(data.at("opponents").is_array()&&data.at("bookings").is_array(),"Freundschaftsplanung fehlt.");
|
||||
Json opponents=Json::array(),bookings=Json::array();std::set<std::string> ids,booked;
|
||||
for(const auto &r:data.at("opponents")) {
|
||||
const auto &team=r.at("team");const auto id=team.at("id").get<std::string>();require(!id.empty()&&team.at("id")!=scope.at("teamId")&&ids.insert(id).second,"Doppelter oder eigener Freundschaftsgegner.");
|
||||
require(r.at("competitionId").is_null()||r.at("competitionId").is_string(),"Unbekannte Gegnerliga.");
|
||||
if (national) require(team.at("kind")=="national" && r.at("competitionId").is_null() && r.at("strength").is_null(),"Ungültiger Nationalgegner oder vorweggenommene Angebotsstärke.");
|
||||
if(!r.at("strength").is_null())(void)whole_in_range(r.at("strength"),0,100000);
|
||||
auto row=r;row["rank"]=nullptr;row["games"]=nullptr;opponents.push_back(row);
|
||||
}
|
||||
@@ -677,11 +684,15 @@ Json engine_friendly_plan(const Json &bundle) {
|
||||
require(r.at("home").at("id")==scope.at("teamId")||r.at("away").at("id")==scope.at("teamId"),"Buchung gehört einem anderen Verein.");
|
||||
bookings.push_back(r);
|
||||
}
|
||||
return {{"opponents",opponents},{"bookings",bookings}};
|
||||
return {{"national",national},{"opponents",opponents},{"bookings",bookings}};
|
||||
}
|
||||
Json engine_friendly_projection(const Json &bundle,const Json &read,const std::string &opponent,bool home) {
|
||||
const auto plan=engine_friendly_plan(bundle),calendar=engine_calendar_projection(bundle);
|
||||
auto context=bundle;context["friendly"]=read;const auto &data=lineup_read(context,"friendly");
|
||||
const bool national = plan.at("national");
|
||||
require(data.value("national",false) == national,"Angebot gehört einem anderen Spieltyp.");
|
||||
Json ratings;
|
||||
if (national) { ratings = data.at("ratings"); require(ratings.is_array() && ratings.size()==2,"Nationalstärken fehlen."); for (const auto &v:ratings) (void)whole_in_range(v,0,100000); }
|
||||
const auto &scope=bundle.at("desktop").at("meta").at("scope"),&own=scope.at("teamId"),&manager_id=scope.at("managerId");
|
||||
bool known=false;for(const auto &r:plan.at("opponents"))known|=r.at("team").at("id")==opponent;require(known,"Unbekannter Freundschaftsgegner.");
|
||||
require(data.at(home?"home":"away").at("id")==own&&data.at(home?"away":"home").at("id")==opponent,"Angebot gehört einer anderen Paarung oder Spielstätte.");
|
||||
@@ -701,7 +712,7 @@ Json engine_friendly_projection(const Json &bundle,const Json &read,const std::s
|
||||
const int index=calendar_index(calendar,r.at("date"));days.push_back(index);dates.push_back(date);if(r.at("withCalendarEvent")==true)flagged.push_back(index);
|
||||
}
|
||||
const auto commands=scope.value("allowedCommands",Json::array());const bool can_book=commands.is_array()&&std::find(commands.begin(),commands.end(),Json("friendly.book"))!=commands.end();
|
||||
return {{"opponent",opponent},{"home",home},{"home_team",data.at("home")},{"away_team",data.at("away")},{"cost",amount},{"payer",payer},{"other_manager",other_id},{"other_name",other_name},{"dates",dates},{"days",days},{"flagged_days",flagged},{"allowed",can_book}};
|
||||
return {{"national",national},{"ratings",ratings},{"opponent",opponent},{"home",home},{"home_team",data.at("home")},{"away_team",data.at("away")},{"cost",amount},{"payer",payer},{"other_manager",other_id},{"other_name",other_name},{"dates",dates},{"days",days},{"flagged_days",flagged},{"allowed",can_book}};
|
||||
}
|
||||
Json engine_friendly_command(const Json &bundle,const Json &read,const std::string &opponent,bool home,const std::string &date,bool accept_cost,bool consent,const std::string &request_id) {
|
||||
const auto quote=engine_friendly_projection(bundle,read,opponent,home);
|
||||
|
||||
@@ -18,6 +18,7 @@ std::vector<std::pair<std::string,std::string>> App::engine_friendly_picker_item
|
||||
void App::engine_friendly_filter(const std::string &kind,const std::string &value) {
|
||||
if(kind=="country") {const auto leagues=engine_friendly_picker_items(value);if(leagues.empty())return;engine_friendly_league_=leagues.front().first;}
|
||||
else if(kind=="league")engine_friendly_league_=value;else return;
|
||||
if (auto *list=element("friendly-opponents")) list->SetScrollTop(0);
|
||||
engine_friendly_opponent_.clear();engine_friendly_read_=Json();engine_friendly_stage_=0;engine_friendly_date_.clear();refresh();
|
||||
}
|
||||
void App::engine_friendly_sync() {
|
||||
@@ -42,6 +43,7 @@ std::string App::engine_friendly_payer(const Json "e) const {
|
||||
std::string App::engine_friendlies_view() {
|
||||
const auto plan=engine_friendly_plan(engine_data_);const bool booking=engine_friendly_stage_==1&&engine_friendly_read_.is_object();
|
||||
const auto quote=booking?engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_):Json();
|
||||
if (plan.at("national")==true) return engine_national_friendly_view(plan,quote)+engine_friendly_dialog();
|
||||
const auto *league=world_->find("competitions",engine_friendly_league_);
|
||||
const Json *opponent=nullptr;for(const auto &r:plan.at("opponents"))if(r.at("team").at("id")==engine_friendly_opponent_)opponent=&r.at("team");
|
||||
std::string out="<div id=\"report-underlay\" class=\"report-underlay friendlies-layout\"><header class=\"planning-heading "+std::string(booking?"booking":"")+"\"><h2>"+(booking&&opponent?engine_friendly_team(*opponent,58):esc(league?world_->name(*league):"Weitere Vereine"))+"</h2><p>";
|
||||
@@ -62,18 +64,62 @@ std::string App::engine_friendlies_view() {
|
||||
}
|
||||
return out+"</div>"+engine_friendly_dialog();
|
||||
}
|
||||
std::string App::engine_national_friendly_view(const Json &plan,const Json "e) {
|
||||
const bool booking=engine_friendly_stage_==1 && !quote.is_null();
|
||||
const auto &own=engine_data_.at("desktop").at("data").at("team");
|
||||
const Json *opponent=nullptr;
|
||||
for(const auto &row:plan.at("opponents"))if(row.at("team").at("id")==engine_friendly_opponent_)opponent=&row.at("team");
|
||||
std::string out="<div id=\"report-underlay\" class=\"national-root engine-national-friendlies\"><header class=\"national-heading\"><h2>";
|
||||
out+=booking && opponent ? engine_friendly_team(own,62)+"<span>–</span>"+engine_friendly_team(*opponent,62) : "<span>Länderspiel vereinbaren</span>";
|
||||
out+="</h2><p><span>"+std::string(booking?(engine_friendly_home_?"Heimspiel":"Auswärtsspiel"):"Gegner für die Nationalmannschaft wählen")+" · Saison "+esc(engine_data_.at("desktop").at("meta").at("season").at("label").get<std::string>())+"</span></p></header>";
|
||||
const auto list=btn("friendly-list","Vorgemerkte Spiele · "+std::to_string(plan.at("bookings").size()),{},"id=\"friendly-list\"");
|
||||
if(!booking) {
|
||||
// The HTML reference has four large cards per row. The real catalogue
|
||||
// scrolls instead of reducing the card size to fit all nations at once.
|
||||
out+="<div id=\"friendly-opponents\" class=\"engine-national-opponents\"><div style=\"position:relative;height:"+scalar(((plan.at("opponents").size()+3)/4)*804.5)+"dp;\">";
|
||||
size_t i=0;
|
||||
for(const auto &row:plan.at("opponents")) {
|
||||
const auto &team=row.at("team");const auto id=team.at("id").get<std::string>();
|
||||
out+=btn("friendly-opponent",crest(world_->find("clubs",id),160)+"<strong><span>"+esc(engine_text(team.at("name")))+"</span></strong>","national-opponent friendly-opponent","id=\"friendly-opponent-"+esc(id)+"\" data-id=\""+esc(id)+"\" aria-label=\""+esc(engine_text(team.at("name")))+" als Gegner wählen\" style=\""+rect((i%4)*655.75,(i/4)*804.5,620.75,769.5)+"\"");
|
||||
++i;
|
||||
}
|
||||
return out+"</div></div><footer class=\"national-actions\">"+list+"</footer></div>";
|
||||
}
|
||||
using namespace std::chrono;
|
||||
const auto view=engine_calendar_view();const auto days=calendar_days(view.at("start"));
|
||||
const int start_year=std::stoi(view.at("start").get<std::string>().substr(0,4)),offset=engine_friendly_month_;
|
||||
const auto ym=year_month{year{start_year},month{7}}+months{offset};
|
||||
const auto first=sys_days{ym/1};const int count=int(unsigned(year_month_day{sys_days{ym/last}}.day())),lead=int(weekday{first}.iso_encoding())-1,weeks=(count+lead+6)/7;
|
||||
const std::array<const char *,12> names{"Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"};
|
||||
out+="<section class=\"national-month\"><header>"+btn("friendly-month","‹",{},"id=\"friendly-month-prev\" aria-label=\"Voriger Monat\" data-id=\""+std::to_string(offset-1)+"\" "+(offset==0?"disabled":""))+"<h3><span>"+std::string(names[unsigned(ym.month())-1])+" "+std::to_string(int(ym.year()))+"</span></h3>"+btn("friendly-month","›",{},"id=\"friendly-month-next\" aria-label=\"Nächster Monat\" data-id=\""+std::to_string(offset+1)+"\" "+(offset==11?"disabled":""))+"</header>";
|
||||
const std::array<const char *,7> weekdays{"Mo","Di","Mi","Do","Fr","Sa","So"};
|
||||
constexpr double cell_w=195.46,gap=18;const double cell_h=(1356.-(weeks-1)*gap)/weeks;
|
||||
for(int i=0;i<7;++i)out+="<span class=\"national-weekday\" style=\""+rect(26+i*(cell_w+gap),124,cell_w,50)+"\"><span>"+weekdays[size_t(i)]+"</span></span>";
|
||||
const int base=int((first-sys_days{year{start_year}/7/1}).count());
|
||||
for(int d=1;d<=count;++d) {
|
||||
const int day=base+d-1,cell=lead+d-1;
|
||||
const bool available=std::find(quote.at("days").begin(),quote.at("days").end(),Json(day))!=quote.at("days").end(),selected=engine_calendar_day_==day;
|
||||
out+=btn("calendar-select",std::to_string(d),"national-day "+std::string(selected?"selected":""),"id=\"calendar-day-"+std::to_string(day)+"\" data-id=\""+std::to_string(day)+"\" aria-pressed=\""+(selected?"true":"false")+"\" aria-label=\""+calendar_date_label(days.at(size_t(day)).iso)+(available?", verfügbar":", kein angebotener Termin")+"\" style=\""+rect(26+(cell%7)*(cell_w+gap),192+(cell/7)*(cell_h+gap),cell_w,cell_h)+"\" "+(available?"":"disabled"));
|
||||
}
|
||||
out+="</section><aside class=\"national-selection\"><h3>Deine Auswahl</h3><p>"+esc(engine_calendar_info(view))+"</p><p>"+esc(engine_friendly_payer(quote))+": "+esc(money(quote.at("cost"),{{"code","EUR"},{"minor_units",2}}))+"</p><h4>Vorgemerkte Spiele</h4>";
|
||||
if(plan.at("bookings").empty())out+="<p>Noch keine Freundschaftsspiele vorgemerkt.</p>";
|
||||
for(const auto &b:plan.at("bookings"))out+="<p>"+calendar_date_label(b.at("date"))+" · "+esc(engine_text(b.at(b.at("home").at("id")==own.at("id")?"away":"home").at("name")))+"</p>";
|
||||
const bool available=std::find(quote.at("dates").begin(),quote.at("dates").end(),Json(engine_friendly_date_))!=quote.at("dates").end();
|
||||
return out+"</aside><footer class=\"national-actions\">"+btn("friendly-back","Gegner ändern",{},"id=\"friendly-back\"")+list+btn("friendly-book","Spiel vereinbaren",{},"id=\"friendly-book\" "+std::string(available&"e.at("allowed")==true?"":"disabled"))+"</footer></div>";
|
||||
}
|
||||
std::string App::engine_friendly_dialog() {
|
||||
if(planning_dialog_.empty())return {};
|
||||
const auto plan=engine_friendly_plan(engine_data_);const Json *opponent=nullptr;for(const auto &r:plan.at("opponents"))if(r.at("team").at("id")==engine_friendly_opponent_)opponent=&r.at("team");
|
||||
const auto close=[&](const char *s){return btn("planning-close",s,{},"id=\"planning-close\"");};
|
||||
std::string title,body,actions;double height=341;
|
||||
if(planning_dialog_=="venue"||planning_dialog_=="quote") {
|
||||
const bool quoted=planning_dialog_=="quote";title=quoted?"Freundschaftsspiel · Kosten":"Austragungsort";height=quoted?720.5:496;
|
||||
const bool quoted=planning_dialog_=="quote";title=quoted?"Freundschaftsspiel · Kosten":"Austragungsort";height=quoted?(plan.at("national")==true?820.5:720.5):496;
|
||||
body="<div class=\"friendly-dialog-club\">"+(opponent?engine_friendly_team(*opponent,72):"")+"<span>"+std::string(quoted?(engine_friendly_home_?"Heimspiel":"Auswärtsspiel"):"Heimspiel oder Auswärtsspiel?")+"</span></div>";
|
||||
if(!quoted)actions=btn("friendly-venue","Heim",{},"id=\"friendly-home\" data-id=\"home\"")+btn("friendly-venue","Auswärts",{},"id=\"friendly-away\" data-id=\"away\"")+close("Abbrechen");
|
||||
else if(engine_friendly_read_.is_object()) {
|
||||
const auto q=engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_);
|
||||
body+="<div class=\"friendly-quote-amount\"><span>"+esc(engine_friendly_payer(q))+"</span><strong class=\"money-amount\">"+esc(money(q.at("cost"),{{"code","EUR"},{"minor_units",2}}))+"</strong></div><p class=\"friendly-quote-note\">"+std::string(q.at("days").empty()?"Für diese Paarung ist derzeit kein Termin verfügbar.":"Anschließend einen angebotenen Termin wählen. Erst die bestätigte Buchung übernimmt das Spiel.")+"</p>";
|
||||
if(q.at("national")==true) body+="<p class=\"friendly-national-ratings\">Angebotsstärke · "+esc(engine_text(engine_data_.at("desktop").at("data").at("team").at("name")))+": "+number(q.at("ratings")[0])+" · "+esc(engine_text(opponent->at("name")))+": "+number(q.at("ratings")[1])+"</p>";
|
||||
actions=close("Abbrechen")+btn("friendly-quote-accept","Termin wählen",{},"id=\"friendly-quote-accept\" "+std::string(q.at("days").empty()?"disabled":""));
|
||||
} else {body+="<p class=\"friendly-quote-note\">"+esc(engine_busy_?"Angebot wird geladen …":"Angebot derzeit nicht verfügbar.")+"</p>";actions=close("Abbrechen");}
|
||||
} else if(planning_dialog_=="list") {
|
||||
@@ -111,12 +157,13 @@ bool App::engine_friendly_action(const std::string &action,Rml::Element *target)
|
||||
engine_start("Freundschaftsangebot wird geladen …",[link,opponent,home]{auto read=link->read({{"kind","friendly"},{"opponentId",opponent},{"home",home}});return EngineReply{link,link->snapshot(),{{"messageType","friendly_preview"},{"read",read},{"opponent",opponent},{"home",home}},nullptr};});return true;
|
||||
}
|
||||
if(action=="friendly-quote-accept") {
|
||||
const auto q=engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_);if(q.at("days").empty())return true;engine_friendly_stage_=1;planning_dialog_.clear();const auto &days=q.at("days");if(std::find(days.begin(),days.end(),Json(engine_calendar_day_))==days.end())engine_calendar_day_=days[0];engine_friendly_date_=calendar_days(engine_calendar_projection(engine_data_).at("start"))[size_t(engine_calendar_day_)].iso;focus_after_render_="calendar-day-"+std::to_string(engine_calendar_day_);refresh();return true;
|
||||
const auto q=engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_);if(q.at("days").empty())return true;engine_friendly_stage_=1;planning_dialog_.clear();const auto &days=q.at("days");if(std::find(days.begin(),days.end(),Json(engine_calendar_day_))==days.end())engine_calendar_day_=days[0];engine_friendly_date_=calendar_days(engine_calendar_projection(engine_data_).at("start"))[size_t(engine_calendar_day_)].iso;engine_friendly_month_=(std::stoi(engine_friendly_date_.substr(5,2))+5)%12;focus_after_render_="calendar-day-"+std::to_string(engine_calendar_day_);refresh();return true;
|
||||
}
|
||||
if(action=="friendly-month") {const int month=target?target->GetAttribute<int>("data-id",-1):-1;if(month>=0&&month<12){engine_friendly_month_=month;focus_after_render_=target->GetId();refresh();}return true;}
|
||||
if(action=="calendar-select") {
|
||||
const int day=target->GetAttribute<int>("data-id",-1);const auto cal=engine_calendar_projection(engine_data_);if(day>=0&&day<cal.at("count").get<int>()){engine_calendar_day_=day;engine_friendly_date_=calendar_days(cal.at("start"))[size_t(day)].iso;focus_after_render_=target->GetId();refresh();}return true;
|
||||
const int day=target->GetAttribute<int>("data-id",-1);const auto q=engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_);if(std::find(q.at("days").begin(),q.at("days").end(),Json(day))==q.at("days").end())return true;const auto cal=engine_calendar_projection(engine_data_);if(day>=0&&day<cal.at("count").get<int>()){engine_calendar_day_=day;engine_friendly_date_=calendar_days(cal.at("start"))[size_t(day)].iso;focus_after_render_=target->GetId();refresh();}return true;
|
||||
}
|
||||
if(action=="friendly-back") {engine_friendly_stage_=0;engine_friendly_read_=Json();focus_after_render_="friendly-calendar";refresh();return true;}
|
||||
if(action=="friendly-back") {engine_friendly_stage_=0;engine_friendly_read_=Json();focus_after_render_="friendly-opponent-"+engine_friendly_opponent_;refresh();return true;}
|
||||
if(action=="friendly-list") {planning_return_focus_="friendly-list";planning_dialog_="list";focus_after_render_="planning-close";close_report_picker(false);refresh();return true;}
|
||||
if(action=="friendly-book") {
|
||||
const auto read=engine_friendly_read_,q=engine_friendly_projection(engine_data_,read,engine_friendly_opponent_,engine_friendly_home_);const auto meta=engine_data_.at("desktop").at("meta");const auto opponent=engine_friendly_opponent_,date=engine_friendly_date_;const bool home=engine_friendly_home_;
|
||||
|
||||
@@ -37,6 +37,7 @@ Json App::engine_camp_view() const {
|
||||
}
|
||||
void App::engine_render() {
|
||||
if (ticket_) ticket_->close(false);
|
||||
if (menu_ == "friendlies") if (auto *list = element("friendly-opponents")) engine_friendly_scroll_ = list->GetScrollTop();
|
||||
if (menu_ == "contracts") if (auto *roster = element("contracts-roster-scroll")) engine_contract_scroll_ = roster->GetScrollTop();
|
||||
if (menu_ == "lineup") {
|
||||
if (auto *roster = element("lineup-roster-scroll")) lineup_roster_scroll_ = lineup_reset_scroll_ ? 0.f : roster->GetScrollTop();
|
||||
|
||||
@@ -22,12 +22,14 @@
|
||||
bool engine_calendar_action(const std::string &, Rml::Element *);
|
||||
std::string engine_friendly_league_, engine_friendly_opponent_, engine_friendly_date_;
|
||||
bool engine_friendly_home_ = true, engine_friendly_pending_ = false;
|
||||
int engine_friendly_stage_ = 0;
|
||||
int engine_friendly_stage_ = 0, engine_friendly_month_ = 0;
|
||||
float engine_friendly_scroll_ = 0;
|
||||
Json engine_friendly_read_;
|
||||
std::vector<std::pair<std::string,std::string>> engine_friendly_picker_items(const std::string &) const;
|
||||
void engine_friendly_filter(const std::string &, const std::string &);
|
||||
void engine_friendly_sync();
|
||||
std::string engine_friendlies_view();
|
||||
std::string engine_national_friendly_view(const Json &, const Json &);
|
||||
std::string engine_friendly_dialog();
|
||||
std::string engine_friendly_team(const Json &, double);
|
||||
std::string engine_friendly_payer(const Json &) const;
|
||||
|
||||
@@ -10,19 +10,35 @@ using namespace bmh;
|
||||
using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
if (argc != 4 || (std::string(argv[1]) != "inspect-friendlies" && std::string(argv[1]) != "inspect" && std::string(argv[1]) != "prepare-two" && std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports" && std::string(argv[1]) != "verify-bank" && std::string(argv[1]) != "verify-commerce" && std::string(argv[1]) != "verify-contracts" && std::string(argv[1]) != "verify-calendar" && std::string(argv[1]) != "verify-friendlies")) throw std::runtime_error("usage: modern_engine_bridge_probe inspect-friendlies|inspect|prepare|prepare-two|verify|verify-lineup|verify-sports|verify-bank|verify-commerce|verify-contracts|verify-calendar|verify-friendlies <world.obw> <new-output-directory>");
|
||||
if (argc != 4 || (std::string(argv[1]) != "prepare-national" && std::string(argv[1]) != "verify-national" && std::string(argv[1]) != "inspect-friendlies" && std::string(argv[1]) != "inspect" && std::string(argv[1]) != "prepare-two" && std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports" && std::string(argv[1]) != "verify-bank" && std::string(argv[1]) != "verify-commerce" && std::string(argv[1]) != "verify-contracts" && std::string(argv[1]) != "verify-calendar" && std::string(argv[1]) != "verify-friendlies")) throw std::runtime_error("usage: modern_engine_bridge_probe prepare-national|verify-national|inspect-friendlies|inspect|prepare|prepare-two|verify|verify-lineup|verify-sports|verify-bank|verify-commerce|verify-contracts|verify-calendar|verify-friendlies <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)); };
|
||||
if (std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
|
||||
if (std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
|
||||
auto package = modern::open_world_package(world);
|
||||
content::Mount mount(world, package.classic); modern::set_current_world(package.world);
|
||||
modern::app::ModernSession session(mount.root(), 17u);
|
||||
ui::SetupOptions options; options.mode = 3; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
|
||||
ui::SetupOptions options; options.mode = 3; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
|
||||
ui::ManagerChoice manager; manager.name = "Codex Engine QA"; manager.master_club = 0;
|
||||
std::string error; ui::CareerInitializationResult result;
|
||||
if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error);
|
||||
if (options.managers == 2) { manager.name = "Codex Opponent QA"; manager.master_club = 1; manager.portrait = 1; if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error); }
|
||||
if (!session.finish(result, error) || !session.save_game(out / "input.obs", 0, false, error)) throw std::runtime_error(error);
|
||||
if (!session.finish(result, error)) throw std::runtime_error(error);
|
||||
if (std::string(argv[1]) == "prepare-national") {
|
||||
uint64_t rev = 0; bool found = false; Json expiry = Json::object(), log = Json::array();
|
||||
for (int k = 0; k < 200; ++k) {
|
||||
const auto desk = Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},rev)));
|
||||
if (desk.at("meta").at("scope").at("role") == "national") { found = true; break; }
|
||||
const auto &meta = desk.at("meta");
|
||||
const Json command{{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:prepare-national-"+std::to_string(k)},{"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()),rev))); log.push_back(reply);
|
||||
if (reply.value("messageType","") == "command_result") continue;
|
||||
if (reply.value("code","") == "decision_pending") { const auto id = reply.at("message").at("args").at("playerId").get<std::string>(); expiry[id]={{"action","release"}}; continue; }
|
||||
throw std::runtime_error(reply.dump());
|
||||
}
|
||||
write("preparation-advance.json",log);
|
||||
if (!found) throw std::runtime_error("no national desk reached through session.advance");
|
||||
}
|
||||
if (!session.save_game(out / "input.obs", 0, false, error)) throw std::runtime_error(error);
|
||||
modern::set_current_world(nullptr);
|
||||
}
|
||||
auto link = EngineBridge::open(world, out / "input.obs");
|
||||
@@ -213,6 +229,51 @@ int main(int argc, char **argv) {
|
||||
const auto after=link->snapshot();write("friendlies-after.json",after);write("friendlies-saved.json",link->save_copy(out/"friendlies.obs"));link.reset();link=EngineBridge::open(world,out/"friendlies.obs");const auto loaded=link->snapshot();write("friendlies-loaded.json",loaded);
|
||||
if(loaded.at("friendly-plan").at("data")!=after.at("friendly-plan").at("data")||loaded.at("calendar").at("data")!=after.at("calendar").at("data")||loaded.at("desktop").at("data").at("accounts")!=after.at("desktop").at("data").at("accounts"))throw std::runtime_error("bookings or money lost at OBS restart");
|
||||
}
|
||||
if (std::string(argv[1]) == "verify-national") {
|
||||
const auto plan=engine_friendly_plan(before);
|
||||
if(plan.at("national")!=true||plan.at("opponents").empty())throw std::runtime_error("national desk required");
|
||||
const auto own=before.at("desktop").at("meta").at("scope").at("teamId");
|
||||
for(const auto &row:plan.at("opponents")) {
|
||||
const auto opponent=row.at("team").at("id").get<std::string>();
|
||||
for(bool home:{true,false}) {
|
||||
const auto read=link->read({{"kind","friendly"},{"opponentId",opponent},{"home",home}});
|
||||
(void)engine_friendly_projection(before,read,opponent,home);
|
||||
if(link->read({{"kind","friendly"},{"opponentId",opponent},{"home",home}})!=read)throw std::runtime_error("national quote changed on repeat");
|
||||
}
|
||||
}
|
||||
if(link->snapshot()!=before)throw std::runtime_error("national previews changed source");
|
||||
write("national-preview-saved.json",link->save_copy(out/"preview.obs"));
|
||||
for(bool home:{true,false}) {
|
||||
const auto now=link->snapshot();const auto opponent=plan.at("opponents")[home?0:1].at("team").at("id").get<std::string>();
|
||||
const auto read=link->read({{"kind","friendly"},{"opponentId",opponent},{"home",home}});
|
||||
write(home?"home-quote.json":"away-quote.json",read);
|
||||
const auto quote=engine_friendly_projection(now,read,opponent,home);
|
||||
if(quote.at("dates").empty())throw std::runtime_error("no national date available");
|
||||
const auto command=engine_friendly_command(now,read,opponent,home,quote.at("dates")[0],true,false,home?"request:national-home":"request:national-away");
|
||||
if(home) {
|
||||
auto refused=command;refused["requestId"]="request:no-cost-consent";refused["payload"]["acceptCost"]=false;
|
||||
const auto reply=link->command(refused);write("no-cost-consent.json",reply);
|
||||
if(reply.value("messageType","")!="error"||link->snapshot()!=now)throw std::runtime_error("declined national booking changed source");
|
||||
auto unavailable=command;unavailable["requestId"]="request:unavailable-date";unavailable["payload"]["date"]=now.at("desktop").at("meta").at("date");
|
||||
const auto rejected=link->command(unavailable);write("unavailable-date.json",rejected);
|
||||
if(rejected.value("messageType","")!="error"||link->snapshot()!=now)throw std::runtime_error("unavailable date changed source");
|
||||
write("refused-saved.json",link->save_copy(out/"refused.obs"));
|
||||
}
|
||||
const auto reply=link->command(command);write(home?"home-command.json":"away-command.json",command);write(home?"home-response.json":"away-response.json",reply);
|
||||
if(reply.value("messageType","")!="command_result"||link->command(command)!=reply)throw std::runtime_error("national booking failed or replay differed");
|
||||
const auto after=link->snapshot();write(home?"home-after.json":"away-after.json",after);
|
||||
const auto &bookings=after.at("friendly-plan").at("data").at("bookings");
|
||||
if(bookings.size()!=now.at("friendly-plan").at("data").at("bookings").size()+1)throw std::runtime_error("national booking missing from saved plan");
|
||||
const auto delta=engine_money_minor(now.at("desktop").at("data").at("accounts").at("cash"))-engine_money_minor(after.at("desktop").at("data").at("accounts").at("cash"));
|
||||
if(delta!=(home?quote.at("cost").get<int64_t>():0))throw std::runtime_error("wrong national payer or amount");
|
||||
auto stale=command;stale["requestId"]=home?"request:stale-home":"request:stale-away";
|
||||
if(link->command(stale).value("code","")!="stale_revision"||link->snapshot()!=after)throw std::runtime_error("stale national quote changed source");
|
||||
}
|
||||
const auto after=link->snapshot();write("national-after.json",after);write("national-saved.json",link->save_copy(out/"national.obs"));link.reset();
|
||||
link=EngineBridge::open(world,out/"national.obs");const auto loaded=link->snapshot();write("national-loaded.json",loaded);
|
||||
for(const auto *kind:{"friendly-plan","calendar"})if(loaded.at(kind).at("data")!=after.at(kind).at("data"))throw std::runtime_error("national plan/calendar lost on restart");
|
||||
if(loaded.at("desktop").at("data").at("accounts")!=after.at("desktop").at("data").at("accounts"))throw std::runtime_error("national funds lost on restart");
|
||||
}
|
||||
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
|
||||
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
|
||||
}
|
||||
@@ -297,6 +297,29 @@ int main() {
|
||||
rejects([&]{engine_friendly_command(hp,hq,"club:7",false,"2026-07-03",true,false,"r");});
|
||||
require(engine_friendly_command(hp,hq,"club:7",false,"2026-07-03",true,true,"r").at("payload").at("opponentConsent")==true,"explicit hotseat consent lost");
|
||||
auto bad_payer=hq;bad_payer["data"]["payerManagerId"]="manager:99";rejects([&]{engine_friendly_projection(hp,bad_payer,"club:7",false);});
|
||||
// National planning has no league/ranking or pre-rolled strengths. Both
|
||||
// quote identity and the engine's explicit day whitelist remain mandatory.
|
||||
auto np=fp;
|
||||
for(auto &[kind,r]:np.items()) {r["meta"]["scope"]["role"]="national";r["meta"]["scope"]["teamId"]="nt:one";r["meta"]["scope"]["allowedCommands"]={"friendly.book"};}
|
||||
const Json nown={{"id","nt:one"},{"kind","national"},{"name","One"},{"nationId","nation:one"}};
|
||||
const Json nopp={{"id","nt:two"},{"kind","national"},{"name","Two"},{"nationId","nation:two"}};
|
||||
np["desktop"]["data"]["team"]=nown;np["session"]["data"]["humanOwnership"][0]["teamId"]="nt:one";
|
||||
np["calendar"]["data"]["fixtures"]=Json::array();
|
||||
np["calendar"]["data"]["days"]={{{"date","2026-07-21"},{"seasonDay",20},{"eventKinds",{"national","league"}},{"fixtureIds",Json::array()}}};
|
||||
np["friendly-plan"]["data"].update({{"national",true},{"teamId","nt:one"},{"opponents",{{{"team",nopp},{"competitionId",nullptr},{"strength",nullptr}}}}});
|
||||
auto nq=fq;nq["meta"]=np["desktop"]["meta"];nq["data"].update({{"national",true},{"ratings",{73,81}},{"home",nown},{"away",nopp}});
|
||||
const auto nv=engine_friendly_projection(np,nq,"nt:two",true),nc=engine_calendar_projection(np);
|
||||
require(nv.at("national")==true && nv.at("ratings")==Json::array({73,81}) && nv.at("days")==Json::array({2,20}),"national quote/rating/date lost");
|
||||
require(nc.at("league").is_null() && nc.at("events").at("20").at("kinds")==Json::array({"national"}),"national calendar leaked club events");
|
||||
require(engine_friendly_command(np,nq,"nt:two",true,"2026-07-21",true,false,"r").at("owner").at("managerId")=="manager:99","national command lost owner");
|
||||
rejects([&]{engine_friendly_command(np,nq,"nt:two",true,"2026-07-21",false,false,"r");});
|
||||
rejects([&]{engine_friendly_command(np,nq,"nt:two",true,"2026-07-04",true,false,"r");});
|
||||
auto bad_nation=np;bad_nation["friendly-plan"]["data"]["opponents"][0]["team"]["kind"]="club";rejects([&]{engine_friendly_plan(bad_nation);});
|
||||
bad_nation=np;bad_nation["friendly-plan"]["data"]["opponents"][0]["strength"]=81;rejects([&]{engine_friendly_plan(bad_nation);});
|
||||
auto bad_nq=nq;bad_nq["data"]["national"]=false;rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
bad_nq=nq;bad_nq["data"]["ratings"]={73};rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
bad_nq=nq;bad_nq["data"]["ratings"]={73,-1};rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
bad_nq=nq;bad_nq["meta"]["stateRevision"]="0";rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
std::cout << "engine DTO, exact money, scope and booking tests passed\n";
|
||||
return 0;
|
||||
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
|
||||
|
||||
Reference in new issue
Block a user