diff --git a/assets/modern/art/bank-hall.png b/assets/modern/art/bank-hall.png new file mode 100644 index 0000000..9a91abd Binary files /dev/null and b/assets/modern/art/bank-hall.png differ diff --git a/assets/modern/art/bank-home-0.png b/assets/modern/art/bank-home-0.png new file mode 100644 index 0000000..871da30 Binary files /dev/null and b/assets/modern/art/bank-home-0.png differ diff --git a/assets/modern/art/bank-home-1.png b/assets/modern/art/bank-home-1.png new file mode 100644 index 0000000..3e05a9c Binary files /dev/null and b/assets/modern/art/bank-home-1.png differ diff --git a/assets/modern/art/bank-home-2.png b/assets/modern/art/bank-home-2.png new file mode 100644 index 0000000..52426ac Binary files /dev/null and b/assets/modern/art/bank-home-2.png differ diff --git a/assets/modern/art/bank-home-3.png b/assets/modern/art/bank-home-3.png new file mode 100644 index 0000000..b71bdde Binary files /dev/null and b/assets/modern/art/bank-home-3.png differ diff --git a/assets/modern/art/bank-home-4.png b/assets/modern/art/bank-home-4.png new file mode 100644 index 0000000..44bb803 Binary files /dev/null and b/assets/modern/art/bank-home-4.png differ diff --git a/assets/modern/art/bank-home-5.png b/assets/modern/art/bank-home-5.png new file mode 100644 index 0000000..40be8a6 Binary files /dev/null and b/assets/modern/art/bank-home-5.png differ diff --git a/assets/modern/art/bank-home-6.png b/assets/modern/art/bank-home-6.png new file mode 100644 index 0000000..1d541ed Binary files /dev/null and b/assets/modern/art/bank-home-6.png differ diff --git a/assets/modern/art/bank-home-7.png b/assets/modern/art/bank-home-7.png new file mode 100644 index 0000000..aab45a2 Binary files /dev/null and b/assets/modern/art/bank-home-7.png differ diff --git a/assets/modern/art/bank-home-8.png b/assets/modern/art/bank-home-8.png new file mode 100644 index 0000000..fff6d1d Binary files /dev/null and b/assets/modern/art/bank-home-8.png differ diff --git a/assets/modern/art/bank-home-9.png b/assets/modern/art/bank-home-9.png new file mode 100644 index 0000000..fd5608e Binary files /dev/null and b/assets/modern/art/bank-home-9.png differ diff --git a/assets/modern/art/bank-players.png b/assets/modern/art/bank-players.png new file mode 100644 index 0000000..3465501 Binary files /dev/null and b/assets/modern/art/bank-players.png differ diff --git a/assets/modern/art/bank-properties.png b/assets/modern/art/bank-properties.png new file mode 100644 index 0000000..9e10b9e Binary files /dev/null and b/assets/modern/art/bank-properties.png differ diff --git a/assets/modern/art/bank-savings.png b/assets/modern/art/bank-savings.png new file mode 100644 index 0000000..558cbd9 Binary files /dev/null and b/assets/modern/art/bank-savings.png differ diff --git a/assets/modern/art/bank-stocks.png b/assets/modern/art/bank-stocks.png new file mode 100644 index 0000000..271f2f9 Binary files /dev/null and b/assets/modern/art/bank-stocks.png differ diff --git a/assets/modern/art/gui-assets.json b/assets/modern/art/gui-assets.json index b146c3a..03d5533 100644 --- a/assets/modern/art/gui-assets.json +++ b/assets/modern/art/gui-assets.json @@ -161,6 +161,156 @@ 1, 1 ] + }, + "bank.scene.savings": { + "file": "bank-savings.png", + "sha256": "2f0ac60e735d9299b2d2dd3c98bb4e90c66834f3af8968577feff3d03f8543d3", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.scene.properties": { + "file": "bank-properties.png", + "sha256": "7b9c6ae2526cf8631a8f71aac093b6147e478ffb0c21df67e05542681ab27eeb", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.scene.stocks": { + "file": "bank-stocks.png", + "sha256": "89eae73444c7c81d18b2158bdb5651ae379921c6569e7ddbbd6efa0a330cb0ad", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.scene.overview": { + "file": "bank-hall.png", + "sha256": "99588ae770f38b758064572c47242c590e97dda3a8f382fcabf081cf32a3a942", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.scene.players": { + "file": "bank-players.png", + "sha256": "64392b21bfac5a9ae51e08948be27115afba52588013b0d386e22c06afaa120b", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.0": { + "file": "bank-home-0.png", + "sha256": "eed1fdb1bdea7ff49712895524add29af8a9b1be598e65fdbd011cb836e1156f", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.1": { + "file": "bank-home-1.png", + "sha256": "5df522f41d497c36b029fb85a0358a4c45247a85e172055d8b53d9e2c8d211bd", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.2": { + "file": "bank-home-2.png", + "sha256": "79caab1c8c3635a157f2c016cdaea8ac1ee18b5db23e815ad16470320b3e2c39", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.3": { + "file": "bank-home-3.png", + "sha256": "cc1b12bce82818d22a3bf9572d79bf25041be861baadd54e8d1378015adba1f2", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.4": { + "file": "bank-home-4.png", + "sha256": "b4225c1617dc6c39d031b3c16995ca4513c7faba42e98fb18b5aeb66968c842d", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.5": { + "file": "bank-home-5.png", + "sha256": "cd51afe7175a4d04f5757a95166bd31e44cce1bd065a1bf2860f8881e2ac7aaf", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.6": { + "file": "bank-home-6.png", + "sha256": "631ac77939524e37fe27b4a79aca7d47eaa40e3885bb076b979f9ecf98c448ef", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.7": { + "file": "bank-home-7.png", + "sha256": "68668dbfac8e233a8825e013add3a63470509eddd8266fe15e82022c685c919b", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.8": { + "file": "bank-home-8.png", + "sha256": "63ca49dc34336951dd90c7a3b33482ca4b882a51512b245c72054c8a108b653a", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "bank.home.9": { + "file": "bank-home-9.png", + "sha256": "111afb4d8a30ac5115b0c6838b96fc47c80a9693d1da0c2135f8316efc13f3ba", + "crop": [ + 0, + 0, + 1, + 1 + ] } } } diff --git a/assets/modern/bank.rcss b/assets/modern/bank.rcss index 9ff412a..7c39885 100644 --- a/assets/modern/bank.rcss +++ b/assets/modern/bank.rcss @@ -1,227 +1,2 @@ /* SPDX-License-Identifier: GPL-3.0-only */ -.bank-page {position:absolute;left:0;right:0;top:0;bottom:0;color:var(--text);} -.bank-scene {position:absolute;left:0;top:60dp;width:2612dp;height:1470.016746dp;border:2dp var(--border);border-radius:20dp;overflow:hidden;} -.bank-hotspots {position:absolute;left:0;right:0;top:0;bottom:0;} -.bank-hotspot,.bank-hotspot:hover {position:absolute;padding:0;border:0dp;border-radius:10dp;background-color:transparent;decorator:none;} -.bank-hotspot:focus-visible {border:4dp var(--accent);} -#bank-interaction-hint {position:absolute;left:40dp;right:40dp;bottom:25dp;min-height:90dp;display:flex;align-items:center;justify-content:center;text-align:center;font-size:32dp;line-height:46.4dp;} -.bank-overlay {position:absolute;left:0;right:0;top:0;bottom:0;border:2dp var(--border);border-radius:20dp;background-color:#243441f7;color:var(--text);font-size:34dp;} -.bank-overlay>h2 {position:absolute;left:50dp;right:50dp;top:40dp;text-align:center;font-size:40dp;line-height:45dp;font-weight:normal;} -.bank-actions {position:absolute;left:50dp;right:50dp;bottom:35dp;height:84dp;display:flex;gap:30dp;} -.bank-actions .bank-control {flex:1;min-width:0;height:84dp;padding:12dp 24dp;font-size:32dp;border-radius:12dp;background-color:transparent;decorator:linear-gradient(180deg,#c1d1e31c,#869eb312);} -.savings-overlay {background-color:#1c2d3bba;} -.passbook {position:absolute;left:254dp;top:35dp;width:2100dp;height:1301.109375dp;color:#342c27;} -.passbook-left,.passbook-right {position:absolute;top:30dp;bottom:30dp;width:924dp;font-size:34dp;line-height:49.3dp;} -.passbook-left {left:63dp;} -.passbook-right {right:63dp;} -.passbook h2 {position:absolute;left:0;right:0;top:0;text-align:center;font-size:52dp;line-height:60dp;font-weight:normal;color:#8b3c32;} -.passbook h3 {position:absolute;left:0;right:0;top:90dp;font-size:46dp;line-height:54dp;font-weight:bold;text-transform:uppercase;color:#423628;} -.passbook-left p {position:absolute;left:0;right:0;} -.passbook-note-one {top:184dp;} -.passbook-note-two {top:273.296875dp;} -.passbook-note-three {top:411.890625dp;} -.passbook-right h2 {color:#5b4837;} -.passbook-right output {position:absolute;left:0;right:0;top:140dp;text-align:right;font-size:54dp;line-height:62dp;} -.property-row {position:absolute;left:50dp;right:50dp;height:650dp;display:flex;align-items:center;gap:50dp;} -.owned-property {top:115dp;} -.offered-property {top:765dp;} -.property-description {flex:1;min-width:0;font-size:34dp;line-height:47.6dp;} -.property-description h3 {font-size:34dp;font-weight:normal;line-height:44.2dp;margin:10dp 0 30dp;} -.property-description p {margin:20dp 0;} -.property-picture {width:1000dp;height:570dp;flex-shrink:0;padding:0;border:2dp var(--border);border-radius:16dp;background-color:#172431;overflow:hidden;display:flex;align-items:center;justify-content:center;} -.property-empty {display:block;width:100%;height:100%;background-color:#242323;} -.stock-table {position:absolute;left:50dp;top:115dp;width:1718dp;height:1320dp;font-size:32dp;} -.stock-row {display:flex;align-items:center;height:103.333333dp;} -.stock-row.stock-head {height:80dp;} -.stock-row>div {width:399.333333dp;flex-shrink:0;text-align:right;color:#d8c892;} -.stock-row>div:first-child {width:520dp;text-align:left;} -.stock-head>div {color:var(--text);} -.stock-name {font-size:32dp;padding:8dp 15dp;border:0dp;border-radius:8dp;background-color:transparent;color:var(--text);} -.stock-name[aria-pressed=true] {background-color:var(--selected);color:var(--accent);} -.stock-chart {position:absolute;left:1818dp;top:115dp;width:740dp;height:1320dp;background-color:#172938;border-radius:16dp;overflow:hidden;} -.credit-portrait {position:absolute;left:50dp;top:135dp;width:620dp;height:515dp;border-radius:16dp;overflow:hidden;} -.credit-facts {position:absolute;left:740dp;top:195dp;width:1818dp;height:395dp;font-size:34dp;line-height:39dp;} -.credit-fact {position:absolute;left:0;right:0;height:63dp;display:flex;justify-content:space-between;} -.credit-fact>span,.credit-fact>strong {display:block;width:891.5dp;font-weight:normal;} -.credit-fact>strong {text-align:right;white-space:nowrap;color:#b9d8e2;} -#bank-term {width:190dp;height:63dp;padding:12dp 30dp 12dp 12dp;text-align:left;border:2dp var(--border);border-radius:10dp;background-color:#263744;color:var(--text);font-size:30dp;} -.credit-schedule {position:absolute;left:50dp;right:50dp;top:686dp;height:642.78125dp;border:2dp var(--border);border-radius:18dp;background-color:#1a303fe6;} -.credit-schedule-caption {position:absolute;left:36dp;right:36dp;top:28dp;height:106.390625dp;} -.credit-schedule-caption h3 {font-size:32dp;line-height:41.59375dp;font-weight:normal;color:var(--text);} -.credit-schedule-amount {position:absolute;left:0;top:51.59375dp;font-size:42dp;line-height:54.796875dp;color:var(--accent);} -.credit-schedule-amount>span {padding:0 16dp;color:var(--muted);} -.credit-schedule-context {position:absolute;right:0;top:0;text-align:right;} -.credit-schedule-context>span {display:inline-block;padding:10dp 22dp;border:2dp var(--border);border-radius:12dp;background-color:var(--soft);font-size:28dp;line-height:36.4dp;} -.credit-schedule-context>p {margin-top:14dp;font-size:28dp;line-height:33.8dp;color:var(--muted);} -.credit-chart {position:absolute;left:36dp;top:152.390625dp;width:2432dp;height:420dp;} -.credit-schedule-note {position:absolute;left:36dp;right:36dp;top:580.390625dp;font-size:28dp;line-height:36.390625dp;color:var(--muted);} -.bank-note {font-size:28dp;line-height:42dp;color:var(--muted);} -.credit-note {position:absolute;left:50dp;right:50dp;top:1346.78125dp;line-height:39.1875dp;} -.bank-overview {position:absolute;left:110dp;right:110dp;top:175dp;font-size:40dp;line-height:45dp;} -.bank-overview-row {height:113dp;display:flex;justify-content:space-between;gap:45dp;} -.bank-overview-row>span,.bank-overview-row>strong {display:block;width:50%;font-weight:normal;} -.bank-overview-row>strong {text-align:right;color:#b9d8e2;} -.bank-overview-total {height:90dp;border-top:5dp var(--border);padding-top:40dp;} -.overview-note {position:absolute;left:50dp;right:50dp;bottom:50dp;} -body.silver .bank-overlay {background-color:#f7f3e9fc;color:#233443;} -body.silver .savings-overlay {background-color:#fcf9f190;} -body.silver .property-picture {background-color:#fcf9f190;} -body.silver .stock-chart {background-color:#fcf9f190;} -body.silver .stock-row>div {color:#805b18;} -body.silver .stock-head>div,body.silver .stock-name {color:#233443;} -body.silver .credit-fact>strong,body.silver .bank-overview-row>strong {color:#233443;} -body.silver #bank-term {background-color:#ffffffad;color:#233443;} -body.silver .credit-schedule {background-color:#fcf9f190;} -body.silver .bank-actions .bank-control {decorator:linear-gradient(180deg,#ffffffd8,#e9e1cf99);} -body.matchday .bank-overlay {background-color:#2c2c32fc;color:#efeded;} -body.matchday .savings-overlay {background-color:#1d1e2466;} -body.matchday .property-picture,body.matchday .stock-chart {background-color:#1d1e2466;} -body.matchday .stock-row>div {color:#e1c68b;} -body.matchday .stock-head>div,body.matchday .stock-name {color:#efeded;} -body.matchday .credit-fact>strong,body.matchday .bank-overview-row>strong {color:#efeded;} -body.matchday #bank-term {background-color:#191a208a;color:#efeded;} -body.matchday .credit-schedule {background-color:#1d1e2466;} -body.matchday .bank-actions .bank-control {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);} -/* each service of the hall carries its name on a paper tag */ -.bank-hotspot {display:flex;align-items:flex-end;justify-content:center;} -.bank-tag {display:block;flex-shrink:0;margin-bottom:10dp;padding:6dp 22dp;border:2dp #7b725f88;border-radius:6dp;background-color:#fbfaf6f0;color:#233443;font-family:Display;font-size:34dp;line-height:44dp;white-space:nowrap;} -.bank-hotspot:hover .bank-tag {background-color:#ffffff;border-color:#25617a;} - -/* --- The bank's services: sheets of the house with a head, tabs, figures and charts. --- */ -body {--bank-gold:#d9bd7c;--bank-panel:#ffffff0a;} -body.silver {--bank-gold:#9a7a3a;--bank-panel:#ffffff8c;} -.bank-overlay,body.silver .bank-overlay,body.matchday .bank-overlay {border:2dp var(--paper-edge);border-radius:10dp;background-color:transparent;decorator:linear-gradient(175deg,var(--paper-top),var(--paper-bottom));color:var(--text);} -.bank-head {position:absolute;left:0;right:0;top:0;height:150dp;display:flex;align-items:center;padding:0 60dp;border-bottom:4dp var(--bank-gold);} -.bank-brand {display:flex;flex-direction:column;flex-shrink:0;} -.bank-brand strong {display:block;font-family:Display;font-size:30dp;line-height:38dp;font-weight:normal;letter-spacing:3dp;color:var(--bank-gold);} -.bank-brand span {display:block;font-family:Display;font-size:60dp;line-height:68dp;} -.bank-tabs {display:flex;gap:14dp;margin-left:auto;} -.bank-tabs .bank-tab {height:72dp;padding:0 34dp;border:2dp var(--rule);border-radius:36dp;background-color:transparent;decorator:none;font-size:32dp;color:var(--text);} -.bank-tabs .bank-tab:hover {background-color:var(--hover);} -.bank-tabs .bank-tab.selected {border-color:var(--bank-gold);background-color:var(--bank-gold);color:#1d232a;} -.bank-insight {border:2dp var(--rule);border-radius:8dp;padding:16dp 30dp;background-color:var(--bank-panel);} -.bank-insight h4 {display:block;margin:0 0 6dp 0;font-family:Display;font-size:34dp;line-height:44dp;font-weight:bold;color:var(--bank-gold);} -.bank-insight p {margin:0;font-size:32dp;line-height:46dp;} -.bank-part-track {height:14dp;border-radius:7dp;background-color:var(--rule);overflow:hidden;} -.bank-part-track>div {height:14dp;border-radius:7dp;background-color:var(--bank-gold);} -/* overview */ -.bank-ring {position:absolute;left:90dp;top:230dp;width:860dp;height:860dp;} -.bank-ring-centre {position:absolute;left:0;top:330dp;width:860dp;text-align:center;} -.bank-ring-centre span {display:block;font-size:34dp;line-height:44dp;color:var(--muted);} -.bank-ring-centre strong {display:block;font-family:Display;font-size:58dp;line-height:76dp;font-weight:bold;} -.bank-parts {position:absolute;left:1080dp;right:60dp;top:240dp;} -.bank-part {height:150dp;} -.bank-part.plain {height:92dp;border-top:2dp var(--rule);padding-top:22dp;} -.bank-part-line {display:flex;align-items:center;height:76dp;font-size:40dp;} -.bank-part-line span,.bank-part-line strong {display:block;flex-shrink:0;} -.bank-part-line .chip {width:30dp;height:30dp;border-radius:15dp;margin-right:24dp;} -.bank-part-line .chip.none {background-color:transparent;} -.bank-part-line .label {flex:1;} -.bank-part-line strong {font-family:Display;font-size:48dp;font-weight:bold;text-align:right;} -.bank-part-line .share {width:220dp;text-align:right;font-size:34dp;color:var(--muted);} -.overview-insight {position:absolute;left:90dp;right:60dp;top:1180dp;} -.overview-note {bottom:40dp;} -/* stocks */ -.stock-table {left:60dp;top:190dp;width:1500dp;height:1340dp;font-size:32dp;} -.stock-row {height:98dp;border-bottom:2dp var(--rule);} -.stock-row.stock-head {height:70dp;color:var(--muted);} -.stock-row.chosen {background-color:var(--selected);} -.stock-row>div,body.silver .stock-row>div,body.matchday .stock-row>div {width:250dp;color:var(--text);} -.stock-row>div:first-child {width:460dp;} -.stock-row>div:nth-child(2) {width:290dp;display:flex;justify-content:flex-end;} -.stock-name[aria-pressed=true] {background-color:transparent;color:var(--text);font-weight:bold;} -.stock-move {display:inline-block;font-size:30dp;} -.stock-move.up {color:var(--win);} -.stock-move.down {color:var(--loss);} -.stock-move.flat {color:var(--muted);} -.stock-detail {position:absolute;left:1620dp;right:60dp;top:190dp;height:1340dp;} -.stock-detail h3 {display:block;margin:0;font-family:Display;font-size:54dp;line-height:64dp;font-weight:bold;} -.stock-quote {display:flex;align-items:baseline;gap:26dp;height:96dp;} -.stock-quote strong {display:block;font-family:Display;font-size:84dp;line-height:96dp;font-weight:bold;} -.stock-quote .stock-move {font-size:38dp;} -.stock-chart,body.silver .stock-chart,body.matchday .stock-chart {position:relative;left:0;top:0;width:920dp;height:500dp;margin-top:10dp;border:2dp var(--rule);border-radius:8dp;background-color:var(--bank-panel);} -.stock-legend {display:flex;align-items:center;height:56dp;margin:0;font-size:26dp;color:var(--muted);} -.stock-legend .key {display:block;width:36dp;height:8dp;border-radius:4dp;margin:0 12dp 0 26dp;} -.stock-legend .key.course {margin-left:0;background-color:#9ac7d8;} -body.silver .stock-legend .key.course {background-color:#25617a;} -.stock-legend .key.average {background-color:var(--bank-gold);} -.stock-legend .key.high {width:16dp;height:16dp;border-radius:8dp;background-color:var(--win);} -.stock-legend .key.low {width:16dp;height:16dp;border-radius:8dp;background-color:var(--loss);} -.stock-tiles {display:flex;flex-wrap:wrap;gap:14dp;width:932dp;} -.stock-tile {width:296dp;height:128dp;border:2dp var(--rule);border-radius:8dp;display:flex;flex-direction:column;align-items:center;justify-content:center;background-color:var(--bank-panel);} -.stock-tile strong {display:block;font-family:Display;font-size:42dp;line-height:52dp;font-weight:bold;white-space:nowrap;} -.stock-tile span {display:block;font-size:26dp;line-height:34dp;color:var(--muted);} -.stock-tile.up strong {color:var(--win);} -.stock-tile.down strong {color:var(--loss);} -.stock-detail .bank-insight {margin-top:20dp;} -.stock-detail .bank-insight p {font-size:30dp;line-height:42dp;} -/* properties */ -.property-card {position:absolute;top:200dp;width:1216dp;height:1330dp;border:2dp var(--rule);border-radius:10dp;background-color:var(--bank-panel);padding:28dp 32dp;} -.property-card.owned-property {left:60dp;} -.property-card.offered-property {left:1336dp;} -.property-card h3 {display:block;margin:0 0 18dp 0;font-size:30dp;line-height:40dp;font-weight:normal;letter-spacing:2dp;color:var(--bank-gold);} -.property-card h4 {display:block;margin:26dp 0 10dp 0;font-family:Display;font-size:54dp;line-height:66dp;font-weight:bold;} -.property-card .property-picture {width:1150dp;height:654dp;border:2dp var(--paper-edge);border-radius:8dp;} -.property-empty,body.silver .property-empty {display:flex;align-items:center;justify-content:center;width:100%;height:100%;background-color:var(--rule);} -.property-empty span {display:block;font-size:34dp;color:var(--muted);} -.bank-fact {display:flex;align-items:center;justify-content:space-between;height:70dp;border-bottom:2dp var(--rule);font-size:34dp;} -.bank-fact span,.bank-fact strong {display:block;} -.bank-fact strong {font-family:Display;font-size:40dp;font-weight:bold;} -.property-hint {margin:22dp 0 0 0;font-size:28dp;color:var(--muted);} -/* savings: the passbook lies on the sheet */ -.savings-overlay,body.silver .savings-overlay,body.matchday .savings-overlay {background-color:transparent;} -.passbook {left:256dp;top:210dp;border-radius:44dp;overflow:hidden;} -.passbook-cash {position:absolute;left:0;right:0;top:240dp;text-align:right;font-size:34dp;color:#5b4837;} -/* credit */ -.credit-portrait {left:60dp;top:200dp;border:2dp var(--paper-edge);border-radius:8dp;} -.credit-facts.engine-credit {left:750dp;right:60dp;top:196dp;width:auto;height:520dp;} -.engine-credit .credit-fact {height:62dp;border-bottom:2dp var(--rule);align-items:center;font-size:32dp;} -.engine-credit .credit-fact>span {width:auto;} -.engine-credit .credit-fact>strong,body.silver .engine-credit .credit-fact>strong {width:auto;font-family:Display;font-size:36dp;font-weight:bold;color:var(--text);} -.engine-credit .credit-fact .bank-control {width:620dp;height:52dp;font-size:32dp;border:2dp var(--bank-gold);border-radius:8dp;} -.credit-schedule,body.silver .credit-schedule,body.matchday .credit-schedule {left:60dp;right:60dp;top:770dp;border:2dp var(--rule);border-radius:10dp;background-color:var(--bank-panel);} -.credit-schedule.engine-credit {height:620dp;} -.credit-schedule-caption h3 {font-family:Display;font-size:40dp;font-weight:bold;} -.credit-tiles {position:absolute;left:36dp;right:36dp;top:110dp;width:auto;} -.credit-tiles .stock-tile {width:780dp;height:170dp;} -.credit-tiles .stock-tile strong {font-size:54dp;line-height:66dp;} -.credit-progress {position:absolute;left:36dp;right:36dp;top:330dp;} -.credit-progress-label {display:flex;justify-content:space-between;height:60dp;font-size:32dp;} -.credit-progress-label span,.credit-progress-label strong {display:block;} -.credit-schedule.engine-credit .credit-schedule-note {top:auto;bottom:28dp;} -.bank-actions {left:60dp;right:60dp;} - -/* second pass */ -.stock-row {height:104dp;} -.stock-row>div,body.silver .stock-row>div,body.matchday .stock-row>div {flex:1;width:auto;} -.stock-row>div:first-child {flex:none;width:430dp;} -.stock-row>div:nth-child(2) {flex:none;width:300dp;} -.stock-row>div:last-child {padding-right:24dp;} -.stock-name,.stock-name.control-button {justify-content:flex-start;text-align:left;} -.stock-chart,body.silver .stock-chart,body.matchday .stock-chart {height:500dp;} -.stock-legend span {display:block;flex-shrink:0;} -.stock-tile {height:138dp;} -.bank-market {position:absolute;left:90dp;right:60dp;top:1370dp;height:400dp;} -.bank-market h4 {display:block;margin:0 0 8dp 0;font-family:Display;font-size:34dp;line-height:44dp;font-weight:bold;color:var(--bank-gold);} -.bank-market-bars {display:flex;height:340dp;} -.bank-market-column {flex:1;min-width:0;display:flex;flex-direction:column;align-items:center;} -.bank-market-column .rise {height:150dp;display:flex;flex-direction:column;align-items:center;justify-content:flex-end;border-bottom:2dp var(--rule);width:100%;} -.bank-market-column .fall {height:150dp;display:flex;flex-direction:column;align-items:center;justify-content:flex-start;width:100%;} -.bank-market-column .bar {width:64dp;border-radius:4dp;} -.bank-market-column .bar.up {background-color:var(--win);} -.bank-market-column .bar.down {background-color:var(--loss);} -.bank-market-column span {display:block;font-size:24dp;line-height:30dp;color:var(--muted);} -.bank-market-column strong {display:block;font-size:26dp;line-height:36dp;font-weight:normal;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:100%;} -.property-prices {margin-top:22dp;} -.property-prices h5 {display:block;margin:0 0 8dp 0;font-size:28dp;line-height:38dp;font-weight:normal;letter-spacing:2dp;color:var(--bank-gold);} -.property-price {display:flex;align-items:center;height:44dp;font-size:28dp;} -.property-price span {display:block;flex-shrink:0;} -.property-price .name {width:340dp;} -.property-price .bank-part-track {flex:1;} -.property-price .sum {width:300dp;text-align:right;} -.property-price.chosen .name,.property-price.chosen .sum {font-weight:bold;} -.property-price.chosen .bank-part-track>div {background-color:#25617a;} -.bank-market-column strong {width:100%;text-align:center;flex-shrink:0;height:36dp;} -.credit-schedule.engine-credit {height:780dp;} -.credit-schedule.engine-credit .credit-tiles .stock-tile {height:210dp;} -.credit-schedule.engine-credit .credit-progress {top:390dp;} +/* The bank is five pages of the notebook now: its styles are the bk-* rules in pages.rcss. */ diff --git a/assets/modern/pages.rcss b/assets/modern/pages.rcss index 1625959..abd0f45 100644 --- a/assets/modern/pages.rcss +++ b/assets/modern/pages.rcss @@ -773,3 +773,66 @@ body.midnight .cp-map-name,body.matchday .cp-map-name {color:#f0ece2;font-effect .ad-strip-item strong {display:block;font-family:Display;font-weight:normal;font-size:40dp;white-space:nowrap;} .ad-board-no {font-size:21dp;} .ad-board-face strong {font-size:28dp;line-height:34dp;} + +/* --- bank: five pages. A picture with a line of writing opens each of them --- */ +.bk-banner {position:relative;display:block;flex:none;overflow:hidden;border:2dp var(--p-div);border-radius:45dp;} +.bk-banner-art {position:absolute;left:0;top:0;display:block;} +.bk-banner-over {position:absolute;left:0;bottom:0;display:block;width:100%;padding:18dp 36dp 20dp;background-color:#201e1dd1;} +.bk-banner-over strong {display:block;font-family:Display;font-weight:normal;font-size:56dp;line-height:64dp;white-space:nowrap;color:#f9f4ed;} +.bk-banner-d {display:block;font-size:27dp;line-height:34dp;white-space:nowrap;color:#e6dccb;} +.bk-reading {display:block;font-size:28dp;line-height:38dp;} +.bk-ring {display:block;flex:none;width:400dp;height:400dp;} +.bk-part {display:block;margin-bottom:9dp;font-size:29dp;line-height:42dp;} +.bk-part span {display:block;white-space:nowrap;} +.bk-part strong {display:block;font-weight:bold;white-space:nowrap;} +.bk-part .pg-bar {display:block;flex:none;height:14dp;margin-top:2dp;} +.bk-part .pg-bar div {height:14dp;} +.bk-chip {display:block;flex:none;width:22dp;height:22dp;border-radius:11dp;} +.bk-share {flex:none;width:118dp;text-align:right;} +.bk-credit-line {align-items:center;min-height:62dp;border-bottom:2dp var(--p-row);} +.pg-root .pg-btn.bk-edit {height:52dp;padding:0 27dp;border-color:var(--p-a5);background-color:var(--p-a1);font-family:Modern;font-size:29dp;font-weight:bold;color:var(--p-a9);} +.pg-root .pg-btn.bk-wide {width:100%;height:76dp;} +.pg-root .bk-select {width:400dp;height:60dp;padding:0 27dp;border:2dp var(--p-div);border-radius:30dp;background-color:var(--p-bg);font-family:Modern;font-size:29dp;color:var(--p-text);} +.bk-tiles {display:flex;flex-wrap:wrap;gap:11dp;} +.bk-tile {display:block;flex:none;width:352dp;padding:11dp 22dp;border:2dp var(--p-div);border-radius:27dp;background-color:var(--p-bg);} +.bk-tile strong {display:block;font-family:Display;font-weight:normal;font-size:38dp;line-height:46dp;white-space:nowrap;} +.bk-tile span {display:block;font-size:24dp;line-height:30dp;color:var(--p-n7);} +.bk-chart {display:block;flex:none;overflow:hidden;} +/* the passbook: a ruled page in the manager's hand */ +.bk-passbook {position:relative;display:block;flex:none;padding:45dp 54dp 40dp;border:2dp #cdbf96;border-radius:18dp;background-color:#fbf6e3;color:#3a332b;} +.bk-passbook-head {display:block;margin-bottom:22dp;padding-bottom:14dp;border-bottom:4dp #56633f;font-family:Display;font-size:40dp;line-height:50dp;color:#3d472b;} +.bk-passbook-line {display:flex;align-items:flex-end;justify-content:space-between;height:92dp;border-bottom:2dp #9fb7c4;font-size:30dp;} +.bk-passbook-line span {display:block;padding-bottom:9dp;color:#645c50;} +.bk-passbook-line strong {display:block;font-family:Pencil;font-weight:bold;font-size:58dp;line-height:70dp;white-space:nowrap;color:#23415c;} +.bk-passbook-note {display:block;margin-top:27dp;font-family:Pencil;font-size:42dp;line-height:52dp;color:#8c491a;transform:rotate(-1deg);} +/* the board of the estate agent */ +.bk-board {display:flex;flex:none;flex-wrap:wrap;gap:22dp 24dp;padding:36dp 30dp 22dp;border:5dp #8a6a44;border-radius:27dp;background-color:#cfa877;} +.bk-home,.bk-home:hover,.bk-home:focus,.bk-home:disabled {position:relative;display:block;flex:none;width:524dp;height:508dp;padding:16dp 16dp 0;margin:0;border:2dp #d9cfbb;border-radius:9dp;background-color:#fffdf8;decorator:none;text-align:left;opacity:1;transform:rotate(-0.5deg);} +.bk-home.odd,.bk-home.odd:hover,.bk-home.odd:disabled {transform:rotate(0.6deg);} +.bk-home:hover {border-color:#c8733c;} +.bk-home.sel,.bk-home.sel:hover {border:5dp #c8733c;padding:13dp 13dp 0;} +.bk-pin {position:absolute;left:50%;top:-18dp;display:block;width:32dp;height:32dp;margin-left:-16dp;border:3dp #6b2318;border-radius:16dp;background-color:#c8452f;} +.bk-home-art {position:relative;display:block;width:492dp;height:382dp;overflow:hidden;border-radius:5dp;} +.bk-home strong {display:block;margin-top:9dp;font-family:Display;font-weight:normal;font-size:34dp;line-height:42dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#2e2b25;} +.bk-home-price {display:block;font-family:Modern;font-size:27dp;line-height:34dp;white-space:nowrap;color:#645c50;} +.bk-home:disabled .bk-home-art,.bk-home[disabled] .bk-home-art {opacity:.7;} +.bk-home:disabled .bk-home-price,.bk-home[disabled] .bk-home-price {color:#8c491a;} +.bk-home[disabled],.bk-home[disabled]:hover {border-color:#d9cfbb;background-color:#f3e6cf;} +.bk-stamp {position:absolute;left:66dp;top:128dp;display:block;width:360dp;padding:9dp 0;border:7dp #a8452f;border-radius:14dp;background-color:#fff8edd9;text-align:center;transform:rotate(-11deg);} +.bk-stamp span {display:block;font-family:Display;font-size:44dp;line-height:52dp;letter-spacing:4dp;color:#a8452f;} +.bk-stamp small {display:block;font-family:Modern;font-size:24dp;line-height:30dp;font-weight:bold;letter-spacing:2dp;color:#a8452f;} +/* the list of the stocks */ +.bk-row,.bk-row:hover,.bk-row:focus {display:flex;flex:none;align-items:center;gap:18dp;width:100%;height:92dp;padding:0 14dp;margin:0;border:0dp;border-top:2dp var(--p-row);border-radius:0dp;background-color:transparent;decorator:none;font-family:Modern;font-size:30dp;color:var(--p-text);text-align:left;} +.bk-row:hover {background-color:var(--p-n2);} +.bk-row.sel,.bk-row.sel:hover {background-color:var(--p-a1);} +.bk-row.head {height:62dp;border-top-width:0dp;font-size:23dp;font-weight:bold;letter-spacing:1dp;color:var(--p-n7);} +.bk-row span {display:block;white-space:nowrap;} +.bk-name {flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;font-weight:bold;} +.bk-row.head .bk-name {font-weight:bold;} +.bk-spark {flex:none;width:216dp;} +.bk-num {flex:none;width:170dp;text-align:right;} +.bk-num.wide {width:230dp;} +.bk-move {display:block;font-weight:bold;white-space:nowrap;} +.bk-move.up {color:var(--p-s8);} +.bk-move.down {color:var(--p-a8);} +.bk-move.flat {color:var(--p-n7);font-weight:normal;} diff --git a/src/modern/ui/bank_controls.inc b/src/modern/ui/bank_controls.inc index f5e3b9e..adcbcc8 100644 --- a/src/modern/ui/bank_controls.inc +++ b/src/modern/ui/bank_controls.inc @@ -1,14 +1,20 @@ // SPDX-License-Identifier: GPL-3.0-only +// The page of the bank a marker of the notebook stands for; "" for any other route. +std::string App::bank_view_of(const std::string &route) { + return route == "bank" ? "credit" : route == "properties" || route == "stocks" || route == "savings" || route == "players" ? route : std::string(); +} bool App::bank_action(const std::string &action, Rml::Element *target) { if (menu_ != "bank" || (!source_ && !engine_mode_) || !world_) return false; - if (action == "close") { - if (bank_view_ == "entrance") return false; - bank_view_ = "entrance"; - bank_hint_.clear(); - focus_after_render_ = "window-close"; + if (action == "bank-property" && target) { + // a house on the board is chosen: it is the one bought and sold + const auto index = target->GetAttribute("data-id", -1); + if (bank_view_ != "properties" || index < 0 || index > 5) return true; + bank_property_ = bank_owned_ = index; + focus_after_render_ = "bank-property-" + std::to_string(index); refresh(); return true; } + if (action == "bank-soon") return true; if (action == "bank-view" && target) { const auto view = target->GetAttribute("data-view", ""); if (view != "properties" && view != "stocks" && view != "overview" && view != "savings" && view != "credit") return true; @@ -101,29 +107,7 @@ bool App::bank_event(Rml::Event &event) { auto *target = event.GetTargetElement(); const bool keyboard = type == "keydown"; const auto key = keyboard ? Rml::Input::KeyIdentifier(event.GetParameter("key_identifier", 0)) : Rml::Input::KI_UNKNOWN; - if (bank_view_ != "entrance" && ((keyboard && key == Rml::Input::KI_ESCAPE) || - (type == "mouseup" && event.GetParameter("button", 0) == 1))) { - if (keyboard) - if (auto *select = dynamic_cast(element("bank-term")); - select && select->IsSelectBoxVisible()) { - select->CancelSelectBox(); - select->Focus(true); - dirty_ = true; - event.StopImmediatePropagation(); - return true; - } - bank_action("close", nullptr); - event.StopImmediatePropagation(); - return true; - } - if (type == "contextmenu" && bank_view_ != "entrance") { event.StopImmediatePropagation(); return true; } - if (type == "click" && bank_view_ != "entrance") - for (auto *node = target; node && node != doc_; node = node->GetParentNode()) - if (node->GetAttribute("data-action", "") == "close") { - bank_action("close", node); - event.StopImmediatePropagation(); - return true; - } + (void)key; if (!engine_mode_ && type == "change" && target->GetId() == "bank-term") { auto *select = dynamic_cast(target); if (!select || bank_view_ != "credit" || snap().state.at("debt") != 0) return true; @@ -141,24 +125,5 @@ bool App::bank_event(Rml::Event &event) { event.StopImmediatePropagation(); return true; } - if (bank_view_ == "entrance" && (type == "mousemove" || type == "focus")) { - const auto hint = [&](Rml::Element *from) { - for (auto *node = from; node && node != doc_; node = node->GetParentNode()) - if (node->HasAttribute("data-bank-hint")) return node->GetAttribute("data-bank-hint", ""); - return Rml::String(); - }; - auto text = hint(target); - // RmlUI dispatches focus to the whole new ancestor chain before updating - // Context's focus pointer. Ancestor notifications must not erase a hint - // just supplied by the actual hotspot. The close button resets it. - if (type == "focus" && text.empty() && target->GetId() != "window-close") return false; - if (type == "mousemove" && text.empty()) text = hint(context_->GetFocusElement()); - if (bank_hint_ != text) { - bank_hint_ = text; - if (auto *label = element("bank-interaction-hint")) - label->SetInnerRML("" + esc(text.empty() ? "Ein Element in der Bankhalle auswählen." : text) + ""); - dirty_ = true; - } - } return false; } diff --git a/src/modern/ui/bank_screens.inc b/src/modern/ui/bank_screens.inc index 7322309..03580c3 100644 --- a/src/modern/ui/bank_screens.inc +++ b/src/modern/ui/bank_screens.inc @@ -1,4 +1,16 @@ // SPDX-License-Identifier: GPL-3.0-only +// Who plays this career as a human: the page "Spieler" exists only where there is more than one. +Json App::bank_players() const { + try { + if (engine_mode_) return engine_manager_value_.is_object() && engine_manager_value_.contains("people") ? engine_career_context().at("active_managers") : Json::array(); + if (source_ && world_) return demo_career_context(snap().state, *snap().world).at("active_managers"); + } catch (const std::exception &) { + } + return Json::array(); +} +// Finanzen > Bank, Immobilien, Aktien, Sparbuch, Spieler: five pages of one menu. `bank_view_` +// says which: "credit" (the bank with what the club owns and its loan), "properties", "stocks", +// "savings" or "players". std::string App::render_bank() { const auto projected = engine_mode_ ? engine_bank_projection(engine_data_) : Json(); const auto snapshot = engine_mode_ ? Snapshot{0, world_, projected.at("state")} : snap(); @@ -7,59 +19,18 @@ std::string App::render_bank() { const auto bank_money = [&](int64_t value) { return engine_mode_ ? money(value, {{"code", "EUR"}, {"minor_units", 2}}) : cash(value); }; const int property_count = int(assets.at("properties").size()), stock_count = int(assets.at("stocks").size()); if (!summary.value("ok", false)) return {}; + if (bank_view_ != "properties" && bank_view_ != "stocks" && bank_view_ != "savings" && bank_view_ != "players") bank_view_ = "credit"; + if (bank_view_ == "players" && bank_players().size() < 2) bank_view_ = "credit"; const auto &finance = snapshot.state.at("finance"); bank_property_ = std::clamp(bank_property_, 0, property_count - 1); bank_stock_ = std::clamp(bank_stock_, 0, stock_count - 1); - bank_owned_ = std::clamp(bank_owned_, 0, property_count - 1); - if (finance.at("properties")[size_t(bank_owned_)] == 0) - for (int i = 0; i < property_count; ++i) - if (finance.at("properties")[size_t(i)] != 0) { bank_owned_ = i; break; } - const auto actions = [&](const char *left, const char *lk, const char *right, const char *rk) { - return ""; + bank_owned_ = bank_property_; // the board has one chosen property: it is bought and sold + const auto calc = [&](const char *label, const char *kind, const std::string &css, bool on = true) { + return pg_button("bank-calc", label, css, "id=\"bank-" + std::string(kind) + "\" data-kind=\"" + kind + "\"" + (on ? "" : " disabled=\"disabled\"")); + }; + const auto kv = [](const std::string &key, const std::string &value, const std::string &css = std::string()) { + return "
" + key + "" + value + "
"; }; - // A data set may carry the newer hall picture or only the first one; each has its own - // places for the five services. - const bool newer_hall = !renderer_.image("art.bank-hall-v2.png", false, 3000).token.empty(); - std::string out = "
" + - img(newer_hall ? "art.bank-hall-v2.png" : "art.bank-hall-v1.png", 2608, 1466.016746, false, false, 3000); - if (bank_view_ == "entrance") { - struct Service { const char *id, *label, *hint; double x, y, w, h; }; - const std::array services = newer_hall ? std::array{{ - {"properties", "Immobilien", "Immobilien – Gebäude ansehen, kaufen oder verkaufen.", 14, 23, 23, 43}, - {"stocks", "Aktien", "Aktien – Kurse und Bestände ansehen, Aktien kaufen oder verkaufen.", 49, 4, 45, 26}, - {"overview", "Finanzübersicht", "Finanzübersicht – Konto, Sparbuch, Immobilien, Aktien und Kredit im Überblick.", 44, 48, 14, 17}, - {"savings", "Sparbuch", "Sparbuch – Guthaben ansehen, Geld einzahlen oder abheben.", 78, 55, 12, 11}, - {"credit", "Kredit", "Kredit – Laufzeit wählen, einen Kredit aufnehmen oder tilgen.", 81, 32, 15, 22}}} - : std::array{{ - {"properties", "Immobilien", "Immobilien – Gebäude ansehen, kaufen oder verkaufen.", .5, 18.5, 17.5, 43.5}, - {"stocks", "Aktien", "Aktien – Kurse und Bestände ansehen, Aktien kaufen oder verkaufen.", 30, 30, 13.5, 19.5}, - {"overview", "Finanzübersicht", "Finanzübersicht – Konto, Sparbuch, Immobilien, Aktien und Kredit im Überblick.", 30.5, 49.5, 13, 14.5}, - {"savings", "Sparbuch", "Sparbuch – Guthaben ansehen, Geld einzahlen oder abheben.", 85, 60, 6.5, 7.5}, - {"credit", "Kredit", "Kredit – Laufzeit wählen, einen Kredit aufnehmen oder tilgen.", 85.3, 31.5, 13.7, 27.5}}}; - out += "
"; - for (const auto &s : services) - out += btn("bank-view", std::string("") + s.label + "", "bank-hotspot", "id=\"bank-view-" + std::string(s.id) + - "\" data-view=\"" + s.id + "\" data-bank-hint=\"" + esc(s.hint) + "\" aria-label=\"" + s.label + - "\" style=\"left:" + scalar(s.x) + "%;top:" + scalar(s.y) + "%;width:" + scalar(s.w) + "%;height:" + scalar(s.h) + "%;\""); - out += "
"; - } - out += "
"; - if (bank_view_ == "entrance") - return out + "

" + - esc(bank_hint_.empty() ? "Ein Element in der Bankhalle auswählen." : bank_hint_) + "

"; - // Every service of the bank shares one head: the house's name, the service, and tabs that - // lead to the other services without a walk back through the hall. - const std::array, 5> bank_tabs{{{"overview", "Übersicht"}, {"stocks", "Aktien"}, {"properties", "Immobilien"}, {"savings", "Sparbuch"}, {"credit", "Kredit"}}}; - std::string service; - for (const auto &[id, label] : bank_tabs) if (bank_view_ == id) service = label; - out += "
Waldpark Bank" + - service + "
"; const auto one = [](double value) { std::ostringstream text; text << std::fixed << std::setprecision(1) << value; @@ -72,9 +43,9 @@ std::string App::render_bank() { in_property = summary.at("properties").get(), in_stock = summary.at("stocks").get(); const int64_t wealth = std::max(0, in_cash) + in_deposit + in_property + in_stock; const auto share = [&](int64_t part) { return wealth > 0 ? one(std::max(0, part) * 100.0 / wealth) + " %" : std::string("—"); }; - const std::string ink = theme_ == "silver" ? "#233443" : "#e8eef2", faint = theme_ == "silver" ? "#4a433430" : "#dfeaf530", - up = theme_ == "silver" ? "#3f7d63" : "#8fd3ad", down = theme_ == "silver" ? "#a23f45" : "#f0a6a7", - gold = theme_ == "silver" ? "#9a7a3a" : "#d9bd7c", line = theme_ == "silver" ? "#25617a" : "#9ac7d8"; + const bool light = theme_ == "silver"; + const std::string ink = light ? "#2e2b25" : "#f0ece2", faint = light ? "#3a332b24" : "#f0ece224", up = light ? "#56633f" : "#a3ba7c", down = light ? "#a8452f" : "#f0a08a", + gold = "#d08a1e", line = light ? "#8c491a" : "#e0a25f"; // an engine name arrives in capitals const auto calm_name = [](std::string name) { bool first = true; @@ -104,54 +75,65 @@ std::string App::render_bank() { } return history; }; + // a picture with a line of writing on its lower edge: every page of the bank begins with one + const auto banner = [&](const std::string &art, double w, double h, const std::string &kicker, const std::string &value, const std::string &detail) { + return "
" + img(art, w * 2.25, h * 2.25, false, true, 1800) + "
" + esc(pg_upper(kicker)) + + "" + esc(value) + "" + (detail.empty() ? std::string() : "" + esc(detail) + "") + "
"; + }; + std::string out = "
"; + if (bank_view_ == "savings") { - out += "
" + img("art.bank-passbook-v1.png", 2100, 1293.109375, false, false, 2400) + - "

Waldpark Bank

Sparbuch

Bitte beachten Sie:

" - "

" + std::string(engine_mode_ ? "Einzahlungen und Abhebungen werden nach Bestätigung im Spielstand verbucht." : "Einzahlungen und Abhebungen werden hier als fiktive Vorschau verbucht.") + "

" - "

" + (engine_mode_ ? "Anteil am Vermögen: " + share(in_deposit) : std::string("2,5 % Beispielzins")) + "

Guthaben

" + - esc(bank_money(snapshot.state.at("deposit").get())) + "

Auf dem Konto: " + esc(bank_money(in_cash)) + "

" + actions("Einzahlen", "deposit", "Abheben", "withdraw"); + page_title_ = "Sparbuch"; + page_hint_ = "Waldpark Bank"; + const auto deposit = snapshot.state.at("deposit").get(); + out += "
" + banner("bank.scene.savings", 640, 648, "Guthaben auf dem Sparbuch", bank_money(deposit), share(in_deposit) + " des Vermögens") + + "
Waldpark Bank · Sparbuch"; + // the page of the passbook: what is written in it today + for (const auto &[label, value] : std::array, 4>{{{"Guthaben", bank_money(deposit)}, {"Auf dem Konto", bank_money(in_cash)}, {"Vermögen gesamt", bank_money(wealth)}, {"Anteil Sparbuch", share(in_deposit)}}}) + out += "
" + std::string(label) + "" + esc(value) + "
"; + out += "" + std::string(deposit > 0 ? "Liegt sicher. Rest bleibt auf dem Konto." : in_cash > 0 ? "Noch nichts zurückgelegt!" : "Erst muss Geld aufs Konto.") + "
" + + std::string(engine_mode_ ? "Einzahlungen und Abhebungen werden nach Bestätigung im Spielstand verbucht." : "Einzahlungen und Abhebungen werden hier als fiktive Vorschau verbucht.") + "
" + + calc("Einzahlen", "deposit", "primary block") + calc("Abheben", "withdraw", "block") + "
"; } else if (bank_view_ == "properties") { - const auto &owned = assets.at("properties")[size_t(bank_owned_)], &offer = assets.at("properties")[size_t(bank_property_)]; - const auto count = finance.at("properties")[size_t(bank_owned_)].get(); + // the board of an estate agent: every house a note pinned to it; what the club owns is stamped + static constexpr std::array coming{"Stadthaus", "Penthouse", "Siedlungshaus", "Altbau-Reihenhaus"}; int64_t houses = 0; for (const auto &held : finance.at("properties")) houses += held.get(); - const auto fact = [](const std::string &label, const std::string &value) { return "
" + label + "" + value + "
"; }; - out += "

Dein Bestand

" + - btn("property-owned-next", count ? img(engine_mode_ ? owned.at("image").get() : "bank.property." + std::to_string(bank_owned_), 1150, 653.5, false, false, 1400) - : "Noch keine Immobilie im Bestand", "property-picture", "id=\"property-owned-next\" aria-label=\"Nächste eigene Immobilie\" " + std::string(count ? "" : "disabled")) + - (count ? "

" + esc(calm_name(owned.at("name").get())) + "

" + fact("Im Bestand", number(count) + " Stück") + - fact("Wert heute", esc(bank_money(count * owned.at("price").get()))) - : "

Kein Bestand

" + fact("Immobilienwert", esc(bank_money(in_property))) + fact("Anteil am Vermögen", share(in_property))) + - "
Preise im Vergleich · " + number(houses) + " im Bestand
"; - { - int64_t dearest = 1; - for (const auto &item : assets.at("properties")) dearest = std::max(dearest, item.at("price").get()); - for (int i = 0; i < property_count; ++i) { - const auto &item = assets.at("properties")[size_t(i)]; - out += "
()) + "\">" + esc(calm_name(item.at("name").get())) + - "
() * 100.0 / dearest) + "%;\">
" + - esc(bank_money(item.at("price").get())) + "
"; - } + page_title_ = "Immobilien"; + page_hint_ = number(houses) + " im Bestand · Wert " + bank_money(in_property); + out += "
"; + for (int i = 0; i < 10; ++i) { + const bool real = i < property_count; + const auto count = real ? finance.at("properties")[size_t(i)].get() : 0; + const auto name = real ? calm_name(assets.at("properties")[size_t(i)].at("name").get()) : std::string(coming[size_t(std::min(3, i - property_count))]); + const auto price = real ? bank_money(assets.at("properties")[size_t(i)].at("price").get()) : std::string("Bald im Angebot"); + const bool chosen = real && i == bank_property_; + out += btn(real ? "bank-property" : "bank-soon", "" + img("bank.home." + std::to_string(i), 492, 382, false, true, 800) + + (count > 0 ? "EIGENTÜMER" + (count > 1 ? "" + number(count) + " Stück" : std::string()) + "" : std::string()) + "" + esc(name) + "" + + esc(price) + "", std::string("bk-home") + (chosen ? " sel" : "") + (i % 2 ? " odd" : ""), + "id=\"bank-property-" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + "\" aria-pressed=\"" + (chosen ? "true" : "false") + "\" aria-label=\"" + esc(name + ", " + price + (count > 0 ? ", " + number(count) + " im Bestand" : "")) + "\" " + + (real ? "" : "disabled=\"disabled\"")); } - out += "
"; - out += "

Kaufangebot " + std::to_string(bank_property_ + 1) + " von " + std::to_string(property_count) + "

" + - btn("property-next", img(engine_mode_ ? offer.at("image").get() : "bank.property." + std::to_string(bank_property_), 1150, 653.5, false, false, 1400), - "property-picture", "id=\"property-next\" aria-label=\"Nächstes Immobilienangebot\"") + - "

