Port stadium blocks and facilities without periphery construction (by Codex)
This commit is contained in:
1 parent
0f36b507d4
commit
349c416f3a
21 files changed
+1185
-12
No files matched your search
@@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp)
|
||||
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp)
|
||||
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
|
||||
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
|
||||
add_library(bmh_modern_ui STATIC view.cpp ticket_popover.cpp)
|
||||
@@ -14,7 +14,7 @@ endif()
|
||||
set(modern_assets "${CMAKE_BINARY_DIR}/assets/modern")
|
||||
FetchContent_GetProperties(rmlui)
|
||||
file(MAKE_DIRECTORY "${modern_assets}")
|
||||
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss)
|
||||
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss)
|
||||
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
|
||||
endforeach()
|
||||
|
||||
@@ -91,7 +91,7 @@ if(MSVC)
|
||||
endif()
|
||||
add_test(NAME modern_control_layout_tests COMMAND modern_control_layout_tests "${modern_assets}")
|
||||
|
||||
foreach(component environment advertising toto lineup transfer)
|
||||
foreach(component environment advertising toto lineup transfer stadium)
|
||||
add_executable(modern_${component}_ui_tests ../../../tests/modern_${component}_ui_tests.cpp)
|
||||
target_link_libraries(modern_${component}_ui_tests PRIVATE bmh_modern_ui_core)
|
||||
if(MSVC)
|
||||
|
||||
@@ -165,6 +165,7 @@ void App::ProcessEvent(Rml::Event &event) try {
|
||||
if (popup_.empty() && amount_trigger_event(event)) return;
|
||||
if (popup_.empty() && report_detail_kind_.empty() && (lineup_event(event) || transfer_event(event))) return;
|
||||
if (popup_.empty() && report_detail_kind_.empty() && (career_report_event(event) || rankings_event(event))) return;
|
||||
if (report_detail_kind_.empty() && stadium_event(event)) return;
|
||||
if (popup_.empty() && contracts_event(event)) return;
|
||||
if (popup_.empty() && (advertising_event(event) || toto_event(event))) return;
|
||||
if (popup_.empty() && (bank_event(event) || finance_event(event))) return;
|
||||
@@ -388,9 +389,10 @@ void App::ProcessEvent(Rml::Event &event) try {
|
||||
: !planning_dialog_.empty() ? element("planning-layer")
|
||||
: !report_detail_kind_.empty() ? element("report-detail-layer")
|
||||
: !career_view_.value("dialog", "").empty() ? element("career-history-layer")
|
||||
: !stadium_view_.value("dialog", "").empty() ? element("stadium-modal")
|
||||
: element("canvas");
|
||||
root->QuerySelectorAll(
|
||||
controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty() || !career_view_.value("dialog", "").empty()
|
||||
controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty() || !career_view_.value("dialog", "").empty() || !stadium_view_.value("dialog", "").empty()
|
||||
? "button,input,select"
|
||||
: ".window button,.window input,.window select");
|
||||
controls.erase(std::remove_if(controls.begin(), controls.end(),
|
||||
@@ -458,6 +460,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
|
||||
target ? target->GetAttribute<Rml::String>("data-id", "") : std::string();
|
||||
if (lineup_action(action, target) || transfer_action(action, target)) return;
|
||||
if (career_report_action(action, target) || rankings_action(action, target)) return;
|
||||
if (stadium_action(action, target)) return;
|
||||
if (environment_action(action, target) || advertising_action(action, target) || toto_action(action, target)) return;
|
||||
if (amount_action(action, target) || bank_action(action, target) || finance_action(action, target) || contracts_action(action, target)) return;
|
||||
if (almanac_action(action, target) || planning_action(action, target) || indoor_action(action, target)) return;
|
||||
@@ -1071,7 +1074,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
|
||||
}
|
||||
static const std::set<std::string> available = {
|
||||
"tables", "strengths", "camp", "settings",
|
||||
"save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer", "achievements", "scorers", "fairplay", "highscore"};
|
||||
"save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer", "achievements", "scorers", "fairplay", "highscore", "stadium"};
|
||||
if (!available.contains(route)) {
|
||||
message("Diese native Ansicht wird im nächsten Menüpaket übertragen.");
|
||||
return;
|
||||
@@ -1463,6 +1466,7 @@ void App::script() {
|
||||
{"lineup_view", {{"pitch", lineup_pitch_}, {"data", lineup_data_}, {"page", lineup_page_}, {"side", lineup_side_}, {"selected", lineup_selected_}, {"drag", lineup_drag_}}},
|
||||
{"transfer_view", transfer_view_}, {"transfer_dialog", transfer_dialog_}, {"transfer_draft", transfer_draft_},
|
||||
{"career_view", career_view_}, {"rankings_view", rankings_view_},
|
||||
{"stadium_view", stadium_view_},
|
||||
{"contracts_view", {{"dialog", contracts_dialog_}, {"player", contracts_player_}, {"tab", contracts_tab_}, {"draft", contract_draft_}}},
|
||||
{"amount_editor", amount_ ? Json{{"title", amount_->request.title}, {"raw", amount_->raw}, {"review", amount_->review}, {"error", amount_error()}} : Json()},
|
||||
{"source_revision", source_ ? Json(snap().revision) : Json()},
|
||||
|
||||
@@ -0,0 +1,261 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include "modern/ui/demo_finance.hpp"
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
constexpr int64_t budget_units = 50000000;
|
||||
constexpr std::array<int, 8> capacities{8000,18000,8000,14000,8000,18000,8000,14000};
|
||||
constexpr std::array<int, 8> initial_places{3000,6000,3000,5000,3000,6000,3000,7000};
|
||||
constexpr std::array<int, 8> initial_levels{1,2,1,1,2,2,2,1};
|
||||
constexpr std::array<int, 8> block_rates{300000,375000,300000,350000,300000,375000,300000,350000};
|
||||
constexpr std::array<int, 8> block_weeks{30,37,30,25,30,37,30,25};
|
||||
constexpr std::array<const char *, 8> block_names{
|
||||
"Nordwest-Kurve", "Nord-Tribüne", "Nordost-Kurve", "Ost-Block",
|
||||
"Südost-Kurve", "Süd-Tribüne", "Südwest-Kurve", "West-Block"};
|
||||
constexpr std::array<const char *, 8> facility_names{
|
||||
"Flutlichtanlage", "Anzeigetafel", "Rasenheizung", "V.I.P.-Lounge",
|
||||
"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};
|
||||
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); });
|
||||
}
|
||||
bool integer(const Json &value, int64_t low, int64_t high) {
|
||||
if (value.is_number_unsigned())
|
||||
return high >= 0 && value.get<uint64_t>() <= uint64_t(high) &&
|
||||
(low <= 0 || value.get<uint64_t>() >= uint64_t(low));
|
||||
return value.is_number_integer() && value.get<int64_t>() >= low && value.get<int64_t>() <= high;
|
||||
}
|
||||
int facility_cap(size_t index) { return index == 2 || index == 3 ? 2 : 4; }
|
||||
Json error(const char *code) { return {{"ok", false}, {"can_build", false}, {"error", code}}; }
|
||||
std::string owner(const Catalog &world, const Json *state, std::string requested) {
|
||||
if (requested.empty() && state && state->is_object()) {
|
||||
const auto managers = state->find("managers");
|
||||
if (managers != state->end() && managers->is_array() && !managers->empty() && (*managers)[0].is_object()) {
|
||||
const auto club = (*managers)[0].find("club");
|
||||
if (club != (*managers)[0].end() && club->is_string()) requested = club->get<std::string>();
|
||||
}
|
||||
}
|
||||
if (!requested.empty()) {
|
||||
if (!world.manageable(requested)) throw editor::Error("invalid_stadium_club");
|
||||
return requested;
|
||||
}
|
||||
for (const auto *club : world.clubs())
|
||||
if (world.manageable(club->at("id").get<std::string>())) return club->at("id").get<std::string>();
|
||||
return {};
|
||||
}
|
||||
bool block_target(const Json &base, const Json &target, size_t index) {
|
||||
return integer(target.at("places"), base.at("places").get<int64_t>(), capacities[index]) &&
|
||||
target.at("places").get<int64_t>() % 1000 == 0 &&
|
||||
target.at("seats").is_boolean() && target.at("roof").is_boolean() &&
|
||||
!(base.at("seats").get<bool>() && !target.at("seats").get<bool>()) &&
|
||||
!(base.at("roof").get<bool>() && !target.at("roof").get<bool>());
|
||||
}
|
||||
Json block_price(const Json &base, const Json &target, size_t index, int64_t factor) {
|
||||
const auto added = target.at("places").get<int64_t>() - base.at("places").get<int64_t>();
|
||||
const int64_t rate = block_rates[index] * factor;
|
||||
const int64_t places = added / 1000 * rate;
|
||||
// All fixed rates and legal thousand-place steps divide exactly. This is
|
||||
// Gold's nearest-integer calculation without floating-point currency drift.
|
||||
const int64_t seats = target.at("seats").get<bool>()
|
||||
? (base.at("seats").get<bool>() ? added : target.at("places").get<int64_t>()) / 1000 * rate * 45 / 100 : 0;
|
||||
const int64_t roof = target.at("roof").get<bool>()
|
||||
? (base.at("roof").get<bool>() ? added : target.at("places").get<int64_t>()) / 1000 * rate * 30 / 100 : 0;
|
||||
return {{"cost", places + seats + roof}, {"weeks", block_weeks[index]},
|
||||
{"placesCost", places}, {"seatsCost", seats}, {"roofCost", roof}};
|
||||
}
|
||||
} // namespace
|
||||
|
||||
Json demo_stadium(const Catalog &world, const std::string &club) {
|
||||
Json blocks = Json::array(), facilities = Json::array();
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
blocks.push_back({{"places", initial_places[i]}, {"seats", false}, {"roof", false}, {"job", nullptr}});
|
||||
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}};
|
||||
}
|
||||
|
||||
bool valid_demo_stadium(const Json &state, const Catalog &world, const std::string &club) {
|
||||
try {
|
||||
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"}) ||
|
||||
!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;
|
||||
int64_t pending = 0;
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("blocks")[i];
|
||||
if (!keys(base, {"places", "seats", "roof", "job"}) ||
|
||||
!integer(base.at("places"), 0, capacities[i]) || base.at("places").get<int64_t>() % 1000 ||
|
||||
!base.at("seats").is_boolean() || !base.at("roof").is_boolean()) return false;
|
||||
const auto &job = base.at("job");
|
||||
if (job.is_null()) continue;
|
||||
if (!keys(job, {"places", "seats", "roof", "weeks", "cost"}) ||
|
||||
!block_target(base, job, i) || !integer(job.at("cost"), 1, cap)) return false;
|
||||
const auto quote = block_price(base, job, i, factor);
|
||||
if (!integer(job.at("weeks"), block_weeks[i], block_weeks[i]) ||
|
||||
job.at("cost") != quote.at("cost")) return false;
|
||||
const auto cost = job.at("cost").get<int64_t>();
|
||||
if (cost > cap - pending) return false;
|
||||
pending += cost;
|
||||
}
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("facilities")[i];
|
||||
if (!keys(base, {"level", "job"}) || !integer(base.at("level"), 1, facility_cap(i))) return false;
|
||||
const auto &job = base.at("job");
|
||||
if (job.is_null()) continue;
|
||||
if (!keys(job, {"level", "weeks", "cost"}) ||
|
||||
!integer(job.at("level"), base.at("level").get<int64_t>() + 1, facility_cap(i)) ||
|
||||
!integer(job.at("weeks"), facility_weeks[i], facility_weeks[i]) ||
|
||||
!integer(job.at("cost"), 1, cap)) return false;
|
||||
const int64_t cost = (job.at("level").get<int64_t>() - base.at("level").get<int64_t>()) * facility_rates[i] * factor;
|
||||
if (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; }
|
||||
}
|
||||
|
||||
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);
|
||||
auto next = state;
|
||||
next["stadium"] = demo_stadium(world, owner(world, &state, club));
|
||||
if (!valid_demo_stadium(next, world, club)) return false;
|
||||
state = std::move(next);
|
||||
return true;
|
||||
} catch (const std::exception &) { return false; }
|
||||
}
|
||||
|
||||
Json demo_stadium_quote(const Json &state, const Json &request, const Catalog &world, const std::string &club) {
|
||||
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");
|
||||
const auto kind = request.at("kind").get<std::string>();
|
||||
const auto index = request.at("index").get<size_t>();
|
||||
const auto &stadium = state.at("stadium");
|
||||
const int64_t factor = finance_currency_factor(world);
|
||||
Json quote;
|
||||
bool pending = false;
|
||||
if (kind == "block") {
|
||||
const auto &base = stadium.at("blocks")[index];
|
||||
if (!keys(request, {"kind", "index", "places", "seats", "roof"}) ||
|
||||
!block_target(base, request, index)) return error("invalid_stadium_block_target");
|
||||
quote = block_price(base, request, index, factor);
|
||||
pending = !base.at("job").is_null();
|
||||
} else if (kind == "facility") {
|
||||
const auto &base = stadium.at("facilities")[index];
|
||||
if (!keys(request, {"kind", "index", "level"}) ||
|
||||
!integer(request.at("level"), base.at("level").get<int64_t>(), facility_cap(index)))
|
||||
return error("invalid_stadium_facility_target");
|
||||
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 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"
|
||||
: cost > budget ? "stadium_budget_exceeded" : "";
|
||||
quote["ok"] = true; quote["can_build"] = !*reason; quote["error"] = reason;
|
||||
quote["kind"] = kind; quote["index"] = index; quote["request"] = request;
|
||||
quote["budget"] = budget; quote["remaining"] = budget - cost;
|
||||
return quote;
|
||||
} catch (const std::exception &) { return error("invalid_stadium_request"); }
|
||||
}
|
||||
|
||||
std::string edit_demo_stadium(Json &state, const Json &action, const Catalog &world, const std::string &club) {
|
||||
if (!valid_demo_stadium(state, world, club)) return "invalid_stadium_state";
|
||||
try {
|
||||
if (!keys(action, {"kind", "request"}) || action.at("kind") != "build") return "invalid_stadium_action";
|
||||
const auto quote = demo_stadium_quote(state, action.at("request"), world, club);
|
||||
if (!quote.value("ok", false) || !quote.value("can_build", false)) return quote.value("error", std::string("invalid_stadium_request"));
|
||||
const auto &request = quote.at("request");
|
||||
const auto index = quote.at("index").get<size_t>();
|
||||
Json job = {{"weeks", quote.at("weeks")}, {"cost", quote.at("cost")}};
|
||||
auto next = state;
|
||||
if (quote.at("kind") == "block") {
|
||||
for (const auto *key : {"places", "seats", "roof"}) job[key] = request.at(key);
|
||||
next["stadium"]["blocks"][index]["job"] = job;
|
||||
} else {
|
||||
job["level"] = request.at("level");
|
||||
next["stadium"]["facilities"][index]["job"] = job;
|
||||
}
|
||||
next["stadium"]["budget"] = quote.at("remaining");
|
||||
if (!valid_demo_stadium(next, world, club)) return "invalid_stadium_state";
|
||||
state = std::move(next);
|
||||
return {};
|
||||
} catch (const std::exception &) { return "invalid_stadium_action"; }
|
||||
}
|
||||
|
||||
Json demo_stadium_rules(const Catalog &world) {
|
||||
const auto factor = finance_currency_factor(world);
|
||||
Json blocks = Json::array(), facilities = Json::array();
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
blocks.push_back({{"index", i}, {"letter", std::string(1, char('A' + i))}, {"name", block_names[i]},
|
||||
{"max_places", capacities[i]}, {"rate", block_rates[i] * factor}, {"weeks", block_weeks[i]}});
|
||||
const Json levels = i == 2 || i == 3 ? Json({"", "nicht vorhanden", "vorhanden"})
|
||||
: i < 2 ? Json({"", "klein", "mittel", "groß", "mega"})
|
||||
: Json({"", "schlecht", "ausreichend", "gut", "sehr gut"});
|
||||
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 demo_stadium_view(const Json &state, const Catalog &world, bool future, const std::string &club) {
|
||||
if (!valid_demo_stadium(state, world, club)) return error("invalid_stadium_state");
|
||||
const auto &stadium = state.at("stadium");
|
||||
const auto id = stadium.at("club").get<std::string>();
|
||||
const auto *team = world.find("clubs", id);
|
||||
const Json *record = nullptr;
|
||||
if (team) {
|
||||
if (auto ref = team->find("stadium"); ref != team->end() && ref->is_string()) record = world.find("stadiums", ref->get<std::string>());
|
||||
if (!record) for (const auto &candidate : world.rows("stadiums")) {
|
||||
const auto ref = candidate.find("owner");
|
||||
if (ref != candidate.end() && ref->is_string() && ref->get<std::string>() == id) { record = &candidate; break; }
|
||||
}
|
||||
}
|
||||
auto rules = demo_stadium_rules(world);
|
||||
int64_t pending = 0, available = 0, planned = 0;
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("blocks")[i];
|
||||
const auto &job = base.at("job");
|
||||
const bool building = !job.is_null();
|
||||
const auto &display = future && building ? job : base;
|
||||
auto &row = rules["blocks"][i];
|
||||
for (const auto *key : {"places", "seats", "roof", "job"}) row[key] = base.at(key);
|
||||
row["building"] = building;
|
||||
row["display_places"] = building && !future ? Json(0) : display.at("places");
|
||||
row["display_seats"] = display.at("seats"); row["display_roof"] = display.at("roof");
|
||||
available += building ? 0 : base.at("places").get<int64_t>();
|
||||
planned += building ? job.at("places").get<int64_t>() : base.at("places").get<int64_t>();
|
||||
if (building) pending += job.at("cost").get<int64_t>();
|
||||
}
|
||||
for (size_t i = 0; i < 8; ++i) {
|
||||
const auto &base = stadium.at("facilities")[i]; const auto &job = base.at("job");
|
||||
const bool building = !job.is_null();
|
||||
auto &row = rules["facilities"][i];
|
||||
row["level"] = base.at("level"); row["job"] = job; row["building"] = building;
|
||||
const int level = (future && building ? job : base).at("level").get<int>();
|
||||
row["display_level"] = level; row["display_label"] = row.at("levels")[size_t(level)];
|
||||
if (building) pending += job.at("cost").get<int64_t>();
|
||||
}
|
||||
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) : "";
|
||||
rules["name"] = name.empty() ? "Stadion" : name;
|
||||
rules["budget"] = stadium.at("budget"); rules["pending_cost"] = pending;
|
||||
rules["available_capacity"] = available; rules["planned_capacity"] = planned;
|
||||
rules["capacity"] = future ? planned : available;
|
||||
return rules;
|
||||
}
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,42 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#pragma once
|
||||
#include "modern/ui/catalog.hpp"
|
||||
|
||||
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,
|
||||
// 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 &,
|
||||
const std::string &club = {});
|
||||
// Initialize only an entirely absent stadium object. Existing invalid data is
|
||||
// rejected unchanged; budget plus all correctly priced pending jobs is 50M.
|
||||
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,
|
||||
// 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 = {});
|
||||
// {ok,can_build,error,request,kind,index,cost,weeks,budget,remaining,
|
||||
// placesCost,seatsCost,roofCost}. All monetary values are raw minor units.
|
||||
// Invalid input/downgrades => ok=false; no-op, pending target or insufficient
|
||||
// budget => ok=true,can_build=false with a precise error and usable quote.
|
||||
// Explicit club wins; otherwise full state.managers[0].club, then legacy first
|
||||
// manageable club, or "" for a catalogue without manageable clubs.
|
||||
Json demo_stadium_quote(const Json &state, const Json &request, const Catalog &,
|
||||
const std::string &club = {});
|
||||
// {budget_cap,blocks:[index,letter,name,max_places,rate,weeks],
|
||||
// facilities:[index,name,max_level,rate,weeks,levels]}. Rates are raw; level
|
||||
// labels are 1-based with an empty entry at index 0. No artwork is required.
|
||||
Json demo_stadium_rules(const Catalog &);
|
||||
// {ok,club,club_name,name,stadium,budget,budget_cap,pending_cost,
|
||||
// available_capacity,planned_capacity,capacity,blocks,facilities}.
|
||||
// Rule rows above are augmented with unchanged base values/job/building plus
|
||||
// display_places/seats/roof or display_level/label for the requested view.
|
||||
// Current capacity excludes a block with any pending job; future uses its target.
|
||||
// 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 = {});
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "modern/ui/demo_sports.hpp"
|
||||
#include "modern/ui/demo_lineup.hpp"
|
||||
#include "modern/ui/demo_transfer.hpp"
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include "modern/ui/desktop.hpp"
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
@@ -96,6 +97,8 @@ DemoSource::DemoSource(std::shared_ptr<const Catalog> catalog)
|
||||
throw editor::Error("invalid_demo_club");
|
||||
if (!migrate_demo_lineup(state_, *catalog_, club) || !migrate_demo_transfer(state_, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_squad");
|
||||
if (!migrate_demo_stadium(state_, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_stadium");
|
||||
saved_ = state_;
|
||||
}
|
||||
Snapshot DemoSource::snapshot() const { return {revision_, catalog_, state_}; }
|
||||
@@ -137,6 +140,7 @@ ActionResult DemoSource::apply(const Action &action) {
|
||||
next["contracts"] = demo_contracts(*catalog_, first);
|
||||
next["lineup"] = demo_lineup(*catalog_, first);
|
||||
next["transfer"] = demo_transfer(*catalog_, first);
|
||||
next["stadium"] = demo_stadium(*catalog_, first);
|
||||
next["calendar"] = demo_calendar(*catalog_, next.at("date"), first);
|
||||
const auto error = edit_demo_reports(next["reports"],
|
||||
{{"kind", "league"}, {"value", next["calendar"]["league"]}}, *catalog_);
|
||||
@@ -152,6 +156,9 @@ ActionResult DemoSource::apply(const Action &action) {
|
||||
const auto error = action.kind == "lineup" ? edit_demo_lineup(next, action.value, *catalog_, club)
|
||||
: edit_demo_transfer(next, action.value, *catalog_, club);
|
||||
if (!error.empty()) return {false, revision_, error};
|
||||
} else if (action.kind == "stadium") {
|
||||
const auto error = edit_demo_stadium(next, action.value, *catalog_, next["managers"][0]["club"]);
|
||||
if (!error.empty()) return {false, revision_, error};
|
||||
} else if (action.kind == "finance") {
|
||||
const auto error = edit_demo_finance(next, action.value, *catalog_, next["managers"][0]["club"]);
|
||||
if (!error.empty()) return {false, revision_, error};
|
||||
@@ -280,6 +287,8 @@ Json DemoSource::load(const fs::path &file) {
|
||||
throw editor::Error("invalid_demo_club");
|
||||
if (!migrate_demo_lineup(data, *catalog_, club) || !migrate_demo_transfer(data, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_squad");
|
||||
if (!migrate_demo_stadium(data, *catalog_, club))
|
||||
throw editor::Error("invalid_demo_stadium");
|
||||
auto next = data;
|
||||
auto desktop = next.value("desktop", Json::object());
|
||||
if (!migrate_desktop(desktop))
|
||||
|
||||
@@ -895,6 +895,8 @@ std::string App::render_menu(const std::string &key) {
|
||||
body = render_fairplay();
|
||||
else if (key == "highscore")
|
||||
body = render_highscore();
|
||||
else if (key == "stadium")
|
||||
body = render_stadium();
|
||||
else if (key == "environment")
|
||||
body = render_environment();
|
||||
else if (key == "advertising")
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
std::optional<int> stadium_integer(const std::string &text,int maximum) {
|
||||
const auto dot=text.find('.');const auto whole=text.substr(0,dot);
|
||||
if(whole.empty()||whole.size()>8||std::any_of(whole.begin(),whole.end(),[](char c){return c<'0'||c>'9';}))return {};
|
||||
if(dot!=std::string::npos&&(dot+1==text.size()||std::any_of(text.begin()+std::ptrdiff_t(dot+1),text.end(),[](char c){return c!='0';})))return {};
|
||||
const auto value=std::stoll(whole);return value<=maximum?std::optional<int>(int(value)):std::optional<int>();
|
||||
}
|
||||
} // namespace
|
||||
void App::sync_stadium_draft() {
|
||||
stadium_view_defaults(stadium_view_);if(stadium_view_.at("dialog")==""||!stadium_view_.at("draft").is_object())return;
|
||||
const auto s=snap();const bool fresh=s.world==stadium_world_&&source_.get()==stadium_source_&&s.revision==stadium_revision_&&stadium_managed(s)==stadium_view_.value("bound_club",std::string());
|
||||
const auto q=fresh?demo_stadium_quote(s.state,stadium_view_.at("draft"),*s.world,stadium_managed(s)):Json{{"ok",false}};
|
||||
auto feedback=stadium_view_.at("feedback").get<std::string>();
|
||||
if(!fresh)feedback="Der Stadionstand hat sich geändert. Bitte den Ausbau erneut öffnen.";
|
||||
if(feedback.empty())feedback=stadium_feedback(q,stadium_view_.at("invalid_places").get<bool>());
|
||||
if(auto *n=element("stadium-draft-feedback"))n->SetInnerRML(esc(feedback));
|
||||
if(auto *n=element("stadium-quote-total"))n->SetInnerRML(s.world?esc(stadium_money(stadium_field(q,"cost"),*s.world)):"—");
|
||||
for(const auto *key:{"placesCost","seatsCost","roofCost"})if(auto *n=element("stadium-cost-"+std::string(key)))n->SetInnerRML(s.world?esc(stadium_money(stadium_field(q,key),*s.world)):"—");
|
||||
if(auto *button=element("stadium-build")) {
|
||||
if(!fresh||!q.value("can_build",false)||stadium_view_.at("invalid_places").get<bool>())button->SetAttribute("disabled",true);
|
||||
else button->RemoveAttribute("disabled");
|
||||
}
|
||||
if(stadium_view_.at("dialog")=="block")if(auto *button=element("stadium-place-number"))button->SetInnerRML("<span class=\"control-label\">"+std::to_string(stadium_view_.at("draft").at("places").get<int64_t>())+"</span>");
|
||||
dirty_=true;
|
||||
}
|
||||
bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
if(!action.starts_with("stadium-"))return false;
|
||||
if(menu_!="stadium"||!source_||!world_||amount_||!popup_.empty()||!report_detail_kind_.empty())return true;
|
||||
stadium_view_defaults(stadium_view_);const auto s=snap();const auto club=stadium_managed(s);
|
||||
if(club.empty()||!s.world)return true;
|
||||
const auto overview=demo_stadium_view(s.state,*s.world,stadium_view_.at("future").get<bool>(),club);if(!overview.value("ok",false))return true;
|
||||
const auto id=target?target->GetAttribute<Rml::String>("data-id",""):std::string();
|
||||
const auto index=stadium_integer(id,25);
|
||||
const auto fresh=[&](){const auto now=snap();return stadium_world_&&now.world==stadium_world_&&source_.get()==stadium_source_&&now.revision==stadium_revision_&&stadium_managed(now)==stadium_view_.value("bound_club",std::string());};
|
||||
const auto cancel=[&](){const auto restore=stadium_view_.at("return_focus").get<std::string>();stadium_view_["dialog"]="";stadium_view_["draft"]=Json();stadium_view_["feedback"]="";stadium_view_["invalid_places"]=false;stadium_view_["return_focus"]="";stadium_world_.reset();stadium_source_=nullptr;stadium_revision_=0;focus_after_render_=restore.empty()?"stadium-data":restore;refresh();};
|
||||
if(action=="stadium-cancel"){cancel();return true;}
|
||||
if(action=="stadium-ticket") {
|
||||
if(!index||stadium_view_.at("dialog")!="")return true;
|
||||
if(s.state.at("ticket")==*index)return true;
|
||||
const auto world=s.world;const auto *source=source_.get();const auto revision=s.revision;const int value=*index;const auto focus=target->GetId();
|
||||
stadium_view_["ticket_return_focus"]=focus;
|
||||
confirmation("Eintritt auf "+std::to_string(value)+" "+money_unit()+" ändern?",[this,world,source,revision,value,focus] {
|
||||
if(menu_!="stadium"||source_.get()!=source||snap().world!=world) {message("Der Eintritt konnte nicht übernommen werden. Bitte den aktuellen Stadionstand erneut öffnen.");return;}
|
||||
const auto result=source_->apply({revision,"ticket",value});
|
||||
if(!result.ok){message("Der Eintritt konnte nicht übernommen werden. Bitte den aktuellen Stadionstand erneut öffnen.");return;}
|
||||
stadium_view_["ticket_return_focus"]="";focus_after_render_=focus;refresh();
|
||||
});
|
||||
return true;
|
||||
}
|
||||
if(action=="stadium-build") {
|
||||
if(stadium_view_.at("dialog")==""||!stadium_view_.at("draft").is_object())return true;
|
||||
if(!fresh()){stadium_view_["feedback"]="Der Stadionstand hat sich geändert. Bitte den Ausbau erneut öffnen.";sync_stadium_draft();return true;}
|
||||
const auto q=demo_stadium_quote(s.state,stadium_view_.at("draft"),*s.world,club);
|
||||
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;
|
||||
}
|
||||
if(action=="stadium-option") {
|
||||
if(stadium_view_.at("dialog")!="facility"||!index||!fresh())return true;
|
||||
const int i=stadium_view_.at("draft").at("index").get<int>();const auto &row=overview.at("facilities")[size_t(i)];
|
||||
if(*index<=row.at("level").get<int>()||*index>row.at("max_level").get<int>())return true;
|
||||
stadium_view_["draft"]["level"]=*index;stadium_view_["feedback"]="";focus_after_render_="stadium-option-"+id;refresh();return true;
|
||||
}
|
||||
if(action=="stadium-places-editor") {
|
||||
if(stadium_view_.at("dialog")!="block"||!fresh())return true;
|
||||
const int i=stadium_view_.at("draft").at("index").get<int>();const auto &row=overview.at("blocks")[size_t(i)];
|
||||
const auto world=stadium_world_;const auto *source=stadium_source_;const auto revision=stadium_revision_;
|
||||
AmountRequest request;request.title="Neue Gesamtplätze";request.unit="Plätze";request.return_focus="stadium-place-number";request.value=stadium_view_.at("draft").at("places").get<int64_t>();request.min=row.at("places").get<int64_t>();request.max=row.at("max_places").get<int64_t>();request.step=1000;request.suggestion_step=1000;request.review=false;
|
||||
request.accept=[this,world,source,revision,i](int64_t value) {
|
||||
if(menu_!="stadium"||stadium_view_.value("dialog",std::string())!="block"||source_.get()!=source||snap().world!=world||snap().revision!=revision||stadium_revision_!=revision||!stadium_view_.at("draft").is_object()||stadium_view_.at("draft").value("index",-1)!=i||value%1000)return false;
|
||||
stadium_view_["draft"]["places"]=value;stadium_view_["invalid_places"]=false;stadium_view_["feedback"]="";refresh();return true;
|
||||
};
|
||||
open_amount(std::move(request));return true;
|
||||
}
|
||||
if(stadium_view_.at("dialog")!="")return true;
|
||||
if(action=="stadium-block"||action=="stadium-facility") {
|
||||
if(!index||*index>7||!target)return true;
|
||||
const bool block=action=="stadium-block";
|
||||
const auto &row=overview.at(block?"blocks":"facilities")[size_t(*index)];
|
||||
if(row.at("building").get<bool>())return true;
|
||||
if(!block&&row.at("level").get<int>()>=row.at("max_level").get<int>()){message("Diese Ausstattung ist bereits vollständig ausgebaut oder im Bau.");return true;}
|
||||
stadium_view_["draft"]=block?Json{{"kind","block"},{"index",*index},{"places",std::min(row.at("max_places").get<int>(),row.at("places").get<int>()+1000)},{"seats",row.at("seats")},{"roof",row.at("roof")}}:Json{{"kind","facility"},{"index",*index},{"level",row.at("level").get<int>()+1}};
|
||||
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-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;}
|
||||
else if(action=="stadium-scale"){if(!index||*index>1)return true;stadium_view_["relative"]=bool(*index);focus_after_render_="stadium-scale-"+id;}
|
||||
else return true;
|
||||
refresh();return true;
|
||||
}
|
||||
bool App::stadium_event(Rml::Event &event) {
|
||||
if(menu_!="stadium"||!source_||!report_detail_kind_.empty())return false;
|
||||
stadium_view_defaults(stadium_view_);const auto type=event.GetType();auto *target=event.GetTargetElement();
|
||||
const auto key=type=="keydown"?Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier",0)):Rml::Input::KI_UNKNOWN;
|
||||
if(!popup_.empty()) {
|
||||
if(stadium_view_.at("ticket_return_focus")!="") {
|
||||
std::string action;for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->HasAttribute("data-action")){action=n->GetAttribute<Rml::String>("data-action","");break;}
|
||||
if(key==Rml::Input::KI_ESCAPE||(type=="click"&&action=="popup-close")) {focus_after_render_=stadium_view_.at("ticket_return_focus").get<std::string>();stadium_view_["ticket_return_focus"]="";refresh();}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if(amount_)return false;
|
||||
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 return false;
|
||||
event.StopImmediatePropagation();return 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)) {
|
||||
const auto s=snap();
|
||||
if(s.world==stadium_world_&&source_.get()==stadium_source_&&s.revision==stadium_revision_) {
|
||||
const auto current=demo_stadium_view(s.state,*s.world,false,stadium_managed(s));
|
||||
if(current.value("ok",false)) {
|
||||
const auto &row=current.at("blocks")[stadium_view_.at("draft").at("index").get<size_t>()];
|
||||
const int value=row.at(key==Rml::Input::KI_HOME?"places":"max_places").get<int>();
|
||||
if(value>=row.at("places").get<int>()&&value<=row.at("max_places").get<int>()&&value%1000==0) {
|
||||
stadium_view_["draft"]["places"]=value;stadium_view_["invalid_places"]=false;stadium_view_["feedback"]="";
|
||||
if(auto *range=dynamic_cast<Rml::ElementFormControl*>(place_range))range->SetValue(std::to_string(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
sync_stadium_draft();event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(dialog&&type=="keydown"&&key==Rml::Input::KI_TAB) {
|
||||
Rml::ElementList controls;if(auto *modal=element("stadium-modal"))modal->QuerySelectorAll(controls,"button,input");controls.erase(std::remove_if(controls.begin(),controls.end(),[](auto *n){return n->HasAttribute("disabled")||!n->IsVisible(true);}),controls.end());
|
||||
if(!controls.empty()){const auto it=std::find(controls.begin(),controls.end(),context_->GetFocusElement());const bool back=event.GetParameter<int>("shift_key",0)!=0;const int old=it==controls.end()?(back?0:-1):int(it-controls.begin());controls[size_t((old+(back?-1:1)+int(controls.size()))%int(controls.size()))]->Focus(true);}event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(dialog&&(type=="input"||type=="change")&&target&&stadium_view_.at("dialog")=="block") {
|
||||
if(auto *control=dynamic_cast<Rml::ElementFormControl*>(target)) {
|
||||
if(target->GetId()=="stadium-place-range") {
|
||||
const auto value=stadium_integer(control->GetValue(),18000);const auto s=snap();const int i=stadium_view_.at("draft").at("index").get<int>();const auto current=demo_stadium_view(s.state,*s.world,false,stadium_managed(s));const auto &row=current.at("blocks")[size_t(i)];
|
||||
if(!value||*value%1000||*value<row.at("places").get<int>()||*value>row.at("max_places").get<int>())stadium_view_["invalid_places"]=true;
|
||||
else {stadium_view_["draft"]["places"]=*value;stadium_view_["invalid_places"]=false;stadium_view_["feedback"]="";}sync_stadium_draft();event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(target->HasAttribute("data-stadium-feature")) {
|
||||
const auto field=target->GetAttribute<Rml::String>("data-stadium-feature","");if(field!="seats"&&field!="roof")return true;
|
||||
stadium_view_["draft"][field]=target->HasAttribute("checked");stadium_view_["feedback"]="";
|
||||
if(auto *image=element("stadium-feature-image-"+field)){const bool checked=stadium_view_.at("draft").at(field).get<bool>();image->SetInnerRML(picture(renderer_.diagram("stadium-feature-"+field+(checked?"-built-":"-empty-")+theme_,stadium_feature_svg(field,checked,theme_),232),116,116));}
|
||||
sync_stadium_draft();event.StopImmediatePropagation();return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(dialog) {
|
||||
bool inside=false;for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->GetId()=="stadium-modal")inside=true;
|
||||
if(!inside&&(type=="click"||type=="dblclick"||type=="mousedown"||type=="mouseup"||type=="keydown")){event.StopImmediatePropagation();return true;}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
const Json &stadium_field(const Json &j,const char *key) {
|
||||
static const Json absent;
|
||||
if(j.is_object())if(const auto i=j.find(key);i!=j.end())return *i;
|
||||
return absent;
|
||||
}
|
||||
void stadium_view_defaults(Json &v) {
|
||||
if(!v.is_object())v=Json::object();
|
||||
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"]="";
|
||||
if(!v.contains("draft"))v["draft"]=Json();
|
||||
}
|
||||
std::string stadium_managed(const Snapshot &s) {
|
||||
const auto &m=stadium_field(s.state,"managers");
|
||||
return m.is_array()&&!m.empty()&&stadium_field(m[0],"club").is_string()?m[0].at("club").get<std::string>():"";
|
||||
}
|
||||
std::string stadium_money(const Json &value,const Catalog &world) {
|
||||
return value.is_number_integer()?money(value.get<int64_t>(),world.manifest().value("currency",Json::object())):"—";
|
||||
}
|
||||
std::string stadium_feedback(const Json "e,bool invalid) {
|
||||
if(invalid)return "Bitte eine gültige Gesamtzahl in Tausenderschritten eingeben.";
|
||||
if(!quote.value("ok",false))return "Bitte einen gültigen Ausbau auswählen.";
|
||||
const auto error=quote.value("error",std::string());
|
||||
if(error.find("budget")!=std::string::npos||quote.value("cost",int64_t(0))>quote.value("budget",int64_t(0)))return "Das POC-Budget reicht für diesen Ausbau nicht aus.";
|
||||
if(!quote.value("can_build",false))return "Bitte einen Ausbau auswählen.";
|
||||
return "Fiktiver Bauauftrag; Spielzeit und Desktopkonto bleiben unverändert.";
|
||||
}
|
||||
std::string stadium_svg(const std::string &body,double w,double h) {
|
||||
return "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 "+scalar(w)+" "+scalar(h)+"\">"+body+"</svg>";
|
||||
}
|
||||
std::string stadium_feature_svg(const std::string &kind,bool built,const std::string &theme) {
|
||||
const std::string color=theme=="silver"?"#25617a":theme=="matchday"?"#efb2aa":built?"#b7e0d1":"#a8cbbd";
|
||||
const auto path=kind=="seats"?"M7 4h16v13H7zM5 20h22v5H5zM8 25v5M24 25v5M9 9h14":"M2 16 16 4l14 12M6 15v14M26 15v14M10 17h12v12H10";
|
||||
return stadium_svg("<path d=\""+std::string(path)+"\" fill=\"none\" stroke=\""+color+"\" stroke-width=\"1.7\" stroke-linecap=\"round\" stroke-linejoin=\"round\" opacity=\""+(built?"1":".32")+"\"/>",32,32);
|
||||
}
|
||||
std::string stadium_graph_svg(const Json &curves,bool relative,const std::string &theme) {
|
||||
constexpr std::array<const char*,6> colors{"#8fbaa6","#8cacc9","#adb7c1","#cf9088","#c5b384","#729aae"};
|
||||
std::array<std::array<double,24>,6> values{};double maximum=0;
|
||||
for(int i=0;i<24;++i) {
|
||||
const double attendance=std::round(24000+7000*std::sin(i*.7)+i*130);
|
||||
const std::array<double,6> row{attendance,double(11+i/8),double(12000000+i*220000),double(18000+i*750),attendance*13,double(70000+i*1500)};
|
||||
for(size_t k=0;k<6;++k){values[k][size_t(i)]=row[k];maximum=std::max(maximum,row[k]);}
|
||||
}
|
||||
const std::string divider=theme=="silver"?"#6c879c28":theme=="matchday"?"#ead9da16":"#9eb6c44d";
|
||||
std::string svg="<path d=\"M50 20V590H3570\" fill=\"none\" stroke=\""+divider+"\" stroke-width=\"2\"/>";
|
||||
for(double x:{.25,.5,.75})svg+="<path d=\"M55 "+scalar(570-x*530)+"H3570\" fill=\"none\" stroke=\""+divider+"\" stroke-width=\"2\" stroke-dasharray=\"12 16\"/>";
|
||||
for(size_t k=0;k<6;++k)if(curves[k].get<bool>()) {
|
||||
const double scale=relative?*std::max_element(values[k].begin(),values[k].end()):maximum;
|
||||
svg+="<polyline fill=\"none\" stroke=\""+std::string(colors[k])+"\" stroke-width=\"6\" points=\"";
|
||||
for(size_t i=0;i<24;++i)svg+=scalar(70+i*3460.0/23)+","+scalar(570-values[k][i]/scale*530)+" ";
|
||||
svg+="\"/>";
|
||||
}
|
||||
return stadium_svg(svg,3600,620);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
std::string App::render_stadium() {
|
||||
stadium_view_defaults(stadium_view_);const auto snapshot=snap();const auto club=stadium_managed(snapshot);
|
||||
if(!snapshot.world||club.empty())return "<p class=\"stadium-empty\">Die Stadionvorschau ist derzeit nicht verfügbar.</p>";
|
||||
const bool future=stadium_view_.at("future").get<bool>();
|
||||
const auto overview=demo_stadium_view(snapshot.state,*snapshot.world,future,club);
|
||||
if(!overview.value("ok",false))return "<p class=\"stadium-empty\">Die Stadionvorschau ist derzeit nicht verfügbar.</p>";
|
||||
const auto view=stadium_view_.at("view").get<std::string>();
|
||||
const auto feature=[&](const std::string &kind,bool built,double size) {return picture(renderer_.diagram("stadium-feature-"+kind+(built?"-built-":"-empty-")+theme_,stadium_feature_svg(kind,built,theme_),232),size,size);};
|
||||
const auto art_overlay=[&](int i,int level,double w,double natural_h) {
|
||||
// Texture cover handles the base art. This independent125dp SVG viewport
|
||||
// clips overlays at the same boundary, even for absolutely positioned text.
|
||||
constexpr double viewport_h=125;const double dy=(viewport_h-natural_h)/2;std::string body;
|
||||
if(i==1) {
|
||||
const double x=level==1?.28:level==3?.13:level==4?.12:.10,y=level==3?.24:level==4?.63:.30,rw=level==1?.40:level==3?.72:level==4?.74:.60,rh=level==1?.28:level==3?.24:level==4?.18:.45;
|
||||
const std::string color=level==2?"#ff593e":theme_=="silver"?(level==4?"#233443":"#805b18"):theme_=="matchday"?(level==4?"#efeded":"#e1c68b"):level==1?"#edc960":level==3?"#dfdc67":"#d9e8ef";
|
||||
body+="<text x=\""+scalar(w*(x+rw/2))+"\" y=\""+scalar(dy+natural_h*(y+rh/2))+"\" dominant-baseline=\"central\" text-anchor=\"middle\" font-family=\"monospace\" font-size=\"33\" letter-spacing=\"4\" fill=\""+color+"\">2 : 1</text>";
|
||||
}
|
||||
if(((i==2||i==3)&&level<2)||(i==5&&level==1)) {
|
||||
const std::string color=theme_=="silver"?"#a23f45":theme_=="matchday"?"#f0a6a7":"#df8c80";
|
||||
body+="<g transform=\"translate("+scalar((w-100)/2)+" "+scalar(dy+(natural_h-100)/2)+")\"><path d=\"M14 14L86 86M86 14L14 86\" stroke=\""+color+"\" stroke-width=\"9\" fill=\"none\"/></g>";
|
||||
}
|
||||
if(i==5&&level>1) {
|
||||
const std::string color=theme_=="silver"?"#805b18":theme_=="matchday"?"#e1c68b":"#e0c99b";
|
||||
const int n=level-1;for(int k=0;k<n;++k)body+="<g transform=\"translate("+scalar((w-(n*52+(n-1)*8))/2+k*60)+" "+scalar(dy+(natural_h-52)/2)+") scale("+scalar(52.0/48)+")\"><path d=\"m24 3 6 13 15 2-11 11 3 15-13-7-13 7 3-15L3 18l15-2Z\" fill=\""+color+"\"/></g>";
|
||||
}
|
||||
if(body.empty())return std::string();
|
||||
return "<span class=\"stadium-art-overlay\" style=\""+rect(0,0,w,viewport_h)+"\">"+picture(renderer_.diagram("stadium-card-overlay-"+std::to_string(i)+"-"+std::to_string(level)+"-"+theme_,stadium_svg(body,w,viewport_h),1564),w,viewport_h)+"</span>";
|
||||
};
|
||||
std::string out="<div class=\"stadium-screen\" id=\"stadium-underlay\"><header class=\"stadium-heading\"><div class=\"stadium-heading-copy\"><h2>"+esc(overview.at("name").get<std::string>())+"</h2><p>"+(view=="inside"?"Innenansicht":view=="panorama"?"Panorama":"Stadiondaten")+"</p></div><div class=\"stadium-summary\"><div><span>"+(future?"Geplante Kapazität":"Verfügbare Kapazität")+std::string("</span><strong>")+number(overview.at("capacity").get<int64_t>())+" <small>Plätze</small></strong></div><div><span>Ausbaubudget</span><strong>"+esc(stadium_money(overview.at("budget"),*snapshot.world))+"</strong></div></div></header>";
|
||||
if(view=="inside") {
|
||||
constexpr double bowl_h=1430.0*1045/1505;
|
||||
out+="<div class=\"stadium-bowl\">"+img("art.stadium-interior-v1.png",1426,bowl_h-4,false,false,2048);
|
||||
constexpr std::array<std::array<double,2>,8> letters{{{{21,20}},{{50,11}},{{80,20}},{{91,50}},{{81,80}},{{50,84}},{{20,80}},{{9,50}}}};
|
||||
for(size_t i=0;i<8;++i) {
|
||||
const auto &b=overview.at("blocks")[i];const bool building=b.at("building").get<bool>();
|
||||
out+=btn("stadium-block",b.at("letter").get<std::string>(),std::string("stadium-letter ")+(building?"building":""),"id=\"stadium-letter-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" style=\""+rect(letters[i][0]*14.26-48,letters[i][1]*(bowl_h-4)/100-46,96,92)+"\" aria-label=\"Block "+b.at("letter").get<std::string>()+", "+esc(b.at("name").get<std::string>())+"\" "+(building?"disabled=\"disabled\"":""));
|
||||
}
|
||||
out+="</div>";
|
||||
for(size_t i=0;i<8;++i) {
|
||||
const auto &b=overview.at("blocks")[i];const bool building=b.at("building").get<bool>();
|
||||
const auto &j=b.at("job");const auto detail=future?(building?"Im Bau: "+number(j.at("places").get<int64_t>())+" Plätze":"kein Bau"):number(b.at("display_places").get<int64_t>())+" Plätze";
|
||||
const auto note=future?(building?"Bauzeit: "+std::to_string(j.at("weeks").get<int>())+" Wochen":""):("max. "+number(b.at("max_places").get<int64_t>()));
|
||||
const double top=note.empty()?48.625:34.625;
|
||||
out+=btn("stadium-block","<span class=\"stadium-block-copy\" style=\"top:"+scalar(top)+"dp;\"><strong>Block "+b.at("letter").get<std::string>()+"</strong><span>"+esc(detail)+"</span><small>"+esc(note)+"</small></span><span class=\"stadium-block-icons\">"+feature("seats",b.at("display_seats").get<bool>(),76)+feature("roof",b.at("display_roof").get<bool>(),76)+"</span>","stadium-block "+std::string(building?"building":""),"id=\"stadium-block-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" style=\""+rect(1822,134+i*201.25,790,189.25)+"\" "+(building?"disabled=\"disabled\"":""));
|
||||
}
|
||||
for(size_t i=0;i<8;++i) {
|
||||
const auto &f=overview.at("facilities")[i];const int level=f.at("display_level").get<int>();const auto art=renderer_.image("stadium.facility."+std::to_string(i)+".level."+std::to_string(level),false,2048);const double h=art.width?391.0*art.height/art.width:215;
|
||||
const auto caption=f.at("display_label").get<std::string>()+(f.at("building").get<bool>()?" · "+std::to_string(f.at("job").at("weeks").get<int>())+" W.":"");
|
||||
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>";
|
||||
} 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>";
|
||||
constexpr std::array<const char*,6> colors{"#8fbaa6","#8cacc9","#adb7c1","#cf9088","#c5b384","#729aae"},names{"Zuschauer","Eintritt","Stadionwert","Zus. Stadion-Einnahmen","Einnahmen","Stadionkosten"};
|
||||
for(size_t i=0;i<6;++i)out+=btn("stadium-curve","<span class=\"stadium-curve-color\" style=\"background-color:"+std::string(colors[i])+";\"></span><span class=\"stadium-curve-label\">"+names[i]+"</span>","stadium-curve","id=\"stadium-curve-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" aria-pressed=\""+(stadium_view_.at("curves")[i].get<bool>()?"true":"false")+"\" style=\""+rect((i%3)*754.666666667,660+(i/3)*90,732.666666667,74)+"\"");
|
||||
for(int i=0;i<2;++i)out+=btn("stadium-scale",i?"Relativ":"Absolut","stadium-scale","id=\"stadium-scale-"+std::to_string(i)+"\" data-id=\""+std::to_string(i)+"\" aria-pressed=\""+(stadium_view_.at("relative").get<bool>()==bool(i)?"true":"false")+"\" style=\""+rect(2282,660+i*90,330,74)+"\"");
|
||||
const auto factor=finance_currency_factor(*snapshot.world);const auto currency=snapshot.world->manifest().value("currency",Json::object());const auto cash=[&](int64_t n){return money(n*factor,currency);};
|
||||
std::vector<std::string> other_clubs;for(const auto *c:snapshot.world->clubs())if(c->value("id","")!=club&&other_clubs.size()<2&&c->value("type",std::string("club"))=="club")other_clubs.push_back(snapshot.world->name(*c));
|
||||
const std::array<std::array<std::string,4>,6> rows{{{{"","Liga","DFB-Pokal","Europapokal"}},{{"Max. Zuschauer","34.800 · "+(other_clubs.size()>0?other_clubs[0]:"—"),"35.200 · "+(other_clubs.size()>1?other_clubs[1]:"—"),"–"}},{{"Max. Einnahmen",cash(452400),cash(457600),"–"}},{{"Heimspiele","15","3","0"}},{{"Ø Zuschauer","28.450","31.200","–"}},{{"Ges. Einnahmen",cash(5547750),cash(1216800),"–"}}}};
|
||||
out+="<div class=\"stadium-data-table\">";
|
||||
for(size_t i=0;i<6;++i){out+="<div class=\"stadium-data-row "+std::string(i==0?"head":i%2?"striped":"")+"\">";for(size_t k=0;k<4;++k)out+="<div class=\"stadium-data-cell "+std::string(k?"":"first")+"\"><span>"+esc(rows[i][k])+"</span></div>";out+="</div>";}out+="</div>";
|
||||
const int ticket=snapshot.state.at("ticket").get<int>();
|
||||
out+="<p class=\"stadium-required\"><span>Benötigter Zuschauerschnitt bei "+esc(cash(ticket))+" Eintritt: </span><span class=\"stadium-required-value\">"+(ticket?number((94000+ticket-1)/ticket):"–")+"</span></p><div class=\"stadium-ticket\"><strong>Eintritt:</strong>";
|
||||
for(int price=0;price<=25;++price)out+=btn("stadium-ticket",(price<10?"0":"")+std::to_string(price),"stadium-ticket-price","id=\"stadium-ticket-"+std::to_string(price)+"\" data-id=\""+std::to_string(price)+"\" aria-pressed=\""+(price==ticket?"true":"false")+"\" aria-label=\"Eintritt "+std::to_string(price)+" "+esc(money_unit())+"\"");
|
||||
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\"");
|
||||
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>";
|
||||
out+=btn("stadium-data","Stadion-Daten","stadium-nav-button","id=\"stadium-data\"");
|
||||
}
|
||||
return out+"</nav></div>"+render_stadium_dialog();
|
||||
}
|
||||
|
||||
std::string App::render_stadium_dialog() {
|
||||
stadium_view_defaults(stadium_view_);if(stadium_view_.at("dialog")=="")return "";
|
||||
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));
|
||||
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;
|
||||
const auto title=block?"Block "+row.at("letter").get<std::string>()+" · "+row.at("name").get<std::string>():row.at("name").get<std::string>();
|
||||
std::string out="<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,(1864-height)/2,2160,height)+"\"><h2 id=\"stadium-draft-title\">"+esc(title)+" ausbauen</h2><div class=\"stadium-draft-summary\"><span>POC-Budget: "+esc(stadium_money(overview.at("budget"),*s.world))+"</span><span>Bauzeit: "+std::to_string(q.value("weeks",row.at("weeks").get<int>()))+" Wochen</span></div>";
|
||||
if(block) {
|
||||
out+="<section class=\"stadium-place-field\"><strong>Block "+row.at("letter").get<std::string>()+"</strong><p>Aktuell: "+number(row.at("places").get<int64_t>())+" Plätze</p><span class=\"stadium-place-label\"><span>Neue Gesamtplätze</span></span>"+btn("stadium-places-editor",std::to_string(d.at("places").get<int64_t>()),"stadium-place-number amount-trigger","id=\"stadium-place-number\"")+"<input type=\"range\" id=\"stadium-place-range\" min=\""+std::to_string(row.at("places").get<int>())+"\" max=\""+std::to_string(row.at("max_places").get<int>())+"\" step=\"1000\" value=\""+std::to_string(d.at("places").get<int>())+"\" aria-label=\"Neue Gesamtplätze\"/></section><div class=\"stadium-features\">";
|
||||
const std::array<const char*,2> features{"seats","roof"},labels{"Sitzplätze","Überdachung"};
|
||||
for(size_t i=0;i<2;++i){const bool built=row.at(features[i]).get<bool>();const bool checked=d.at(features[i]).get<bool>();out+="<label class=\"stadium-feature-row\"><input type=\"checkbox\" id=\"stadium-feature-"+std::string(features[i])+"\" data-stadium-feature=\""+features[i]+"\" "+(checked?"checked=\"checked\" ":"")+(built?"disabled=\"disabled\" ":"")+"/><span class=\"stadium-feature-image\" id=\"stadium-feature-image-"+std::string(features[i])+"\">"+picture(renderer_.diagram("stadium-feature-"+std::string(features[i])+(checked?"-built-":"-empty-")+theme_,stadium_feature_svg(features[i],checked,theme_),232),116,116)+"</span><span>"+labels[i]+"</span></label>";}
|
||||
out+="</div><dl class=\"stadium-costs\">";
|
||||
const std::array<const char*,3> keys{"placesCost","seatsCost","roofCost"},names{"Neue Plätze","Sitzplätze","Überdachung"};
|
||||
for(size_t i=0;i<3;++i)out+="<div class=\"stadium-cost-row\" style=\"top:"+scalar(i*51.5)+"dp;\"><dt>"+std::string(names[i])+"</dt><dd id=\"stadium-cost-"+keys[i]+"\">"+esc(stadium_money(stadium_field(q,keys[i]),*s.world))+"</dd></div>";
|
||||
out+="</dl>";
|
||||
} else {
|
||||
const double total=options.size()*640+(options.size()-1)*28,left=52+(2052-total)/2;
|
||||
for(size_t i=0;i<options.size();++i) {
|
||||
const auto &o=options[i];const bool selected=d.at("level")==o.level;const double group_offset=(option_h-o.height-159)/2;
|
||||
// Facility options share the same source cells; overlays are rendered at the natural art size.
|
||||
std::string art=picture(o.art,592,o.height);
|
||||
if(index==1) {
|
||||
const double x=o.level==1?.28:o.level==3?.13:o.level==4?.12:.10,y=o.level==3?.24:o.level==4?.63:.30,rw=o.level==1?.40:o.level==3?.72:o.level==4?.74:.60,rh=o.level==1?.28:o.level==3?.24:o.level==4?.18:.45;
|
||||
const std::string color=o.level==2?"#ff593e":theme_=="silver"?(o.level==4?"#233443":"#805b18"):theme_=="matchday"?(o.level==4?"#efeded":"#e1c68b"):o.level==3?"#dfdc67":"#d9e8ef";
|
||||
const auto svg=stadium_svg("<text x=\"50%\" y=\"50%\" text-anchor=\"middle\" dominant-baseline=\"central\" font-family=\"monospace\" font-size=\"33\" letter-spacing=\"4\" fill=\""+color+"\">2 : 1</text>",592*rw,o.height*rh);
|
||||
art+="<span class=\"stadium-art-overlay\" style=\""+rect(592*x,o.height*y,592*rw,o.height*rh)+"\">"+picture(renderer_.diagram("stadium-option-score-"+std::to_string(o.level)+"-"+theme_,svg,1536),592*rw,o.height*rh)+"</span>";
|
||||
}
|
||||
if(index==5){const std::string color=theme_=="silver"?"#805b18":theme_=="matchday"?"#e1c68b":"#e0c99b";const auto svg=stadium_svg("<path d=\"m24 3 6 13 15 2-11 11 3 15-13-7-13 7 3-15L3 18l15-2Z\" fill=\""+color+"\"/>",48,48);const int n=o.level-1;for(int j=0;j<n;++j)art+="<span class=\"stadium-art-overlay\" style=\""+rect((592-(n*52+(n-1)*8))/2+j*60,(o.height-52)/2,52,52)+"\">"+picture(renderer_.diagram("stadium-option-star-"+theme_,svg,104),52,52)+"</span>";}
|
||||
out+=btn("stadium-option","<span class=\"stadium-option-art\" style=\"height:"+scalar(o.height)+"dp;top:"+scalar(22+group_offset)+"dp;\">"+art+"</span><strong style=\"top:"+scalar(22+o.height+20+group_offset)+"dp;\">"+esc(row.at("levels")[size_t(o.level)].get<std::string>())+"</strong><span class=\"stadium-option-price\" style=\"top:"+scalar(22+o.height+20+37+20+group_offset)+"dp;\">"+esc(stadium_money(Json(int64_t(o.level-row.at("level").get<int>())*row.at("rate").get<int64_t>()),*s.world))+"</span>","stadium-option","id=\"stadium-option-"+std::to_string(o.level)+"\" data-id=\""+std::to_string(o.level)+"\" aria-pressed=\""+(selected?"true":"false")+"\" style=\""+rect(left+i*668,174,640,option_h)+"\"");
|
||||
}
|
||||
}
|
||||
const auto custom=stadium_view_.at("feedback").get<std::string>();const auto feedback=custom.empty()?stadium_feedback(q,stadium_view_.at("invalid_places").get<bool>()):custom;
|
||||
out+="<div class=\"stadium-draft-total\" style=\"top:"+scalar(total_top)+"dp;\"><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:"+scalar(feedback_top)+"dp;\">"+esc(feedback)+"</p><nav class=\"stadium-draft-actions\" style=\"top:"+scalar(actions_top)+"dp;\">"+btn("stadium-build","Bauen","stadium-dialog-action primary","id=\"stadium-build\" "+std::string(!q.value("can_build",false)||stadium_view_.at("invalid_places").get<bool>()?"disabled=\"disabled\"":""))+btn("stadium-cancel","Abbrechen","stadium-dialog-action","id=\"stadium-cancel\"")+"</nav></section></div>";
|
||||
return out;
|
||||
}
|
||||
+20
-2
@@ -16,6 +16,7 @@
|
||||
#include "modern/ui/demo_transfer.hpp"
|
||||
#include "modern/ui/demo_career_reports.hpp"
|
||||
#include "modern/ui/demo_rankings.hpp"
|
||||
#include "modern/ui/demo_stadium.hpp"
|
||||
#include "modern/ui/desktop.hpp"
|
||||
#include "modern/ui/gui_assets.hpp"
|
||||
#include "modern/ui/model.hpp"
|
||||
@@ -369,6 +370,10 @@ class App final : public Rml::EventListener {
|
||||
uint64_t transfer_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> transfer_world_;
|
||||
Json career_view_ = Json::object(), rankings_view_ = Json::object();
|
||||
Json stadium_view_ = Json::object();
|
||||
uint64_t stadium_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> stadium_world_;
|
||||
const DataSource *stadium_source_ = nullptr;
|
||||
float device_ratio_ = 1.f;
|
||||
Json desktop_ = Json::object(), saved_desktop_ = Json::object(),
|
||||
options_ = Json::object();
|
||||
@@ -588,6 +593,8 @@ class App final : public Rml::EventListener {
|
||||
transfer_dialog_.clear(); transfer_picker_.clear(); transfer_notice_.clear(); transfer_return_focus_.clear();
|
||||
transfer_poach_league_.clear(); transfer_poach_club_.clear(); transfer_world_.reset(); transfer_revision_ = 0;
|
||||
career_view_ = Json::object(); rankings_view_ = Json::object();
|
||||
stadium_view_ = Json::object(); stadium_revision_ = 0;
|
||||
stadium_world_.reset(); stadium_source_ = nullptr;
|
||||
advertising_selected_ = -1; advertising_offer_ = 0; advertising_revision_ = 0; advertising_world_.reset();
|
||||
toto_column_ = 0; toto_dialog_.clear();
|
||||
for (auto &focus : toto_focus_) focus = {0, 1};
|
||||
@@ -758,6 +765,11 @@ class App final : public Rml::EventListener {
|
||||
bool rankings_event(Rml::Event &);
|
||||
void rankings_remember_scroll();
|
||||
void rankings_restore_scroll();
|
||||
std::string render_stadium();
|
||||
std::string render_stadium_dialog();
|
||||
void sync_stadium_draft();
|
||||
bool stadium_action(const std::string &, Rml::Element *);
|
||||
bool stadium_event(Rml::Event &);
|
||||
std::string render_almanac();
|
||||
bool almanac_action(const std::string &, Rml::Element *);
|
||||
std::string render_indoor();
|
||||
@@ -833,6 +845,10 @@ class App final : public Rml::EventListener {
|
||||
if (menu_ != last_rendered_menu_) {
|
||||
planning_dialog_.clear();
|
||||
career_view_["dialog"] = ""; career_view_["return_focus"] = "";
|
||||
stadium_view_["dialog"] = ""; stadium_view_["draft"] = Json();
|
||||
stadium_view_["return_focus"] = ""; stadium_revision_ = 0;
|
||||
stadium_view_["ticket_return_focus"] = "";
|
||||
stadium_world_.reset(); stadium_source_ = nullptr;
|
||||
lineup_drag_ = Json(); lineup_drag_world_.reset(); lineup_ignore_click_ = false;
|
||||
transfer_dialog_.clear(); transfer_draft_ = transfer_search_draft_ = Json(); transfer_picker_.clear();
|
||||
transfer_world_.reset(); transfer_revision_ = 0; transfer_return_focus_.clear();
|
||||
@@ -886,10 +902,10 @@ class App final : public Rml::EventListener {
|
||||
setting_menu_markup_ = true;
|
||||
element("canvas")->SetInnerRML(markup);
|
||||
setting_menu_markup_ = false;
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty()) {
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty() || !stadium_view_.value("dialog", "").empty()) {
|
||||
Rml::ElementList behind;
|
||||
doc_->QuerySelectorAll(behind,
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,.window .titlebar button");
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,#stadium-underlay button,#stadium-underlay input,#stadium-underlay select,.window .titlebar button");
|
||||
for (auto *node : behind)
|
||||
node->SetProperty("pointer-events", "none");
|
||||
}
|
||||
@@ -1316,6 +1332,8 @@ public:
|
||||
#include "modern/ui/career_report_controls.inc"
|
||||
#include "modern/ui/rankings_screens.inc"
|
||||
#include "modern/ui/rankings_controls.inc"
|
||||
#include "modern/ui/stadium_screens.inc"
|
||||
#include "modern/ui/stadium_controls.inc"
|
||||
} // namespace
|
||||
bool is_modern_world(const fs::path &file) {
|
||||
try {
|
||||
|
||||
Reference in new issue
Block a user