sc2ai 0.0.4 → 0.0.6

data/lib/sc2ai/unit_group/action_ext.rb

@@ -49,6 +49,15 @@ module Sc2
       bot&.warp(units: self, unit_type_id:, target:, queue_command:)
     end
 
+    # Research a specific upgrade at one of these structures
+    # @param upgrade_id [Integer] Api::UpgradeId to research
+    # @param queue_command [Boolean] shift+command
+    def research(upgrade_id:, queue_command: false)
+      return if size.zero?
+
+      bot&.research(units: self, upgrade_id:, queue_command:)
+    end
+
     # Shorthand for performing action SMART (right-click)
     # @param target [Api::Unit, Integer, Api::Point2D] is a unit, unit tag or a Api::Point2D
     # @param queue_command [Boolean] shift+command

data/lib/sc2ai/unit_group/filter_ext.rb

@@ -229,6 +229,17 @@ module Sc2
     alias_method :extractors, :gas
     alias_method :assimilators, :gas
 
+    # Selects only units which have finished constructing, i.o.w. build_progress == 1.0
+    # @return [UnitGroup] gas structures
+    def completed
+      select(&:is_completed?)
+    end
+
+    # Selects only units which do not have orders
+    def idle
+      select { |unit| unit.orders.empty? }
+    end
+
     # NEUTRAL ------------------------------------------
 
     # Selects mineral fields
@@ -284,7 +295,13 @@ module Sc2
     # Selects overlords
     # @return [Sc2::UnitGroup]
     def overlords
-      select_type([Api::UnitTypeId::OVERLORD, Api::UnitTypeId::OVERLORDCOCOON])
+      select_type([Api::UnitTypeId::OVERLORD, Api::UnitTypeId::OVERLORDTRANSPORT, Api::UnitTypeId::TRANSPORTOVERLORDCOCOON])
+    end
+
+    # Selects overseers
+    # @return [Sc2::UnitGroup]
+    def overseers
+      select_type([Api::UnitTypeId::OVERLORDCOCOON, Api::UnitTypeId::OVERSEER, Api::UnitTypeId::OVERSEERSIEGEMODE])
     end
 
     # Selects creep tumors (all)

data/lib/sc2ai/unit_group/geo_ext.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "sc2ai/unit_group"
+
+module Sc2
+  # A set geometric/map/math methods for unit group
+  class UnitGroup
+    # Returns the center (average) position of all units or nil if the group is empty.
+    # Outliers effect this point
+    # @return [Api::Point2D, nil]
+    def pos_centroid
+      return nil if size == 0
+      size = @units.size
+      sum_x = 0.0
+      sum_y = 0.0
+      i = 0
+
+      while i < size
+        unit = at(i)
+        sum_x += unit.pos.x.to_f
+        sum_y += unit.pos.y.to_f
+        i += 1
+      end
+
+      Api::Point2D[sum_x / size.to_f, sum_y / size.to_f]
+    end
+  end
+end

data/lib/sc2ai/unit_group.rb

@@ -182,6 +182,8 @@ module Sc2
       UnitGroup.new(@units.reject { |tag, _unit| other_unit_group.units.has_key?(tag) })
     end
 
+    alias_method :-, :subtract
+
     # Merges unit_group with our units and returns a new unit group
     # @return [Sc2::UnitGroup] a new unit group with items merged
     def merge(unit_group)
@@ -227,12 +229,20 @@ module Sc2
       UnitGroup.new(@units.except(...))
     end
 
-    # Returns a hash containing the entries for given tag(s).
+    # Returns a new unit group containing the entries for given tag(s).
     # @return [Sc2::UnitGroup] new unit group
     def slice(...)
       UnitGroup.new(@units.slice(...))
     end
 
+    # Returns a new unit group containing each element found both in self and in all of the given other_arrays; duplicates are omitted; items are compared using eql? (items must also implement hash correctly):
+    # @param other_unit_group [UnitGroup]
+    # @return [UnitGroup] new unit group
+    def intersection(other_unit_group)
+      slice(*other_unit_group.tags)
+    end
+    alias_method :&, :intersection
+
     # Selects a single random Unit without a parameter or an array of Units with a param, i.e. self.random(2)
     # @return [Api::Unit]
     def sample(...)
@@ -287,3 +297,4 @@ end
 
 require_relative "unit_group/action_ext"
 require_relative "unit_group/filter_ext"
+require_relative "unit_group/geo_ext"

data/lib/sc2ai/version.rb

@@ -2,5 +2,5 @@
 
 module Sc2
   # gem version
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 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::VeryEasy)
   ],
-  map: "Goldenaura512AIE" # Or any of the downloaded map names
+  map: "Goldenaura512V2AIE" # Or any of the downloaded map names
 ).run