diff --git a/assets/modern/pages.rcss b/assets/modern/pages.rcss index f01172a..dd597f1 100644 --- a/assets/modern/pages.rcss +++ b/assets/modern/pages.rcss @@ -1030,3 +1030,7 @@ body.midnight .cp-map-name,body.matchday .cp-map-name {color:#f0ece2;font-effect .es-pair-s strong,.es-pair.big .es-pair-s strong {flex:none;overflow:visible;text-overflow:clip;} .es-stage .es-draw-dot {width:32.15dp;height:32.15dp;border-width:0dp;border-radius:16.08dp;} .es-foot .es-note {min-width:0;pointer-events:none;} + +/* bank > players: a fellow manager as the lender */ +.pg-card.bk-lender,.pg-card.bk-lender:hover {flex:none;flex-direction:row;align-items:center;gap:27dp;width:100%;padding:18dp 27dp;border-radius:36dp;} +.bk-lender strong,.bk-lender span {display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} diff --git a/src/modern/ui/bank_screens.inc b/src/modern/ui/bank_screens.inc index 9bc5794..9cf3509 100644 --- a/src/modern/ui/bank_screens.inc +++ b/src/modern/ui/bank_screens.inc @@ -232,13 +232,39 @@ std::string App::render_bank() { const auto people = bank_players(); page_title_ = "Spieler"; page_hint_ = std::to_string(people.size()) + " Manager an einem Tisch"; - out += "
" + banner("bank.scene.players", 700, 648, "Unter Managern", "Geschäfte mit Mitspielern", "Noch nicht im Spiel") + "
" + + if (engine_mode_) { + // a fellow manager lends like the bank does, without fees; the first of them is chosen + const auto self = engine_data_.at("desktop").at("meta").at("scope").value("managerId", std::string()); + bool known = false; + for (const auto &person : people) known |= person.value("id", "") == bank_lender_ && bank_lender_ != self; + if (!known) { bank_lender_.clear(); for (const auto &person : people) if (bank_lender_.empty() && person.value("id", "") != self) bank_lender_ = person.value("id", ""); } + page_hint_ = "Kredit von einem Mitspieler"; + out += "
" + + banner("bank.scene.players", 520, 390, "Unter Managern", "Geld vom Mitspieler", "Kredit ohne Bank und ohne Gebühren") + "
" + pg_kicker("Kreditgeber"); + int index = 0; + for (const auto &person : people) { + const auto id = person.value("id", ""); + if (id == self) continue; + const auto *club = world_->find("clubs", person.value("club", "")); + const bool chosen = id == bank_lender_; + out += btn("bank-lender", (club ? "" + crest(club, 72) + "" : std::string()) + "
" + esc(person.value("name", "")) + "" + + esc(club ? world_->name(*club) : std::string()) + "
", std::string("pg-card bk-lender") + (chosen ? " sel" : ""), + "id=\"bank-lender-" + std::to_string(index++) + "\" data-id=\"" + esc(id) + "\" aria-pressed=\"" + (chosen ? "true" : "false") + "\""); + } + out += "Je Mitspieler läuft höchstens ein Kredit. Die Summe ist durch sein Konto und seine Kreditlinie begrenzt.
"; + if (engine_credit_lender_ == bank_lender_ && !bank_lender_.empty()) out += engine_credit_view(); + else out += "
" + std::string(engine_credit_refused_ == bank_lender_ && !bank_lender_.empty() ? "Dieser Kredit kann gerade nicht gelesen werden." : "Der Kredit wird gelesen …") + "
"; + out += "
"; + } else { + out += "
" + banner("bank.scene.players", 700, 648, "Unter Managern", "Geschäfte mit Mitspielern", "Nur im echten Spiel") + "
" + pg_kicker("Mitspieler"); for (const auto &person : people) { const auto *club = world_->find("clubs", person.value("club", "")); out += "
" + (club ? crest(club, 72) : std::string()) + "
" + esc(person.value("name", "")) + "" + esc(club ? world_->name(*club) : std::string()) + "
"; } - out += "
Hier sollen Manager einander Geld leihen und Geschäfte abschließen können. Das Spiel kennt solche Geschäfte noch nicht; die Seite zeigt vorerst nur, wer mitspielt.
"; + out += "
Kredite zwischen Managern gibt es nur im echten Spiel; die Vorschau zeigt, wer mitspielt.
"; + } } else { // the bank: where the money lies, and the loan page_title_ = "Bank"; diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index b7d9450..694238f 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -105,7 +105,7 @@ void App::engine_accept(EngineReply result) { else if(engine_response_.value("messageType","")=="live_finished"){engine_dirty_=true;engine_notice_="Abpfiff · Änderungen noch nicht gespeichert.";} else engine_notice_ = "Spielstand geladen."; if (engine_response_.value("messageType", "") == "command_result") { advertising_selected_ = -1; advertising_offer_ = 0; } - engine_credit_ = engine_data_.value("credit", Json()); engine_credit_edits_ = Json::array(); + engine_credit_ = engine_data_.value("credit", Json()); engine_credit_edits_ = Json::array(); engine_credit_lender_ = "bank"; engine_credit_refused_.clear(); engine_reports_sync(); engine_almanac_sync(); engine_ticket_bind(); @@ -183,11 +183,12 @@ void App::engine_poll() { } if (result.response.value("messageType", "") == "credit_preview") { const auto &read = result.response.at("read"); - if (read.value("messageType", "") == "error") engine_notice_ = "Kreditvorschau abgewiesen: " + read.value("code", "unknown_error"); + const auto lender = result.response.value("lender", std::string("bank")); + if (read.value("messageType", "") == "error") { engine_notice_ = "Kreditvorschau abgewiesen: " + read.value("code", "unknown_error"); if (lender != engine_credit_lender_) engine_credit_refused_ = lender; } else { (void)engine_credit_projection(result.bundle, read); - engine_credit_ = read; engine_credit_edits_ = result.response.at("edits"); - engine_notice_ = "Kreditvorschau berechnet · Noch keine Buchung."; + engine_credit_ = read; engine_credit_edits_ = result.response.at("edits"); engine_credit_lender_ = lender; + engine_notice_ = engine_credit_edits_.empty() ? std::string() : "Kreditvorschau berechnet · Noch keine Buchung."; } refresh(); return; } @@ -199,6 +200,7 @@ void App::engine_frame() { engine_poll(); const bool rendered = needs_render_; if(needs_render_&&menu_=="news"){last_rendered_menu_=menu_;news_before_render();} + engine_credit_follow(); if (needs_render_) engine_render(); engine_sports_update(); if (ticket_) ticket_->update(); diff --git a/src/modern/ui/engine_dto.cpp b/src/modern/ui/engine_dto.cpp index cd81148..4a732b6 100644 --- a/src/modern/ui/engine_dto.cpp +++ b/src/modern/ui/engine_dto.cpp @@ -397,7 +397,8 @@ Json engine_credit_projection(const Json &bundle, const Json &read) { validate_engine_desk(bundle); auto context = bundle; context["credit"] = read; const auto data = lineup_read(context, "credit"); - require(data.at("lenderId") == "bank" && data.at("fields").is_array() && data.at("fields").size() == 8 && data.at("saved").size() == 6, + // the lender is the bank or another manager of this career + require(data.at("lenderId").is_string() && !data.at("lenderId").get().empty() && data.at("fields").is_array() && data.at("fields").size() == 8 && data.at("saved").size() == 6, "Ungültige Kreditansicht."); for (int i = 0; i < 8; ++i) { const auto &f = data.at("fields")[size_t(i)]; @@ -420,7 +421,7 @@ Json engine_credit_command(const Json &bundle, const Json &read, const Json &edi (void)whole_in_range(e.at("field"), 0, 7); (void)whole_in_range(e.at("value"), 0, 99999999); } // The engine replays this ordered edit list and owns fees and all loan maths. - return sports_command(bundle, "bank.commit", {{"action", "credit"}, {"lenderId", "bank"}, {"edits", edits}, {"acceptFees", true}}, request_id); + return sports_command(bundle, "bank.commit", {{"action", "credit"}, {"lenderId", credit.at("lenderId")}, {"edits", edits}, {"acceptFees", true}}, request_id); } Json engine_environment_projection(const Json &bundle) { diff --git a/src/modern/ui/engine_finance.inc b/src/modern/ui/engine_finance.inc index a4afb06..81153ac 100644 --- a/src/modern/ui/engine_finance.inc +++ b/src/modern/ui/engine_finance.inc @@ -27,10 +27,37 @@ void App::engine_ticket_bind() { }, [this] { focus_after_render_ = "account-ticket"; dirty_ = true; }); ticket_engine_bound_ = true; } +// Reads the loan the current manager has with a lender, without any edit. +void App::engine_credit_load(const std::string &lender) { + if (!engine_fresh_ || engine_busy_ || lender.empty()) return; + auto link = engine_link_; + engine_start("Kredit wird gelesen …", [link, lender] { + auto response = link->read({{"kind", "credit"}, {"lenderId", lender}, {"edits", Json::array()}}); + return EngineReply{link, link->snapshot(), {{"messageType", "credit_preview"}, {"read", response}, {"edits", Json::array()}, {"lender", lender}}, nullptr}; + }); +} +// Keeps the loan on screen the one its page is about: the bank's on "Bank", the chosen fellow +// manager's on "Spieler". Every accepted state brings the bank's loan, so the other is read again. +void App::engine_credit_follow() { + if (menu_ != "bank" || !engine_fresh_ || engine_busy_) return; + if (bank_view_ == "players") { + if (!bank_lender_.empty() && engine_credit_lender_ != bank_lender_ && engine_credit_refused_ != bank_lender_) engine_credit_load(bank_lender_); + } else if (engine_credit_lender_ != "bank") { + engine_credit_ = engine_data_.value("credit", Json()); engine_credit_edits_ = Json::array(); engine_credit_lender_ = "bank"; needs_render_ = true; + } +} bool App::engine_bank_action(const std::string &action, Rml::Element *target) { if (!engine_fresh_ || engine_busy_) return true; + if (action == "bank-lender" && target) { + // a fellow manager is chosen as the lender: his loan is read + bank_lender_ = target->GetAttribute("data-id", ""); engine_credit_refused_.clear(); focus_after_render_ = target->GetId(); + if (engine_credit_lender_ != bank_lender_) engine_credit_load(bank_lender_); else refresh(); + return true; + } if (action == "engine-credit-reset") { - engine_credit_ = engine_data_.at("credit"); engine_credit_edits_ = Json::array(); refresh(); return true; + if (engine_credit_lender_ == "bank") { engine_credit_ = engine_data_.at("credit"); engine_credit_edits_ = Json::array(); refresh(); } + else engine_credit_load(engine_credit_lender_); + return true; } if (action == "engine-credit-apply") { const auto data = engine_credit_projection(engine_data_, engine_credit_); @@ -58,12 +85,13 @@ bool App::engine_bank_action(const std::string &action, Rml::Element *target) { const auto edits_before = engine_credit_edits_; if (edits_before.size() >= 64) { message("Bitte den Kreditentwurf zurücksetzen, bevor du weitere Felder änderst."); return true; } request.accept = [this, fresh, edits_before, index](int64_t value) { - if (!fresh() || bank_view_ != "credit" || engine_credit_edits_ != edits_before) return false; + if (!fresh() || (bank_view_ != "credit" && bank_view_ != "players") || engine_credit_edits_ != edits_before) return false; auto edits = edits_before; edits.push_back({{"field", index}, {"value", value}}); auto link = engine_link_; - engine_start("Kreditvorschau wird berechnet …", [link, edits] { - auto response = link->read({{"kind", "credit"}, {"lenderId", "bank"}, {"edits", edits}}); - return EngineReply{link, link->snapshot(), {{"messageType", "credit_preview"}, {"read", response}, {"edits", edits}}, nullptr}; + const auto lender = engine_credit_lender_; + engine_start("Kreditvorschau wird berechnet …", [link, edits, lender] { + auto response = link->read({{"kind", "credit"}, {"lenderId", lender}, {"edits", edits}}); + return EngineReply{link, link->snapshot(), {{"messageType", "credit_preview"}, {"read", response}, {"edits", edits}, {"lender", lender}}, nullptr}; }); return true; }; } else { @@ -100,8 +128,11 @@ bool App::engine_bank_action(const std::string &action, Rml::Element *target) { std::string App::engine_credit_view() { std::string out; Json data; + const bool fellow = engine_credit_lender_ != "bank"; try { data = engine_credit_projection(engine_data_, engine_credit_); } - catch (const std::exception &) { return "
Der Bankkredit ist in diesem Kontext nicht verfügbar.
"; } + catch (const std::exception &) { return "
" + std::string(fellow ? "Dieser Kredit ist in diesem Kontext nicht verfügbar." : "Der Bankkredit ist in diesem Kontext nicht verfügbar.") + "
"; } + std::string lender_name; + if (fellow) try { const auto people = bank_players(); for (const auto &person : people) if (person.value("id", "") == engine_credit_lender_) lender_name = person.value("name", ""); } catch (const std::exception &) {} // the original's labels arrive in capitals: one capital per word reads calmer const auto calm = [](std::string text) { bool first = true; @@ -117,7 +148,7 @@ std::string App::engine_credit_view() { return text; }; // the loan as the bank states it: every figure a line; what may be changed is a button - out += "
" + pg_kicker("Kredit"); + out += "
" + pg_kicker(fellow ? "Kredit von " + lender_name : std::string("Kredit")); int64_t total = 0, paid = 0; for (size_t i = 0; i < 8; ++i) { const auto &f = data.at("fields")[i]; const auto value = f.at("value").get(); @@ -136,7 +167,7 @@ std::string App::engine_credit_view() { const double done = total > 0 ? std::clamp(double(paid) * 100.0 / double(total), 0.0, 100.0) : 0; out += "
Zurückgezahlt" + (total > 0 ? std::to_string(int(std::lround(done))) + " %" : std::string("kein Kredit")) + "
" + pg_bar(done, "sage") + "
" + - std::string(data.at("saved")[0] == 0 ? "Die Bank berechnet Laufzeit, Raten und Gebühren. Gebucht wird erst nach deiner Bestätigung." : "Laufender Kredit · Änderungen folgen mit vollständiger Gebührenvorschau.") + "
"; + std::string(data.at("saved")[0] != 0 ? "" : fellow ? "Ohne Gebühren. Die Summe geht vom Konto des Mitspielers ab, die Raten fließen an ihn. Gebucht wird erst nach deiner Bestätigung; er wird nicht gefragt." : "Die Bank berechnet Laufzeit, Raten und Gebühren. Gebucht wird erst nach deiner Bestätigung.") + std::string(data.at("saved")[0] == 0 ? "" : "Laufender Kredit · Änderungen folgen mit vollständiger Gebührenvorschau.") + ""; out += "
" + pg_button("engine-credit-reset", "Zurücksetzen", "block", "id=\"engine-credit-reset\"") + pg_button("engine-credit-apply", "Verbindlich buchen", "primary block", "id=\"engine-credit-apply\" " + std::string(engine_credit_edits_.empty() ? "disabled=\"disabled\"" : "")) + "
"; return out; diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc index 3f2e8de..666188d 100644 --- a/src/modern/ui/engine_state.inc +++ b/src/modern/ui/engine_state.inc @@ -5,6 +5,11 @@ Json engine_data_, engine_response_, engine_focus_, engine_training_draft_, engine_tactics_draft_; std::string engine_camp_, engine_operation_, engine_notice_, engine_player_; Json engine_credit_, engine_credit_edits_ = Json::array(); + // whose loan engine_credit_ shows ("bank" or a manager's id), the fellow manager chosen on the page + // "Spieler", and a lender whose loan could not be read (not asked again until something changes) + std::string engine_credit_lender_ = "bank", bank_lender_, engine_credit_refused_; + void engine_credit_load(const std::string &lender); + void engine_credit_follow(); std::string engine_contract_operation_; std::optional engine_contract_scroll_; bool engine_contracts_action(const std::string &, Rml::Element *); diff --git a/src/modern/ui/notebook.inc b/src/modern/ui/notebook.inc index e63210d..8ef38de 100644 --- a/src/modern/ui/notebook.inc +++ b/src/modern/ui/notebook.inc @@ -228,9 +228,12 @@ std::string App::notebook_shell(const std::function & } out += ""; // the page: paper, the picture of its subject, ruled lines with a margin, two rings left by a cup, a turned corner + // ruled, squared or left empty, as the settings say + const std::string sheet = ui_preferences_.is_object() ? ui_preferences_.value("display", Json::object()).value("paper", std::string("ruled")) : std::string("ruled"); std::string lines; - for (double y = 44; y < 850; y += 32) lines += ""; - lines += ""; + if (sheet != "plain") for (double y = 44; y < 850; y += 32) lines += ""; + if (sheet == "squared") for (double x = 98; x < 1396; x += 32) lines += ""; + if (sheet != "plain") lines += ""; // the ring a cup left in the lower right corner: only where the page keeps that corner free or covers it // with a panel of its own, never under bare writing or an older sheet // (the transfer market keeps it free; on the home page it shows while no card lies on the last two cells of the bottom row) @@ -245,7 +248,7 @@ std::string App::notebook_shell(const std::function & if (stain) lines += ""; out += "
" + picture(paper, 3163.5, 1948.5, true) + "
"; if (const auto art = notebook_art(); !art.token.empty()) out += "
" + picture(art, 3163.5, 1948.5, true) + "
"; - out += "
" + svg(stain ? "nb-lines" : "nb-lines-plain", 1406, 866, lines, 2800) + "
" + + out += "
" + svg((stain ? "nb-lines-" : "nb-lines-clean-") + sheet, 1406, 866, lines, 2800) + "
" + svg("nb-corner", 62, 62, "", 200) + "
"; diff --git a/src/modern/ui/settings_screens.inc b/src/modern/ui/settings_screens.inc index c7645e9..510fe4f 100644 --- a/src/modern/ui/settings_screens.inc +++ b/src/modern/ui/settings_screens.inc @@ -274,6 +274,9 @@ std::string App::render_settings() { settings_row("preference-motion", "Übergänge und Einblendungen", "Reduziert: Fenster, Karten und Tor-Einblendungen erscheinen ohne Bewegung.", settings_select("preference-motion", {{"full", "Voll"}, {"reduced", "Reduziert"}}, p.at("display").at("motion").get(), "global", "display", "motion")) + + settings_row("preference-paper", "Papier des Notizbuchs", "Linien, Kästchen oder ein leeres Blatt.", + settings_select("preference-paper", {{"ruled", "Liniert"}, {"squared", "Kariert"}, {"plain", "Blanko"}}, + p.at("display").at("paper").get(), "global", "display", "paper")) + (page && engine_mode_ ? "" : "
"); if (engine_mode_) { int width=0,height=0; SDL_GetWindowSize(video_.window,&width,&height); diff --git a/src/modern/ui/ui_preferences.cpp b/src/modern/ui/ui_preferences.cpp index b23d698..55aa73b 100644 --- a/src/modern/ui/ui_preferences.cpp +++ b/src/modern/ui/ui_preferences.cpp @@ -27,7 +27,8 @@ Json default_ui_preferences() { {"resolution", "1920x1080"}, {"scale", "auto"}, {"language", "de"}, - {"motion", "full"}}}, + {"motion", "full"}, + {"paper", "ruled"}}}, {"sound", {{"volume", 80}, {"effects", true}, {"style", "classic"}}}}; } bool valid_ui_preferences(const Json &v) { @@ -36,8 +37,9 @@ bool valid_ui_preferences(const Json &v) { !choice(v.at("theme"), {"midnight", "silver", "matchday"})) return false; const auto &d = v.at("display"), &s = v.at("sound"); - return keys(d, {"mode", "resolution", "scale", "language", "motion"}) && + return keys(d, {"mode", "resolution", "scale", "language", "motion", "paper"}) && choice(d.at("motion"), {"full", "reduced"}) && + choice(d.at("paper"), {"ruled", "squared", "plain"}) && keys(s, {"volume", "effects", "style"}) && choice(d.at("mode"), {"window", "fullscreen"}) && choice(d.at("resolution"), {"1280x720", "1600x900", "1920x1080", @@ -76,6 +78,11 @@ Json load_ui_preferences(const fs::path &path) { envelope["preferences"].contains("display") && envelope["preferences"]["display"].is_object() && !envelope["preferences"]["display"].contains("motion")) envelope["preferences"]["display"]["motion"] = "full"; + // and one written before the notebook's paper could be chosen keeps its ruled lines + if (envelope.is_object() && envelope.contains("preferences") && envelope["preferences"].is_object() && + envelope["preferences"].contains("display") && envelope["preferences"]["display"].is_object() && + !envelope["preferences"]["display"].contains("paper")) + envelope["preferences"]["display"]["paper"] = "ruled"; if (!keys(envelope, {"schema", "preferences"}) || envelope.at("schema") != "openbmh-ui-preferences@1" || !valid_ui_preferences(envelope.at("preferences")))