Bind stadium construction and historical data to scoped engine offers (by Codex)
This commit is contained in:
1 parent
dfb972abbd
commit
0edf208405
22 files changed
+1037
-40
No files matched your search
@@ -15,7 +15,7 @@ using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
const std::string mode=argc>1?argv[1]:"";
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto"};
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto","verify-stadium","complete-stadium"};
|
||||
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)); };
|
||||
@@ -133,6 +133,23 @@ int main(int argc, char **argv) {
|
||||
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);
|
||||
write("winner-records.json",Json::parse(cli::dump_json(session.read_statistics(cli::Json::Object{{"kind","winners"}}))));modern::set_current_world(nullptr);return 0;
|
||||
}
|
||||
if(mode=="complete-stadium") {
|
||||
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);uint64_t revision=0;Json expiry=Json::object(),log=Json::array();const auto initial=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","stadium"}},revision)));const auto initial_desk=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},revision)));const auto own=initial_desk.at("meta").at("scope").at("teamId");Json jobs=Json::array();for(size_t i=0;i<14;++i)if(initial.at("data").at("periphery")[i].at("constructionDays").get<int>()>0)jobs.push_back(i);if(jobs.empty())throw std::runtime_error("completion fixture has no periphery job");bool complete=false;Json final;
|
||||
for(int step=0;step<100;++step){const auto desk=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},revision)));if(desk.at("meta").at("scope").at("teamId")==own){const auto st=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","stadium"}},revision)));if(st.value("messageType","")=="snapshot"){bool done=true;for(const auto &i:jobs)done=done&&st.at("data").at("periphery")[i.get<size_t>()].at("constructionDays")==0;if(done){complete=true;final=st;break;}}}const auto &meta=desk.at("meta");const Json command={{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:complete-stadium-"+std::to_string(step)},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};const auto reply=Json::parse(cli::dump_json(session.ui_command(cli::parse_json(command.dump()),revision)));log.push_back(reply);if(reply.value("messageType","")!="command_result"){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());}}
|
||||
if(!complete)throw std::runtime_error("actual construction did not complete");write("before.json",initial);write("completed.json",final);write("advance.json",log);std::string error;const int manager=session.state().memory.u8(::bmh::layout::ActiveManager);if(!session.save_game(out/"completed.obs",manager,false,error))throw std::runtime_error(error);write("receipt.json",{{"status","passed"},{"advanceCommands",log.size()},{"jobs",jobs}});modern::set_current_world(nullptr);std::cout<<"actual periphery construction completed through session.advance\n";return 0;
|
||||
}
|
||||
if(mode=="verify-stadium") {
|
||||
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);uint64_t revision=0;Json records=Json::array();
|
||||
const auto bundle=[&]{Json b;for(const auto* kind:{"session","desktop","camps","stadium"})b[kind]=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind",kind}},revision)));return b;};
|
||||
const auto run=[&](const Json &request){const auto r=Json::parse(cli::dump_json(session.ui_command(cli::parse_json(request.dump()),revision)));records.push_back({{"request",request},{"response",r}});return r;};
|
||||
const auto checkpoint=[&]{const auto c=session.stadium_checkpoint();return Json{{"randSeed",c.rand.seed()},{"randCalls",std::to_string(c.rand.calls())},{"gameSeed",c.game.seed()},{"gameCalls",std::to_string(c.game.calls())}};};
|
||||
const auto initial=bundle(),random_before=checkpoint();if(initial!=bundle()||checkpoint()!=random_before)throw std::runtime_error("stadium read changed game");write("before.json",initial);int slot=-1;for(size_t i=0;i<8;++i){const auto &b=initial.at("stadium").at("data").at("blocks")[i];if(b.at("constructionWeeks")==0&&b.at("places").get<int>()+2000<=b.at("maxPlaces").get<int>()){slot=int(i);break;}}if(slot<0)throw std::runtime_error("no expandable actual block");const auto base=initial.at("stadium").at("data").at("blocks")[size_t(slot)];Json draft={{"kind","block"},{"index",slot},{"places",base.at("places").get<int>()+1000},{"seats",base.at("seats")},{"roof",base.at("roof")}};
|
||||
auto response=run(engine_stadium_request(initial,draft,"request:stadium-open"));if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());auto quoted=bundle();const auto opened_rng=checkpoint(),quote_id=quoted.at("stadium").at("data").at("quote").at("id");write("block-quote.json",quoted);draft["places"]=base.at("places").get<int>()+2000;response=run(engine_stadium_request(quoted,draft,"request:stadium-update",true));if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());const auto updated=bundle();(void)engine_stadium_quote(updated,draft);write("block-updated.json",updated);if(checkpoint()!=opened_rng||updated.at("stadium").at("data").at("quote").at("id")!=quote_id)throw std::runtime_error("block edit rerolled price/owner");
|
||||
auto bad=engine_stadium_request(updated,draft,"request:stadium-stale",true);bad["payload"]["quoteId"]="quote:stadium-stale";response=run(bad);if(response.value("code","")!="stale_quote"||bundle()!=updated||checkpoint()!=opened_rng)throw std::runtime_error("stale quote modified owner or RNG");response=run(engine_stadium_commit(updated,false,"request:stadium-cancel"));if(response.value("messageType","")!="command_result"||checkpoint()!=opened_rng||bundle().at("stadium").at("data").at("quote").is_object())throw std::runtime_error("cancel did not release unchanged quote");std::string error;if(!session.save_game(out/"cancelled.obs",0,false,error))throw std::runtime_error(error);
|
||||
auto current=bundle();int facility=-1;for(size_t i=0;i<8;++i){const auto &f=current.at("stadium").at("data").at("facilities")[i];if(f.at("upgradeAvailable")==true&&f.at("level").get<int>()+2<=f.at("maxLevel").get<int>()){facility=int(i);break;}}if(facility<0)throw std::runtime_error("no actual multiple-tier facility");const int level=current.at("stadium").at("data").at("facilities")[size_t(facility)].at("level");Json fd={{"kind","facility"},{"index",facility},{"level",level+1}};response=run(engine_stadium_request(current,fd,"request:facility-open"));if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());current=bundle();const auto frng=checkpoint(),fid=current.at("stadium").at("data").at("quote").at("id");fd["level"]=level+2;response=run(engine_stadium_request(current,fd,"request:facility-update",true));if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());current=bundle();write("facility-updated.json",current);if(checkpoint()!=frng||current.at("stadium").at("data").at("quote").at("id")!=fid)throw std::runtime_error("tier edit rerolled owner/RNG");(void)engine_stadium_quote(current,fd);run(engine_stadium_commit(current,false,"request:facility-cancel"));
|
||||
current=bundle();draft["places"]=base.at("places").get<int>()+1000;response=run(engine_stadium_request(current,draft,"request:build-open"));if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());current=bundle();write("build-offer.json",current);response=run(engine_stadium_commit(current,true,"request:build"));if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());const auto built=bundle();write("built.json",built);if(built.at("stadium").at("data").at("blocks")[size_t(slot)].at("constructionWeeks").get<int>()<=0)throw std::runtime_error("actual block construction not started");if(!session.save_game(out/"built.obs",0,false,error))throw std::runtime_error(error);
|
||||
write("commands.json",records);write("receipt.json",{{"status","passed"},{"block",slot},{"facility",facility},{"readOnlyViews",true},{"editsPreserveRandomStreams",true},{"editsPreserveQuoteOwner",true},{"staleQuoteRefused",true},{"actualBuild",true}});modern::set_current_world(nullptr);std::cout<<"actual scoped stadium quotes, pure edits, cancellation and construction passed\n";return 0;
|
||||
}
|
||||
if(mode=="settle-toto") {
|
||||
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);uint64_t revision=0;Json expiry=Json::object(),log=Json::array();bool settled=false;
|
||||
for(int step=0;step<100;++step){const auto before=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},revision)));const auto &meta=before.at("meta");const Json command={{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:settle-toto-"+std::to_string(step)},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};const auto reply=Json::parse(cli::dump_json(session.ui_command(cli::parse_json(command.dump()),revision)));log.push_back(reply);if(reply.value("messageType","")!="command_result"){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());}if(!session.state().pools.empty()&&session.state().pools[0].paid>0){settled=true;break;}}
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
using namespace bmh::modern_ui;
|
||||
namespace {
|
||||
void check(bool yes, const char *why) {
|
||||
if (!yes)
|
||||
throw std::runtime_error(why);
|
||||
}
|
||||
template <class F> void rejected(F f) {
|
||||
bool caught = false;
|
||||
try {
|
||||
f();
|
||||
} catch (const std::exception &) {
|
||||
caught = true;
|
||||
}
|
||||
check(caught, "invalid stadium accepted");
|
||||
}
|
||||
Json money(int n) {
|
||||
return {{"currency", "EUR"}, {"minorUnits", 2}, {"minor", std::to_string(n * 100)}};
|
||||
}
|
||||
Json fixture() {
|
||||
const Json meta = {{"contractVersion", "bmh-modern-ui@draft1"},
|
||||
{"careerId", "career:test"},
|
||||
{"worldId", "world:test"},
|
||||
{"worldRevision", "1"},
|
||||
{"stateRevision", "3"},
|
||||
{"scope",
|
||||
{{"role", "club"},
|
||||
{"managerId", "manager:test"},
|
||||
{"teamId", "club:test"},
|
||||
{"allowedCommands", {"quote.request", "stadium.commit"}}}}};
|
||||
Json b;
|
||||
for (const auto *kind : {"session", "desktop", "camps", "stadium"})
|
||||
b[kind] = {{"messageType", "snapshot"}, {"meta", meta}, {"data", {{"kind", kind}}}};
|
||||
b["desktop"]["data"].update({{"manager", {{"id", "manager:test"}}},
|
||||
{"team", {{"id", "club:test"}}},
|
||||
{"accounts", {{"cash", money(5000000)}}}});
|
||||
b["camps"]["data"]["camps"] = Json::array();
|
||||
auto &d = b["stadium"]["data"];
|
||||
d.update({{"teamId", "club:test"},
|
||||
{"quote", nullptr},
|
||||
{"blocks", Json::array()},
|
||||
{"facilities", Json::array()},
|
||||
{"periphery", Json::array()}});
|
||||
for (int i = 0; i < 8; ++i) {
|
||||
d["blocks"].push_back({{"id", "block:" + std::string(1, char('a' + i))},
|
||||
{"name", "Synthetic block"},
|
||||
{"places", 4000},
|
||||
{"maxPlaces", 8000},
|
||||
{"seats", false},
|
||||
{"roof", false},
|
||||
{"seatsAfterConstruction", i == 0},
|
||||
{"roofAfterConstruction", i == 0},
|
||||
{"constructionWeeks", i == 0 ? 3 : 0},
|
||||
{"placesAfterConstruction", i == 0 ? 6000 : 0}});
|
||||
d["facilities"].push_back({{"id", "facility:" + std::to_string(i)},
|
||||
{"name", "Synthetic facility"},
|
||||
{"level", 1},
|
||||
{"maxLevel", i == 2 || i == 3 ? 2 : 4},
|
||||
{"plannedLevel", i == 0 ? 3 : 1},
|
||||
{"constructionWeeks", i == 0 ? 4 : 0},
|
||||
{"upgradeAvailable", i != 0}});
|
||||
}
|
||||
for (int i = 0; i < 14; ++i) {
|
||||
Json p = {{"id", "periphery:" + std::to_string(i)},
|
||||
{"name", "Synthetic site"},
|
||||
{"constructionDays", i == 0 ? 5 : 0}};
|
||||
if (i == 0) {
|
||||
p["stage"] = 1;
|
||||
p["maxStage"] = 4;
|
||||
} else
|
||||
p["built"] = false;
|
||||
d["periphery"].push_back(p);
|
||||
}
|
||||
return b;
|
||||
}
|
||||
} // namespace
|
||||
int main() try {
|
||||
const auto b = fixture(), before = b;
|
||||
const auto now = engine_stadium_projection(b, false), future = engine_stadium_projection(b, true);
|
||||
check(now.at("available_capacity") == 28000 && future.at("capacity") == 34000,
|
||||
"pending block capacity not separated");
|
||||
check(now.at("blocks")[0].at("display_places") == 0 &&
|
||||
future.at("blocks")[0].at("display_seats") == true,
|
||||
"construction seats/capacity ignored");
|
||||
check(now.at("facilities")[0].at("display_level") == 1 &&
|
||||
future.at("facilities")[0].at("display_level") == 3,
|
||||
"planned facility replaced current value");
|
||||
check(now.at("periphery")[0].at("display_level") == 1 &&
|
||||
future.at("periphery")[0].at("display_level") == 2 &&
|
||||
future.at("periphery")[4].at("max_level") == 1,
|
||||
"periphery invented unsupported parking stages");
|
||||
check(b == before, "projection changed state");
|
||||
auto full = b;
|
||||
for (auto &block : full["stadium"]["data"]["blocks"]) {
|
||||
block["places"] = 8000;
|
||||
block["seats"] = true;
|
||||
block["roof"] = true;
|
||||
block["constructionWeeks"] = 0;
|
||||
}
|
||||
check(engine_stadium_projection(full, false).at("super_stadium") == true,
|
||||
"super stadium ignores actual maxima/features");
|
||||
auto quote = b;
|
||||
quote["stadium"]["data"]["quote"] = {{"id", "quote:stadium-test"},
|
||||
{"kind", "block"},
|
||||
{"blockId", "block:b"},
|
||||
{"places", 5000},
|
||||
{"seats", true},
|
||||
{"roof", true},
|
||||
{"price", money(12345)},
|
||||
{"weeks", 8},
|
||||
{"breakdown",
|
||||
{{{"code", "places"}, {"amount", money(10000)}},
|
||||
{{"code", "seats"}, {"amount", money(2000)}},
|
||||
{{"code", "roof"}, {"amount", money(345)}}}}};
|
||||
const Json draft = {
|
||||
{"kind", "block"}, {"index", 1}, {"places", 5000}, {"seats", true}, {"roof", true}};
|
||||
const auto value = engine_stadium_quote(quote, draft);
|
||||
check(value.at("cost") == 1234500 && value.at("roofCost") == 34500,
|
||||
"authoritative price rounded or rescaled");
|
||||
const auto edit = engine_stadium_request(quote, draft, "request:edit", true);
|
||||
check(edit.at("payload").at("quoteId") == "quote:stadium-test" &&
|
||||
edit.at("payload").at("blockId") == "block:b" && edit.at("expectedRevision") == "3",
|
||||
"edit loses exact quote/owner");
|
||||
const auto cancel = engine_stadium_commit(quote, false, "request:cancel");
|
||||
check(cancel.at("payload").at("accept") == false && cancel.at("payload").at("tip") == false,
|
||||
"cancel enables unquoted acceleration");
|
||||
auto changed = draft;
|
||||
changed["places"] = 6000;
|
||||
rejected([&] { engine_stadium_quote(quote, changed); });
|
||||
auto stale = quote;
|
||||
stale["stadium"]["meta"]["stateRevision"] = "4";
|
||||
rejected([&] { engine_stadium_quote(stale, draft); });
|
||||
std::cout << "stadium: actual capacities, future facilities, periphery limits and scoped prices "
|
||||
"passed\n";
|
||||
return 0;
|
||||
} catch (const std::exception &e) {
|
||||
std::cerr << e.what() << '\n';
|
||||
return 1;
|
||||
}
|
||||
Reference in new issue
Block a user