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
@@ -20,6 +20,18 @@ constexpr std::array<const char *, 8> facility_names{
|
||||
"Rasenzustand", "Stadionkomfort", "Stadionzustand", "Stadionsicherheit"};
|
||||
constexpr std::array<int, 8> facility_rates{250000,350000,850000,1200000,180000,200000,300000,400000};
|
||||
constexpr std::array<int, 8> facility_weeks{12,15,16,18,8,5,10,14};
|
||||
constexpr std::array<const char *, 14> periphery_names{
|
||||
"Verkehrsanbindung", "Arcade-Spielhalle", "Einkaufszentrum", "Clubhaus", "Parkplatz", "Restaurant",
|
||||
"1. Imbissbude", "2. Imbissbude", "3. Imbissbude", "4. Imbissbude",
|
||||
"1. Fan-Shop", "2. Fan-Shop", "3. Fan-Shop", "4. Fan-Shop"};
|
||||
constexpr std::array<int, 14> periphery_rates{700000,800000,1800000,650000,450000,550000,90000,90000,90000,90000,140000,140000,140000,140000};
|
||||
constexpr std::array<int, 14> periphery_weeks{12,14,28,16,9,12,4,4,4,4,6,6,6,6};
|
||||
int periphery_cap(size_t index) { return index == 0 ? 4 : index == 4 ? 3 : 1; }
|
||||
Json initial_periphery() {
|
||||
Json rows = Json::array();
|
||||
for (size_t i = 0; i < 14; ++i) rows.push_back({{"level", i == 0 || i == 4 || i == 5 ? 1 : 0}, {"job", nullptr}});
|
||||
return rows;
|
||||
}
|
||||
bool keys(const Json &value, std::initializer_list<const char *> expected) {
|
||||
return value.is_object() && value.size() == expected.size() &&
|
||||
std::all_of(expected.begin(), expected.end(), [&](auto *key) { return value.contains(key); });
|
||||
@@ -77,7 +89,7 @@ Json demo_stadium(const Catalog &world, const std::string &club) {
|
||||
facilities.push_back({{"level", initial_levels[i]}, {"job", nullptr}});
|
||||
}
|
||||
return {{"club", owner(world, nullptr, club)}, {"budget", budget_units * finance_currency_factor(world)},
|
||||
{"blocks", blocks}, {"facilities", facilities}};
|
||||
{"blocks", blocks}, {"facilities", facilities}, {"periphery", initial_periphery()}};
|
||||
}
|
||||
|
||||
bool valid_demo_stadium(const Json &state, const Catalog &world, const std::string &club) {
|
||||
@@ -85,11 +97,12 @@ bool valid_demo_stadium(const Json &state, const Catalog &world, const std::stri
|
||||
if (!state.is_object()) return false;
|
||||
const int64_t factor = finance_currency_factor(world), cap = budget_units * factor;
|
||||
const auto &stadium = state.at("stadium");
|
||||
if (!keys(stadium, {"club", "budget", "blocks", "facilities"}) ||
|
||||
if (!keys(stadium, {"club", "budget", "blocks", "facilities", "periphery"}) ||
|
||||
!stadium.at("club").is_string() || stadium.at("club") != owner(world, &state, club) ||
|
||||
!integer(stadium.at("budget"), 0, cap) ||
|
||||
!stadium.at("blocks").is_array() || stadium.at("blocks").size() != 8 ||
|
||||
!stadium.at("facilities").is_array() || stadium.at("facilities").size() != 8) return false;
|
||||
!stadium.at("facilities").is_array() || stadium.at("facilities").size() != 8 ||
|
||||
!stadium.at("periphery").is_array() || stadium.at("periphery").size() != 14) return false;
|
||||
int64_t pending = 0;
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("blocks")[i];
|
||||
@@ -120,6 +133,18 @@ bool valid_demo_stadium(const Json &state, const Catalog &world, const std::stri
|
||||
if (job.at("cost") != cost || cost > cap - pending) return false;
|
||||
pending += cost;
|
||||
}
|
||||
for (size_t i = 0; i < 14; ++i) {
|
||||
const auto &base = stadium.at("periphery")[i];
|
||||
if (!keys(base, {"level", "job"}) || !integer(base.at("level"), 0, periphery_cap(i))) return false;
|
||||
const auto &job = base.at("job");
|
||||
if (job.is_null()) continue;
|
||||
const int next = base.at("level").get<int>() + 1;
|
||||
const int64_t cost = periphery_rates[i] * factor;
|
||||
if (next > periphery_cap(i) || !keys(job, {"level", "weeks", "cost"}) ||
|
||||
!integer(job.at("level"), next, next) || !integer(job.at("weeks"), periphery_weeks[i], periphery_weeks[i]) ||
|
||||
job.at("cost") != cost || cost > cap - pending) return false;
|
||||
pending += cost;
|
||||
}
|
||||
return stadium.at("budget").get<int64_t>() == cap - pending;
|
||||
} catch (const std::exception &) { return false; }
|
||||
}
|
||||
@@ -127,7 +152,15 @@ bool valid_demo_stadium(const Json &state, const Catalog &world, const std::stri
|
||||
bool migrate_demo_stadium(Json &state, const Catalog &world, const std::string &club) {
|
||||
try {
|
||||
if (!state.is_object()) return false;
|
||||
if (state.contains("stadium")) return valid_demo_stadium(state, world, club);
|
||||
if (state.contains("stadium")) {
|
||||
if (valid_demo_stadium(state, world, club)) return true;
|
||||
if (!keys(state.at("stadium"), {"club", "budget", "blocks", "facilities"})) return false;
|
||||
auto next = state;
|
||||
next["stadium"]["periphery"] = initial_periphery();
|
||||
if (!valid_demo_stadium(next, world, club)) return false;
|
||||
state = std::move(next);
|
||||
return true;
|
||||
}
|
||||
auto next = state;
|
||||
next["stadium"] = demo_stadium(world, owner(world, &state, club));
|
||||
if (!valid_demo_stadium(next, world, club)) return false;
|
||||
@@ -140,7 +173,7 @@ Json demo_stadium_quote(const Json &state, const Json &request, const Catalog &w
|
||||
if (!valid_demo_stadium(state, world, club)) return error("invalid_stadium_state");
|
||||
try {
|
||||
if (!request.is_object() || !request.contains("kind") || !request.at("kind").is_string() ||
|
||||
!request.contains("index") || !integer(request.at("index"), 0, 7)) return error("invalid_stadium_request");
|
||||
!request.contains("index") || !integer(request.at("index"), 0, request.value("kind", std::string()) == "periphery" ? 13 : 7)) return error("invalid_stadium_request");
|
||||
const auto kind = request.at("kind").get<std::string>();
|
||||
const auto index = request.at("index").get<size_t>();
|
||||
const auto &stadium = state.at("stadium");
|
||||
@@ -161,6 +194,14 @@ Json demo_stadium_quote(const Json &state, const Json &request, const Catalog &w
|
||||
quote = {{"cost", (request.at("level").get<int64_t>() - base.at("level").get<int64_t>()) * facility_rates[index] * factor},
|
||||
{"weeks", facility_weeks[index]}, {"placesCost", 0}, {"seatsCost", 0}, {"roofCost", 0}};
|
||||
pending = !base.at("job").is_null();
|
||||
} else if (kind == "periphery") {
|
||||
const auto &base = stadium.at("periphery")[index];
|
||||
const int next = base.at("level").get<int>() + 1;
|
||||
if (!keys(request, {"kind", "index", "level"}) || next > periphery_cap(index) ||
|
||||
!integer(request.at("level"), next, next)) return error("invalid_stadium_periphery_target");
|
||||
quote = {{"cost", periphery_rates[index] * factor}, {"weeks", periphery_weeks[index]},
|
||||
{"placesCost", 0}, {"seatsCost", 0}, {"roofCost", 0}};
|
||||
pending = !base.at("job").is_null();
|
||||
} else return error("unknown_stadium_request");
|
||||
const auto cost = quote.at("cost").get<int64_t>(), budget = stadium.at("budget").get<int64_t>();
|
||||
const auto reason = pending ? "stadium_pending" : !cost ? "stadium_no_change"
|
||||
@@ -187,7 +228,7 @@ std::string edit_demo_stadium(Json &state, const Json &action, const Catalog &wo
|
||||
next["stadium"]["blocks"][index]["job"] = job;
|
||||
} else {
|
||||
job["level"] = request.at("level");
|
||||
next["stadium"]["facilities"][index]["job"] = job;
|
||||
next["stadium"][quote.at("kind") == "periphery" ? "periphery" : "facilities"][index]["job"] = job;
|
||||
}
|
||||
next["stadium"]["budget"] = quote.at("remaining");
|
||||
if (!valid_demo_stadium(next, world, club)) return "invalid_stadium_state";
|
||||
@@ -208,7 +249,11 @@ Json demo_stadium_rules(const Catalog &world) {
|
||||
facilities.push_back({{"index", i}, {"name", facility_names[i]}, {"max_level", facility_cap(i)},
|
||||
{"rate", facility_rates[i] * factor}, {"weeks", facility_weeks[i]}, {"levels", levels}});
|
||||
}
|
||||
return {{"budget_cap", budget_units * factor}, {"blocks", blocks}, {"facilities", facilities}};
|
||||
Json periphery = Json::array();
|
||||
for (size_t i = 0; i < 14; ++i)
|
||||
periphery.push_back({{"index", i}, {"name", periphery_names[i]}, {"max_level", periphery_cap(i)},
|
||||
{"rate", periphery_rates[i] * factor}, {"weeks", periphery_weeks[i]}});
|
||||
return {{"budget_cap", budget_units * factor}, {"blocks", blocks}, {"facilities", facilities}, {"periphery", periphery}};
|
||||
}
|
||||
|
||||
Json demo_stadium_view(const Json &state, const Catalog &world, bool future, const std::string &club) {
|
||||
@@ -249,6 +294,17 @@ Json demo_stadium_view(const Json &state, const Catalog &world, bool future, con
|
||||
row["display_level"] = level; row["display_label"] = row.at("levels")[size_t(level)];
|
||||
if (building) pending += job.at("cost").get<int64_t>();
|
||||
}
|
||||
for (size_t i = 0; i < 14; ++i) {
|
||||
const auto &base = stadium.at("periphery")[i]; const auto &job = base.at("job");
|
||||
const bool building = !job.is_null(); auto &row = rules["periphery"][i];
|
||||
row["level"] = base.at("level"); row["job"] = job; row["building"] = building;
|
||||
row["display_level"] = (future && building ? job : base).at("level");
|
||||
if (building) pending += job.at("cost").get<int64_t>();
|
||||
}
|
||||
// Closed blocks still contribute their completed size to the physical stadium.
|
||||
int64_t physical = 0;
|
||||
for (const auto &block : stadium.at("blocks")) physical += block.at("places").get<int64_t>();
|
||||
rules["physical_capacity"] = future ? planned : physical;
|
||||
rules["ok"] = true; rules["club"] = id; rules["club_name"] = team ? world.name(*team) : "—";
|
||||
rules["stadium"] = record ? record->at("id") : Json();
|
||||
const auto name = record ? world.name(*record) : "";
|
||||
@@ -258,4 +314,55 @@ Json demo_stadium_view(const Json &state, const Catalog &world, bool future, con
|
||||
rules["capacity"] = future ? planned : available;
|
||||
return rules;
|
||||
}
|
||||
Json demo_stadium_scene(const Json &configuration, const Json &overview, bool future) {
|
||||
if (configuration.at("schemaVersion") != 1 || configuration.at("activeProfile") != "modern")
|
||||
throw editor::Error("invalid_stadium_scene");
|
||||
const auto &profile = configuration.at("profiles").at("modern");
|
||||
if (profile.at("referenceSize").at("width") != 1920 || profile.at("referenceSize").at("height") != 1080 ||
|
||||
profile.at("objects").size() != 14 || overview.at("periphery").size() != 14)
|
||||
throw editor::Error("invalid_stadium_scene");
|
||||
Json layers = Json::array(), areas = Json::array();
|
||||
const auto place = [&](const Json &binding, const Json &transform, const Json &owner, const char *role) {
|
||||
const auto asset = binding.at("asset").get<std::string>();
|
||||
const auto &meta = configuration.at("assets").at(asset);
|
||||
const double scale = transform.at("scale").get<double>();
|
||||
const double width = binding.at("width").get<double>() * binding.at("scale").get<double>() * scale;
|
||||
const double height = width * meta.at("height").get<double>() / meta.at("width").get<double>();
|
||||
layers.push_back({{"asset", asset}, {"owner", owner}, {"role", role}, {"z", transform.at("z")},
|
||||
{"x", transform.at("x").get<double>() + binding.at("offsetX").get<double>() * scale - binding.at("anchorX").get<double>() * width},
|
||||
{"y", transform.at("y").get<double>() + binding.at("offsetY").get<double>() * scale - binding.at("anchorY").get<double>() * height},
|
||||
{"width", width}, {"height", height}});
|
||||
};
|
||||
const auto &transport = overview.at("periphery")[0];
|
||||
const int traffic = (transport.at("building").get<bool>() ? transport.at("job") : transport).at("level").get<int>();
|
||||
const auto &background = profile.at("background");
|
||||
place(profile.at("backgroundOptions")[0].at("variants").at(size_t(traffic)),
|
||||
{{"x", background.at("offsetX")}, {"y", background.at("offsetY")}, {"scale", background.at("scale")}, {"z", 0}}, "background", "background");
|
||||
const auto capacity = overview.at("physical_capacity").get<int64_t>();
|
||||
size_t stadium_index = 0;
|
||||
for (const auto &threshold : profile.at("stadium").at("thresholds")) if (capacity >= threshold.get<int64_t>()) ++stadium_index;
|
||||
place(profile.at("stadium").at("variants").at(stadium_index), profile.at("stadium").at("transform"), "stadium", "stadium");
|
||||
for (size_t i = 0; i < 14; ++i) {
|
||||
const auto &object = profile.at("objects")[i], &row = overview.at("periphery")[i];
|
||||
if (object.at("id") != i) throw editor::Error("invalid_stadium_scene");
|
||||
const auto &transform = object.at("transform"), &area = object.at("hitArea"), &sprites = object.at("sprites");
|
||||
const bool pending = row.at("building").get<bool>(), building = pending && !future;
|
||||
const int level = (pending ? row.at("job") : row).at("level").get<int>();
|
||||
const double scale = transform.at("scale").get<double>();
|
||||
const double w = area.at("width").get<double>() * scale, h = area.at("height").get<double>() * scale;
|
||||
areas.push_back({{"index", i}, {"z", transform.at("z")},
|
||||
{"x", transform.at("x").get<double>() + area.at("offsetX").get<double>() * scale - w / 2},
|
||||
{"y", transform.at("y").get<double>() + area.at("offsetY").get<double>() * scale - h / 2}, {"width", w}, {"height", h}});
|
||||
if (i == 0 || (building && i >= 6)) {
|
||||
if (building) place(sprites.at("marker"), transform, i, "marker");
|
||||
} else if (level) {
|
||||
const size_t variant = i == 4 ? size_t(level - 1) : 0;
|
||||
place(sprites.at("variants").at(variant), transform, i, "building");
|
||||
if (building) place(sprites.at("overlays").at(variant), transform, i, "overlay");
|
||||
}
|
||||
}
|
||||
std::stable_sort(layers.begin(), layers.end(), [](const Json &a, const Json &b) { return a.at("z").get<double>() < b.at("z").get<double>(); });
|
||||
std::stable_sort(areas.begin(), areas.end(), [](const Json &a, const Json &b) { return a.at("z").get<double>() < b.at("z").get<double>(); });
|
||||
return {{"layers", layers}, {"areas", areas}, {"stadium_index", stadium_index}, {"traffic_level", traffic}};
|
||||
}
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -4,8 +4,9 @@
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
// Presentation-only construction ledger. Only state.stadium is owned here:
|
||||
// {club,budget,blocks:[{places,seats,roof,job}],facilities:[{level,job}]}.
|
||||
// All money is currency minor units. No periphery, ticket, navigation, engine,
|
||||
// {club,budget,blocks:[{places,seats,roof,job}],facilities:[{level,job}],periphery:[{level,job}]}.
|
||||
// All money is currency minor units. Includes fourteen independent periphery sites.
|
||||
// No ticket, navigation, engine,
|
||||
// random stream, world edit, legacy initialization, or completion timer.
|
||||
Json demo_stadium(const Catalog &, const std::string &club = {});
|
||||
bool valid_demo_stadium(const Json &state, const Catalog &,
|
||||
@@ -15,7 +16,8 @@ bool valid_demo_stadium(const Json &state, const Catalog &,
|
||||
bool migrate_demo_stadium(Json &state, const Catalog &,
|
||||
const std::string &club = {});
|
||||
// Only {kind:"build",request:{kind:"block",index,places,seats,roof}} or
|
||||
// {kind:"build",request:{kind:"facility",index,level}}. Recompute the quote,
|
||||
// {kind:"build",request:{kind:"facility"|"periphery",index,level}}.
|
||||
// Periphery targets must be exactly the completed level plus one. Recompute the quote,
|
||||
// atomically debit only local stadium budget and stage a pending job.
|
||||
std::string edit_demo_stadium(Json &state, const Json &action, const Catalog &,
|
||||
const std::string &club = {});
|
||||
@@ -39,4 +41,8 @@ Json demo_stadium_rules(const Catalog &);
|
||||
// Stadium identity comes from the catalogue, not its initialization policies.
|
||||
Json demo_stadium_view(const Json &state, const Catalog &, bool future = false,
|
||||
const std::string &club = {});
|
||||
// Pure calibrated sprite layout. Ignores exported simulation/editor/object state;
|
||||
// uses only runtime overview capacity and periphery jobs. Coordinates remain in
|
||||
// the 1920x1080 reference space; stable layers include full transparent canvases.
|
||||
Json demo_stadium_scene(const Json &configuration, const Json &overview, bool future);
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -55,7 +55,7 @@ bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
if(!q.value("can_build",false)||stadium_view_.at("invalid_places").get<bool>()){sync_stadium_draft();return true;}
|
||||
const auto result=source_->apply({stadium_revision_,"stadium",{{"kind","build"},{"request",stadium_view_.at("draft")}}});
|
||||
if(!result.ok){stadium_view_["feedback"]="Der Bauauftrag konnte nicht übernommen werden. Bitte den aktuellen Stand erneut öffnen.";sync_stadium_draft();return true;}
|
||||
stadium_view_["future"]=true;stadium_view_["return_focus"]="stadium-future";cancel();return true;
|
||||
stadium_view_["future"]=stadium_view_.at("draft").at("kind")!="periphery";stadium_view_["hint"]="";stadium_view_["return_focus"]="stadium-future";cancel();return true;
|
||||
}
|
||||
if(action=="stadium-option") {
|
||||
if(stadium_view_.at("dialog")!="facility"||!index||!fresh())return true;
|
||||
@@ -75,6 +75,13 @@ bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
open_amount(std::move(request));return true;
|
||||
}
|
||||
if(stadium_view_.at("dialog")!="")return true;
|
||||
if(action=="stadium-periphery") {
|
||||
if(stadium_view_.at("view")!="panorama"||!index||*index>13||!target)return true;
|
||||
const auto &row=overview.at("periphery")[size_t(*index)];
|
||||
if(row.at("building").get<bool>()||row.at("level").get<int>()>=row.at("max_level").get<int>())return true;
|
||||
stadium_view_["draft"]={{"kind","periphery"},{"index",*index},{"level",row.at("level").get<int>()+1}};
|
||||
stadium_view_["dialog"]="periphery";stadium_view_["bound_club"]=club;stadium_view_["feedback"]="";stadium_view_["invalid_places"]=false;stadium_view_["return_focus"]=target->GetId();stadium_world_=s.world;stadium_revision_=s.revision;stadium_source_=source_.get();focus_after_render_="stadium-build";refresh();return true;
|
||||
}
|
||||
if(action=="stadium-block"||action=="stadium-facility") {
|
||||
if(!index||*index>7||!target)return true;
|
||||
const bool block=action=="stadium-block";
|
||||
@@ -85,7 +92,7 @@ bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
stadium_view_["dialog"]=block?"block":"facility";stadium_view_["bound_club"]=club;stadium_view_["feedback"]="";stadium_view_["invalid_places"]=false;stadium_view_["return_focus"]=target->GetId();stadium_world_=s.world;stadium_revision_=s.revision;stadium_source_=source_.get();focus_after_render_=block?"stadium-place-number":"stadium-option-"+std::to_string(row.at("level").get<int>()+1);refresh();return true;
|
||||
}
|
||||
if(action=="stadium-view"){stadium_view_["view"]=stadium_view_.at("view")=="inside"?"panorama":"inside";focus_after_render_="stadium-view";}
|
||||
else if(action=="stadium-future"){if(stadium_view_.at("view")!="inside")return true;stadium_view_["future"]=!stadium_view_.at("future").get<bool>();focus_after_render_="stadium-future";}
|
||||
else if(action=="stadium-future"){if(stadium_view_.at("view")=="data")return true;stadium_view_["future"]=!stadium_view_.at("future").get<bool>();focus_after_render_="stadium-future";}
|
||||
else if(action=="stadium-data"){stadium_view_["view"]="data";focus_after_render_="stadium-back";}
|
||||
else if(action=="stadium-back"){stadium_view_["view"]="inside";focus_after_render_="stadium-data";}
|
||||
else if(action=="stadium-curve"){if(!index||*index>5)return true;stadium_view_["curves"][size_t(*index)]=!stadium_view_.at("curves")[size_t(*index)].get<bool>();focus_after_render_="stadium-curve-"+id;}
|
||||
@@ -108,10 +115,17 @@ bool App::stadium_event(Rml::Event &event) {
|
||||
const bool dialog=stadium_view_.at("dialog")!="";
|
||||
if((type=="keydown"&&key==Rml::Input::KI_ESCAPE)||(dialog&&type=="mouseup"&&event.GetParameter<int>("button",0)==1)) {
|
||||
if(dialog)stadium_action("stadium-cancel",nullptr);
|
||||
else if(stadium_view_.at("view")=="data")stadium_action("stadium-back",nullptr);
|
||||
else if(stadium_view_.at("view")=="data"||stadium_view_.at("view")=="panorama")stadium_action("stadium-back",nullptr);
|
||||
else return false;
|
||||
event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(!dialog&&stadium_view_.at("view")=="panorama"&&(type=="mousemove"||type=="focus"||type=="blur")) {
|
||||
const auto hint=[&](Rml::Element *from) {for(auto *n=from;n&&n!=doc_;n=n->GetParentNode())if(n->HasAttribute("data-stadium-hint"))return n->GetAttribute<Rml::String>("data-stadium-hint","");return Rml::String();};
|
||||
auto text=hint(target);
|
||||
if(type=="focus"&&text.empty()&&target&&target->GetId()!="stadium-back"&&target->GetId()!="stadium-future"&&target->GetId()!="window-close")return false;
|
||||
if(type=="blur")text="";
|
||||
if(stadium_view_.at("hint")!=text) {stadium_view_["hint"]=text;if(auto *n=element("stadium-interaction-hint"))n->SetInnerRML("<span>"+esc(text.empty()?"Ein Element im Stadionumfeld auswählen.":text)+"</span>");dirty_=true;}
|
||||
}
|
||||
Rml::Element *place_range=nullptr;
|
||||
for(auto *node=target;node&&node!=doc_;node=node->GetParentNode())if(node->GetId()=="stadium-place-range"){place_range=node;break;}
|
||||
if(dialog&&type=="keydown"&&place_range&&stadium_view_.at("dialog")=="block"&&(key==Rml::Input::KI_HOME||key==Rml::Input::KI_END)) {
|
||||
|
||||
@@ -10,8 +10,8 @@ void stadium_view_defaults(Json &v) {
|
||||
if(!v.contains("view")||!v.at("view").is_string()||(v.at("view")!="inside"&&v.at("view")!="panorama"&&v.at("view")!="data"))v["view"]="inside";
|
||||
for(const auto *key:{"future","relative","invalid_places"})if(!v.contains(key)||!v.at(key).is_boolean())v[key]=std::string(key)=="relative";
|
||||
if(!v.contains("curves")||!v.at("curves").is_array()||v.at("curves").size()!=6||!std::all_of(v.at("curves").begin(),v.at("curves").end(),[](const auto &x){return x.is_boolean();}))v["curves"]={true,true,true,true,true,true};
|
||||
for(const auto *key:{"dialog","return_focus","ticket_return_focus","feedback"})if(!v.contains(key)||!v.at(key).is_string())v[key]="";
|
||||
if(v.at("dialog")!=""&&v.at("dialog")!="block"&&v.at("dialog")!="facility")v["dialog"]="";
|
||||
for(const auto *key:{"dialog","return_focus","ticket_return_focus","feedback","hint"})if(!v.contains(key)||!v.at(key).is_string())v[key]="";
|
||||
if(v.at("dialog")!=""&&v.at("dialog")!="block"&&v.at("dialog")!="facility"&&v.at("dialog")!="periphery")v["dialog"]="";
|
||||
if(!v.contains("draft"))v["draft"]=Json();
|
||||
}
|
||||
std::string stadium_managed(const Snapshot &s) {
|
||||
@@ -109,8 +109,21 @@ std::string App::render_stadium() {
|
||||
out+=btn("stadium-facility","<span class=\"stadium-facility-picture\">"+picture(art,391,125,true)+art_overlay(int(i),level,391,h)+"</span><strong>"+esc(f.at("name").get<std::string>())+"</strong><span class=\"stadium-facility-caption\">"+esc(caption)+"</span>","stadium-facility","id=\"stadium-facility-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" style=\""+rect((i%4)*411,1148+(i/4)*214,395,198)+"\" aria-label=\""+esc(f.at("name").get<std::string>()+", "+caption)+"\" "+(f.at("building").get<bool>()?"disabled=\"disabled\"":""));
|
||||
}
|
||||
} else if(view=="panorama") {
|
||||
constexpr double panorama_h=2612.0*941/1672;
|
||||
out+="<div class=\"stadium-panorama\">"+img("art.stadium-panorama-v2.png",2608,panorama_h-4,false,false,2880)+"</div>";
|
||||
constexpr double scale=2612.0/1920;
|
||||
out+="<div class=\"stadium-periphery-scene\" id=\"stadium-periphery-scene\">";
|
||||
if(!gui_.contains("stadium.scene"))out+="<p class=\"stadium-empty\">Die kalibrierten Stadionumfeld-Grafiken fehlen im GUI-Paket.</p>";
|
||||
else try {
|
||||
const auto configuration=Json::parse(editor::read_file(gui_.root()/editor::path(gui_.items().at("stadium.scene").at("file").get<std::string>())));
|
||||
const auto scene=demo_stadium_scene(configuration,overview,future);
|
||||
for(const auto &layer:scene.at("layers"))out+="<span class=\"stadium-scene-sprite\" data-owner=\""+esc(layer.at("owner").is_string()?layer.at("owner").get<std::string>():layer.at("owner").dump())+"\" data-role=\""+layer.at("role").get<std::string>()+"\" style=\""+rect(layer.at("x").get<double>()*scale,layer.at("y").get<double>()*scale,layer.at("width").get<double>()*scale,layer.at("height").get<double>()*scale)+"\">"+img("stadium.scene."+layer.at("asset").get<std::string>(),layer.at("width").get<double>()*scale,layer.at("height").get<double>()*scale,false,false,3072)+"</span>";
|
||||
for(const auto &area:scene.at("areas")) {
|
||||
const auto i=area.at("index").get<size_t>();const auto &row=overview.at("periphery")[i];
|
||||
auto hint=row.at("name").get<std::string>();
|
||||
if(row.at("building").get<bool>())hint+=" · noch "+std::to_string(row.at("job").at("weeks").get<int>())+" Wochen";
|
||||
out+=btn("stadium-periphery","","stadium-periphery-hit","id=\"stadium-periphery-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" data-stadium-hint=\""+esc(hint)+"\" aria-label=\""+esc(hint)+"\" aria-disabled=\""+(row.at("building").get<bool>()||row.at("level")==row.at("max_level")?"true":"false")+"\" style=\""+rect(area.at("x").get<double>()*scale,area.at("y").get<double>()*scale,area.at("width").get<double>()*scale,area.at("height").get<double>()*scale)+"\"");
|
||||
}
|
||||
} catch(const std::exception &) {out+="<p class=\"stadium-empty\">Die Stadionumfeld-Grafiken sind unvollständig.</p>";}
|
||||
out+="</div><p id=\"stadium-interaction-hint\" role=\"status\" aria-live=\"polite\"><span>"+esc(stadium_view_.at("hint").get<std::string>().empty()?"Ein Element im Stadionumfeld auswählen.":stadium_view_.at("hint").get<std::string>())+"</span></p>";
|
||||
} else {
|
||||
const auto graph=stadium_graph_svg(stadium_view_.at("curves"),stadium_view_.at("relative").get<bool>(),theme_);
|
||||
out+="<div class=\"stadium-graph\"><div class=\"stadium-graph-art\">"+picture(renderer_.diagram("stadium-graph",graph,7200),2560,456)+"</div></div>";
|
||||
@@ -128,7 +141,11 @@ std::string App::render_stadium() {
|
||||
out+="</div>";
|
||||
}
|
||||
out+="<nav class=\"stadium-nav\">";
|
||||
if(view=="data")out+=btn("stadium-back","Zurück zum Stadion","stadium-nav-button wide","id=\"stadium-back\"");
|
||||
if(view=="panorama") {
|
||||
out+=btn("stadium-back","Zurück","stadium-nav-button half","id=\"stadium-back\"");
|
||||
out+=btn("stadium-future","Zukunft","stadium-nav-button half","id=\"stadium-future\" aria-pressed=\""+std::string(future?"true":"false")+"\"");
|
||||
}
|
||||
else if(view=="data")out+=btn("stadium-back","Zurück zum Stadion","stadium-nav-button wide","id=\"stadium-back\"");
|
||||
else {
|
||||
out+=btn("stadium-view",view=="inside"?"Sicht: Panorama":"Sicht: Innen","stadium-nav-button","id=\"stadium-view\"");
|
||||
out+=view=="inside"?btn("stadium-future",std::string("Ausbau: ")+(future?"Zukunft":"Aktuell"),"stadium-nav-button","id=\"stadium-future\" aria-pressed=\""+std::string(future?"true":"false")+"\""):"<button class=\"stadium-nav-button control-button\" disabled=\"disabled\"><span class=\"control-label\">Peripherie bauen</span></button>";
|
||||
@@ -142,7 +159,20 @@ std::string App::render_stadium_dialog() {
|
||||
const auto s=snap();if(!s.world||!stadium_view_.at("draft").is_object())return "";
|
||||
const auto &d=stadium_view_.at("draft");const bool block=d.at("kind")=="block";const int index=d.at("index").get<int>();
|
||||
const auto overview=demo_stadium_view(s.state,*s.world,false,stadium_managed(s));if(!overview.value("ok",false))return "";
|
||||
const auto &row=overview.at(block?"blocks":"facilities")[size_t(index)];const auto q=demo_stadium_quote(s.state,d,*s.world,stadium_managed(s));
|
||||
const bool periphery=d.at("kind")=="periphery";
|
||||
const auto &row=overview.at(block?"blocks":periphery?"periphery":"facilities")[size_t(index)];const auto q=demo_stadium_quote(s.state,d,*s.world,stadium_managed(s));
|
||||
if(periphery) {
|
||||
const int level=d.at("level").get<int>();std::string preview;
|
||||
if(gui_.contains("stadium.scene"))try {
|
||||
const auto config=Json::parse(editor::read_file(gui_.root()/editor::path(gui_.items().at("stadium.scene").at("file").get<std::string>())));
|
||||
const auto &profile=config.at("profiles").at("modern");
|
||||
const auto binding=index==0?profile.at("backgroundOptions")[0].at("variants").at(size_t(level)):profile.at("objects").at(size_t(index)).at("sprites").at("variants").at(index==4?size_t(level-1):0);
|
||||
const auto asset=binding.at("asset").get<std::string>();const auto &meta=config.at("assets").at(asset);const double height=800.0*meta.at("height").get<double>()/meta.at("width").get<double>();
|
||||
preview="<span class=\"stadium-periphery-preview\" style=\""+rect(680,174,800,height)+"\">"+img("stadium.scene."+asset,800,height,false,false,1600)+"</span>";
|
||||
} catch(const std::exception &) {}
|
||||
const auto title=row.at("name").get<std::string>();
|
||||
return "<div class=\"stadium-modal\" id=\"stadium-modal\"><section class=\"stadium-draft\" id=\"stadium-draft\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"stadium-draft-title\" style=\""+rect(226,377,2160,1110)+"\"><h2 id=\"stadium-draft-title\">"+esc(title)+" ausbauen</h2><div class=\"stadium-draft-summary\"><span>"+(row.at("level")==0?"Neubau":"Erweiterung")+" · Stufe "+std::to_string(level)+"</span><span>Bauzeit: "+std::to_string(q.value("weeks",0))+" Wochen</span></div>"+preview+"<div class=\"stadium-draft-total\" style=\"top:758dp;\"><span>Gesamtbetrag:</span><span id=\"stadium-quote-total\">"+esc(stadium_money(stadium_field(q,"cost"),*s.world))+"</span></div><p id=\"stadium-draft-feedback\" style=\"top:850dp;\">"+esc(stadium_feedback(q,false))+"</p><nav class=\"stadium-draft-actions\" style=\"top:946dp;\">"+btn("stadium-build","Bauen","stadium-dialog-action primary","id=\"stadium-build\" "+std::string(q.value("can_build",false)?"":"disabled=\"disabled\""))+btn("stadium-cancel","Abbrechen","stadium-dialog-action","id=\"stadium-cancel\"")+"</nav></section></div>";
|
||||
}
|
||||
struct Option {int level;Picture art;double height;};std::vector<Option> options;double option_h=0;
|
||||
if(!block)for(int level=row.at("level").get<int>()+1;level<=row.at("max_level").get<int>();++level){const auto a=renderer_.image("stadium.facility."+std::to_string(index)+".level."+std::to_string(level),false,2048);const double h=a.width?592.0*a.height/a.width:325;options.push_back({level,a,h});option_h=std::max(option_h,h+159);}
|
||||
const double height=block?982.5:option_h+499,total_top=block?687.5:option_h+204,feedback_top=block?776.5:option_h+293,actions_top=block?854.5:option_h+371;
|
||||
|
||||
Reference in new issue
Block a user