Expand the lineup pitch and show three squad statuses (by Codex)
This commit is contained in:
1 parent
d533f260a0
commit
f41823ef6b
9 files changed
+85
-66
No files matched your search
@@ -1,5 +1,21 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
// Shared with lineup_controls.inc: proportional outer pitch and its border-free art box.
|
||||
constexpr double lineup_pitch_width_dp = 1920.0;
|
||||
constexpr double lineup_pitch_height_dp = lineup_pitch_width_dp * 117.0 / 196.0;
|
||||
constexpr double lineup_pitch_border_dp = 2.0;
|
||||
constexpr double lineup_art_width_dp = lineup_pitch_width_dp - 2.0 * lineup_pitch_border_dp;
|
||||
constexpr double lineup_art_height_dp = lineup_pitch_height_dp - 2.0 * lineup_pitch_border_dp;
|
||||
constexpr int lineup_pitch_raster_px = 2048;
|
||||
// Current demo follows the Classic German/Modern24-slot markers:11 start,6 bench.
|
||||
// This is not a universal match rule; a future session adapter supplies its DTO status.
|
||||
// See game/lineup.cpp DispatchLiveOverview and ui/lineup_tests.cpp fixture markers.
|
||||
constexpr size_t lineup_start_limit = 11;
|
||||
constexpr size_t lineup_bench_limit = 6;
|
||||
std::string lineup_status(size_t slot) {
|
||||
return slot < lineup_start_limit ? "Startelf" :
|
||||
slot < lineup_start_limit + lineup_bench_limit ? "Ersatzbank" : "—";
|
||||
}
|
||||
std::string lineup_managed(const Snapshot &s) {
|
||||
const auto m = s.state.value("managers",Json::array());
|
||||
return m.is_array() && !m.empty() && m[0].is_object() ? m[0].value("club","") : "";
|
||||
@@ -88,7 +104,7 @@ std::string App::render_lineup() {
|
||||
out+="<span class=\"lineup-cell lineup-col-0\"><span>"+(slot<11?std::to_string(slot+1):"–")+"</span></span>";
|
||||
out+=btn("lineup-player",esc(row.at("name").get<std::string>()),"lineup-cell lineup-col-1 lineup-name",player_attrs(row,"lineup-name-"));
|
||||
std::vector<std::string> fields;
|
||||
if (!lineup_data_) fields={lineup_position(row.at("position")),lineup_value(row.at("condition")),lineup_value(row.at("technique")),lineup_value(row.at("form")),lineup_value(row.at("strength")),slot<11?"STARTELF":"BANK",row.at("nation").is_string()?row.at("nation").get<std::string>():"—",lineup_value(row.at("motivation")),lineup_value(row.at("goals")),lineup_value(row.at("assists"))};
|
||||
if (!lineup_data_) fields={lineup_position(row.at("position")),lineup_value(row.at("condition")),lineup_value(row.at("technique")),lineup_value(row.at("form")),lineup_value(row.at("strength")),lineup_status(size_t(slot)),row.at("nation").is_string()?row.at("nation").get<std::string>():"—",lineup_value(row.at("motivation")),lineup_value(row.at("goals")),lineup_value(row.at("assists"))};
|
||||
else for (const auto *key:{"age","corner","free_kick","tackling","passing","shooting","speed","teamplay","games","grade"}) fields.push_back(lineup_value(row.at(key)));
|
||||
for (size_t f=0;f<fields.size();++f) {
|
||||
std::string value=esc(fields[f]);
|
||||
@@ -120,16 +136,16 @@ std::string App::render_lineup() {
|
||||
const auto data_btn=[&]() {return btn("lineup-data",lineup_data_?"Daten A":"Daten B","lineup-tab","id=\"lineup-data\"");};
|
||||
const auto view_btn=[&]() {return btn("lineup-view",lineup_pitch_?"Team":"Spielfeld","lineup-tab","id=\"lineup-view\"");};
|
||||
if (lineup_pitch_) {
|
||||
out+="<div id=\"lineup-pitch\" class=\"lineup-pitch\" role=\"group\" aria-label=\"Spielfeld, Spieler auswählen oder ziehen\"><div class=\"lineup-field-art\">"+picture(renderer_.diagram("lineup-field",lineup_field(),1600),1486,885.4375)+"</div>";
|
||||
out+="<div id=\"lineup-pitch\" class=\"lineup-pitch\" role=\"group\" aria-label=\"Spielfeld, Spieler auswählen oder ziehen\"><div class=\"lineup-field-art\">"+picture(renderer_.diagram("lineup-field",lineup_field(),lineup_pitch_raster_px),lineup_art_width_dp,lineup_art_height_dp)+"</div>";
|
||||
if (lineup_side_=="orders" && !lineup_selected_.empty()) {
|
||||
const auto zone=lineup_zone(l,lineup_selected_);
|
||||
if (!zone.empty()) out+="<div id=\"lineup-zone\" class=\"lineup-order-zone\">"+picture(renderer_.diagram("lineup-zone",zone,1600),1486,885.4375)+"</div>";
|
||||
if (!zone.empty()) out+="<div id=\"lineup-zone\" class=\"lineup-order-zone\">"+picture(renderer_.diagram("lineup-zone",zone,lineup_pitch_raster_px),lineup_art_width_dp,lineup_art_height_dp)+"</div>";
|
||||
}
|
||||
for (size_t i=0;i<std::min(size_t(11),rows.size());++i) {
|
||||
const auto &row=rows[i], &point=l.at("points")[i];
|
||||
const bool selected=lineup_selected_==row.at("id").get<std::string>();
|
||||
const auto x=(8+point[0].get<int>()/18.0*84)*14.86-63;
|
||||
const auto y=(10+point[1].get<int>()/8.0*80)*8.854375-76.86;
|
||||
const auto x=(8+point[0].get<int>()/18.0*84)*lineup_art_width_dp/100.0-63;
|
||||
const auto y=(10+point[1].get<int>()/8.0*80)*lineup_art_height_dp/100.0-76.86;
|
||||
out+=btn("lineup-player",img(selected?"lineup.player.selected":"lineup.player.normal",126,126)+"<span class=\"lineup-jersey\">"+std::to_string(i+1)+"</span>","lineup-player",player_attrs(row,"lineup-player-")+attr("style",rect(x,y,126,126)));
|
||||
}
|
||||
out+="<div id=\"lineup-ghost\" class=\"lineup-ghost\">"+img("lineup.player.ghost",126,126)+"</div></div><aside class=\"lineup-controls\"><nav class=\"lineup-tabs\" aria-label=\"Aufstellungsansichten\">"+data_btn()+view_btn();
|
||||
@@ -143,7 +159,7 @@ std::string App::render_lineup() {
|
||||
const auto mini=lineup_mini(point,theme_);
|
||||
const std::string label=i<4?"Aufstellung "+std::to_string(i+1):"Eigene "+std::to_string(i-3);
|
||||
const auto art=picture(renderer_.diagram("lineup-mini-"+std::to_string(i)+"-"+theme_,mini,520),260,156);
|
||||
out+="<div class=\"lineup-formation-cell "+std::string(i>=4?"custom":"")+"\" style=\""+rect((slot%2)*546,(slot/2)*230,528,218)+"\">";
|
||||
out+="<div class=\"lineup-formation-cell "+std::string(i>=4?"custom":"")+"\" style=\""+rect(0,slot*221.5,652,209.5)+"\">";
|
||||
out+=btn("lineup-formation","<span class=\"lineup-mini\">"+art+"</span><span class=\"lineup-formation-label\">"+label+"</span>","lineup-formation",
|
||||
attr("id","lineup-formation-"+std::to_string(i))+attr("data-id",std::to_string(i))+attr("aria-pressed",l.at("formation")==i?"true":"false")+(point.is_null()?" disabled=\"disabled\"":""));
|
||||
if (i>=4) out+=btn("lineup-save","Merken","lineup-save",attr("id","lineup-save-"+std::to_string(i-4))+attr("data-id",std::to_string(i-4)));
|
||||
@@ -187,15 +203,9 @@ std::string App::render_lineup() {
|
||||
}
|
||||
out+=btn("lineup-auto","Automatisch","lineup-auto","id=\"lineup-auto\"")+"</section>";
|
||||
}
|
||||
out+="</div><section class=\"lineup-bench\"><h2>Ersatzbank</h2><div id=\"lineup-bench-scroll\" class=\"lineup-bench-scroll\">";
|
||||
for (size_t r=11;r<rows.size();++r) {
|
||||
const auto &row=rows[r];
|
||||
out+=btn("lineup-player","<span class=\"lineup-bench-position\">"+esc(lineup_position(row.at("position")))+"</span><span class=\"lineup-bench-name\">"+esc(row.at("name").get<std::string>())+"</span>","lineup-bench-player",player_attrs(row,"lineup-bench-"));
|
||||
}
|
||||
if (rows.size()<=11) out+="<span class=\"lineup-bench-empty\">Keine Ersatzspieler überliefert.</span>";
|
||||
out+="</div></section></aside>";
|
||||
out+="</div></aside>";
|
||||
} else {
|
||||
out+="<footer class=\"lineup-team-actions\">"+data_btn()+view_btn()+"<span>"+std::to_string(std::min(size_t(11),rows.size()))+" Spieler auf dem Feld · "+std::to_string(rows.size()>11?rows.size()-11:0)+" Kaderplätze auf der Bank</span></footer>";
|
||||
out+="<footer class=\"lineup-team-actions\">"+data_btn()+view_btn()+"<span>"+std::to_string(std::min(size_t(11),rows.size()))+" Spieler auf dem Feld · "+std::to_string(std::min(lineup_bench_limit,rows.size()>lineup_start_limit?rows.size()-lineup_start_limit:0))+" Ersatzbank · "+std::to_string(rows.size()>lineup_start_limit+lineup_bench_limit?rows.size()-lineup_start_limit-lineup_bench_limit:0)+" weitere Spieler</span></footer>";
|
||||
}
|
||||
out+="</div>";
|
||||
return out+render_report_detail();
|
||||
|
||||
Reference in new issue
Block a user