()+")";
+}
+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();
+ 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=""+(booking&&opponent?engine_friendly_team(*opponent,58):esc(league?world_->name(*league):"Weitere Vereine"))+" ";
+ out+=booking?std::string(engine_friendly_home_?"Heimspiel":"Auswärtsspiel")+" · "+engine_friendly_payer(quote)+": "+money(quote.at("cost"),{{"code","EUR"},{"minor_units",2}}):"Freundschaftsspiel vereinbaren · Saison "+engine_data_.at("desktop").at("meta").at("season").at("label").get();
+ out+="
"+planning_progress(booking,false)+"";const auto count="Vorgemerkte Spiele · "+std::to_string(plan.at("bookings").size());
+ if(!booking) {
+ out+="
";
+ for(const auto *h:{"Gegner","Stärke","Platz","Spiele"})out+="
"+std::string(h)+"
";
+ out+="
";size_t n=0;
+ for(const auto &r:plan.at("opponents"))if(friendly_league_key(r)==engine_friendly_league_) {
+ const auto &team=r.at("team");const auto id=team.at("id").get
();
+ out+=""+btn("friendly-opponent",engine_friendly_team(team,42),"friendly-opponent","id=\"friendly-opponent-"+esc(id)+"\" data-id=\""+esc(id)+"\" aria-pressed=\""+(id==engine_friendly_opponent_?"true":"false")+"\"")+"
"+(r.at("strength").is_number_integer()?number(r.at("strength")):"—")+"
—
—
";
+ }
+ out+=" ";
+ } else {
+ const auto calendar=engine_calendar_view();const auto &dates=quote.at("dates");const bool available=std::find(dates.begin(),dates.end(),Json(engine_friendly_date_))!=dates.end();
+ out+=calendar_grid(calendar,148,1424,22,22,true,false)+"
Gewählter Termin "+esc(engine_calendar_info(calendar))+"
Ligaspiel Freundschaftsspiel
"+(available?"Dieser Termin ist für die Paarung verfügbar.":"Bitte einen angebotenen Termin wählen.")+"
";
+ }
+ return out+"
"+engine_friendly_dialog();
+}
+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;
+ body=""+(opponent?engine_friendly_team(*opponent,72):"")+""+std::string(quoted?(engine_friendly_home_?"Heimspiel":"Auswärtsspiel"):"Heimspiel oder Auswärtsspiel?")+"
";
+ 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+=""+esc(engine_friendly_payer(q))+" "+esc(money(q.at("cost"),{{"code","EUR"},{"minor_units",2}}))+"
"+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.")+"
";
+ actions=close("Abbrechen")+btn("friendly-quote-accept","Termin wählen",{},"id=\"friendly-quote-accept\" "+std::string(q.at("days").empty()?"disabled":""));
+ } else {body+=""+esc(engine_busy_?"Angebot wird geladen …":"Angebot derzeit nicht verfügbar.")+"
";actions=close("Abbrechen");}
+ } else if(planning_dialog_=="list") {
+ title="Vorgemerkte Freundschaftsspiele";auto bookings=plan.at("bookings");std::sort(bookings.begin(),bookings.end(),[](const auto &a,const auto &b){return a.at("date")";
+ if(bookings.empty())body+="Noch keine Freundschaftsspiele vorgemerkt.
";
+ else {body+="Datum Gegner Ort
";const auto own=engine_data_.at("desktop").at("meta").at("scope").at("teamId");for(const auto &r:bookings){const bool home=r.at("home").at("id")==own;body+=""+calendar_date_label(r.at("date"))+" "+engine_friendly_team(r.at(home?"away":"home"),42)+" "+(home?"Heim":"Auswärts")+"
";}}
+ body+="";actions=close("Zurück");
+ } else {title=planning_dialog_=="booked"?"Freundschaftsspiel vereinbart":"Nicht übernommen";body=""+esc(planning_notice_)+"
";actions=close("Verstanden");}
+ return ""+title+" "+body+""+actions+"
";
+}
+bool App::engine_friendly_event(Rml::Event &event) {
+ if(menu_!="friendlies"||planning_dialog_.empty())return false;
+ const auto type=event.GetType();const bool key=type=="keydown";
+ if((key&&event.GetParameter("key_identifier",0)==Rml::Input::KI_ESCAPE)||type=="contextmenu"||(type=="mouseup"&&event.GetParameter("button",0)==1)){engine_friendly_action("planning-close",nullptr);event.StopImmediatePropagation();return true;}
+ if(key&&event.GetParameter("key_identifier",0)==Rml::Input::KI_TAB){Rml::ElementList nodes;if(auto *p=element("planning-dialog"))p->QuerySelectorAll(nodes,"button");std::erase_if(nodes,[](auto *n){return n->HasAttribute("disabled");});if(!nodes.empty()){const auto at=std::find(nodes.begin(),nodes.end(),context_->GetFocusElement());const int old=at==nodes.end()?-1:int(at-nodes.begin()),n=int(nodes.size());nodes[size_t((old+n+(event.GetParameter("shift_key",0)?-1:1))%n)]->Focus(true);}event.StopImmediatePropagation();return true;}
+ bool inside=false;for(auto *n=event.GetTargetElement();n&&n!=doc_;n=n->GetParentNode())if(n->GetId()=="planning-dialog")inside=true;
+ if(!inside&&(key||type=="click"||type=="dblclick"||type=="mousedown"||type=="mouseup")){event.StopImmediatePropagation();return true;}
+ return false;
+}
+bool App::engine_friendly_action(const std::string &action,Rml::Element *target) {
+ if(menu_!="friendlies"||(!action.starts_with("friendly-")&&action!="planning-close"&&action!="calendar-select"))return false;
+ if(engine_busy_||!engine_fresh_)return true;
+ const auto id=target?target->GetAttribute("data-id",""):std::string();
+ if(action=="planning-close") {if(planning_dialog_=="venue"||planning_dialog_=="quote"||planning_dialog_=="friendly-error"){engine_friendly_stage_=0;engine_friendly_read_=Json();}planning_dialog_.clear();focus_after_render_=planning_return_focus_;refresh();return true;}
+ if(!planning_dialog_.empty()&&action!="friendly-venue"&&action!="friendly-quote-accept")return true;
+ if(action=="friendly-opponent"||action=="friendly-calendar") {
+ const auto plan=engine_friendly_plan(engine_data_);bool found=false;for(const auto &r:plan.at("opponents"))found|=r.at("team").at("id")==(action=="friendly-opponent"?id:engine_friendly_opponent_);if(!found)return true;
+ if(action=="friendly-opponent")engine_friendly_opponent_=id;
+ engine_friendly_read_=Json();engine_friendly_stage_=0;planning_return_focus_=target->GetId();planning_dialog_="venue";focus_after_render_="friendly-home";close_report_picker(false);refresh();return true;
+ }
+ if(action=="friendly-venue") {
+ if(id!="home"&&id!="away")return true;
+ engine_friendly_home_=id=="home";engine_friendly_read_=Json();planning_dialog_="quote";const auto opponent=engine_friendly_opponent_;const bool home=engine_friendly_home_;auto link=engine_link_;
+ 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;
+ }
+ if(action=="calendar-select") {
+ const int day=target->GetAttribute("data-id",-1);const auto cal=engine_calendar_projection(engine_data_);if(day>=0&&day()){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-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_;
+ auto submit=[this,read,meta,opponent,date,home](bool consent){if(engine_busy_||!engine_fresh_||meta!=engine_data_.at("desktop").at("meta")){message("Das Angebot hat sich geändert. Bitte neu auswählen.");return;}const auto command=engine_friendly_command(engine_data_,read,opponent,home,date,true,consent,editor::new_id("request:ui-"));engine_friendly_pending_=true;engine_finance_submit(command);};
+ const auto text=engine_text(q.at("home_team").at("name"))+" – "+engine_text(q.at("away_team").at("name"))+" am "+calendar_date_label(date)+" vereinbaren? "+engine_friendly_payer(q)+": "+money(q.at("cost"),{{"code","EUR"},{"minor_units",2}})+".";
+ confirmation(text,[this,q,submit,date]{if(q.at("other_manager").is_null())submit(false);else confirmation("Zustimmung von "+q.at("other_name").get()+": Dem Freundschaftsspiel am "+calendar_date_label(date)+" zustimmen? "+engine_friendly_payer(q)+": "+money(q.at("cost"),{{"code","EUR"},{"minor_units",2}})+".",[submit]{submit(true);});});return true;
+ }
+ return true;
+}
diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc
index ddef7f3..2c82db7 100644
--- a/src/modern/ui/engine_screens.inc
+++ b/src/modern/ui/engine_screens.inc
@@ -77,6 +77,8 @@ void App::engine_render() {
bool calendar_available = false, scheduling_available = false;
try { (void)engine_calendar_projection(engine_data_); calendar_available = true; } catch (const std::exception &) {}
try { scheduling_available = engine_scheduling_projection(engine_data_).at("allowed"); } catch (const std::exception &) {}
+ bool friendlies_available = false;
+ try { (void)engine_friendly_plan(engine_data_); friendlies_available = true; } catch (const std::exception &) {}
init_desktop();
for (const auto &[id, o] : desktop_.at("objects").items()) {
if (!o.value("visible", false)) continue;
@@ -109,11 +111,12 @@ void App::engine_render() {
const auto route = id.substr(4);
const bool camp_allowed = desk.at("menuAvailability").at("camps").value("status", "") == "available";
const auto commands = meta.at("scope").value("allowedCommands", Json::array());
- const bool supported = (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || route == "save" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
+ const bool supported = (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || route == "save" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
out += desktop_button(id, o, "engine-open", supported && !engine_busy_);
}
}
out += "";
+ if (menu_ == "friendlies") out += "" + window("Freundschaftsspiel", friendlies_available ? render_friendlies() : "
Freundschaftsplanung ist derzeit nicht verfügbar.
") + "
";
if (menu_ == "calendar") out += "" + window("Kalender", calendar_available ? render_calendar() : "
Der Saisonkalender ist derzeit nicht verfügbar.
") + "
";
if (menu_ == "postpone") out += "" + window("Verlegen", scheduling_available ? render_postpone() : "
Die Spielverlegung ist derzeit nicht verfügbar.
") + "
";
if (menu_ == "contracts") out += "" + window("Verträge", render_contracts()) + "
";
@@ -125,7 +128,7 @@ void App::engine_render() {
if (menu_ == "lineup") out += "" + window("Aufstellung", render_lineup()) + "
";
if (menu_ == "camp") out += "" + window("Trainingslager", render_camp()) + "
";
}
- if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone") && !amount_ && contracts_dialog_.empty()) out += "" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
";
+ if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
";
if (menu_.empty() || engine_data_.empty()) out += "" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
";
element("canvas")->SetInnerRML(out); ++document_generation_;
scale_chalk_shadow();
@@ -140,6 +143,10 @@ void App::engine_render() {
Rml::ElementList underlay; doc_->QuerySelectorAll(underlay, "#contracts-underlay button,.contracts-actions button,#window-close");
for (auto *node : underlay) { node->SetAttribute("disabled", true); node->SetProperty("pointer-events", "none"); }
}
+ if (!planning_dialog_.empty() && menu_ == "friendlies") {
+ Rml::ElementList underlay; doc_->QuerySelectorAll(underlay,"#report-underlay button,#report-underlay select,#window-close");
+ for (auto *node : underlay) { node->SetAttribute("disabled",true); node->SetProperty("pointer-events","none"); }
+ }
if (amount_) {
Rml::ElementList underlay; doc_->QuerySelectorAll(underlay, ".window>.content,.window>.titlebar");
for (auto *node : underlay) { node->SetProperty("pointer-events", "none"); node->SetProperty("filter", "blur(10dp)"); }
diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc
index c42f3e2..b76dadc 100644
--- a/src/modern/ui/engine_state.inc
+++ b/src/modern/ui/engine_state.inc
@@ -20,6 +20,19 @@
std::string engine_calendar_footer(const Json &);
std::string engine_postpone_view();
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;
+ Json engine_friendly_read_;
+ std::vector> 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_friendly_dialog();
+ std::string engine_friendly_team(const Json &, double);
+ std::string engine_friendly_payer(const Json &) const;
+ bool engine_friendly_action(const std::string &, Rml::Element *);
+ bool engine_friendly_event(Rml::Event &);
bool engine_commerce_action(const std::string &, Rml::Element *);
bool engine_bank_action(const std::string &, Rml::Element *);
std::string engine_credit_view();
diff --git a/src/modern/ui/planning_screens.inc b/src/modern/ui/planning_screens.inc
index d26de90..903fc4d 100644
--- a/src/modern/ui/planning_screens.inc
+++ b/src/modern/ui/planning_screens.inc
@@ -48,6 +48,7 @@ std::string App::render_postpone() {
}
std::string App::render_friendlies() {
+ if (engine_mode_) return engine_friendlies_view();
const auto calendar = planning_calendar();
const auto own = manager(snap()).value("club", "");
const auto *league = world_->find("competitions", calendar.at("friendly_league"));
@@ -101,6 +102,7 @@ std::string App::render_friendlies() {
}
std::string App::render_planning_dialog() {
+ if (engine_mode_) return engine_friendly_dialog();
if (planning_dialog_.empty()) return {};
const auto calendar = planning_calendar();
const auto *opponent = world_->find("clubs", calendar.at("opponent"));
diff --git a/src/modern/ui/report_pickers.inc b/src/modern/ui/report_pickers.inc
index 772b045..a449d67 100644
--- a/src/modern/ui/report_pickers.inc
+++ b/src/modern/ui/report_pickers.inc
@@ -16,6 +16,7 @@ App::report_picker_items(const std::string &kind) const {
std::vector> items;
if (!world_ || !report_picker_kind(kind))
return items;
+ if (engine_mode_ && menu_ == "friendlies") return engine_friendly_picker_items(kind);
if (menu_ == "statistics")
return statistics_picker_items(kind);
if (kind == "scorer-scope") {
@@ -83,6 +84,12 @@ std::string App::report_picker_value(const std::string &kind) const {
const auto *row = world_->find("competitions", league);
return row ? row->value("nation", "") : "";
}
+ if (engine_mode_ && menu_ == "friendlies") {
+ if (kind == "league") return engine_friendly_league_;
+ const auto items = engine_friendly_picker_items("country");
+ for (const auto &[id, caption] : items) { const auto leagues = engine_friendly_picker_items(id); for (const auto &[league, name] : leagues) if (league == engine_friendly_league_) return id; }
+ return {};
+ }
const auto reports = snap().state.at("reports");
if (kind == "filter" || kind == "competition")
return std::to_string(reports.at(kind).get());
@@ -207,7 +214,9 @@ bool App::report_picker_action(const std::string &action, Rml::Element *target)
? Json(std::stoi(value)) : Json(value);
close_report_picker(false);
// Commit even an unchanged country: the Gold resets its first league.
- if (menu_ == "statistics") {
+ if (engine_mode_ && menu_ == "friendlies") {
+ engine_friendly_filter(kind, value);
+ } else if (menu_ == "statistics") {
statistics_picker_select(kind, value);
} else if (kind == "year" && menu_ == "almanac") {
almanac_year_ = std::stoi(value);
diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp
index 781c850..5827dbf 100644
--- a/src/modern/ui/view.cpp
+++ b/src/modern/ui/view.cpp
@@ -1520,6 +1520,7 @@ public:
#include "modern/ui/engine_commerce.inc"
#include "modern/ui/engine_contracts.inc"
#include "modern/ui/engine_calendar.inc"
+#include "modern/ui/engine_friendlies.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {
diff --git a/tests/modern_engine_bridge_probe.cpp b/tests/modern_engine_bridge_probe.cpp
index da16d45..e828fcb 100644
--- a/tests/modern_engine_bridge_probe.cpp
+++ b/tests/modern_engine_bridge_probe.cpp
@@ -5,27 +5,37 @@
#include "modern/content/world_package.hpp"
#include
#include
+#include
using namespace bmh;
using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
- if (argc != 4 || (std::string(argv[1]) != "inspect" && 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")) throw std::runtime_error("usage: modern_engine_bridge_probe inspect|prepare|verify|verify-lineup|verify-sports|verify-bank|verify-commerce|verify-contracts|verify-calendar ");
+ 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 ");
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") {
+ if (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;
+ ui::SetupOptions options; options.mode = 3; 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) || !session.finish(result, error) ||
- !session.save_game(out / "input.obs", 0, false, error)) throw std::runtime_error(error);
+ 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);
modern::set_current_world(nullptr);
}
auto link = EngineBridge::open(world, out / "input.obs");
const auto before = link->snapshot(); write("before.json", before);
if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection");
+ if (std::string(argv[1]) == "inspect-friendlies") {
+ const auto &opponents=before.at("friendly-plan").at("data").at("opponents");
+ if(opponents.empty())throw std::runtime_error("no friendly opponents");
+ const auto id=opponents[0].at("team").at("id");
+ write("home-quote.json",link->read({{"kind","friendly"},{"opponentId",id},{"home",true}}));
+ write("away-quote.json",link->read({{"kind","friendly"},{"opponentId",id},{"home",false}}));
+ if(link->snapshot()!=before)throw std::runtime_error("friendly previews mutated session");
+ }
if (std::string(argv[1]) == "verify") {
auto camp = before.at("camps").at("data").at("camps").front();
const auto command = engine_camp_command(before, camp.at("id"), {{"condition", 3}, {"technique", 4}, {"play", 5}}, "request:probe-book");
@@ -179,9 +189,30 @@ int main(int argc, char **argv) {
const auto after_schedule=engine_scheduling_projection(moved);if(!after_schedule.at("movable").empty()){auto bad=request;bad["requestId"]="request:invalid-target";bad["expectedRevision"]=moved.at("desktop").at("meta").at("stateRevision");bad["payload"]={{"matchId",after_schedule.at("movable")[0].at("id")},{"date",after_schedule.at("movable")[0].at("date")}};const auto rejected=link->command(bad);write("invalid-target.json",rejected);if(rejected.value("messageType","")!="error"||link->snapshot()!=moved)throw std::runtime_error("invalid target changed state");}
write("moved-saved.json",link->save_copy(out/"moved.obs"));link.reset();link=EngineBridge::open(world,out/"moved.obs");const auto loaded=link->snapshot();write("loaded-move.json",loaded);if(loaded.at("calendar").at("data")!=moved.at("calendar").at("data")||loaded.at("scheduling").at("data")!=moved.at("scheduling").at("data"))throw std::runtime_error("move lost in OBS round trip");
run(engine_reschedule_undo(loaded,target,"request:undo"),"undo");const auto undone=link->snapshot();write("undone.json",undone);
- if(undone.at("calendar").at("data").at("fixtures")!=before.at("calendar").at("data").at("fixtures")||!undone.at("scheduling").at("data").at("moved").empty()||undone.at("desktop").at("data").at("accounts")!=before.at("desktop").at("data").at("accounts"))throw std::runtime_error("undo did not restore fixture/calendar or changed account");
+ if(undone.at("calendar").at("data").at("fixtures")!=before.at("calendar").at("data").at("fixtures")||!undone.at("scheduling").at("data").at("moved").empty()||undone.at("desktop").at("data").at("accounts")!=before.at("desktop").at("data").at("accounts")||undone.at("scheduling").at("data")!=before.at("scheduling").at("data"))throw std::runtime_error("undo did not restore fixture/calendar or changed account");
write("undone-saved.json",link->save_copy(out/"undone.obs"));link.reset();link=EngineBridge::open(world,out/"undone.obs");const auto final=link->snapshot();write("loaded-undo.json",final);if(final.at("calendar").at("data").at("fixtures")!=before.at("calendar").at("data").at("fixtures")||!final.at("scheduling").at("data").at("moved").empty())throw std::runtime_error("undo not persisted");
}
+
+ if(std::string(argv[1])=="verify-friendlies") {
+ const auto run=[&](const Json &request,const std::string &name){auto response=link->command(request);write((name+"-response.json").c_str(),response);if(response.value("messageType","")!="command_result"||link->command(request)!=response)throw std::runtime_error(response.dump());return response;};
+ const auto plan=engine_friendly_plan(before);std::set humans;const auto own=before.at("desktop").at("meta").at("scope").at("teamId");for(const auto &r:before.at("session").at("data").at("humanOwnership"))if(r.at("controller")=="human")humans.insert(r.at("teamId").get());
+ std::string ai;for(const auto &r:plan.at("opponents"))if(!humans.contains(r.at("team").at("id").get())){ai=r.at("team").at("id");break;}if(ai.empty())throw std::runtime_error("no AI opponent");
+ for(bool home:{true,false}) {
+ const auto now=link->snapshot(),read=link->read({{"kind","friendly"},{"opponentId",ai},{"home",home}});write(home?"home-quote.json":"away-quote.json",read);const auto quote=engine_friendly_projection(now,read,ai,home);
+ if(link->snapshot()!=now||link->read({{"kind","friendly"},{"opponentId",ai},{"home",home}})!=read)throw std::runtime_error("preview mutated source or RNG");
+ if(quote.at("dates").empty())throw std::runtime_error("no actual available date");const auto cmd=engine_friendly_command(now,read,ai,home,quote.at("dates")[0],true,false,home?"request:friendly-home":"request:friendly-away");
+ if(home){auto bad=cmd;bad["requestId"]="request:no-cost-consent";bad["payload"]["acceptCost"]=false;const auto refused=link->command(bad);write("no-cost-consent.json",refused);if(refused.value("messageType","")!="error"||link->snapshot()!=now)throw std::runtime_error("unapproved cost changed state");}
+ run(cmd,home?"home-booked":"away-booked");const auto after=link->snapshot();write(home?"home-after.json":"away-after.json",after);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():0))throw std::runtime_error("actual payer debit differs from quote");
+ auto stale=cmd;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 booking changed state");
+ }
+ for(const auto &r:before.at("session").at("data").at("humanOwnership"))if(r.at("teamId")!=own&&r.at("controller")=="human") {
+ const auto id=r.at("teamId").get(); const auto now=link->snapshot();const auto read=link->read({{"kind","friendly"},{"opponentId",id},{"home",false}});const auto quote=engine_friendly_projection(now,read,id,false);write("human-quote.json",read);if(quote.at("dates").empty())throw std::runtime_error("no human date");const auto cmd=engine_friendly_command(now,read,id,false,quote.at("dates")[0],true,true,"request:human-friendly");
+ auto bad=cmd;bad["requestId"]="request:missing-opponent-consent";bad["payload"]["opponentConsent"]=false;const auto refused=link->command(bad);write("missing-opponent-consent.json",refused);if(refused.value("messageType","")!="error"||link->snapshot()!=now)throw std::runtime_error("missing opponent consent mutated source");
+ run(cmd,"human-booked");const auto after=link->snapshot();if(after.at("desktop").at("data").at("accounts")!=now.at("desktop").at("data").at("accounts"))throw std::runtime_error("away human booking charged wrong manager");break;
+ }
+ 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");
+ }
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
}
diff --git a/tests/modern_engine_dto_tests.cpp b/tests/modern_engine_dto_tests.cpp
index e521c27..abc80c1 100644
--- a/tests/modern_engine_dto_tests.cpp
+++ b/tests/modern_engine_dto_tests.cpp
@@ -276,6 +276,27 @@ int main() {
auto leap=cal;for(auto &[kind,row]:leap.items()){row["meta"]["season"]={{"startDate","2027-07-01"},{"endDate","2028-06-30"}};row["meta"]["date"]="2028-02-29";}
leap["calendar"]["data"]["from"]="2027-07-01";leap["calendar"]["data"]["until"]="2028-06-30";leap["calendar"]["data"]["fixtures"]=Json::array();leap["calendar"]["data"]["days"]={{{"date","2028-02-29"},{"seasonDay",243},{"eventKinds",{"national"}},{"fixtureIds",Json::array()}}};
require(engine_calendar_projection(leap).at("count")==366&&engine_calendar_projection(leap).at("today")==243,"leap day lost in calendar geometry");
+
+ auto fp=cal;for(auto &[kind,r]:fp.items())r["meta"]["scope"]["allowedCommands"]={"friendly.book","fixture.reschedule"};
+ const auto fm=fp.at("desktop").at("meta");
+ fp["session"]["data"]["activeManagerId"]="manager:99";fp["session"]["data"]["humanOwnership"]={{{"controller","human"},{"teamId","club:6"},{"managerId","manager:99"}}};
+ fp["session"]["data"]["managers"]={{{"id","manager:99"},{"name","Own manager"},{"status","active"},{"control","human"}}};
+ Json ft={{"id","club:7"},{"name","Actual opponent"},{"nationId","nation:de"}};
+ fp["friendly-plan"]={{"messageType","snapshot"},{"meta",fm},{"data",{{"kind","friendly-plan"},{"teamId","club:6"},{"opponents",{{{"team",ft},{"competitionId","league:real"},{"strength",88}}}},{"bookings",Json::array()}}}};
+ auto fq=Json{{"messageType","snapshot"},{"meta",fm},{"data",{{"kind","friendly"},{"home",home},{"away",ft},{"cost",M(123400)},{"payerManagerId","manager:99"},{"opponentHuman",false},{"dates",{{{"date","2026-07-03"},{"withCalendarEvent",false}},{{"date","2026-07-21"},{"withCalendarEvent",true}}}}}}};
+ auto fv=engine_friendly_projection(fp,fq,"club:7",true);require(fv.at("days")==Json::array({2,20})&&fv.at("flagged_days")==Json::array({20}),"friendly date rules guessed or flagged date discarded");
+ require(engine_friendly_plan(fp).at("opponents")[0].at("rank").is_null(),"friendly picker invented standings");
+ require(engine_friendly_command(fp,fq,"club:7",true,"2026-07-03",true,false,"r").at("payload").at("acceptCost")==true,"cost approval missing");
+ rejects([&]{engine_friendly_command(fp,fq,"club:7",true,"2026-07-03",false,false,"r");});
+ rejects([&]{engine_friendly_command(fp,fq,"club:7",true,"2026-07-04",true,false,"r");});
+ rejects([&]{engine_friendly_projection(fp,fq,"club:7",false);});
+ auto foreign_quote=fq;foreign_quote["meta"]["scope"]["managerId"]="foreign";rejects([&]{engine_friendly_projection(fp,foreign_quote,"club:7",true);});
+ auto hp=fp;hp["session"]["data"]["humanOwnership"].push_back({{"controller","human"},{"teamId","club:7"},{"managerId","manager:2"}});hp["session"]["data"]["managers"].push_back({{"id","manager:2"},{"name","Other manager"},{"status","active"},{"control","human"}});
+ auto hq=fq;hq["data"]["home"]=ft;hq["data"]["away"]=home;hq["data"]["payerManagerId"]="manager:2";hq["data"]["opponentHuman"]=true;
+ require(engine_friendly_projection(hp,hq,"club:7",false).at("other_name")=="Other manager","human approver identity lost");
+ 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);});
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; }