sc2ai 0.6.5 → 0.7.0

data/lib/sc2ai/player/geo.rb

@@ -520,11 +520,11 @@ module Sc2
         point_search_offsets = (-7..7).to_a.product((-7..7).to_a)
         point_search_offsets.select! do |x, y|
           dist = Math.hypot(x, y)
-          dist > 4 && dist <= 8
+          dist > 4.0 && dist <= 8.0
         end
 
         # Split resources by Z axis
-        resources = bot.neutral.minerals.reject_type(Api::UnitTypeId::MINERALFIELD450) + bot.neutral.geysers
+        resources = bot.neutral.minerals - mineral_walls + bot.neutral.geysers
         resource_group_z = resources.group_by do |resource|
           resource.pos.z.round # 32 units of Y, most maps will have use 3. round to nearest.
         end
@@ -591,11 +591,86 @@ module Sc2
             # Choose best fitting point
             best_point = possible_points.keys[possible_points.values.find_index(possible_points.values.min)]
             @expansions[best_point.to_p2d] = UnitGroup.new(clustered_resources)
+
+            # Check if this might be a mirrored base.
+            best_mirror_point = nil
+            geysers = clustered_resources.select { |res| Sc2::UnitGroup::TYPE_GEYSER.include?(res.unit_type) }
+            if geysers.size == 2
+              if geysers[0].pos.y == geysers[1].pos.y || geysers[0].pos.x == geysers[1].pos.x
+                # Mirrored vertical, potentially
+                best_mirror_point = [
+                  best_point[0],
+                  best_point[1] - (best_point[1] - (geysers[0].pos.y + geysers[1].pos.y) / 2.0) * 2.0
+                ]
+                if best_mirror_point != best_point && possible_points.has_key?(best_mirror_point)
+                  @expansions[best_mirror_point.to_p2d] = UnitGroup.new(clustered_resources)
+                else
+                  # Wasn't mirrored the one way. How about the other?...
+                  # Mirrored horizontal, potentially
+                  best_mirror_point = [
+                    best_point[0] - (best_point[0] - (geysers[0].pos.x + geysers[1].pos.x) / 2.0) * 2.0,
+                    best_point[1]
+                  ]
+                  if best_mirror_point != best_point && possible_points.has_key?(best_mirror_point)
+                    @expansions[best_mirror_point.to_p2d] = UnitGroup.new(clustered_resources)
+                  end
+
+                end
+              end
+            end
           end
         end
         @expansions
       end
 
+      # @private
+      # Mineral walls. Defined once upon start of game, mostly based on layout.
+      # @return [Sc2::UnitGroup]
+      private def mineral_walls
+        return @mineral_walls unless @mineral_walls.nil?
+
+        # Find mineral walls.
+        @mineral_walls = []
+        minerals_by_pos = {}
+        bot.neutral.minerals.reject_type(Api::UnitTypeId::MINERALFIELD450)
+          .each do |mineral|
+          minerals_by_pos[mineral.pos.to_axy] = mineral
+        end
+        minerals_by_pos.each do |xy, mineral|
+          x, y = xy
+          # Test X
+          if (side1 = minerals_by_pos[[x - 2, y]]) && (side2 = minerals_by_pos[[x + 2, y]])
+            @mineral_walls << side1
+            @mineral_walls << mineral
+            @mineral_walls << side2
+          end
+
+          # # Test Y
+          if (side1 = minerals_by_pos[[x, y - 1]]) && (side2 = minerals_by_pos[[x, y + 1]])
+            @mineral_walls << side1
+            @mineral_walls << mineral
+            @mineral_walls << side2
+          end
+
+          # Test \
+          if (side1 = minerals_by_pos[[x - 2, y + 1]]) && (side2 = minerals_by_pos[[x + 2, y - 1]])
+            @mineral_walls << side1
+            @mineral_walls << mineral
+            @mineral_walls << side2
+          end
+
+          # Test /
+          if (side1 = minerals_by_pos[[x - 2, y - 1]]) && (side2 = minerals_by_pos[[x + 2, y + 1]])
+            @mineral_walls << side1
+            @mineral_walls << mineral
+            @mineral_walls << side2
+          end
+        end
+        @mineral_walls.uniq!
+
+        @mineral_walls = UnitGroup.new(@mineral_walls) + bot.neutral.minerals.select_type(Api::UnitTypeId::MINERALFIELD450)
+      end
+
       # Returns a list of 2d points for expansion build locations
       # Does not contain mineral info, but the value can be checked against geo.expansions
       #

data/lib/sc2ai/version.rb

@@ -1,5 +1,5 @@
 module Sc2
   # gem version
   # @return [String]
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

data/lib/templates/new/run_example_match.rb.tt

@@ -10,5 +10,5 @@ Sc2::Match.new(
     $bot,
     Sc2::Player::Computer.new(race: Api::Race::RANDOM, difficulty: Api::Difficulty::VERY_EASY)
   ],
-  map: "ThunderbirdAIE" # Or any of the downloaded map names
+  map: "PylonAIE" # Or any of the downloaded map names
 ).run