The notebook's paper can be chosen; a fellow manager lends on the page "Spieler"

The settings offer ruled, squared or plain paper for the notebook
(display.paper; a file written before keeps its ruled lines).

The page "Spieler" of the bank is the loan from another human manager of
the career, which the game has always had beside the bank's: the credit
read and the credit command name their lender instead of always the bank.
The loan on screen follows its page, since every accepted state brings the
bank's loan again.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-16 12:53:45 +01:00
1 parent 048ccbecaa
commit 28f86c169e
9 files changed
+103 -21

No files matched your search

+39 -8
View File
@@ -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<Rml::String>("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 "<div class=\"pg-panel pg-grow\"><div class=\"pg-empty\"><span>Der Bankkredit ist in diesem Kontext nicht verfügbar.</span></div></div>"; }
catch (const std::exception &) { return "<div class=\"pg-panel pg-grow\"><div class=\"pg-empty\"><span>" + std::string(fellow ? "Dieser Kredit ist in diesem Kontext nicht verfügbar." : "Der Bankkredit ist in diesem Kontext nicht verfügbar.") + "</span></div></div>"; }
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 += "<div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:4px;padding:12px 16px;") + "\">" + pg_kicker("Kredit");
out += "<div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:4px;padding:12px 16px;") + "\">" + 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<int64_t>();
@@ -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 += "</div><div class=\"bk-part\"><div class=\"pg-row\" style=\"justify-content:space-between;\"><span>Zurückgezahlt</span><strong>" + (total > 0 ? std::to_string(int(std::lround(done))) + " %" : std::string("kein Kredit")) +
"</strong></div>" + pg_bar(done, "sage") + "</div><span class=\"pg-sp\"></span><span class=\"pg-mut\" style=\"display:block;\">" +
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.") + "</span></div>";
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.") + "</span></div>";
out += "<div class=\"pg-row\" style=\"" + pg_css("gap:8px;") + "\">" + 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\"" : "")) + "</div>";
return out;