powergrid-engine 1.9.7 → 1.10.0

package/dist/src/available-moves.js

@@ -201,7 +201,26 @@ function availableMoves(G, player) {
                     ? G.map.cities.map((c) => ({ name: c.name, price: 0 }))
                     : dijkstra(G, player).map((c) => ({ name: c.name, price: c.price }));
                 toBuild.forEach((city) => {
+                    const cityData = G.map.cities.find((c) => c.name == city.name);
                     const othersCount = G.players.filter((p) => p.cities.find((c) => city.name == c.name)).length;
+                    // Transregional cities (e.g. Strasbourg on Baden-Württemberg) are only open
+                    // in Step 2 onward. The slot fee is replaced by a flat 15 (Step 2) or 20
+                    // (Step 3); the dijkstra connection cost from the player's existing network
+                    // is still paid on top.
+                    if (cityData.transregional) {
+                        if (G.step < 2) {
+                            city.price = 9999;
+                            return;
+                        }
+                        city.price += G.step == 3 ? 20 : 15;
+                        if (othersCount == G.step) {
+                            city.price = 9999;
+                        }
+                        if (player.cities.find((c) => c.name == city.name)) {
+                            city.price = 9999;
+                        }
+                        return;
+                    }
                     city.price += 10 + othersCount * 5;
                     if (othersCount == G.step) {
                         city.price = 9999;

package/dist/src/engine.js

@@ -17,6 +17,7 @@ const randomizeMap_1 = require("./randomizeMap");
 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 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];
@@ -279,7 +280,9 @@ function setup(numPlayers, { fastBid = false, map = 'USA', variant = 'original',
         seed,
         round: 1,
         auctionSkips: 0,
-        citiesToStep2: citiesToStep2[numPlayers - 2],
+        citiesToStep2: (forceMap || finalMap).name == 'Baden-Württemberg'
+            ? citiesToStep2BadenWurttemberg[numPlayers - 2]
+            : citiesToStep2[numPlayers - 2],
         citiesToEndGame: citiesToEndGame[numPlayers - 2],
         resourceResupply: [
             `[${coalResupply[p][0]}, ${oilResupply[p][0]}, ${garbageResupply[p][0]}, ${uraniumResupply[p][0]}]`,
@@ -289,7 +292,10 @@ function setup(numPlayers, { fastBid = false, map = 'USA', variant = 'original',
         paymentTable: cityIncome,
         variant,
         minimunBid: 0,
-        plantDiscountActive: variant == 'recharged' && (forceMap || finalMap).name != 'China' && (forceMap || finalMap).name != 'Russia',
+        plantDiscountActive: variant == 'recharged' &&
+            (forceMap || finalMap).name != 'China' &&
+            (forceMap || finalMap).name != 'Russia' &&
+            (forceMap || finalMap).name != 'Baden-Württemberg',
         discardSmallestPlant: false,
         cardsLeft: powerPlantsDeck.length,
         nextCardWeak: variant == 'recharged',
@@ -457,12 +463,27 @@ function move(G, move, playerNumber, isUndo = false) {
                                 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);
+                                if (G.map.name == 'Baden-Württemberg') {
+                                    // Baden-Württemberg: remove the two lowest plants
+                                    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}).`,
+                                    });
+                                    G.actualMarket.shift();
+                                    addPowerPlant(G);
+                                }
                             }
                             toResourcesPhase(G);
                         }
@@ -742,7 +763,10 @@ function move(G, move, playerNumber, isUndo = false) {
                             addPowerPlant(G);
                         }
                         G.round++;
-                        setPlayerOrder(G);
+                        if (G.map.name != 'Baden-Württemberg') {
+                            // Baden-Württemberg: player order is determined AFTER the auction phase, not before it.
+                            setPlayerOrder(G);
+                        }
                         G.players.forEach((p) => {
                             p.passed = p.isDropped;
                         });
@@ -753,7 +777,10 @@ function move(G, move, playerNumber, isUndo = false) {
                                 G.step = 3;
                             }
                             G.plantDiscountActive =
-                                G.options.variant == 'recharged' && G.map.name != 'China' && G.map.name != 'Russia';
+                                G.options.variant == 'recharged' &&
+                                    G.map.name != 'China' &&
+                                    G.map.name != 'Russia' &&
+                                    G.map.name != 'Baden-Württemberg';
                             setCurrentPlayer(G, G.playerOrder[0]);
                         }
                         else {
@@ -1023,7 +1050,8 @@ function move(G, move, playerNumber, isUndo = false) {
                 if (G.actualMarket.length > 0 &&
                     player.cities.length >= G.actualMarket[0].number &&
                     G.map.name != 'China' &&
-                    G.map.name != 'Russia') {
+                    G.map.name != 'Russia' &&
+                    G.map.name != 'Baden-Württemberg') {
                     G.actualMarket.shift();
                     addPowerPlant(G);
                 }
@@ -1699,6 +1727,10 @@ function isValid(player, powerPlants) {
     return true;
 }
 function toResourcesPhase(G) {
+    if (G.map.name == 'Baden-Württemberg') {
+        // Baden-Württemberg: player order is determined AFTER the auction phase, every round.
+        setPlayerOrder(G);
+    }
     G.players.forEach((p) => {
         p.bid = 0;
         p.passed = p.isDropped;

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

@@ -10,14 +10,14 @@ export declare enum Cities {
     Friedrichshafen = "Friedrichshafen",
     Ravensburg = "Ravensburg",
     Biberach = "Biberach",
-    Sigmarincen = "Sigmarincen",
+    Sigmarincen = "Sigmaringen",
     Konstanz = "Konstanz",
     Ulm = "Ulm",
     Augsburg = "Augsburg",
     Basel = "Basel",
-    Waldshuttiencen = "Waldshut-Tiencen",
+    Waldshuttiencen = "Waldshut-Tiengen",
     Singen = "Singen",
-    Tuttlincen = "Tuttlincen",
+    Tuttlincen = "Tuttlingen",
     Donaueschingen = "Donaueschingen",
     Freiburg = "Freiburg",
     Lorrach = "Lorrach",
@@ -25,22 +25,22 @@ export declare enum Cities {
     Schwabischhall = "Schwabisch Hall",
     Heilbronn = "Heilbronn",
     Sinsheim = "Sinsheim",
-    Heidelber = "Heidelber",
+    Heidelber = "Heidelberg",
     Mannheim = "Mannheim",
-    Luowigshafen = "Luowigshafen",
+    Luowigshafen = "Ludwigshafen",
     Nurnberg = "Nurnberg",
     Ellwangen = "Ellwangen",
-    Coppingen = "Coppingen",
-    Reutlincen = "Reutlincen",
+    Coppingen = "G\u00F6ppingen",
+    Reutlincen = "Reutlingen",
     Stuttgart = "Stuttgart",
     Ludwigsburg = "Ludwigsburg",
     Boblingen = "Boblingen",
-    Laha = "Laha",
+    Laha = "Lahr",
     Badenbaden = "Baden-Baden",
     Offenburg = "Offenburg",
     Strasbourg = "Strasbourg",
     Pforzheim = "Pforzheim",
     Rastatt = "Rastatt",
-    Karlsruhf = "Karlsruhf"
+    Karlsruhf = "Karlsruhe"
 }
 export declare const map: GameMap;

package/dist/src/maps/badenwurttemberg.js

@@ -14,14 +14,14 @@ var Cities;
     Cities["Friedrichshafen"] = "Friedrichshafen";
     Cities["Ravensburg"] = "Ravensburg";
     Cities["Biberach"] = "Biberach";
-    Cities["Sigmarincen"] = "Sigmarincen";
+    Cities["Sigmarincen"] = "Sigmaringen";
     Cities["Konstanz"] = "Konstanz";
     Cities["Ulm"] = "Ulm";
     Cities["Augsburg"] = "Augsburg";
     Cities["Basel"] = "Basel";
-    Cities["Waldshuttiencen"] = "Waldshut-Tiencen";
+    Cities["Waldshuttiencen"] = "Waldshut-Tiengen";
     Cities["Singen"] = "Singen";
-    Cities["Tuttlincen"] = "Tuttlincen";
+    Cities["Tuttlincen"] = "Tuttlingen";
     Cities["Donaueschingen"] = "Donaueschingen";
     Cities["Freiburg"] = "Freiburg";
     Cities["Lorrach"] = "Lorrach";
@@ -29,23 +29,23 @@ var Cities;
     Cities["Schwabischhall"] = "Schwabisch Hall";
     Cities["Heilbronn"] = "Heilbronn";
     Cities["Sinsheim"] = "Sinsheim";
-    Cities["Heidelber"] = "Heidelber";
+    Cities["Heidelber"] = "Heidelberg";
     Cities["Mannheim"] = "Mannheim";
-    Cities["Luowigshafen"] = "Luowigshafen";
+    Cities["Luowigshafen"] = "Ludwigshafen";
     Cities["Nurnberg"] = "Nurnberg";
     Cities["Ellwangen"] = "Ellwangen";
-    Cities["Coppingen"] = "Coppingen";
-    Cities["Reutlincen"] = "Reutlincen";
+    Cities["Coppingen"] = "G\u00F6ppingen";
+    Cities["Reutlincen"] = "Reutlingen";
     Cities["Stuttgart"] = "Stuttgart";
     Cities["Ludwigsburg"] = "Ludwigsburg";
     Cities["Boblingen"] = "Boblingen";
-    Cities["Laha"] = "Laha";
+    Cities["Laha"] = "Lahr";
     Cities["Badenbaden"] = "Baden-Baden";
     Cities["Offenburg"] = "Offenburg";
     Cities["Strasbourg"] = "Strasbourg";
     Cities["Pforzheim"] = "Pforzheim";
     Cities["Rastatt"] = "Rastatt";
-    Cities["Karlsruhf"] = "Karlsruhf";
+    Cities["Karlsruhf"] = "Karlsruhe";
 })(Cities = exports.Cities || (exports.Cities = {}));
 exports.map = {
     name: 'Baden-Württemberg',
@@ -56,8 +56,8 @@ exports.map = {
         { name: Cities.Sigmarincen, region: Regions.Purple, x: 1111, y: 1803 },
         { name: Cities.Konstanz, region: Regions.Purple, x: 1088, y: 2163 },
         { name: Cities.Ulm, region: Regions.Purple, x: 1541, y: 1499 },
-        { name: Cities.Augsburg, region: Regions.Purple, x: 1830, y: 1505 },
-        { name: Cities.Basel, region: Regions.Green, x: 103, y: 2271 },
+        { name: Cities.Augsburg, region: Regions.Purple, x: 1830, y: 1505, transregional: true },
+        { name: Cities.Basel, region: Regions.Green, x: 103, y: 2271, transregional: true },
         { name: Cities.Waldshuttiencen, region: Regions.Green, x: 502, y: 2166 },
         { name: Cities.Singen, region: Regions.Green, x: 874, y: 2084 },
         { name: Cities.Tuttlincen, region: Regions.Green, x: 870, y: 1854 },
@@ -70,8 +70,8 @@ exports.map = {
         { name: Cities.Sinsheim, region: Regions.Red, x: 920, y: 785 },
         { name: Cities.Heidelber, region: Regions.Red, x: 817, y: 660 },
         { name: Cities.Mannheim, region: Regions.Red, x: 710, y: 540 },
-        { name: Cities.Luowigshafen, region: Regions.Red, x: 579, y: 588 },
-        { name: Cities.Nurnberg, region: Regions.Blue, x: 1837, y: 771 },
+        { name: Cities.Luowigshafen, region: Regions.Red, x: 579, y: 588, transregional: true },
+        { name: Cities.Nurnberg, region: Regions.Blue, x: 1837, y: 771, transregional: true },
         { name: Cities.Ellwangen, region: Regions.Blue, x: 1637, y: 1030 },
         { name: Cities.Coppingen, region: Regions.Blue, x: 1387, y: 1233 },
         { name: Cities.Reutlincen, region: Regions.Blue, x: 1107, y: 1443 },
@@ -81,7 +81,7 @@ exports.map = {
         { name: Cities.Laha, region: Regions.Yellow, x: 296, y: 1575 },
         { name: Cities.Badenbaden, region: Regions.Yellow, x: 554, y: 1259 },
         { name: Cities.Offenburg, region: Regions.Yellow, x: 395, y: 1422 },
-        { name: Cities.Strasbourg, region: Regions.Yellow, x: 211, y: 1330 },
+        { name: Cities.Strasbourg, region: Regions.Yellow, x: 211, y: 1330, transregional: true },
         { name: Cities.Pforzheim, region: Regions.Yellow, x: 794, y: 1095 },
         { name: Cities.Rastatt, region: Regions.Yellow, x: 509, y: 1109 },
         { name: Cities.Karlsruhf, region: Regions.Yellow, x: 638, y: 974 },
@@ -160,4 +160,43 @@ exports.map = {
     layout: 'Portrait',
     adjustRatio: [0.425, 0.425],
     mapPosition: [100, -90],
+    resupply: [
+        // Coal
+        [
+            [3, 4, 3],
+            [4, 5, 3],
+            [5, 6, 4],
+            [5, 7, 5],
+            [7, 9, 6], // 6P
+        ],
+        // Oil
+        [
+            [2, 2, 4],
+            [2, 3, 4],
+            [3, 4, 5],
+            [4, 5, 6],
+            [5, 6, 7],
+        ],
+        // Garbage
+        [
+            [1, 2, 3],
+            [1, 2, 3],
+            [2, 3, 4],
+            [3, 3, 5],
+            [3, 5, 6],
+        ],
+        // Uranium
+        [
+            [1, 1, 1],
+            [1, 1, 1],
+            [1, 2, 2],
+            [2, 3, 2],
+            [2, 3, 3],
+        ],
+    ],
+    mapSpecificRules: 'Phase order change: buy power plants first, then determine player order. ' +
+        'If no power plant is sold in a round, remove the two lowest-numbered plants from the market and replace them from the draw stack. ' +
+        'Never remove a power plant whose number is equal to or lower than the number of cities any player has powered. ' +
+        'Transregional cities (e.g. Strasbourg) are only available starting in Step 2. ' +
+        'Step 2 begins when any player connects to 9 cities (2 players), 6 cities (3–5 players), or 5 cities (6 players).',
 };

package/dist/src/maps.d.ts

@@ -5,6 +5,7 @@ export interface City {
     region: string;
     x: number;
     y: number;
+    transregional?: boolean;
 }
 export interface Connection {
     nodes: string[];

package/dist/src/maps.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapsRecharged = exports.maps = void 0;
 const america_1 = require("./maps/america");
+// import { map as australia } from './maps/australia';
+const badenwurttemberg_1 = require("./maps/badenwurttemberg");
 const benelux_1 = require("./maps/benelux");
 const brazil_1 = require("./maps/brazil");
 const centraleurope_1 = require("./maps/centraleurope");
@@ -28,8 +30,8 @@ exports.maps = [
     benelux_1.map,
     russia_1.map,
     centraleurope_1.map,
+    badenwurttemberg_1.map,
     // australia,
-    // badenwurttemberg,
     // japan,
     // korea,
     // northerneurope,
@@ -50,8 +52,8 @@ exports.mapsRecharged = [
     benelux_1.map,
     russia_1.map,
     centraleurope_1.map,
+    badenwurttemberg_1.map,
     // australia,
-    // badenwurttemberg,
     // china,
     // japan,
     // korea,

package/package.json

@@ -1,11 +1,19 @@
 {
   "name": "powergrid-engine",
-  "version": "1.9.7",
+  "version": "1.10.0",
   "description": "An engine for Power Grid",
   "main": "dist/index.js",
   "types": "index.ts",
   "source": "index.ts",
-  "repository": "git@github.com:LucasAMello/powergrid-engine.git",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/boardgamers/powergrid.git",
+    "directory": "engine"
+  },
+  "homepage": "https://github.com/boardgamers/powergrid#readme",
+  "bugs": {
+    "url": "https://github.com/boardgamers/powergrid/issues"
+  },
   "publishConfig": {
     "access": "public"
   },

package/src/available-moves.ts

@@ -256,7 +256,30 @@ export function availableMoves(G: GameState, player: Player): AvailableMoves {
                         : dijkstra(G, player).map((c) => ({ name: c.name, price: c.price }));
 
                 toBuild.forEach((city) => {
+                    const cityData = G.map.cities.find((c) => c.name == city.name)!;
                     const othersCount = G.players.filter((p) => p.cities.find((c) => city.name == c.name)).length;
+
+                    // Transregional cities (e.g. Strasbourg on Baden-Württemberg) are only open
+                    // in Step 2 onward. The slot fee is replaced by a flat 15 (Step 2) or 20
+                    // (Step 3); the dijkstra connection cost from the player's existing network
+                    // is still paid on top.
+                    if (cityData.transregional) {
+                        if (G.step < 2) {
+                            city.price = 9999;
+                            return;
+                        }
+                        city.price += G.step == 3 ? 20 : 15;
+
+                        if (othersCount == G.step) {
+                            city.price = 9999;
+                        }
+
+                        if (player.cities.find((c) => c.name == city.name)) {
+                            city.price = 9999;
+                        }
+                        return;
+                    }
+
                     city.price += 10 + othersCount * 5;
 
                     if (othersCount == G.step) {

package/src/engine.ts

@@ -14,6 +14,7 @@ import { asserts, shuffle } from './utils';
 export const playerColors = ['limegreen', 'mediumorchid', 'red', 'dodgerblue', 'yellow', 'brown'];
 
 const citiesToStep2 = [10, 7, 7, 7, 6];
+const citiesToStep2BadenWurttemberg = [9, 6, 6, 6, 5];
 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];
@@ -330,7 +331,10 @@ export function setup(
         seed,
         round: 1,
         auctionSkips: 0,
-        citiesToStep2: citiesToStep2[numPlayers - 2],
+        citiesToStep2:
+            (forceMap || finalMap).name == 'Baden-Württemberg'
+                ? citiesToStep2BadenWurttemberg[numPlayers - 2]
+                : citiesToStep2[numPlayers - 2],
         citiesToEndGame: citiesToEndGame[numPlayers - 2],
         resourceResupply: [
             `[${coalResupply[p][0]}, ${oilResupply[p][0]}, ${garbageResupply[p][0]}, ${uraniumResupply[p][0]}]`,
@@ -341,7 +345,10 @@ export function setup(
         variant,
         minimunBid: 0,
         plantDiscountActive:
-            variant == 'recharged' && (forceMap || finalMap).name != 'China' && (forceMap || finalMap).name != 'Russia',
+            variant == 'recharged' &&
+            (forceMap || finalMap).name != 'China' &&
+            (forceMap || finalMap).name != 'Russia' &&
+            (forceMap || finalMap).name != 'Baden-Württemberg',
         discardSmallestPlant: false,
         cardsLeft: powerPlantsDeck.length,
         nextCardWeak: variant == 'recharged',
@@ -545,13 +552,29 @@ export function move(G: GameState, move: Move, playerNumber: number, isUndo = fa
                                 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}).`,
-                                });
+                                if (G.map.name == 'Baden-Württemberg') {
+                                    // Baden-Württemberg: remove the two lowest plants
+                                    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.actualMarket.shift();
-                                addPowerPlant(G);
+                                    G.actualMarket.shift();
+                                    addPowerPlant(G);
+                                }
                             }
 
                             toResourcesPhase(G);
@@ -882,7 +905,10 @@ export function move(G: GameState, move: Move, playerNumber: number, isUndo = fa
 
                         G.round++;
 
-                        setPlayerOrder(G);
+                        if (G.map.name != 'Baden-Württemberg') {
+                            // Baden-Württemberg: player order is determined AFTER the auction phase, not before it.
+                            setPlayerOrder(G);
+                        }
 
                         G.players.forEach((p) => {
                             p.passed = p.isDropped;
@@ -897,7 +923,10 @@ export function move(G: GameState, move: Move, playerNumber: number, isUndo = fa
                             }
 
                             G.plantDiscountActive =
-                                G.options.variant == 'recharged' && G.map.name != 'China' && G.map.name != 'Russia';
+                                G.options.variant == 'recharged' &&
+                                G.map.name != 'China' &&
+                                G.map.name != 'Russia' &&
+                                G.map.name != 'Baden-Württemberg';
                             setCurrentPlayer(G, G.playerOrder[0]);
                         } else {
                             toResourcesPhase(G);
@@ -1218,7 +1247,8 @@ export function move(G: GameState, move: Move, playerNumber: number, isUndo = fa
                     G.actualMarket.length > 0 &&
                     player.cities.length >= G.actualMarket[0].number &&
                     G.map.name != 'China' &&
-                    G.map.name != 'Russia'
+                    G.map.name != 'Russia' &&
+                    G.map.name != 'Baden-Württemberg'
                 ) {
                     G.actualMarket.shift();
                     addPowerPlant(G);
@@ -1994,6 +2024,11 @@ function isValid(player: Player, powerPlants: PowerPlant[]) {
 }
 
 function toResourcesPhase(G: GameState) {
+    if (G.map.name == 'Baden-Württemberg') {
+        // Baden-Württemberg: player order is determined AFTER the auction phase, every round.
+        setPlayerOrder(G);
+    }
+
     G.players.forEach((p) => {
         p.bid = 0;
         p.passed = p.isDropped;

package/src/maps/badenwurttemberg.ts

@@ -12,14 +12,14 @@ export enum Cities {
     Friedrichshafen = 'Friedrichshafen',
     Ravensburg = 'Ravensburg',
     Biberach = 'Biberach',
-    Sigmarincen = 'Sigmarincen',
+    Sigmarincen = 'Sigmaringen',
     Konstanz = 'Konstanz',
     Ulm = 'Ulm',
     Augsburg = 'Augsburg',
     Basel = 'Basel',
-    Waldshuttiencen = 'Waldshut-Tiencen',
+    Waldshuttiencen = 'Waldshut-Tiengen',
     Singen = 'Singen',
-    Tuttlincen = 'Tuttlincen',
+    Tuttlincen = 'Tuttlingen',
     Donaueschingen = 'Donaueschingen',
     Freiburg = 'Freiburg',
     Lorrach = 'Lorrach',
@@ -27,23 +27,23 @@ export enum Cities {
     Schwabischhall = 'Schwabisch Hall',
     Heilbronn = 'Heilbronn',
     Sinsheim = 'Sinsheim',
-    Heidelber = 'Heidelber',
+    Heidelber = 'Heidelberg',
     Mannheim = 'Mannheim',
-    Luowigshafen = 'Luowigshafen',
+    Luowigshafen = 'Ludwigshafen',
     Nurnberg = 'Nurnberg',
     Ellwangen = 'Ellwangen',
-    Coppingen = 'Coppingen',
-    Reutlincen = 'Reutlincen',
+    Coppingen = 'Göppingen',
+    Reutlincen = 'Reutlingen',
     Stuttgart = 'Stuttgart',
     Ludwigsburg = 'Ludwigsburg',
     Boblingen = 'Boblingen',
-    Laha = 'Laha',
+    Laha = 'Lahr',
     Badenbaden = 'Baden-Baden',
     Offenburg = 'Offenburg',
     Strasbourg = 'Strasbourg',
     Pforzheim = 'Pforzheim',
     Rastatt = 'Rastatt',
-    Karlsruhf = 'Karlsruhf',
+    Karlsruhf = 'Karlsruhe',
 }
 
 export const map: GameMap = {
@@ -55,8 +55,8 @@ export const map: GameMap = {
         { name: Cities.Sigmarincen, region: Regions.Purple, x: 1111, y: 1803 },
         { name: Cities.Konstanz, region: Regions.Purple, x: 1088, y: 2163 },
         { name: Cities.Ulm, region: Regions.Purple, x: 1541, y: 1499 },
-        { name: Cities.Augsburg, region: Regions.Purple, x: 1830, y: 1505 },
-        { name: Cities.Basel, region: Regions.Green, x: 103, y: 2271 },
+        { name: Cities.Augsburg, region: Regions.Purple, x: 1830, y: 1505, transregional: true },
+        { name: Cities.Basel, region: Regions.Green, x: 103, y: 2271, transregional: true },
         { name: Cities.Waldshuttiencen, region: Regions.Green, x: 502, y: 2166 },
         { name: Cities.Singen, region: Regions.Green, x: 874, y: 2084 },
         { name: Cities.Tuttlincen, region: Regions.Green, x: 870, y: 1854 },
@@ -69,8 +69,8 @@ export const map: GameMap = {
         { name: Cities.Sinsheim, region: Regions.Red, x: 920, y: 785 },
         { name: Cities.Heidelber, region: Regions.Red, x: 817, y: 660 },
         { name: Cities.Mannheim, region: Regions.Red, x: 710, y: 540 },
-        { name: Cities.Luowigshafen, region: Regions.Red, x: 579, y: 588 },
-        { name: Cities.Nurnberg, region: Regions.Blue, x: 1837, y: 771 },
+        { name: Cities.Luowigshafen, region: Regions.Red, x: 579, y: 588, transregional: true },
+        { name: Cities.Nurnberg, region: Regions.Blue, x: 1837, y: 771, transregional: true },
         { name: Cities.Ellwangen, region: Regions.Blue, x: 1637, y: 1030 },
         { name: Cities.Coppingen, region: Regions.Blue, x: 1387, y: 1233 },
         { name: Cities.Reutlincen, region: Regions.Blue, x: 1107, y: 1443 },
@@ -80,7 +80,7 @@ export const map: GameMap = {
         { name: Cities.Laha, region: Regions.Yellow, x: 296, y: 1575 },
         { name: Cities.Badenbaden, region: Regions.Yellow, x: 554, y: 1259 },
         { name: Cities.Offenburg, region: Regions.Yellow, x: 395, y: 1422 },
-        { name: Cities.Strasbourg, region: Regions.Yellow, x: 211, y: 1330 },
+        { name: Cities.Strasbourg, region: Regions.Yellow, x: 211, y: 1330, transregional: true },
         { name: Cities.Pforzheim, region: Regions.Yellow, x: 794, y: 1095 },
         { name: Cities.Rastatt, region: Regions.Yellow, x: 509, y: 1109 },
         { name: Cities.Karlsruhf, region: Regions.Yellow, x: 638, y: 974 },
@@ -159,4 +159,44 @@ export const map: GameMap = {
     layout: 'Portrait',
     adjustRatio: [0.425, 0.425],
     mapPosition: [100, -90],
+    resupply: [
+        // Coal
+        [
+            [3, 4, 3], // 2P
+            [4, 5, 3], // 3P
+            [5, 6, 4], // 4P
+            [5, 7, 5], // 5P
+            [7, 9, 6], // 6P
+        ],
+        // Oil
+        [
+            [2, 2, 4],
+            [2, 3, 4],
+            [3, 4, 5],
+            [4, 5, 6],
+            [5, 6, 7],
+        ],
+        // Garbage
+        [
+            [1, 2, 3],
+            [1, 2, 3],
+            [2, 3, 4],
+            [3, 3, 5],
+            [3, 5, 6],
+        ],
+        // Uranium
+        [
+            [1, 1, 1],
+            [1, 1, 1],
+            [1, 2, 2],
+            [2, 3, 2],
+            [2, 3, 3],
+        ],
+    ],
+    mapSpecificRules:
+        'Phase order change: buy power plants first, then determine player order. ' +
+        'If no power plant is sold in a round, remove the two lowest-numbered plants from the market and replace them from the draw stack. ' +
+        'Never remove a power plant whose number is equal to or lower than the number of cities any player has powered. ' +
+        'Transregional cities (e.g. Strasbourg) are only available starting in Step 2. ' +
+        'Step 2 begins when any player connects to 9 cities (2 players), 6 cities (3–5 players), or 5 cities (6 players).',
 };

package/src/maps.ts

@@ -1,6 +1,8 @@
 import seedrandom from 'seedrandom';
 import { PowerPlant } from './gamestate';
 import { map as america, mapRecharged as americaRecharged } from './maps/america';
+// import { map as australia } from './maps/australia';
+import { map as badenwurttemberg } from './maps/badenwurttemberg';
 import { map as benelux } from './maps/benelux';
 import { map as brazil } from './maps/brazil';
 import { map as centraleurope } from './maps/centraleurope';
@@ -13,8 +15,6 @@ import { map as middleeast } from './maps/middleeast';
 import { map as quebec } from './maps/quebec';
 import { map as russia } from './maps/russia';
 import { map as spainportugal } from './maps/spainportugal';
-// import { map as australia } from './maps/australia';
-// import { map as badenwurttemberg } from './maps/badenwurttemberg';
 // import { map as japan } from './maps/japan';
 // import { map as korea } from './maps/korea';
 // import { map as northerneurope } from './maps/northerneurope';
@@ -26,6 +26,10 @@ export interface City {
     region: string;
     x: number;
     y: number;
+    // Transregional cities (e.g. Strasbourg on Baden-Württemberg) only open in Step 2,
+    // and connecting to them costs a fixed price (transregionalConnectionCost on the GameMap)
+    // instead of the normal dijkstra path cost.
+    transregional?: boolean;
 }
 
 export interface Connection {
@@ -89,8 +93,8 @@ export const maps: GameMap[] = [
     benelux,
     russia,
     centraleurope,
+    badenwurttemberg,
     // australia,
-    // badenwurttemberg,
     // japan,
     // korea,
     // northerneurope,
@@ -112,8 +116,8 @@ export const mapsRecharged: GameMap[] = [
     benelux,
     russia,
     centraleurope,
+    badenwurttemberg,
     // australia,
-    // badenwurttemberg,
     // china,
     // japan,
     // korea,