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
@@ -411,8 +411,7 @@ void App::ProcessEvent(Rml::Event &event) try {
|
||||
controls[size_t(next)]->GetId().starts_with("alm-match-") ||
|
||||
controls[size_t(next)]->GetId().starts_with("contract-player-") ||
|
||||
controls[size_t(next)]->GetId().starts_with("lineup-name-") ||
|
||||
controls[size_t(next)]->GetId().starts_with("lineup-detail-") ||
|
||||
controls[size_t(next)]->GetId().starts_with("lineup-bench-"))
|
||||
controls[size_t(next)]->GetId().starts_with("lineup-detail-"))
|
||||
controls[size_t(next)]->ScrollIntoView(
|
||||
Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));
|
||||
event.StopImmediatePropagation();
|
||||
|
||||
@@ -20,7 +20,7 @@ bool App::lineup_action(const std::string &action,Rml::Element *target) {
|
||||
};
|
||||
const auto player_focus=[&](const std::string &p) {
|
||||
const int slot=lineup_slot(l,p);
|
||||
return std::string(lineup_pitch_?(slot<11?"lineup-player-":"lineup-bench-"):"lineup-name-")+p;
|
||||
return std::string(lineup_pitch_ && slot<11?"lineup-player-":"lineup-name-")+p;
|
||||
};
|
||||
if (action=="lineup-player") {
|
||||
if (lineup_slot(l,id)<0) return true;
|
||||
@@ -28,7 +28,7 @@ bool App::lineup_action(const std::string &action,Rml::Element *target) {
|
||||
else if (!lineup_selected_.empty()) {
|
||||
const auto selected=lineup_selected_; lineup_selected_.clear();
|
||||
const int destination=lineup_slot(l,selected);
|
||||
const auto focus=std::string(lineup_pitch_?(destination<11?"lineup-player-":"lineup-bench-"):"lineup-name-")+id;
|
||||
const auto focus=std::string(lineup_pitch_ && destination<11?"lineup-player-":"lineup-name-")+id;
|
||||
commit({{"kind","swap"},{"a",selected},{"b",id}},focus); return true;
|
||||
} else lineup_selected_=id;
|
||||
focus_after_render_=player_focus(id); refresh(); return true;
|
||||
@@ -112,14 +112,20 @@ bool App::lineup_event(Rml::Event &event) {
|
||||
const auto index=target->GetAttribute<Rml::String>("data-lineup-order","");
|
||||
const auto id=target->GetAttribute<Rml::String>("data-player","");
|
||||
const auto text=control->GetValue();
|
||||
if(index.size()!=1 || index[0]<'0' || index[0]>'3' || text.empty() || text.size()>2 || std::any_of(text.begin(),text.end(),[](char c){return c<'0'||c>'9';}))return true;
|
||||
const int value=std::stoi(text),i=index[0]-'0';
|
||||
// RmlUI ranges format whole steps as "%f" (for example "22.000000").
|
||||
// Accept that complete representation without rounding fractional input.
|
||||
const auto dot=text.find('.');
|
||||
const auto whole=text.substr(0,dot);
|
||||
const bool whole_fraction=dot==std::string::npos ||
|
||||
(dot+1<text.size() && std::all_of(text.begin()+dot+1,text.end(),[](char c){return c=='0';}));
|
||||
if(index.size()!=1 || index[0]<'0' || index[0]>'3' || whole.empty() || whole.size()>2 || !whole_fraction || std::any_of(whole.begin(),whole.end(),[](char c){return c<'0'||c>'9';}))return true;
|
||||
const int value=std::stoi(whole),i=index[0]-'0';
|
||||
if(value<2 || value>40 || lineup_slot(l,id)<0 || lineup_slot(l,id)>=11)return true;
|
||||
if(l.at("orders").at(id)[size_t(i)]!=value && commit({{"kind","order"},{"player",id},{"index",i},{"value",value}},s.revision)) {
|
||||
if(auto *output=element("lineup-order-value-"+index))output->SetInnerRML(std::to_string(value));
|
||||
if(auto *zone=element("lineup-zone")) {
|
||||
const auto now=snap();
|
||||
zone->SetInnerRML(picture(renderer_.diagram("lineup-zone",lineup_zone(now.state.at("lineup"),id),1600),1486,885.4375));
|
||||
zone->SetInnerRML(picture(renderer_.diagram("lineup-zone",lineup_zone(now.state.at("lineup"),id),lineup_pitch_raster_px),lineup_art_width_dp,lineup_art_height_dp));
|
||||
}
|
||||
dirty_=true;
|
||||
}
|
||||
@@ -141,8 +147,8 @@ bool App::lineup_event(Rml::Event &event) {
|
||||
const auto p=point(mx,my);lineup_drag_["ghost"]=p;
|
||||
if(p.is_array())if(auto *ghost=element("lineup-ghost")) {
|
||||
ghost->SetProperty("display","block");
|
||||
ghost->SetProperty("left",scalar((8+p[0].get<int>()/18.0*84)*14.86-63)+"dp");
|
||||
ghost->SetProperty("top",scalar((10+p[1].get<int>()/8.0*80)*8.854375-76.86)+"dp");
|
||||
ghost->SetProperty("left",scalar((8+p[0].get<int>()/18.0*84)*lineup_art_width_dp/100-63)+"dp");
|
||||
ghost->SetProperty("top",scalar((10+p[1].get<int>()/8.0*80)*lineup_art_height_dp/100-76.86)+"dp");
|
||||
dirty_=true;
|
||||
}
|
||||
stop();return true;
|
||||
@@ -166,7 +172,7 @@ bool App::lineup_event(Rml::Event &event) {
|
||||
if(drop_slot>=0 && drop!=id) {
|
||||
commit({{"kind","swap"},{"a",id},{"b",drop}},revision);
|
||||
lineup_selected_.clear();
|
||||
focus_after_render_=std::string(drop_slot<11?"lineup-player-":"lineup-bench-")+id;
|
||||
focus_after_render_=std::string(drop_slot<11?"lineup-player-":"lineup-name-")+id;
|
||||
} else if(drop_slot<0 && in_pitch(mx,my)) {
|
||||
const int slot=lineup_slot(l,id); const auto p=point(mx,my);
|
||||
if(slot<11) {lineup_selected_=id;commit({{"kind","move"},{"player",id},{"point",p}},revision);}
|
||||
|
||||
@@ -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();
|
||||
|
||||
+2
-10
@@ -361,7 +361,7 @@ class App final : public Rml::EventListener {
|
||||
uint64_t lineup_drag_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> lineup_drag_world_;
|
||||
bool lineup_ignore_click_ = false, lineup_reset_scroll_ = false;
|
||||
std::optional<float> lineup_roster_scroll_, lineup_bench_scroll_;
|
||||
std::optional<float> lineup_roster_scroll_;
|
||||
Json transfer_view_ = Json::object(), transfer_draft_, transfer_search_draft_;
|
||||
std::string transfer_dialog_, transfer_return_focus_, transfer_notice_, transfer_poach_league_, transfer_poach_club_, transfer_picker_;
|
||||
uint64_t transfer_revision_ = 0;
|
||||
@@ -834,12 +834,9 @@ class App final : public Rml::EventListener {
|
||||
report_picker_.clear();
|
||||
}
|
||||
lineup_roster_scroll_.reset();
|
||||
lineup_bench_scroll_.reset();
|
||||
if (menu_ == "lineup" && last_rendered_menu_ == "lineup") {
|
||||
if (auto *roster = element("lineup-roster-scroll"))
|
||||
lineup_roster_scroll_ = lineup_reset_scroll_ ? 0.f : roster->GetScrollTop();
|
||||
if (auto *bench = element("lineup-bench-scroll"))
|
||||
lineup_bench_scroll_ = bench->GetScrollTop();
|
||||
}
|
||||
lineup_reset_scroll_ = false;
|
||||
training_scroll_.reset();
|
||||
@@ -918,8 +915,7 @@ class App final : public Rml::EventListener {
|
||||
focus_after_render_.starts_with("alm-match-") ||
|
||||
focus_after_render_.starts_with("contract-player-") ||
|
||||
focus_after_render_.starts_with("lineup-name-") ||
|
||||
focus_after_render_.starts_with("lineup-detail-") ||
|
||||
focus_after_render_.starts_with("lineup-bench-"))
|
||||
focus_after_render_.starts_with("lineup-detail-"))
|
||||
report_option_to_scroll_ = focus_after_render_;
|
||||
focus_after_render_.clear();
|
||||
}
|
||||
@@ -1029,10 +1025,6 @@ class App final : public Rml::EventListener {
|
||||
if (auto *roster = element("lineup-roster-scroll")) roster->SetScrollTop(*lineup_roster_scroll_);
|
||||
lineup_roster_scroll_.reset();
|
||||
}
|
||||
if (lineup_bench_scroll_) {
|
||||
if (auto *bench = element("lineup-bench-scroll")) bench->SetScrollTop(*lineup_bench_scroll_);
|
||||
lineup_bench_scroll_.reset();
|
||||
}
|
||||
if (menu_ == "transfer") transfer_restore_scroll();
|
||||
if (!report_option_to_scroll_.empty()) {
|
||||
if (auto *node = element(report_option_to_scroll_))
|
||||
|
||||
Reference in new issue
Block a user