powergrid-engine 1.11.0 → 1.12.1

package/src/maps/southafrica.ts

@@ -1,4 +1,11 @@
+// by John and Cici
+import { cloneDeep } from 'lodash';
+import seedrandom from 'seedrandom';
+import { getPowerPlant } from '../engine';
+import { PowerPlant } from '../gamestate';
+import { shuffle } from '../utils';
 import { GameMap } from './../maps';
+import { powerPlants } from './../powerPlants';
 
 export enum Regions {
     Orange = 'orange',
@@ -9,143 +16,267 @@ export enum Regions {
 }
 
 export enum Cities {
-    Zimbaswe = 'Zimbaswe',
+    Zimbabwe = 'Zimbabwe',
     Musina = 'Musina',
     Botswana = 'Botswana',
     Polokwane = 'Polokwane',
-    Pretoria1 = 'Pretoria 1',
-    Pretoria2 = 'Pretoria 2',
-    Rustenburc = 'Rustenburc',
+    PretoriaN = 'Pretoria N',
+    PretoriaS = 'Pretoria S',
+    Rustenburg = 'Rustenburg',
     Mozambique = 'Mozambique',
     Mbombela = 'Mbombela',
-    Iswaini = 'Iswaini',
+    Eswatini = 'Eswatini',
     Germiston = 'Germiston',
-    Johannesburg1 = 'Johannesburg 1',
-    Johannesburg2 = 'Johannesburg 2',
+    JohannesburgN = 'Johannesburg N',
+    JohannesburgS = 'Johannesburg S',
     Ladysmith = 'Ladysmith',
-    Abc = 'Abc',
-    Def = 'Def',
-    Ghi1 = 'Ghi 1',
-    Ghi2 = 'Ghi 2',
-    Jkl = 'Jkl',
-    Mno = 'Mno',
-    Qrs = 'Qrs',
-    Keerksorp = 'Keerksorp',
-    Weikom = 'Weikom',
-    Xuruman = 'Xuruman',
+    Newcastle = 'Newcastle',
+    Pietermaritzburg = 'Pietermaritzburg',
+    DurbanN = 'Durban N',
+    DurbanS = 'Durban S',
+    Mthatha = 'Mthatha',
+    Lesotho = 'Lesotho',
+    Bloemfontein = 'Bloemfontein',
+    Klerksdorp = 'Klerksdorp',
+    Welkom = 'Welkom',
+    Kuruman = 'Kuruman',
     Kimberly = 'Kimberly',
-    Upincion = 'Upincion',
-    Sprincbom = 'Sprincbom',
+    Upington = 'Upington',
+    Springbok = 'Springbok',
     Namibia = 'Namibia',
-    Deaar = 'Deaar',
-    Beaufortwest = 'Beaufort West',
-    Eastlondon = 'East London',
-    Portelizabeth = 'Port Elizabeth',
-    Ceorci = 'Ceorci',
-    Capetown1 = 'Capetown 1',
-    Capetown2 = 'Capetown2',
+    DeAar = 'De Aar',
+    BeaufortWest = 'Beaufort West',
+    EastLondon = 'East London',
+    PortElizabeth = 'Port Elizabeth',
+    George = 'George',
+    CapeTownN = 'Cape Town N',
+    CapeTownS = 'Cape Town S',
 }
 
 export const map: GameMap = {
     name: 'South Africa',
     cities: [
-        { name: Cities.Zimbaswe, region: Regions.Orange, x: 1060, y: 29 },
-        { name: Cities.Musina, region: Regions.Orange, x: 1027, y: 125 },
-        { name: Cities.Botswana, region: Regions.Orange, x: 665, y: 186 },
-        { name: Cities.Polokwane, region: Regions.Orange, x: 944, y: 188 },
-        { name: Cities.Pretoria1, region: Regions.Orange, x: 894, y: 271 },
-        { name: Cities.Pretoria2, region: Regions.Orange, x: 894, y: 306 },
-        { name: Cities.Rustenburc, region: Regions.Orange, x: 787, y: 327 },
-        { name: Cities.Mozambique, region: Regions.Green, x: 1184, y: 167 },
-        { name: Cities.Mbombela, region: Regions.Green, x: 1046, y: 287 },
-        { name: Cities.Iswaini, region: Regions.Green, x: 1086, y: 375 },
-        { name: Cities.Germiston, region: Regions.Green, x: 983, y: 375 },
-        { name: Cities.Johannesburg1, region: Regions.Green, x: 887, y: 365 },
-        { name: Cities.Johannesburg2, region: Regions.Green, x: 889, y: 398 },
-        { name: Cities.Ladysmith, region: Regions.Green, x: 968, y: 495 },
-        { name: Cities.Abc, region: Regions.Yellow, x: 1122, y: 521 },
-        { name: Cities.Def, region: Regions.Yellow, x: 1000, y: 558 },
-        { name: Cities.Ghi1, region: Regions.Yellow, x: 1049, y: 618 },
-        { name: Cities.Ghi2, region: Regions.Yellow, x: 1048, y: 651 },
-        { name: Cities.Jkl, region: Regions.Yellow, x: 931, y: 733 },
-        { name: Cities.Mno, region: Regions.Yellow, x: 894, y: 572 },
-        { name: Cities.Qrs, region: Regions.Yellow, x: 776, y: 556 },
-        { name: Cities.Keerksorp, region: Regions.Brown, x: 780, y: 387 },
-        { name: Cities.Weikom, region: Regions.Brown, x: 771, y: 467 },
-        { name: Cities.Xuruman, region: Regions.Brown, x: 595, y: 415 },
-        { name: Cities.Kimberly, region: Regions.Brown, x: 670, y: 541 },
-        { name: Cities.Upincion, region: Regions.Brown, x: 456, y: 492 },
-        { name: Cities.Sprincbom, region: Regions.Brown, x: 264, y: 580 },
-        { name: Cities.Namibia, region: Regions.Brown, x: 239, y: 329 },
-        { name: Cities.Deaar, region: Regions.Red, x: 641, y: 735 },
-        { name: Cities.Beaufortwest, region: Regions.Red, x: 513, y: 782 },
-        { name: Cities.Eastlondon, region: Regions.Red, x: 852, y: 833 },
-        { name: Cities.Portelizabeth, region: Regions.Red, x: 712, y: 903 },
-        { name: Cities.Ceorci, region: Regions.Red, x: 526, y: 903 },
-        { name: Cities.Capetown1, region: Regions.Red, x: 290, y: 871 },
-        { name: Cities.Capetown2, region: Regions.Red, x: 287, y: 904 },
+        { name: Cities.Zimbabwe, region: Regions.Orange, x: 903, y: 50, singleOccupancy: true },
+        { name: Cities.Musina, region: Regions.Orange, x: 874, y: 134 },
+        { name: Cities.Botswana, region: Regions.Orange, x: 560, y: 187, singleOccupancy: true },
+        { name: Cities.Polokwane, region: Regions.Orange, x: 802, y: 189 },
+        { name: Cities.PretoriaN, region: Regions.Orange, x: 759, y: 261 },
+        { name: Cities.PretoriaS, region: Regions.Orange, x: 759, y: 291 },
+        { name: Cities.Rustenburg, region: Regions.Orange, x: 666, y: 310 },
+        { name: Cities.Mozambique, region: Regions.Green, x: 1011, y: 170, singleOccupancy: true },
+        { name: Cities.Mbombela, region: Regions.Green, x: 891, y: 275 },
+        { name: Cities.Eswatini, region: Regions.Green, x: 926, y: 351, singleOccupancy: true },
+        { name: Cities.Germiston, region: Regions.Green, x: 836, y: 351 },
+        { name: Cities.JohannesburgN, region: Regions.Green, x: 753, y: 343 },
+        { name: Cities.JohannesburgS, region: Regions.Green, x: 754, y: 371 },
+        { name: Cities.Ladysmith, region: Regions.Green, x: 823, y: 456 },
+        { name: Cities.Newcastle, region: Regions.Yellow, x: 957, y: 478 },
+        { name: Cities.Pietermaritzburg, region: Regions.Yellow, x: 851, y: 511 },
+        { name: Cities.DurbanN, region: Regions.Yellow, x: 894, y: 563 },
+        { name: Cities.DurbanS, region: Regions.Yellow, x: 893, y: 592 },
+        { name: Cities.Mthatha, region: Regions.Yellow, x: 791, y: 663 },
+        { name: Cities.Lesotho, region: Regions.Yellow, x: 759, y: 523, singleOccupancy: true },
+        { name: Cities.Bloemfontein, region: Regions.Yellow, x: 656, y: 509 },
+        { name: Cities.Klerksdorp, region: Regions.Brown, x: 660, y: 362 },
+        { name: Cities.Welkom, region: Regions.Brown, x: 652, y: 431 },
+        { name: Cities.Kuruman, region: Regions.Brown, x: 499, y: 386 },
+        { name: Cities.Kimberly, region: Regions.Brown, x: 564, y: 496 },
+        { name: Cities.Upington, region: Regions.Brown, x: 378, y: 453 },
+        { name: Cities.Springbok, region: Regions.Brown, x: 211, y: 530 },
+        { name: Cities.Namibia, region: Regions.Brown, x: 189, y: 311, singleOccupancy: true },
+        { name: Cities.DeAar, region: Regions.Red, x: 539, y: 665 },
+        { name: Cities.BeaufortWest, region: Regions.Red, x: 427, y: 705 },
+        { name: Cities.EastLondon, region: Regions.Red, x: 722, y: 750 },
+        { name: Cities.PortElizabeth, region: Regions.Red, x: 600, y: 811 },
+        { name: Cities.George, region: Regions.Red, x: 439, y: 811 },
+        { name: Cities.CapeTownN, region: Regions.Red, x: 233, y: 783 },
+        { name: Cities.CapeTownS, region: Regions.Red, x: 231, y: 812 },
     ],
     connections: [
-        { nodes: [Cities.Sprincbom, Cities.Namibia], cost: 30 },
-        { nodes: [Cities.Qrs, Cities.Mno], cost: 30 },
-        { nodes: [Cities.Germiston, Cities.Iswaini], cost: 30 },
+        { nodes: [Cities.Springbok, Cities.Namibia], cost: 30 },
+        { nodes: [Cities.Bloemfontein, Cities.Lesotho], cost: 30 },
+        { nodes: [Cities.Germiston, Cities.Eswatini], cost: 30 },
         { nodes: [Cities.Mbombela, Cities.Mozambique], cost: 30 },
-        { nodes: [Cities.Botswana, Cities.Rustenburc], cost: 30 },
-        { nodes: [Cities.Zimbaswe, Cities.Musina], cost: 30 },
-        { nodes: [Cities.Capetown2, Cities.Capetown1], cost: 0 },
-        { nodes: [Cities.Capetown2, Cities.Ceorci], cost: 16 },
-        { nodes: [Cities.Ceorci, Cities.Portelizabeth], cost: 12 },
-        { nodes: [Cities.Portelizabeth, Cities.Eastlondon], cost: 13 },
-        { nodes: [Cities.Eastlondon, Cities.Jkl], cost: 8 },
-        { nodes: [Cities.Jkl, Cities.Ghi2], cost: 13 },
-        { nodes: [Cities.Ghi2, Cities.Ghi1], cost: 0 },
-        { nodes: [Cities.Ghi1, Cities.Def], cost: 3 },
-        { nodes: [Cities.Ghi1, Cities.Abc], cost: 9 },
-        { nodes: [Cities.Abc, Cities.Def], cost: 9 },
-        { nodes: [Cities.Def, Cities.Ladysmith], cost: 5 },
-        { nodes: [Cities.Ladysmith, Cities.Abc], cost: 10 },
-        { nodes: [Cities.Qrs, Cities.Jkl], cost: 18 },
-        { nodes: [Cities.Qrs, Cities.Eastlondon], cost: 22 },
-        { nodes: [Cities.Eastlondon, Cities.Deaar], cost: 22 },
-        { nodes: [Cities.Deaar, Cities.Portelizabeth], cost: 18 },
-        { nodes: [Cities.Ceorci, Cities.Deaar], cost: 17 },
-        { nodes: [Cities.Deaar, Cities.Beaufortwest], cost: 10 },
-        { nodes: [Cities.Beaufortwest, Cities.Ceorci], cost: 8 },
-        { nodes: [Cities.Beaufortwest, Cities.Capetown1], cost: 22 },
-        { nodes: [Cities.Capetown1, Cities.Sprincbom], cost: 22 },
-        { nodes: [Cities.Sprincbom, Cities.Beaufortwest], cost: 24 },
-        { nodes: [Cities.Deaar, Cities.Sprincbom], cost: 26 },
-        { nodes: [Cities.Sprincbom, Cities.Upincion], cost: 16 },
-        { nodes: [Cities.Upincion, Cities.Deaar], cost: 16 },
-        { nodes: [Cities.Deaar, Cities.Qrs], cost: 13 },
-        { nodes: [Cities.Qrs, Cities.Kimberly], cost: 6 },
-        { nodes: [Cities.Kimberly, Cities.Deaar], cost: 10 },
-        { nodes: [Cities.Kimberly, Cities.Upincion], cost: 14 },
-        { nodes: [Cities.Kimberly, Cities.Weikom], cost: 9 },
-        { nodes: [Cities.Weikom, Cities.Qrs], cost: 6 },
-        { nodes: [Cities.Qrs, Cities.Ladysmith], cost: 19 },
-        { nodes: [Cities.Jkl, Cities.Def], cost: 12 },
-        { nodes: [Cities.Upincion, Cities.Xuruman], cost: 11 },
+        { nodes: [Cities.Botswana, Cities.Rustenburg], cost: 30 },
+        { nodes: [Cities.Zimbabwe, Cities.Musina], cost: 30 },
+        { nodes: [Cities.CapeTownS, Cities.CapeTownN], cost: 0 },
+        { nodes: [Cities.CapeTownS, Cities.George], cost: 16 },
+        { nodes: [Cities.George, Cities.PortElizabeth], cost: 12 },
+        { nodes: [Cities.PortElizabeth, Cities.EastLondon], cost: 13 },
+        { nodes: [Cities.EastLondon, Cities.Mthatha], cost: 8 },
+        { nodes: [Cities.Mthatha, Cities.DurbanS], cost: 13 },
+        { nodes: [Cities.DurbanS, Cities.DurbanN], cost: 0 },
+        { nodes: [Cities.DurbanN, Cities.Pietermaritzburg], cost: 3 },
+        { nodes: [Cities.DurbanN, Cities.Newcastle], cost: 9 },
+        { nodes: [Cities.Newcastle, Cities.Pietermaritzburg], cost: 9 },
+        { nodes: [Cities.Pietermaritzburg, Cities.Ladysmith], cost: 5 },
+        { nodes: [Cities.Ladysmith, Cities.Newcastle], cost: 10 },
+        { nodes: [Cities.Bloemfontein, Cities.Mthatha], cost: 18 },
+        { nodes: [Cities.Bloemfontein, Cities.EastLondon], cost: 22 },
+        { nodes: [Cities.EastLondon, Cities.DeAar], cost: 22 },
+        { nodes: [Cities.DeAar, Cities.PortElizabeth], cost: 18 },
+        { nodes: [Cities.George, Cities.DeAar], cost: 17 },
+        { nodes: [Cities.DeAar, Cities.BeaufortWest], cost: 10 },
+        { nodes: [Cities.BeaufortWest, Cities.George], cost: 8 },
+        { nodes: [Cities.BeaufortWest, Cities.CapeTownN], cost: 22 },
+        { nodes: [Cities.CapeTownN, Cities.Springbok], cost: 22 },
+        { nodes: [Cities.Springbok, Cities.BeaufortWest], cost: 24 },
+        { nodes: [Cities.DeAar, Cities.Springbok], cost: 26 },
+        { nodes: [Cities.Springbok, Cities.Upington], cost: 16 },
+        { nodes: [Cities.Upington, Cities.DeAar], cost: 16 },
+        { nodes: [Cities.DeAar, Cities.Bloemfontein], cost: 13 },
+        { nodes: [Cities.Bloemfontein, Cities.Kimberly], cost: 6 },
+        { nodes: [Cities.Kimberly, Cities.DeAar], cost: 10 },
+        { nodes: [Cities.Kimberly, Cities.Upington], cost: 14 },
+        { nodes: [Cities.Kimberly, Cities.Welkom], cost: 9 },
+        { nodes: [Cities.Welkom, Cities.Bloemfontein], cost: 6 },
+        { nodes: [Cities.Bloemfontein, Cities.Ladysmith], cost: 19 },
+        { nodes: [Cities.Mthatha, Cities.Pietermaritzburg], cost: 12 },
+        { nodes: [Cities.Upington, Cities.Kuruman], cost: 11 },
         { nodes: [Cities.Musina, Cities.Polokwane], cost: 8 },
-        { nodes: [Cities.Polokwane, Cities.Pretoria1], cost: 11 },
-        { nodes: [Cities.Pretoria1, Cities.Pretoria2], cost: 0 },
-        { nodes: [Cities.Pretoria2, Cities.Johannesburg1], cost: 2 },
-        { nodes: [Cities.Johannesburg1, Cities.Johannesburg2], cost: 0 },
-        { nodes: [Cities.Johannesburg2, Cities.Germiston], cost: 1 },
-        { nodes: [Cities.Johannesburg1, Cities.Mbombela], cost: 13 },
+        { nodes: [Cities.Polokwane, Cities.PretoriaN], cost: 11 },
+        { nodes: [Cities.PretoriaN, Cities.PretoriaS], cost: 0 },
+        { nodes: [Cities.PretoriaS, Cities.JohannesburgN], cost: 2 },
+        { nodes: [Cities.JohannesburgN, Cities.JohannesburgS], cost: 0 },
+        { nodes: [Cities.JohannesburgS, Cities.Germiston], cost: 1 },
+        { nodes: [Cities.JohannesburgN, Cities.Mbombela], cost: 13 },
         { nodes: [Cities.Mbombela, Cities.Germiston], cost: 13 },
-        { nodes: [Cities.Pretoria1, Cities.Mbombela], cost: 13 },
+        { nodes: [Cities.PretoriaN, Cities.Mbombela], cost: 13 },
         { nodes: [Cities.Mbombela, Cities.Polokwane], cost: 10 },
         { nodes: [Cities.Musina, Cities.Mbombela], cost: 15 },
-        { nodes: [Cities.Pretoria1, Cities.Rustenburc], cost: 4 },
-        { nodes: [Cities.Rustenburc, Cities.Johannesburg1], cost: 4 },
-        { nodes: [Cities.Johannesburg1, Cities.Keerksorp], cost: 7 },
-        { nodes: [Cities.Keerksorp, Cities.Weikom], cost: 5 },
-        { nodes: [Cities.Qrs, Cities.Johannesburg2], cost: 16 },
-        { nodes: [Cities.Xuruman, Cities.Rustenburc], cost: 18 },
-        { nodes: [Cities.Keerksorp, Cities.Xuruman], cost: 12 },
-        { nodes: [Cities.Xuruman, Cities.Kimberly], cost: 8 },
-        { nodes: [Cities.Johannesburg2, Cities.Ladysmith], cost: 13 },
+        { nodes: [Cities.PretoriaN, Cities.Rustenburg], cost: 4 },
+        { nodes: [Cities.Rustenburg, Cities.JohannesburgN], cost: 4 },
+        { nodes: [Cities.JohannesburgN, Cities.Klerksdorp], cost: 7 },
+        { nodes: [Cities.Klerksdorp, Cities.Welkom], cost: 5 },
+        { nodes: [Cities.Bloemfontein, Cities.JohannesburgS], cost: 16 },
+        { nodes: [Cities.Kuruman, Cities.Rustenburg], cost: 18 },
+        { nodes: [Cities.Klerksdorp, Cities.Kuruman], cost: 12 },
+        { nodes: [Cities.Kuruman, Cities.Kimberly], cost: 8 },
+        { nodes: [Cities.JohannesburgS, Cities.Ladysmith], cost: 13 },
         { nodes: [Cities.Ladysmith, Cities.Germiston], cost: 13 },
     ],
+
+    // Resupply per South Africa refill summary cards. Indexed as
+    // [resource][playerCount-2][step-1]. Note: 2P and 3P rows are intentionally
+    // identical on the printed cards (same pattern as North America).
+    resupply: [
+        // Coal
+        [
+            [4, 7, 5], // 2P
+            [4, 7, 5], // 3P
+            [5, 8, 6], // 4P
+            [6, 9, 7], // 5P
+            [7, 10, 8], // 6P
+        ],
+        // Oil
+        [
+            [1, 2, 1], // 2P
+            [1, 2, 1], // 3P
+            [2, 3, 2], // 4P
+            [2, 4, 3], // 5P
+            [4, 5, 4], // 6P
+        ],
+        // Garbage
+        [
+            [1, 3, 3], // 2P
+            [1, 3, 3], // 3P
+            [2, 4, 4], // 4P
+            [3, 4, 5], // 5P
+            [3, 6, 6], // 6P
+        ],
+        // Uranium
+        [
+            [1, 1, 2], // 2P
+            [1, 1, 2], // 3P
+            [2, 2, 3], // 4P
+            [2, 3, 3], // 5P
+            [2, 3, 4], // 6P
+        ],
+    ],
+    layout: 'Landscape',
+    // Cities authored at photo-coord scale (~1200x863). First-pass fit into the
+    // standard 1500x800 landscape viewBox — tune after first render.
+    adjustRatio: [0.9, 0.75],
+    mapPosition: [70, 50],
+    mapRotation: 0,
+    // SA uses the engine default 8-price market (24 coal / 24 oil / 24 garbage
+    // slots + 12 uranium 1–8 + 10/12/14/16), so we don't override coal/oil/
+    // garbage/uranium Prices. Only the starting fill differs:
+    //   coal    1–8 full     = 24
+    //   oil     4–8          = 15
+    //   garbage 5–8          = 12
+    //   uranium 12–16 only   = 3
+    startingResources: [24, 15, 12, 3],
+    // Total cubes in the game (used cubes return here; refill draws from here).
+    // For SA, USED coal goes to the separate coalStorage pool instead — see
+    // GameState.coalStorage and the UsePowerPlant/resupply branches in engine.ts.
+    startingSupply: [24, 24, 24, 12],
+    // SA removes oil power plant 07 from the deck; the rest follows the standard
+    // recharged/original deck setup. With 07 gone the "starter pool" is one
+    // plant shorter (12 instead of 13 for recharged; future market shifts to
+    // 8/9/10/11 instead of 7/8/9/10 for original).
+    setupDeck(numPlayers: number, variant: string, rng: seedrandom.prng) {
+        let powerPlantsDeck = cloneDeep(powerPlants).filter((pp) => pp.number !== 7);
+        let actualMarket: PowerPlant[];
+        let futureMarket: PowerPlant[];
+
+        if (variant == 'original') {
+            powerPlantsDeck = powerPlantsDeck.slice(8);
+            const powerPlant13Idx = powerPlantsDeck.findIndex((pp) => pp.number == 13);
+            const powerPlant13 = powerPlantsDeck.splice(powerPlant13Idx, 1)[0];
+            const step3 = powerPlantsDeck.pop()!;
+
+            powerPlantsDeck = shuffle(powerPlantsDeck, rng() + '');
+            if (numPlayers == 2 || numPlayers == 3) {
+                powerPlantsDeck = powerPlantsDeck.slice(8);
+            } else if (numPlayers == 4) {
+                powerPlantsDeck = powerPlantsDeck.slice(4);
+            }
+
+            powerPlantsDeck.unshift(powerPlant13);
+            powerPlantsDeck.push(step3);
+
+            actualMarket = [getPowerPlant(3), getPowerPlant(4), getPowerPlant(5), getPowerPlant(6)];
+            futureMarket = [getPowerPlant(8), getPowerPlant(9), getPowerPlant(10), getPowerPlant(11)];
+        } else {
+            let initialPowerPlants = shuffle(powerPlantsDeck.splice(0, 12), rng() + '');
+            let initialPlantMarket = initialPowerPlants.splice(0, 8);
+            initialPlantMarket = initialPlantMarket.sort((a, b) => a.number - b.number);
+            actualMarket = initialPlantMarket.slice(0, 4);
+            futureMarket = initialPlantMarket.slice(4);
+
+            const first = initialPowerPlants.shift()!;
+            const step3 = powerPlantsDeck.pop()!;
+
+            powerPlantsDeck = shuffle(powerPlantsDeck, rng() + '');
+            if (numPlayers == 2 || numPlayers == 3) {
+                initialPowerPlants = initialPowerPlants.slice(2);
+                powerPlantsDeck = shuffle(powerPlantsDeck.slice(6).concat(initialPowerPlants), rng() + '');
+            } else if (numPlayers == 4) {
+                initialPowerPlants = initialPowerPlants.slice(1);
+                powerPlantsDeck = shuffle(powerPlantsDeck.slice(3).concat(initialPowerPlants), rng() + '');
+            } else {
+                powerPlantsDeck = shuffle(powerPlantsDeck.concat(initialPowerPlants), rng() + '');
+            }
+
+            powerPlantsDeck.unshift(first);
+            powerPlantsDeck.push(step3);
+        }
+
+        return { actualMarket, futureMarket, powerPlantsDeck };
+    },
+    mapSpecificRules:
+        'Coal storage: there is a separate storage space below the resource market, ' +
+        'empty at game start. Coal used to power plants returns to this storage space ' +
+        '(not the main supply). The resource-market refill draws coal from storage ' +
+        'first, then from the main supply. Players can always buy coal for $8 from ' +
+        'the storage space (in addition to the standard market price). ' +
+        'Metropolises: Cape Town, Durban, Johannesburg and Pretoria each consist of ' +
+        'two cities (N and S) connected by a 0-cost edge. ' +
+        'Cross-border connections: the six 30-Elektro connections to neighboring ' +
+        'countries (Namibia, Botswana, Zimbabwe, Mozambique, Eswatini, Lesotho) are ' +
+        'available from the start of the game. The 30 Elektro is the complete cost ' +
+        '— no house-base cost is added on top. Only a single player can build on ' +
+        'each cross-border space (cap of 1 instead of the standard 3). ' +
+        'Power plant 07 is removed from the deck.',
 };

package/src/maps/ukireland.ts

@@ -1,4 +1,11 @@
+// by John and Cici
+import { cloneDeep } from 'lodash';
+import seedrandom from 'seedrandom';
+import { getPowerPlant } from '../engine';
+import { PowerPlant } from '../gamestate';
+import { shuffle } from '../utils';
 import { GameMap } from './../maps';
+import { powerPlants } from './../powerPlants';
 
 export enum Regions {
     Red = 'red',
@@ -55,46 +62,46 @@ export enum Cities {
 export const map: GameMap = {
     name: 'UK & Ireland',
     cities: [
-        { name: Cities.Norwich, region: Regions.Red, x: 646, y: 702 },
-        { name: Cities.London1, region: Regions.Red, x: 554, y: 756 },
-        { name: Cities.London2, region: Regions.Red, x: 550, y: 780 },
-        { name: Cities.Brighton, region: Regions.Red, x: 537, y: 837 },
-        { name: Cities.Southampton, region: Regions.Red, x: 451, y: 805 },
-        { name: Cities.Plymouth, region: Regions.Red, x: 312, y: 814 },
-        { name: Cities.Leicester, region: Regions.Red, x: 540, y: 680 },
-        { name: Cities.Bristol, region: Regions.Red, x: 425, y: 762 },
-        { name: Cities.Newcastleupontyne, region: Regions.Pink, x: 550, y: 414 },
-        { name: Cities.Leeds, region: Regions.Pink, x: 559, y: 541 },
-        { name: Cities.Sheffield, region: Regions.Pink, x: 530, y: 590 },
-        { name: Cities.Nottingham, region: Regions.Pink, x: 531, y: 632 },
-        { name: Cities.Birmingham, region: Regions.Pink, x: 465, y: 663 },
-        { name: Cities.Manchester, region: Regions.Pink, x: 479, y: 543 },
-        { name: Cities.Liverpool, region: Regions.Pink, x: 433, y: 576 },
-        { name: Cities.Newportcasnewydd, region: Regions.Yellow, x: 425, y: 722 },
-        { name: Cities.Bangor, region: Regions.Yellow, x: 348, y: 574 },
-        { name: Cities.Aberystwyth, region: Regions.Yellow, x: 357, y: 639 },
-        { name: Cities.Swanseaabertawe, region: Regions.Yellow, x: 346, y: 706 },
-        { name: Cities.Cardiffcaerdydd, region: Regions.Yellow, x: 357, y: 741 },
-        { name: Cities.Haverfordwesthwlffordd, region: Regions.Yellow, x: 303, y: 673 },
-        { name: Cities.Invernessinbhirnis, region: Regions.Brown, x: 479, y: 208 },
-        { name: Cities.Aberdeenobardheathain, region: Regions.Brown, x: 588, y: 245 },
-        { name: Cities.Dundeedundeach, region: Regions.Brown, x: 552, y: 286 },
-        { name: Cities.Perthpeairt, region: Regions.Brown, x: 489, y: 307 },
-        { name: Cities.Edinburgh, region: Regions.Brown, x: 494, y: 350 },
-        { name: Cities.Dumfries, region: Regions.Brown, x: 441, y: 417 },
-        { name: Cities.Glasgow, region: Regions.Brown, x: 422, y: 335 },
-        { name: Cities.Coleraine, region: Regions.Orange, x: 330, y: 367 },
-        { name: Cities.Derry, region: Regions.Orange, x: 256, y: 362 },
-        { name: Cities.Belfast, region: Regions.Orange, x: 342, y: 421 },
-        { name: Cities.Newry, region: Regions.Orange, x: 298, y: 462 },
-        { name: Cities.Omagh, region: Regions.Orange, x: 260, y: 403 },
-        { name: Cities.Sligo, region: Regions.Green, x: 181, y: 411 },
-        { name: Cities.Dublin, region: Regions.Green, x: 274, y: 530 },
-        { name: Cities.Waterford, region: Regions.Green, x: 210, y: 611 },
-        { name: Cities.Cork, region: Regions.Green, x: 114, y: 626 },
-        { name: Cities.Athlone, region: Regions.Green, x: 200, y: 489 },
-        { name: Cities.Galway, region: Regions.Green, x: 112, y: 486 },
-        { name: Cities.Limerick, region: Regions.Green, x: 122, y: 546 },
+        { name: Cities.Norwich, region: Regions.Red, island: 'gb', x: 646, y: 702 },
+        { name: Cities.London1, region: Regions.Red, island: 'gb', x: 554, y: 756 },
+        { name: Cities.London2, region: Regions.Red, island: 'gb', x: 550, y: 780 },
+        { name: Cities.Brighton, region: Regions.Red, island: 'gb', x: 537, y: 837 },
+        { name: Cities.Southampton, region: Regions.Red, island: 'gb', x: 451, y: 805 },
+        { name: Cities.Plymouth, region: Regions.Red, island: 'gb', x: 312, y: 814 },
+        { name: Cities.Leicester, region: Regions.Red, island: 'gb', x: 540, y: 680 },
+        { name: Cities.Bristol, region: Regions.Red, island: 'gb', x: 425, y: 762 },
+        { name: Cities.Newcastleupontyne, region: Regions.Pink, island: 'gb', x: 550, y: 414 },
+        { name: Cities.Leeds, region: Regions.Pink, island: 'gb', x: 559, y: 541 },
+        { name: Cities.Sheffield, region: Regions.Pink, island: 'gb', x: 530, y: 590 },
+        { name: Cities.Nottingham, region: Regions.Pink, island: 'gb', x: 531, y: 632 },
+        { name: Cities.Birmingham, region: Regions.Pink, island: 'gb', x: 465, y: 663 },
+        { name: Cities.Manchester, region: Regions.Pink, island: 'gb', x: 479, y: 543 },
+        { name: Cities.Liverpool, region: Regions.Pink, island: 'gb', x: 433, y: 576 },
+        { name: Cities.Newportcasnewydd, region: Regions.Yellow, island: 'gb', x: 425, y: 722 },
+        { name: Cities.Bangor, region: Regions.Yellow, island: 'gb', x: 348, y: 574 },
+        { name: Cities.Aberystwyth, region: Regions.Yellow, island: 'gb', x: 357, y: 639 },
+        { name: Cities.Swanseaabertawe, region: Regions.Yellow, island: 'gb', x: 346, y: 706 },
+        { name: Cities.Cardiffcaerdydd, region: Regions.Yellow, island: 'gb', x: 357, y: 741 },
+        { name: Cities.Haverfordwesthwlffordd, region: Regions.Yellow, island: 'gb', x: 303, y: 673 },
+        { name: Cities.Invernessinbhirnis, region: Regions.Brown, island: 'gb', x: 479, y: 208 },
+        { name: Cities.Aberdeenobardheathain, region: Regions.Brown, island: 'gb', x: 588, y: 245 },
+        { name: Cities.Dundeedundeach, region: Regions.Brown, island: 'gb', x: 552, y: 286 },
+        { name: Cities.Perthpeairt, region: Regions.Brown, island: 'gb', x: 489, y: 307 },
+        { name: Cities.Edinburgh, region: Regions.Brown, island: 'gb', x: 494, y: 350 },
+        { name: Cities.Dumfries, region: Regions.Brown, island: 'gb', x: 441, y: 417 },
+        { name: Cities.Glasgow, region: Regions.Brown, island: 'gb', x: 422, y: 335 },
+        { name: Cities.Coleraine, region: Regions.Orange, island: 'ie', x: 330, y: 367 },
+        { name: Cities.Derry, region: Regions.Orange, island: 'ie', x: 256, y: 362 },
+        { name: Cities.Belfast, region: Regions.Orange, island: 'ie', x: 342, y: 421 },
+        { name: Cities.Newry, region: Regions.Orange, island: 'ie', x: 298, y: 462 },
+        { name: Cities.Omagh, region: Regions.Orange, island: 'ie', x: 260, y: 403 },
+        { name: Cities.Sligo, region: Regions.Green, island: 'ie', x: 181, y: 411 },
+        { name: Cities.Dublin, region: Regions.Green, island: 'ie', x: 274, y: 530 },
+        { name: Cities.Waterford, region: Regions.Green, island: 'ie', x: 210, y: 611 },
+        { name: Cities.Cork, region: Regions.Green, island: 'ie', x: 114, y: 626 },
+        { name: Cities.Athlone, region: Regions.Green, island: 'ie', x: 200, y: 489 },
+        { name: Cities.Galway, region: Regions.Green, island: 'ie', x: 112, y: 486 },
+        { name: Cities.Limerick, region: Regions.Green, island: 'ie', x: 122, y: 546 },
     ],
     connections: [
         { nodes: [Cities.Nottingham, Cities.Leicester], cost: 4 },
@@ -172,4 +179,127 @@ export const map: GameMap = {
         { nodes: [Cities.Omagh, Cities.Derry], cost: 5 },
         { nodes: [Cities.Omagh, Cities.Sligo], cost: 10 },
     ],
+    layout: 'Portrait',
+    // Stub coords are at photo scale (x range ~110-650, y range ~200-840 — taller
+    // than wide). First-pass fit into the default portrait viewBox — tune after
+    // first render against the printed board.
+    adjustRatio: [1.1, 1.1],
+    mapPosition: [10, -75],
+    mapRotation: 0,
+    // Resupply table read from the printed UK & Ireland refill summary cards.
+    // Indexed [resource][playerCount-2][step-1]. Note: 2P and 3P rows are NOT
+    // identical on this map (unlike NA / SA), except for the Garbage row.
+    resupply: [
+        // Coal
+        [
+            [3, 4, 3], // 2P
+            [3, 5, 3], // 3P
+            [4, 6, 4], // 4P
+            [4, 7, 5], // 5P
+            [6, 8, 6], // 6P
+        ],
+        // Oil
+        [
+            [2, 3, 2], // 2P
+            [2, 4, 2], // 3P
+            [3, 5, 3], // 4P
+            [4, 6, 4], // 5P
+            [5, 7, 5], // 6P
+        ],
+        // Garbage
+        [
+            [1, 2, 2], // 2P
+            [1, 2, 2], // 3P
+            [2, 3, 3], // 4P
+            [3, 3, 5], // 5P
+            [3, 5, 5], // 6P
+        ],
+        // Uranium
+        [
+            [1, 1, 1], // 2P
+            [1, 2, 1], // 3P
+            [1, 3, 1], // 4P
+            [2, 4, 2], // 5P
+            [2, 4, 3], // 6P
+        ],
+    ],
+    // Standard 8-price market (no overrides). Starting fill from the rulebook:
+    //   coal    1-8 full = 24
+    //   oil     3-8      = 18
+    //   garbage 5-8      = 12
+    //   uranium none     = 0
+    startingResources: [24, 18, 12, 0],
+    startingSupply: [24, 24, 24, 12],
+    // Two-network mechanic: 20 Elektro surcharge to start a network on an
+    // island where the player has no city. The cross-island build skips the
+    // dijkstra path (there is no sea edge) and pays house base + 20.
+    crossIslandSurcharge: 20,
+    // Step 3 is placed 3rd from last in the deck (two plants below it) so Step
+    // 3 starts earlier than on most maps. Otherwise standard recharged/original
+    // deck prep.
+    setupDeck(numPlayers: number, variant: string, rng: seedrandom.prng) {
+        let powerPlantsDeck = cloneDeep(powerPlants);
+        let actualMarket: PowerPlant[];
+        let futureMarket: PowerPlant[];
+
+        if (variant == 'original') {
+            powerPlantsDeck = powerPlantsDeck.slice(8);
+            const powerPlant13Idx = powerPlantsDeck.findIndex((pp) => pp.number == 13);
+            const powerPlant13 = powerPlantsDeck.splice(powerPlant13Idx, 1)[0];
+            const step3 = powerPlantsDeck.pop()!;
+
+            powerPlantsDeck = shuffle(powerPlantsDeck, rng() + '');
+            if (numPlayers == 2 || numPlayers == 3) {
+                powerPlantsDeck = powerPlantsDeck.slice(8);
+            } else if (numPlayers == 4) {
+                powerPlantsDeck = powerPlantsDeck.slice(4);
+            }
+
+            powerPlantsDeck.unshift(powerPlant13);
+            // UK&I: Step 3 sits 3rd from last (two plants below it).
+            powerPlantsDeck.splice(powerPlantsDeck.length - 2, 0, step3);
+
+            actualMarket = [getPowerPlant(3), getPowerPlant(4), getPowerPlant(5), getPowerPlant(6)];
+            futureMarket = [getPowerPlant(7), getPowerPlant(8), getPowerPlant(9), getPowerPlant(10)];
+        } else {
+            let initialPowerPlants = shuffle(powerPlantsDeck.splice(0, 13), rng() + '');
+            let initialPlantMarket = initialPowerPlants.splice(0, 8);
+            initialPlantMarket = initialPlantMarket.sort((a, b) => a.number - b.number);
+            actualMarket = initialPlantMarket.slice(0, 4);
+            futureMarket = initialPlantMarket.slice(4);
+
+            const first = initialPowerPlants.shift()!;
+            const step3 = powerPlantsDeck.pop()!;
+
+            powerPlantsDeck = shuffle(powerPlantsDeck, rng() + '');
+            if (numPlayers == 2 || numPlayers == 3) {
+                initialPowerPlants = initialPowerPlants.slice(2);
+                powerPlantsDeck = shuffle(powerPlantsDeck.slice(6).concat(initialPowerPlants), rng() + '');
+            } else if (numPlayers == 4) {
+                initialPowerPlants = initialPowerPlants.slice(1);
+                powerPlantsDeck = shuffle(powerPlantsDeck.slice(3).concat(initialPowerPlants), rng() + '');
+            } else {
+                powerPlantsDeck = shuffle(powerPlantsDeck.concat(initialPowerPlants), rng() + '');
+            }
+
+            powerPlantsDeck.unshift(first);
+            // UK&I: Step 3 sits 3rd from last (two plants below it). The engine's
+            // standard Step 3 trigger already reshuffles plants below + discard
+            // into the new face-down deck, so we only need the placement here.
+            powerPlantsDeck.splice(powerPlantsDeck.length - 2, 0, step3);
+        }
+
+        return { actualMarket, futureMarket, powerPlantsDeck };
+    },
+    mapSpecificRules:
+        'Two networks: Ireland (Green and Orange regions) and Great Britain ' +
+        '(Red, Pink, Yellow, Brown) have no sea connection. A player may run ' +
+        'one network on each island. Starting a second network on the other ' +
+        'island costs an extra 20 Elektro on top of the normal first-house cost. ' +
+        'Nuclear restriction: a player whose network is entirely in the Republic ' +
+        'of Ireland (Green region) cannot bid on or auction a nuclear power plant ' +
+        'until they build a city in Scotland, Wales, England, or Northern Ireland. ' +
+        'Early Step 3: the Step 3 card is placed 3rd from last in the deck (two ' +
+        'plants below it). Step 2 begins when a player connects their 7th city ' +
+        '(6th for 6 players).',
 };