" + esc(calm_name(offer.at("name").get())) + "

" + fact("Kaufpreis", esc(bank_money(offer.at("price").get()))) + - fact("Anteil am Konto", in_cash > 0 ? one(offer.at("price").get() * 100.0 / in_cash) + " %" : std::string("—")) + - (offer.contains("maxToBuy") ? fact("Bezahlbar", number(offer.at("maxToBuy").get()) + " Stück") : std::string()) + - "

Das Bild anklicken, um das nächste Angebot zu sehen.

" + - actions("Kaufen", "property-buy", "Verkaufen", "property-sell"); + const auto &offer = assets.at("properties")[size_t(bank_property_)]; + const auto held = finance.at("properties")[size_t(bank_property_)].get(); + const auto price = offer.at("price").get(); + out += "
" + pg_kicker("Ausgewählt") + + "

" + esc(calm_name(offer.at("name").get())) + "

" + esc(bank_money(price)) + "
" + + kv("Im Bestand", number(held) + " Stück") + kv("Wert heute", esc(bank_money(held * price))) + kv("Anteil am Konto", in_cash > 0 ? one(price * 100.0 / in_cash) + " %" : std::string("—")) + + (offer.contains("maxToBuy") ? kv("Bezahlbar", number(offer.at("maxToBuy").get()) + " Stück") : kv("Auf dem Konto", esc(bank_money(in_cash)))) + "
" + + calc("Kaufen", "property-buy", "primary bk-wide") + calc("Verkaufen", "property-sell", "bk-wide", held > 0) + "Ein Haus am Brett anklicken, dann kaufen oder verkaufen.
"; } else if (bank_view_ == "stocks") { const auto move = [&](double from, double to) { - if (from <= 0) return std::string("—"); + if (from <= 0) return std::string("—"); const double change = (to - from) * 100.0 / from; - return std::string(" 0.05 ? "up" : change < -0.05 ? "down" : "flat") + "\">" + - (change > 0.05 ? "▲ +" : change < -0.05 ? "▼ −" : "") + one(std::abs(change)) + " %"; + return std::string(" 0.05 ? "up" : change < -0.05 ? "down" : "flat") + "\">" + (change > 0.05 ? "▲ +" : change < -0.05 ? "▼ −" : "") + one(std::abs(change)) + " %"; }; - out += "
"; - for (const auto *label : {"Wert", "30 Tage", "Kurs", "zum Vortag", "Bestand"}) out += "
" + std::string(label) + "
"; - out += "
"; + int held_papers = 0; + for (const auto &held : finance.at("stocks")) if (held.get() > 0) ++held_papers; + page_title_ = "Aktien"; + page_hint_ = "Depotwert " + bank_money(in_stock); + out += "
" + banner("bank.scene.stocks", 700, 96, "Depot", bank_money(in_stock), std::to_string(held_papers) + " von " + std::to_string(stock_count) + " Papieren im Bestand") + + "
WERT30 TAGEKURSZUM VORTAGBESTAND
"; for (int i = 0; i < stock_count; ++i) { const auto &s = assets.at("stocks")[size_t(i)]; const auto history = course(i); @@ -163,27 +145,27 @@ std::string App::render_bank() { spark += "= history.front() ? up : down) + "\" stroke-width=\"4\" stroke-linejoin=\"round\" stroke-linecap=\"round\"/>"; } spark += ""; - out += "
" + btn("bank-stock", esc(s.at("name").get()), "stock-name", - "id=\"bank-stock-" + std::to_string(i) + "\" data-bank-stock=\"" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + - "\" aria-pressed=\"" + (i == bank_stock_ ? "true" : "false") + "\"") + "
" + picture(renderer_.diagram("bank-spark-" + std::to_string(i), spark, 480), 240, 60) + - "
" + number(s.at("price").get() / factor) + "
" + move(s.at("previous").get(), s.at("price").get()) + - "
" + number(finance.at("stocks")[size_t(i)].get()) + "
"; + const bool chosen = i == bank_stock_; + out += btn("bank-stock", "" + esc(s.at("name").get()) + "" + picture(renderer_.diagram("bank-spark-" + std::to_string(i) + "-" + theme_, spark, 480), 216, 54) + "" + + number(s.at("price").get() / factor) + "" + move(s.at("previous").get(), s.at("price").get()) + "" + number(finance.at("stocks")[size_t(i)].get()) + "", + std::string("bk-row") + (chosen ? " sel" : ""), "id=\"bank-stock-" + std::to_string(i) + "\" data-bank-stock=\"" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + "\" aria-pressed=\"" + (chosen ? "true" : "false") + "\""); } - out += "
"; + out += "
"; // the chosen stock: its course with a five-day average, its range, and what the numbers say const auto &chosen = assets.at("stocks")[size_t(bank_stock_)]; const auto history = course(bank_stock_); - const double price = chosen.at("price").get() / factor; - out += "

