powergrid-viewer 1.9.8 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powergrid-viewer",
-  "version": "1.9.8",
+  "version": "1.10.0",
   "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.6"
+    "powergrid-engine": "1.14.0"
   },
   "devDependencies": {
     "@types/assert": "^1.4.7",

package/src/components/Game.vue

@@ -110,6 +110,68 @@
                 @buyResource="buyResource($event)"
             />
 
+            <!-- Australia: uranium-mine selling table. Six price rows $7 (top) →
+                 $2 (bottom), two token slots each. Sellers place one token per mine
+                 on the highest empty slot; the resource refill removes from the
+                 cheap (bottom) end. Lives in the clear upper-left margin. -->
+            <g v-if="G.map.name === 'Australia' && G.uraniumMineMarket" transform="translate(15, 70)">
+                <rect x="0" y="0" width="104" height="430" rx="6" fill="#8aa84a" stroke="#4d6322" stroke-width="3" />
+                <text x="52" y="22" text-anchor="middle" font-weight="700" fill="black" style="font-size: 15px">
+                    Uranium
+                </text>
+                <text x="52" y="38" text-anchor="middle" font-weight="600" fill="black" style="font-size: 11px">
+                    mine market
+                </text>
+                <g v-for="row in 6" :key="'uraniumRow' + row" :transform="`translate(0, ${50 + (row - 1) * 59})`">
+                    <text x="16" y="32" text-anchor="middle" font-weight="700" fill="black" style="font-size: 15px">
+                        ${{ 8 - row }}
+                    </text>
+                    <rect
+                        x="36"
+                        y="14"
+                        width="26"
+                        height="26"
+                        rx="3"
+                        fill="goldenrod"
+                        stroke="#4d6322"
+                        stroke-width="1.5"
+                    />
+                    <rect
+                        x="68"
+                        y="14"
+                        width="26"
+                        height="26"
+                        rx="3"
+                        fill="goldenrod"
+                        stroke="#4d6322"
+                        stroke-width="1.5"
+                    />
+                    <circle
+                        v-if="(G.uraniumMineMarket[6 - row] || 0) >= 1"
+                        cx="49"
+                        cy="27"
+                        r="10"
+                        fill="#46c655"
+                        stroke="#1f5c25"
+                        stroke-width="2"
+                    />
+                    <circle
+                        v-if="(G.uraniumMineMarket[6 - row] || 0) >= 2"
+                        cx="81"
+                        cy="27"
+                        r="10"
+                        fill="#46c655"
+                        stroke="#1f5c25"
+                        stroke-width="2"
+                    />
+                </g>
+                <!-- Removal rate: tokens taken from the cheapest slots each refill (current step). -->
+                <line x1="10" y1="402" x2="94" y2="402" stroke="#4d6322" stroke-width="1" />
+                <text x="52" y="420" text-anchor="middle" font-weight="700" fill="#22340f" style="font-size: 12px">
+                    refill −{{ G.map.uraniumMineResupply[G.players.length - 2][G.step - 1] }}/rnd
+                </text>
+            </g>
+
             <g :transform="`translate(${G.map.roundInfoPosition[0]}, ${G.map.roundInfoPosition[1]})`">
                 <template v-if="gameEnded(G)">
                     <Button
@@ -175,6 +237,7 @@
                     :showMoney="player == playerIndex || gameEnded(G) || G.options.showMoney"
                     :showBid="!G.options.fastBid"
                     :phase="G.phase"
+                    :isAustralia="G.map.name === 'Australia'"
                     @powerPlantClick="powerPlantClick($event)"
                     @discardResource="discardResource($event)"
                 />
@@ -368,6 +431,11 @@
                                             (S), <strong>{{ G.resourceResupplyNorth[0] }}</strong> (N)
                                         </template>
                                     </li>
+                                    <li v-if="G.map.uraniumMineResupply">
+                                        Uranium market: remove
+                                        <strong>{{ G.map.uraniumMineResupply[G.players.length - 2][0] }}</strong>
+                                        token(s) from the cheapest slots
+                                    </li>
                                     <li>Bureaucracy: remove <strong>highest</strong> power plant from market</li>
                                 </ul>
                             </li>
@@ -385,6 +453,11 @@
                                             (S), <strong>{{ G.resourceResupplyNorth[1] }}</strong> (N)
                                         </template>
                                     </li>
+                                    <li v-if="G.map.uraniumMineResupply">
+                                        Uranium market: remove
+                                        <strong>{{ G.map.uraniumMineResupply[G.players.length - 2][1] }}</strong>
+                                        token(s) from the cheapest slots
+                                    </li>
                                     <li>Bureaucracy: remove <strong>highest</strong> power plant from market</li>
                                 </ul>
                             </li>
@@ -399,6 +472,11 @@
                                             (S), <strong>{{ G.resourceResupplyNorth[2] }}</strong> (N)
                                         </template>
                                     </li>
+                                    <li v-if="G.map.uraniumMineResupply">
+                                        Uranium market: remove
+                                        <strong>{{ G.map.uraniumMineResupply[G.players.length - 2][2] }}</strong>
+                                        token(s) from the cheapest slots
+                                    </li>
                                     <li>Bureaucracy: remove <strong>lowest</strong> power plant from market</li>
                                     <li>All power plants available for auction</li>
                                 </ul>

package/src/components/PlayerBoard.vue

@@ -18,19 +18,47 @@
         <Card
             v-for="(powerPlant, i) in player.powerPlants"
             :key="'powerPlant_' + powerPlant.number"
-            :targetState="{ x: player.powerPlants.length < 5 ? 20 + 80 * i : 5 + 70 * i, y: 30 }"
+            :targetState="{ x: cardX(i), y: 30 }"
             :owner="owner"
             :powerPlant="powerPlant"
             :canClick="canUse(powerPlant)"
             @click="powerPlantClick(powerPlant)"
         />
 
+        <!-- Australia: mark uranium mines (they sell uranium instead of powering
+             cities, and don't count toward the 3-plant limit) with a green frame
+             and a uranium badge. -->
+        <template v-for="(powerPlant, i) in player.powerPlants">
+            <g v-if="isMine(powerPlant)" :key="'mine_' + powerPlant.number">
+                <rect
+                    :x="cardX(i)"
+                    y="30"
+                    width="60"
+                    height="40"
+                    fill="none"
+                    stroke="#2e8b3d"
+                    stroke-width="3px"
+                    rx="3px"
+                />
+                <circle :cx="cardX(i) + 51" cy="37" r="8" fill="#46c655" stroke="#1f5c25" stroke-width="1.5" />
+                <text
+                    :x="cardX(i) + 51"
+                    y="40"
+                    text-anchor="middle"
+                    fill="white"
+                    style="font-size: 9px; font-weight: 700"
+                >
+                    U
+                </text>
+            </g>
+        </template>
+
         <template v-if="!preferences.disableHelp">
             <template v-for="(powerPlant, i) in player.powerPlants">
                 <rect
                     v-if="canUse(powerPlant)"
                     :key="i + '_' + i + '_helper'"
-                    :x="player.powerPlants.length < 5 ? 20 + 80 * i : 5 + 70 * i"
+                    :x="cardX(i)"
                     :y="30"
                     width="60"
                     height="40"
@@ -98,11 +126,27 @@ export default class PlayerBoard extends Vue {
     @Prop() showMoney?: boolean;
     @Prop() showBid?: boolean;
     @Prop() phase?: Phase;
+    // Australia: uranium plants are "mines" — flag so the hand marks them distinctly.
+    @Prop() isAustralia?: boolean;
 
     @Inject() preferences!: Preferences;
 
     powerPlantClicked?: PowerPlant;
 
+    // Horizontal position of the i-th power-plant card. Spacing compresses as the
+    // hand grows so Australia's mines (which don't count toward the 3-plant limit,
+    // so a player can hold many cards) stay on the board instead of overflowing
+    // off the right edge. Non-Australia hands never exceed 4, so they are unaffected.
+    cardX(i: number): number {
+        const n = this.player.powerPlants.length;
+        if (n < 5) return 20 + 80 * i;
+        return 5 + Math.min(70, 280 / (n - 1)) * i;
+    }
+
+    isMine(powerPlant: PowerPlant): boolean {
+        return this.isAustralia === true && powerPlant.type === PowerPlantType.Uranium;
+    }
+
     getPlayerName() {
         let name = '';
         if (this.isCurrentPlayer) {

package/src/components/boards/Resources.vue

@@ -123,13 +123,16 @@
             {{ resourceResupply[2] }}
         </text>
         <Garbage :pieceId="-1" :targetState="{ x: 382, y: 11 }" :canClick="false" :transparent="false" />
-        <text x="414" y="20" font-weight="600" fill="black" style="font-size: 24px">
-            {{ resourceResupply[3] }}
-        </text>
-        <Uranium :pieceId="-1" :targetState="{ x: 428, y: 12 }" :canClick="false" :transparent="false" />
+        <!-- Australia has no main-market uranium row, so its resupply indicator omits uranium. -->
+        <template v-if="!isAustraliaMarket">
+            <text x="414" y="20" font-weight="600" fill="black" style="font-size: 24px">
+                {{ resourceResupply[3] }}
+            </text>
+            <Uranium :pieceId="-1" :targetState="{ x: 428, y: 12 }" :canClick="false" :transparent="false" />
+        </template>
 
         <rect
-            v-if="!isIndiaResourceMarket && !isNinePriceMarket"
+            v-if="!isIndiaResourceMarket && !isNinePriceMarket && !isAustraliaMarket"
             width="760"
             height="80"
             x="20"
@@ -138,8 +141,9 @@
             fill="goldenrod"
         />
         <rect v-if="isNinePriceMarket" width="780" height="80" x="20" y="40" rx="3" fill="goldenrod" />
+        <rect v-if="isAustraliaMarket" width="870" height="80" x="20" y="40" rx="3" fill="goldenrod" />
         <rect v-if="isIndiaResourceMarket" width="680" height="80" x="20" y="40" rx="3" fill="goldenrod" />
-        <template v-for="index in isNinePriceMarket ? 9 : 8">
+        <template v-for="index in isNinePriceMarket ? 9 : isAustraliaMarket ? 10 : 8">
             <rect
                 :key="'resources' + index"
                 width="70"
@@ -160,7 +164,7 @@
             >
                 {{ index }}
             </text>
-            <g :key="'lines' + index" v-if="!isIndiaResourceMarket && !isNinePriceMarket">
+            <g :key="'lines' + index" v-if="!isIndiaResourceMarket && !isNinePriceMarket && !isAustraliaMarket">
                 <line :x1="25 + 85 * (index - 1)" y1="68" :x2="95 + 85 * (index - 1)" y2="68" stroke="goldenrod" />
                 <line :x1="25 + 85 * (index - 1)" y1="92" :x2="95 + 85 * (index - 1)" y2="92" stroke="goldenrod" />
 
@@ -188,6 +192,20 @@
             </g>
         </template>
 
+        <!-- Australia: the $1 and $2 spaces close once the Step 3 CO2 tax fires. -->
+        <template v-if="isAustraliaMarket && co2TaxActive">
+            <rect width="160" height="70" x="24" y="45" rx="2" fill="black" opacity="0.55" />
+            <text
+                text-anchor="middle"
+                style="font-size: 12px; font-family: monospace; font-weight: 700"
+                x="104"
+                y="84"
+                fill="white"
+            >
+                CO₂ closed
+            </text>
+        </template>
+
         <template v-if="isIndiaResourceMarket">
             <g :key="'separators'">
                 <line x1="275" y1="40" x2="275" y2="140" stroke="red" />
@@ -198,7 +216,7 @@
             </g>
         </template>
 
-        <template v-if="!isIndiaResourceMarket && !isNinePriceMarket">
+        <template v-if="!isIndiaResourceMarket && !isNinePriceMarket && !isAustraliaMarket">
             <rect width="30" height="30" x="705" y="45" rx="2" fill="darkgoldenrod" />
             <circle r="10" cx="732" cy="48" fill="yellow" />
             <text
@@ -366,7 +384,7 @@
                 v-if="!isKorea && buyableResources.length > 0"
                 x="15"
                 y="35"
-                width="770"
+                :width="isAustraliaMarket ? 880 : 770"
                 height="90"
                 rx="2"
                 fill="none"
@@ -432,6 +450,10 @@ export default class Resources extends Vue {
 
     isKorea: boolean = false;
     isNinePriceMarket: boolean = false;
+    // Australia: coal/oil/garbage-only market that can reach $10 after the Step 3
+    // CO2 tax. co2TaxActive closes the $1/$2 columns once that shift has happened.
+    isAustraliaMarket: boolean = false;
+    co2TaxActive: boolean = false;
     coalsNorth: Piece[] = [];
     oilsNorth: Piece[] = [];
     garbagesNorth: Piece[] = [];
@@ -483,6 +505,9 @@ export default class Resources extends Vue {
     createPieces(gameState: GameState) {
         if (!gameState) return;
 
+        this.isAustraliaMarket = gameState.map?.name === 'Australia';
+        this.co2TaxActive = this.isAustraliaMarket && gameState.step >= 3;
+
         const isKorea = gameState.coalMarketNorth !== undefined;
         this.isKorea = isKorea;
 
@@ -558,6 +583,29 @@ export default class Resources extends Vue {
             );
             return;
         }
+
+        // Australia: coal/oil/garbage only (no uranium row — uranium lives in the
+        // separate mine market). Prices run $1–$8, shifting to $3–$10 at Step 3
+        // (CO2 tax). buildMainRowPieces positions cubes by price, so the shift is
+        // automatic; the template renders 10 price columns and closes $1/$2 once
+        // co2TaxActive.
+        if (this.isAustraliaMarket) {
+            this.coals = this.buildMainRowPieces(
+                gameState.coalPrices!, gameState.coalMarket, 'coal', 48, { maxPrice: 10 },
+            );
+            this.oils = this.buildMainRowPieces(
+                gameState.oilPrices!, gameState.oilMarket, 'oil', 70, { maxPrice: 10 },
+            );
+            this.garbages = this.buildMainRowPieces(
+                gameState.garbagePrices!, gameState.garbageMarket, 'garbage', 94, { maxPrice: 10 },
+            );
+            this.uraniums = [];
+            this.coalsNorth = [];
+            this.oilsNorth = [];
+            this.garbagesNorth = [];
+            return;
+        }
+
         this.isNinePriceMarket = false;
 
         // Non-Korea: original logic below (unchanged).

package/src/self-contained.ts

@@ -10,7 +10,7 @@ function launchSelfContained(selector = '#app') {
 
     const emitter = launch(selector);
 
-    let gameState = setup(5, { map: 'Japan', variant: 'recharged', showMoney: true, randomizeMap: false }, '7');
+    let gameState = setup(6, { map: 'Australia', 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