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
@@ -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);}
|
||||
|
||||
Reference in new issue
Block a user