" + esc(chosen.at("name").get()) + "

" + number(chosen.at("price").get() / factor) + - "" + move(chosen.at("previous").get(), chosen.at("price").get()) + "
"; + const auto held = finance.at("stocks")[size_t(bank_stock_)].get(); + out += "
" + + pg_kicker("Ausgewähltes Papier") + "

" + esc(chosen.at("name").get()) + "

" + + number(chosen.at("price").get() / factor) + "" + move(chosen.at("previous").get(), chosen.at("price").get()) + "
"; if (history.size() > 1) { const double lo = *std::min_element(history.begin(), history.end()), hi = *std::max_element(history.begin(), history.end()); const double floor = lo * .97, ceiling = std::max(floor + 1., hi * 1.03); const auto px = [&](size_t at) { return 30 + at * 860.0 / (history.size() - 1); }; - const auto py = [&](double value) { return 470 - (value - floor) / (ceiling - floor) * 430; }; - std::string svg = ""; - for (int row = 0; row < 5; ++row) svg += ""; + const auto py = [&](double value) { return 450 - (value - floor) / (ceiling - floor) * 420; }; + std::string svg = ""; + for (int row = 0; row < 5; ++row) svg += ""; std::string points, average; size_t high_at = 0, low_at = 0; for (size_t at = 0; at < history.size(); ++at) { @@ -196,11 +178,9 @@ std::string App::render_bank() { average += scalar(px(at)) + "," + scalar(py(sum / 5)) + " "; } } - svg += ""; + svg += ""; double mean = 0, spread = 0; for (const double value : history) mean += value; mean /= double(history.size()); @@ -208,78 +188,37 @@ std::string App::render_bank() { spread = mean > 0 ? std::sqrt(spread / double(history.size())) * 100.0 / mean : 0; const double trend = history.front() > 0 ? (history.back() - history.front()) * 100.0 / history.front() : 0; const double below = hi > 0 ? (hi - history.back()) * 100.0 / hi : 0; - const auto held = finance.at("stocks")[size_t(bank_stock_)].get(); - const auto tile = [](const std::string &label, const std::string &value, const char *tone = "") { - return "
" + value + "" + label + "
"; + const auto tile = [](const std::string &label, const std::string &value, const std::string &tone = std::string()) { + return "
" + value + "" + label + "
"; }; - out += "
()) + "\">" + picture(renderer_.diagram("bank-stock", svg, 1840), 920, 500) + "
" - "
KursFünf-Tage-SchnittHochTief
" - "
" + - tile("Hoch", number(int64_t(std::llround(hi)))) + tile("Tief", number(int64_t(std::llround(lo)))) + - tile(std::to_string(history.size()) + " Tage", (trend > 0 ? "+" : trend < 0 ? "−" : "") + one(std::abs(trend)) + " %", trend > 0.05 ? "up" : trend < -0.05 ? "down" : "") + - tile("Schwankung", one(spread) + " %") + tile("Depotwert", esc(bank_money(held * chosen.at("price").get()))) + - (chosen.contains("maxToBuy") ? tile("Kaufbar", number(chosen.at("maxToBuy").get())) : tile("Bestand", number(held))) + "
" - "

