diff --git a/assets/modern/finance.rcss b/assets/modern/finance.rcss
index 2bfb9bf..93b385b 100644
--- a/assets/modern/finance.rcss
+++ b/assets/modern/finance.rcss
@@ -34,3 +34,7 @@ body.midnight .balance-panel h2,body.midnight .balance-plan h2 {color:#dce5ee;}
body.midnight .balance-summary-item {color:#c4d0da;}
body.midnight .balance-summary-item.balance-net,body.midnight .balance-plan-total {color:#a9dccb;}
body.midnight .balance-plan-value {background-color:#111f2a80;border-color:#c5d9e738;color:#dce5ee;}
+
+/* Balances use semantic money colours in every skin. */
+body .balance-native .balance-summary-item.money-amount {color:var(--money);}
+body .balance-native .balance-summary-item.money-amount.is-negative {color:var(--danger);}
diff --git a/docs/DIFFERENCES.md b/docs/DIFFERENCES.md
index 8ab173d..70512a2 100644
--- a/docs/DIFFERENCES.md
+++ b/docs/DIFFERENCES.md
@@ -51,6 +51,7 @@ describe deliberate changes; they are not a list of every known compatibility li
- [src/modern/game/weekly.hpp](../src/modern/game/weekly.hpp): uses the supported weekly processing and transfer rule profile.
- [src/modern/ui/demo_calendar.cpp](../src/modern/ui/demo_calendar.cpp): the native season follows its saved start year (including leap days), rather than the HTML's fixed 2027/28.
- [src/modern/ui/engine_achievements.cpp](../src/modern/ui/engine_achievements.cpp): shows recorded manager history between seasons without inventing future results.
+- [src/modern/ui/engine_balance.cpp](../src/modern/ui/engine_balance.cpp): viewing a balance is read-only and publishing a changed plan requires explicit confirmation.
- [src/ui/league_table.hpp](../src/ui/league_table.hpp): uses three points for a win in the supported rule profile.
- [src/ui/pitch.cpp](../src/ui/pitch.cpp): supports owner-bound designated set-piece selection in the extended manager record.
- [src/ui/save_load.cpp](../src/ui/save_load.cpp): focuses the host save filename on entry and selects an existing name for replacement.
diff --git a/docs/new_engine/datenformat.md b/docs/new_engine/datenformat.md
index 3f703b8..2e81c8c 100644
--- a/docs/new_engine/datenformat.md
+++ b/docs/new_engine/datenformat.md
@@ -141,6 +141,14 @@ Die bestehende Regel `rule:training-camps` (Typ `training_camps`) bleibt und wir
### F8 · Optionale Managerdarstellung (29.10.2026)
+Der Modern-Sessionkontext (`state/session.json`, vorhandenes Schema
+`classic-session@1.0`) darf zusätzlich die bis zu vier bekannten flüchtigen
+PlanTicketPrice-Bytes enthalten, wenn sie nicht im serialisierten Speicherblock
+liegen. Der Leser prüft ihre ursprüngliche Preisgrenze 0–25; die bisherigen
+Pflichtadressen und Duplikat-/Unbekannt-Prüfungen bleiben erhalten. Das behebt
+#26, ohne Classic oder die Byteanordnung der Spielwerte zu verändern.
+Editor: keine Anpassung; der Editor liest keine Karriere-/Sessiondateien.
+
Das Postfach darf außerdem `news_marks` speichern: eine Map kanonischer
Manager-IDs auf Nachrichten-IDs und deren UI-Bits (`1` gelesen, `2` Papierkorb).
Fehlende Markierungen bedeuten ungelesen/im Posteingang; leere Besitzermaps
diff --git a/docs/new_engine/ui-anbindung.md b/docs/new_engine/ui-anbindung.md
index 00b550d..cd8e42f 100644
--- a/docs/new_engine/ui-anbindung.md
+++ b/docs/new_engine/ui-anbindung.md
@@ -34,6 +34,7 @@ Revision kommt vom Aufrufer (Konsole bzw. AppController), der Read ändert nicht
| `contracts` | je Spieler Restlaufzeit, Monatsgehalt, Versicherung, Prämien; das offene Angebot (`quote`: ID, Spieler, Monatsforderung für 1–4 Jahre, Höchstgehalt 200.000 €) |
| `advertising` | 14 Banden (`ad:board/`), Trikot (`ad:shirt`), TV-Rechte (`ad:tv`) je mit Vertrag (Sponsor, Monatsbetrag, Restmonate, Verlängerung, Option) und den offenen Angeboten (`offer:ad--`, Sponsor, Betrag, Banden, Monate, `allowed`); die drei Budgets (Merchandising, Presse, Fanarbeit) mit Stand, Höchstbetrag, Lieferwochen; die Finanzvorschau des Originals |
| `stadium` | Umfeld (14 Objekte mit Namen und Bautagen; Verkehrsanbindung mit `stage` und `maxStage`: Classic 3, Modern-Welt 4; sonst `built`), die acht Anlagen (Stufe, Höchststufe, Bauwochen, ob ausbaubar), die acht Tribünenblöcke (Plätze, Höchstplätze, Sitzplätze, Dach, Bauwochen, Plätze nach dem Bau), Eintrittspreis (8–25 €); das offene Angebot des Stadion-Dialogs (`quote`: Umfeld mit Preis, oder Anlage mit Zielstufe, Preis, Bauwochen und dem Trinkgeld-Bereich 6–14 %) |
+| `balance` | `view` current/real/future, optional `edits [{id: balance:<0–17>, amount: Money}]`; liefert ursprüngliche Posten/Labels/Grenzen, sechs Zusatzwerte, Abschreibung, Nettoergebnis und Bilanzwarnung. Prognose auf eigener Kopie, kein RNG/Live-Publish. |
| `achievements` | Reine Manager-Saisonhistorie am Vereinsschreibtisch: `managerId`, aktuelles `teamId`, `currentSeasonYear`, `records` mit Jahr/Abschlussstatus, Liga-ID/Platz/Teilnehmerzahl und ursprünglichen Pokal-/Europapokalständen samt Text. Keine historische Vereinszuordnung erfinden. `available` bedeutet vorhandene Aufzeichnungen; `originalMenuAvailable` nennt zusätzlich die bisherige Ligaspiel-Sperre. Abgeschlossene Daten bleiben in der Modern UI auch zwischen Saisons lesbar; ungespielte neue Saisons werden nicht ergänzt. Kein RNG oder Schreibvorgang. |
| `transfer` | die Transferliste (`listing:`: Spieler, Alter, Position, Stärke, Verkäufer, Ablöseforderung, Gehaltsreferenz pro Monat, Gehaltsforderung in %, Zahl der Angebote, eigene Listung, eigenes Gebot), der eigene Kader (gelistet oder nicht), Kontostand, Kreditrahmen; `details` je Spieler mit vollständigem Namen, Nationalität, Foto, Kondition/Technik/Form und sieben Fähigkeiten; `activeStrengths`/`teamStrengths` enthalten vier Positionen und Gesamtschnitt. `ownBid.monthlySalary` ist das gespeicherte Monatsgehalt; `annualSalary` bleibt als früher irreführend benannter Alias erhalten. `salaryReferencePeriod: month`. `loanAvailable` sperrt vereinslose Anbieter; `offerTerms` liefert Kauf-/Leihgebühr, jeweilige maximale Gebühr und maximales Monatsgehalt aus den Original-Editorgrenzen. `ownBid.loan` bezeichnet die gespeicherte Leihart. `ownBid.bonuses` sind sieben gespeicherte Prämienstufen. Die Projektion und Gebotsprüfung verwenden den weltabhängigen Modern-Pool, nicht Classic `0xb70` (#24). |
| `news` | Presseereignisse eines Teams (`teamId`, Vorgabe das Team am Schreibtisch), `from`/`until` (ISO, Vorgabe bis heute), `limit` (Vorgabe 50, die neuesten): `events` je `{id, type, date, scope, data, variant: null}` nach [Pressevertrag](../new_ui/integration/PRESS.md), `total`. Quelle ist der Almanach, darum gleich bei jedem Lesen und mit stabiler ID (`press-event:::`). Typen: `match.result`, `cup.round_result`, `cup.final_result`, `cup.extra_time`, `cup.penalties`, `player.sent_off`, `player.injury`, `run.wins` (3/5/8/10/15), `run.unbeaten` (5/10/15/20/30), `run.winless` (5/8/10/15), `run.losses` (3/5/8/10), `league.position`, `league.champion`, `cup.won`, `indoor.won`. Fakten: `team`, `opponent`, `competition` (mit `kind`, `season`), `matchId`, `score {for, against}` aus Sicht des Teams, `venue`, `trailed`, `minute` (das entscheidende Tor), `outcome`, `round`, `shootout`, `player`, `matches`, `position`, `points`. Dazu Geschäftsereignisse aus dem Pressejournal im Spielstand (`state/modern.json`, `press`): beim Anstoß aus dem Kadervergleich der menschlichen Vereine `transfer.signed` (`fromClub`), `transfer.free`, `transfer.sold` (`toClub`; auch ein freigegebener Spieler, der im selben Anstoß woanders unterschreibt), `contract.ended`; `toto.win`/`toto.loss` (`amount`); `career.season_finished`/`career.season_started`; beim Saisonwechsel `league.promoted`/`league.relegated` (`competition` die neue, `from` die alte Liga); aus bestätigten Befehlen `contract.extended` (`years`, `wage`), `advertising.signed` (`company`, `amount` monatlich, `months`, `place` boards/shirt/tv), `finance.loan_approved`/`finance.loan_repaid` (`amount`, `bank`), `stadium.expansion_planned` (`block`, `seats` Ziel insgesamt) und `career.manager_resigned`. Ablösen kennt der Kadervergleich nicht (`fee: null`). Ohne Welt-IDs (Classic-Daten) heißt ein Verein `team:`, die sich zum Saisonstart ändern kann. Monatlich `finance.profit`/`finance.loss` (`amount` die Veränderung des Kontostands im abgelaufenen Monat, alles Gebuchte eingeschlossen, `month` als JJJJ-MM; vermerkt beim ersten Anstoß im neuen Monat). Beim Anstoß `stadium.expansion_finished` (`count` die Plätze des Stadions danach), wenn die Bauzeit eines Tribünenblocks abläuft. Noch nicht: Derby, Aktien. Dazu `messages`: das Postfach des Managers am Schreibtisch (die Nachrichten des Originals; `id` stabil `message:-`, auch wenn das Original seine Einträge zusammenschiebt; `subject` die erste Zeile, `paragraphs` der Text, `read`, `folder` inbox/archive/trash); `articles` leer (die UI rendert und hält ihre Artikel), `dedupePolicyId` |
@@ -100,6 +101,7 @@ Die UI ruft diese über `DataSource::read_almanac` und `read_statistics` direkt
| `live.tactics` | `values` (8) | Taktik wie im Taktik-Bildschirm während des Spiels; Fehler `invalid_tactic` |
| `live.finish` | `{}` | spielt den Spieltag ohne weiteren Halt zu Ende; Antwort wie `session.advance` (bei fehlender Vertragsentscheidung wird der ganze Live-Spieltag zurückgerollt: `decision_pending`) |
| `bank.commit` | `action` `deposit`/`withdraw` mit `amount` (`Money`, ganze Euro) oder `buy`/`sell` mit `assetId` (`stock:`, `fund:`) und `count` oder `credit` mit `lenderId` (optional), `edits` wie im Read `credit` und `acceptFees` (Gebühren wie im Original bestätigen) | wie die Bank am Schreibtisch; Fehler `invalid_amount`, `amount_unavailable`, `invalid_share_count`, `insufficient_funds`, `investment_limit`, `invalid_fund_count` u. a. |
+| `balance.commit` | view future, nichtleere edits wie im Read, acceptWarning bei Bilanzwarnung | übernimmt die mit vorhandenen Core-Funktionen rekonstruierte Zukunftsplanung; keine unmittelbare Cash-Buchung. Fehler invalid_payload, confirmation_required, balance_refused; veraltete Karriere/Manager/Revision wie üblich. |
| `news.update` | `messageId`, `action` `read`/`unread`/`archive`/`trash`/`restore` | eine Nachricht des eigenen Postfachs: gelesen und Papierkorb sind Markierungen der Oberfläche (im Spielstand, `news_marks` je Manager; die Nachricht bleibt im Postfach des Originals, `restore` holt sie zurück), `archive` ist das „Behalten“ des Originals (eine behaltene Nachricht wird bei vollem Postfach nicht verdrängt), `restore` gibt sie wieder frei. Endgültiges Löschen bietet die Schnittstelle nicht an. Unverändert: `no_change`; Fehler `unknown_message` |
| `lineup.commit` | `order`: Spieler-IDs in der gewünschten Reihenfolge | öffnet die Aufstellung wie am Schreibtisch und tauscht die Zeilen; Fehler `unknown_player`, `lineup_refused` (z. B. Verletzte, Ausländerregel) |
| `tactics.commit` | `values`: die acht Werte | jede geänderte Einstellung über die Prüfung der Taktiktafel (eine gesetzte Grundausrichtung beendet die Steuerung durch den Assistenten); Fehler `invalid_tactic` |
diff --git a/docs/new_ui/README.md b/docs/new_ui/README.md
index 55cf65b..09f12ba 100644
--- a/docs/new_ui/README.md
+++ b/docs/new_ui/README.md
@@ -38,6 +38,7 @@ Implementierung in der Spiel-Engine.
| TOTO | [Sechs Tipp-Spalten und Vormerkung](desktop/toto/README.md) |
| Bank | [Sparbuch, Immobilien, Aktien und Kredit](desktop/bank/README.md) |
| Bilanz | [Aktuelle Bilanz und Zukunftsplanung](desktop/balance/README.md) |
+| Tatsächliche Bilanz | [Sessionwerte, reine Prognose und bestätigte Planung](desktop/balance/ENGINE.md) |
| Verträge | [Kaderdaten, Angebote, Versicherung und Prämien](desktop/contracts/README.md) |
| Almanach | [Echte Archivjahre, Tagespartien und historische Spielberichte](desktop/almanac/README.md) |
| Paarungsanordnung | [Mittige Ergebnisse und innenliegende Wappen](desktop/fixtures/README.md) |
diff --git a/docs/new_ui/desktop/balance/ENGINE.md b/docs/new_ui/desktop/balance/ENGINE.md
new file mode 100644
index 0000000..fef146a
--- /dev/null
+++ b/docs/new_ui/desktop/balance/ENGINE.md
@@ -0,0 +1,24 @@
+
+# Tatsächliche Bilanz und Planung · 29. Oktober 2026
+
+Der native Engine-Einstieg verwendet denselben Bilanz-Presenter wie die HTML-/Demoansicht. Gebuchte Werte und Prognosen stammen ausschließlich aus den vorhandenen Modern-BalancePlan-Funktionen; die UI berechnet weder Gehälter noch Einnahmen oder Zuschauermengen selbst.
+
+`ui_read balance` liefert die 18 ursprünglichen Posten (sieben Einnahmen, elf Ausgaben), sechs Zusatzwerte, Abschreibung und Nettoergebnis. Die ursprünglichen Ansichten `current` (bisher), `real` (gebucht plus Restjahr) und `future` (zwölf Monate) bleiben im Read unterscheidbar. Die Gold-Oberfläche verwendet weiterhin die beiden Ansichten Aktuell und Zukunft. Abschreibungen werden entsprechend ihrem tatsächlichen Vorzeichen als Ausgabe oder Gutschrift dargestellt. Beträge haben ausdrücklich EUR/2, unabhängig von der Importwährung im Weltmanifest.
+
+Die Zukunftsansicht erlaubt die elf ursprünglichen Ausgabenposten mit ihren tatsächlichen Eingabegrenzen. Änderungen werden zunächst als lokale, revisionsgebundene Eingaben an die reine Engine-Vorschau geschickt. Die vorhandene Normalisierung auf zwölf Monate und gespeicherte Anpassungen bleiben maßgeblich. Ein erneut auf den Ausgangswert gesetzter Posten entfernt die lokale Änderung. Die Vorschau hält keinen pausierten Legacy-Bildschirm und zieht keinen RNG.
+
+Beim Verlassen eines geänderten Entwurfs stehen Übernehmen, Entwurf verwerfen und Abbrechen zur Verfügung. Die Bestätigung nennt das tatsächliche prognostizierte Ergebnis und gegebenenfalls die ursprüngliche Bilanzwarnung. Nur `balance.commit` schreibt nach Bestätigung die vorhandenen Planfelder. Die Planänderung ist keine unmittelbare Geldbuchung. Auch Speichern, Laden und OS-Beenden berücksichtigen einen noch nicht übernommenen lokalen Entwurf.
+
+Das flüchtige `PlanTicketPrice` wird wie beim vorhandenen Sessionbesitzer aus Speicher/Laufzeitbereich/Edition aufgelöst. Ein fehlender Saveblock wird nicht durch einen geratenen Preis ersetzt oder neu in den Live-Speicher aufgenommen. Veröffentlicht werden nur die ursprünglichen Managerfelder und der bestehende geplante Eintrittspreis im passenden Speicherbereich.
+
+Bewusste Abweichung der neuen Oberfläche: reines Öffnen/Umschalten oder das Verwerfen eines lokalen Entwurfs schreibt keine automatisch errechnete Planung. Das ursprüngliche Schließen speichert auch seine berechneten Bildschirmwerte; der neue Geld-Dialog erfordert dafür eine ausdrückliche Bestätigung. Saisonberechnungen, DFB-Regel, Classic und Welt-/Spielstandformat bleiben unverändert.
+
+## Speicherrundreise
+
+Der Modern-Sessionleser akzeptiert die vier nachgewiesenen optionalen
+PlanTicketPrice-Laufzeitbytes auch dann, wenn der originale Save-Speicherblock
+fehlt. Werte außerhalb 0–25, unbekannte Adressen und Duplikate bleiben gesperrt;
+die übrigen bisherigen Laufzeitbytes sind weiterhin Pflicht. Alte OBS-Dateien
+ohne diese optionalen Einträge bleiben lesbar. Dies korrigiert den Gegenfall
+#26: Eine erfolgreich gespeicherte Planung war zuvor nicht erneut ladbar.
+Classic und das Session-Schema bleiben unverändert.
diff --git a/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md b/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md
index e0de96f..b6884d2 100644
--- a/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md
+++ b/docs/new_ui/integration/NATIVE_ENGINE_COVERAGE.md
@@ -3,10 +3,10 @@
Dies ist eine Routenübersicht des nativen Engine-Einstiegs auf `0.3`, keine
Fertigstellungsquote des gesamten Spiels. HTML-/Demo-Presenter sind getrennt
-von echten Karrierewerten. Stand einschließlich Transfermarkt, Erfolgsverlauf und Nachrichtenpostfach.
+von echten Karrierewerten. Stand einschließlich Transfermarkt, Erfolgsverlauf, Nachrichtenpostfach und Bilanz.
-Von 32 Desktoprouten sind 26 an Sessiondaten bzw. tatsächliche Aktionen
-angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Fünf weitere
+Von 32 Desktoprouten sind 27 an Sessiondaten bzw. tatsächliche Aktionen
+angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Vier weitere
Routen besitzen ihre Präsentation, sind im echten Einstieg aber noch nicht
freigeschaltet. Rollen-, Termin- und Angebotssperren können auch eine angebundene
Route vorübergehend deaktivieren; insbesondere hat der Nationaltrainer weniger
@@ -25,6 +25,7 @@ Vereinsmenüs.
| Transfermarkt | Tatsächliche Kader-/Marktwerte und Gebote, lokale Suche, bestätigte Listung und Kauf-/Leihangebote | Abwerben, Entfernen und Zurücknehmen sind sichtbar gesperrt; ursprüngliche Prämienstufen bleiben erhalten |
| Erfolge | Tatsächliche Manager-Saisonaufzeichnungen, Ligafarben aus Weltregeln, aktueller Zwischenstand und Karriereverlauf | Keine fiktiven Vorjahre oder erfundene historische Vereinszuordnung; Nationaltrainer gesperrt |
| Nachrichten | Tatsächliche Postfachtexte, bestätigte Leser-/Ordneraktionen, Wiederherstellung und aus Engine-Fakten gerenderte Berichte | Presseberichte bleiben bis zu ihrer eigenen Zustandsanbindung schreibgeschützt; Nationalrechte werden beachtet |
+| Bilanz | Gebuchte 18 Posten, Abschreibung, echte Zwölfmonatsprognose, bestätigte Planung und OBS-Rundreise | Gold bietet Aktuell/Zukunft; der zusätzliche ursprüngliche Real-Read bleibt separat verfügbar |
| Große Statistik | Vorhandene Almanachauswertungen, tatsächliche Transfer-/Analyticswerte | Titelchancen, fehlende Saisonfinanzen und nicht aufgezeichnete Turnierbereiche bleiben leer |
| Almanach | Tatsächlich aufgezeichnete Spiele, Details und Ereignisse | Keine Rekonstruktion unbekannter historischer Werte |
| Toto | Echte elf Spiele, sechs Spalten, Kostenprüfung, bestätigte Abgabe/Rücknahme und letzte Abrechnung | Abrechnung am Spieltagsende; unvollständiges Programm gesperrt |
@@ -38,7 +39,6 @@ Vereinsmenüs.
| Hallentabellen | HTML-/RmlUI-Ansicht und Indoor-Presenter | Tatsächliche Turnierphase und Tabellen/Teilnehmer liefern |
| Einstellungen im Karriere-Desktop | Gemeinsamer globaler/lokaler Einstellungsdialog | Spiel-/Automatikwerte und Plattformwirkung sauber anbinden; Hauptmenüpräferenzen sind separat vorhanden |
| Highscore | Gemeinsamer Presenter und ursprüngliche Ranglistenprojektion | Tatsächlichen Ranglistenbesitzer und Speicherweg anbinden |
-| Bilanz | Gemeinsamer Presenter und bestehender Session-Planungsdienst | Aktuell/Zukunft ohne POC-Schätzwerte projizieren |
| Manager | Präsentation für Hinzufügen, Aufgeben und spätere Vereinssuche; Sessionaktionen vorhanden | Join/Abgabe an aktuelle Menschen und Besitzwechsel binden |
Desktop-Widgets sind ebenfalls noch nicht vollständig gebunden. Statusleiste,
diff --git a/src/modern/app/modern_session.cpp b/src/modern/app/modern_session.cpp
index 8aa1cae..86f401a 100644
--- a/src/modern/app/modern_session.cpp
+++ b/src/modern/app/modern_session.cpp
@@ -42,6 +42,7 @@
#include "import/save.hpp"
#include
+#include
#include
#include
#include
@@ -7825,12 +7826,22 @@ void ModernSession::restore_native_session_context(const cli::Json &root) {
if (!row.object() || !row.object()->contains("address") || !row.object()->contains("value"))
throw FormatError("Invalid runtime byte");
const auto at = uint32_t(integer(row.object()->at("address"), 0, UINT32_MAX));
- if (!club_modal_runtime_.contains(at) ||
- !runtime.emplace(at, uint8_t(integer(row.object()->at("value"), 0, 255))).second)
+ const auto value = uint8_t(integer(row.object()->at("value"), 0, 255));
+ const bool planned_ticket = at >= ::bmh::layout::PlanTicketPrice &&
+ at < ::bmh::layout::PlanTicketPrice + 4 && !g_.memory.has(at);
+ if ((!club_modal_runtime_.contains(at) && !planned_ticket) ||
+ !runtime.emplace(at, value).second)
throw FormatError("Unknown or duplicated runtime byte");
+ if (planned_ticket && value > 25)
+ throw FormatError("Invalid planned ticket price");
+ }
+ for (const auto &[address, value] : club_modal_runtime_) {
+ (void)value;
+ const bool planned_ticket = address >= ::bmh::layout::PlanTicketPrice &&
+ address < ::bmh::layout::PlanTicketPrice + 4 && !g_.memory.has(address);
+ if (!planned_ticket && !runtime.contains(address))
+ throw FormatError("Incomplete native runtime bytes");
}
- if (runtime.size() != club_modal_runtime_.size())
- throw FormatError("Incomplete native runtime bytes");
std::vector callargs;
for (const auto &row : array(field("desk_callargs"), 4)) {
const auto &fields = array(row, 2);
@@ -8764,6 +8775,8 @@ std::string ui_text(const cli::Json& j, const char* key) {
return v && v->string() ? *v->string() : std::string{};
}
+#include "modern/app/ui_balance.inc"
+
// The original mailbox of a manager, each message with an id that stays the same while the
// mailbox shifts its entries (the entry index does not): "message:-", "-"
// for the n-th equal message of a day.
@@ -9000,12 +9013,20 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
return answer;
}
if (manager < 0 || size_t(manager) >= g_.manager_teams.size() ||
- (kind != "achievements" && kind != "statistics" && kind != "opening" && kind != "lineup" && kind != "tactics" && kind != "training" && kind != "bank" && kind != "contracts" &&
+ (kind != "balance" && kind != "achievements" && kind != "statistics" && kind != "opening" && kind != "lineup" && kind != "tactics" && kind != "training" && kind != "bank" && kind != "contracts" &&
kind != "advertising" && kind != "stadium" && kind != "transfer" && kind != "postmatch" && kind != "credit" &&
!(kind == "friendly" && g_.manager_teams[size_t(manager)] == no_team())))
return modern::ui_read(g_, context, request);
if (const std::string 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);
+ if (kind == "balance") {
+ try {
+ return modern::ui_snapshot(g_, context, request_id,
+ ui_balance_plan(g_, exe_, club_modal_runtime_, manager, request).data);
+ } catch (const std::exception &e) {
+ return modern::ui_error(request_id, "balance_unavailable", e.what(), revision, false);
+ }
+ }
if(kind=="achievements") {
const int team=g_.manager_teams[size_t(manager)];
if(team<0||team>=league_clubs()||manager>3)return modern::ui_error(request_id,"no_club","Erfolge sind am Vereinsschreibtisch verfügbar.",revision,false);
@@ -10585,6 +10606,33 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
if (!dispatch_ticket_price(r, revision, error)) { restore(); return refuse("ticket_refused", error); }
if (revision != previous) revision = previous + 1;
answer = modern::ui_command_result(request_id, previous, revision, {"stadium"}, "Eintrittspreis gesetzt.");
+ } else if (kind == "balance.commit") {
+ if (balance_active() || transfer_offer_editor_ || contract_quote_ || stadium_.block_expansion)
+ return refuse("decision_pending", "Bitte die offene Entscheidung zuerst abschließen.");
+ if (ui_text(*payload, "view") != "future")
+ return refuse("invalid_payload", "Eine Zukunftsplanung wird benötigt.");
+ const auto *edits = ui_field(*payload, "edits");
+ if (!edits || !edits->array() || edits->array()->empty())
+ return refuse("invalid_payload", "Keine Planänderungen vorhanden.");
+ try {
+ auto plan = ui_balance_plan(g_, exe_, club_modal_runtime_, manager, *payload);
+ const auto *accept = ui_field(*payload, "acceptWarning");
+ if (plan.warning && (!accept || !std::holds_alternative(accept->value) ||
+ !std::get(accept->value)))
+ return refuse("confirmation_required", "Die Bilanzwarnung muss bestätigt werden.");
+ const auto address = ::bmh::layout::PlanTicketPrice + uint32_t(manager);
+ g_.manager_records = std::move(plan.records);
+ if (g_.memory.has(address))
+ g_.memory.set8(address, plan.ticket);
+ else
+ club_modal_runtime_[address] = plan.ticket;
+ revision = previous + 1;
+ answer = modern::ui_command_result(request_id, previous, revision,
+ {"balance", "desktop"}, "Bilanzplanung übernommen.");
+ } catch (const std::exception &e) {
+ restore();
+ return refuse("balance_refused", e.what());
+ }
} else if (kind == "bank.commit") {
// payload {action: deposit|withdraw, amount: Money} or {action: buy|sell, assetId: stock:|fund:, count}
const std::string action = ui_text(*payload, "action");
diff --git a/src/modern/app/ui_balance.inc b/src/modern/app/ui_balance.inc
new file mode 100644
index 0000000..b0f1f6c
--- /dev/null
+++ b/src/modern/app/ui_balance.inc
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: GPL-3.0-only
+// Transport adapter for the existing, pure balance-plan draft operations.
+struct UiBalancePlan {
+ BalancePlanDraft draft;
+ std::vector records;
+ uint8_t ticket = 0;
+ bool warning = false;
+ cli::Json data;
+};
+UiBalancePlan ui_balance_plan(const ModernState &state, const LeImage &exe,
+ const std::map &runtime,
+ int manager, const cli::Json &query) {
+ using J = cli::Json;
+ using O = J::Object;
+ using A = J::Array;
+ if (manager < 0 || manager >= 4 ||
+ size_t(manager) >= state.manager_teams.size() ||
+ state.manager_teams[size_t(manager)] < 0 ||
+ state.manager_teams[size_t(manager)] >= modern::league_clubs())
+ throw FormatError("balance_requires_club");
+ if (!state.memory.has(::bmh::layout::GameMode) ||
+ state.memory.u8(::bmh::layout::GameMode) != 3)
+ throw FormatError("balance_requires_mode_three");
+ const auto view = ui_text(query, "view");
+ const int wanted = view.empty() || view == "current" ? 0
+ : view == "real" ? 1
+ : view == "future" ? 2
+ : -1;
+ if (wanted < 0)
+ throw FormatError("invalid_balance_view");
+ ModernState work = state;
+ if (!work.memory.has(::bmh::layout::PlanTicketPrice))
+ work.memory.add_block(::bmh::layout::PlanTicketPrice, 4);
+ for (int i = 0; i < 4; ++i)
+ work.memory.set8(
+ ::bmh::layout::PlanTicketPrice + uint32_t(i),
+ source_runtime_byte(state, runtime, exe,
+ ::bmh::layout::PlanTicketPrice + uint32_t(i)));
+ auto draft = modern::open_balance_plan(work, manager);
+ for (int i = 0; int(draft.view) != wanted && i < 3; ++i)
+ modern::cycle_balance_view(work, draft);
+ A applied;
+ const auto *edits = ui_field(query, "edits");
+ if (edits) {
+ if (!edits->array() || edits->array()->size() > 18)
+ throw FormatError("invalid_balance_edits");
+ std::set seen;
+ for (const auto &edit : *edits->array()) {
+ const auto id = ui_text(edit, "id");
+ int row = -1;
+ if (std::sscanf(id.c_str(), "balance:%d", &row) != 1 ||
+ id != "balance:" + std::to_string(row) || row < 0 || row >= 18 ||
+ !seen.insert(row).second)
+ throw FormatError("invalid_balance_row");
+ const auto *value = ui_field(edit, "amount");
+ const auto *units = value ? ui_field(*value, "minorUnits") : nullptr;
+ if (!value || ui_text(*value, "currency") != "EUR" || !units ||
+ !units->integer() || *units->integer() != 2)
+ throw FormatError("invalid_balance_money");
+ const auto raw = ui_text(*value, "minor");
+ size_t end = 0;
+ int64_t cents = -1;
+ try {
+ cents = std::stoll(raw, &end);
+ } catch (const std::exception &) {
+ throw FormatError("invalid_balance_money");
+ }
+ if (end != raw.size() || raw != std::to_string(cents) || cents < 0 ||
+ cents % 100 || cents / 100 > INT32_MAX)
+ throw FormatError("invalid_balance_money");
+ if (modern::edit_balance_plan(work, draft, row, int32_t(cents / 100)) !=
+ BalanceEditStatus::changed)
+ throw FormatError("balance_edit_refused");
+ applied.push_back(
+ O{{"id", id}, {"amount", modern::ui_money(cents / 100)}});
+ }
+ }
+ if (!std::isfinite(draft.total) || draft.total < INT32_MIN ||
+ draft.total > INT32_MAX)
+ throw FormatError("balance_total_overflow");
+ const auto label = [&](uint32_t address) {
+ if (!state.texts || address < ::bmh::layout::TextPointerTable ||
+ (address - ::bmh::layout::TextPointerTable) % 4)
+ throw FormatError("balance_label_unavailable");
+ return ui::original_to_utf8(
+ (*state.texts)[(address - ::bmh::layout::TextPointerTable) / 4]);
+ };
+ A items, summaries;
+ int64_t income = 0, costs = 0;
+ for (int row = 0; row < 18; ++row) {
+ const auto amount = draft.rows[size_t(row)];
+ const auto maximum = modern::balance_row_maximum(draft, row);
+ if (row < 7)
+ income += amount;
+ else
+ costs += amount;
+ items.push_back(
+ O{{"id", "balance:" + std::to_string(row)},
+ {"label", label(::bmh::layout::BalancePlan_DrawRows_TextPointer5 +
+ uint32_t(row) * 4)},
+ {"section", row < 7 ? "income" : "costs"},
+ {"amount", modern::ui_money(amount)},
+ {"editable", wanted != 0 && maximum >= 0},
+ {"minimum", modern::ui_money(0)},
+ {"maximum", maximum >= 0 ? modern::ui_money(maximum) : J(nullptr)}});
+ }
+ for (int row = 18; row < 24; ++row)
+ summaries.push_back(
+ O{{"id", "balance:" + std::to_string(row)},
+ {"label", label(::bmh::layout::BalancePlan_DrawRows_TextPointer4 +
+ uint32_t(row - 18) * 4)},
+ {"unit", row == 21 || row == 23 ? "money" : "count"},
+ {"value", row == 21 || row == 23
+ ? modern::ui_money(draft.rows[size_t(row)])
+ : J(int64_t(draft.rows[size_t(row)]))}});
+ const bool warning = modern::close_balance_plan(work, draft);
+ UiBalancePlan result;
+ result.draft = draft;
+ result.records = std::move(work.manager_records);
+ result.ticket =
+ work.memory.u8(::bmh::layout::PlanTicketPrice + uint32_t(manager));
+ result.warning = warning;
+ result.data = O{
+ {"kind", "balance"},
+ {"teamId",
+ modern::ui_team_id(state, state.manager_teams[size_t(manager)])},
+ {"view", wanted == 0 ? "current"
+ : wanted == 1 ? "real"
+ : "future"},
+ {"edits", std::move(applied)},
+ {"items", std::move(items)},
+ {"summaries", std::move(summaries)},
+ {"months", draft.months_left},
+ {"income", modern::ui_money(income)},
+ {"costs", modern::ui_money(costs)},
+ {"depreciation", modern::ui_money(draft.depreciation)},
+ {"depreciationLabel",
+ label(::bmh::layout::BalancePlan_DrawRows_TextPointer6)},
+ {"net", modern::ui_money(int64_t(std::llround(draft.total)))},
+ {"warning", warning},
+ {"warningText",
+ warning ? label(::bmh::layout::BalancePlan_BalanceFromGame_TextPointer2)
+ : std::string()}};
+ return result;
+}
diff --git a/src/modern/content/ui_contract.cpp b/src/modern/content/ui_contract.cpp
index c49098b..21f47b9 100644
--- a/src/modern/content/ui_contract.cpp
+++ b/src/modern/content/ui_contract.cpp
@@ -154,7 +154,7 @@ A allowed_commands(const ModernState& g, const UiContext& c) {
"session.advance", "lineup.commit", "tactics.commit", "friendly.book", "manager.resign.commit",
"training.commit", "camp.book", "bank.commit", "toto.submit", "quote.request", "contract.offer",
"stadium.commit", "advertising.accept", "budget.commit", "ticket.commit", "transfer.submit",
- "sponsor.answer", "environment.commit", "fixture.reschedule", "contract.cancel", "news.update"};
+ "sponsor.answer", "environment.commit", "fixture.reschedule", "contract.cancel", "news.update", "balance.commit"};
A out;
for (size_t i = 0; i < std::size(kAll); ++i)
if (!national || i < 5) out.push_back(kAll[i]);
diff --git a/src/modern/ui/CMakeLists.txt b/src/modern/ui/CMakeLists.txt
index eb70d63..3eb5fec 100644
--- a/src/modern/ui/CMakeLists.txt
+++ b/src/modern/ui/CMakeLists.txt
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-only
-add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp engine_news.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
+add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp engine_news.cpp engine_balance.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
add_library(bmh_modern_ui_mods STATIC mod_library.cpp)
@@ -49,7 +49,7 @@ foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss report
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
endforeach()
-foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection news_projection)
+foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection news_projection balance_projection)
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
if(MSVC)
diff --git a/src/modern/ui/engine_balance.cpp b/src/modern/ui/engine_balance.cpp
new file mode 100644
index 0000000..02a009c
--- /dev/null
+++ b/src/modern/ui/engine_balance.cpp
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: GPL-3.0-only
+// OpenBMH deviates from the original: viewing a balance is read-only and publishing a changed plan requires explicit confirmation.
+#include "modern/ui/engine_bridge.hpp"
+#include
+#include
+namespace bmh::modern_ui {
+namespace {
+void check(bool yes, const char *text) {
+ if (!yes)
+ throw editor::Error(text);
+}
+const Json &balance_read(const Json &b, const Json &r) {
+ validate_engine_desk(b);
+ check(r.value("messageType", "") == "snapshot" &&
+ r.at("data").value("kind", "") == "balance",
+ "Die Bilanz ist hier nicht verfügbar.");
+ for (auto *k : {"contractVersion", "careerId", "worldId", "worldRevision",
+ "stateRevision", "scope"})
+ check(r.at("meta").at(k) == b.at("desktop").at("meta").at(k),
+ "Die Bilanz gehört zu einem anderen Spielstand.");
+ check(r.at("data").at("teamId") ==
+ b.at("desktop").at("meta").at("scope").at("teamId") &&
+ r.at("meta").at("scope").at("role") == "club",
+ "Die Bilanz gehört einem anderen Verein.");
+ return r.at("data");
+}
+} // namespace
+Json engine_balance_projection(const Json &b, const Json &r) {
+ const auto &d = balance_read(b, r);
+ check(d.at("items").size() == 18 && d.at("summaries").size() == 6,
+ "Die Bilanz ist unvollständig.");
+ Json income = Json::array(), costs = Json::array(), plan = Json::array();
+ std::set ids;
+ for (const auto &row : d.at("items")) {
+ const auto id = row.at("id").get();
+ check(ids.insert(id).second, "Doppelter Bilanzposten.");
+ Json entry = {
+ {"id", id},
+ {"name", row.at("label")},
+ {"amount", engine_money_minor(row.at("amount"))},
+ {"editable", row.at("editable")},
+ {"maximum", row.at("maximum").is_null()
+ ? Json()
+ : Json(engine_money_minor(row.at("maximum")) / 100)}};
+ if (row.at("section") == "income")
+ income.push_back(entry);
+ else {
+ check(row.at("section") == "costs", "Unbekannter Bilanzbereich.");
+ costs.push_back(entry);
+ plan.push_back(entry);
+ }
+ }
+ const int64_t dep = engine_money_minor(d.at("depreciation"));
+ Json depreciation = {{"id", "balance:depreciation"},
+ {"name", d.at("depreciationLabel")},
+ {"amount", dep < 0 ? -dep : dep},
+ {"editable", false},
+ {"maximum", nullptr}};
+ if (dep < 0)
+ income.push_back(depreciation);
+ else
+ costs.push_back(depreciation);
+ const auto &s = d.at("summaries");
+ return {{"ok", true},
+ {"income", income},
+ {"costs", costs},
+ {"plan", plan},
+ {"plan_total", engine_money_minor(d.at("costs"))},
+ {"league_home_games", s[0].at("value")},
+ {"other_home_games", s[1].at("value")},
+ {"attendance_average", s[4].at("value")},
+ {"ticket", engine_money_minor(s[3].at("value"))},
+ {"cash", engine_money_minor(s[5].at("value"))},
+ {"balance", engine_money_minor(d.at("net"))},
+ {"warning", d.at("warning")},
+ {"warning_text", d.at("warningText")}};
+}
+Json engine_balance_command(const Json &b, const Json &r,
+ const std::string &id) {
+ const auto &d = balance_read(b, r), &m = b.at("desktop").at("meta");
+ const auto &commands = m.at("scope").at("allowedCommands");
+ check(!id.empty() && std::find(commands.begin(), commands.end(),
+ Json("balance.commit")) != commands.end(),
+ "Planänderungen sind hier gesperrt.");
+ check(d.at("view") == "future" && d.at("edits").is_array() &&
+ !d.at("edits").empty(),
+ "Kein bestätigter Planentwurf vorhanden.");
+ (void)engine_balance_projection(b, r);
+ return {{"messageType", "command"},
+ {"requestId", id},
+ {"careerId", m.at("careerId")},
+ {"expectedRevision", m.at("stateRevision")},
+ {"owner", {{"managerId", m.at("scope").at("managerId")}}},
+ {"kind", "balance.commit"},
+ {"payload",
+ {{"view", "future"},
+ {"edits", d.at("edits")},
+ {"acceptWarning", d.at("warning")}}}};
+}
+} // namespace bmh::modern_ui
diff --git a/src/modern/ui/engine_balance.inc b/src/modern/ui/engine_balance.inc
new file mode 100644
index 0000000..13137a6
--- /dev/null
+++ b/src/modern/ui/engine_balance.inc
@@ -0,0 +1,198 @@
+// SPDX-License-Identifier: GPL-3.0-only
+Json App::balance_rows() const {
+ if (!engine_mode_)
+ return demo_balance_rows(snap().state, *world_);
+ return engine_balance_projection(
+ engine_data_,
+ balance_future_ ? engine_balance_future_ : engine_data_.at("balance"));
+}
+std::string App::balance_cash(const Json &minor) const {
+ return engine_mode_
+ ? engine_price({{"currency", "EUR"},
+ {"minorUnits", 2},
+ {"minor", std::to_string(minor.get())}})
+ : cash(minor.get());
+}
+void App::engine_balance_sync() {
+ const auto &meta = engine_data_.at("desktop").at("meta");
+ if (meta != engine_balance_context_) {
+ engine_balance_context_ = meta;
+ engine_balance_edits_ = Json::array();
+ engine_balance_future_ = Json();
+ engine_balance_base_ = Json();
+ balance_future_ = false;
+ }
+ if (engine_balance_committing_) {
+ engine_balance_committing_ = false;
+ if (engine_response_.value("messageType", "") == "command_result") {
+ const auto after = engine_balance_after_;
+ engine_balance_after_.clear();
+ engine_balance_continue(after);
+ } else {
+ engine_balance_after_.clear();
+ message(engine_notice_);
+ }
+ }
+}
+void App::engine_balance_preview(const EngineReply &reply) {
+ const auto &read = reply.response.at("read");
+ if (reply.response.at("edits") != engine_balance_edits_ ||
+ reply.bundle.at("desktop").at("meta") != engine_balance_context_)
+ throw editor::Error("Der Bilanzentwurf hat sich geändert.");
+ if (read.value("messageType", "") != "snapshot") {
+ engine_balance_edits_ = engine_balance_future_.is_object()
+ ? engine_balance_future_.at("data").at("edits")
+ : Json::array();
+ engine_balance_feedback_ = engine_text(read.value("message", Json()));
+ message(engine_balance_feedback_);
+ return;
+ }
+ (void)engine_balance_projection(engine_data_, read);
+ engine_balance_future_ = read;
+ if (engine_balance_edits_.empty())
+ engine_balance_base_ = read;
+ balance_future_ = true;
+ engine_balance_feedback_ = engine_balance_edits_.empty()
+ ? "Prognose der Engine für zwölf Monate."
+ : "Planentwurf · Noch nicht übernommen.";
+ focus_after_render_ = "balance-toggle";
+}
+void App::engine_balance_load_future() {
+ auto link = engine_link_;
+ const auto edits = engine_balance_edits_;
+ engine_start("Bilanzprognose wird berechnet …", [link, edits] {
+ const auto bundle = link->snapshot();
+ return EngineReply{link,
+ bundle,
+ {{"messageType", "balance_preview"},
+ {"edits", edits},
+ {"read", link->read({{"kind", "balance"},
+ {"view", "future"},
+ {"edits", edits}})}},
+ nullptr};
+ });
+}
+void App::engine_balance_continue(const std::string &after) {
+ engine_balance_edits_ = Json::array();
+ engine_balance_future_ = engine_balance_base_ = Json();
+ balance_future_ = false;
+ menu_.clear();
+ refresh();
+ if (after == "quit")
+ engine_quit();
+ else if (after == "save")
+ engine_save();
+ else if (after == "library-save")
+ engine_files_begin("save");
+ else if (after == "load")
+ engine_files_begin("load");
+}
+void App::engine_balance_close(const std::string &after) {
+ if (engine_balance_edits_.empty()) {
+ engine_balance_continue(after);
+ return;
+ }
+ if (engine_busy_ || !engine_fresh_)
+ return;
+ const auto request = engine_balance_command(
+ engine_data_, engine_balance_future_, editor::new_id("request:ui-"));
+ const auto &d = engine_balance_future_.at("data");
+ std::string text = "Zukunftsplanung mit einem Ergebnis von " +
+ engine_price(d.at("net")) + " übernehmen?";
+ if (d.at("warning") == true)
+ text += " " + engine_text(d.at("warningText"));
+ engine_balance_after_ = after;
+ confirmation(text, [this, request, after] {
+ engine_balance_after_ = after;
+ engine_balance_committing_ = true;
+ auto link = engine_link_;
+ engine_start(
+ "Bilanzplanung wird übernommen …",
+ [link, request] {
+ const auto response = link->command(request);
+ return EngineReply{link, link->snapshot(), response, nullptr};
+ },
+ true);
+ });
+ popup_accept_ = "Übernehmen";
+ popup_extra_ =
+ btn("balance-discard", "Entwurf verwerfen", "", "id=\"balance-discard\"");
+}
+bool App::engine_balance_action(const std::string &action,
+ Rml::Element *target) {
+ if (menu_ != "balance")
+ return false;
+ if (action == "balance-discard") {
+ const auto after = engine_balance_after_;
+ popup_.clear();
+ reset_popup();
+ engine_balance_after_.clear();
+ engine_balance_continue(after);
+ return true;
+ }
+ if (engine_busy_ || !engine_fresh_)
+ return true;
+ if (action == "close") {
+ engine_balance_close("menu");
+ return true;
+ }
+ if (action == "balance-toggle") {
+ if (balance_future_) {
+ balance_future_ = false;
+ refresh();
+ } else if (engine_balance_future_.is_object()) {
+ balance_future_ = true;
+ refresh();
+ } else
+ engine_balance_load_future();
+ return true;
+ }
+ if (action != "balance-plan" || !target || !balance_future_ ||
+ !engine_balance_future_.is_object())
+ return action.starts_with("balance-");
+ const int index = target->GetAttribute("data-id", -1);
+ const auto rows = balance_rows();
+ if (index < 0 || size_t(index) >= rows.at("plan").size())
+ return true;
+ const auto row = rows.at("plan")[size_t(index)];
+ if (row.at("editable") != true)
+ return true;
+ const auto context = engine_balance_context_, before = engine_balance_edits_;
+ const auto id = row.at("id");
+ AmountRequest a;
+ a.title = row.at("name");
+ a.unit = "€";
+ a.min = 0;
+ a.max = row.at("maximum");
+ a.value = row.at("amount").get() / 100;
+ a.step = 1;
+ a.suggestion_step = 50000;
+ a.return_focus = target->GetId();
+ a.review = false;
+ a.accept = [this, context, before, id](int64_t value) {
+ if (menu_ != "balance" || engine_balance_context_ != context ||
+ engine_balance_edits_ != before || !engine_balance_base_.is_object())
+ return false;
+ auto edits = before;
+ edits.erase(std::remove_if(edits.begin(), edits.end(),
+ [&](const auto &e) { return e.at("id") == id; }),
+ edits.end());
+ const auto &items = engine_balance_base_.at("data").at("items");
+ const auto found =
+ std::find_if(items.begin(), items.end(),
+ [&](const auto &r) { return r.at("id") == id; });
+ if (found == items.end())
+ return false;
+ if (engine_money_minor(found->at("amount")) != value * 100)
+ edits.push_back({{"id", id},
+ {"amount",
+ {{"currency", "EUR"},
+ {"minorUnits", 2},
+ {"minor", std::to_string(value * 100)}}}});
+ engine_balance_edits_ = edits;
+ engine_balance_load_future();
+ return true;
+ };
+ open_amount(std::move(a));
+ return true;
+}
diff --git a/src/modern/ui/engine_bridge.cpp b/src/modern/ui/engine_bridge.cpp
index 602edd5..53d3a85 100644
--- a/src/modern/ui/engine_bridge.cpp
+++ b/src/modern/ui/engine_bridge.cpp
@@ -17,7 +17,7 @@ Json from_engine(const cli::Json &v) { return Json::parse(cli::dump_json(v)); }
namespace {
Json session_snapshot(modern::app::ModernSession &session,uint64_t revision) {
Json bundle=Json::object();
- for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements","news"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
+ for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements","news","balance"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
validate_engine_desk(bundle);const auto &season=bundle.at("desktop").at("meta").at("season");
bundle["calendar"]=from_engine(session.ui_read(cli::Json::Object{{"kind","calendar"},{"from",season.at("startDate").get()},{"until",season.at("endDate").get()}},revision));
bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle;
diff --git a/src/modern/ui/engine_bridge.hpp b/src/modern/ui/engine_bridge.hpp
index 85ac727..2692647 100644
--- a/src/modern/ui/engine_bridge.hpp
+++ b/src/modern/ui/engine_bridge.hpp
@@ -72,6 +72,9 @@ Json engine_toto_command(const Json &bundle,const Json "e,const std::string
Json engine_statistics_projection(const Json &bundle,const Json &read);
+Json engine_balance_projection(const Json &,const Json &);
+Json engine_balance_command(const Json &,const Json &,const std::string &);
+
class NewsCatalog;
NewsCatalog engine_news_catalogue(const NewsCatalog &);
Json engine_news_projection(const Json &,const Json &,const NewsCatalog &,const std::string &);
diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc
index 468173d..bbd2526 100644
--- a/src/modern/ui/engine_controls.inc
+++ b/src/modern/ui/engine_controls.inc
@@ -33,6 +33,7 @@ void App::engine_accept(EngineReply result) {
engine_stadium_poll();
engine_transfer_sync();
engine_news_sync();
+ engine_balance_sync();
engine_contracts_poll();
engine_calendar_sync();
engine_friendly_sync();
@@ -48,6 +49,7 @@ void App::engine_poll() {
try {
auto result = engine_job_.get();
validate_engine_desk(result.bundle);
+ if(result.response.value("messageType","")=="balance_preview"){engine_balance_preview(result);refresh();return;}
if(result.response.value("messageType","")=="toto_preview"){engine_toto_preview(result);refresh();return;}
if(result.response.value("messageType","")=="reports_preview"){engine_reports_poll(result);refresh();return;}
if(result.response.value("messageType","")=="almanac_preview"){engine_almanac_poll(result);refresh();return;}
@@ -124,6 +126,7 @@ void App::engine_frame() {
renderer_.Clear(); renderer_.BeginFrame(); context_->Render(); renderer_.EndFrame(); video_.present(); dirty_ = false;
}
void App::engine_save() {
+ if(menu_=="balance"&&!engine_balance_edits_.empty()){engine_balance_close("save");return;}
if (engine_busy_ || engine_files_busy_ || !engine_link_) return;
if(config_.file_export.empty()){engine_files_begin("save");return;}
auto output = config_.file_export;
@@ -139,6 +142,7 @@ void App::engine_save() {
engine_start("Spielstand wird gespeichert …", [link, output] { auto response = link->save_copy(output); return EngineReply{link, link->snapshot(), response, nullptr}; });
}
void App::engine_quit() {
+ if(menu_=="balance"&&!engine_balance_edits_.empty()){engine_balance_close("quit");return;}
if(!engine_busy_&&engine_data_.value("stadium",Json()).is_object()&&engine_data_.at("stadium").value("messageType","")=="snapshot"&&engine_data_.at("stadium").at("data").at("quote").is_object()){engine_stadium_exit_=true;engine_stadium_send(engine_stadium_commit(engine_data_,false,editor::new_id("request:ui-")),"cancel");return;}
if (engine_busy_ || engine_files_busy_) { engine_notice_ = "Bitte den laufenden Vorgang abwarten."; dirty_ = true; return; }
if (engine_dirty_) {
@@ -174,6 +178,7 @@ void App::engine_event(Rml::Event &event) {
if(menu_=="transfer"&&transfer_event(event))return;
if(menu_=="achievements"&&career_report_event(event))return;
if(menu_=="news"&&news_event(event))return;
+ if(menu_=="balance"&&!engine_busy_&&popup_.empty()&&finance_event(event))return;
if(!engine_busy_&&popup_.empty()&&rankings_event(event))return;
if (!engine_busy_ && popup_.empty() && engine_friendly_event(event)) return;
if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && report_picker_event(event)) return;
@@ -205,6 +210,7 @@ void App::engine_event(Rml::Event &event) {
if (!popup_.empty()) { popup_.clear(); reset_popup(); engine_files_pending_load_.reset(); engine_exit_after_save_=false; dirty_ = true; }
else if (!engine_busy_ && !engine_player_.empty()) { focus_after_render_ = "lineup-detail-" + engine_player_ + "-0"; engine_player_.clear(); refresh(); }
else if (!engine_busy_ && menu_ == "almanac") engine_almanac_action("alm-back",nullptr);
+ else if(!engine_busy_&&menu_=="balance"){engine_balance_close("menu");}
else if (!engine_busy_ && !menu_.empty()) { if (menu_ == "training" || menu_ == "tactics") engine_sports_reset(); if(menu_=="scorers"||menu_=="fairplay")rankings_remember_scroll(); menu_.clear(); refresh(); }
else engine_quit();
event.StopImmediatePropagation(); return;
@@ -227,7 +233,7 @@ void App::engine_event(Rml::Event &event) {
}
event.StopImmediatePropagation(); return;
}
- if(type=="keydown"&&popup_.empty()&&menu_.empty()&&!engine_busy_&&!engine_files_busy_) {
+ if(type=="keydown"&&popup_.empty()&&(menu_.empty()||menu_=="balance")&&!engine_busy_&&!engine_files_busy_) {
const auto key=Rml::Input::KeyIdentifier(event.GetParameter("key_identifier",0));
if(event.GetParameter("ctrl_key",0)&&(key==Rml::Input::KI_S||key==Rml::Input::KI_O)){engine_files_begin(key==Rml::Input::KI_S?"save":"load");event.StopImmediatePropagation();return;}
}
@@ -256,6 +262,7 @@ void App::engine_event(Rml::Event &event) {
if (!node->HasAttribute("data-action") || node->HasAttribute("disabled")) continue;
const auto action = node->GetAttribute("data-action", ""), id = node->GetAttribute("data-id", "");
if (!popup_.empty()) {
+ if(action=="balance-discard"){engine_balance_action(action,node);return;}
if (action == "popup-close") { popup_.clear(); reset_popup(); engine_files_pending_load_.reset(); engine_exit_after_save_=false; dirty_ = true; }
if(action=="files-save-before-load"){const auto pending=engine_files_pending_load_;reset_popup();popup_.clear();engine_files_begin("save");engine_files_pending_load_=pending;return;}
if(action=="engine-save-exit"){reset_popup();popup_.clear();engine_exit_after_save_=true;try{engine_save();}catch(const std::exception &e){engine_exit_after_save_=false;message(e.what());}return;}
@@ -271,6 +278,7 @@ void App::engine_event(Rml::Event &event) {
if(menu_=="transfer"&&transfer_action(action,node))return;
if(menu_=="achievements"&&career_report_action(action,node))return;
if(menu_=="news"&&dispatch_news(action,node))return;
+ if(menu_=="balance"&&engine_balance_action(action,node))return;
if (almanac_action(action,node)) return;
if (engine_friendly_action(action, node)) return;
if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && report_picker_action(action,node)) return;
@@ -287,6 +295,7 @@ void App::engine_event(Rml::Event &event) {
ticket_->open(node, device_ratio_, price.at("min"), price.at("max")); dirty_ = true;
}
else if (action == "engine-open" && (id == "environment" || id == "advertising")) { menu_ = id; advertising_selected_ = -1; advertising_offer_ = 0; refresh(); }
+ else if(action=="engine-open"&&id=="balance"){menu_=id;balance_future_=false;engine_balance_feedback_="Gebuchte Saisonwerte.";refresh();}
else if(action=="engine-open"&&id=="news"){menu_=id;news_dialog_.clear();refresh();}
else if(action=="engine-open"&&id=="achievements"){menu_=id;career_view_=Json::object();refresh();}
else if(action=="engine-open"&&id=="transfer"){menu_=id;transfer_view_=Json::object();transfer_dialog_.clear();engine_transfer_sync();refresh();}
@@ -324,5 +333,5 @@ void App::engine_event(Rml::Event &event) {
}
Json App::engine_snapshot() const {
return {{"mode", engine_mode_}, {"creation_busy",engine_creation_busy_}, {"busy", engine_busy_}, {"dirty", engine_dirty_}, {"fresh", engine_fresh_}, {"bundle", engine_data_},
- {"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
+ {"balance_future",engine_balance_future_},{"balance_edits",engine_balance_edits_},{"balance_view_future",balance_future_},{"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
}
diff --git a/src/modern/ui/engine_files.inc b/src/modern/ui/engine_files.inc
index 7a34680..621b821 100644
--- a/src/modern/ui/engine_files.inc
+++ b/src/modern/ui/engine_files.inc
@@ -6,6 +6,7 @@ void App::engine_files_start(std::string label,std::function
if(engine_files_busy_||engine_busy_)return;engine_files_busy_=true;files_feedback_=std::move(label);engine_files_job_=std::async(std::launch::async,std::move(work));refresh();
}
void App::engine_files_begin(const std::string &mode) {
+ if(engine_mode_&&menu_=="balance"&&!engine_balance_edits_.empty()){engine_balance_close(mode=="save"?"library-save":"load");return;}
if(engine_files_busy_||engine_busy_)return;
if(!world_){const auto *active=mod(active_mod_);if(!active||active->type!="Modern"||!active->error.empty()){message("Bitte zuerst eine spielbare Modern-Mod aktivieren.");return;}load_world(active->file);}
reset_files();files_native_=true;files_mode_=mode;menu_=mode;files_world_=world_;files_name_="Spielstand 1";engine_files_metadata_=Json();
@@ -21,7 +22,7 @@ void App::engine_files_poll() {
try {
auto result=engine_files_job_.get();
if(result.operation=="loaded") {
- stadium_view_=Json::object();engine_stadium_context_=Json();engine_toto_context_=Json();engine_toto_quote_=Json();engine_reports_context_=Json();engine_almanac_context_=Json();engine_friendly_read_=Json();engine_friendly_stage_=0;engine_calendar_season_.clear();engine_calendar_day_=-1;engine_move_id_.clear();report_detail_kind_.clear();engine_player_.clear();lineup_selected_.clear();engine_opening_state_=Json();engine_opening_read_=Json();
+ stadium_view_=Json::object();engine_stadium_context_=Json();engine_toto_context_=Json();engine_toto_quote_=Json();engine_reports_context_=Json();engine_balance_context_=Json();engine_almanac_context_=Json();engine_friendly_read_=Json();engine_friendly_stage_=0;engine_calendar_season_.clear();engine_calendar_day_=-1;engine_move_id_.clear();report_detail_kind_.clear();engine_player_.clear();lineup_selected_.clear();engine_opening_state_=Json();engine_opening_read_=Json();
engine_mode_=true;engine_dirty_=engine_base_dirty_=false;engine_accept(std::move(*result.engine));source_.reset();entry_catalog_.reset();engine_files_current_id_=result.selected;engine_files_pending_load_.reset();scene_="engine";menu_.clear();reset_files();refresh();return;
}
files_rows_=std::move(result.rows);if(result.metadata.is_object())engine_files_metadata_=std::move(result.metadata);
diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc
index 643b80b..f9dc509 100644
--- a/src/modern/ui/engine_screens.inc
+++ b/src/modern/ui/engine_screens.inc
@@ -120,7 +120,7 @@ void App::engine_render() {
const auto route = id.substr(4);
const bool camp_allowed = desk.at("menuAvailability").at("camps").value("status", "") == "available";
const auto commands = meta.at("scope").value("allowedCommands", Json::array());
- const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
+ const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="balance"&&engine_fresh_&&engine_data_.at("balance").value("messageType","")=="snapshot") || (route=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
out += desktop_button(id, o, "engine-open", supported && !engine_busy_);
}
}
@@ -129,6 +129,7 @@ void App::engine_render() {
if(menu_=="scorers")out+=""+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"
"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"
")+"
";
if(menu_=="fairplay")out+=""+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"
"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"
")+"
";
if(menu_=="other")out+=""+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"
"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"
")+"
";
+ if(menu_=="balance")out+=""+window("Bilanz",render_balance())+"
";
if(menu_=="news")out+=""+render_news()+"
";
if(menu_=="achievements")out+=""+window("Erfolge",render_achievements())+"
";
if(menu_=="transfer")out+=""+window("Transfers",render_transfer())+"
";
diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc
index 43abb05..c9ba20e 100644
--- a/src/modern/ui/engine_state.inc
+++ b/src/modern/ui/engine_state.inc
@@ -144,3 +144,15 @@
Json news_data(const std::string &,const std::string &) const;
void engine_news_send(const std::vector &,const std::string &);
bool engine_news_action(const std::string &,Rml::Element *);
+
+ Json engine_balance_context_,engine_balance_future_,engine_balance_base_,engine_balance_edits_=Json::array();
+ std::string engine_balance_feedback_,engine_balance_after_;
+ bool engine_balance_committing_=false;
+ Json balance_rows() const;
+ std::string balance_cash(const Json &) const;
+ void engine_balance_sync();
+ void engine_balance_load_future();
+ void engine_balance_preview(const EngineReply &);
+ void engine_balance_close(const std::string &);
+ void engine_balance_continue(const std::string &);
+ bool engine_balance_action(const std::string &,Rml::Element *);
diff --git a/src/modern/ui/finance_controls.inc b/src/modern/ui/finance_controls.inc
index b567da9..320c5f5 100644
--- a/src/modern/ui/finance_controls.inc
+++ b/src/modern/ui/finance_controls.inc
@@ -10,6 +10,7 @@ bool App::commit_finance(const Json &change, uint64_t revision) {
return true;
}
bool App::finance_action(const std::string &action, Rml::Element *target) {
+ if(engine_mode_)return engine_balance_action(action,target);
if (menu_ != "balance") return false;
if (action == "balance-toggle") {
balance_future_ = !balance_future_;
diff --git a/src/modern/ui/finance_screens.inc b/src/modern/ui/finance_screens.inc
index 9335777..3de7db0 100644
--- a/src/modern/ui/finance_screens.inc
+++ b/src/modern/ui/finance_screens.inc
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
std::string App::render_balance() {
- const auto rows = demo_balance_rows(snap().state, *world_);
+ const auto rows = balance_rows();
if (!rows.value("ok", false)) throw editor::Error("Die Bilanzdaten sind ungültig.");
std::string out = "";
if (balance_future_) {
@@ -9,13 +9,13 @@ std::string App::render_balance() {
for (const auto &row : rows.at("plan")) {
const auto name = row.at("name").get
();
out += "" + esc(name) + "" +
- btn("balance-plan", esc(number(row.at("amount").get() / finance_currency_factor(*world_))),
+ btn("balance-plan", esc(number(row.at("amount").get() / (engine_mode_?100:finance_currency_factor(*world_)))),
"balance-plan-value amount-trigger", "id=\"balance-plan-" + std::to_string(i) +
- "\" data-id=\"" + std::to_string(i) + "\" aria-label=\"" + esc(name + " in " + (money_unit() == "€" ? "Euro" : money_unit())) + "\"") + "
";
+ "\" data-id=\"" + std::to_string(i) + "\" aria-label=\"" + esc(name + " in " + (engine_mode_?"Euro":money_unit() == "€" ? "Euro" : money_unit())) + "\" " + std::string(engine_mode_&&row.at("editable")!=true?"disabled":"")) + " ";
++i;
}
out += "Geplante Ausgaben" +
- esc(cash(rows.at("plan_total").get())) + "
";
+ esc(balance_cash(rows.at("plan_total").get())) + "
";
} else {
int index = 0;
for (const auto &kind : {std::string("income"), std::string("costs")}) {
@@ -25,7 +25,7 @@ std::string App::render_balance() {
int n = 0;
for (const auto &row : rows.at(kind)) {
out += "" +
- esc(row.at("name").get()) + "" + esc(cash(row.at("amount").get())) + "
";
+ esc(row.at("name").get()) + "" + esc(balance_cash(row.at("amount").get())) + "";
}
out += "";
}
@@ -33,15 +33,15 @@ std::string App::render_balance() {
number(rows.at("league_home_games").get()) + " Liga-Heimspiele",
number(rows.at("other_home_games").get()) + " sonstige Heimspiele",
"Zuschauerschnitt: " + number(rows.at("attendance_average").get()),
- "Eintrittspreis: " + cash(rows.at("ticket").get()),
- "Kontostand: " + cash(rows.at("cash").get()),
- "Saldo: " + cash(rows.at("balance").get())};
+ "Eintrittspreis: " + balance_cash(rows.at("ticket").get()),
+ "Kontostand: " + balance_cash(rows.at("cash").get()),
+ "Saldo: " + balance_cash(rows.at("balance").get())};
for (int i = 0; i < 6; ++i)
- out += "()):std::string()) + "\" style=\"" +
rect(26 + (i % 2) * 1310, 1526 + (i / 2) * 68, 1250, 38) + "\">" + esc(values[size_t(i)]) + "
";
}
out += btn("balance-toggle", "" + std::string(balance_future_ ? "Zukunft" : "Aktuell") +
"", "balance-toggle report-reset",
"id=\"balance-toggle\" aria-label=\"Zwischen aktueller Bilanz und Zukunftsplanung wechseln\"");
- return out + "";
+ return out + (engine_mode_?""+esc(engine_busy_?engine_operation_:engine_balance_feedback_)+"
":"") + "";
}
diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp
index f556a23..1da6831 100644
--- a/src/modern/ui/view.cpp
+++ b/src/modern/ui/view.cpp
@@ -1550,6 +1550,7 @@ public:
#include "modern/ui/engine_transfer.inc"
#include "modern/ui/engine_achievements.inc"
#include "modern/ui/engine_news.inc"
+#include "modern/ui/engine_balance.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {
diff --git a/tests/modern_balance_projection_tests.cpp b/tests/modern_balance_projection_tests.cpp
new file mode 100644
index 0000000..0e3e7e5
--- /dev/null
+++ b/tests/modern_balance_projection_tests.cpp
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: GPL-3.0-only
+#include "modern/ui/engine_bridge.hpp"
+#include
+#include
+using namespace bmh::modern_ui;
+namespace {
+void check(bool y, const char *s) {
+ if (!y)
+ throw std::runtime_error(s);
+}
+template void rejected(F f) {
+ bool caught = false;
+ try {
+ f();
+ } catch (const std::exception &) {
+ caught = true;
+ }
+ check(caught, "invalid balance accepted");
+}
+Json money(int64_t n) {
+ return {{"currency", "EUR"},
+ {"minorUnits", 2},
+ {"minor", std::to_string(n * 100)}};
+}
+} // namespace
+int main() try {
+ const Json meta = {{"contractVersion", "bmh-modern-ui@draft1"},
+ {"careerId", "career:test"},
+ {"worldId", "world:test"},
+ {"worldRevision", "1"},
+ {"stateRevision", "3"},
+ {"scope",
+ {{"role", "club"},
+ {"managerId", "manager:test"},
+ {"teamId", "club:test"},
+ {"allowedCommands", {"balance.commit"}}}}};
+ Json b;
+ for (auto *k : {"session", "desktop", "camps", "balance"})
+ b[k] = {
+ {"messageType", "snapshot"}, {"meta", meta}, {"data", {{"kind", k}}}};
+ b["desktop"]["data"].update({{"manager", {{"id", "manager:test"}}},
+ {"team", {{"id", "club:test"}}},
+ {"accounts", {{"cash", money(5000000)}}}});
+ b["camps"]["data"]["camps"] = Json::array();
+ auto &d = b["balance"]["data"];
+ d.update(
+ {{"teamId", "club:test"},
+ {"view", "future"},
+ {"items", Json::array()},
+ {"summaries", Json::array()},
+ {"edits", Json::array({{{"id", "balance:7"}, {"amount", money(7000)}}})},
+ {"income", money(100000)},
+ {"costs", money(60000)},
+ {"depreciation", money(500)},
+ {"depreciationLabel", "Synthetic depreciation"},
+ {"net", money(39500)},
+ {"warning", true},
+ {"warningText", "Synthetic fiscal warning"}});
+ for (int i = 0; i < 18; ++i)
+ d["items"].push_back({{"id", "balance:" + std::to_string(i)},
+ {"label", "Synthetic item " + std::to_string(i)},
+ {"section", i < 7 ? "income" : "costs"},
+ {"amount", money(i * 1000)},
+ {"editable", true},
+ {"maximum", money(30000000)}});
+ for (int i = 0; i < 6; ++i)
+ d["summaries"].push_back({{"value", i == 3 ? money(15)
+ : i == 5 ? money(5000000)
+ : Json(i + 10)}});
+ const auto original = b;
+ const auto v = engine_balance_projection(b, b.at("balance"));
+ check(v.at("income").size() == 7 && v.at("costs").size() == 12 &&
+ v.at("plan").size() == 11,
+ "actual item groups lost");
+ check(v.at("ticket") == 1500 && v.at("cash") == 500000000 &&
+ v.at("plan")[0].at("amount") == 700000,
+ "money scaled incorrectly");
+ check(v.at("plan")[0].at("maximum") == 30000000, "actual edit bounds lost");
+ check(v.at("balance") == 3950000 && v.at("warning"),
+ "actual net/warning lost");
+ check(b == original, "projection mutated source");
+ const auto c = engine_balance_command(b, b.at("balance"), "request:test");
+ check(c.at("payload").at("edits") == d.at("edits") &&
+ c.at("payload").at("acceptWarning") == true &&
+ c.at("expectedRevision") == "3",
+ "confirmed draft changed");
+ auto bad = b.at("balance");
+ bad["meta"]["stateRevision"] = "4";
+ rejected([&] { engine_balance_projection(b, bad); });
+ bad = b.at("balance");
+ bad["data"]["teamId"] = "foreign";
+ rejected([&] { engine_balance_projection(b, bad); });
+ bad = b.at("balance");
+ bad["data"]["items"][1]["id"] = "balance:0";
+ rejected([&] { engine_balance_projection(b, bad); });
+ bad = b.at("balance");
+ bad["data"]["edits"] = Json::array();
+ rejected([&] { engine_balance_command(b, bad, "request:x"); });
+ bad = b.at("balance");
+ bad["data"]["view"] = "current";
+ rejected([&] { engine_balance_command(b, bad, "request:x"); });
+ bad = b.at("balance");
+ bad["data"]["depreciation"] = money(-500);
+ auto credit = engine_balance_projection(b, bad);
+ check(credit.at("income").size() == 8 && credit.at("costs").size() == 11 &&
+ credit.at("income").back().at("amount") == 50000,
+ "negative depreciation shown as an expense");
+ std::cout << "balance actual money, depreciation, owner, bounds and "
+ "confirmed draft checks passed\n";
+ return 0;
+} catch (const std::exception &e) {
+ std::cerr << e.what() << '\n';
+ return 1;
+}
diff --git a/tests/modern_engine_bridge_probe.cpp b/tests/modern_engine_bridge_probe.cpp
index 85b68d2..8e993c3 100644
--- a/tests/modern_engine_bridge_probe.cpp
+++ b/tests/modern_engine_bridge_probe.cpp
@@ -15,7 +15,7 @@ using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
const std::string mode=argc>1?argv[1]:"";
- const std::set modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto","verify-stadium","complete-stadium","verify-transfer","prepare-achievements"};
+ const std::set modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto","verify-stadium","complete-stadium","verify-transfer","prepare-achievements","verify-balance","verify-balance-warning"};
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe ");
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
@@ -163,6 +163,22 @@ int main(int argc, char **argv) {
auto link = EngineBridge::open(world, out / "input.obs");
const auto before = link->snapshot(); write("before.json", before);
if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection");
+ if(mode=="verify-balance"||mode=="verify-balance-warning") {
+ const auto future=link->read({{"kind","balance"},{"view","future"}}),real=link->read({{"kind","balance"},{"view","real"}});write("future.json",future);write("real.json",real);
+ if(future.value("messageType","")!="snapshot"||real.value("messageType","")!="snapshot")throw std::runtime_error(future.dump()+real.dump());
+ const auto item=future.at("data").at("items")[7];const auto euros=engine_money_minor(item.at("amount"))/100;const auto amount=mode=="verify-balance-warning"?engine_money_minor(item.at("maximum"))/100:euros==1000?2000:1000;
+ const Json edits=Json::array({{{"id",item.at("id")},{"amount",{{"currency","EUR"},{"minorUnits",2},{"minor",std::to_string(amount*100)}}}}});
+ const auto quote=link->read({{"kind","balance"},{"view","future"},{"edits",edits}});write("quote.json",quote);if(quote.value("messageType","")!="snapshot")throw std::runtime_error(quote.dump());
+ if(link->snapshot()!=before)throw std::runtime_error("balance previews changed live state");link->save_copy(out/"read-only.obs");
+ const auto request=engine_balance_command(before,quote,"request:balance-commit");auto invalid=request;invalid["requestId"]="request:balance-money";invalid["payload"]["edits"][0]["amount"]["currency"]="USD";const auto refused=link->command(invalid);write("invalid.json",refused);if(refused.value("messageType","")!="error"||link->snapshot()!=before)throw std::runtime_error("invalid balance money changed state");
+ if(quote.at("data").at("warning")==true){auto no=request;no["requestId"]="request:balance-warning";no["payload"]["acceptWarning"]=false;const auto response=link->command(no);write("warning-refused.json",response);if(response.value("code","")!="confirmation_required"||link->snapshot()!=before)throw std::runtime_error("warning accepted without confirmation");}
+ const auto response=link->command(request);write("committed.json",response);if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());
+ const auto after=link->snapshot(),reopened=link->read({{"kind","balance"},{"view","future"}});write("after.json",after);write("reopened.json",reopened);
+ if(reopened.at("data").at("items")!=quote.at("data").at("items")||reopened.at("data").at("net")!=quote.at("data").at("net"))throw std::runtime_error("saved balance draft differs from reviewed projection");
+ auto stale=request;stale["requestId"]="request:balance-stale";if(link->command(stale).value("code","")!="stale_revision"||link->snapshot()!=after)throw std::runtime_error("stale balance command changed state");link->save_copy(out/"committed.obs");
+ {link->load_same_world(out/"committed.obs");const auto reopened_save=link->read({{"kind","balance"},{"view","future"}});write("reloaded.json",reopened_save);if(reopened_save.at("data").at("items")!=reopened.at("data").at("items"))throw std::runtime_error("balance save could not restore its runtime plan");}
+ write("receipt.json",{{"status","passed"},{"pureViews",true},{"invalidMoneyRefused",true},{"actualPlanCommitted",true},{"reopenedDraftIdentical",true},{"staleRefused",true},{"warningChecked",quote.at("data").at("warning")}});std::cout<<"actual balance views, quote, commit and refusals passed\n";return 0;
+ }
if(mode=="verify-transfer") {
const auto value=engine_transfer_projection(before,engine_transfer_filters());write("projection.json",value);
Json commands=Json::array();