Preserve human manager identity through national coach record swaps (by Codex)

This commit is contained in:
Codex committed 2026-10-29 01:56:31 +01:00
1 parent ce1535fe2d
commit 693744a961
16 files changed
+203 -21

No files matched your search

+24 -15
View File
@@ -109,27 +109,36 @@ J team_ref(const ModernState& g, int team, const std::string& as_of) {
{"crestAssetId", text_or_null(club ? &club->crest : nullptr)}, {"nameAsOf", as_of}};
}
std::string manager_id(const ModernState& g, int manager) {
const std::string& id = entry(g.manager_ids, size_t(manager));
return id.empty() ? "manager:slot-" + std::to_string(manager) : id;
std::string human_manager_id(const ModernState& g, int human) {
const std::string& id = entry(g.manager_ids, size_t(human));
return id.empty() ? "manager:slot-" + std::to_string(human) : id;
}
std::string manager_id(const ModernState& g, int runtime) {
return human_manager_id(g, g.human_manager_slot(runtime));
}
int human_team(const ModernState& g, int human) {
const int record = g.manager_record_slot(human);
if (record >= 0 && size_t(record) < g.manager_teams.size()) return g.manager_teams[size_t(record)];
const size_t at = size_t(record) * kRecord + 0x290;
return record >= 0 && at + 1 < g.manager_records.size() ? int(uint16_t(g.manager_records[at]) | uint16_t(g.manager_records[at + 1]) << 8) : -1;
}
// A human manager (Manager of the contract). After the career's end he is archived: resigned
// when he gave up, retired when the set duration ran out.
J manager_json(const ModernState& g, int manager, bool at_desk) {
(void)at_desk; // who is at the desk is the session's activeManagerId
const int team = team_of(g, manager);
J manager_json(const ModernState& g, int human) {
const int manager = g.manager_record_slot(human);
const int team = human_team(g, human);
const size_t at = size_t(manager) * kRecord;
const int portrait = at + 0x221 < g.manager_records.size() ? g.manager_records[at + 0x221] : 0;
const auto* presentation = g.manager_presentation(manager);
const auto* presentation = g.manager_presentation_for_human(human);
const std::string style = presentation ? presentation->portrait_style : "photo";
const bool ended = !g.career_end_reason.empty();
const char* status = !ended ? "active" : g.career_end_reason == "last_human_resigned" ? "resigned" : "retired";
return O{{"id", manager_id(g, manager)}, {"slot", manager}, {"name", manager_name(g, manager)},
return O{{"id", human_manager_id(g, human)}, {"slot", human}, {"runtimeSlot", manager}, {"name", manager_name(g, manager)},
{"control", ended ? "archived" : "human"}, {"status", status},
{"teamId", team >= 0 ? J(team_id(g, team)) : J(nullptr)},
{"portraitGuiKey", "gui:manager/" + style + "/" + std::to_string(portrait)}, {"portraitStyle", style},
{"strengthChoice", nullptr}, {"employments", manager_employments(g, manager, manager_id(g, manager))}};
{"strengthChoice", nullptr}, {"employments", manager_employments(g, human, human_manager_id(g, human))}};
}
// The commands the desk accepts now (the session refuses the others): none after the career's
@@ -192,15 +201,15 @@ J session_data(const ModernState& g, const UiContext& c) {
const bool ended = c.career_ended || !g.career_end_reason.empty();
bool national = false, club = false;
for (int m = 0; m < human_managers(g); ++m) {
const int team = team_of(g, m);
const int team = human_team(g, m);
(team == no_team() ? national : club) = true;
if (ended) {
archived_ids.push_back(manager_id(g, m));
archived_ids.push_back(human_manager_id(g, m));
continue;
}
managers.push_back(manager_json(g, m, m == c.manager));
managers.push_back(manager_json(g, m));
if (team >= 0)
ownership.push_back(O{{"teamId", team_id(g, team)}, {"controller", "human"}, {"managerId", manager_id(g, m)},
ownership.push_back(O{{"teamId", team_id(g, team)}, {"controller", "human"}, {"managerId", human_manager_id(g, m)},
{"sinceRevision", "0"}});
}
const std::string reason = !g.career_end_reason.empty() ? g.career_end_reason : ended ? "career_completed" : "";
@@ -216,7 +225,7 @@ J session_data(const ModernState& g, const UiContext& c) {
J desktop_data(const ModernState& g, const UiContext& c, const std::string& today) {
const int team = team_of(g, c.manager);
const bool national = team == no_team();
O data{{"kind", "desktop"}, {"manager", manager_json(g, c.manager, true)}, {"team", team_ref(g, team, today)}};
O data{{"kind", "desktop"}, {"manager", manager_json(g, g.human_manager_slot(c.manager))}, {"team", team_ref(g, team, today)}};
// the account: the bank's savings and credit follow with the bank read
data["accounts"] = O{{"cash", ui_money(money_of(g, c.manager))}, {"savings", nullptr}, {"debt", nullptr},
{"netAssets", nullptr}};
@@ -465,7 +474,7 @@ cli::Json ui_snapshot(const ModernState& g, const UiContext& c, const std::strin
}
std::string ui_team_id(const ModernState& g, int team) { return team_id(g, team); }
cli::Json ui_manager(const ModernState& g, int manager) { return manager_json(g, manager, false); }
cli::Json ui_manager(const ModernState& g, int manager) { return manager_json(g, g.human_manager_slot(manager)); }
std::string ui_player_id(const ModernState& g, int player) {
std::string id = entry(g.world_player_id, size_t(player));