Analyse

" + - std::string(trend > 5 ? "Aufwärtstrend: " : trend < -5 ? "Abwärtstrend: " : "Seitwärtsbewegung: ") + "über " + std::to_string(history.size()) + " Tage " + - (trend > 0 ? "+" : trend < 0 ? "−" : "") + one(std::abs(trend)) + " %. " + - (below < 0.5 ? "Der Kurs steht am Hoch dieses Zeitraums." : "Der Kurs liegt " + one(below) + " % unter dem Hoch dieses Zeitraums.") + " " + - (spread > 12 ? "Das Papier schwankt stark." : spread > 5 ? "Das Papier schwankt mäßig." : "Das Papier läuft ruhig.") + "

"; - (void)price; - } else out += "

Für dieses Papier liegt noch kein Kursverlauf vor.

"; - out += "
" + actions("Kaufen", "stock-buy", "Verkaufen", "stock-sell"); - } else if (bank_view_ == "credit") { - if (engine_mode_) return out + engine_credit_view() + "
"; - out += "
" + img("art.bank-adviser-v1.png", 620, 515, false, false, 1000) + - "
"; - const auto fact = [&](const char *label, const std::string &value, int row) { - constexpr std::array y{0, 83, 166, 273, 356}; - return "
" + label + "" + value + "
"; - }; - out += fact("Restschuld", esc(bank_money(summary.at("debt").get())), 0) + fact("Beispielzins", "8 % pro Jahr", 1); - std::string select = "", 2) + fact("Monatsrate, Beispiel", esc(bank_money(summary.at("monthly_rate").get())), 3) + - fact("Maximaler Kredit", esc(bank_money(5000000 * finance_currency_factor(*world_))), 4) + "
"; - const int term = finance.at("term"); - const auto principal = summary.at("schedule_principal").get(); - std::string svg = "" - "" - ""; - for (int i = 0; i < 5; ++i) { - const auto y = 30 + i * 77.5; - svg += "" - "" + - esc(bank_money((principal * (4 - i) + 2) / 4)) + ""; + out += "
()) + "\">" + + picture(renderer_.diagram("bank-stock-" + theme_, svg, 1840), 1098, 561) + "
KursFünf-Tage-SchnittHochTief
" + + tile("Hoch", number(int64_t(std::llround(hi)))) + tile("Tief", number(int64_t(std::llround(lo)))) + tile(std::to_string(history.size()) + " Tage", (trend > 0 ? "+" : trend < 0 ? "−" : "") + one(std::abs(trend)) + " %", trend > 0.05 ? "ad-plus" : trend < -0.05 ? "ad-minus" : "") + + tile("Schwankung", one(spread) + " %") + tile("Depotwert", esc(bank_money(held * chosen.at("price").get()))) + (chosen.contains("maxToBuy") ? tile("Kaufbar", number(chosen.at("maxToBuy").get())) : tile("Bestand", number(held))) + + "
" + std::string(trend > 5 ? "Aufwärtstrend: " : trend < -5 ? "Abwärtstrend: " : "Seitwärtsbewegung: ") + "über " + std::to_string(history.size()) + " Tage " + (trend > 0 ? "+" : trend < 0 ? "−" : "") + one(std::abs(trend)) + " %. " + + (below < 0.5 ? "Der Kurs steht am Hoch dieses Zeitraums." : "Der Kurs liegt " + one(below) + " % unter dem Hoch dieses Zeitraums.") + " " + (spread > 12 ? "Das Papier schwankt stark." : spread > 5 ? "Das Papier schwankt mäßig." : "Das Papier läuft ruhig.") + ""; + } else out += "
Für dieses Papier liegt noch kein Kursverlauf vor.
"; + out += "
" + calc("Kaufen", "stock-buy", "primary block") + calc("Verkaufen", "stock-sell", "block", held > 0) + "
"; + } else if (bank_view_ == "players") { + // the other humans of this career; dealings between them are not in the game yet + 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") + "
" + + 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()) + "
"; } - const int interval = term <= 12 ? 3 : term <= 24 ? 6 : 12; - std::vector labels; - for (int month = 0; month <= term; month += interval) labels.push_back(month); - if (labels.back() != term) labels.push_back(term); - for (const int month : labels) { - svg += "" + (month == 0 ? "Heute" : std::to_string(month) + (month == term ? " Monate" : "")) + ""; - } - std::string points; - for (const auto &point : summary.at("schedule")) points += scalar(220 + point.at("month").get() / term * 1960) + "," + - scalar(340 - point.at("remaining").get() / principal * 310) + " "; - svg += "" - ""; - out += "

