From ffbdbaaeff893e850a2aa9603091af5efb4dc408 Mon Sep 17 00:00:00 2001
From: Benjamin Scott <bschmoker@gmail.com>
Date: Mon, 29 Jan 2024 11:50:34 -0800
Subject: [PATCH] [1846-likes] use "bonus" terminology vs "markers"

---
 lib/engine/game/g_1846/game.rb            | 14 +++++++-------
 lib/engine/game/g_18_los_angeles/game.rb  |  6 +++---
 lib/engine/game/g_18_los_angeles1/game.rb |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/engine/game/g_1846/game.rb b/lib/engine/game/g_1846/game.rb
index b04369c1c9..211a807121 100644
--- a/lib/engine/game/g_1846/game.rb
+++ b/lib/engine/game/g_1846/game.rb
@@ -128,7 +128,7 @@ class Game < Game::Base
               },
             ],
             events: [
-              { 'type' => 'remove_markers' },
+              { 'type' => 'remove_bonuses' },
               { 'type' => 'remove_reservations' },
             ],
           },
@@ -201,7 +201,7 @@ class Game < Game::Base
 
         TILE_COST = 20
         EVENTS_TEXT = Base::EVENTS_TEXT.merge(
-          'remove_markers' => ['Remove Markers', 'Remove Steamboat, Meat Packing, and Boomtown markers'],
+          'remove_bonuses' => ['Remove Bonuses', 'Remove Steamboat, Meat Packing, and Boomtown bonuses'],
           'remove_reservations' => ['Remove Reservations', 'Remove reserved token slots for corporations']
         ).freeze
 
@@ -645,11 +645,11 @@ def event_close_companies!
           @minors.dup.each { |minor| close_corporation(minor) }
           remove_icons(self.class::LSL_HEXES, self.class::ABILITY_ICONS[lake_shore_line.id]) if lake_shore_line
           remove_icons(self.class::LITTLE_MIAMI_HEXES, self.class::ABILITY_ICONS[little_miami.id]) if little_miami
-          remove_steamboat_markers! if steamboat && !steamboat.owned_by_corporation?
+          remove_steamboat_bonuses! if steamboat && !steamboat.owned_by_corporation?
           super
         end
 
-        def remove_steamboat_markers!
+        def remove_steamboat_bonuses!
           self.class::STEAMBOAT_HEXES.each do |hex_id|
             hex = hex_by_id(hex_id)
             if hex.assigned?(steamboat.id)
@@ -678,7 +678,7 @@ def event_remove_reservations!
           end
         end
 
-        def event_remove_markers!
+        def event_remove_bonuses!
           removals = Hash.new { |h, k| h[k] = {} }
 
           @corporations.each do |corp|
@@ -702,7 +702,7 @@ def event_remove_markers!
           removals.each do |company, removal|
             hex = removal[:hex]
             corp = removal[:corporation]
-            @log << "-- Event: #{corp}'s #{company_by_id(company).name} marker removed from #{hex} --"
+            @log << "-- Event: #{corp}'s #{company_by_id(company).name} bonus removed from #{hex} --"
           end
         end
 
@@ -835,7 +835,7 @@ def game_end_check_values
         end
 
         def east_west_desc
-          'E/W'
+          'East to West'
         end
 
         def train_help(_entity, runnable_trains, _routes)
diff --git a/lib/engine/game/g_18_los_angeles/game.rb b/lib/engine/game/g_18_los_angeles/game.rb
index 5dddc966fe..3b7dfa480d 100644
--- a/lib/engine/game/g_18_los_angeles/game.rb
+++ b/lib/engine/game/g_18_los_angeles/game.rb
@@ -83,7 +83,7 @@ class Game < G1846::Game
         BOOMTOWN_REVENUE_DESC = 'RKO'
 
         EVENTS_TEXT = G1846::Game::EVENTS_TEXT.merge(
-          'remove_markers' => ['Remove Tokens & Markers', 'Remove RJ token and LA Steamship, LA Citrus, and RKO Pictures markers']
+          'remove_bonuses' => ['Remove Tokens & Bonuses', 'Remove RJ token and LA Steamship, LA Citrus, and RKO Pictures bonuses']
         ).freeze
 
         CORPORATION_START_LIMIT = {
@@ -406,10 +406,10 @@ def east_west_desc
           'E/W or N/S'
         end
 
-        def event_remove_markers!
+        def event_remove_bonuses!
           super
 
-          # piggy-back on the markers event to avoid redefining all the trains
+          # piggy-back on the bonuses event to avoid redefining all the trains
           # from 1846 just for the sake of adding a single new event
           event_remove_rj_token!
         end
diff --git a/lib/engine/game/g_18_los_angeles1/game.rb b/lib/engine/game/g_18_los_angeles1/game.rb
index 73b09856f2..ceedfac1d5 100644
--- a/lib/engine/game/g_18_los_angeles1/game.rb
+++ b/lib/engine/game/g_18_los_angeles1/game.rb
@@ -43,7 +43,7 @@ class Game < G18LosAngeles::Game
         LSL_ID = 'SBL'
 
         EVENTS_TEXT = G1846::Game::EVENTS_TEXT.merge(
-          'remove_markers' => ['Remove Markers', 'Remove LA Steamship and LA Citrus markers']
+          'remove_bonuses' => ['Remove Bonuses', 'Remove LA Steamship and LA Citrus bonuses']
         ).freeze
 
         def post_setup; end