Implement calibrated Modern stadium periphery preview and staged upgrades (by Codex)
This commit is contained in:
1 parent
fff2cc2f0b
commit
bfcf9a07bf
12 files changed
+470
-37
No files matched your search
@@ -2,6 +2,7 @@
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include <array>
|
||||
#include <chrono>
|
||||
#include <cmath>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
@@ -54,8 +55,8 @@ void currency(int precision) {
|
||||
const auto unrelated = state, world_clubs = world.rows("clubs"), world_stadiums = world.rows("stadiums"), manifest = world.manifest();
|
||||
require(!valid_demo_stadium(state, world) && migrate_demo_stadium(state, world) && valid_demo_stadium(state, world) && without_stadium(state) == unrelated, "Missing-state migration altered unrelated fields or failed");
|
||||
const auto defaults = state;
|
||||
require(state.at("stadium").size() == 4 && state.at("stadium").at("club") == second && state.at("stadium").at("budget") == 50000000 * factor, "Canonical fields, manager binding or raw budget wrong");
|
||||
require(!state.at("stadium").contains("periphery") && !state.at("stadium").contains("ticket"), "Excluded construction/navigation leaked into canonical model");
|
||||
require(state.at("stadium").size() == 5 && state.at("stadium").at("club") == second && state.at("stadium").at("budget") == 50000000 * factor, "Canonical fields, manager binding or raw budget wrong");
|
||||
require(state.at("stadium").at("periphery").size() == 14 && !state.at("stadium").contains("ticket"), "Excluded construction/navigation leaked into canonical model");
|
||||
const auto overview = demo_stadium_view(state, world);
|
||||
require(overview.at("capacity") == 36000 && overview.at("planned_capacity") == 36000 && overview.at("available_capacity") == 36000 && overview.at("name") == "Synthetic ground " + second && overview.at("stadium") == "stadium:" + second, "Overview lost identity or incorrectly derived capacity from OBW initialization");
|
||||
const std::array<int, 8> base{3000,6000,3000,5000,3000,6000,3000,7000}, caps{8000,18000,8000,14000,8000,18000,8000,14000}, rates{300000,375000,300000,350000,300000,375000,300000,350000}, weeks{30,37,30,25,30,37,30,25};
|
||||
@@ -114,7 +115,7 @@ void currency(int precision) {
|
||||
require(spent.at("stadium").at("budget") == 465000 * factor && old_quote.at("can_build") == true && demo_stadium_quote(spent, facility(6, 4), world).at("error") == "stadium_budget_exceeded", "Stale quote not revalidated against remaining local budget");
|
||||
reject_build(spent, facility(6, 4), world); conserved(spent, world, factor);
|
||||
for (const auto &action : std::vector<Json>{nullptr, Json::array(), Json::object(), {{"kind", "complete"}}, {{"kind", "ticket"}, {"value", 0}}, {{"kind", "periphery"}, {"index", 0}}, {{"kind", "build"}, {"request", facility(7, 2)}, {"cost", 1}}}) reject(spent, action, world);
|
||||
for (const auto &request : std::vector<Json>{nullptr, {{"kind", "periphery"}, {"index", 0}, {"level", 1}}, {{"kind", "block"}, {"index", -1}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", true}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", uint64_t(-1)}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", 0}, {"places", uint64_t(-1)}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", 0}, {"places", 4000.0}, {"seats", false}, {"roof", false}}, {{"kind", "facility"}, {"index", 0}, {"level", 2}, {"weeks", 1}}}) { auto next = defaults; reject_build(next, request, world); }
|
||||
for (const auto &request : std::vector<Json>{nullptr, {{"kind", "periphery"}, {"index", 0}, {"level", 3}}, {{"kind", "block"}, {"index", -1}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", true}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", uint64_t(-1)}, {"places", 4000}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", 0}, {"places", uint64_t(-1)}, {"seats", false}, {"roof", false}}, {{"kind", "block"}, {"index", 0}, {"places", 4000.0}, {"seats", false}, {"roof", false}}, {{"kind", "facility"}, {"index", 0}, {"level", 2}, {"weeks", 1}}}) { auto next = defaults; reject_build(next, request, world); }
|
||||
std::vector<Json> corrupt;
|
||||
auto bad = defaults; bad["stadium"]["budget"] = 1; corrupt.push_back(bad);
|
||||
bad = defaults; bad["stadium"]["periphery"] = Json::array(); corrupt.push_back(bad);
|
||||
@@ -146,9 +147,81 @@ void currency(int precision) {
|
||||
require(world.rows("clubs") == world_clubs && world.rows("stadiums") == world_stadiums && world.manifest() == manifest, "Provider mutated original world records");
|
||||
require(demo_stadium(world, first).at("club") == first && !valid_demo_stadium(defaults, world, first), "Explicit manager binding ignored");
|
||||
}
|
||||
Json scene_fixture() {
|
||||
const auto binding=[](const std::string &id) {return Json{{"asset",id},{"width",300},{"scale",1.2},{"anchorX",.4},{"anchorY",.8},{"offsetX",12},{"offsetY",-7}};};
|
||||
Json config={{"schemaVersion",1},{"activeProfile","modern"},{"simulation",{{"capacity",100000}}},{"assets",Json::object()}};
|
||||
auto &profile=config["profiles"]["modern"];
|
||||
profile["referenceSize"]={{"width",1920},{"height",1080}};
|
||||
profile["background"]=binding("panorama-forest");
|
||||
profile["backgroundOptions"]=Json::array({{{"variants",Json::array()}}});
|
||||
const auto add=[&](const std::string &id) {config["assets"][id]={{"width",1500},{"height",1000}};return binding(id);};
|
||||
for(int i=0;i<5;++i)profile["backgroundOptions"][0]["variants"].push_back(add("traffic-"+std::to_string(i)));
|
||||
profile["stadium"]={{"transform",{{"x",945.3},{"y",718.1},{"scale",1},{"z",20}}},{"thresholds",{10000,25000,50000,75000,100000}},{"variants",Json::array()}};
|
||||
for(int i=0;i<6;++i)profile["stadium"]["variants"].push_back(add("stadium-"+std::to_string(i)));
|
||||
profile["objects"]=Json::array();
|
||||
for(int i=0;i<14;++i) {
|
||||
Json variants=Json::array(),overlays=Json::array();const int cap=i==0?0:i==4?3:1;
|
||||
for(int level=1;level<=cap;++level){variants.push_back(add("site-"+std::to_string(i)+"-"+std::to_string(level)));if(i<=5)overlays.push_back(add("overlay-"+std::to_string(i)+"-"+std::to_string(level)));}
|
||||
profile["objects"].push_back({{"id",i},{"transform",{{"x",400+i*50},{"y",650},{"scale",1.5},{"z",i<6?15:40}}},
|
||||
{"hitArea",{{"width",100},{"height",80},{"offsetX",10},{"offsetY",-30}}},
|
||||
{"state",{{"status","built"},{"completedLevel",cap},{"targetLevel",cap}}},
|
||||
{"sprites",{{"variants",variants},{"overlays",overlays},{"marker",add("marker")}}}});
|
||||
}
|
||||
return config;
|
||||
}
|
||||
void periphery() {
|
||||
for(int precision:{0,2}) {
|
||||
Fixture fixture(precision);const auto &world=*fixture.world;const int64_t factor=precision?100:1;
|
||||
Json defaults;defaults=Json::object();require(migrate_demo_stadium(defaults,world),"Initialize periphery fixture");
|
||||
auto old=defaults;old["stadium"].erase("periphery");const auto before=old;
|
||||
require(migrate_demo_stadium(old,world)&&old==defaults,"Old four-field checkpoint not extended exactly");
|
||||
old=before;old["stadium"]["budget"]=3;const auto broken=old;
|
||||
require(!migrate_demo_stadium(old,world)&&old==broken,"Invalid old ledger repaired during periphery migration");
|
||||
for(int i=0;i<14;++i) {
|
||||
const int cap=i==0?4:i==4?3:1;
|
||||
for(int level=0;level<cap;++level) {
|
||||
auto state=defaults;state["stadium"]["periphery"][size_t(i)]["level"]=level;
|
||||
const auto request=Json{{"kind","periphery"},{"index",i},{"level",level+1}};
|
||||
const auto q=demo_stadium_quote(state,request,world);require(q.at("can_build")==true,"Next periphery level rejected");
|
||||
const auto keep=state;reject_build(state,{{"kind","periphery"},{"index",i},{"level",level+2}},world);
|
||||
reject_build(state,{{"kind","periphery"},{"index",i},{"level",level}},world);
|
||||
build(state,request,world);conserved(state,world,factor);
|
||||
const auto current=demo_stadium_view(state,world),future=demo_stadium_view(state,world,true);
|
||||
require(current.at("periphery")[size_t(i)].at("display_level")==level&&future.at("periphery")[size_t(i)].at("display_level")==level+1,"Periphery current/future projection wrong");
|
||||
auto other=state;other["stadium"]["periphery"]=keep.at("stadium").at("periphery");other["stadium"]["budget"]=keep.at("stadium").at("budget");require(other==keep,"Periphery build affected another ledger or finance");
|
||||
reject_build(state,request,world);
|
||||
const auto checkpoint=Json::parse(state.dump());require(valid_demo_stadium(checkpoint,world)&&checkpoint==state,"Periphery checkpoint loses pending weeks/level");
|
||||
auto corrupt=state;corrupt["stadium"]["periphery"][size_t(i)]["job"]["level"]=level+2;require(!valid_demo_stadium(corrupt,world),"Skipped queued periphery level accepted");
|
||||
corrupt=state;corrupt["stadium"]["periphery"][size_t(i)]["job"]["weeks"]=1;require(!valid_demo_stadium(corrupt,world),"Invalid periphery weeks accepted");
|
||||
}
|
||||
}
|
||||
auto state=defaults;for(auto &row:state["stadium"]["periphery"])row["level"]=0;
|
||||
const auto config=scene_fixture(),keep=config;
|
||||
const auto initial=demo_stadium_scene(config,demo_stadium_view(state,world),false);
|
||||
require(initial.at("layers").size()==2&&initial.at("traffic_level")==0,"Export full-build preview leaked into empty career");
|
||||
const auto &area=initial.at("areas")[0];require(area.at("x")==340&&area.at("y")==545&&area.at("width")==150&&area.at("height")==120,"Calibrated hit area did not scale around object transform");
|
||||
build(state,{{"kind","periphery"},{"index",4},{"level",1}},world);
|
||||
build(state,{{"kind","periphery"},{"index",6},{"level",1}},world);
|
||||
build(state,{{"kind","periphery"},{"index",0},{"level",1}},world);
|
||||
auto current=demo_stadium_scene(config,demo_stadium_view(state,world),false),future=demo_stadium_scene(config,demo_stadium_view(state,world,true),true);
|
||||
require(current.at("traffic_level")==1&&future.at("traffic_level")==1,"Construction transport target panorama wrong");
|
||||
bool overlay=false,marker=false;for(const auto &layer:current.at("layers")) {
|
||||
overlay|=layer.at("owner")==4&&layer.at("role")=="overlay";
|
||||
marker|=layer.at("owner")==6&&layer.at("role")=="marker";
|
||||
if(layer.at("owner")==6)require(layer.at("role")=="marker","Snack building appears before completion");
|
||||
if(layer.at("owner")==4)require(std::abs(layer.at("x").get<double>()-402)<.00001&&std::abs(layer.at("y").get<double>()-351.5)<.00001,"PNG anchor/offset geometry changed");
|
||||
}
|
||||
require(overlay&&marker,"Missing parking overlay or independent snack marker");
|
||||
for(const auto &layer:future.at("layers"))require(layer.at("role")!="overlay"&&layer.at("role")!="marker","Future preview retains construction overlay");
|
||||
auto overview=demo_stadium_view(state,world);const std::array<int,5> boundaries{10000,25000,50000,75000,100000};
|
||||
for(size_t i=0;i<boundaries.size();++i)for(int delta:{-1,0}) {overview["physical_capacity"]=boundaries[i]+delta;require(demo_stadium_scene(config,overview,false).at("stadium_index")==i+(delta==0),"Capacity boundary selects wrong stadium");}
|
||||
require(config==keep,"Scene projection mutated calibrated export");
|
||||
auto block_state=defaults;build(block_state,block(0,4000),world);require(demo_stadium_view(block_state,world).at("physical_capacity")==36000&&demo_stadium_view(block_state,world,true).at("physical_capacity")==37000,"Closed block shrinks physical stadium artwork");
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
int main() try {
|
||||
currency(0); currency(2);
|
||||
currency(0); currency(2); periphery();
|
||||
Fixture empty(0, false); Json state = {{"cash", 77}, {"ticket", 13}};
|
||||
require(migrate_demo_stadium(state, *empty.world) && valid_demo_stadium(state, *empty.world) && state.at("stadium").at("club") == "" && demo_stadium_view(state, *empty.world).at("stadium").is_null() && demo_stadium_view(state, *empty.world).at("name") == "Stadion", "Zero-club fixture invented identity or crashed");
|
||||
const auto saved = state; require(!migrate_demo_stadium(state, *empty.world, "club:missing") && state == saved, "Invalid explicit club accepted");
|
||||
|
||||
Reference in new issue
Block a user