Restschuld über die Laufzeit

" + - esc(bank_money(principal)) + " → " + esc(bank_money(0)) + "

" + std::to_string(term) + - " Monate

" + (summary.at("schedule_example") == true ? "Beispiel · kein laufender Kredit" : "Aktueller Kredit") + - "

" + picture(renderer_.diagram("bank-credit", svg, 2400), 2432, 420) + - "

Gleichmäßige monatliche Tilgung · Restschuld ohne Zinsen

" - "

Fiktiver Kredit. Im POC erfolgen keine Zins- oder Ratenbuchungen.

" + actions("Aufnehmen", "loan", "Tilgen", "repay"); - } else if (bank_view_ == "overview") { - // where the money lies: a ring by share, the four places with their sums, and a reading of it + 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.
"; + } else { + // the bank: where the money lies, and the loan + page_title_ = "Bank"; + page_hint_ = "Waldpark Bank · Vermögen und Kredit"; struct Part { const char *label; int64_t value; const char *colour; }; - const std::array parts{{{"Konto", std::max(0, in_cash), "#2f6f8f"}, {"Sparbuch", in_deposit, "#c9a24a"}, - {"Immobilien", in_property, "#6f8a52"}, {"Aktien", in_stock, "#a8574f"}}}; + const std::array parts{{{"Konto", std::max(0, in_cash), "#2b6f8f"}, {"Sparbuch", in_deposit, "#d08a1e"}, {"Immobilien", in_property, "#56633f"}, {"Aktien", in_stock, "#a8452f"}}}; const double around = 2 * 3.14159265358979 * 300; std::string ring = ""; double turned = 0; @@ -287,58 +226,45 @@ std::string App::render_bank() { if (wealth <= 0 || part.value <= 0) continue; const double length = around * double(part.value) / double(wealth); if (part.value == wealth) { ring += ""; break; } - ring += ""; + ring += ""; turned += length; } ring += ""; - out += "
" + picture(renderer_.diagram("bank-ring", ring, 1600), 860, 860) + "
Vermögen" + - esc(bank_money(wealth)) + "
"; + out += "
" + banner("bank.scene.overview", 590, 196, "Vermögen", bank_money(wealth), "Konto, Sparbuch, Immobilien und Aktien") + + "
" + picture(renderer_.diagram("bank-ring-" + theme_, ring, 900), 400, 400) + "
"; const Part *largest = &parts[0]; for (const auto &part : parts) { if (part.value > largest->value) largest = ∂ const double width = wealth > 0 ? std::max(0, part.value) * 100.0 / wealth : 0; - out += "
" + part.label + - "" + esc(bank_money(std::string(part.label) == "Konto" ? in_cash : part.value)) + "" + share(part.value) + - "
"; + out += "
" + part.label + "" + + esc(bank_money(std::string(part.label) == "Konto" ? in_cash : part.value)) + "" + share(part.value) + "
"; } - if (engine_mode_) - out += "
Kreditlinie" + - esc(bank_money(summary.at("credit_line").get())) + "
"; - else - out += "
Kredit−" + - esc(bank_money(summary.at("debt").get())) + "
" - "
Saldo" + - esc(bank_money(summary.at("net").get())) + "
"; - out += "

