diff --git a/assets/modern/pages.rcss b/assets/modern/pages.rcss index f08f366..94f6f44 100644 --- a/assets/modern/pages.rcss +++ b/assets/modern/pages.rcss @@ -1082,3 +1082,56 @@ body .popup-box p.as-verdict {margin:14dp 0 0;text-align:center;font-size:31dp;} .as-needle {display:block;position:absolute;left:314dp;top:76dp;width:12dp;height:244dp;border-radius:6dp;background-color:var(--p-text);transform-origin:50% 100%;transform:rotate(0deg);} .as-ends {display:flex;justify-content:space-between;width:640dp;margin:6dp auto 18dp;font-size:27dp;color:var(--p-n7);} .as-ends span {display:block;} +.pg-dlg.cs-sheet {width:3000dp;height:1800dp;box-sizing:border-box;} +.cs-head {display:block;flex:none;} +.cs-body {display:flex;flex:1;min-height:0;gap:36dp;} +.cs-list {display:block;flex:none;width:1040dp;overflow-y:auto;padding-right:14dp;} +.pg-ov button.cs-club {display:flex;align-items:center;gap:27dp;width:100%;box-sizing:border-box;min-height:0;height:auto;margin:0 0 18dp;padding:22dp 27dp;border:3dp var(--p-div);border-radius:32dp;background-color:var(--p-n1);decorator:none;text-align:left;color:var(--p-text);font-family:Modern;} +.pg-ov button.cs-club:hover {border-color:var(--p-a4);background-color:var(--p-n1);} +.pg-ov button.cs-club.on,.pg-ov button.cs-club.on:hover {border-color:var(--p-a5);background-color:var(--p-a1);} +.cs-crest {display:block;flex:none;width:150dp;height:150dp;} +.cs-text {display:block;flex:1;min-width:0;} +.cs-name {display:block;font-family:Display;font-weight:normal;font-size:46dp;line-height:56dp;} +.cs-line {display:block;font-family:Modern;font-size:29dp;line-height:40dp;color:var(--p-n7);} +.cs-power {display:block;flex:none;width:150dp;text-align:center;} +.cs-figure {display:block;font-family:Display;font-weight:normal;font-size:72dp;line-height:80dp;color:var(--p-a6);} +.cs-detail {display:flex;flex-direction:column;flex:1;min-width:0;gap:24dp;} +.cs-top {display:flex;align-items:center;gap:36dp;flex:none;} +.cs-big {display:block;flex:none;width:230dp;height:230dp;} +.cs-title {display:block;flex:1;min-width:0;} +.cs-title h3 {display:block;margin:0;font-family:Display;font-weight:normal;font-size:76dp;line-height:88dp;} +.cs-title span {display:block;font-size:34dp;line-height:44dp;color:var(--p-n7);} +.cs-key {display:block;flex:none;font-size:27dp;line-height:40dp;} +.cs-key span {display:block;padding-left:18dp;border-left:22dp var(--p-n5);margin:8dp 0;} +.cs-key span.new {border-left-color:var(--p-a5);} +.cs-row {display:flex;gap:24dp;flex:none;} +.cs-box {display:block;box-sizing:border-box;padding:24dp 28dp;border:2dp var(--p-div);border-radius:28dp;background-color:var(--p-n1);} +.cs-team {flex:none;width:900dp;} +.cs-season {flex:1;min-width:0;} +.cs-chart {display:flex;justify-content:space-between;align-items:flex-end;margin-top:14dp;} +.cs-grp {display:block;text-align:center;} +.cs-bars {display:flex;align-items:flex-end;justify-content:center;gap:10dp;height:510dp;} +.cs-col {display:block;width:62dp;} +.cs-num {display:block;font-size:27dp;line-height:36dp;text-align:center;} +.cs-bar {display:block;width:62dp;border-radius:10dp 10dp 0 0;background-color:var(--p-a5);} +.cs-bar.own {background-color:var(--p-n5);} +.cs-cap {display:block;margin-top:10dp;font-size:27dp;line-height:36dp;color:var(--p-n7);} +.cs-curve {display:block;position:relative;margin-top:44dp;padding-left:70dp;height:468dp;} +.cs-axis {display:block;position:absolute;left:0;width:60dp;text-align:right;font-size:27dp;line-height:36dp;color:var(--p-n7);} +.cs-axis.top {top:0;} +.cs-axis.bottom {bottom:0;} +.cs-none {display:block;padding:120dp 0;text-align:center;color:var(--p-n7);} +.cs-cash {flex:1;min-width:0;} +.cs-money {display:flex;align-items:center;gap:22dp;margin-top:18dp;} +.cs-label {display:block;flex:none;width:300dp;font-size:29dp;} +.cs-track {display:block;flex:1;height:30dp;border-radius:15dp;background-color:var(--p-div);overflow:hidden;} +.cs-fill {display:block;height:30dp;border-radius:15dp;background-color:var(--p-a5);} +.cs-fill.own {background-color:var(--p-n5);} +.cs-fill.debt {background-color:#b8402f;} +.cs-sum {display:block;flex:none;width:330dp;text-align:right;font-size:31dp;} +.cs-fact {flex:none;width:330dp;text-align:center;} +.cs-fact strong {display:block;margin-top:34dp;font-family:Display;font-weight:normal;font-size:72dp;line-height:84dp;} +.cs-fact span {display:block;font-size:27dp;color:var(--p-n7);} +.pg-dlg p.cs-note {font-size:29dp;line-height:40dp;color:var(--p-n7);} +#assembly-layer {z-index:150;height:100%;} +.cs-cash,.cs-fact {min-height:250dp;} diff --git a/docs/new_engine/ui-anbindung.md b/docs/new_engine/ui-anbindung.md index dd27ddd..45b258f 100644 --- a/docs/new_engine/ui-anbindung.md +++ b/docs/new_engine/ui-anbindung.md @@ -46,7 +46,7 @@ Revision kommt vom Aufrufer (Konsole bzw. AppController), der Read ändert nicht | `sponsor` | das Exklusiv-Sponsor-Angebot aus einem Trainingslager und ein vorgemerkter Vertrag (`monthly` als `Money`; `asset: null`, siehe [Trainingslager](trainingslager.md)) | | `bank` | Konto, Festgeld, Kreditrahmen, Anlagen (alles `Money`), die 12 Aktien (Kurs, Vorkurs, Bestand, bezahlt, Höchstkauf, 30 Kurse Verlauf) und die angebotenen Fonds; `credit` verweist auf den Read `credit`, der Aktientipp zieht Zufall und kommt als `quote.request` | | `credit` | der Kreditdialog (`lenderId` `bank` oder die Manager-ID eines anderen Menschen): `saved` (Darlehen, Gesamtbetrag, Rate, Laufzeit, vergangene Monate, Zahlungen), `fields` (acht Felder mit `field`, `label`, `value`, `editable`, `min`, `max`; Werte in ganzen Euro bzw. Monaten), `fees`, `refund`, `principalPaid` (`Money`). Optional `edits` [{field, value}] als Vorschau, nichts wird gebucht; Fehler `unknown_lender`, `credit_unavailable`, `invalid_credit_edit` | -| `assembly` | die [Jahreshauptversammlung](hauptversammlung.md) und die interessierten Vereine: `available` (false am Schreibtisch des Bundestrainers), `due` (am Schreibtisch „Saisonende“, solange in dieser Saison nicht abgestimmt ist), `dismissals`, `vote {sport, finance, supporters, yes, confirmed}` (Prozent), `club` und `offers[]` je mit `teamId`, `name`, `league`, `leagueIndex`, `strength` (Schnitt der Elf), `position`; Angebote zusätzlich `cash` (`Money`). Rein lesend, zieht keine Zufallszahl | +| `assembly` | die [Jahreshauptversammlung](hauptversammlung.md) und die interessierten Vereine: `available` (false am Schreibtisch des Bundestrainers), `due` (am Schreibtisch „Saisonende“, solange in dieser Saison nicht abgestimmt ist), `dismissals`, `vote {sport, finance, supporters, yes, confirmed}` (Prozent), `club` und `offers[]` je mit `teamId`, `name`, `league`, `leagueIndex`, `leagueSize`, `strength` (Schnitt der Elf), `lines {goal, defence, midfield, attack}`, `positions[]` (Platz nach jedem Spieltag der Saison), `squad` (Spieler), `stadiumCapacity` (Plätze des Stadions, das ein Manager dort erhält), `position`; Angebote zusätzlich `cash` (`Money`), dazu `cash` des Managers heute. Rein lesend, zieht keine Zufallszahl | | `postmatch` | das Nachspiel des letzten `session.advance` (auch am Bundestrainer-Schreibtisch): `steps` (`results`, `report`, `team_of_the_day`, `overview`, `table` je mit `available`), `matches` (alle Spiele des Anstoßes im Almanach-Format), `reportMatchIds` (Spiele menschlicher Manager), `teamOfTheDay` (die Sportschau-Elf der Engine je Wettbewerb mit Spieler, Verein, Wertung; nur mit der Sportschau-Option der EXE, sonst leer und `team_of_the_day` nicht verfügbar), `tables` (die aktuellen Tabellen der Ligen des Spieltags). Rückblick und Abspielen ändern nichts; weiter geht es mit `session.advance` | Fehler: `unknown_read`, `manager_not_active`, `no_active_manager`, `unknown_team`. diff --git a/src/modern/app/modern_session.cpp b/src/modern/app/modern_session.cpp index d254198..e110a53 100644 --- a/src/modern/app/modern_session.cpp +++ b/src/modern/app/modern_session.cpp @@ -8926,7 +8926,7 @@ namespace { // The annual general meeting and the interested clubs for the interface (read "assembly", and the // args of the advance's question): the vote of the three groups, whether it is due at this desk, // and the clubs with the cash they offer and the strength of their eleven. -cli::Json assembly_data(const modern::ModernState& g, int manager, bool season_end) { +cli::Json assembly_data(const modern::ModernState& g, const LeImage& exe, int manager, bool season_end) { using O = cli::Json::Object; using A = cli::Json::Array; const int team = manager >= 0 && size_t(manager) < g.manager_teams.size() ? g.manager_teams[size_t(manager)] : -1; @@ -8934,12 +8934,37 @@ cli::Json assembly_data(const modern::ModernState& g, int manager, bool season_e const auto vote = modern::assembly_vote(g, manager); const int voted = size_t(manager) < g.assembly.size() ? g.assembly[size_t(manager)].voted_season : -1; const uint16_t eleven = avg::CONDITION | avg::TECHNIQUE | avg::FORM | avg::MORALE | avg::ALL_POSITIONS | avg::LINEUP_ONLY; + // the eleven by line: goal, defence, midfield, attack + const auto lines = [&](int t) { + const uint16_t base = avg::CONDITION | avg::TECHNIQUE | avg::FORM | avg::MORALE | avg::LINEUP_ONLY; + return O{{"goal", team_average(g, t, base | avg::GOALKEEPER).value}, {"defence", team_average(g, t, base | avg::DEFENDER).value}, + {"midfield", team_average(g, t, base | avg::MIDFIELDER).value}, {"attack", team_average(g, t, base | avg::FORWARD).value}}; + }; + // the club's place after every round of the season (1 = first) + const auto places = [&](int t) { + A out; + const int league = team_league(t); + const int rounds = league >= 0 && size_t(league) < g.league_rounds.size() ? g.league_rounds[size_t(league)] : 0; + for (int round = 0; round < rounds; ++round) { + const size_t at = (size_t(round / 3) + size_t(t) * 13) * 2; + if (at + 1 >= g.position_history.size()) break; + const int word = int16_t(uint16_t(g.position_history[at] | g.position_history[at + 1] << 8)); + out.push_back(((word >> ((round % 3) * 5)) & 0x1f) + 1); + } + return out; + }; + // the ground a manager gets with a club of this league (build_stadium): eight stands of equal size + const auto capacity = [&](int league) { + const uint32_t at = ::bmh::layout::Career_BuildStadium_RuntimeField4 + uint32_t(league > 2 ? league - 1 : league); + return league >= 0 && exe.contains(at) ? cli::Json(int(exe.u8(at)) * 8000) : cli::Json(nullptr); + }; const auto club = [&](int t) { const int league = team_league(t); return O{{"teamId", modern::ui_team_id(g, t)}, {"name", size_t(t) < g.world_club_name.size() ? g.world_club_name[size_t(t)] : std::string()}, {"league", league >= 0 && size_t(league) < g.world_league_name.size() ? g.world_league_name[size_t(league)] : std::string()}, - {"leagueIndex", league}, {"strength", team_average(g, t, eleven).value}, + {"leagueIndex", league}, {"leagueSize", league_table_teams(league)}, {"strength", team_average(g, t, eleven).value}, + {"lines", lines(t)}, {"positions", places(t)}, {"squad", modern::squad_count(g, t, 2)}, {"stadiumCapacity", capacity(league)}, {"position", modern::table_position(g, t) < 0 ? cli::Json(nullptr) : cli::Json(modern::table_position(g, t) + 1)}}; }; A offers; @@ -8952,7 +8977,8 @@ cli::Json assembly_data(const modern::ModernState& g, int manager, bool season_e {"dismissals", g.dismissals}, {"season", g.season}, {"vote", O{{"sport", vote.sport}, {"finance", vote.finance}, {"supporters", vote.supporters}, {"yes", vote.yes}, {"confirmed", vote.confirmed}}}, - {"club", club(team)}, {"offers", std::move(offers)}}; + {"club", club(team)}, {"cash", modern::ui_money(int64_t(int32_t(uint32_t(g.manager_records[size_t(manager) * 0xb0c + 0x314]) | uint32_t(g.manager_records[size_t(manager) * 0xb0c + 0x315]) << 8 | uint32_t(g.manager_records[size_t(manager) * 0xb0c + 0x316]) << 16 | uint32_t(g.manager_records[size_t(manager) * 0xb0c + 0x317]) << 24)))}, + {"offers", std::move(offers)}}; } } // namespace @@ -9519,7 +9545,7 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co // the annual general meeting and the clubs that want the manager (hauptversammlung.md). Pure. try { return modern::ui_snapshot(g_, context, request_id, - assembly_data(g_, manager, turn_driver_.stage == TurnDriver::Stage::SeasonEndDesk)); + assembly_data(g_, exe_, manager, turn_driver_.stage == TurnDriver::Stage::SeasonEndDesk)); } catch (const std::exception&) { return modern::ui_error(request_id, "assembly_unavailable", "Die Hauptversammlung ist hier nicht verfügbar.", revision, false); } @@ -9897,7 +9923,7 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision const bool must_leave = !vote.confirmed && g_.dismissals; const cli::Json* asked = ui_field(*payload, "assembly"); const auto ask = [&](const char* text) { - cli::Json data = assembly_data(g_, manager, true); + cli::Json data = assembly_data(g_, exe_, manager, true); restore(); managers_ = managers_before; cli::Json pending = refuse("decision_pending", text); auto& message = std::get(std::get(pending.value)["message"].value); diff --git a/src/modern/ui/engine_assembly.inc b/src/modern/ui/engine_assembly.inc index 6654568..fbac931 100644 --- a/src/modern/ui/engine_assembly.inc +++ b/src/modern/ui/engine_assembly.inc @@ -82,37 +82,145 @@ void App::engine_assembly_tick() { engine_assembly_started_ = 0; } } -// The clubs that want the manager: crest, league, the strength of their eleven beside his own, -// and the cash they give him to start with. +// The clubs that want the manager, on a sheet as large as a page of the notebook: the clubs on +// the left, and on the right what the chosen one is like beside the manager's own club. void App::engine_assembly_clubs(bool forced) { engine_assembly_forced_ = forced; + const Json offers = engine_assembly_.value("offers", Json::array()); + if (offers.empty()) { + engine_assembly_open_ = false; + message("Zurzeit interessiert sich kein Verein für dich."); + return; + } + engine_assembly_open_ = true; + engine_assembly_pick_ = offers.front().value("teamId", std::string()); + engine_assembly_scroll_ = 0.f; + refresh(); +} +namespace { +// 1234567 -> 1.234.567 +std::string assembly_count(int64_t n) { + std::string digits = std::to_string(n < 0 ? -n : n), out; + for (size_t i = 0; i < digits.size(); ++i) { + if (i && (digits.size() - i) % 3 == 0) out += '.'; + out += digits[i]; + } + return (n < 0 ? "−" : "") + out; +} +// Money of the contract ({minor: "…"}) in whole euros. +int64_t assembly_euros(const Json &money) { + try { + return std::stoll(money.at("minor").get()) / 100; + } catch (const std::exception &) { return 0; } +} +// Two bars side by side for one part of the team: the manager's club and the other one. +std::string assembly_pair(const char *name, int own, int other) { + const auto bar = [](int value, const char *css) { + return "
" + std::to_string(value) + "
"; + }; + return "
" + bar(own, "own") + bar(other, "new") + "
" + esc(name) + "
"; +} +} // namespace +std::string App::engine_assembly_sheet() { const Json offers = engine_assembly_.value("offers", Json::array()); const Json own = engine_assembly_.value("club", Json::object()); - std::string body = "
"; + const Json *chosen = nullptr; + for (const auto &offer : offers) + if (offer.value("teamId", std::string()) == engine_assembly_pick_) chosen = &offer; + if (!chosen && !offers.empty()) chosen = &offers.front(); + const auto name_of = [&](const Json &row) { + const auto *club = world_->find("clubs", row.value("teamId", std::string())); + return club ? world_->name(*club) : row.value("name", std::string("Verein")); + }; + const auto place_of = [](const Json &row) { + return row.contains("position") && row.at("position").is_number_integer() ? "Platz " + std::to_string(row.at("position").get()) : std::string("noch ohne Platz"); + }; + const bool forced = engine_assembly_forced_; + std::string out = "
" + + std::string(forced ? "NACH DER ABWAHL" : "VEREINSWECHSEL") + "

Interessierte Vereine

" + + esc(forced ? "Einen dieser Vereine musst du übernehmen, bevor die neue Saison beginnt." : "Diese Vereine wollen dich verpflichten. Die Liste wechselt alle zwei Wochen.") + + "
"; for (const auto &offer : offers) { const std::string id = offer.value("teamId", std::string()); const auto *club = world_->find("clubs", id); - const std::string name = club ? world_->name(*club) : offer.value("name", std::string("Ein Verein")); - body += "
" + (club ? crest(club, 72) : std::string()) + "
" + esc(name) + "" + esc(offer.value("league", std::string())) + - (offer.contains("position") && offer.at("position").is_number_integer() ? " · Platz " + std::to_string(offer.at("position").get()) : std::string()) + " · Stärke " + std::to_string(offer.value("strength", 0)) + - " · Startkapital " + esc(offer.contains("cash") ? engine_price(offer.at("cash")) : std::string("—")) + "
" + - pg_button("assembly-club", "Übernehmen", "primary", "id=\"assembly-club-" + esc(id) + "\" data-id=\"" + esc(id) + "\"") + "
"; + const bool on = chosen && id == chosen->value("teamId", std::string()); + out += ""; } - body += "
"; - const std::string strength = own.contains("strength") ? " Deine Elf hat die Stärke " + std::to_string(own.value("strength", 0)) + "." : std::string(); - message(offers.empty() ? "Zurzeit interessiert sich kein Verein für dich." - : forced ? "Diese Vereine wollen dich verpflichten. Einen davon musst du übernehmen, bevor die neue Saison beginnt." + strength - : "Diese Vereine wollen dich verpflichten. Die Liste wechselt alle zwei Wochen." + strength); - popup_title_ = "Interessierte Vereine"; - popup_close_ = forced ? "Zum Schreibtisch" : "Abbrechen"; - popup_body_ = body; + out += "
"; + if (chosen) { + const Json &c = *chosen; + const auto *club = world_->find("clubs", c.value("teamId", std::string())); + const std::string name = name_of(c), mine = name_of(own); + out += "
" + (club ? crest(club, 230) : std::string()) + "

