Create real careers from the native wizard and preserve manager presentation (by Codex)
This commit is contained in:
1 parent
738ecc7a09
commit
ce1535fe2d
38 files changed
+466
-75
No files matched your search
@@ -3,6 +3,7 @@
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include "modern/app/modern_session.hpp"
|
||||
#include "modern/content/world_package.hpp"
|
||||
#include "modern/ui/demo_opening.hpp"
|
||||
#include <iostream>
|
||||
#include <algorithm>
|
||||
#include <set>
|
||||
@@ -11,7 +12,7 @@ using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
const std::string mode=argc>1?argv[1]:"";
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived"};
|
||||
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"};
|
||||
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
|
||||
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
|
||||
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
|
||||
@@ -59,6 +60,31 @@ int main(int argc, char **argv) {
|
||||
modern::set_current_world(nullptr);auto fixture=EngineBridge::open(world,out/"archived.obs");const auto bundle=fixture->snapshot(),index=fixture->read({{"kind","report-index"}}),read=fixture->read({{"kind","player-rankings"},{"leagueId",league},{"scope",0}});const auto value=engine_rankings_projection(bundle,index,read,league,0);
|
||||
if(value.at("categories")[0][0].at("player")!=person||!value.at("categories")[0][0].at("currentTeam").is_null())throw std::runtime_error("archived-only counterexample not retained");write("rankings.json",read);std::cout<<"synthetic archived-only rankings fixture passed\n";return 0;
|
||||
}
|
||||
if(mode=="verify-create") {
|
||||
const auto package=modern::open_world_package(world);Json clubs=Json::array();for(int league=0;league<5;++league)for(const auto &l:package.world->leagues)if(l.index==league&&!l.members.empty())clubs.push_back(l.members.front());
|
||||
const std::array<std::string,4> names{"Jörg Müller","Zoë García","Alex Berger","Mina Öztürk"};Json cases=Json::array();
|
||||
for(int count:{1,2,4}) {
|
||||
Json setup={{"duration",5},{"difficulty",3},{"players",count},{"mode",3},{"league",true},{"world",true}},managers=Json::array();
|
||||
for(int i=0;i<count;++i)managers.push_back({{"name",names[size_t(i)]},{"club",clubs.at(size_t(i))},{"portrait",i},{"portrait_style",i%2?"photo":"painted"},{"strength_choice",1}});
|
||||
auto created=EngineBridge::create(world,setup,managers,17);const auto before=created->snapshot(),opening=created->read({{"kind","opening"}});write(("created-"+std::to_string(count)+".json").c_str(),before);write(("opening-"+std::to_string(count)+".json").c_str(),opening);auto state=engine_opening_projection(before,opening);
|
||||
if(before.at("session").at("data").at("managers").size()!=size_t(count))throw std::runtime_error("wrong human manager count");
|
||||
for(int i=0;i<count;++i){const auto &m=before.at("session").at("data").at("managers").at(size_t(i));if(m.at("name")!=names[size_t(i)]||m.at("teamId")!=clubs.at(size_t(i))||m.at("portraitStyle")!=(i%2?"photo":"painted"))throw std::runtime_error("new career manager mapping differs");}
|
||||
write(("saved-initial-"+std::to_string(count)+".json").c_str(),created->save_copy(out/("initial-"+std::to_string(count)+".obs")));
|
||||
for(int page=0;page<3;++page){const auto error=advance_opening_presentation(state["opening_flow"],"next");if(!error.empty())throw std::runtime_error(error);}
|
||||
if(!advance_opening_presentation(state["opening_flow"],"skip").empty()||!advance_opening_presentation(state["opening_flow"],"finish").empty())throw std::runtime_error("opening presentation failed");
|
||||
if(created->snapshot()!=before)throw std::runtime_error("intro presentation modified career");
|
||||
const auto saved=out/("created-"+std::to_string(count)+".obs");write(("saved-"+std::to_string(count)+".json").c_str(),created->save_copy(saved));created.reset();created=EngineBridge::open(world,saved);
|
||||
if(created->snapshot().at("session").at("data")!=before.at("session").at("data")||created->read({{"kind","opening"}}).at("data")!=opening.at("data"))throw std::runtime_error("created career lost managers or draw after restart");
|
||||
cases.push_back({{"managers",count},{"sameManagersAfterReload",true},{"sameDrawAfterReload",true},{"presentationIsReadOnly",true}});created.reset();
|
||||
}
|
||||
Json setup={{"duration",5},{"difficulty",3},{"players",1},{"mode",3},{"league",false},{"world",true}},managers={{{"name","National QA"},{"club",clubs[0]},{"portrait",0},{"portrait_style","photo"},{"strength_choice",1}}};
|
||||
{auto c=EngineBridge::create(world,setup,managers,17);const auto o=c->read({{"kind","opening"}});if(o.at("data").at("enabled")!=false)throw std::runtime_error("national-only created club intro");write("national-only.json",c->snapshot());write("saved-national.json",c->save_copy(out/"national-only.obs"));}
|
||||
setup["league"]=true;
|
||||
for(int fault=0;fault<7;++fault){auto bad_setup=setup,bad_managers=managers;if(fault==0){bad_setup["league"]=false;bad_setup["world"]=false;}if(fault==1)bad_setup["mode"]=2;if(fault==2)bad_managers[0]["club"]="club:missing";if(fault==3)bad_managers[0]["name"]="";if(fault==4)bad_managers[0]["portrait"]=12;if(fault==5)bad_managers[0]["strength_choice"]=3;if(fault==6){bad_setup["players"]=2;bad_managers.push_back(bad_managers[0]);bad_managers[1]["portrait"]=1;}
|
||||
bool rejected=false;try{auto invalid=EngineBridge::create(world,bad_setup,bad_managers,17);}catch(const std::exception&){rejected=true;}if(!rejected||modern::current_world())throw std::runtime_error("invalid creation retained an active session");
|
||||
}
|
||||
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;
|
||||
}
|
||||
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");
|
||||
|
||||
@@ -399,6 +399,13 @@ int main() {
|
||||
bad_rank=rr;bad_rank["meta"]["stateRevision"]="42";rejects([&]{engine_rankings_projection(rankings_bundle,ri,bad_rank,"league:live",0);});
|
||||
const auto fr=rw({{"kind","fairplay"},{"leagueId","league:live"},{"season","2026/27"},{"weights",{{"yellow",1},{"red",4}}},{"recordedMatches",1},{"rows",{{{"rank",1},{"team",{{"id","club:6"},{"name","Live A"}}},{"yellow",1},{"red",0},{"points",1}},{{"rank",2},{"team",{{"id","club:7"},{"name","Live B"}}},{"yellow",0},{"red",1},{"points",4}}}}});
|
||||
require(engine_fairplay_projection(rankings_bundle,ri,fr).at("rows").size()==2,"fairplay rows lost");auto bad_fair=fr;bad_fair["data"]["rows"][1]["points"]=1;rejects([&]{engine_fairplay_projection(rankings_bundle,ri,bad_fair);});
|
||||
auto opening_bundle=fixture();opening_bundle["desktop"]["meta"]["date"]="2026-07-01";opening_bundle["session"]["data"]["managers"]={{{"teamId","club:6"}}};
|
||||
const auto ow=[&](const Json &d){return Json{{"messageType","snapshot"},{"meta",opening_bundle.at("desktop").at("meta")},{"data",d}};};
|
||||
Json opening_data={{"kind","opening"},{"enabled",true},{"showEntrants",true}};
|
||||
opening_data["entrants"]={{"uefa",Json::array({Json{{"id","club:7"},{"name","Live B"}}})},{"champions",Json::array()},{"winners",Json::array()}};
|
||||
opening_data["order"]=Json::array({Json{{"id","club:6"},{"name","Live A"}},Json{{"id","club:7"},{"name","Live B"}}});
|
||||
opening_data["fixtureIds"]={"fixture:cup-0-1-0"};const auto oi=ow(opening_data);
|
||||
require(engine_opening_projection(opening_bundle,oi).at("opening_flow").at("order")[0]=="club:6","opening ignored authoritative pair order");auto bad_opening=oi;bad_opening["data"]["order"][1]["id"]="club:6";rejects([&]{engine_opening_projection(opening_bundle,bad_opening);});bad_opening=oi;bad_opening["meta"]["stateRevision"]="42";rejects([&]{engine_opening_projection(opening_bundle,bad_opening);});
|
||||
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; }
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/content/ui_contract.hpp"
|
||||
#include "modern/game/modern_state.hpp"
|
||||
#include <iostream>
|
||||
#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_teams={0};g.manager_ids={"manager:1"};g.manager_serial=1;g.manager_records.resize(0xb0c);g.world_club_id={"club:one"};g.world_club_name={"Synthetic"};const std::string original="M}ller";for(size_t i=0;i<original.size();++i)g.manager_records[0xa8+i]=original[i];
|
||||
const std::string unicode="J\xc3\xb6rg M\xc3\xbcller";g.manager_presentations.push_back({"manager:1",unicode,"painted"});modern::UiContext c;c.manager=0;
|
||||
const auto read=modern::ui_read(g,c,O{{"kind","session"}});const auto &m=at(at(read,"data"),"managers").array()->at(0);check(*at(m,"name").string()==unicode,"UTF-8 manager name lost");check(*at(m,"portraitStyle").string()=="painted"&&*at(m,"portraitGuiKey").string()=="gui:manager/painted/0","portrait style lost");check(!g.manager_presentation(1)&&!g.manager_presentation(-1),"presentation crossed slot bounds");check(g.manager_records[0xa8+1]=='}',"display metadata modified original bytes");
|
||||
g.manager_presentations.clear();const auto fallback=modern::ui_read(g,c,O{{"kind","session"}});const auto &old=at(at(fallback,"data"),"managers").array()->at(0);check(*at(old,"name").string()=="M\xc3\xbcller"&&*at(old,"portraitStyle").string()=="photo","old saves lost original-name/photo fallback");std::cout<<"Modern UTF-8 presentation, original bytes and older-save fallback passed\n";return 0;
|
||||
} catch(const std::exception& e){std::cerr<<e.what()<<'\n';return 1;}
|
||||
Reference in new issue
Block a user