Analyse

"; + out += engine_mode_ ? kv("Kreditlinie", esc(bank_money(summary.at("credit_line").get()))) : kv("Kredit", "−" + esc(bank_money(summary.at("debt").get()))) + kv("Saldo", esc(bank_money(summary.at("net").get()))); + out += "

"; if (wealth > 0) { const int64_t invested = in_deposit + in_property + in_stock; out += "Größter Posten: " + std::string(largest->label) + " mit " + share(largest->value) + " des Vermögens. " + - (invested > 0 ? "Angelegt in Sparbuch, Immobilien und Aktien sind " + share(invested) + "." - : std::string("Bisher ist nichts angelegt: Das ganze Vermögen liegt auf dem Konto.")); + (invested > 0 ? "Angelegt in Sparbuch, Immobilien und Aktien sind " + share(invested) + "." : std::string("Bisher ist nichts angelegt: Das ganze Vermögen liegt auf dem Konto.")); } else out += "Es ist kein Vermögen vorhanden."; - out += "

"; - // the market at a glance: every stock's change over its recorded days - std::vector> market; - double widest = 1; - for (int i = 0; i < stock_count; ++i) { - const auto history = course(i); - if (history.size() < 2 || history.front() <= 0) continue; - const double change = (history.back() - history.front()) * 100.0 / history.front(); - market.emplace_back(assets.at("stocks")[size_t(i)].at("name").get(), change); - widest = std::max(widest, std::abs(change)); + out += "
"; + if (engine_mode_) out += engine_credit_view(); + else { + const int term = finance.at("term"); + std::string select = "
" + kv("Monatsrate, Beispiel", esc(bank_money(summary.at("monthly_rate").get()))) + kv("Maximaler Kredit", esc(bank_money(5000000 * finance_currency_factor(*world_)))) + + "
" + picture(renderer_.diagram("bank-credit-" + theme_, svg, 1800), 1200, 360) + "
" + + esc(bank_money(principal)) + " über " + std::to_string(term) + " Monate · " + (summary.at("schedule_example") == true ? "Beispiel, kein laufender Kredit" : "aktueller Kredit") + ". Fiktiver Kredit ohne Zins- und Ratenbuchungen.
" + calc("Aufnehmen", "loan", "primary block") + calc("Tilgen", "repay", "block") + "
"; } - if (!market.empty()) { - out += "

