Bind the transfer market to world-relative Modern data (by Codex)

This commit is contained in:
Codex committed 2026-10-29 09:00:21 +01:00
1 parent e559e84a69
commit 1e88304019
23 files changed
+1230 -76

No files matched your search

+5 -1
View File
@@ -346,7 +346,7 @@ add_library(bmh_modern_content STATIC src/modern/content/world.cpp src/modern/co
src/modern/content/world_save.cpp
src/modern/content/world_expand.cpp
src/modern/content/statistics.cpp
src/modern/content/toto_quote.cpp src/modern/content/projections.cpp src/modern/content/ui_contract.cpp src/modern/content/press_journal.cpp)
src/modern/content/toto_quote.cpp src/modern/content/transfer_market.cpp src/modern/content/projections.cpp src/modern/content/ui_contract.cpp src/modern/content/press_journal.cpp)
target_link_libraries(bmh_modern_content PUBLIC bmh_content bmh_season_modern PRIVATE bmh_miniz)
if(MSVC)
target_compile_options(bmh_modern_content PRIVATE /W4 /utf-8)
@@ -1217,6 +1217,10 @@ add_test(NAME modern_camp_tests COMMAND modern_camp_tests)
add_executable(modern_almanac_tests tests/modern_almanac_tests.cpp)
target_link_libraries(modern_almanac_tests PRIVATE bmh_modern_content)
add_test(NAME modern_almanac_tests COMMAND modern_almanac_tests)
add_executable(modern_transfer_read_tests tests/modern_transfer_read_tests.cpp)
target_link_libraries(modern_transfer_read_tests PRIVATE bmh_modern_content)
add_test(NAME modern_transfer_read_tests COMMAND modern_transfer_read_tests)
add_executable(modern_toto_quote_tests tests/modern_toto_quote_tests.cpp)
target_link_libraries(modern_toto_quote_tests PRIVATE bmh_modern_content)
add_test(NAME modern_toto_quote_tests COMMAND modern_toto_quote_tests)
+6
View File
@@ -180,3 +180,9 @@ body.matchday .transfer-name-search input,body.matchday .transfer-offer-inputs b
.transfer-filters button[aria-pressed=true],.transfer-strengths button[aria-pressed=true],.transfer-search-kind button[aria-pressed=true],.transfer-search-traits button[aria-pressed=true],.transfer-actions button[aria-pressed=true] {background-color:#9cafc240;border-color:#dce9f047;color:#f5f8fc;}
body.silver .transfer-filters button[aria-pressed=true],body.silver .transfer-strengths button[aria-pressed=true],body.silver .transfer-search-kind button[aria-pressed=true],body.silver .transfer-search-traits button[aria-pressed=true],body.silver .transfer-actions button[aria-pressed=true] {background-color:#a3c3dd54;border-color:#356f966e;color:#193b52;}
body.matchday .transfer-filters button[aria-pressed=true],body.matchday .transfer-strengths button[aria-pressed=true],body.matchday .transfer-search-kind button[aria-pressed=true],body.matchday .transfer-search-traits button[aria-pressed=true],body.matchday .transfer-actions button[aria-pressed=true] {background-color:#d48c7b26;border-color:#e5a19770;color:#ffe5de;}
/* Account balances follow the infobar's semantic money colour in every skin. */
body .transfer-heading>div>strong.money-amount,
body .transfer-preview strong.money-amount {color:var(--money);}
body .transfer-heading>div>strong.money-amount.is-negative,
body .transfer-preview strong.money-amount.is-negative {color:var(--danger);}
+2 -2
View File
@@ -34,7 +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/<n>`), Trikot (`ad:shirt`), TV-Rechte (`ad:tv`) je mit Vertrag (Sponsor, Monatsbetrag, Restmonate, Verlängerung, Option) und den offenen Angeboten (`offer:ad-<Platz>-<Nr.>`, 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 %) |
| `transfer` | die Transferliste (`listing:<n>`: Spieler, Alter, Position, Stärke, Verkäufer, Ablöseforderung, Gehaltsreferenz pro Jahr, Gehaltsforderung in %, Zahl der Angebote, eigene Listung, eigenes Gebot), der eigene Kader (gelistet oder nicht), Kontostand, Kreditrahmen |
| `transfer` | die Transferliste (`listing:<n>`: 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:<Typ>:<Vorkommnis>:<Team>`). 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:<Laufzeitnummer>`, 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 |
| `calendar` | der Saisonkalender des Teams am Schreibtisch, `from`/`until` (ISO, Vorgabe der laufende Monat): `days` (Datum, `seasonDay`, `today`, `eventKinds`: `league`, `cup:<n>`, `replay`, `indoor`, `special`, `national`, `friendly`; `fixtureIds`) und `fixtures` (die eigenen Ligaspiele: `fixture:league-<Liga>-<Runde>-<Nr.>`, Wettbewerb, Runde, `originalDate`, `scheduledDate`, Heim/Gast, `status` `scheduled`/`played`/`rescheduled`/`postponed`, `result`). Verlegte und im Winter ausgefallene Spiele stehen am Nachholtag. Pokalspiele nur als `eventKinds`; Fehler `invalid_range` |
| `scheduling` | die verlegbaren eigenen Ligaspiele (`move:<Tag>-<Liga>-<Runde>-<Nr.>`, Datum, Runde, Heim/Gast, mögliche Zieldaten) und die verlegten, die sich zurücknehmen lassen |
@@ -84,7 +84,7 @@ Die UI ruft diese über `DataSource::read_almanac` und `read_statistics` direkt
| `advertising.accept` | `offerId` | nimmt ein Angebot an wie am Schreibtisch; Fehler `unknown_offer`, `advertising_refused` |
| `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` |
| `transfer.submit` | `action: list`, `playerId`, optional `loan`; oder `action: bid`, `listingId`, `fee`, `monthlySalary` (`Money`), `years` 1–4 (Leihe 1–2), optional `loan`, optional `bonuses` (sieben gespeicherte Stufen: zuerst 0–20, dann 0–200) | 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). Abgelehnte Listung: `listing_refused`, vollständige Rücknahme. Geldfelder verlangen EUR/2 und ganze Euro ohne Überlauf. Fehler `unknown_player`, `already_listed`, `unknown_listing`, `own_player`, `no_bid_slot`, `transfer_refused` |
| `friendly.book` | `opponentId`, optional `home`, `date`, `acceptCost`, bei menschlichem Gegner `opponentConsent` | am Schreibtisch des Bundestrainers das Länderspiel (Rückmeldung mit Bonus, wenn das Original ihn gewährt); vereinbart das Freundschaftsspiel; Fehler `declined` (Kosten nicht bestätigt), `opponent_declined`, `insufficient_funds`, `date_unavailable`, `plan_full` u. a. |
| `fixture.reschedule` | `matchId`, `date`; oder `action: undo`, `date` | verlegt eine eigene Ligapartie bzw. nimmt die Verlegung zurück; Fehler `invalid_day`, `day_full`, `team_clash`, `no_free_slot`, `no_moved_match` |
| `environment.commit` | `itemId`, `level` 0–6 | setzt ein Monatsbudget des Umfelds (keine Sofortbuchung, kein Zufall); unverändert: `outcome: no_change`; Fehler `environment_refused` |
+61 -1
View File
@@ -1,6 +1,6 @@
# Kader und Transfermarkt · native Modern UI
Stand: 25. Oktober 2026. Maßgeblich ist der aktuelle private HTML-Stand
Stand: 29. Oktober 2026. Maßgeblich ist der aktuelle private HTML-Stand
`bmh_4k_ui`, Referenz `23845730`: `desktop/transfer-menu.js`,
`transfer-window.css`, `career-menus.css` und die Einbindung in
`management-menus.js`. Die späteren Regeln in `transfer-window.css`
@@ -16,6 +16,66 @@ und [transfer.rcss](../../../../assets/modern/transfer.rcss).
Private Bilder, Namenstabellen und Weltdateien gehören nicht in öffentliche
Tests oder dieses Dokument.
## Tatsächlicher Engine-Einstieg (29. Oktober)
Die native Karriere benutzt denselben Gold-Presenter und das vorhandene RCSS,
aber ausschließlich `ModernSession::ui_read("transfer")`. Namen, Alter,
Positionen, Kondition/Technik/Form/Stärke, sieben Fähigkeiten, Fotos,
Nationalitäten, Marktangebote, eigene Listungen und eigene Gebote stammen aus
der Partie. Positions- und Durchschnittsstärken sind die vorhandene
`TransferMarketState`-Projektion; weder Katalog-Startwerte noch Demoformeln
ersetzen den aktuellen Zustand. Nicht gelieferte Fuß-/Typ-/Saisonwerte bleiben
unbekannt. Ein vereinsloser Anbieter erhält seinen tatsächlichen Anbietertext.
Suchen nach Name, Position, Alter, Stärke und Ablösebudget sowie Daten A/B,
Komplett, Blättern, Hover und Aktive/Team sind reine UI-Zustände. Ein Vorschlag
wählt nur die aktuell schwächste eigene Position als Suchfilter. Nicht
bereitgestellte Fuß-/Typ-/Attributgewichtungen sind im Suchdialog gesperrt.
Die Suche ist kein Transferauftrag und schreibt keine OBS-Daten.
Eigene Spieler werden erst nach Bestätigung auf die vorhandene Transferliste
gesetzt. Wie im Original teilen Verkauf und Verleih dieselbe Listung; der
Käufer bestimmt die tatsächliche Leihe mit seinem Gebot. Die neue Modern-Projektion liest den weltabhängigen Transferpool statt der
festen Classic-Adresse; auch die ursprünglichen Gebotsprüfungen verwenden
diesen Pool (#24). Ein abgelehnter
Listenauftrag wird als `listing_refused` zurückgewiesen und vollständig
zurückgenommen (#24), statt fälschlich Erfolg zu melden.
Vereinslose Spieler sind als Kaufangebote erkennbar; Ausleihen ist dort gesperrt.
Die Session liefert außerdem die ursprünglichen Angebotsgrenzen und die
geviertelte Leihgebühr. Der Zahleneditor übernimmt diese Grenzen direkt.
Kauf-/Leihgebote bearbeiten Ablöse, Monatsgehalt, Dauer und sieben Prämien im
lokalen Entwurf. Die Geldbeträge haben ausdrücklich EUR/2, unabhängig von der
Importwährung im Weltmanifest. Die Gehaltsreferenz wird wie der Original-Angebotseditor als Monatsreferenz
beschriftet. Sie ist kein bereits zugesagtes Gehalt. Die neue eindeutige
`ownBid.monthlySalary`-Angabe verhindert eine Division durch zwölf beim
Wiederöffnen. Das früher irreführend benannte `annualSalary` bleibt nur als
kompatibler Alias desselben gespeicherten Werts erhalten. Vor dem Absenden werden die
Geldbeträge und Dauer nochmals bestätigt; die sieben sichtbaren Prämien gehören
zum bestätigten Auftrag. Die Session öffnet/ändert/schließt den ursprünglichen
Angebotseditor innerhalb desselben Befehls und liefert angenommen, ausstehend
oder abgelehnt als tatsächliches Ergebnis. Der nächste Wochenwechsel ist in
diesem UI-Meilenstein weiterhin nicht über Anstoß erreichbar.
Prämien werden als sieben gespeicherte Stufen transportiert: 0–20 für die ersten
drei, 0–200 für die letzten vier. Die letzten vier Felder erscheinen wie im
Original mit Faktor fünf (0–1000, Eingabeschritt fünf); der Session-Adapter
übersetzt zur ursprünglichen Einzel-Feld-Aktion. Keine pauschale Money-Skalierung
für Prämien. Die ursprünglichen Grenzen bleiben bindend. Leihen bieten ein oder
zwei Jahre, Käufe ein bis vier Jahre. Fremdwährung, falsche Nachkommastellen,
Überlauf und ungültige Prämien werden vor Öffnen des Editors abgewiesen.
Offen und sichtbar gesperrt sind Abwerben, das Entfernen eigener Listungen sowie
das Zurücknehmen eines Gebots. Dafür existiert bisher kein freigegebener
Session-Befehl. Die Auftragsliste zeigt nur tatsächlich gespeicherte eigene
Gebote. Menschliche Verkäuferentscheidungen bleiben als `decision_pending`
atomar abgewiesen. Keine Classic-, Wettbewerbs-, Welt- oder Saveformatänderung.
Die folgenden Abschnitte beschreiben weiterhin die **separate Demoquelle**.
Insbesondere gelten deren erfundene Marktwerte, Monatsgehälter und
Auftragsänderungen nicht für den tatsächlichen Engine-Einstieg.
## Übersicht und Auswahl
Links steht der gesamte eigene Kader mit stabilen Spieler-IDs in der
@@ -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 nach `5a9121b`.
von echten Karrierewerten. Stand einschließlich der tatsächlichen Transferanbindung.
Von 32 Desktoprouten sind 23 an Sessiondaten bzw. tatsächliche Aktionen
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Acht weitere
Von 32 Desktoprouten sind 24 an Sessiondaten bzw. tatsächliche Aktionen
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Sieben 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
@@ -22,6 +22,7 @@ Vereinsmenüs.
| Verträge | Aktuelle Spielerwerte, konkrete Angebote, bestätigte Verlängerung und Verwerfen | Jede Verhandlung wird ihrem Besitzer zugeordnet |
| Kalender, Verlegen, Freundschaftsspiele | Tatsächlicher Kalender, belegte Verlegungen, Vereins-/Nationalangebote | Kein POC-Spielplan als Ersatz |
| Spielerstatistik und Fairplay | Aktuelle Saisonereignisse aus dem Almanach | Heutige unbekannte Spielerwerte bleiben unbekannt |
| 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 |
| 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 |
@@ -34,7 +35,6 @@ Vereinsmenüs.
|---|---|---|
| Erfolge | Gemeinsamer Karriere-/Erfolgspresenter und ursprüngliche Rekordprojektion | Aktive Managerhistorie autoritativ liefern und binden |
| Hallentabellen | HTML-/RmlUI-Ansicht und Indoor-Presenter | Tatsächliche Turnierphase und Tabellen/Teilnehmer liefern |
| Transfermarkt | Gemeinsamer Presenter; Session-Read/Submit vorhanden | Liste, Verhandlungen, Rollen und bestätigte Angebote verbinden |
| 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 |
+38 -11
View File
@@ -6,6 +6,7 @@
#include "modern/content/world_expand.hpp"
#include "modern/content/world_package.hpp"
#include "modern/content/toto_quote.hpp"
#include "modern/content/transfer_market.hpp"
#include "modern/content/world_save.hpp"
#include "modern/game/balance_plan.hpp"
#include "modern/game/bank_credit.hpp"
@@ -9089,31 +9090,46 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
// the transfer list (listed players with seller, asking fee, salary reference, offers, the own
// bid), the own squad (listed or not), account and credit line
ui::TransferMarketState mk;
try { mk = ui::transfer_market_from_game(g_, revision); } catch (const std::exception&) {
try { mk = modern::project_transfer_market(g_, revision); } catch (const std::exception&) {
return modern::ui_error(request_id, "transfer_unavailable", "Der Transfermarkt ist hier nicht verfügbar.", revision, false);
}
static constexpr const char* kPositions[4] = {"gk", "def", "mid", "fwd"};
A listings, squad;
const auto details = [&](int player) -> cli::Json {
const auto& p = g_.players.at(size_t(player));
A skills; for (const auto skill : {Player::CORNER, Player::FREE_KICK, Player::TACKLING, Player::PASSING, Player::SHOOTING, Player::SPEED, Player::TEAMPLAY}) skills.push_back(p.skill(skill));
const auto id = modern::ui_player_id(g_, player);
const auto* world = modern::current_world(); const auto* person = world ? world->player(id) : nullptr;
const std::string first = size_t(player)<g_.player_first.size()?g_.player_first[size_t(player)]:std::string{};
const std::string last = size_t(player)<g_.player_last.size()?g_.player_last[size_t(player)]:std::string{};
const std::string nation = size_t(player)<g_.player_nation.size()?g_.player_nation[size_t(player)]:std::string{};
return O{{"name",last.empty()?ui::original_to_utf8(g_.player_name(player)):first.empty()?last:first+" "+last},
{"condition",p.condition()},{"technique",p.technique()},{"form",p.form()},{"skills",std::move(skills)},
{"nationId",nation.empty()?cli::Json(nullptr):cli::Json(nation)},
{"photoAssetId",person&&!person->photo.empty()?cli::Json(person->photo):cli::Json(nullptr)}};
};
for (const auto& it : mk.items) {
cli::Json bid = nullptr;
if (it.own_bid)
bid = O{{"fee", modern::ui_money(it.own_bid->fee)}, {"annualSalary", modern::ui_money(it.own_bid->annual_salary)},
{"years", int(it.own_bid->contract_years)}};
bid = O{{"fee", modern::ui_money(it.own_bid->fee)}, {"annualSalary", modern::ui_money(it.own_bid->annual_salary)}, {"monthlySalary", modern::ui_money(it.own_bid->annual_salary)},
{"years", int(it.own_bid->contract_years)}, {"loan",it.own_bid->loan}, {"bonuses", [&]{A a;for(auto b:it.own_bid->bonuses)a.push_back(int(b));return cli::Json(std::move(a));}()}};
listings.push_back(O{{"id", "listing:" + std::to_string(it.list_entry)}, {"playerId", modern::ui_player_id(g_, it.player)},
{"name", ui::original_to_utf8(it.name)}, {"age", it.age}, {"position", kPositions[it.position & 3]},
{"strength", it.strength},
{"sellerId", it.seller >= 0 ? cli::Json(modern::ui_team_id(g_, it.seller)) : cli::Json(nullptr)},
{"seller", ui::original_to_utf8(it.seller_name)}, {"askingFee", modern::ui_money(it.asking_fee)},
{"salaryReference", modern::ui_money(it.salary_reference)},
{"salaryReference", modern::ui_money(it.salary_reference)}, {"salaryReferencePeriod","month"},
{"salaryDemandPercent", int(it.salary_demand_percent)}, {"offers", it.offers},
{"ownListing", it.own_listing}, {"ownBidPending", it.own_bid_pending}, {"ownBid", std::move(bid)}});
{"offerTerms",O{{"buy",O{{"fee",modern::ui_money(it.asking_fee)},{"maximumFee",modern::ui_money(int64_t(it.asking_fee)*2)}}},{"loan",O{{"fee",modern::ui_money(it.asking_fee/4)},{"maximumFee",modern::ui_money(int64_t(it.asking_fee/4)*2)}}},{"maximumMonthlySalary",modern::ui_money(200000)}}}, {"loanAvailable",it.seller>=0&&it.seller<league_clubs()}, {"ownListing", it.own_listing}, {"ownBidPending", it.own_bid_pending}, {"ownBid", std::move(bid)}, {"details",details(it.player)}});
}
for (const auto& s : mk.squad)
squad.push_back(O{{"playerId", modern::ui_player_id(g_, s.player)}, {"name", ui::original_to_utf8(s.name)}, {"age", s.age},
{"position", kPositions[s.position & 3]}, {"strength", s.strength}, {"listed", s.already_listed}});
{"position", kPositions[s.position & 3]}, {"strength", s.strength}, {"listed", s.already_listed}, {"details",details(s.player)}});
return modern::ui_snapshot(g_, context, request_id,
O{{"kind", "transfer"}, {"teamId", modern::ui_team_id(g_, team)}, {"listings", std::move(listings)}, {"squad", std::move(squad)},
{"cash", modern::ui_money(mk.balance)}, {"creditLine", modern::ui_money(mk.credit_line)}});
{"cash", modern::ui_money(mk.balance)}, {"creditLine", modern::ui_money(mk.credit_line)},
{"activeStrengths", [&]{A a;for(auto n:mk.active_strengths)a.push_back(int(n));return cli::Json(std::move(a));}()},
{"teamStrengths", [&]{A a;for(auto n:mk.team_strengths)a.push_back(int(n));return cli::Json(std::move(a));}()}});
}
if (kind == "stadium") {
// the periphery (14 objects; the traffic access has three stages), the eight facilities with
@@ -10197,7 +10213,7 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
HumanBuyerSaleHooks hooks;
hooks.notice = [&](const GameState&, const HumanBuyerSaleNotice& n) { notices.push_back(ui::original_to_utf8(n.original_message)); };
hooks.confirm = [&](const GameState&, int, const std::string&) -> bool { question = true; throw std::runtime_error("question"); };
const ui::TransferMarketState m = ui::transfer_market_from_game(g_, revision);
const ui::TransferMarketState m = modern::project_transfer_market(g_, revision);
std::string feedback;
bool bid_pending = false;
try {
@@ -10212,7 +10228,9 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
r.manager_slot = m.manager_slot, r.runtime_club = m.runtime_club, r.revision = m.revision;
r.squad_row = item->row, r.expected_player = item->player;
r.selected_players.push_back({-1, m.roster.squad_start_offset + item->row, item->player, m.runtime_club, item->row});
if (!dispatch_transfer_market(r, hooks, revision, error)) { restore(); return refuse("transfer_refused", error); }
const auto listed_result=dispatch_transfer_market(r, hooks, revision, error);
if (!listed_result) { restore(); return refuse("transfer_refused", error); }
if(listed_result->status!=TransferActionStatus::accepted) {restore();return refuse("listing_refused","Der Spieler konnte nicht auf die Transferliste gesetzt werden.");}
feedback = loan ? "Der Spieler wird zum Verleih angeboten." : "Der Spieler steht auf der Transferliste.";
} else if (action == "bid") {
int entry = -1;
@@ -10222,12 +10240,20 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
if (item->own_listing) return refuse("own_player", "Das ist ein eigener Spieler.");
const auto money_of = [&](const char* key) -> int64_t {
const cli::Json* v = ui_field(*payload, key);
try { return v ? std::stoll(ui_text(*v, "minor")) : -1; } catch (const std::exception&) { return -1; }
try {
if(!v||ui_text(*v,"currency")!="EUR")return -1;
const auto* units=ui_field(*v,"minorUnits");if(!units||!units->integer()||*units->integer()!=2)return -1;
const auto text=ui_text(*v,"minor");size_t end=0;const auto amount=std::stoll(text,&end);
return end==text.size()&&amount>=0&&amount/100<=std::numeric_limits<uint32_t>::max()?amount:-1;
} catch (const std::exception&) { return -1; }
};
const int64_t fee = money_of("fee"), salary = money_of("monthlySalary");
const cli::Json* years = ui_field(*payload, "years");
if (fee < 0 || fee % 100 || salary < 0 || salary % 100 || !years || !years->integer() || *years->integer() < 1 || *years->integer() > 4)
if (fee < 0 || fee % 100 || fee/100>std::numeric_limits<int32_t>::max() || salary < 0 || salary % 100 || salary/100>std::numeric_limits<int32_t>::max()/12 || !years || !years->integer() || *years->integer() < 1 || *years->integer() > 4)
return refuse("invalid_payload", "fee, monthlySalary (Money, ganze Euro) und years 1-4 nötig.");
const auto* bonuses=ui_field(*payload,"bonuses");
if(bonuses&&(!bonuses->array()||bonuses->array()->size()!=7||std::any_of(bonuses->array()->begin(),bonuses->array()->end(),[](const auto& b){return !b.integer()||*b.integer()<0||*b.integer()>255;})))return refuse("invalid_payload","bonuses benötigt sieben ganze Werte zwischen 0 und 255.");
if(bonuses)for(size_t i=0;i<7;++i)if(*(*bonuses->array())[i].integer()>(i<3?20:200))return refuse("invalid_payload","Die Prämie überschreitet das Originalmaximum.");
ui::TransferMarketRequest open;
open.kind = ui::TransferMarketRequestKind::open_offer;
open.offer_is_loan = loan;
@@ -10263,6 +10289,7 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
e.duration_years = uint8_t(*years->integer());
ok = bool(edit(ui::OutgoingTransferRequestKind::quote_change, ui::OutgoingTransferField::duration_years, e.duration_years));
}
if(ok&&bonuses)for(size_t i=0;i<7&&ok;++i){const auto value=uint8_t(*(*bonuses->array())[i].integer());if(e.bonuses[i]!=value){e.bonuses[i]=value;ok=bool(edit(ui::OutgoingTransferRequestKind::quote_change,ui::OutgoingTransferField(int(ui::OutgoingTransferField::bonus_0)+int(i)),uint32_t(value)*(i<3?1u:5u)));}}
std::optional<TransferOfferEditorDispatch> sent;
if (ok) sent = edit(ui::OutgoingTransferRequestKind::submit, ui::OutgoingTransferField::fee, e.fee);
if (!sent) { restore(); return refuse("transfer_refused", error); }
+128
View File
@@ -0,0 +1,128 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/content/transfer_market.hpp"
#include "formats/executable_layout.hpp"
#include <algorithm>
#include <limits>
namespace bmh::modern {
ui::TransferMarketState project_transfer_market(const ModernState &g,
uint64_t revision) {
ui::TransferMarketState out;
const auto active = int(g.memory.u8(::bmh::layout::ActiveManager));
if (active < 0 || size_t(active) >= g.manager_teams.size())
throw FormatError("invalid transfer manager");
out.manager_slot = active;
out.runtime_club = g.manager_teams[size_t(active)];
out.revision = revision;
if (out.runtime_club < 0 || out.runtime_club >= modern::league_clubs())
throw FormatError("transfers require a club manager");
const size_t record = size_t(active) * 0xb0c;
const auto word32 = [&](size_t at) {
return int32_t(uint32_t(g.manager_records.at(at)) |
uint32_t(g.manager_records.at(at + 1)) << 8 |
uint32_t(g.manager_records.at(at + 2)) << 16 |
uint32_t(g.manager_records.at(at + 3)) << 24);
};
out.balance = word32(record + 0x314);
out.credit_line = word32(record + 0x31c);
out.club_name = g.club_name(out.runtime_club);
out.source = "modern_world_projection";
const auto range = bmh::squad_range(out.runtime_club);
out.roster.squad_start_offset = int(range.first);
std::vector<bool> listed(g.players.size(), false);
for (int i = 0; i < 40; ++i) {
const size_t slot = modern::transfer_list_slot() + size_t(i);
const int player = g.squad_slots.at(slot) & 0xfff;
if (player == 0xfff)
continue;
const auto &p = g.players.at(size_t(player));
const uint32_t entry = ::bmh::layout::EditorList + uint32_t(i) * 0x58;
ui::TransferMarketItem item;
item.list_entry = i;
item.source_slot = int(slot);
item.player = player;
item.attributes = p;
item.age = p.age();
item.position = p.position();
item.strength = p.strength();
item.name = g.player_name(player);
item.source_word = g.squad_slots[slot];
const auto seller = g.memory.u16(entry + 8);
item.seller = seller == 0xffff ? -1 : int(seller & 0x7fff);
item.seller_name = g.club_name(item.seller < 0 ? 0xfff : item.seller);
item.own_listing = item.seller == out.runtime_club;
const auto fee = uint64_t(g.memory.u32(entry + 0x2c) / 10000) * 12500;
if (fee > uint64_t(INT32_MAX))
throw FormatError("transfer asking fee overflow");
item.asking_fee = int32_t(fee);
item.salary_reference = g.memory.u32(entry + 0x30);
item.salary_demand_percent = g.memory.u8(entry + 0x55);
for (int n = 0; n < 4; ++n) {
const auto buyer = g.memory.u16(entry + uint32_t(n) * 2);
if (buyer == 0xffff)
continue;
++item.offers;
if (buyer != out.runtime_club)
continue;
TransferBidRequest bid;
bid.manager = active;
bid.list_entry = i;
bid.source_slot = int(slot);
bid.player = player;
bid.fee = int32_t(g.memory.u32(entry + 0x1c + uint32_t(n) * 4));
bid.annual_salary = int32_t(g.memory.u32(entry + 0x0c + uint32_t(n) * 4));
const auto term = g.memory.u8(entry + 0x34 + uint32_t(n));
bid.contract_years = uint8_t((int(term & 0x7f) - 1) / 12 + 1);
bid.loan = (term & 0x80) != 0;
for (size_t k = 0; k < 7; ++k)
bid.bonuses[k] =
g.memory.u8(entry + 0x38 + uint32_t(n) * 7 + uint32_t(k));
item.own_bid = bid;
item.own_bid_pending = true;
}
listed.at(size_t(player)) = true;
out.items.push_back(std::move(item));
}
size_t borrowed = 0;
for (int i = 0; i < 12; ++i)
if (g.memory.has(::bmh::layout::Career_CareerManagersEnd_RuntimeField +
uint32_t(i) * 2 + 1) &&
g.memory.has(::bmh::layout::ClubInfo_FormatError_RuntimeField2 +
uint32_t(i)) &&
g.memory.u16(::bmh::layout::Career_CareerManagersEnd_RuntimeField +
uint32_t(i) * 2) != 0xfff &&
g.memory.u8(::bmh::layout::ClubInfo_FormatError_RuntimeField2 +
uint32_t(i)) == active)
++borrowed;
if (borrowed > range.count)
throw FormatError("transfer borrowed rows exceed squad");
for (size_t row = 0; row < range.count - borrowed; ++row) {
const auto slot = g.squad_slots.at(range.first + row);
const int player = slot & 0xfff;
if (player == 0xfff)
continue;
const auto &p = g.players.at(size_t(player));
out.squad.push_back({int(row), player, slot, g.player_name(player), p.age(),
p.position(), p.strength(),
listed.at(size_t(player))});
}
for (int all = 0; all < 2; ++all) {
std::array<uint32_t, 5> count{}, sum{};
for (size_t row = 0; row < std::min(range.count, size_t(all ? 24 : 11));
++row) {
const int player = g.squad_slots.at(range.first + row) & 0xfff;
if (player == 0xfff)
continue;
const auto &p = g.players.at(size_t(player));
const auto pos = size_t(p.position());
++count[pos];
++count[4];
sum[pos] += p.strength();
sum[4] += p.strength();
}
auto &strength = all ? out.team_strengths : out.active_strengths;
for (size_t i = 0; i < 5; ++i)
strength[i] = count[i] ? uint16_t(sum[i] / count[i]) : 0;
}
return out;
}
} // namespace bmh::modern
+9
View File
@@ -0,0 +1,9 @@
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include "modern/game/modern_state.hpp"
#include "ui/transfer_market.hpp"
namespace bmh::modern {
// Modern pool identities are world-relative, never Classic's fixed 0xb70.
ui::TransferMarketState project_transfer_market(const ModernState &,
uint64_t revision);
} // namespace bmh::modern
+5 -5
View File
@@ -567,7 +567,7 @@ TransferActionResult list_manager_player(ModernState& g, int manager, int squad_
// The transfer-list slot follows the new pool slot. The engine uses 40 entries
// for the normal list; entries 40-43 are reserved for matchday approaches.
for (int i = 0; i < 40; ++i)
if ((g.squad_slots.at(0xb70u + size_t(i)) & 0xfff) == player) { out.list_entry = i; break; }
if ((g.squad_slots.at(modern::transfer_list_slot() + size_t(i)) & 0xfff) == player) { out.list_entry = i; break; }
return out;
}
@@ -587,7 +587,7 @@ TransferActionResult submit_transfer_bid_impl(ModernState& g, const TransferBidR
if (request.list_entry < 0 || request.list_entry >= 40 || request.player < 0 || request.fee <= 0 || request.annual_salary <= 0 ||
request.contract_years < 1 || request.contract_years > 4) return out;
const uint32_t entry = ::bmh::layout::EditorListUnsigned + uint32_t(request.list_entry) * 0x58;
const int player = g.squad_slots.at(0xb70u + size_t(request.list_entry)) & 0xfff;
const int player = g.squad_slots.at(modern::transfer_list_slot() + size_t(request.list_entry)) & 0xfff;
if (player == 0xfff) {
out.status = TransferActionStatus::invalid_player;
return out;
@@ -684,7 +684,7 @@ TransferActionResult submit_transfer_bid_impl(ModernState& g, const TransferBidR
sale.list_entry = request.list_entry;
sale.bid_slot = bid;
sale.list_address = entry;
sale.source_pool_slot = 0xb70u + size_t(request.list_entry);
sale.source_pool_slot = modern::transfer_list_slot() + size_t(request.list_entry);
sale.expected_seller = seller;
sale.expected_buyer = buyer;
sale.expected_active_manager = request.manager;
@@ -782,13 +782,13 @@ TransferActionResult submit_transfer_bid_source_impl(ModernState& g, const Trans
return unsupported("unsupported ordinary human-buyer record or 24-slot squad");
const uint32_t list = ::bmh::layout::EditorListUnsigned + uint32_t(request.list_entry) * 0x58;
const size_t expected_pool_slot = 0xb70u + size_t(request.list_entry);
const size_t expected_pool_slot = modern::transfer_list_slot() + size_t(request.list_entry);
if (!g.memory.has(list + 0x57) || request.source_slot < 0 ||
size_t(request.source_slot) != expected_pool_slot || size_t(request.source_slot) >= g.squad_slots.size())
return unsupported("missing or mismatched explicit ordinary Source pool slot");
const int player = int(g.squad_slots[size_t(request.source_slot)] & 0x0fff);
if (player == 0x0fff || player != request.player ||
int(g.squad_slots[0xb70u + size_t(request.list_entry)] & 0x0fff) != player)
int(g.squad_slots[modern::transfer_list_slot() + size_t(request.list_entry)] & 0x0fff) != player)
return unsupported("ordinary Source list/player identity mismatch");
if (!g.memory.has(::bmh::layout::ActiveManager) || g.memory.u8(::bmh::layout::ActiveManager) != request.manager ||
+2 -2
View File
@@ -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 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 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)
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection)
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
if(MSVC)
+1 -1
View File
@@ -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"})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"})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<std::string>()},{"until",season.at("endDate").get<std::string>()}},revision));
bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle;
+4
View File
@@ -72,6 +72,10 @@ Json engine_toto_command(const Json &bundle,const Json &quote,const std::string
Json engine_statistics_projection(const Json &bundle,const Json &read);
Json engine_transfer_filters();
Json engine_transfer_projection(const Json &,const Json &);
Json engine_transfer_command(const Json &,const Json &,const std::string &);
Json engine_opening_projection(const Json &bundle,const Json &read);
// Single-session facade. Its owner serializes all calls on a background worker.
+6 -1
View File
@@ -31,6 +31,7 @@ void App::engine_accept(EngineReply result) {
engine_ticket_bind();
engine_toto_poll();
engine_stadium_poll();
engine_transfer_sync();
engine_contracts_poll();
engine_calendar_sync();
engine_friendly_sync();
@@ -91,6 +92,7 @@ void App::engine_frame() {
}
if(rendered&&(menu_=="scorers"||menu_=="fairplay")){rankings_restore_scroll();context_->Update();}
if(menu_=="statistics")statistics_restore_scroll();
if(menu_=="transfer")transfer_restore_scroll();
if(rendered&&files_native_){files_after_render();context_->Update();}
if (center_selects(*doc_)) context_->Update();
if (menu_ == "lineup" && lineup_roster_scroll_) {
@@ -166,6 +168,7 @@ void App::engine_event(Rml::Event &event) {
if(menu_=="statistics"&&statistics_event(event))return;
if(menu_=="toto"&&toto_event(event))return;
if(menu_=="stadium"&&stadium_event(event))return;
if(menu_=="transfer"&&transfer_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;
@@ -260,6 +263,7 @@ void App::engine_event(Rml::Event &event) {
if(menu_=="statistics"&&statistics_action(action,node))return;
if(menu_=="toto"&&toto_action(action,node))return;
if(menu_=="stadium"&&stadium_action(action,node))return;
if(menu_=="transfer"&&transfer_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;
@@ -276,6 +280,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=="transfer"){menu_=id;transfer_view_=Json::object();transfer_dialog_.clear();engine_transfer_sync();refresh();}
else if(action=="engine-open"&&id=="stadium"){menu_=id;stadium_view_=Json::object();stadium_view_defaults(stadium_view_);engine_stadium_sync();refresh();}
else if(action=="engine-open"&&id=="toto"){menu_=id;engine_toto_sync();refresh();}
else if(action=="engine-open"&&id=="statistics"){menu_=id;engine_reports_sync();engine_statistics_load();}
@@ -310,5 +315,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_},
{"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_}};
{"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_}};
}
+3 -1
View File
@@ -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=="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=="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+="<div class=\"fill\" style=\"z-index:100;\">"+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"<div class=\"fill center\">"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="fairplay")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"<div class=\"fill center\">"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="other")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"<div class=\"fill center\">"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"</div>")+"</div>";
if(menu_=="transfer")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Transfers",render_transfer())+"</div>";
if(menu_=="stadium")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Stadion",render_stadium())+"</div>";
if(menu_=="toto")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Toto",render_toto())+"</div>";
if(menu_=="statistics")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Statistiken",engine_statistics_value_.is_object()?render_statistics():"<div class=\"fill center\">"+esc(engine_busy_?"Statistik wird geladen …":engine_notice_)+"</div>")+"</div>";
@@ -176,6 +177,7 @@ void App::engine_render() {
if(menu_=="stadium"&&stadium_view_.value("dialog",std::string())!=""){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#stadium-underlay button,.window>.titlebar button");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
if(!toto_dialog_.empty()){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#toto-underlay button,.window>.titlebar button");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
if(statistics_trophy_.contains("asset")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".window button,.window input");for(auto *n:nodes)n->SetAttribute("disabled",true);}
if(menu_=="transfer"&&!transfer_dialog_.empty()){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".transfer-overview button,.transfer-overview input,#window-close");for(auto*n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}if(transfer_dialog_=="search"){for(auto*id:{"transfer-criterion-foot","transfer-criterion-type","transfer-search-trait-0","transfer-search-trait-1","transfer-search-trait-2"})if(auto*n=element(id))n->SetAttribute("disabled",true);}}
if (engine_busy_) {
Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input");
for (auto *node : controls) node->SetAttribute("disabled", true);
+7
View File
@@ -126,3 +126,10 @@
void engine_stadium_send(const Json &,const std::string &);
bool engine_stadium_action(const std::string &,Rml::Element *);
bool engine_stadium_event(Rml::Event &);
Json engine_transfer_context_,engine_transfer_value_,engine_transfer_filters_=engine_transfer_filters();
bool engine_transfer_submitting_=false;
void engine_transfer_sync();
Json transfer_data() const;
std::string transfer_money(const Json &) const;
bool engine_transfer_action(const std::string &,Rml::Element *);
+235
View File
@@ -0,0 +1,235 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/engine_bridge.hpp"
#include <algorithm>
#include <array>
#include <set>
namespace bmh::modern_ui {
namespace {
void check(bool yes, const char *message) {
if (!yes)
throw editor::Error(message);
}
const Json &read(const Json &b) {
validate_engine_desk(b);
const auto &r = b.at("transfer"), &m = b.at("desktop").at("meta");
check(r.value("messageType", "") == "snapshot" &&
r.at("data").value("kind", "") == "transfer",
"Transfermarkt nicht verfügbar.");
for (const auto *key : {"contractVersion", "careerId", "worldId",
"worldRevision", "stateRevision", "scope"})
check(r.at("meta").at(key) == m.at(key),
"Der Transferkontext hat sich geändert.");
check(m.at("scope").at("role") == "club" &&
r.at("data").at("teamId") == m.at("scope").at("teamId"),
"Transfers gehören einer anderen Mannschaft.");
return r.at("data");
}
Json row(const Json &p, const Json &club, bool own) {
const auto &d = p.at("details");
Json r = {{"id", p.at("playerId")},
{"name", d.at("name")},
{"club", club.is_string() ? club : Json("")},
{"own", own},
{"age", p.at("age")},
{"position", p.at("position")},
{"strength", p.at("strength")},
{"nation", d.at("nationId")},
{"photo", d.at("photoAssetId")},
{"skills", d.at("skills")},
{"condition", d.at("condition")},
{"technique", d.at("technique")},
{"form", d.at("form")},
{"fee", nullptr},
{"salary", nullptr},
{"foot", nullptr},
{"type", nullptr},
{"nation_name", ""},
{"games", nullptr},
{"goals", nullptr},
{"assists", nullptr},
{"league_games", nullptr},
{"cup_games", nullptr},
{"europe_games", nullptr}};
return r;
}
std::string folded(std::string s) {
for (size_t i = 0; i < s.size(); ++i) {
auto &c = s[i];
if (c >= 'A' && c <= 'Z')
c = char(c - 'A' + 'a');
else if (static_cast<unsigned char>(c) == 0xc3 && i + 1 < s.size()) {
auto &next = s[++i];
const auto n = static_cast<unsigned char>(next);
if (n >= 0x80 && n <= 0x9e && n != 0x97)
next = char(n + 0x20);
}
}
return s;
}
} // namespace
Json engine_transfer_filters() {
return {{"query", ""},
{"positions", 15},
{"criteria",
{{"age_min", 16},
{"age_max", 47},
{"strength_min", 0},
{"strength_max", 100},
{"traits", 7},
{"foot", 0},
{"type", 0},
{"price_max", 9999999900LL}}}};
}
Json engine_transfer_projection(const Json &b, const Json &filters) {
const auto &d = read(b);
check(filters.is_object() && filters.at("query").is_string() &&
filters.at("positions").is_number_integer(),
"Ungültiger Suchfilter.");
const int positions = filters.at("positions");
check(positions > 0 && positions <= 15, "Ungültiger Positionsfilter.");
Json own = Json::array(), market = Json::array(), orders = Json::array(),
listed = Json::array();
std::set<std::string> ids, listing_ids;
for (const auto &p : d.at("squad")) {
check(ids.insert(p.at("playerId").get<std::string>()).second,
"Doppelter Kaderspieler.");
auto r = row(p, d.at("teamId"), true);
if (p.at("listed") == true)
listed.push_back(p.at("playerId"));
own.push_back(std::move(r));
}
const auto &c = filters.at("criteria");
for (const auto &p : d.at("listings")) {
check(listing_ids.insert(p.at("id").get<std::string>()).second,
"Doppelter Listenplatz.");
auto r = row(p, p.at("sellerId"), p.at("ownListing"));
r["listing"] = p.at("id");
r["fee"] = engine_money_minor(p.at("askingFee"));
r["offers"] = p.at("offers");
r["bid"] = p.at("ownBid");
r["salary_reference"] = engine_money_minor(p.at("salaryReference"));
r["salary_percent"] = p.at("salaryDemandPercent");
r["seller_name"] = p.at("seller");
r["loan_allowed"] = p.at("loanAvailable");
r["terms"] = p.at("offerTerms");
if (r.at("own") == true)
for (auto &member : own)
if (member.at("id") == r.at("id")) {
member["fee"] = r.at("fee");
member["listing"] = r.at("listing");
}
if (p.at("ownBid").is_object()) {
const auto &bid = p.at("ownBid");
orders.push_back({{"player", r.at("id")},
{"name", r.at("name")},
{"kind", bid.value("loan", false) ? "loan" : "buy"},
{"poached", false},
{"fee", engine_money_minor(bid.at("fee"))},
{"months", bid.at("years").get<int>() * 12},
{"listing", p.at("id")}});
}
const std::array<const char *, 4> roles{"gk", "def", "mid", "fwd"};
const auto pos = std::find(roles.begin(), roles.end(),
r.at("position").get<std::string>());
check(pos != roles.end(), "Unbekannte Transferposition.");
if (!(positions & (1 << int(pos - roles.begin()))) ||
r.at("age") < c.at("age_min") || r.at("age") > c.at("age_max") ||
r.at("strength") < c.at("strength_min") ||
r.at("strength") > c.at("strength_max") ||
r.at("fee") > c.at("price_max"))
continue;
if (folded(r.at("name")).find(folded(filters.at("query"))) ==
std::string::npos)
continue;
market.push_back(std::move(r));
}
const auto &a = d.at("activeStrengths"), &t = d.at("teamStrengths");
check(a.size() == 5 && t.size() == 5, "Unvollständige Mannschaftsstärken.");
return {{"ok", true},
{"own", own},
{"market", market},
{"orders", orders},
{"listed", listed},
{"query", filters.at("query")},
{"positions", positions},
{"cash", engine_money_minor(d.at("cash"))},
{"credit", engine_money_minor(d.at("creditLine"))},
{"strengths",
{{"active", Json::array({a[0], a[1], a[2], a[3]})},
{"team", Json::array({t[0], t[1], t[2], t[3]})},
{"active_average", a[4]},
{"team_average", t[4]}}}};
}
Json engine_transfer_command(const Json &b, const Json &draft,
const std::string &id) {
const auto &d = read(b), &m = b.at("desktop").at("meta");
check(!id.empty(), "Anfrage-ID fehlt.");
const auto &commands = m.at("scope").at("allowedCommands");
check(std::find(commands.begin(), commands.end(), Json("transfer.submit")) !=
commands.end(),
"Transfers sind derzeit gesperrt.");
const auto kind = draft.at("kind").get<std::string>(),
player = draft.at("player").get<std::string>();
Json payload;
if (kind == "sell" || kind == "lend") {
const auto it =
std::find_if(d.at("squad").begin(), d.at("squad").end(),
[&](const auto &p) { return p.at("playerId") == player; });
check(it != d.at("squad").end() && it->at("listed") == false,
"Der Spieler ist nicht verfügbar oder bereits gelistet.");
payload = {
{"action", "list"}, {"playerId", player}, {"loan", kind == "lend"}};
} else {
check(kind == "buy" || kind == "loan", "Unbekannte Transferart.");
const auto listing = draft.at("listing").get<std::string>();
const auto it = std::find_if(
d.at("listings").begin(), d.at("listings").end(), [&](const auto &p) {
return p.at("id") == listing && p.at("playerId") == player;
});
check(it != d.at("listings").end() && it->at("ownListing") == false,
"Das Angebot gehört einem anderen Spieler.");
if (kind == "loan")
check(it->at("loanAvailable") == true,
"Vereinslose Spieler können nicht ausgeliehen werden.");
if (it->at("ownBid").is_object())
check(it->at("ownBid").value("loan", false) == (kind == "loan"),
"Die Leihart eines laufenden Angebots kann hier noch nicht "
"geändert werden.");
const auto integer = [&](const Json &v, int64_t maximum) {
check(v.is_number_integer() && v.get<int64_t>() >= 0 &&
v.get<int64_t>() <= maximum,
"Ungültiger Angebotswert.");
return v.get<int64_t>();
};
const auto fee = integer(draft.at("fee"), 99999999),
salary = integer(draft.at("salary"), 200000),
months = integer(draft.at("months"), 48);
check(months >= 12 && months % 12 == 0 && (kind != "loan" || months <= 24),
"Ungültige Vertragsdauer.");
check(draft.at("bonuses").is_array() && draft.at("bonuses").size() == 7,
"Sieben Prämien benötigt.");
for (size_t i = 0; i < 7; ++i)
integer(draft.at("bonuses")[i], i < 3 ? 20 : 200);
const auto money = [](int64_t euros) {
return Json{{"currency", "EUR"},
{"minorUnits", 2},
{"minor", std::to_string(euros * 100)}};
};
payload = {{"action", "bid"},
{"listingId", listing},
{"fee", money(fee)},
{"monthlySalary", money(salary)},
{"years", months / 12},
{"loan", kind == "loan"},
{"bonuses", draft.at("bonuses")}};
}
return {{"messageType", "command"},
{"requestId", id},
{"careerId", m.at("careerId")},
{"expectedRevision", m.at("stateRevision")},
{"owner", {{"managerId", m.at("scope").at("managerId")}}},
{"kind", "transfer.submit"},
{"payload", payload}};
}
} // namespace bmh::modern_ui
+365
View File
@@ -0,0 +1,365 @@
// SPDX-License-Identifier: GPL-3.0-only
Json App::transfer_data() const {
return engine_mode_ ? engine_transfer_projection(engine_data_,
engine_transfer_filters_)
: demo_transfer_view(snap().state, *world_,
transfer_ui_club(snap()));
}
std::string App::transfer_money(const Json &minor) const {
if (!minor.is_number_integer())
return "—";
if (!engine_mode_)
return cash(minor.get<int64_t>());
return engine_price({{"currency", "EUR"},
{"minorUnits", 2},
{"minor", std::to_string(minor.get<int64_t>())}});
}
void App::engine_transfer_sync() {
const auto &meta = engine_data_.at("desktop").at("meta");
if (!engine_transfer_context_.is_object() ||
engine_transfer_context_.value("careerId", Json()) !=
meta.at("careerId") ||
engine_transfer_context_.at("scope").at("managerId") !=
meta.at("scope").at("managerId") ||
engine_transfer_context_.at("scope").at("teamId") !=
meta.at("scope").at("teamId") ||
engine_transfer_context_.at("scope").at("role") !=
meta.at("scope").at("role")) {
engine_transfer_filters_ = engine_transfer_filters();
transfer_view_ = Json::object();
transfer_dialog_.clear();
}
engine_transfer_context_ = meta;
engine_transfer_value_ = Json();
try {
engine_transfer_value_ =
engine_transfer_projection(engine_data_, engine_transfer_filters_);
} catch (const std::exception &) {
}
if (engine_transfer_submitting_) {
engine_transfer_submitting_ = false;
transfer_dialog_ = "booked";
transfer_notice_ = engine_notice_;
transfer_draft_ = Json();
transfer_world_.reset();
focus_after_render_ = "transfer-close";
}
}
bool App::engine_transfer_action(const std::string &action,
Rml::Element *target) {
if (!action.starts_with("transfer-"))
return false;
if (menu_ != "transfer" || engine_busy_ || !engine_fresh_ ||
!engine_transfer_value_.is_object())
return true;
transfer_remember_scroll();
const auto index = target ? target->GetAttribute<int>("data-index", -1) : -1;
const auto id =
target ? target->GetAttribute<Rml::String>("data-player", "") : "";
const auto context = engine_transfer_context_;
const auto update = [&] {
engine_transfer_value_ =
engine_transfer_projection(engine_data_, engine_transfer_filters_);
transfer_view_["page"] = 0;
transfer_view_["market"] = "";
transfer_view_["hover"] = "";
refresh();
};
const auto send = [this, context](const Json &draft) {
if (!engine_fresh_ || engine_busy_ || engine_transfer_context_ != context) {
message("Die Partie hat sich geändert. Bitte das Angebot erneut öffnen.");
return;
}
const auto request = engine_transfer_command(engine_data_, draft,
editor::new_id("request:ui-"));
engine_transfer_submitting_ = true;
auto link = engine_link_;
engine_start(
"Transferauftrag wird bearbeitet …",
[link, request] {
const auto reply = link->command(request);
return EngineReply{link, link->snapshot(), reply, nullptr};
},
true);
};
if (action == "transfer-close") {
close_transfer();
return true;
}
if (action == "transfer-offer-back") {
transfer_dialog_ = "offer";
focus_after_render_ = "transfer-fee";
refresh();
return true;
}
if (action == "transfer-own" || action == "transfer-market") {
auto row = transfer_ui_find(engine_transfer_value_.at("own"), id);
if (row.is_null())
row = transfer_ui_find(engine_transfer_value_.at("market"), id);
if (row.is_null())
return true;
const bool own = row.at("own");
transfer_view_[own ? "own" : "market"] = id;
transfer_view_["side"] = own ? "own" : "market";
transfer_view_["hover"] = "";
focus_after_render_ = target->GetId();
refresh();
return true;
}
if (action == "transfer-data" || action == "transfer-all" ||
action == "transfer-scope") {
if (action == "transfer-data")
transfer_view_["tab"] = 1 - transfer_view_.value("tab", 0);
else if (action == "transfer-all") {
transfer_view_["complete"] = !transfer_view_.value("complete", false);
transfer_view_["roster_left"] = 0;
} else {
const auto scope = target->GetAttribute<Rml::String>("data-scope", "");
if (scope == "team" || scope == "active")
transfer_view_["scope"] = scope;
}
focus_after_render_ = target->GetId();
refresh();
return true;
}
if (action == "transfer-filter") {
if (index < 0 || index > 4)
return true;
const int mask = index == 0
? 15
: engine_transfer_filters_.at("positions").get<int>() ^
(1 << (index - 1));
if (mask) {
engine_transfer_filters_["positions"] = mask;
update();
}
return true;
}
if (action == "transfer-search") {
engine_transfer_filters_["query"] =
transfer_view_.value("query", std::string());
update();
return true;
}
if (action == "transfer-page") {
const int step = target->GetAttribute<int>("data-step", 0);
if (step == -1 || step == 1) {
transfer_view_["page"] = std::clamp(
transfer_view_.value("page", 0) + step, 0,
std::max(0,
int((engine_transfer_value_.at("market").size() + 5) / 6) -
1));
transfer_view_["hover"] = "";
focus_after_render_ = target->GetId();
refresh();
}
return true;
}
if (action == "transfer-offer") {
const auto kind = target->GetAttribute<Rml::String>("data-kind", "");
const bool own = kind == "sell" || kind == "lend";
auto row = transfer_ui_find(
engine_transfer_value_.at(own ? "own" : "market"),
transfer_view_.value(own ? "own" : "market", std::string()));
if (row.is_null())
return true;
if (own) {
if (std::find(engine_transfer_value_.at("listed").begin(),
engine_transfer_value_.at("listed").end(),
row.at("id")) != engine_transfer_value_.at("listed").end())
return true;
const Json draft = {{"kind", kind}, {"player", row.at("id")}};
confirmation(row.at("name").get<std::string>() +
(kind == "lend" ? " zum Verleih anbieten?"
: " auf die Transferliste setzen?"),
[send, draft] { send(draft); });
popup_accept_ = "Anbieten";
return true;
}
const auto *club = row.at("club").is_string()
? world_->find("clubs", row.at("club"))
: nullptr;
row["club_name"] =
club ? world_->name(*club) : row.value("seller_name", std::string("—"));
row["nation_name"] = row.at("nation").is_string()
? world_->nation_name(row.at("nation"))
: "";
const auto &bid = row.at("bid");
Json bonuses = Json::array({0, 0, 0, 0, 0, 0, 0});
if (bid.is_object())
bonuses = bid.at("bonuses");
transfer_draft_ = {
{"kind", kind},
{"player", row.at("id")},
{"listing", row.at("listing")},
{"row", row},
{"poached", false},
{"fee", bid.is_object() ? engine_money_minor(bid.at("fee")) / 100
: engine_money_minor(
row.at("terms")
.at(kind == "loan" ? "loan" : "buy")
.at("fee")) /
100},
{"salary", bid.is_object()
? engine_money_minor(bid.at("monthlySalary")) / 100
: row.at("salary_reference").get<int64_t>() / 100},
{"months", bid.is_object() ? bid.at("years").get<int>() * 12 : 24},
{"bonuses", bonuses},
{"demand_fee",
engine_money_minor(
row.at("terms").at(kind == "loan" ? "loan" : "buy").at("fee"))},
{"demand_salary", row.at("salary_reference")}};
transfer_revision_ =
std::stoull(context.at("stateRevision").get<std::string>());
transfer_world_ = world_;
transfer_return_focus_ = target->GetId();
transfer_dialog_ = "offer";
focus_after_render_ = "transfer-fee";
refresh();
return true;
}
if (action == "transfer-player-info" || action == "transfer-team-info") {
if (transfer_dialog_ == "offer") {
transfer_dialog_ =
action == "transfer-player-info" ? "player-info" : "team-info";
focus_after_render_ = "transfer-offer-back";
refresh();
}
return true;
}
if (action == "transfer-submit") {
if (transfer_dialog_ != "offer" || transfer_world_ != world_)
return true;
const auto draft = transfer_draft_;
const auto request = engine_transfer_command(
engine_data_, draft, editor::new_id("request:review-"));
(void)request;
confirmation(draft.at("row").at("name").get<std::string>() + ": " +
(draft.at("kind") == "loan" ? std::string("Leihgebühr ")
: std::string("Ablöse ")) +
transfer_money(draft.at("fee").get<int64_t>() * 100) +
", Monatsgehalt " +
transfer_money(draft.at("salary").get<int64_t>() * 100) +
", " + std::to_string(draft.at("months").get<int>()) +
" Monate. Angebot mit den angezeigten Prämien abgeben?",
[send, draft] { send(draft); });
popup_accept_ = "Angebot abgeben";
return true;
}
if (action == "transfer-amount" || action == "transfer-bonus" ||
action == "transfer-search-budget") {
const bool search = action == "transfer-search-budget",
bonus = action == "transfer-bonus";
if (search ? transfer_dialog_ != "search" : transfer_dialog_ != "offer")
return true;
const auto field =
search ? std::string("price_max")
: bonus ? std::string("bonuses")
: target->GetAttribute<Rml::String>("data-field", "");
if ((bonus && (index < 0 || index > 6)) ||
(!search && !bonus && field != "fee" && field != "salary"))
return true;
AmountRequest a;
a.title = search ? "Maximale Ablösesumme"
: bonus ? transfer_ui_bonuses[size_t(index)]
: field == "fee" ? "Ablöse / Leihgebühr"
: "Monatsgehalt";
a.unit = bonus ? "" : "€";
a.return_focus = target->GetId();
a.min = 0;
a.max = bonus ? (index < 3 ? 20 : 1000)
: field == "salary" ? 200000
: 99999999;
a.step = bonus && index >= 3 ? 5 : 1;
if (!search && !bonus) {
const auto &terms = transfer_draft_.at("row").at("terms");
a.max = std::min<int64_t>(
a.max, engine_money_minor(
field == "fee"
? terms
.at(transfer_draft_.at("kind") == "loan" ? "loan"
: "buy")
.at("maximumFee")
: terms.at("maximumMonthlySalary")) /
100);
}
a.suggestion_step = bonus ? 1 : field == "salary" ? 5000 : 100000;
a.review = false;
a.value = search ? transfer_search_draft_.at(field).get<int64_t>()
: bonus ? transfer_draft_.at(field)[size_t(index)].get<int64_t>()
: transfer_draft_.at(field).get<int64_t>();
if (bonus && index >= 3)
a.value *= 5;
a.accept = [this, context, field, index, search, bonus](int64_t value) {
if (menu_ != "transfer" || engine_transfer_context_ != context ||
transfer_dialog_ != (search ? "search" : "offer"))
return false;
if (search)
transfer_search_draft_[field] = value;
else if (bonus)
transfer_draft_[field][size_t(index)] = index < 3 ? value : value / 5;
else
transfer_draft_[field] = value;
refresh();
return true;
};
open_amount(std::move(a));
return true;
}
if (action == "transfer-criteria" || action == "transfer-suggest" ||
action == "transfer-search-reset") {
transfer_search_draft_ = action == "transfer-search-reset"
? engine_transfer_filters().at("criteria")
: engine_transfer_filters_.at("criteria");
transfer_search_draft_["price_max"] =
transfer_search_draft_.at("price_max").get<int64_t>() / 100;
transfer_search_draft_["positions"] =
action == "transfer-search-reset"
? 15
: engine_transfer_filters_.at("positions").get<int>();
if (action == "transfer-suggest") {
const auto &strengths =
engine_transfer_value_.at("strengths").at("active");
const auto it = std::min_element(strengths.begin(), strengths.end());
transfer_search_draft_["positions"] = 1 << int(it - strengths.begin());
}
transfer_world_ = world_;
transfer_dialog_ = "search";
transfer_return_focus_ = target->GetId();
focus_after_render_ = "transfer-search-position-0";
refresh();
return true;
}
if (action == "transfer-search-position") {
if (transfer_dialog_ == "search" && index >= 0 && index < 4) {
const int mask =
transfer_search_draft_.at("positions").get<int>() ^ (1 << index);
if (mask)
transfer_search_draft_["positions"] = mask;
focus_after_render_ = target->GetId();
refresh();
}
return true;
}
if (action == "transfer-search-apply") {
if (transfer_dialog_ != "search")
return true;
auto criteria = transfer_search_draft_;
engine_transfer_filters_["positions"] = criteria.at("positions");
criteria.erase("positions");
criteria["price_max"] = criteria.at("price_max").get<int64_t>() * 100;
engine_transfer_filters_["criteria"] = criteria;
engine_transfer_filters_["query"] = "";
update();
close_transfer();
return true;
}
if (action == "transfer-orders") {
transfer_dialog_ = "orders";
transfer_return_focus_ = target->GetId();
focus_after_render_ = "transfer-close";
refresh();
return true;
}
return true;
}
+12 -12
View File
@@ -11,6 +11,7 @@ void App::close_transfer(bool restore) {
refresh();
}
bool App::transfer_action(const std::string &action, Rml::Element *target) {
if (engine_mode_) return engine_transfer_action(action,target);
if (!action.starts_with("transfer-"))
return false;
if (menu_ != "transfer" || !world_ || !source_)
@@ -392,7 +393,7 @@ bool App::transfer_action(const std::string &action, Rml::Element *target) {
return true;
}
bool App::transfer_event(Rml::Event &event) {
if (menu_ != "transfer" || !source_ || amount_ || !popup_.empty() ||
if (menu_ != "transfer" || (!engine_mode_ && !source_) || amount_ || !popup_.empty() ||
!report_detail_kind_.empty())
return false;
const auto type = event.GetType();
@@ -458,7 +459,7 @@ bool App::transfer_event(Rml::Event &event) {
target->HasAttribute("data-criterion")) {
const auto field =
target->GetAttribute<Rml::String>("data-criterion", "");
const int maximum = (field == "age_min" || field == "age_max") ? 40
const int maximum = (field == "age_min" || field == "age_max") ? (engine_mode_?47:40)
: (field == "foot" || field == "type") ? 3
: 100;
const int minimum = (field == "age_min" || field == "age_max") ? 16 : 0;
@@ -549,7 +550,7 @@ bool App::transfer_event(Rml::Event &event) {
offers = true;
if (offers) {
const auto pool =
demo_transfer_view(snap().state, *world_, transfer_ui_club(snap()))
transfer_data()
.at("market");
const int pages = std::max(1, int((pool.size() + 5) / 6));
transfer_view_["page"] = (transfer_view_.value("page", 0) + 1) % pages;
@@ -576,9 +577,8 @@ bool App::transfer_event(Rml::Event &event) {
return false;
if (transfer_view_.value("hover", std::string()) != hover) {
transfer_view_["hover"] = hover;
const auto snapshot = snap();
const auto rows = demo_transfer_view(snapshot.state, *world_,
transfer_ui_club(snapshot));
const auto snapshot = engine_mode_ ? Snapshot{} : snap();
const auto rows = transfer_data();
auto row = transfer_ui_find(rows.at("market"), hover);
if (row.is_null())
row = transfer_view_.value("side", std::string()) == "own"
@@ -589,19 +589,19 @@ bool App::transfer_event(Rml::Event &event) {
transfer_view_.value("market", std::string()));
std::string body = "<p>Wähle einen angebotenen Spieler.</p>";
if (row.is_object()) {
const auto fee = row.at("fee").get<int64_t>(),
remaining = snapshot.state.at("cash").get<int64_t>() +
const auto fee = row.at("fee").is_number_integer() ? row.at("fee").get<int64_t>() : 0,
remaining = (engine_mode_ ? engine_transfer_value_.at("cash").get<int64_t>() : snapshot.state.at("cash").get<int64_t>()) +
(row.at("own") == true ? fee : -fee);
body = "<p>" + label(world_->find("clubs", row.at("club")), 32) +
body = "<p>" + (world_->find("clubs",row.at("club"))?label(world_->find("clubs",row.at("club")),32):esc(row.value("seller_name",std::string("—")))) +
"</p><div><section><span>" +
std::string(row.at("own") == true ? "Marktwert"
: "Geforderte Ablöse") +
"</span><strong>" + esc(cash(fee)) +
"</span><strong>" + esc(row.at("fee").is_null()?std::string("—"):transfer_money(fee)) +
"</strong></section><section><span>Restkapital nach " +
std::string(row.at("own") == true ? "Verkauf" : "Kauf") +
"</span><strong class=\"" +
std::string(remaining < 0 ? "transfer-negative" : "") + "\">" +
esc(cash(remaining)) + "</strong></section></div>";
money_classes(remaining) + "\">" +
esc(row.at("fee").is_null()?std::string("—"):transfer_money(remaining)) + "</strong></section></div>";
}
if (auto *preview = element("transfer-preview"))
preview->SetInnerRML(body);
+36 -34
View File
@@ -110,9 +110,9 @@ void App::transfer_restore_scroll() {
}
std::string App::render_transfer() {
transfer_remember_scroll();
const auto snapshot = snap();
const auto own = transfer_ui_club(snapshot);
const auto data = demo_transfer_view(snapshot.state, *world_, own);
const auto snapshot = engine_mode_ ? Snapshot{} : snap();
const auto own = engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>() : transfer_ui_club(snapshot);
const auto data = transfer_data();
if (!data.value("ok", false))
return {};
if (!transfer_view_.is_object() || !transfer_view_.contains("tab"))
@@ -159,7 +159,7 @@ std::string App::render_transfer() {
if (preview.is_null())
preview = chosen;
const auto listed = [&](const std::string &id) {
const auto &ls = snapshot.state.at("transfer").at("listed");
const auto &ls = engine_mode_ ? engine_transfer_value_.at("listed") : snapshot.state.at("transfer").at("listed");
return std::find(ls.begin(), ls.end(), id) != ls.end();
};
const auto trait = [&](const Json &v, bool foot) {
@@ -204,8 +204,8 @@ std::string App::render_transfer() {
"<section class=\"transfer-overview " +
std::string(complete ? "transfer-complete" : "") +
"\"><header class=\"transfer-heading\"><h2>Kader und "
"Transfermarkt</h2><div><span>Verfügbares Kapital</span><strong>" +
esc(cash(snapshot.state.at("cash").get<int64_t>())) +
"Transfermarkt</h2>" + (engine_mode_?"<p id=\"transfer-engine-feedback\" style=\"position:absolute;left:0;right:650dp;bottom:0;font-size:23dp;line-height:27dp;color:var(--muted);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;\">"+esc(engine_busy_?engine_operation_:engine_notice_)+"</p>":"") + "<div><span>Verfügbares Kapital</span><strong class=\"" + money_classes(engine_mode_?engine_transfer_value_.at("cash").get<int64_t>():snapshot.state.at("cash").get<int64_t>()) + "\">" +
esc(transfer_money((engine_mode_ ? engine_transfer_value_.at("cash").get<int64_t>() : snapshot.state.at("cash").get<int64_t>()))) +
"</strong></div></header><div class=\"transfer-columns\"><section "
"class=\"transfer-roster\"><header><h2>Dein Kader</h2><span>" +
std::to_string(ours.size()) + " Spieler · Daten " + (b ? "B" : "A") +
@@ -368,18 +368,18 @@ std::string App::render_transfer() {
"</div><section id=\"transfer-preview\" class=\"transfer-preview\">";
if (preview.is_object()) {
const auto *source = world_->find("clubs", preview.at("club"));
const auto fee = preview.at("fee").get<int64_t>();
const auto remaining = snapshot.state.at("cash").get<int64_t>() +
const auto fee = preview.at("fee").is_number_integer() ? preview.at("fee").get<int64_t>() : 0;
const auto remaining = (engine_mode_ ? engine_transfer_value_.at("cash").get<int64_t>() : snapshot.state.at("cash").get<int64_t>()) +
(preview.at("own") == true ? fee : -fee);
out += "<p>" + label(source, 32) + "</p><div><section><span>" +
out += "<p>" + (source?label(source,32):esc(preview.value("seller_name",std::string("—")))) + "</p><div><section><span>" +
std::string(preview.at("own") == true ? "Marktwert"
: "Geforderte Ablöse") +
"</span><strong>" + esc(cash(fee)) +
"</span><strong>" + esc(preview.at("fee").is_null()?std::string("—"):transfer_money(fee)) +
"</strong></section><section><span>Restkapital nach " +
std::string(preview.at("own") == true ? "Verkauf" : "Kauf") +
"</span><strong class=\"" +
std::string(remaining < 0 ? "transfer-negative" : "") + "\">" +
esc(cash(remaining)) + "</strong></section></div>";
money_classes(remaining) + "\">" +
esc(preview.at("fee").is_null()?std::string("—"):transfer_money(remaining)) + "</strong></section></div>";
} else
out += "<p>Wähle einen angebotenen Spieler.</p>";
out += "</section><nav class=\"transfer-filters\">";
@@ -397,7 +397,7 @@ std::string App::render_transfer() {
: "false") +
"\"");
out += "</nav>";
const auto strengths = demo_transfer_strengths(
const auto strengths = engine_mode_ ? engine_transfer_value_.at("strengths") : demo_transfer_strengths(
snapshot.state, *world_, own, demo_lineup_active(snapshot.state));
const auto scope = transfer_view_.value("scope", std::string("active"));
out +=
@@ -428,17 +428,19 @@ std::string App::render_transfer() {
: "Kein Marktspieler ausgewählt") +
"</p><div>";
const bool mine = chosen.is_object() && chosen.at("own") == true;
const bool pending = engine_mode_ && !mine && chosen.is_object() && chosen.value("bid",Json()).is_object();
const bool pending_loan = pending && chosen.at("bid").value("loan",false);
out +=
btn("transfer-offer",
mine && listed(chosen.at("id")) ? "Vom Markt nehmen" : "Ver-kaufen",
"",
"id=\"transfer-offer-buy-sell\" data-kind=\"" +
std::string(mine ? "sell" : "buy") + "\" " +
std::string(chosen.is_object() ? "" : "disabled")) +
std::string(chosen.is_object() && (!engine_mode_ || !mine || !listed(chosen.at("id"))) && (!pending || !pending_loan) ? "" : "disabled")) +
btn("transfer-offer", "Ver-leihen", "",
"id=\"transfer-offer-loan-lend\" data-kind=\"" +
std::string(mine ? "lend" : "loan") + "\" " +
std::string(chosen.is_object() ? "" : "disabled")) +
std::string(chosen.is_object() && (!engine_mode_ || !mine || !listed(chosen.at("id"))) && (!pending || pending_loan) && (!engine_mode_ || mine || chosen.value("loan_allowed",false)) ? "" : "disabled")) +
"</div></div></div></section>";
}
out += "</div><nav class=\"transfer-actions\">" +
@@ -451,7 +453,7 @@ std::string App::render_transfer() {
out += btn("transfer-criteria", "Spieler suchen", "",
"id=\"transfer-criteria\"") +
btn("transfer-suggest", "Vorschlag", "", "id=\"transfer-suggest\"") +
btn("transfer-poach", "Abwerben", "", "id=\"transfer-poach\"") +
btn("transfer-poach", "Abwerben", "", "id=\"transfer-poach\" " + std::string(engine_mode_?"disabled title=\"Noch nicht angebunden\"":"")) +
btn("transfer-orders",
"Aufträge (" + std::to_string(data.at("orders").size()) + ")",
"", "id=\"transfer-orders\"");
@@ -462,8 +464,8 @@ std::string App::render_transfer() {
std::string App::render_transfer_dialog() {
if (transfer_dialog_.empty())
return {};
const auto snapshot = snap();
const auto actor = transfer_ui_club(snapshot);
const auto snapshot = engine_mode_ ? Snapshot{} : snap();
const auto actor = engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>() : transfer_ui_club(snapshot);
std::string title, body, actions;
double height = 500;
const auto button = [&](const char *action, const std::string &caption,
@@ -500,15 +502,15 @@ std::string App::render_transfer_dialog() {
transfer_ui_number(r.at("age")) + " Jahre · Stärke " +
transfer_ui_number(r.at("strength")) +
"</span></div><div class=\"transfer-offer-club\">" +
label(world_->find("clubs", r.at("club")), 58) +
(world_->find("clubs",r.at("club"))?label(world_->find("clubs",r.at("club")),58):esc(r.value("club_name",std::string("—")))) +
"</div></header><div class=\"transfer-demands\"><section><span>" +
std::string(loan ? "Fiktive Leihgebühr" : "Ungefährer Marktwert") +
"</span><strong>" + esc(cash(d.at("demand_fee").get<int64_t>())) +
std::string(engine_mode_ ? "Ablöseforderung" : loan ? "Fiktive Leihgebühr" : "Ungefährer Marktwert") +
"</span><strong>" + esc(transfer_money(d.at("demand_fee").get<int64_t>())) +
"</strong></section><section><span>" +
std::string(mine ? "Aktuelles Monatsgehalt" : "Gehaltswunsch") +
std::string(engine_mode_ ? "Gehaltsreferenz / Monat" : mine ? "Aktuelles Monatsgehalt" : "Gehaltswunsch") +
"</span><strong>" +
(d.at("demand_salary").is_number_integer()
? esc(cash(d.at("demand_salary").get<int64_t>()))
? esc(transfer_money(d.at("demand_salary").get<int64_t>()))
: "—") +
"</strong></section></div><h3 class=\"transfer-offer-your\">Dein "
"Angebot</h3><div class=\"transfer-offer-inputs\">";
@@ -544,13 +546,13 @@ std::string App::render_transfer_dialog() {
"<div class=\"transfer-premium-row\" style=\"" +
rect((i % 2) * 1063, 48 + (i / 2) * 82, 1029, 82) + "\"><span>" +
std::string(transfer_ui_bonuses[size_t(i)]) + "</span>" +
btn("transfer-bonus", transfer_ui_number(d.at("bonuses")[size_t(i)]),
btn("transfer-bonus", transfer_ui_number(engine_mode_&&i>=3?Json(d.at("bonuses")[size_t(i)].get<int>()*5):d.at("bonuses")[size_t(i)]),
"amount-trigger",
"id=\"transfer-bonus-" + std::to_string(i) + "\" data-index=\"" +
std::to_string(i) + "\"") +
"</div>";
body += "</div></section><p class=\"transfer-offer-note\">" +
std::string(mine ? "Der Spieler wird zum " +
std::string(engine_mode_ ? "Die Engine entscheidet nach Bestätigung über dieses Angebot. Die Konditionen werden erst beim Absenden verbindlich." : mine ? "Der Spieler wird zum " +
std::string(loan ? "Verleihen" : "Verkauf") +
" auf dem Markt vorgemerkt."
: "Das Angebot wird vorgemerkt; die Entscheidung "
@@ -594,7 +596,7 @@ std::string App::render_transfer_dialog() {
"</span><input type=\"range\" id=\"transfer-range-" + key +
"\" data-criterion=\"" + key + "\" min=\"" +
std::to_string(i < 2 ? 16 : 0) + "\" max=\"" +
std::to_string(i < 2 ? 40 : 100) + "\" step=\"1\" value=\"" +
std::to_string(i < 2 ? (engine_mode_?47:40) : 100) + "\" step=\"1\" value=\"" +
transfer_ui_number(d.at(key)) +
"\"/><output id=\"transfer-range-value-" + key + "\">" +
transfer_ui_number(d.at(key)) + "</output></div>";
@@ -652,7 +654,7 @@ std::string App::render_transfer_dialog() {
"class=\"transfer-info-photo\">" +
(r.at("photo").is_string()
? img(r.at("photo"), 440, 550, true, true, 650)
: "<span>—</span>") +
: engine_mode_ ? img("asset:player/generic/photo",440,550,true,false,650) : "<span>—</span>") +
"</div><div class=\"transfer-info-facts\">";
const std::vector<std::pair<std::string, std::string>> facts{
{"Verein", r.at("club_name")},
@@ -683,7 +685,7 @@ std::string App::render_transfer_dialog() {
} else if (transfer_dialog_ == "team-info") {
height = 800;
title = "Team-Info";
const auto values = demo_transfer_strengths(
const auto values = engine_mode_ ? engine_transfer_value_.at("strengths") : demo_transfer_strengths(
snapshot.state, *world_, actor, demo_lineup_active(snapshot.state));
body = "<div class=\"transfer-team-info\"><h3>" +
label(world_->find("clubs", actor), 58) +
@@ -766,7 +768,7 @@ std::string App::render_transfer_dialog() {
"<span>" + transfer_ui_role(r.at("position")) + "</span><span>" +
transfer_ui_number(r.at("age")) + "</span><span>" +
transfer_ui_number(r.at("strength")) + "</span><span>" +
esc(cash((r.at("fee").get<int64_t>() * 3 + 1) / 2)) +
esc(transfer_money((r.at("fee").get<int64_t>() * 3 + 1) / 2)) +
"</span></div>";
body += "</div>";
actions = button("transfer-poach-back", "Zurück zu Vereinen",
@@ -775,7 +777,7 @@ std::string App::render_transfer_dialog() {
} else if (transfer_dialog_ == "orders") {
title = "Vorgemerkte Transferaufträge";
const auto rows =
demo_transfer_view(snapshot.state, *world_, actor).at("orders");
transfer_data().at("orders");
height = rows.empty() ? 430 : std::min(1450., 352. + rows.size() * 74.);
body = "<div id=\"transfer-orders-scroll\" class=\"transfer-order-list\">";
if (rows.empty())
@@ -793,21 +795,21 @@ std::string App::render_transfer_dialog() {
body +=
"<div class=\"transfer-order-row\"><span>" +
esc(o.at("name").get<std::string>()) + "</span><span>" +
esc(o.at("poached") == true ? "Abwerben" : kinds.at(o.at("kind"))) +
"</span><span>" + esc(cash(o.at("fee").get<int64_t>())) +
esc(engine_mode_ ? "Gebot" : o.at("poached") == true ? "Abwerben" : kinds.at(o.at("kind"))) +
"</span><span>" + esc(transfer_money(o.at("fee").get<int64_t>())) +
"</span><span>" + std::to_string(o.at("months").get<int>()) +
" Monate</span>" +
btn("transfer-order-delete", "×", "",
"id=\"transfer-order-delete-" + std::to_string(i) +
"\" data-index=\"" + std::to_string(i) +
"\" aria-label=\"Auftrag zurücknehmen\"") +
"\" aria-label=\"Auftrag zurücknehmen\" " + std::string(engine_mode_?"disabled title=\"Noch nicht angebunden\"":"")) +
"</div>";
}
}
body += "</div>";
actions = close("Zurück");
} else {
title = transfer_dialog_ == "booked" ? "Auftrag vorgemerkt"
title = transfer_dialog_ == "booked" ? (engine_mode_ ? "Transferauftrag" : "Auftrag vorgemerkt")
: "Transferliste voll";
body = "<p class=\"transfer-notice\">" + esc(transfer_notice_) + "</p>";
actions = close("Verstanden");
+1
View File
@@ -1546,6 +1546,7 @@ public:
#include "modern/ui/engine_statistics.inc"
#include "modern/ui/engine_toto.inc"
#include "modern/ui/engine_stadium.inc"
#include "modern/ui/engine_transfer.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {
+30 -1
View File
@@ -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<std::string> 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"};
const std::set<std::string> 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"};
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
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)); };
@@ -158,6 +158,35 @@ 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-transfer") {
const auto value=engine_transfer_projection(before,engine_transfer_filters());write("projection.json",value);
Json commands=Json::array();
const auto run=[&](const Json &request){const auto result=link->command(request);commands.push_back({{"request",request},{"response",result}});return result;};
Json current=before,list_request;bool found=false;int refusal_count=0;
for(const auto&candidate:before.at("transfer").at("data").at("squad")) {
if(candidate.at("listed")==true)continue;
const Json listing={{"kind","sell"},{"player",candidate.at("playerId")}};
list_request=engine_transfer_command(current,listing,"request:list-player-"+candidate.at("playerId").get<std::string>());
const auto response=run(list_request);
if(response.value("messageType","")=="error") {if(link->snapshot()!=current)throw std::runtime_error("refused listing changed game");++refusal_count;continue;}
current=link->snapshot();for(const auto&p:current.at("transfer").at("data").at("squad"))if(p.at("playerId")==candidate.at("playerId")&&p.at("listed")==true)found=true;
if(!found)throw std::runtime_error("false successful listing feedback");break;
}
if(!found)throw std::runtime_error("no actual listable player");write("listed.json",current);
auto stale=list_request;stale["requestId"]="request:stale-transfer";if(run(stale).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("stale transfer changed game");
Json draft;for(const auto&p:current.at("transfer").at("data").at("listings"))if(p.at("ownListing")==false){draft={{"kind","buy"},{"player",p.at("playerId")},{"listing",p.at("id")},{"fee",engine_money_minor(p.at("askingFee"))/100},{"salary",12000},{"months",24},{"bonuses",{1,2,3,4,5,6,7}}};break;}
if(draft.is_null())throw std::runtime_error("no actual market candidate");
auto request=engine_transfer_command(current,draft,"request:transfer-offer");
auto bad=request;bad["requestId"]="request:wrong-currency";bad["payload"]["fee"]["currency"]="USD";
if(run(bad).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("invalid currency changed game");
bad=request;bad["requestId"]="request:overflow-fee";bad["payload"]["fee"]["minor"]="429496729600";
if(run(bad).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("overflow fee changed game");
bad=request;bad["requestId"]="request:overflow-salary";bad["payload"]["monthlySalary"]["minor"]="214748364700";
if(run(bad).value("messageType","")!="error"||link->snapshot()!=current)throw std::runtime_error("overflow salary changed game");
const auto offered=run(request);write("offered.json",offered);const auto after=link->snapshot();write("after.json",after);if(offered.value("messageType","")!="command_result")throw std::runtime_error(offered.dump());
if(offered.value("outcome","")=="offer_pending"){bool bid=false;for(const auto&p:after.at("transfer").at("data").at("listings"))if(p.at("playerId")==draft.at("player")&&p.at("ownBid").is_object()){bid=true;if(p.at("ownBid").at("bonuses")!=draft.at("bonuses"))throw std::runtime_error("pending bonuses differ");}if(!bid)throw std::runtime_error("pending bid missing");}
link->save_copy(out/"after.obs");write("commands.json",commands);write("receipt.json",{{"status","passed"},{"actualListing",true},{"listingRefusals",refusal_count},{"staleRefused",true},{"invalidMoneyRefused",true},{"offerOutcome",offered.value("outcome",std::string("applied"))}});std::cout<<"actual transfer listing, offer, bonuses and invalid money passed\n";return 0;
}
if(mode=="verify-toto") {
const auto value=engine_toto_projection(before);if(value.at("programme").at("complete")!=true)throw std::runtime_error("fixture has no eleven-match coupon");Json rows=Json::array();for(int column=0;column<2;++column){auto tips=value.at("suggestions");if(column){tips[0]=tips[0]==0?1:0;}rows.push_back(tips);}const Json payload={{"stake",{{"currency","EUR"},{"minorUnits",2},{"minor","5000000"}}},{"columns",rows}};
const auto quote=link->read({{"kind","toto"},{"draft",payload}});write("quote.json",quote);if(link->read({{"kind","toto"},{"draft",payload}})!=quote||link->snapshot()!=before)throw std::runtime_error("Toto quote changed session");const auto &offer=quote.at("data").at("draftQuote");if(offer.at("allowed")!=true||engine_money_minor(offer.at("cost"))!=10500000||engine_money_minor(offer.at("fee"))!=500000)throw std::runtime_error("wrong actual two-column cost");
+185
View File
@@ -0,0 +1,185 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/engine_bridge.hpp"
#include <iostream>
#include <stdexcept>
using namespace bmh::modern_ui;
namespace {
void check(bool yes, const char *why) {
if (!yes)
throw std::runtime_error(why);
}
template <class F> void rejected(F f) {
bool caught = false;
try {
f();
} catch (const std::exception &) {
caught = true;
}
check(caught, "invalid transfer accepted");
}
Json money(int64_t n) {
return {{"currency", "EUR"},
{"minorUnits", 2},
{"minor", std::to_string(n * 100)}};
}
Json fixture() {
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", {"transfer.submit"}}}}};
Json b;
for (auto *kind : {"session", "desktop", "camps", "transfer"})
b[kind] = {{"messageType", "snapshot"},
{"meta", meta},
{"data", {{"kind", kind}}}};
b["desktop"]["data"].update({{"manager", {{"id", "manager:test"}}},
{"team", {{"id", "club:test"}}},
{"accounts", {{"cash", money(5000000)}}}});
b["camps"]["data"]["camps"] = Json::array();
const Json details = {{"name", "Synthetic Player"},
{"nationId", nullptr},
{"photoAssetId", nullptr},
{"condition", 71},
{"technique", 62},
{"form", 53},
{"skills", {0, 1, 2, 3, 2, 1, 0}}};
auto &d = b["transfer"]["data"];
d.update(
{{"teamId", "club:test"},
{"cash", money(5000000)},
{"creditLine", money(1000000)},
{"activeStrengths", {10, 20, 30, 40, 25}},
{"teamStrengths", {11, 21, 31, 41, 26}},
{"squad", Json::array({{{"playerId", "player:own"},
{"age", 26},
{"position", "mid"},
{"strength", 61},
{"listed", false},
{"details", details}}})},
{"listings",
Json::array(
{{{"id", "listing:0"},
{"playerId", "player:market"},
{"sellerId", "club:other"},
{"seller", "Other club"},
{"age", 25},
{"position", "fwd"},
{"strength", 64},
{"details", details},
{"askingFee", money(1234567)},
{"salaryReference", money(120000)},
{"salaryDemandPercent", 110},
{"offers", 0},
{"offerTerms",
{{"buy",
{{"fee", money(1234567)}, {"maximumFee", money(2469134)}}},
{"loan",
{{"fee", money(308641)}, {"maximumFee", money(617282)}}},
{"maximumMonthlySalary", money(200000)}}},
{"loanAvailable", true},
{"ownListing", false},
{"ownBid", nullptr}}})}});
return b;
}
} // namespace
int main() {
try {
auto b = fixture(), f = engine_transfer_filters();
const auto before = b;
auto v = engine_transfer_projection(b, f);
check(b == before, "projection mutated source");
check(v.at("own").size() == 1 && v.at("market").size() == 1,
"source rows missing");
check(v.at("cash") == 500000000 && v.at("market")[0].at("fee") == 123456700,
"money scaled incorrectly");
check(v.at("own")[0].at("fee").is_null() &&
v.at("own")[0].at("games").is_null(),
"unknown values invented");
check(v.at("strengths").at("active_average") == 25,
"source position strength lost");
f["positions"] = 1;
check(engine_transfer_projection(b, f).at("market").empty(),
"position filter ignored");
f = engine_transfer_filters();
f["query"] = "sYnThEtIc";
check(engine_transfer_projection(b, f).at("market").size() == 1,
"name filter wrong");
f["criteria"]["price_max"] = 123456699;
check(engine_transfer_projection(b, f).at("market").empty(),
"budget filter scaled incorrectly");
Json draft = {{"kind", "buy"},
{"player", "player:market"},
{"listing", "listing:0"},
{"fee", 1234567},
{"salary", 12345},
{"months", 36},
{"bonuses", {1, 2, 3, 4, 5, 6, 7}}};
auto c = engine_transfer_command(b, draft, "request:test");
check(c.at("payload").at("fee") == money(1234567) &&
c.at("payload").at("monthlySalary") == money(12345) &&
c.at("payload").at("years") == 3 &&
c.at("payload").at("loan") == false,
"offer did not preserve exact terms");
check(c.at("expectedRevision") == "3" &&
c.at("owner").at("managerId") == "manager:test",
"command lost owner");
check(c.at("payload").at("bonuses") == draft.at("bonuses"), "bonuses lost");
auto invalid = draft;
invalid["player"] = "player:recycled";
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
invalid = draft;
invalid["fee"] = 100000000;
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
invalid = draft;
invalid["salary"] = -1;
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
invalid = draft;
invalid["months"] = 13;
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
invalid = draft;
invalid["bonuses"][0] = 21;
rejected([&] { engine_transfer_command(b, invalid, "request:x"); });
auto foreign = b;
foreign["transfer"]["meta"]["stateRevision"] = "4";
rejected([&] {
engine_transfer_projection(foreign, engine_transfer_filters());
});
foreign = b;
foreign["transfer"]["data"]["teamId"] = "club:foreign";
rejected([&] {
engine_transfer_projection(foreign, engine_transfer_filters());
});
foreign = b;
foreign["transfer"]["data"]["listings"].push_back(
foreign["transfer"]["data"]["listings"][0]);
rejected([&] {
engine_transfer_projection(foreign, engine_transfer_filters());
});
foreign = b;
foreign["transfer"]["data"]["cash"]["minorUnits"] = 0;
rejected([&] {
engine_transfer_projection(foreign, engine_transfer_filters());
});
auto list = engine_transfer_command(
b, {{"kind", "lend"}, {"player", "player:own"}}, "request:list");
check(list.at("payload").at("action") == "list" &&
list.at("payload").at("loan") == true,
"loan listing lost");
b["transfer"]["data"]["squad"][0]["listed"] = true;
rejected([&] {
engine_transfer_command(b, {{"kind", "sell"}, {"player", "player:own"}},
"request:list");
});
std::cout << "transfer projection and command checks passed\n";
return 0;
} catch (const std::exception &e) {
std::cerr << e.what() << '\n';
return 1;
}
}
+85
View File
@@ -0,0 +1,85 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "formats/executable_layout.hpp"
#include "modern/content/transfer_market.hpp"
#include <iostream>
#include <stdexcept>
using namespace bmh;
namespace {
void check(bool yes, const char *why) {
if (!yes)
throw std::runtime_error(why);
}
} // namespace
int main() try {
for (const bool expanded : {false, true}) {
auto layout = classic_world_layout();
if (expanded) {
uint32_t at = 0;
for (size_t i = 0; i < layout.squad_size.size(); ++i) {
layout.squad_start[i] = at;
layout.squad_size[i] = 24;
at += 24;
}
layout.transfer_list = at;
layout.free_agents = at + 44;
layout.foreign_offers = at + 124;
layout.pool_end = at + 144;
layout.total_slots = layout.pool_end + 102;
}
set_world_layout(layout);
modern::ModernState g;
g.manager_teams = {0};
g.manager_records.resize(0xb0c);
g.club_ids = {0};
g.club_names = {'T', 0};
g.player_name_offsets = {0, 0, 0};
g.player_names = {'P', 0};
g.players.resize(3);
g.players[2].w35c = 80 | (70 << 7) | (60 << 14);
g.players[2].w364 = 2 | (10 << 21);
g.squad_slots.assign(layout.total_slots, 0xfff);
g.squad_slots[0] = 2;
g.squad_slots[0xb70] = 1;
g.squad_slots[layout.transfer_list] = 2;
g.memory.add_block(::bmh::layout::ActiveManager, 1);
g.memory.add_block(::bmh::layout::EditorList, 40 * 0x58);
for (int i = 0; i < 4; ++i)
g.memory.set16(::bmh::layout::EditorList + uint32_t(i) * 2, 0xffff);
g.memory.set16(::bmh::layout::EditorList + 8, 0);
g.memory.set32(::bmh::layout::EditorList + 0x2c, 800000);
g.memory.set32(::bmh::layout::EditorList + 0x30, 12000);
const auto slots = g.squad_slots;
const auto records = g.manager_records;
const auto memory = g.memory.blocks();
auto v = modern::project_transfer_market(g, 17);
check(v.items.size() == 1 && v.items[0].player == 2 &&
v.items[0].source_slot == int(layout.transfer_list),
"projection read Classic pool in an expanded world");
check(v.squad.size() == 1 && v.squad[0].already_listed,
"actual own list membership missing");
check(v.items[0].own_listing && v.items[0].asking_fee == 1000000,
"actual seller/fee missing");
check(v.revision == 17 && v.active_strengths[2] == g.players[2].strength(),
"identity/positional strength changed");
check(g.squad_slots == slots && g.manager_records == records &&
g.memory.blocks() == memory,
"read mutated state");
g.memory.set16(::bmh::layout::EditorList, 0);
g.memory.set8(::bmh::layout::EditorList + 0x34, 0x80 | 24);
for (int i = 0; i < 7; ++i)
g.memory.set8(::bmh::layout::EditorList + 0x38 + uint32_t(i),
uint8_t(i + 1));
v = modern::project_transfer_market(g, 18);
check(v.items[0].own_bid && v.items[0].own_bid->loan &&
v.items[0].own_bid->contract_years == 2 &&
v.items[0].own_bid->bonuses[6] == 7,
"saved bid term/bonuses lost");
}
set_world_layout(classic_world_layout());
std::cout << "world-relative transfer pool, actual list membership, bid and "
"pure reads passed\n";
return 0;
} catch (const std::exception &e) {
std::cerr << e.what() << '\n';
return 1;
}