Show recorded manager achievements and career history (by Codex)
This commit is contained in:
1 parent
179cd970ad
commit
9101770614
18 files changed
+442
-29
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 crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp model.cpp demo_career.cpp demo_national_ui.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_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
|
||||
add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp model.cpp demo_career.cpp demo_national_ui.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_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.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_mods STATIC mod_library.cpp)
|
||||
@@ -49,7 +49,7 @@ foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss report
|
||||
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
|
||||
endforeach()
|
||||
|
||||
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection)
|
||||
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection)
|
||||
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
|
||||
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
|
||||
if(MSVC)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
bool App::career_report_action(const std::string &action,Rml::Element *target) {
|
||||
if(action!="career-report-page"&&action!="career-history"&&action!="career-history-close")return false;
|
||||
if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return true;
|
||||
const int page=career_page(career_view_);
|
||||
const int page=career_page(career_view_,career_max_page());
|
||||
if(action=="career-history-close") {
|
||||
if(career_view_.at("dialog")!="history")return true;
|
||||
focus_after_render_=career_view_.at("return_focus").get<std::string>();
|
||||
@@ -11,9 +11,7 @@ bool App::career_report_action(const std::string &action,Rml::Element *target) {
|
||||
refresh();return true;
|
||||
}
|
||||
if(career_view_.at("dialog")!=""||!target)return true;
|
||||
const auto snapshot=snap();
|
||||
if(!snapshot.world)return true;
|
||||
const auto data=demo_achievements(*snapshot.world,snapshot.state,page);
|
||||
const auto data=achievements_data(page);
|
||||
if(!data.value("ok",false)||!data.value("available",false))return true;
|
||||
if(action=="career-history") {
|
||||
career_view_["dialog"]="history";career_view_["return_focus"]=target->GetId();
|
||||
@@ -22,15 +20,15 @@ bool App::career_report_action(const std::string &action,Rml::Element *target) {
|
||||
}
|
||||
const auto id=target->GetAttribute<Rml::String>("data-id","");
|
||||
if(id!="older"&&id!="newer")return true;
|
||||
const int next=std::clamp(page+(id=="older"?1:-1),0,4);
|
||||
const int next=std::clamp(page+(id=="older"?1:-1),0,career_max_page());
|
||||
if(next==page)return true;
|
||||
career_view_["page"]=next;
|
||||
focus_after_render_=(id=="older"&&next==4)?"career-page-newer":(id=="newer"&&next==0)?"career-page-older":target->GetId();
|
||||
focus_after_render_=(id=="older"&&next==career_max_page())?"career-page-newer":(id=="newer"&&next==0)?"career-page-older":target->GetId();
|
||||
refresh();return true;
|
||||
}
|
||||
bool App::career_report_event(Rml::Event &event) {
|
||||
if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return false;
|
||||
career_page(career_view_);
|
||||
career_page(career_view_,career_max_page());
|
||||
if(career_view_.at("dialog")!="history")return false;
|
||||
const auto type=event.GetType();const bool keyboard=type=="keydown";
|
||||
const auto key=keyboard?Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier",0)):Rml::Input::KI_UNKNOWN;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
int career_page(Json &view) {
|
||||
int career_page(Json &view,int maximum=4) {
|
||||
if(!view.is_object())view=Json::object();
|
||||
if(!view.contains("page")||!view.at("page").is_number_integer()||view.at("page")<0||view.at("page")>4)view["page"]=0;
|
||||
if(!view.contains("page")||!view.at("page").is_number_integer()||view.at("page")<0||view.at("page")>maximum)view["page"]=0;
|
||||
for(const auto *key:{"dialog","return_focus","bound_club"})if(!view.contains(key)||!view.at(key).is_string())view[key]="";
|
||||
if(view.at("dialog")!=""&&view.at("dialog")!="history")view["dialog"]="";
|
||||
return view.at("page").get<int>();
|
||||
@@ -21,12 +21,13 @@ std::string career_svg(const Json &chart,const std::string &theme) {
|
||||
std::string svg="<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 -32 2240 346\">";
|
||||
if(!kind) {
|
||||
constexpr std::array<const char*,4> names{"Bundesliga","2. Bundesliga","3. Bundesliga","Regionalliga"};
|
||||
for(int i=0;i<4;++i)svg+="<rect x=\"70\" y=\""+std::to_string(i*49+12)+"\" width=\"2110\" height=\"49\" fill=\""+bar_tiers[size_t(i)]+"\" opacity=\".12\"/><text x=\"2135\" y=\""+std::to_string(i*49+43)+"\" text-anchor=\"end\" font-family=\"Arial,sans-serif\" font-size=\"25\" fill=\""+text_tiers[size_t(i)]+"\">"+names[size_t(i)]+"</text>";
|
||||
for(int i=0;i<4;++i)svg+="<rect x=\"70\" y=\""+std::to_string(i*49+12)+"\" width=\"2110\" height=\"49\" fill=\""+bar_tiers[size_t(i)]+"\" opacity=\".12\"/><text x=\"2135\" y=\""+std::to_string(i*49+43)+"\" text-anchor=\"end\" font-family=\"Arial,sans-serif\" font-size=\"25\" fill=\""+text_tiers[size_t(i)]+"\">"+(chart.contains("bands")?chart.at("bands")[size_t(i)].get<std::string>():std::string(names[size_t(i)]))+"</text>";
|
||||
} else svg+="<path d=\"M70 126H2180M70 218H2180\" fill=\"none\" stroke=\""+grid+"\" stroke-width=\"2\"/>";
|
||||
size_t i=0;
|
||||
for(const auto &row:chart.at("seasons")) {
|
||||
if(!row.at("value").is_number_integer()||(!kind&&!row.at("tier").is_number_integer())) {const int x=171+int(i++)*232;svg+="<text x=\""+std::to_string(x)+"\" y=\"207\" text-anchor=\"middle\" font-family=\"Arial,sans-serif\" font-size=\"26\" fill=\""+text+"\">—</text><text x=\""+std::to_string(x)+"\" y=\"267\" text-anchor=\"middle\" font-family=\"Arial,sans-serif\" font-size=\"28\" fill=\""+muted+"\">"+esc(row.at("season").get<std::string>())+"</text>";continue;}
|
||||
const int value=row.at("value").get<int>(),tier=!kind?row.at("tier").get<int>():1;
|
||||
const double height=!kind?std::max(8.0,218-((tier-1)*49+18+(value-1)/19.0*29))
|
||||
const double height=!kind?std::max(8.0,218-((tier-1)*49+18+(value-1)/(row.contains("max_position")?std::max(1.,row.at("max_position").get<double>()-1):19.0)*29))
|
||||
:value?22+(6-std::log2(double(value)))*27:3;
|
||||
const int x=124+int(i)*232;
|
||||
const std::string fill=!kind?bar_tiers[size_t(tier-1)]:kind==1?"#8cacc9":"#c5b384";
|
||||
@@ -41,8 +42,8 @@ std::string career_cell(const std::string &text,const std::string &css) {
|
||||
} // namespace
|
||||
|
||||
std::string App::render_achievements() {
|
||||
const auto snapshot=snap();const int page=career_page(career_view_);
|
||||
const auto data=snapshot.world?demo_achievements(*snapshot.world,snapshot.state,page):Json{{"ok",false},{"available",false}};
|
||||
const int page=career_page(career_view_,career_max_page());
|
||||
const auto data=achievements_data(page);
|
||||
const bool ready=data.value("ok",false)&&data.value("available",false);
|
||||
const auto club=ready?data.at("club").get<std::string>():std::string();
|
||||
if(career_view_.at("dialog")=="history"&&career_view_.at("bound_club")!=club) {
|
||||
@@ -52,14 +53,14 @@ std::string App::render_achievements() {
|
||||
if(ready) {
|
||||
for(const auto &chart:data.at("charts")) {
|
||||
const int kind=chart.at("kind").get<int>();const auto &last=chart.at("latest");
|
||||
const auto summary=(kind==0?last.at("tier_name").get<std::string>()+" · ":std::string())+last.at("label").get<std::string>();
|
||||
const auto summary=(kind==0?last.at("tier_name").get<std::string>()+" · ":std::string())+last.at("label").get<std::string>()+(engine_mode_&&last.at("completed")==false?" · Zwischenstand":"");
|
||||
const auto svg=career_svg(chart,theme_);
|
||||
out+="<section class=\"career-chart\" style=\""+rect(0,150+kind*(531.333333333),2612,509.333333333)+"\"><header><h2>"+esc(chart.at("title").get<std::string>())+"</h2><div class=\"career-chart-summary\"><span class=\"career-chart-year\">"+esc(last.at("season").get<std::string>())+"</span><span class=\"career-chart-result\">"+esc(summary)+"</span></div></header><div class=\"career-chart-art\" aria-label=\""+esc("Fiktive "+chart.at("title").get<std::string>()+"-Ergebnisse")+"\">"+picture(renderer_.diagram("career-chart-"+std::to_string(kind),svg,4480),2548,403.333333333)+"</div></section>";
|
||||
out+="<section class=\"career-chart\" style=\""+rect(0,150+kind*(531.333333333),2612,509.333333333)+"\"><header><h2>"+esc(chart.at("title").get<std::string>())+"</h2><div class=\"career-chart-summary\"><span class=\"career-chart-year\">"+esc(last.at("season").get<std::string>())+"</span><span class=\"career-chart-result\">"+esc(summary)+"</span></div></header><div class=\"career-chart-art\" aria-label=\""+esc(std::string(engine_mode_?"Erfasste ":"Fiktive ")+chart.at("title").get<std::string>()+"-Ergebnisse")+"\">"+picture(renderer_.diagram("career-chart-"+std::to_string(kind),svg,4480),2548,403.333333333)+"</div></section>";
|
||||
}
|
||||
} else out+="<p class=\"career-report-empty\">Für den aktuellen Verein ist keine Saisonvorschau verfügbar.</p>";
|
||||
out+="<nav class=\"career-report-actions\">"+btn("career-report-page","‹ Ältere Saisons","career-action","id=\"career-page-older\" data-id=\"older\" "+std::string(!ready||page==4?"disabled=\"disabled\"":""))+btn("career-history","Vereinsgeschichte","career-action","id=\"career-history\" "+std::string(!ready?"disabled=\"disabled\"":""))+btn("career-report-page","Neuere Saisons ›","career-action","id=\"career-page-newer\" data-id=\"newer\" "+std::string(!ready||page==0?"disabled=\"disabled\"":""))+"</nav></div>";
|
||||
} else out+="<p class=\"career-report-empty\">"+std::string(engine_mode_?"Noch keine Saisonergebnisse erfasst.":"Für den aktuellen Verein ist keine Saisonvorschau verfügbar.")+"</p>";
|
||||
out+="<nav class=\"career-report-actions\">"+btn("career-report-page","‹ Ältere Saisons","career-action","id=\"career-page-older\" data-id=\"older\" "+std::string(!ready||page==career_max_page()?"disabled=\"disabled\"":""))+btn("career-history",engine_mode_?"Karriereverlauf":"Vereinsgeschichte","career-action","id=\"career-history\" "+std::string(!ready?"disabled=\"disabled\"":""))+btn("career-report-page","Neuere Saisons ›","career-action","id=\"career-page-newer\" data-id=\"newer\" "+std::string(!ready||page==0?"disabled=\"disabled\"":""))+"</nav></div>";
|
||||
if(ready&&career_view_.at("dialog")=="history") {
|
||||
out+="<div class=\"career-history-layer\" id=\"career-history-layer\"><section class=\"career-history-dialog\" id=\"career-history-dialog\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"career-history-title\"><h2 id=\"career-history-title\">Vereinsgeschichte</h2><div class=\"career-history-club\">"+report_club_button(club)+"<span>Zwölf abgeschlossene Saisons · fiktive Ergebnisse</span></div><div class=\"career-history-table\" id=\"career-history-scroll\" role=\"table\"><div class=\"career-history-row career-history-head\">";
|
||||
out+="<div class=\"career-history-layer\" id=\"career-history-layer\"><section class=\"career-history-dialog\" id=\"career-history-dialog\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"career-history-title\"><h2 id=\"career-history-title\">"+std::string(engine_mode_?"Karriereverlauf":"Vereinsgeschichte")+"</h2><div class=\"career-history-club\">"+(engine_mode_?std::string():report_club_button(club))+"<span>"+(engine_mode_?esc(data.at("history_caption").get<std::string>()):"Zwölf abgeschlossene Saisons · fiktive Ergebnisse")+"</span></div><div class=\"career-history-table\" id=\"career-history-scroll\" role=\"table\"><div class=\"career-history-row career-history-head\">";
|
||||
const std::array<const char*,4> heads{"Saison","Meisterschaft","DFB-Pokal","Europapokal"};
|
||||
for(int i=0;i<4;++i)out+=career_cell(heads[size_t(i)],i?"history-result":"history-season history-heading-season");
|
||||
out+="</div>";
|
||||
|
||||
@@ -0,0 +1,179 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// OpenBMH deviates from the original: shows recorded manager history between
|
||||
// seasons without inventing future results.
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <set>
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
void check(bool yes, const char *text) {
|
||||
if (!yes)
|
||||
throw editor::Error(text);
|
||||
}
|
||||
std::string season(int year) {
|
||||
return std::to_string(year) + "/" + ((year + 1) % 100 < 10 ? "0" : "") +
|
||||
std::to_string((year + 1) % 100);
|
||||
}
|
||||
} // namespace
|
||||
Json engine_achievements_projection(const Json &bundle, const Json &leagues,
|
||||
int page) {
|
||||
validate_engine_desk(bundle);
|
||||
const auto &read = bundle.at("achievements"),
|
||||
&meta = bundle.at("desktop").at("meta");
|
||||
check(read.value("messageType", "") == "snapshot" &&
|
||||
read.at("data").value("kind", "") == "achievements",
|
||||
"Erfolge sind hier nicht verfügbar.");
|
||||
for (const auto *key : {"contractVersion", "careerId", "worldId",
|
||||
"worldRevision", "stateRevision", "scope"})
|
||||
check(read.at("meta").at(key) == meta.at(key),
|
||||
"Der Karrierekontext hat sich geändert.");
|
||||
const auto &d = read.at("data");
|
||||
check(meta.at("scope").at("role") == "club" &&
|
||||
d.at("managerId") == meta.at("scope").at("managerId") &&
|
||||
d.at("teamId") == meta.at("scope").at("teamId"),
|
||||
"Die Erfolgsaufzeichnungen gehören einem anderen Manager.");
|
||||
check(d.at("records").is_array() && d.at("records").size() <= 50,
|
||||
"Ungültiger Karriereumfang.");
|
||||
const int max_page =
|
||||
d.at("records").empty() ? 0 : int((d.at("records").size() - 1) / 8);
|
||||
check(page >= 0 && page <= max_page, "Diese Karriereseite existiert nicht.");
|
||||
Json result = {
|
||||
{"ok", true},
|
||||
{"available", d.at("available") == true && !d.at("records").empty()},
|
||||
{"fictional", false},
|
||||
{"club", d.at("teamId")},
|
||||
{"manager", bundle.at("desktop").at("data").at("manager").at("name")},
|
||||
{"page", page},
|
||||
{"max_page", max_page},
|
||||
{"charts", Json::array()},
|
||||
{"history", Json::array()},
|
||||
{"range", "—"}};
|
||||
if (!result.at("available").get<bool>())
|
||||
return result;
|
||||
const int current = d.at("currentSeasonYear");
|
||||
std::set<int> years;
|
||||
std::array<std::set<std::string>, 4> bands;
|
||||
for (const auto &[id, l] : leagues.items()) {
|
||||
(void)id;
|
||||
const auto t = l.value("tier", Json());
|
||||
if (t.is_number_integer() && t >= 1 && t <= 4)
|
||||
bands[size_t(t.get<int>() - 1)].insert(l.at("name").get<std::string>());
|
||||
}
|
||||
Json history = Json::array();
|
||||
for (const auto &record : d.at("records")) {
|
||||
const int year = record.at("year");
|
||||
check(year >= 1 && year <= current && years.insert(year).second,
|
||||
"Doppeltes oder zukünftiges Karrierejahr.");
|
||||
check(record.at("completed") == Json(year < current),
|
||||
"Der Saisonstatus ist widersprüchlich.");
|
||||
const auto label = season(year);
|
||||
Json values = Json::array();
|
||||
const auto &league = record.at("league");
|
||||
Json value = league.at("position"), tier = nullptr;
|
||||
std::string league_name = "—",
|
||||
placement = league.value("label", std::string());
|
||||
if (placement.empty())
|
||||
placement = "Nicht erfasst";
|
||||
if (!league.at("leagueId").is_null()) {
|
||||
const auto id = league.at("leagueId").get<std::string>();
|
||||
check(leagues.contains(id),
|
||||
"Historische Liga fehlt im aktuellen Regelprofil.");
|
||||
const auto &l = leagues.at(id);
|
||||
check(
|
||||
l.at("tier").is_number_integer() && l.at("tier").get<int>() >= 1 &&
|
||||
l.at("tier").get<int>() <= 4,
|
||||
"Die Spielklasse kann in diesem Diagramm nicht dargestellt werden.");
|
||||
tier = l.at("tier");
|
||||
league_name = l.at("name");
|
||||
check(value.is_number_integer() &&
|
||||
league.at("teams").is_number_integer() && value >= 1 &&
|
||||
value <= league.at("teams"),
|
||||
"Ungültige historische Platzierung.");
|
||||
placement = std::to_string(value.get<int>()) + ". Platz";
|
||||
bands[size_t(tier.get<int>() - 1)].insert(league_name);
|
||||
} else
|
||||
check(value.is_null(), "Platzierung ohne Liga.");
|
||||
values.push_back({{"year", year},
|
||||
{"season", label},
|
||||
{"value", value},
|
||||
{"max_position", league.at("teams")},
|
||||
{"tier", tier},
|
||||
{"tier_name", league_name},
|
||||
{"label", placement},
|
||||
{"caption", value.is_number_integer()
|
||||
? std::to_string(value.get<int>()) + "."
|
||||
: "—"},
|
||||
{"winner", value == 1},
|
||||
{"completed", record.at("completed")},
|
||||
{"fictional", false}});
|
||||
for (const auto *key : {"cup", "europe"}) {
|
||||
const auto &cup = record.at(key);
|
||||
const int stage = cup.at("stage");
|
||||
check(stage >= 0 && stage <= 31 && cup.at("winner") == Json(stage == 7),
|
||||
"Ungültiger Pokalstatus.");
|
||||
Json progress = stage == 0 ? Json(0)
|
||||
: stage <= 7 ? Json(1 << (7 - stage))
|
||||
: Json();
|
||||
const auto text = cup.at("label").get<std::string>();
|
||||
const std::array<const char *, 8> captions{
|
||||
"–", "1. Runde", "2. Runde", "Achtelfinale", "Viertelfinale",
|
||||
"Halbfinale", "Finale", "Sieger"};
|
||||
values.push_back({{"year", year},
|
||||
{"season", label},
|
||||
{"value", progress},
|
||||
{"tier", nullptr},
|
||||
{"tier_name", nullptr},
|
||||
{"label", text.empty() ? "Nicht erfasst" : text},
|
||||
{"caption", stage <= 7 ? captions[size_t(stage)] : "—"},
|
||||
{"winner", cup.at("winner")},
|
||||
{"completed", record.at("completed")},
|
||||
{"fictional", false}});
|
||||
}
|
||||
history.push_back({{"year", year},
|
||||
{"season", label},
|
||||
{"completed", record.at("completed")},
|
||||
{"results", values}});
|
||||
}
|
||||
std::sort(history.begin(), history.end(), [](const auto &a, const auto &b) {
|
||||
return a.at("year") < b.at("year");
|
||||
});
|
||||
const size_t end = history.size() - size_t(page) * 8,
|
||||
start = end > 8 ? end - 8 : 0;
|
||||
result["range"] =
|
||||
start + 1 == end
|
||||
? history[start].at("season")
|
||||
: Json(history[start].at("season").get<std::string>() + " – " +
|
||||
history[end - 1].at("season").get<std::string>());
|
||||
const std::array<const char *, 3> titles{"Meisterschaft", "DFB-Pokal",
|
||||
"Europapokal"};
|
||||
Json labels = Json::array();
|
||||
for (size_t i = 0; i < 4; ++i) {
|
||||
std::string name;
|
||||
for (const auto &n : bands[i]) {
|
||||
if (!name.empty())
|
||||
name += " · ";
|
||||
name += n;
|
||||
}
|
||||
labels.push_back(name.empty() ? "Spielklasse " + std::to_string(i + 1)
|
||||
: name);
|
||||
}
|
||||
for (size_t kind = 0; kind < 3; ++kind) {
|
||||
Json rows = Json::array();
|
||||
for (size_t i = start; i < end; ++i)
|
||||
rows.push_back(history[i].at("results")[kind]);
|
||||
result["charts"].push_back({{"kind", kind},
|
||||
{"title", titles[kind]},
|
||||
{"latest", rows.back()},
|
||||
{"seasons", rows},
|
||||
{"bands", labels}});
|
||||
}
|
||||
std::reverse(history.begin(), history.end());
|
||||
result["history"] = history;
|
||||
result["history_caption"] =
|
||||
std::to_string(history.size()) + " erfasste Saison" +
|
||||
(history.size() == 1 ? "" : "s") + " · Karriere von " +
|
||||
result.at("manager").get<std::string>();
|
||||
return result;
|
||||
}
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,26 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
int App::career_max_page() const {
|
||||
if (!engine_mode_)
|
||||
return 4;
|
||||
const auto &r = engine_data_.at("achievements");
|
||||
return r.value("messageType", "") == "snapshot" &&
|
||||
!r.at("data").at("records").empty()
|
||||
? int((r.at("data").at("records").size() - 1) / 8)
|
||||
: 0;
|
||||
}
|
||||
Json App::achievements_data(int page) const {
|
||||
if (!engine_mode_) {
|
||||
const auto s = snap();
|
||||
return s.world ? demo_achievements(*s.world, s.state, page)
|
||||
: Json{{"ok", false}, {"available", false}};
|
||||
}
|
||||
const auto *club = world_->find(
|
||||
"clubs", engine_data_.at("desktop").at("meta").at("scope").at("teamId"));
|
||||
const auto nation = club ? club->value("nation", Json()) : Json();
|
||||
Json leagues = Json::object();
|
||||
for (const auto &l : world_->rows("competitions"))
|
||||
if (l.value("type", "") == "league" && l.value("nation", Json()) == nation)
|
||||
leagues[l.at("id").get<std::string>()] = {
|
||||
{"name", world_->name(l)}, {"tier", l.value("tier", Json())}};
|
||||
return engine_achievements_projection(engine_data_, leagues, page);
|
||||
}
|
||||
@@ -17,7 +17,7 @@ Json from_engine(const cli::Json &v) { return Json::parse(cli::dump_json(v)); }
|
||||
namespace {
|
||||
Json session_snapshot(modern::app::ModernSession &session,uint64_t revision) {
|
||||
Json bundle=Json::object();
|
||||
for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
|
||||
for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
|
||||
validate_engine_desk(bundle);const auto &season=bundle.at("desktop").at("meta").at("season");
|
||||
bundle["calendar"]=from_engine(session.ui_read(cli::Json::Object{{"kind","calendar"},{"from",season.at("startDate").get<std::string>()},{"until",season.at("endDate").get<std::string>()}},revision));
|
||||
bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle;
|
||||
|
||||
@@ -72,6 +72,8 @@ Json engine_toto_command(const Json &bundle,const Json "e,const std::string
|
||||
|
||||
Json engine_statistics_projection(const Json &bundle,const Json &read);
|
||||
|
||||
Json engine_achievements_projection(const Json &,const Json &,int page);
|
||||
|
||||
Json engine_transfer_filters();
|
||||
Json engine_transfer_projection(const Json &,const Json &);
|
||||
Json engine_transfer_command(const Json &,const Json &,const std::string &);
|
||||
|
||||
@@ -169,6 +169,7 @@ void App::engine_event(Rml::Event &event) {
|
||||
if(menu_=="toto"&&toto_event(event))return;
|
||||
if(menu_=="stadium"&&stadium_event(event))return;
|
||||
if(menu_=="transfer"&&transfer_event(event))return;
|
||||
if(menu_=="achievements"&&career_report_event(event))return;
|
||||
if(!engine_busy_&&popup_.empty()&&rankings_event(event))return;
|
||||
if (!engine_busy_ && popup_.empty() && engine_friendly_event(event)) return;
|
||||
if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && report_picker_event(event)) return;
|
||||
@@ -264,6 +265,7 @@ void App::engine_event(Rml::Event &event) {
|
||||
if(menu_=="toto"&&toto_action(action,node))return;
|
||||
if(menu_=="stadium"&&stadium_action(action,node))return;
|
||||
if(menu_=="transfer"&&transfer_action(action,node))return;
|
||||
if(menu_=="achievements"&&career_report_action(action,node))return;
|
||||
if (almanac_action(action,node)) return;
|
||||
if (engine_friendly_action(action, node)) return;
|
||||
if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && report_picker_action(action,node)) return;
|
||||
@@ -280,6 +282,7 @@ void App::engine_event(Rml::Event &event) {
|
||||
ticket_->open(node, device_ratio_, price.at("min"), price.at("max")); dirty_ = true;
|
||||
}
|
||||
else if (action == "engine-open" && (id == "environment" || id == "advertising")) { menu_ = id; advertising_selected_ = -1; advertising_offer_ = 0; refresh(); }
|
||||
else if(action=="engine-open"&&id=="achievements"){menu_=id;career_view_=Json::object();refresh();}
|
||||
else if(action=="engine-open"&&id=="transfer"){menu_=id;transfer_view_=Json::object();transfer_dialog_.clear();engine_transfer_sync();refresh();}
|
||||
else if(action=="engine-open"&&id=="stadium"){menu_=id;stadium_view_=Json::object();stadium_view_defaults(stadium_view_);engine_stadium_sync();refresh();}
|
||||
else if(action=="engine-open"&&id=="toto"){menu_=id;engine_toto_sync();refresh();}
|
||||
@@ -315,5 +318,5 @@ void App::engine_event(Rml::Event &event) {
|
||||
}
|
||||
Json App::engine_snapshot() const {
|
||||
return {{"mode", engine_mode_}, {"creation_busy",engine_creation_busy_}, {"busy", engine_busy_}, {"dirty", engine_dirty_}, {"fresh", engine_fresh_}, {"bundle", engine_data_},
|
||||
{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
|
||||
{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
|
||||
}
|
||||
@@ -120,7 +120,7 @@ void App::engine_render() {
|
||||
const auto route = id.substr(4);
|
||||
const bool camp_allowed = desk.at("menuAvailability").at("camps").value("status", "") == "available";
|
||||
const auto commands = meta.at("scope").value("allowedCommands", Json::array());
|
||||
const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
|
||||
const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
|
||||
out += desktop_button(id, o, "engine-open", supported && !engine_busy_);
|
||||
}
|
||||
}
|
||||
@@ -129,6 +129,7 @@ void App::engine_render() {
|
||||
if(menu_=="scorers")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"<div class=\"fill center\">"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"</div>")+"</div>";
|
||||
if(menu_=="fairplay")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"<div class=\"fill center\">"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"</div>")+"</div>";
|
||||
if(menu_=="other")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"<div class=\"fill center\">"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"</div>")+"</div>";
|
||||
if(menu_=="achievements")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Erfolge",render_achievements())+"</div>";
|
||||
if(menu_=="transfer")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Transfers",render_transfer())+"</div>";
|
||||
if(menu_=="stadium")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Stadion",render_stadium())+"</div>";
|
||||
if(menu_=="toto")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Toto",render_toto())+"</div>";
|
||||
@@ -177,6 +178,7 @@ void App::engine_render() {
|
||||
if(menu_=="stadium"&&stadium_view_.value("dialog",std::string())!=""){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#stadium-underlay button,.window>.titlebar button");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
|
||||
if(!toto_dialog_.empty()){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#toto-underlay button,.window>.titlebar button");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
|
||||
if(statistics_trophy_.contains("asset")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".window button,.window input");for(auto *n:nodes)n->SetAttribute("disabled",true);}
|
||||
if(menu_=="achievements"&&career_view_.value("dialog",std::string())=="history"){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#career-report-underlay button,#window-close");for(auto*n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
|
||||
if(menu_=="transfer"&&!transfer_dialog_.empty()){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".transfer-overview button,.transfer-overview input,#window-close");for(auto*n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}if(transfer_dialog_=="search"){for(auto*id:{"transfer-criterion-foot","transfer-criterion-type","transfer-search-trait-0","transfer-search-trait-1","transfer-search-trait-2"})if(auto*n=element(id))n->SetAttribute("disabled",true);}}
|
||||
if (engine_busy_) {
|
||||
Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input");
|
||||
|
||||
@@ -133,3 +133,6 @@
|
||||
Json transfer_data() const;
|
||||
std::string transfer_money(const Json &) const;
|
||||
bool engine_transfer_action(const std::string &,Rml::Element *);
|
||||
|
||||
int career_max_page() const;
|
||||
Json achievements_data(int) const;
|
||||
@@ -1547,6 +1547,7 @@ public:
|
||||
#include "modern/ui/engine_toto.inc"
|
||||
#include "modern/ui/engine_stadium.inc"
|
||||
#include "modern/ui/engine_transfer.inc"
|
||||
#include "modern/ui/engine_achievements.inc"
|
||||
} // namespace
|
||||
bool is_modern_world(const fs::path &file) {
|
||||
try {
|
||||
|
||||
Reference in new issue
Block a user