Aktienmarkt · Veränderung über die aufgezeichneten Tage

"; - for (const auto &[name, change] : market) { - const double height = std::abs(change) / widest * 120; - out += "
" + (change > 0 ? "+" + one(change) + " %
" : std::string()) + - "
" + (change <= 0 ? "
−" + one(std::abs(change)) + " %" : std::string()) + - "
" + esc(name) + "
"; - } - out += "
"; - } - out += "

" + std::string(engine_mode_ ? "Bestände und Kurse aus dem Spielstand." : "Erfundene Bestände · Änderungen betreffen ausschließlich die Bankvorschau.") + "

"; + out += ""; } - return out + "
"; + return out + ""; } diff --git a/src/modern/ui/controls.inc b/src/modern/ui/controls.inc index c012a19..c41da2e 100644 --- a/src/modern/ui/controls.inc +++ b/src/modern/ui/controls.inc @@ -705,6 +705,9 @@ void App::dispatch(const std::string &action, Rml::Element *target) { // the investments are the second page of advertising const bool investments = route == "investments"; if (investments) route = "advertising"; + // ... and the bank has five + const auto bank_page = bank_view_of(route); + if (!bank_page.empty()) route = "bank"; if(source_&&!demo_career_menu_available(snap().state,route)){message(snap().state.at("career").value("ended",false)?"Diese Partie ist beendet. Bitte ein neues Spiel beginnen oder einen Spielstand laden.":"Dieses Vereinsmenü ist für die Nationalmannschaft nicht verfügbar.");return;} if (route == "kickoff") return; @@ -719,7 +722,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) { message("Diese native Ansicht wird im nächsten Menüpaket übertragen."); return; } - if (route == "bank") { bank_view_ = "entrance"; bank_hint_.clear(); } + if (route == "bank") { bank_view_ = bank_page.empty() ? "credit" : bank_page; bank_hint_.clear(); } if (route == "advertising") { advertising_page_ = investments ? "investments" : "advertising"; advertising_selected_ = -1; advertising_offer_ = 0; } if (route == "stadium") { if (!stadium_view_.is_object()) stadium_view_ = Json::object(); stadium_view_["view"] = surroundings ? "panorama" : "inside"; stadium_focus_.clear(); } menu_ = route; diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index ab697d1..54db83e 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -501,7 +501,7 @@ void App::engine_event(Rml::Event &event) { else if (action == "engine-open" && id == "friendlies") { menu_ = id; planning_dialog_.clear(); engine_friendly_sync(); refresh(); } else if (action == "engine-open" && (id == "calendar" || id == "postpone")) { menu_ = id; engine_move_id_.clear(); calendar_month_ = -1; calendar_anim_.clear(); engine_calendar_sync(); refresh(); } else if (action == "engine-open" && id == "contracts") { menu_ = id; engine_contracts_clear(false); contracts_player_.clear(); engine_contract_scroll_ = 0.f; refresh(); } - else if (action == "engine-open" && id == "bank") { bank_view_ = "entrance"; bank_hint_.clear(); menu_ = "bank"; refresh(); } + else if (action == "engine-open" && !bank_view_of(id).empty()) { bank_view_ = bank_view_of(id); bank_hint_.clear(); menu_ = "bank"; refresh(); } else if (action == "engine-open" && id == "save") engine_save(); else if (action == "engine-open" && (id == "training" || id == "tactics")) { engine_sports_reset(); menu_ = id; refresh(); } else if (action == "engine-open" && id == "lineup") { menu_ = "lineup"; lineup_selected_.clear(); lineup_reset_scroll_ = true; refresh(); } diff --git a/src/modern/ui/engine_finance.inc b/src/modern/ui/engine_finance.inc index ed13446..a4afb06 100644 --- a/src/modern/ui/engine_finance.inc +++ b/src/modern/ui/engine_finance.inc @@ -98,10 +98,10 @@ bool App::engine_bank_action(const std::string &action, Rml::Element *target) { open_amount(std::move(request)); return true; } std::string App::engine_credit_view() { - std::string out = "
" + img("art.bank-adviser-v1.png", 620, 515, false, false, 1000) + "
"; + std::string out; Json data; try { data = engine_credit_projection(engine_data_, engine_credit_); } - catch (const std::exception &) { return out + "

Der Bankkredit ist in diesem Kontext nicht verfügbar.

