sc2ai 0.5.0 → 0.6.1

data/lib/sc2ai/protocol/extensions/unit_type_data.rb

@@ -23,6 +23,36 @@ module Api
     #   i.e. 2 for Supply Depot (2x2)
     #   @return [Integer] side-length for placement
     attr_accessor :placement_length
+
+    # @!attribute ground_range
+    #   Ground weapon range or 0.0 when it can't shoot ground
+    #   @return [Float]
+    attr_accessor :ground_range
+
+    # @!attribute air_range
+    #   Air weapon range or 0.0 when it can't shoot air
+    #   @return [Float]
+    attr_accessor :air_range
+
+    # @!attribute ground_damage
+    #   Ground weapon damage or 0.0
+    #   @return [Float]
+    attr_accessor :ground_damage
+
+    # @!attribute air_damage
+    #   Air weapon damage or 0.0
+    #   @return [Float]
+    attr_accessor :air_damage
+
+    # @!attribute ground_dps
+    #   Ground weapon damage per second or 0.0
+    #   @return [Float]
+    attr_accessor :ground_dps
+
+    # @!attribute air_dps
+    #   Air weapon damage per second or 0.0
+    #   @return [Float]
+    attr_accessor :air_dps
   end
 end
 Api::UnitTypeData.prepend Api::UnitTypeDataExtension

data/lib/sc2ai/unit_group/filter_ext.rb

@@ -74,6 +74,18 @@ module Sc2
       Api::UnitTypeId::HATCHERY, Api::UnitTypeId::HIVE, Api::UnitTypeId::LAIR,
       Api::UnitTypeId::NEXUS
     ].freeze
+
+    # An array of passive detector unit types.
+    # Does not include units with detection abilities, such as Oracle/Ghost
+    # @return [Array<Integer>]
+    TYPE_DETECTORS = [
+      Api::UnitTypeId::RAVEN, Api::UnitTypeId::MISSILETURRET,
+      Api::UnitTypeId::OBSERVER, Api::UnitTypeId::OBSERVERSIEGEMODE,
+      Api::UnitTypeId::PHOTONCANNON,
+      Api::UnitTypeId::OVERSEER, Api::UnitTypeId::OVERSEERSIEGEMODE,
+      Api::UnitTypeId::SPORECRAWLER
+    ].freeze
+
     # Returns a new UnitGroup containing all units matching unit type id(s)
     # Multiple values work as an "OR" filter
     # @example
@@ -254,6 +266,12 @@ module Sc2
     alias_method :extractors, :gas
     alias_method :assimilators, :gas
 
+    # Selects units passively have Detection
+    # @return [UnitGroup] gas structures
+    def detectors
+      select_type(TYPE_DETECTORS)
+    end
+
     # Selects only units which have finished constructing, i.o.w. build_progress == 1.0
     # @return [UnitGroup] complete unit group
     def completed
@@ -374,7 +392,7 @@ module Sc2
       select_type(Api::UnitTypeId::CREEPTUMORBURROWED)
     end
 
-    # Protoss ---
+    # PROTOSS ---
 
     # Selects pylons
     # @return [Sc2::UnitGroup] pylons
@@ -416,7 +434,10 @@ module Sc2
     # @param pos [Sc2::Position] unit.pos or a point of any kind
     # @return [Sc2::UnitGroup, Api::Unit, nil] return group or single unit if amount is not supplied
     def nearest_to(pos:, amount: nil)
-      return UnitGroup.new if !amount.nil? && amount.to_i <= 0
+      unless amount.nil?
+        return UnitGroup.new if amount <= 0
+        return self if amount > @units.size
+      end
 
       if use_kdtree
         if amount.nil?

data/lib/sc2ai/version.rb

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

data/lib/templates/new/api/data.proto

@@ -89,7 +89,7 @@ message UnitTypeData {
   optional float sight_range = 25;                                // Range unit reveals vision.
 
   repeated uint32 tech_alias = 21 [packed=false];                                // Other units that satisfy the same tech requirement.
-  optional uint32 unit_alias = 22 [packed=false];                                // The morphed variant of this unit.
+  optional uint32 unit_alias = 22;                                // The morphed variant of this unit.
 
   optional uint32 tech_requirement = 23;                          // Structure required to build this unit. (Or any with the same tech_alias)
   optional bool require_attached = 24;                            // Whether tech_requirement is an add-on.

data/lib/templates/new/api/raw.proto

@@ -191,7 +191,7 @@ message ActionRawUnitCommand {
     uint64 target_unit_tag = 3;
   }
   repeated uint64 unit_tags = 4 [packed=false];
-  optional bool queue_command = 5 [packed=false];
+  optional bool queue_command = 5;
 }
 
 message ActionRawCameraMove {

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

@@ -1,5 +1,5 @@
 # Use the ladder's boot.rb file and configure there
-require "./boot.rb"
+require_relative "boot"
 
 # Or simply, create by hand
 #my_bot = MyBot.new(name: "Botname", race: Api::Race::RANDOM)