" + esc(name) + "

" + esc(c.value("league", std::string())) + " · " + + esc(place_of(c)) + (c.contains("leagueSize") ? " von " + std::to_string(c.value("leagueSize", 0)) : std::string()) + "
" + esc(mine) + + "" + esc(name) + "
"; + // the team, part by part + const Json a = own.value("lines", Json::object()), b = c.value("lines", Json::object()); + out += "
MANNSCHAFT IM VERGLEICH
" + assembly_pair("Tor", a.value("goal", 0), b.value("goal", 0)) + + assembly_pair("Abwehr", a.value("defence", 0), b.value("defence", 0)) + assembly_pair("Mittelfeld", a.value("midfield", 0), b.value("midfield", 0)) + + assembly_pair("Angriff", a.value("attack", 0), b.value("attack", 0)) + assembly_pair("Elf gesamt", own.value("strength", 0), c.value("strength", 0)) + "
"; + // the season so far, place by round + const Json places = c.value("positions", Json::array()); + const int size = std::max(c.value("leagueSize", 18), 2); + std::string curve; + if (places.size() >= 2) { + std::string points; + for (size_t i = 0; i < places.size(); ++i) + points += scalar(12 + 576.0 * double(i) / double(places.size() - 1)) + "," + scalar(12 + 336.0 * double(std::clamp(places[i].get(), 1, size) - 1) / double(size - 1)) + " "; + const std::string last_y = scalar(12 + 336.0 * double(std::clamp(places.back().get(), 1, size) - 1) / double(size - 1)); + curve = picture(renderer_.diagram("assembly-places-" + c.value("teamId", std::string()) + "-" + std::to_string(places.size()), + "", 1200), 780, 468); + } + out += "
TABELLENPLATZ IN DIESER SAISON" + + (curve.empty() ? std::string("
Noch zu wenige Spieltage.
") + : "
1." + std::to_string(size) + "." + curve + "
") + "
"; + // money, ground and squad + const int64_t now = assembly_euros(engine_assembly_.value("cash", Json::object())), then = assembly_euros(c.value("cash", Json::object())); + const double scale = double(std::max({std::llabs(now), std::llabs(then), 1})); + const auto money_bar = [&](const char *label, int64_t value, const char *css) { + return "
" + std::string(label) + "
" + assembly_count(value) + " €
"; + }; + out += "
VEREINSKASSE" + money_bar("Dein Konto heute", now, "own") + money_bar("Startkapital dort", then, "new") + + "
STADION" + + (c.contains("stadiumCapacity") && c.at("stadiumCapacity").is_number_integer() ? assembly_count(c.at("stadiumCapacity").get()) : std::string("—")) + + "Plätze zum Start
KADER" + std::to_string(c.value("squad", 0)) + "Spieler
" + + "

