powergrid-engine 1.13.0 → 1.13.1

package/dist/src/engine.js

@@ -18,7 +18,7 @@ const utils_1 = require("./utils");
 exports.playerColors = ['limegreen', 'mediumorchid', 'red', 'dodgerblue', 'yellow', 'brown'];
 const citiesToStep2 = [10, 7, 7, 7, 6];
 const citiesToStep2BadenWurttemberg = [9, 6, 6, 6, 5];
-const citiesToStep2UKIreland = [7, 7, 7, 7, 6];
+const citiesToStep2UKIreland = [10, 7, 7, 7, 6];
 const citiesToEndGame = [21, 17, 17, 15, 14];
 const cityIncome = [10, 22, 33, 44, 54, 64, 73, 82, 90, 98, 105, 112, 118, 124, 129, 134, 138, 142, 145, 148, 150, 150];
 const regionsInPlay = [3, 3, 4, 5, 5];
@@ -531,31 +531,30 @@ function move(G, move, playerNumber, isUndo = false) {
                             nextPlayerAuction(G);
                         }
                         else {
-                            if (G.auctionSkips == G.players.length &&
-                                G.options.variant == 'original' &&
-                                G.map.name != 'China' &&
-                                G.map.name != 'Russia') {
-                                if (G.map.name == 'Baden-Württemberg') {
-                                    // Baden-Württemberg: remove the two lowest plants when no one buys.
-                                    const removed = [];
-                                    for (let i = 0; i < 2 && G.actualMarket.length > 0; i++) {
-                                        removed.push(G.actualMarket[0].number);
-                                        G.actualMarket.shift();
-                                        addPowerPlant(G);
-                                    }
-                                    G.log.push({
-                                        type: 'event',
-                                        event: `Everyone passed, removing the two lowest numbered Power Plants (${removed.join(', ')}).`,
-                                    });
-                                }
-                                else {
-                                    G.log.push({
-                                        type: 'event',
-                                        event: `Everyone passed, removing lowest numbered Power Plant (${G.actualMarket[0].number}).`,
-                                    });
+                            if (G.auctionSkips == G.players.length && G.map.name == 'Baden-Württemberg') {
+                                // Baden-Württemberg: remove the two lowest plants when no one buys.
+                                // This applies regardless of variant.
+                                const removed = [];
+                                for (let i = 0; i < 2 && G.actualMarket.length > 0; i++) {
+                                    removed.push(G.actualMarket[0].number);
                                     G.actualMarket.shift();
                                     addPowerPlant(G);
                                 }
+                                G.log.push({
+                                    type: 'event',
+                                    event: `Everyone passed, removing the two lowest numbered Power Plants (${removed.join(', ')}).`,
+                                });
+                            }
+                            else if (G.auctionSkips == G.players.length &&
+                                G.options.variant == 'original' &&
+                                G.map.name != 'China' &&
+                                G.map.name != 'Russia') {
+                                G.log.push({
+                                    type: 'event',
+                                    event: `Everyone passed, removing lowest numbered Power Plant (${G.actualMarket[0].number}).`,
+                                });
+                                G.actualMarket.shift();
+                                addPowerPlant(G);
                             }
                             toResourcesPhase(G);
                         }

package/dist/src/maps/japan.d.ts

@@ -44,3 +44,4 @@ export declare enum Cities {
     Nagasaki = "Nagasaki"
 }
 export declare const map: GameMap;
+export declare const mapRecharged: GameMap;

package/dist/src/maps/japan.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.map = exports.Cities = exports.Regions = void 0;
+exports.mapRecharged = exports.map = exports.Cities = exports.Regions = void 0;
 var Regions;
 (function (Regions) {
     Regions["Brown"] = "brown";
@@ -54,13 +54,13 @@ exports.map = {
         { name: Cities.Sapporo, region: Regions.Brown, x: 3028, y: 982, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
         { name: Cities.Hakodate, region: Regions.Brown, x: 2622, y: 1112 },
         { name: Cities.Admori, region: Regions.Brown, x: 3818, y: 1336 },
-        { name: Cities.Morioka, region: Regions.Brown, x: 3636, y: 1646, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Morioka, region: Regions.Brown, x: 3636, y: 1646, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Akita, region: Regions.Brown, x: 3472, y: 1480 },
         { name: Cities.Sendai, region: Regions.Brown, x: 3408, y: 1886 },
         { name: Cities.Niigata, region: Regions.Green, x: 2874, y: 1628 },
         { name: Cities.Koriyama, region: Regions.Green, x: 3086, y: 1932, slotCosts: [10, 15] },
         { name: Cities.Nagano, region: Regions.Green, x: 2486, y: 1722 },
-        { name: Cities.Saitama, region: Regions.Green, x: 2450, y: 1986, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Saitama, region: Regions.Green, x: 2450, y: 1986, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Tokyo, region: Regions.Green, x: 2524, y: 2122, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
         { name: Cities.Chiba, region: Regions.Green, x: 2650, y: 2316 },
         {
@@ -72,14 +72,14 @@ exports.map = {
             stepSlots: [2, 2, 3],
         },
         { name: Cities.Kanazawa, region: Regions.Purple, x: 2207, y: 1385 },
-        { name: Cities.Toyama, region: Regions.Purple, x: 2257, y: 1595, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Toyama, region: Regions.Purple, x: 2257, y: 1595, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Kyoto, region: Regions.Purple, x: 1765, y: 1595 },
         { name: Cities.Osaka, region: Regions.Purple, x: 1517, y: 1631, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
         { name: Cities.Nagoya, region: Regions.Purple, x: 1942, y: 1751 },
         { name: Cities.Kofu, region: Regions.Purple, x: 2179, y: 1897 },
         { name: Cities.Hamamatsu, region: Regions.Purple, x: 1958, y: 2024, slotCosts: [10, 15] },
         { name: Cities.Kobe, region: Regions.Yellow, x: 1555, y: 1451, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
-        { name: Cities.Matsue, region: Regions.Yellow, x: 1457, y: 1006, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Matsue, region: Regions.Yellow, x: 1457, y: 1006, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Okayama, region: Regions.Yellow, x: 1390, y: 1286 },
         { name: Cities.Takamatsu, region: Regions.Yellow, x: 1268, y: 1507 },
         { name: Cities.Kochi, region: Regions.Yellow, x: 974, y: 1472, slotCosts: [10, 15] },
@@ -87,7 +87,7 @@ exports.map = {
         { name: Cities.Hiroshima, region: Regions.Yellow, x: 1103, y: 1078 },
         { name: Cities.Shimonoseki, region: Regions.Red, x: 856, y: 962 },
         { name: Cities.Oita, region: Regions.Red, x: 731, y: 1166, slotCosts: [10, 15] },
-        { name: Cities.Miyazaki, region: Regions.Red, x: 469, y: 1318, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Miyazaki, region: Regions.Red, x: 469, y: 1318, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Kagoshima, region: Regions.Red, x: 157, y: 1255 },
         { name: Cities.Kumamoto, region: Regions.Red, x: 457, y: 1045 },
         { name: Cities.Fukuoka, region: Regions.Red, x: 644, y: 823, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
@@ -194,3 +194,4 @@ exports.map = {
         { nodes: [Cities.Kumamoto, Cities.Fukuoka], cost: 8 },
     ],
 };
+exports.mapRecharged = { ...exports.map };

package/dist/src/maps/northerneurope.js

@@ -145,7 +145,7 @@ exports.map = {
         [Regions.Orange]: [
             // Denmark
             { number: 19, type: gamestate_1.PowerPlantType.Oil, cost: 2, citiesPowered: 4 },
-            { number: 26, type: gamestate_1.PowerPlantType.Coal, cost: 3, citiesPowered: 5 },
+            { number: 26, type: gamestate_1.PowerPlantType.Oil, cost: 3, citiesPowered: 5 },
         ],
         [Regions.Red]: [
             // Norway

package/dist/src/maps.js

@@ -70,5 +70,5 @@ exports.mapsRecharged = [
     ukireland_1.map,
     // australia,
     // china,
-    // japan,
+    japan_1.mapRecharged,
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powergrid-engine",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "An engine for Power Grid",
   "main": "dist/index.js",
   "types": "index.ts",

package/src/engine.ts

@@ -15,7 +15,7 @@ export const playerColors = ['limegreen', 'mediumorchid', 'red', 'dodgerblue', '
 
 const citiesToStep2 = [10, 7, 7, 7, 6];
 const citiesToStep2BadenWurttemberg = [9, 6, 6, 6, 5];
-const citiesToStep2UKIreland = [7, 7, 7, 7, 6];
+const citiesToStep2UKIreland = [10, 7, 7, 7, 6];
 const citiesToEndGame = [21, 17, 17, 15, 14];
 const cityIncome = [10, 22, 33, 44, 54, 64, 73, 82, 90, 98, 105, 112, 118, 124, 129, 134, 138, 142, 145, 148, 150, 150];
 const regionsInPlay = [3, 3, 4, 5, 5];
@@ -621,35 +621,34 @@ export function move(G: GameState, move: Move, playerNumber: number, isUndo = fa
                         if (G.players.some((p) => !p.skipAuction && !p.isDropped)) {
                             nextPlayerAuction(G);
                         } else {
-                            if (
+                            if (G.auctionSkips == G.players.length && G.map.name == 'Baden-Württemberg') {
+                                // Baden-Württemberg: remove the two lowest plants when no one buys.
+                                // This applies regardless of variant.
+                                const removed: number[] = [];
+                                for (let i = 0; i < 2 && G.actualMarket.length > 0; i++) {
+                                    removed.push(G.actualMarket[0].number);
+                                    G.actualMarket.shift();
+                                    addPowerPlant(G);
+                                }
+                                G.log.push({
+                                    type: 'event',
+                                    event: `Everyone passed, removing the two lowest numbered Power Plants (${removed.join(
+                                        ', '
+                                    )}).`,
+                                });
+                            } else if (
                                 G.auctionSkips == G.players.length &&
                                 G.options.variant == 'original' &&
                                 G.map.name != 'China' &&
                                 G.map.name != 'Russia'
                             ) {
-                                if (G.map.name == 'Baden-Württemberg') {
-                                    // Baden-Württemberg: remove the two lowest plants when no one buys.
-                                    const removed: number[] = [];
-                                    for (let i = 0; i < 2 && G.actualMarket.length > 0; i++) {
-                                        removed.push(G.actualMarket[0].number);
-                                        G.actualMarket.shift();
-                                        addPowerPlant(G);
-                                    }
-                                    G.log.push({
-                                        type: 'event',
-                                        event: `Everyone passed, removing the two lowest numbered Power Plants (${removed.join(
-                                            ', '
-                                        )}).`,
-                                    });
-                                } else {
-                                    G.log.push({
-                                        type: 'event',
-                                        event: `Everyone passed, removing lowest numbered Power Plant (${G.actualMarket[0].number}).`,
-                                    });
+                                G.log.push({
+                                    type: 'event',
+                                    event: `Everyone passed, removing lowest numbered Power Plant (${G.actualMarket[0].number}).`,
+                                });
 
-                                    G.actualMarket.shift();
-                                    addPowerPlant(G);
-                                }
+                                G.actualMarket.shift();
+                                addPowerPlant(G);
                             }
 
                             toResourcesPhase(G);

package/src/maps/japan.ts

@@ -53,13 +53,13 @@ export const map: GameMap = {
         { name: Cities.Sapporo, region: Regions.Brown, x: 3028, y: 982, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
         { name: Cities.Hakodate, region: Regions.Brown, x: 2622, y: 1112 },
         { name: Cities.Admori, region: Regions.Brown, x: 3818, y: 1336 },
-        { name: Cities.Morioka, region: Regions.Brown, x: 3636, y: 1646, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Morioka, region: Regions.Brown, x: 3636, y: 1646, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Akita, region: Regions.Brown, x: 3472, y: 1480 },
         { name: Cities.Sendai, region: Regions.Brown, x: 3408, y: 1886 },
         { name: Cities.Niigata, region: Regions.Green, x: 2874, y: 1628 },
         { name: Cities.Koriyama, region: Regions.Green, x: 3086, y: 1932, slotCosts: [10, 15] },
         { name: Cities.Nagano, region: Regions.Green, x: 2486, y: 1722 },
-        { name: Cities.Saitama, region: Regions.Green, x: 2450, y: 1986, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Saitama, region: Regions.Green, x: 2450, y: 1986, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Tokyo, region: Regions.Green, x: 2524, y: 2122, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
         { name: Cities.Chiba, region: Regions.Green, x: 2650, y: 2316 },
         {
@@ -71,14 +71,14 @@ export const map: GameMap = {
             stepSlots: [2, 2, 3],
         },
         { name: Cities.Kanazawa, region: Regions.Purple, x: 2207, y: 1385 },
-        { name: Cities.Toyama, region: Regions.Purple, x: 2257, y: 1595, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Toyama, region: Regions.Purple, x: 2257, y: 1595, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Kyoto, region: Regions.Purple, x: 1765, y: 1595 },
         { name: Cities.Osaka, region: Regions.Purple, x: 1517, y: 1631, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
         { name: Cities.Nagoya, region: Regions.Purple, x: 1942, y: 1751 },
         { name: Cities.Kofu, region: Regions.Purple, x: 2179, y: 1897 },
         { name: Cities.Hamamatsu, region: Regions.Purple, x: 1958, y: 2024, slotCosts: [10, 15] },
         { name: Cities.Kobe, region: Regions.Yellow, x: 1555, y: 1451, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
-        { name: Cities.Matsue, region: Regions.Yellow, x: 1457, y: 1006, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Matsue, region: Regions.Yellow, x: 1457, y: 1006, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Okayama, region: Regions.Yellow, x: 1390, y: 1286 },
         { name: Cities.Takamatsu, region: Regions.Yellow, x: 1268, y: 1507 },
         { name: Cities.Kochi, region: Regions.Yellow, x: 974, y: 1472, slotCosts: [10, 15] },
@@ -86,7 +86,7 @@ export const map: GameMap = {
         { name: Cities.Hiroshima, region: Regions.Yellow, x: 1103, y: 1078 },
         { name: Cities.Shimonoseki, region: Regions.Red, x: 856, y: 962 },
         { name: Cities.Oita, region: Regions.Red, x: 731, y: 1166, slotCosts: [10, 15] },
-        { name: Cities.Miyazaki, region: Regions.Red, x: 469, y: 1318, slotCosts: [15, 20], stepSlots: [0, 2, 2] },
+        { name: Cities.Miyazaki, region: Regions.Red, x: 469, y: 1318, slotCosts: [15, 20], stepSlots: [0, 1, 2] },
         { name: Cities.Kagoshima, region: Regions.Red, x: 157, y: 1255 },
         { name: Cities.Kumamoto, region: Regions.Red, x: 457, y: 1045 },
         { name: Cities.Fukuoka, region: Regions.Red, x: 644, y: 823, slotCosts: [10, 10, 20], stepSlots: [2, 2, 3] },
@@ -194,3 +194,5 @@ export const map: GameMap = {
         { nodes: [Cities.Kumamoto, Cities.Fukuoka], cost: 8 },
     ],
 };
+
+export const mapRecharged: GameMap = { ...map };

package/src/maps/northerneurope.ts

@@ -144,7 +144,7 @@ export const map: GameMap = {
         [Regions.Orange]: [
             // Denmark
             { number: 19, type: PowerPlantType.Oil, cost: 2, citiesPowered: 4 },
-            { number: 26, type: PowerPlantType.Coal, cost: 3, citiesPowered: 5 },
+            { number: 26, type: PowerPlantType.Oil, cost: 3, citiesPowered: 5 },
         ],
         [Regions.Red]: [
             // Norway

package/src/maps.ts

@@ -12,7 +12,7 @@ import { map as france } from './maps/france';
 import { map as germany, mapRecharged as germanyRecharged } from './maps/germany';
 import { map as indian } from './maps/indian';
 import { map as italy } from './maps/italy';
-import { map as japan } from './maps/japan';
+import { map as japan, mapRecharged as japanRecharged } from './maps/japan';
 import { map as korea } from './maps/korea';
 import { map as middleeast } from './maps/middleeast';
 import { map as northamerica } from './maps/northamerica';
@@ -173,5 +173,5 @@ export const mapsRecharged: GameMap[] = [
     ukireland,
     // australia,
     // china,
-    // japan,
+    japanRecharged,
 ];