Merge pull request #12391 from perwestling/fix/12330

Minor visual improvements in 1824 and 1824 Cisleithania

Author: ollybh

lib/engine/game/g_1824/game.rb

@@ -678,6 +678,12 @@ def place_home_token(corporation)
           super
         end
 
+        # 1837 uses a black token, we want to have a gray one
+        def blocking_token
+          @blocker ||= Corporation.new(sym: 'B', name: '', logo: '1824/blocking', tokens: [])
+          Token.new(@blocker)
+        end
+
         # 1837 use as special functionality for token graphs so we need to use base functionality
         def token_graph_for_entity(_entity)
           @graph

lib/engine/game/g_1824/map.rb

@@ -205,18 +205,18 @@ module Map
                      'path=a:1,b:_0,terminal:1;border=edge:0'
         BUKAREST_2 = 'offboard=revenue:yellow_10|green_30|brown_40|gray_50,groups:Bukarest;path=a:2,b:_0,terminal:1;'\
                      'border=edge:3'
-        SARAJEVO = 'city=revenue:yellow_10|green_10|brown_50|gray_50;'\
+        SARAJEVO = 'city=revenue:yellow_10|brown_50;'\
                    'path=a:1,b:_0,lanes:2,terminal:1;path=a:2,b:_0,terminal:1;border=edge:1;'\
                    'path=a:3,b:_0,terminal:1;path=a:4,b:_0,lanes:2,terminal:1;border=edge:4'
-        SARAJEVO_W = 'path=a:2,b:4,b_lane:2.0;path=a:3,b:4,b_lane:2.1;border=edge:4;border=edge:5'
-        SARAJEVO_E = 'path=a:2,b:1,b_lane:2.0;path=a:3,b:1,b_lane:2.1;border=edge:0;border=edge:1'
+        SARAJEVO_W = 'path=a:2,b:4,b_lane:2.0;path=a:3,b:4,b_lane:2.1;border=edge:4'
+        SARAJEVO_E = 'path=a:2,b:1,b_lane:2.0;path=a:3,b:1,b_lane:2.1;border=edge:1'
         WIEN = 'city=revenue:30;path=a:0,b:_0;city=revenue:30;'\
                'path=a:1,b:_1;city=revenue:30;path=a:2,b:_2;upgrade=cost:20,terrain:water;label=W'
 
-        MINE_1 = 'city=revenue:yellow_10|green_10|brown_40|gray_40;path=a:2,b:_0,terminal:1;path=a:3,b:_0,terminal:1'
-        MINE_2 = 'city=revenue:yellow_10|green_10|brown_40|gray_40;path=a:1,b:_0,terminal:1;path=a:5,b:_0,terminal:1'
-        MINE_3 = 'city=revenue:yellow_20|green_20|brown_60|gray_60;path=a:1,b:_0,terminal:1;path=a:5,b:_0,terminal:1'
-        MINE_4 = 'city=revenue:yellow_20|green_20|brown_60|gray_60;path=a:1,b:_0,terminal:1;path=a:3,b:_0,terminal:1'
+        MINE_1 = 'city=revenue:yellow_10|brown_40;path=a:2,b:_0,terminal:1;path=a:3,b:_0,terminal:1'
+        MINE_2 = 'city=revenue:yellow_10|brown_40,loc:0;path=a:1,b:_0,terminal:1;path=a:5,b:_0,terminal:1'
+        MINE_3 = 'city=revenue:yellow_20|brown_60,loc:0;path=a:1,b:_0,terminal:1;path=a:5,b:_0,terminal:1'
+        MINE_4 = 'city=revenue:yellow_20|brown_60,loc:2;path=a:1,b:_0,terminal:1;path=a:3,b:_0,terminal:1'
 
         TOWN = 'town=revenue:0'
         TOWN_WITH_WATER = 'town=revenue:0;upgrade=cost:20,terrain:water'

lib/engine/game/g_1824_cisleithania/map.rb

@@ -19,18 +19,18 @@ def map_optional_hexes
               ['A26'] => G1824::Map::KIEW_2,
               ['B3'] => G1824::Map::DRESDEN_2,
               ['E14'] =>
-                'offboard=revenue:yellow_20|green_30|brown_40|gray_40;path=a:0,b:_0,terminal:1;'\
+                'offboard=revenue:yellow_20|green_30|brown_40;path=a:0,b:_0,terminal:1;'\
                 'path=a:1,b:_0,terminal:1;path=a:2,b:_0,terminal:1;path=a:3,b:_0,terminal:1',
               ['G12'] =>
                 "#{budapest}=revenue:yellow_20|green_40|brown_60|gray_70;"\
                 'path=a:0,b:_0,terminal:1;path=a:1,b:_0,terminal:1;path=a:2,b:_0,terminal:1;path=a:3,b:_0,terminal:1',
               ['F25'] =>
-                'offboard=revenue:yellow_20|green_30|brown_40|gray_40;path=a:2,b:_0,terminal:1;'\
+                'offboard=revenue:yellow_20|green_30|brown_40;path=a:2,b:_0,terminal:1;'\
                 'path=a:3,b:_0,terminal:1',
               ['H1'] => G1824::Map::MAINLAND_1,
               ['I2'] => G1824::Map::MAINLAND_2,
               ['I10'] =>
-                'offboard=revenue:yellow_10|green_10|brown_50|gray_50;path=a:1,b:_0,terminal:1;'\
+                'offboard=revenue:yellow_10|brown_50;path=a:1,b:_0,terminal:1;'\
                 'path=a:2,b:_0,terminal:1;path=a:3,b:_0,terminal:1',
             },
             gray: {