Bind native manager actions and preserve ongoing Modern standings (by Codex)
This commit is contained in:
1 parent
f9f950fc7f
commit
cf424b6be1
31 files changed
+466
-100
No files matched your search
@@ -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
|
||||
|
||||
@@ -992,6 +992,8 @@ private:
|
||||
int runtime_club(int master) const;
|
||||
int runtime_club(const ModernState&, int master) const;
|
||||
ui::SelectionContext selection_context_for(const ModernState&, uint64_t revision) const;
|
||||
cli::Json ui_manager_menu_data(uint64_t revision) const;
|
||||
cli::Json ui_join_managers(const cli::Json&, const std::string&, uint64_t&);
|
||||
struct ManagerJoinDraft {
|
||||
ModernState state;
|
||||
WatcomRandom rand;
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
cli::Json ModernSession::ui_manager_menu_data(uint64_t revision) const {
|
||||
using O=cli::Json::Object;using A=cli::Json::Array;
|
||||
const int manager=int(g_.memory.u8(::bmh::layout::ActiveManager));
|
||||
UiContext context;context.manager=manager;context.state_revision=revision;context.career_ended=career_complete();
|
||||
const auto session=modern::ui_read(g_,context,O{{"kind","session"}});
|
||||
const auto *data=ui_field(session,"data");
|
||||
const auto *humans=data?ui_field(*data,"managers"):nullptr;
|
||||
if(!humans||!humans->array())throw FormatError("manager identities unavailable");
|
||||
A archived;
|
||||
if(context.career_ended) {
|
||||
const auto *ids=ui_field(*data,"archivedManagerIds");
|
||||
if(!ids||!ids->array()||ids->array()->size()>4)throw FormatError("archived manager identities unavailable");
|
||||
for(size_t i=0;i<ids->array()->size();++i) {
|
||||
auto person=modern::ui_manager(g_,g_.manager_record_slot(int(i)));
|
||||
if(ui_text(person,"id")!=*ids->array()->at(i).string())throw FormatError("archived manager identity mismatch");
|
||||
archived.push_back(std::move(person));
|
||||
}
|
||||
}
|
||||
A people,clubs;
|
||||
const auto &rows=context.career_ended?archived:*humans->array();
|
||||
for(const auto &person:rows) {
|
||||
const auto *slot=ui_field(person,"runtimeSlot");
|
||||
if(!person.object()||!slot||!slot->integer()||*slot->integer()<0||*slot->integer()>4)throw FormatError("invalid manager identity");
|
||||
O row=*person.object();row["portrait"]=int(g_.manager_records.at(size_t(*slot->integer())*0xb0c+0x221));people.push_back(std::move(row));
|
||||
}
|
||||
const bool blocked=live_||calendar_advance_active_||manager_join_||contract_quote_||transfer_offer_editor_||poach_||
|
||||
stadium_.investment||stadium_.tip||stadium_.periphery_quote||stadium_.block_expansion||desk_settings_owner_||live_settings_owner_||
|
||||
balance_draft_||strengths_owner_||top_scorers_owner_||opportunities_owner_||other_games_owner_||league_family_owner_||league_pairings_draft_;
|
||||
bool join=!context.career_ended&&!blocked&&g_.manager_teams.at(size_t(manager))!=no_team()&&people.size()<4;
|
||||
try { join=join&&manager_choices(revision).size()==people.size(); }catch(const std::exception &){join=false;}
|
||||
const auto *world=modern::current_world();
|
||||
const auto selection=selection_context(revision);
|
||||
for(int team=0;world&&team<league_clubs();++team) {
|
||||
const auto id=modern::ui_team_id(g_,team);const auto *club=world->club(id);const int league=team_league(team);
|
||||
if(!club||league<0||size_t(league)>=g_.world_league_id.size())continue;
|
||||
const bool playable=team<german_clubs()&&club->legacy_index>=0&&size_t(team)<selection.club_order.size()&&selection.club_order[size_t(team)]==club->legacy_index;
|
||||
clubs.push_back(O{{"id",id},{"leagueId",g_.world_league_id[size_t(league)]},{"playable",playable}});
|
||||
}
|
||||
return O{{"kind","manager-menu"},{"activeManagerId",context.career_ended?cli::Json(nullptr):cli::Json(modern::ui_manager_id(g_,manager))},{"ownerManagerId",modern::ui_manager_id(g_,manager)},
|
||||
{"ended",context.career_ended},{"canJoin",join},{"canResign",!context.career_ended&&!blocked&&people.size()==1},
|
||||
{"joinReason",join?"":people.size()>=4?"Es können höchstens vier Menschen mitspielen.":"In dieser Phase kann kein Mitspieler hinzugefügt werden."},
|
||||
{"resignReason",people.size()>1?"Die Übergabe an die KI bei mehreren Menschen ist noch nicht verfügbar.":blocked?"Bitte die offene Entscheidung zuerst abschließen.":""},
|
||||
{"surface",g_.indoor?"indoor":"outdoor"},{"managers",std::move(people)},{"clubs",std::move(clubs)}};
|
||||
}
|
||||
cli::Json ModernSession::ui_join_managers(const cli::Json &payload,const std::string &request_id,uint64_t &revision) {
|
||||
const auto previous=revision;
|
||||
auto checkpoint=manager_join_checkpoint();
|
||||
try {
|
||||
const auto menu=ui_manager_menu_data(revision);const auto *can=ui_field(menu,"canJoin");
|
||||
if(!can||!std::holds_alternative<bool>(can->value)||!std::get<bool>(can->value))throw FormatError(ui_text(menu,"joinReason"));
|
||||
const auto *confirmed=ui_field(payload,"confirmed"),*offered=ui_field(payload,"managers");
|
||||
const size_t old_count=ui_field(menu,"managers")->array()->size();
|
||||
if(!confirmed||!std::holds_alternative<bool>(confirmed->value)||!std::get<bool>(confirmed->value)||
|
||||
!offered||!offered->array()||offered->array()->empty()||old_count+offered->array()->size()>4)throw FormatError("confirmed manager choices required");
|
||||
const auto desk=desktop_projection(revision);auto options=desk.options;options.managers=int(old_count+offered->array()->size());
|
||||
ui::DeskRequest origin;origin.kind=ui::DeskRequestKind::open_menu;origin.menu_kind=29;origin.manager_slot=desk.manager_slot;origin.revision=revision;
|
||||
std::string error;if(!begin_manager_join(origin,options,revision,error))throw FormatError(error);
|
||||
std::vector<std::string> names,styles;
|
||||
for(const auto &person:*offered->array()) {
|
||||
const auto name=modern::normalized_manager_name(ui_text(person,"name"));const auto id=ui_text(person,"club"),style=ui_text(person,"portrait_style");
|
||||
const auto *portrait=ui_field(person,"portrait"),*strength=ui_field(person,"strength_choice");
|
||||
if(!name||(style!="photo"&&style!="painted")||!portrait||!portrait->integer()||*portrait->integer()<0||*portrait->integer()>11||
|
||||
!strength||!strength->integer()||*strength->integer()<0||*strength->integer()>2)throw FormatError("invalid manager choice");
|
||||
const auto *world=modern::current_world();const auto *club=world?world->club(id):nullptr;
|
||||
if(!club||club->legacy_index<0)throw FormatError("unknown selectable club");
|
||||
const auto context=manager_join_context();const auto found=std::find(context.club_order.begin(),context.club_order.end(),club->legacy_index);
|
||||
if(found==context.club_order.end())throw FormatError("club no longer selectable");
|
||||
const auto selected=int(found-context.club_order.begin());
|
||||
if(selected>=german_clubs())throw FormatError("only current domestic league clubs are selectable");
|
||||
const int league=team_league(selected);
|
||||
if(league<0||league>4)throw FormatError("only current domestic league clubs are selectable");
|
||||
ui::ManagerChoice choice;choice.slot=int(old_count+names.size());choice.master_club=club->legacy_index;choice.selection_club=selected;
|
||||
choice.start_league=league;choice.roster_revision=context.revision;choice.portrait=int(*portrait->integer());choice.strength=int(*strength->integer());
|
||||
try {choice.name=ui::utf8_to_original(*name);}catch(const std::exception &){choice.name="Manager "+std::to_string(choice.slot+1);}
|
||||
if(choice.name.empty()||choice.name.size()>24)choice.name="Manager "+std::to_string(choice.slot+1);
|
||||
if(!confirm_manager_join(choice,error))throw FormatError(error);names.push_back(*name);styles.push_back(style);
|
||||
}
|
||||
ui::CareerInitializationResult result;if(!commit_manager_join(result,revision,error))throw FormatError(error);
|
||||
for(size_t i=0;i<names.size();++i) {
|
||||
if(modern::ui_team_id(g_,g_.manager_teams.at(old_count+i))!=ui_text(offered->array()->at(i),"club"))throw FormatError("manager assigned to a different club");
|
||||
g_.manager_presentations.push_back({g_.manager_ids.at(old_count+i),names[i],styles[i]});
|
||||
}
|
||||
return modern::ui_command_result(request_id,previous,revision,{"session","desktop","manager-menu","squad","lineup"},"Mitspieler hinzugefügt.");
|
||||
}catch(const std::exception &e){restore_manager_join_checkpoint(std::move(checkpoint));revision=previous;return modern::ui_error(request_id,"manager_join_refused",e.what(),revision,false);}
|
||||
}
|
||||
Reference in new issue
Block a user