Merge pull request #7210 from vandamm/feature/18scan-part2

[18Scan] Implementation pt.2
tobymao · Feb 19, 2022 · 261afd0 · 261afd0
2 parents c91aa66 + 9707408
commit 261afd0
Show file tree

Hide file tree

Showing 13 changed files with 450 additions and 120 deletions.
diff --git a/lib/engine/game/g_1836_jr30/game.rb b/lib/engine/game/g_1836_jr30/game.rb
@@ -453,7 +453,7 @@ def operating_round(round_num)
             Engine::Step::Route,
             Engine::Step::Dividend,
             Engine::Step::DiscardTrain,
-            G1836Jr30::Step::BuyTrain,
+            Engine::Step::BuySingleTrainOfType,
             [Engine::Step::BuyCompany, { blocks: true }],
           ], round_num: round_num)
         end

diff --git a/lib/engine/game/g_1836_jr30/step/buy_train.rb b/lib/engine/game/g_1836_jr30/step/buy_train.rb
diff --git a/lib/engine/game/g_18_scan/corporation.rb b/lib/engine/game/g_18_scan/corporation.rb
diff --git a/lib/engine/game/g_18_scan/entities.rb b/lib/engine/game/g_18_scan/entities.rb
@@ -18,7 +18,13 @@ module Entities
             abilities: [
               { type: 'no_buy' },
               { type: 'shares', shares: 'VR_1' },
-              # TODO: Two +20 bonus tokens for ferry
+              # TODO: Ferry token svg
+              {
+                type: 'assign_corporation',
+                when: 'owning_player_token',
+                count: 2,
+                owner_type: 'player',
+              },
             ],
             color: nil,
           },
@@ -36,7 +42,13 @@ module Entities
             abilities: [
               { type: 'no_buy' },
               { type: 'shares', shares: 'S&NJ_1' },
-              # TODO: +50 bonus token for Kiruna
+              # TODO: Ore mine token svg
+              {
+                type: 'assign_corporation',
+                when: 'owning_player_token',
+                count: 1,
+                owner_type: 'player',
+              },
             ],
             color: nil,
           },
@@ -57,7 +69,7 @@ module Entities
                 type: 'tile_lay',
                 hexes: %w[F3],
                 tiles: %w[403 121 584],
-                when: 'track',
+                when: 'owning_player_track',
                 owner_type: 'player',
                 count: 1,
                 consume_tile_lay: true,
@@ -111,6 +123,7 @@ module Entities
             name: 'Södra Stambanan',
             logo: '18_scan/1',
             simple_logo: '18_scan/1.alt',
+            type: 'minor',
             tokens: [0, 40],
             coordinates: 'G4',
             destination_coordinates: 'B11',
@@ -134,9 +147,10 @@ module Entities
             name: 'Nordvärsta Stambanan',
             logo: '18_scan/2',
             simple_logo: '18_scan/2.alt',
+            type: 'minor',
             tokens: [0, 40],
             coordinates: 'F11',
-            city: 0,
+            city: 1,
             destination_coordinates: 'B11',
             color: '#5b74b4',
             abilities: [
@@ -158,9 +172,10 @@ module Entities
             name: 'Västra Stambanan',
             logo: '18_scan/3',
             simple_logo: '18_scan/3.alt',
+            type: 'minor',
             tokens: [0, 40],
             coordinates: 'F11',
-            city: 1,
+            city: 0,
             destination_coordinates: 'D7',
             color: '#5b74b4',
             abilities: [
@@ -183,6 +198,7 @@ module Entities
           {
             sym: 'DSB',
             name: 'Danske Statsbaner',
+            type: 'major',
             logo: '18_scan/DSB',
             simple_logo: '18_scan/DSB.alt',
             float_percent: 20,
@@ -194,6 +210,7 @@ module Entities
           {
             sym: 'S&NJ',
             name: 'Sveriges & Norges Järnvägar',
+            type: 'major',
             logo: '18_scan/SNJ',
             simple_logo: '18_scan/SNJ.alt',
             float_percent: 20,
@@ -205,6 +222,7 @@ module Entities
           {
             sym: 'NSB',
             name: 'Norges Statsbaner',
+            type: 'major',
             logo: '18_scan/NSB',
             simple_logo: '18_scan/NSB.alt',
             float_percent: 20,
@@ -216,6 +234,7 @@ module Entities
           {
             sym: 'VR',
             name: 'Valtionraurariet',
+            type: 'major',
             logo: '18_scan/VR',
             simple_logo: '18_scan/VR.alt',
             float_percent: 20,
@@ -229,22 +248,11 @@ module Entities
             name: 'Statens Järnvägar',
             logo: '18_scan/SJ',
             simple_logo: '18_scan/SJ.alt',
+            type: 'national',
             float_percent: 50,
             floatable: false,
             tokens: [0, 100, 100, 100, 100, 100],
-            coordinates: 'F3',
             color: '#3561AE',
-            abilities: [
-              {
-                type: 'train_limit',
-                description: '+1 train limit',
-                increase: 1,
-              },
-              {
-                type: 'no_buy',
-                description: 'Cannot float before phase 5',
-              },
-            ],
           },
         ].freeze
       end