Merge pull request #7223 from roseundy/connections

Allow find_pairwise_chain to use saved_nodes even with tile upgrade

lib/engine/action/run_routes.rb

@@ -51,7 +51,7 @@ def args_to_h
             'subsidy' => route.subsidy,
             'halts' => route.halts,
             'abilities' => route.abilities,
-            'nodes' => route.nodes.map(&:full_id),
+            'nodes' => route.nodes.map(&:signature),
           }.select { |_, v| v }
         end
 

lib/engine/operating_info.rb

@@ -10,7 +10,7 @@ def initialize(runs, dividend, revenue, laid_hexes, dividend_kind: nil)
       # Convert the route into connection hexes as upgrades may break the representation
       @routes = runs.to_h { |run| [run.train, run.connection_hexes] }
       @halts = runs.to_h { |run| [run.train, run.halts] }
-      @nodes = runs.to_h { |run| [run.train, run.nodes.map(&:full_id)] }
+      @nodes = runs.to_h { |run| [run.train, run.nodes.map(&:signature)] }
       @revenue = revenue
       @dividend = dividend
       @laid_hexes = laid_hexes

lib/engine/part/base.rb

@@ -13,8 +13,8 @@ def id
         @id ||= "#{tile.id}-#{index}"
       end
 
-      def full_id
-        "#{hex&.id}-#{tile.name}-#{index}"
+      def signature
+        "#{hex&.id}-#{index}"
       end
 
       def hex

lib/engine/route.rb

@@ -20,7 +20,7 @@ def initialize(game, phase, train, **opts)
       @subsidy = opts[:subsidy]
       @halts = opts[:halts]
       @abilities = opts[:abilities]
-      @saved_nodes = opts[:nodes] # node.full_id for every node in the route
+      @saved_nodes = opts[:nodes] # node.signature for every node in the route
       @local_length = @game.local_length
 
       @node_chains = {}
@@ -34,6 +34,7 @@ def initialize(game, phase, train, **opts)
 
     def clear_cache!(all: false, only_routes: false)
       @connection_hexes = nil if all
+      @saved_nodes = nil if all
       @revenue = nil
       @revenue_str = nil
 
@@ -47,7 +48,6 @@ def clear_cache!(all: false, only_routes: false)
       @paths = nil
       @stops = nil
       @subsidy = nil
-      @saved_nodes = nil
       @visited_stops = nil
       @check_connected = nil
       @check_distance = nil
@@ -407,7 +407,7 @@ def find_pairwise_chain(chains_a, chains_b, other_paths)
       # pass through the nodes associated with it.
       if @saved_nodes
         candidates.each do |a, b, left, right, middle|
-          return [a, b, left, right, middle] if [left, right, middle].all? { |n| @saved_nodes.include?(n.full_id) }
+          return [a, b, left, right, middle] if [left, right, middle].all? { |n| @saved_nodes.include?(n.signature) }
         end
       end