diff --git a/docs/new_engine/ui-anbindung.md b/docs/new_engine/ui-anbindung.md index 6d28cf7..0c3bf87 100644 --- a/docs/new_engine/ui-anbindung.md +++ b/docs/new_engine/ui-anbindung.md @@ -78,6 +78,7 @@ Die UI ruft diese über `DataSource::read_almanac` und `read_statistics` direkt | `budget.commit` | `budgetId` (`budget:merchandise`, `budget:press`, `budget:fans`), `amount` (`Money`) | setzt ein Budget; Fehler `unknown_budget`, `invalid_amount`, `advertising_refused` (z. B. Lieferung läuft, zu wenig Geld) | | `ticket.commit` | `price` (`Money`, 8–25 €) | der Eintrittspreis; Fehler `invalid_amount`, `ticket_refused` | | `transfer.submit` | `action: list`, `playerId`, optional `loan`; oder `action: bid`, `listingId`, `fee`, `monthlySalary` (`Money`), `years` 1–4, optional `loan` | setzt einen eigenen Spieler auf die Liste (bzw. bietet ihn zum Verleih an) oder gibt über den Angebotseditor des Originals ein Gebot ab (öffnen, Felder setzen, abschicken). `outcome`: `applied` (sofort angenommen), `offer_pending` (Antwort mit der nächsten Woche), `offer_rejected` (zu niedrig/abgelehnt). Fragt die Engine einen menschlichen Verkäufer (Abwerben), wird zurückgerollt: `decision_pending` (noch nicht unterstützt). Fehler `unknown_player`, `already_listed`, `unknown_listing`, `own_player`, `no_bid_slot`, `transfer_refused` | +| `manager.resign.commit` | `confirmed: true` | Aufgeben (neu in Modern, das Original kennt kein Aussteigen): Der letzte menschliche Manager beendet die Karriere (`outcome: career_ended`, `session`-Read `sessionState: "ended"`, danach antwortet jeder Befehl `career_ended`). Mit weiteren Menschen soll der Computer den Verein übernehmen; das braucht das Nachrücken aller Managertabellen und folgt (`resign_not_supported_yet`). Fehler `confirmation_required` | | `toto.submit` | `stake` (`Money` je Spalte), `columns` (bis 6 Spalten mit 11 Tipps: 1 Heim, 0 Unentschieden, 2 Auswärts) | gibt den Tippschein ab; Fehler `toto_refused` (z. B. kein offener Schein, Einsatzgrenzen, doppelte Spalte) | | `sponsor.answer` | `accept` | Antwort auf das Exklusiv-Sponsor-Angebot: beginnt sofort, wird vorgemerkt oder abgelehnt | | `quote.request` (Stadion) | `kind: periphery`, `objectId` oder `kind: facility`, `facilityId`, `increment` 1–3 | öffnet den Stadion-Dialog und holt das Angebot der Baufirma bzw. wählt Anlage und Stufen; `offer_pending`. Der Dialog bleibt offen (andere Schreibtisch-Einstellungen sind bis dahin gesperrt, `quote_open` für ein zweites Angebot) | diff --git a/src/modern/app/modern_session.cpp b/src/modern/app/modern_session.cpp index 0fb4df6..2151945 100644 --- a/src/modern/app/modern_session.cpp +++ b/src/modern/app/modern_session.cpp @@ -8896,6 +8896,7 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co context.next_opponent = desk.next_opponent; context.next_competition = desk.next_competition_label; context.next_away = desk.next_match_away; + 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 (manager < 0 || size_t(manager) >= g_.manager_teams.size() || @@ -9258,6 +9259,7 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision return refuse("manager_not_active", "Dieser Manager sitzt nicht am Schreibtisch."); const cli::Json* payload = ui_field(request, "payload"); if (!payload || !payload->object()) return refuse("invalid_payload", "Der Befehl braucht ein payload-Objekt."); + if (career_complete()) return refuse("career_ended", "Die Karriere ist beendet."); // a live kickoff stands still: only its own commands until it is finished if (live_ && !kind.starts_with("live.")) return refuse("live_running", "Ein Spieltag läuft live; erst live.step oder live.finish."); if (!live_ && kind.starts_with("live.")) return refuse("live_not_running", "Es läuft kein Live-Spieltag."); @@ -10025,6 +10027,25 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision answer = modern::ui_command_result(request_id, previous, revision, {"transfer", "squad", "desktop"}, feedback); if (bid_pending) std::get(answer.value)["outcome"] = "offer_pending"; } + } 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 + // other human managers the computer is to take the club over; that needs every per-manager + // table moved up a slot and is not supported yet. + const cli::Json* confirmed = ui_field(*payload, "confirmed"); + if (!confirmed || !std::holds_alternative(confirmed->value) || !std::get(confirmed->value)) + return refuse("confirmation_required", "Aufgeben muss bestätigt werden (confirmed: true)."); + if (career_complete()) return refuse("career_ended", "Die Karriere ist schon beendet."); + const int humans = g_.memory.has(::bmh::layout::CoachActive) && g_.memory.u8(::bmh::layout::CoachActive) != 0 && + g_.memory.has(::bmh::layout::OriginalManagerCount) + ? g_.memory.u8(::bmh::layout::OriginalManagerCount) : int(g_.manager_teams.size()); + if (humans > 1) + return refuse("resign_not_supported_yet", "Aufgeben bei mehreren menschlichen Managern folgt noch."); + turn_driver_.stage = TurnDriver::Stage::CareerComplete; + revision = previous + 1; + answer = modern::ui_command_result(request_id, previous, revision, {"session", "desktop"}, + "Sie haben aufgegeben. Die Karriere ist beendet."); + std::get(answer.value)["outcome"] = "career_ended"; } else if (kind == "toto.submit") { // payload {stake: Money per column, columns: [[11 tips: 1 home, 0 draw, 2 away], ... up to 6]} const cli::Json* stake = ui_field(*payload, "stake"); diff --git a/src/modern/content/ui_contract.cpp b/src/modern/content/ui_contract.cpp index 1af346b..e8225b5 100644 --- a/src/modern/content/ui_contract.cpp +++ b/src/modern/content/ui_contract.cpp @@ -152,7 +152,7 @@ J failure(const std::string& request_id, const char* code, const std::string& me J session_data(const ModernState& g, const UiContext& c) { A managers; for (int m = 0; m < human_managers(g); ++m) managers.push_back(manager_json(g, m, m == c.manager)); - return O{{"kind", "session"}, {"sessionState", "desktop"}, {"activeManagerId", manager_id(g, c.manager)}, + return O{{"kind", "session"}, {"sessionState", c.career_ended ? "ended" : "desktop"}, {"activeManagerId", manager_id(g, c.manager)}, {"managers", std::move(managers)}}; } diff --git a/src/modern/content/ui_contract.hpp b/src/modern/content/ui_contract.hpp index 5937f02..bb5f4a0 100644 --- a/src/modern/content/ui_contract.hpp +++ b/src/modern/content/ui_contract.hpp @@ -34,6 +34,7 @@ struct UiContext { std::optional next_opponent; std::string next_competition; bool next_away = false; + bool career_ended = false; // the last human manager resigned or the career ran out }; // Gives a career without them its identities: a career id ("career:" + 16 hex digits, drawn diff --git a/tests/modern_ui_contract_tests.cpp b/tests/modern_ui_contract_tests.cpp index 6f19e64..e6a1ff4 100644 --- a/tests/modern_ui_contract_tests.cpp +++ b/tests/modern_ui_contract_tests.cpp @@ -546,6 +546,19 @@ int main(int argc, char** argv) { const J curves = session.read_statistics_screen(O{{"section", 2}}); check(!club_desk || (at(curves, "series").array() && at(curves, "series").array()->size() == 6), "the six curves of the original"); } + // resigning: needs the confirmation; the last human manager ends the career + { + const auto resign = [&](const std::string& id, J payload) { + return session.ui_command(J(O{{"messageType", "command"}, {"requestId", id}, {"expectedRevision", std::to_string(rev)}, + {"owner", O{{"managerId", "manager:1"}}}, {"kind", "manager.resign.commit"}, + {"payload", std::move(payload)}}), rev); + }; + check(s(at(resign("request:r1", O{}), "code")) == "confirmation_required", "resigning needs the confirmation"); + const J done = resign("request:r2", O{{"confirmed", true}}); + check(s(at(done, "outcome")) == "career_ended", "the last human manager ends the career"); + check(s(at(at(session.ui_read(O{{"kind", "session"}}, rev), "data"), "sessionState")) == "ended", "session ended"); + check(s(at(resign("request:r3", O{{"confirmed", true}}), "code")) == "career_ended", "no command after the end"); + } } catch (const std::exception& ex) { std::fprintf(stderr, "FAIL: %s\n", ex.what()); return 1;