Bind native manager actions and preserve ongoing Modern standings (by Codex)

This commit is contained in:
Codex committed 2026-10-29 21:24:49 +01:00
1 parent f9f950fc7f
commit cf424b6be1
31 files changed
+466 -100

No files matched your search

+14
View File
@@ -3,6 +3,7 @@
#include "modern/game/modern_state.hpp"
#include "modern/app/modern_session.hpp"
#include "modern/content/press_journal.hpp"
#include "modern/content/manager_name.hpp"
#include "modern/content/world_expand.hpp"
#include "modern/content/world_package.hpp"
#include "modern/content/toto_quote.hpp"
@@ -8827,6 +8828,8 @@ cli::Json ModernSession::read_statistics_screen(const cli::Json& request) const
return answer;
}
#include "modern/app/ui_managers.inc"
cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) const {
using O = cli::Json::Object;
using A = cli::Json::Array;
@@ -8840,6 +8843,14 @@ 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 == "manager-menu") {
if (manager < 0 || size_t(manager) >= g_.manager_teams.size())
return modern::ui_error(request_id, "no_manager", "Kein aktiver Manager.", 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 { return modern::ui_snapshot(g_,context,request_id,ui_manager_menu_data(revision)); }
catch(const std::exception &e) { return modern::ui_error(request_id,"manager_menu_unavailable",e.what(),revision,false); }
}
if (kind == "settings") {
if (manager < 0 || manager > 3 || size_t(manager) >= g_.manager_teams.size())
return modern::ui_error(request_id, "no_manager", "Kein aktiver Manager.", revision, false);
@@ -10493,6 +10504,9 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
if (result == EnvironmentResult::changed) revision = previous + 1;
answer = modern::ui_command_result(request_id, previous, revision, {"environment", "desktop"},
message.empty() ? "Umfeld geändert." : ui::original_to_utf8(message));
} else if (kind == "manager.join.commit") {
answer = ui_join_managers(*payload,request_id,revision);
if (ui_text(answer,"messageType")=="error") return answer;
} else if (kind == "manager.resign.commit") {
// payload {confirmed: true}. A Modern feature (the original has no resigning): when the last
// human manager resigns the career ends (outcome career_ended, sessionState "ended"). With