powergrid-viewer 1.9.0 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powergrid-viewer",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/boardgamers/powergrid.git",
@@ -18,7 +18,7 @@
     "vue": "^2.6.11",
     "vue-class-component": "^7.2.3",
     "vue-property-decorator": "^8.4.2",
-    "powergrid-engine": "1.13.0"
+    "powergrid-engine": "1.13.2"
   },
   "devDependencies": {
     "@types/assert": "^1.4.7",

package/src/components/Game.vue

@@ -71,6 +71,7 @@
                 :buyableResources="buyableResources()"
                 :coalStorage="G.coalStorage"
                 :resourceResupply="getResourceResupply()"
+                :resourceResupplyNorth="getResourceResupplyNorth()"
                 @buyResource="buyResource($event)"
             />
 
@@ -1140,6 +1141,15 @@ export default class Game extends Vue {
 
         return [0, 0, 0, 0];
     }
+
+    getResourceResupplyNorth() {
+        if (this.G && this.G.resourceResupplyNorth) {
+            let str = this.G.resourceResupplyNorth[this.G.step - 1];
+            str = str.substr(1, str.length - 2);
+            return str.split(',');
+        }
+        return null;
+    }
 }
 </script>
 <style lang="scss">

package/src/components/boards/Map.vue

@@ -225,7 +225,17 @@ export default class Map extends Vue {
             player.cities.forEach((cityPiece) => {
                 const city = gameState.map.cities.find((city) => city.name == cityPiece.name)!;
                 let offsetX, offsetY;
-                if (cityPiece.position == 0) {
+                const is1520 = city.slotCosts?.length === 2 && city.slotCosts[0] === 15;
+                if (is1520) {
+                    // [15,20] city: slot 0 (cost 15) → bottom-left, slot 1 (cost 20) → bottom-right
+                    if (cityPiece.position == 0) {
+                        offsetX = -15;
+                        offsetY = -4;
+                    } else {
+                        offsetX = 1;
+                        offsetY = -4;
+                    }
+                } else if (cityPiece.position == 0) {
                     offsetX = -6;
                     offsetY = -18;
                 } else if (cityPiece.position == 1) {

package/src/components/boards/PowerPlantMarket.vue

@@ -152,10 +152,13 @@ export default class PowerPlantMarket extends Vue {
         this.futureMarketCards = [];
         gameState.futureMarket.forEach((card, i) => {
             if (card.number != gameState.chosenPowerPlant?.number) {
+                // Europe step 1 has 5 plants in the future market; the 5th would
+                // sit under the bid calculator at x=actualMarketWidth, so wrap
+                // to a second row.
                 this.futureMarketCards.push({
                     id: 'future_' + i,
-                    x: 165 + i * 65,
-                    y: 90,
+                    x: 165 + (i % 4) * 65,
+                    y: 90 + Math.floor(i / 4) * 50,
                     powerPlant: card
                 });
             }

package/src/components/boards/Resources.vue

@@ -4,6 +4,42 @@
              The South market re-uses the existing rendering below; Korea-specific
              cube positions are populated in createPieces. -->
         <template v-if="isKorea">
+            <template v-if="resourceResupplyNorth">
+                <text
+                    v-if="resourceResupplyNorth[0] < 10"
+                    x="30"
+                    y="-125"
+                    font-weight="600"
+                    fill="black"
+                    style="font-size: 24px"
+                    >Resource Resupply:</text
+                >
+                <text v-else x="20" y="-125" font-weight="600" fill="black" style="font-size: 24px"
+                    >Resource Resupply:</text
+                >
+                <text
+                    v-if="resourceResupplyNorth[0] < 10"
+                    x="276"
+                    y="-125"
+                    font-weight="600"
+                    fill="black"
+                    style="font-size: 24px"
+                >
+                    {{ resourceResupplyNorth[0] }}
+                </text>
+                <text v-else x="262" y="-125" font-weight="600" fill="black" style="font-size: 24px">
+                    {{ resourceResupplyNorth[0] }}
+                </text>
+                <Coal :pieceId="-1" :targetState="{ x: 288, y: -133 }" :canClick="false" :transparent="false" />
+                <text x="321" y="-125" font-weight="600" fill="black" style="font-size: 24px">
+                    {{ resourceResupplyNorth[1] }}
+                </text>
+                <Oil :pieceId="-1" :targetState="{ x: 331, y: -134 }" :canClick="false" :transparent="false" />
+                <text x="368" y="-125" font-weight="600" fill="black" style="font-size: 24px">
+                    {{ resourceResupplyNorth[2] }}
+                </text>
+                <Garbage :pieceId="-1" :targetState="{ x: 382, y: -134 }" :canClick="false" :transparent="false" />
+            </template>
             <text x="20" y="-110" font-weight="700" fill="black" style="font-size: 22px">North Market</text>
             <rect width="760" height="80" x="20" y="-100" rx="3" fill="#c89c3a" />
             <template v-for="index in 8">
@@ -377,6 +413,7 @@ import { range } from 'lodash';
 })
 export default class Resources extends Vue {
     @Prop() resourceResupply?: number[];
+    @Prop() resourceResupplyNorth?: number[];
     @Prop() isUsaRecharged?: boolean;
     @Prop() isMiddleEast?: boolean;
     @Prop() isIndiaResourceMarket?: boolean;

package/src/self-contained.ts

@@ -10,11 +10,7 @@ function launchSelfContained(selector = '#app') {
 
     const emitter = launch(selector);
 
-    let gameState = setup(
-        5,
-        { map: 'Baden-Württemberg', variant: 'original', showMoney: true, randomizeMap: false },
-        '7'
-    );
+    let gameState = setup(5, { map: 'Japan', variant: 'recharged', showMoney: true, randomizeMap: false }, '7');
 
     // Dev coord-picker example (commented; uncomment + drop a board photo into
     // viewer/public/ to author city coordinates for a new map). See the picker