[1849] modification to code for variants

lib/engine/game/g_1849/game.rb

@@ -517,15 +517,15 @@ def operating_round(round_num)
             G1849::Step::Token,
             Engine::Step::Route,
             G1849::Step::Dividend,
-            acquiring_station_tokens? ? G1849::Step::BuyToken : nil,
-            electric_dreams? ? G1849::Step::BuyEToken : nil,
+            G1849::Step::BuyToken,
+            G1849::Step::BuyEToken,
             Engine::Step::DiscardTrain,
             G1849::Step::BuyTrain,
             G1849::Step::IssueShares,
-            bonds? ? G1849::Step::BondInterestPayment : nil,
-            bonds? ? G1849::Step::Bond : nil,
+            G1849::Step::BondInterestPayment,
+            G1849::Step::Bond,
             [Engine::Step::BuyCompany, { blocks: true }],
-        ].compact, round_num: round_num)
+        ], round_num: round_num)
         end
 
         def next_round!

lib/engine/game/g_1849/step/bond.rb

@@ -8,7 +8,7 @@ module G1849
       module Step
         class Bond < Engine::Step::Base
           def actions(entity)
-            return [] if !entity.corporation? || entity != current_entity
+            return [] if !@game.bonds? || !entity.corporation? || entity != current_entity
 
             actions = []
             actions << 'payoff_loan' if can_payoff_loan?(entity)
@@ -30,7 +30,11 @@ def description
           end
 
           def log_skip(entity)
-            super if @game.bonds? && @game.issue_bonds_enabled
+            super if @game.bonds?
+          end
+
+          def log_pass(entity)
+            super if @game.bonds?
           end
 
           def take_loan_text

lib/engine/game/g_1849/step/bond_interest_payment.rb

@@ -12,6 +12,18 @@ def actions(_entity)
             []
           end
 
+          def log_skip(entity)
+            super if @game.bonds?
+          end
+
+          def log_pass(entity)
+            super if @game.bonds?
+          end
+
+          def blocks?
+            false
+          end
+
           def skip!
             pass!
             entity = current_entity

lib/engine/game/g_1849/step/buy_e_token.rb

@@ -8,7 +8,7 @@ module G1849
       module Step
         class BuyEToken < Engine::Step::Base
           def actions(entity)
-            return [] if !entity.corporation? || entity != current_entity
+            return [] if !@game.electric_dreams? || !entity.corporation? || entity != current_entity
 
             actions = []
             actions += %w[choose pass] if can_buy_e_token?(entity)
@@ -34,7 +34,11 @@ def choice_name
           end
 
           def log_skip(entity)
-            super if @game.electric_dreams? && @game.e_tokens_enabled
+            super if @game.electric_dreams?
+          end
+
+          def log_pass(entity)
+            super if @game.electric_dreams?
           end
 
           def e_token_cost

lib/engine/game/g_1849/step/buy_token.rb

@@ -11,7 +11,7 @@ class BuyToken < Engine::Step::Base
           MIN_PRICE = 1
 
           def actions(entity)
-            return [] if entity != current_entity
+            return [] if [email protected]_station_tokens? || !entity.corporation? || entity != current_entity
 
             ACTIONS
           end
@@ -50,6 +50,14 @@ def any_buyable_tokens_placed?(entity)
             false
           end
 
+          def log_skip(entity)
+            super if @game.acquiring_station_tokens?
+          end
+
+          def log_pass(entity)
+            super if @game.acquiring_station_tokens?
+          end
+
           def auto_actions(entity)
             return [Engine::Action::Pass.new(entity)] unless any_buyable_tokens_placed?(entity)