Beim Wechsel bleiben dein Konto, deine Aktien, Fonds und Kredite zurück. Stadion, Verträge und Werbung beginnen beim neuen Verein neu.

"; + } + out += "
"; + return out; } -// A club of the list was chosen: asked once more, because nothing of the old club comes along. +bool App::engine_assembly_action(const std::string &action, const std::string &id) { + if (action == "assembly-pick") { + engine_assembly_pick_ = id; + focus_after_render_ = "assembly-pick-" + id; + refresh(); + return true; + } + if (action == "assembly-close") { + engine_assembly_open_ = false; + refresh(); + return true; + } + if (action == "assembly-take" && !engine_busy_) { + engine_assembly_choose(engine_assembly_pick_); + return true; + } + return false; +} +// A club was taken: asked once more, because nothing of the old club comes along. void App::engine_assembly_choose(const std::string &team) { const auto *club = world_->find("clubs", team); - const std::string name = club ? world_->name(*club) : std::string("diesem Verein"); + if (team.empty() || !club) return; + const std::string name = world_->name(*club); const bool forced = engine_assembly_forced_; - confirmation("Wirklich zu " + name + " wechseln? Dein Konto, deine Aktien, Fonds und Kredite bleiben zurück; beim neuen Verein beginnst du mit dessen Startkapital und einem neuen Vertragswerk.", [this, team, forced] { + confirmation("Wirklich zu " + name + " wechseln? Das lässt sich nicht zurücknehmen. Dein Konto, deine Aktien, Fonds und Kredite bleiben zurück; beim neuen Verein beginnst du mit dessen Startkapital und neuen Verträgen.", [this, team, forced] { + engine_assembly_open_ = false; if (forced) { engine_advance_payload_["assembly"] = {{"seen", true}, {"teamId", team}}; engine_kickoff(); diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index 3ceedef..ff2a11d 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -272,6 +272,10 @@ void App::engine_frame() { if(menu_=="news")news_after_render(); if(rendered&&files_native_){files_after_render();context_->Update();} if (center_selects(*doc_)) context_->Update(); + if (engine_assembly_scroll_) { + if (auto *clubs = element("assembly-list")) clubs->SetScrollTop(*engine_assembly_scroll_); + engine_assembly_scroll_.reset(); + } if (menu_ == "lineup" && lineup_roster_scroll_) { if (auto *roster = element("lineup-roster-scroll")) roster->SetScrollTop(*lineup_roster_scroll_); lineup_roster_scroll_.reset(); @@ -477,12 +481,6 @@ void App::engine_event(Rml::Event &event) { const auto action = node->GetAttribute("data-action", ""), id = node->GetAttribute("data-id", ""); if (!popup_.empty()) { if(action=="balance-discard"){engine_balance_action(action,node);return;} - if (action == "assembly-club") { - const std::string team = id; - popup_.clear(); reset_popup(); confirm_ = {}; dirty_ = true; - engine_assembly_choose(team); - return; - } if (action == "engine-offer-accept") { const auto player = engine_offer_player_; const int index = node->GetAttribute("data-id", -1); @@ -502,6 +500,7 @@ void App::engine_event(Rml::Event &event) { if (action == "popup-confirm") { auto callback=std::move(confirm_);auto text_callback=std::move(text_accept_);const auto text=field("popup-text");popup_.clear();reset_popup();dirty_=true;if(text_callback)text_callback(text);else if(callback)callback(); } return; } + if (engine_assembly_open_) { engine_assembly_action(action, id); return; } // the sheet of the interested clubs lies over everything if (action == "engine-widget-warning" && menu_.empty() && !engine_busy_) { const auto rows = engine_widgets_projection(engine_data_).at("warnings"); std::string text; diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index 4a3b186..f2979c4 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -45,6 +45,7 @@ void App::engine_render() { if (menu_ == "settings") { settings_remember_scroll(); last_rendered_menu_ = menu_; } if (menu_ == "friendlies") if (auto *list = element("friendly-opponents")) engine_friendly_scroll_ = list->GetScrollTop(); if (menu_ == "contracts") if (auto *roster = element("contracts-roster-scroll")) engine_contract_scroll_ = roster->GetScrollTop(); + if (auto *clubs = element("assembly-list")) engine_assembly_scroll_ = clubs->GetScrollTop(); if (menu_ == "lineup") { if (auto *roster = element("lineup-roster-scroll")) lineup_roster_scroll_ = lineup_reset_scroll_ ? 0.f : roster->GetScrollTop(); lineup_reset_scroll_ = false; @@ -230,6 +231,7 @@ void App::engine_render() { element("canvas")->SetProperty("overflow",statistics_trophy_.contains("asset")?"visible":"hidden"); setting_menu_markup_ = true; notebook_finish(out); + if (engine_assembly_open_) out += engine_assembly_sheet(); element("canvas")->SetInnerRML(out); ++document_generation_; setting_menu_markup_ = false; needs_render_ = false; diff --git a/src/modern/ui/live_state.inc b/src/modern/ui/live_state.inc index 135a2c2..70d3b10 100644 --- a/src/modern/ui/live_state.inc +++ b/src/modern/ui/live_state.inc @@ -53,6 +53,13 @@ void engine_assembly_ask(const Json &args); void engine_assembly_clubs(bool forced); void engine_assembly_choose(const std::string &team); + // The big sheet of the interested clubs: open or not, the club whose details are shown, and + // where its list was scrolled to before the sheet was drawn again. + bool engine_assembly_open_ = false; + std::string engine_assembly_pick_; + std::optional engine_assembly_scroll_; + std::string engine_assembly_sheet(); + bool engine_assembly_action(const std::string &action, const std::string &id); // The needle of the meeting: when it started to swing (0 = at rest) and where it comes to rest. uint64_t engine_assembly_started_ = 0; int engine_assembly_target_ = 50;