System18: Remove discarded trains from the game in correct way

tobymao · Oct 13, 2024 · 62c4286 · 62c4286
1 parent 92f2c63
commit 62c4286
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/lib/engine/game/g_system18/game.rb b/lib/engine/game/g_system18/game.rb
@@ -278,6 +278,7 @@ class Game < Game::Base
         BANKRUPTCY_ENDS_GAME_AFTER = :one
         STATUS_TEXT = {}.freeze
         TILE_UPGRADES_MUST_USE_MAX_EXITS = [].freeze
+        DISCARDED_TRAINS = :remove
 
         def find_map_name
           optional_rules&.find { |r| r.to_s.include?('map_') }&.to_s&.delete_prefix('map_')&.downcase
@@ -460,7 +461,7 @@ def operating_steps
               GSystem18::Step::Token,
               Engine::Step::Route,
               GSystem18::Step::Dividend,
-              GSystem18::Step::DiscardTrain,
+              Engine::Step::DiscardTrain,
               GSystem18::Step::BuyTrain,
             ]
           else
@@ -475,7 +476,7 @@ def operating_steps
               GSystem18::Step::Token,
               Engine::Step::Route,
               GSystem18::Step::Dividend,
-              GSystem18::Step::DiscardTrain,
+              Engine::Step::DiscardTrain,
               GSystem18::Step::BuyTrain,
               [Engine::Step::BuyCompany, { blocks: true }],
             ]
@@ -692,12 +693,6 @@ def place_home_token(corporation)
 
           send("map_#{map_name}_place_home_token", corporation)
         end
-
-        def remove_discarded_train?(train)
-          return true unless respond_to?("map_#{map_name}_remove_discarded_train?")
-
-          send("map_#{map_name}_remove_discarded_train?", train)
-        end
       end
     end
   end

diff --git a/lib/engine/game/g_system18/step/discard_train.rb b/lib/engine/game/g_system18/step/discard_train.rb