"; } + catch (const std::exception &) { return "
Der Bankkredit ist in diesem Kontext nicht verfügbar.
"; } // the original's labels arrive in capitals: one capital per word reads calmer const auto calm = [](std::string text) { bool first = true; @@ -116,26 +116,28 @@ std::string App::engine_credit_view() { } return text; }; - out += "
"; + // the loan as the bank states it: every figure a line; what may be changed is a button + out += "
" + pg_kicker("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(); if (i == 1) total = value; if (i == 5) paid = value; const auto text = i == 3 || i == 4 ? number(value) + " Monate" : money(value * 100, {{"code", "EUR"}, {"minor_units", 2}}); - out += "
" + esc(calm(engine_text(f.at("label")))) + ""; - if (data.at("saved")[0] == 0 && f.at("editable") == true) out += btn("engine-credit-edit", esc(text), "bank-control", "id=\"engine-credit-" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + "\""); - else out += esc(text); - out += "
"; + out += "
" + esc(calm(engine_text(f.at("label")))) + ""; + if (data.at("saved")[0] == 0 && f.at("editable") == true) out += pg_button("engine-credit-edit", esc(text), "bk-edit", "id=\"engine-credit-" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + "\""); + else out += "" + esc(text) + ""; + out += "
"; } - out += "

Kreditvorschau

"; + out += "
"; for (const auto &[label, key] : std::array, 3>{{{"Gebühren", "fees"}, {"Erstattung", "refund"}, {"Bereits getilgt", "principalPaid"}}}) - out += "
" + esc(engine_price(data.at(key))) + "" + label + "
"; + out += "
" + esc(engine_price(data.at(key))) + "" + label + "
"; // how much of the whole sum is paid back 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")) + - "
"; - out += "

" + 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.") + "

"; - out += ""; + 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.") + ""; + 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/notebook.inc b/src/modern/ui/notebook.inc index 73784c1..e3a8033 100644 --- a/src/modern/ui/notebook.inc +++ b/src/modern/ui/notebook.inc @@ -15,7 +15,7 @@ const std::vector ¬ebook_sections() { {"team", "Mannschaft", {"lineup", "tactics", "training", "camp", "strengths", "scorers"}}, {"transfers", "Transfers", {"transfer", "contracts"}}, {"club", "Verein", {"stadium", "periphery", "environment", "advertising", "investments"}}, - {"finance", "Finanzen", {"balance", "bank", "toto"}}, + {"finance", "Finanzen", {"balance", "bank", "properties", "stocks", "savings", "players", "toto"}}, {"fixtures", "Spielplan", {"calendar", "league", "tables", "other", "friendlies", "postpone", "indoor"}}, {"records", "Statistik", {"statistics", "stat-trend", "stat-winners", "stat-records", "stat-players", "achievements", "almanac", "fairplay", "highscore"}}, {"inbox", "Posteingang", {"news"}}, @@ -26,7 +26,7 @@ std::string notebook_page_label(const std::string &route) { static const std::map labels = { {"lineup", "Aufstellung"}, {"tactics", "Taktik"}, {"training", "Training"}, {"camp", "Trainingslager"}, {"strengths", "Stärken"}, {"scorers", "Spielerstatistik"}, {"transfer", "Transfermarkt"}, {"contracts", "Verträge"}, {"stadium", "Stadion"}, {"periphery", "Peripherie"}, {"environment", "Umfeld"}, - {"advertising", "Werbung"}, {"investments", "Investitionen"}, {"balance", "Bilanz"}, {"bank", "Bank"}, {"toto", "Toto"}, {"calendar", "Kalender"}, {"league", "Ligaspiele"}, + {"advertising", "Werbung"}, {"investments", "Investitionen"}, {"balance", "Bilanz"}, {"bank", "Bank"}, {"properties", "Immobilien"}, {"stocks", "Aktien"}, {"savings", "Sparbuch"}, {"players", "Spieler"}, {"toto", "Toto"}, {"calendar", "Kalender"}, {"league", "Ligaspiele"}, {"tables", "Tabellen"}, {"other", "Übrige Spiele"}, {"friendlies", "Testspiele"}, {"postpone", "Verlegen"}, {"indoor", "Halle"}, {"statistics", "Analyse"}, {"stat-trend", "Verlauf"}, {"stat-winners", "Sieger"}, {"stat-records", "Rekorde"}, {"stat-players", "Spieler"}, {"achievements", "Erfolge"}, {"almanac", "Almanach"}, {"fairplay", "Fairplay"}, {"highscore", "Highscore"}, {"news", "Nachrichten"}, {"settings", "Einstellungen"}, {"save", "Speichern"}, {"load", "Laden"}, {"newplayer", "Manager"}}; @@ -197,26 +197,32 @@ std::string App::notebook_shell(const std::function & out += btn("home-do", "+", "nb-sub add", "id=\"page-home-add\" data-id=\"new\" aria-label=\"Neue Seite\" style=\"transform:translateY(16dp) rotate(1deg);\""); } size_t n = 0; + // a marker the book does not show: the pages of the archive in the demo, and the page for + // dealings between managers where only one human plays + const bool alone = bank_players().size() < 2; + const auto hidden = [&](const char *r) { return (!engine_mode_ && std::string_view(r).starts_with("stat-")) || (alone && std::string_view(r) == "players"); }; + const auto shown = size_t(std::count_if(section.routes.begin(), section.routes.end(), [&](const char *r) { return !hidden(r); })); for (const char *r : section.routes) { + if (hidden(r)) continue; // the statistics are one menu with several pages; the demo has only its first const bool part = std::string_view(r).starts_with("stat-") || std::string_view(r) == "statistics"; - if (!engine_mode_ && std::string_view(r).starts_with("stat-")) continue; // the ground is one menu with two pages: the stadium and what stands around it const bool ground = std::string_view(r) == "stadium" || std::string_view(r) == "periphery"; // so is advertising: the sponsors' contracts, and what the club invests itself const bool commerce = std::string_view(r) == "advertising" || std::string_view(r) == "investments"; const bool here = ground ? menu_ == "stadium" && (stadium_view_.value("view", std::string("inside")) == "panorama") == (std::string_view(r) == "periphery") + : !bank_view_of(r).empty() ? menu_ == "bank" && bank_view_ == bank_view_of(r) : commerce ? menu_ == "advertising" && (advertising_page_ == "investments") == (std::string_view(r) == "investments") : part && engine_mode_ ? menu_ == "statistics" && statistics_page_ == r : notebook_menu() == r; if (here) { - kicker = std::string(section.label) + " · " + std::to_string(n + 1) + " / " + std::to_string(section.routes.size()); + kicker = std::string(section.label) + " · " + std::to_string(n + 1) + " / " + std::to_string(shown); heading = notebook_page_label(r); } out += open(r, "" + std::to_string(n + 1) + "" + notebook_page_label(r) + "", std::string("nb-sub") + (here ? " active" : ""), "id=\"page-" + std::string(r) + "\" aria-pressed=\"" + (here ? "true" : "false") + "\" style=\"transform:translateY(" + (here ? std::string("-13") : std::to_string(sub_rest[n % sub_rest.size()])) + "dp) rotate(" + scalar(sub_turns[n % sub_turns.size()]) + "deg);\"", - enabled(part ? "statistics" : ground ? "stadium" : commerce ? "advertising" : r)); + enabled(part ? "statistics" : ground ? "stadium" : commerce ? "advertising" : !bank_view_of(r).empty() ? "bank" : r)); ++n; } } diff --git a/src/modern/ui/pages.inc b/src/modern/ui/pages.inc index 9ef337f..cb837de 100644 --- a/src/modern/ui/pages.inc +++ b/src/modern/ui/pages.inc @@ -6,7 +6,7 @@ // sheet of the old format, shown scaled inside the book. bool App::page_native() const { if (scene_ == "managerhub") return true; - static const std::set native{"advertising", "camp", "toto", "settings", "save", "load", "stadium", "statistics", "news", "transfer", "training", "almanac", "tactics", "achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"}; + static const std::set native{"bank", "advertising", "camp", "toto", "settings", "save", "load", "stadium", "statistics", "news", "transfer", "training", "almanac", "tactics", "achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"}; if (menu_ == "calendar" || menu_ == "postpone" || menu_ == "lineup") return notebook_page() && engine_mode_; // a national coach arranges friendlies on the older sheet if (menu_ == "friendlies") return notebook_page() && engine_mode_ && engine_data_.contains("desktop") && engine_data_.at("desktop").at("meta").at("scope").at("role") == "club"; diff --git a/src/modern/ui/screens.inc b/src/modern/ui/screens.inc index 1440a14..7506d34 100644 --- a/src/modern/ui/screens.inc +++ b/src/modern/ui/screens.inc @@ -239,11 +239,6 @@ std::string App::render_menu(const std::string &key) { else throw editor::Error("Diese native Ansicht ist noch nicht verfügbar."); std::string heading = key == "postpone" ? "Spiel verlegen" : title(key); - if (key == "bank" && bank_view_ != "entrance") { - const std::map labels = {{"savings", "Sparbuch"}, {"properties", "Immobilien"}, - {"stocks", "Aktien"}, {"credit", "Kredit"}, {"overview", "Finanzübersicht"}}; - if (labels.contains(bank_view_)) heading += " · " + labels.at(bank_view_); - } return "
" + window(heading, body) + (key == "statistics" ? render_statistics_trophy() : "") + "
"; diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index bb55053..d2c7da5 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -470,7 +470,9 @@ class App final : public Rml::EventListener { bool amount_select_all_ = false, amount_caret_end_ = false; // the offered value is still as it was opened: the first digit key replaces it bool amount_untouched_ = false; - std::string bank_view_ = "entrance", bank_hint_; + std::string bank_view_ = "credit", bank_hint_; // the page of the bank that is open + Json bank_players() const; + static std::string bank_view_of(const std::string &route); int bank_property_ = 0, bank_owned_ = 0, bank_stock_ = 11; bool balance_future_ = false; // the balance sheet's what-if calculation (finance_simulation.inc) @@ -702,7 +704,7 @@ class App final : public Rml::EventListener { if (page) club_mark.clear(); return (page ? "
" : "
") + - (close ? btn("close", "×", "close", "id=\"window-close\" aria-label=\"" + std::string(menu_ == "bank" && bank_view_ != "entrance" ? "Zurück zur Bankhalle" : "Fenster schließen") + "\"") + (close ? btn("close", "×", "close", "id=\"window-close\" aria-label=\"" + std::string("Fenster schließen") + "\"") : "") + "

" + esc(heading) + "

" + club_mark + "
" + window_art() + "
" + content + "
" + (amount_ ? render_amount() : "") + "
" + (page ? "
" : ""); @@ -823,7 +825,7 @@ class App final : public Rml::EventListener { contracts_player_.clear(); contract_draft_ = Json(); contracts_world_.reset(); - bank_view_ = "entrance"; + bank_view_ = "credit"; bank_hint_.clear(); balance_future_ = false; balance_sim_ = false;