Connect native indoor standings to real season points and extend CI coverage (by Codex)

This commit is contained in:
Codex committed 2026-10-29 16:27:59 +01:00
1 parent d30e83c0a5
commit 0842cb3458
19 files changed
+296 -20

No files matched your search

+34
View File
@@ -8,6 +8,7 @@
#include "modern/content/toto_quote.hpp"
#include "modern/content/transfer_market.hpp"
#include "ui/achievements.hpp"
#include "ui/indoor_standings.hpp"
#include "modern/content/world_save.hpp"
#include "modern/game/balance_plan.hpp"
#include "modern/game/bank_credit.hpp"
@@ -8984,6 +8985,39 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
context.career_ended = career_complete();
const std::string kind = ui_text(request, "kind"), request_id = ui_text(request, "requestId");
const int manager = context.manager;
if (kind == "indoor-standings") {
if (manager < 0 || manager > 3 || size_t(manager) >= g_.manager_teams.size() ||
g_.manager_teams[size_t(manager)] < 0 || g_.manager_teams[size_t(manager)] >= league_clubs())
return modern::ui_error(request_id, "no_club", "Hallentabellen sind am Vereinsschreibtisch verfügbar.", revision, false);
if (const auto wanted = ui_text(request, "managerId");
!wanted.empty() && wanted != modern::ui_manager_id(g_, manager))
return modern::ui_error(request_id, "manager_not_active", "Dieser Manager sitzt nicht am Schreibtisch.", revision, false);
try {
ui::DeskRequest owner;
owner.kind = ui::DeskRequestKind::open_menu;
owner.menu_kind = 9; owner.manager_slot = manager; owner.revision = revision;
const auto view = ui::indoor_standings_from_game(g_, exe_, texts_, owner);
A rows, awards;
for (size_t i = 0; i < view.rows.size(); ++i) {
const auto &row = view.rows[i];
const auto id = modern::ui_team_id(g_, row.team);
const auto *world = modern::current_world();
const auto *club = world ? world->club(id) : nullptr;
rows.push_back(O{{"rank", int(i + 1)}, {"points", int(row.points)},
{"team", O{{"id", id}, {"name", club ? club->name : ui::original_to_utf8(row.name)}}}});
}
// These are ranking points, not money. Keep sprite-font padding out of the transport.
if (view.indoor) for (int i = 0; i < 4; ++i)
awards.push_back(O{{"rank", i + 1}, {"points", int(exe_.u8(::bmh::layout::IndoorStandings_FormatError_TextPointer + uint32_t(i))) * int(view.strength)}});
return modern::ui_snapshot(g_, context, request_id, O{{"kind", "indoor-standings"},
{"teamId", modern::ui_team_id(g_, g_.manager_teams[size_t(manager)])},
{"tournaments", int(view.tournaments)}, {"rows", std::move(rows)},
{"footer", ui::original_to_utf8(view.footer)}, {"indoor", view.indoor},
{"scoring", view.indoor ? cli::Json(O{{"value", int(view.strength)}, {"places", std::move(awards)}}) : cli::Json(nullptr)}});
} catch (const std::exception &e) {
return modern::ui_error(request_id, "indoor_unavailable", e.what(), revision, false);
}
}
if (kind == "desktop-widgets") {
if (manager < 0 || size_t(manager) >= g_.manager_teams.size())
return modern::ui_error(request_id, "no_manager", "Kein aktiver Manager.", revision, false);