sc2ai 0.0.5 → 0.0.7

data/sig/sc2ai.rbs

@@ -23,6 +23,82 @@ module Sc2
   class Error < StandardError
   end
 
+  # Holds game data from tech tree and Api::ResponseData
+  # Called once on game start
+  class Data
+    # sord warn - Api::ResponseData wasn't able to be resolved to a constant in this project
+    # _@param_ `data`
+    def initialize: (Api::ResponseData data) -> void
+
+    # sord warn - Api::AbilityData wasn't able to be resolved to a constant in this project
+    # sord warn - "Hash<Integer, Api::AbilityData] indexed data" does not appear to be a type
+    # Indexes ability data by ability id
+    # 
+    # _@param_ `abilities`
+    # 
+    # _@return_ — Hash<Integer, Api::AbilityData] indexed data
+    def abilities_from_proto: (::Array[Api::AbilityData] abilities) -> SORD_ERROR_HashIntegerApiAbilityDataindexeddata
+
+    # Indexes unit data by id
+    # 
+    # _@param_ `units`
+    # 
+    # _@return_ — indexed data
+    def units_from_proto: (::Array[Api::UnitTypeData] units) -> ::Hash[Integer, Api::UnitTypeData]
+
+    # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
+    # sord warn - "Hash<Integer, Api::UpgradeData] indexed data" does not appear to be a type
+    # Indexes upgrades data by id
+    # 
+    # _@param_ `upgrades`
+    # 
+    # _@return_ — Hash<Integer, Api::UpgradeData] indexed data
+    def upgrades_from_proto: (::Array[Api::UpgradeData] upgrades) -> SORD_ERROR_HashIntegerApiUpgradeDataindexeddata
+
+    # sord omit - no YARD type given for "effects", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def effects_from_proto: (untyped effects) -> untyped
+
+    # sord omit - no YARD type given for "buffs", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def buffs_from_proto: (untyped buffs) -> untyped
+
+    # sord omit - no YARD return type given, using untyped
+    # Overrides unit data from api to implement fixes or change context
+    # i.e. Api::UnitTypeId::ORBITALCOMMAND cost is cost-to-upgrade instead of CC + Orbital combined cost.
+    # Run once. Depends on all data already being set.
+    def override_unit_data: () -> untyped
+
+    # sord omit - no YARD return type given, using untyped
+    # Fixes mineral_cost, vespene_cost and food_required values
+    def correct_unit_type_costs: () -> untyped
+
+    # sord omit - no YARD return type given, using untyped
+    # Fixes mineral_cost_sum, vespene_cost_sum
+    def correct_unit_type_sum: () -> untyped
+
+    # sord warn - Api::AbilityData wasn't able to be resolved to a constant in this project
+    # _@return_ — AbilityId => AbilityData
+    attr_accessor abilities: (::Hash[Integer, Api::AbilityData] | untyped)
+
+    # _@return_ — UnitId => UnitTypeData
+    attr_accessor units: (::Hash[Integer, Api::UnitTypeData] | untyped)
+
+    # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
+    # _@return_ — UpgradeId => UpgradeData
+    attr_accessor upgrades: (::Hash[Integer, Api::UpgradeData] | untyped)
+
+    # sord omit - no YARD type given for :buffs, using untyped
+    # Not particularly useful data. Just use BuffId directly
+    #   @return [Hash<Integer, Api::BuffData>] BuffId => BuffData
+    attr_accessor buffs: untyped
+
+    # sord omit - no YARD type given for :effects, using untyped
+    # Not particularly useful data. Just use EffectId directly
+    #   @return [Hash<Integer, Api::EffectData>] EffectId => EffectData
+    attr_accessor effects: untyped
+  end
+
   # Helps determine common paths to sc2 install dir, executable and maps.
   # It maintains some semblance of compatibility with python-sc2 config
   # 
@@ -338,10 +414,16 @@ module Sc2
     def on_status_change: (Symbol status) -> untyped
 
     # Determines if your game_info will be refreshed at this moment
-    # Has a hard-capped refresh of only ever 2 steps
+    # Has a hard-capped refresh of only ever 4 steps
     # In general game_info is only refreshed Player::Bot reads from pathing_grid or placement_grid
     def game_info_stale?: () -> bool
 
+    # A Hash by unit tag, holding an array of available ability ids
+    # Synchronously calls RequestQueryAvailableAbilities and caches for this game loop.
+    # 
+    # _@return_ — { unit_tag => [ability_id, ...], ... }
+    def available_abilities: () -> ::Hash[Integer, ::Array[Integer]]
+
     # sord warn - Api::PlayerCommon wasn't able to be resolved to a constant in this project
     # An alias for observation.player_common to allow easier access to i.e. common.minerals
     # 
@@ -494,7 +576,6 @@ module Sc2
       # _@param_ `race` — Api::Race::* excl *::Random
       def on_random_race_detected: (Integer race) -> untyped
 
-      # sord warn - Api::ActionError wasn't able to be resolved to a constant in this project
       # sord omit - no YARD return type given, using untyped
       # Called on step if errors are present. Equivalent of UI red text errors.
       # Override to read action errors.
@@ -682,16 +763,15 @@ module Sc2
       # 
       # _@param_ `radius` — default one tile wide, 1.0
       # 
-      # _@param_ `color` — default white. min(r,b) is used for both r&b
+      # _@param_ `color` — default white
       def debug_draw_sphere: (point: Api::Point, ?radius: Float, ?color: Api::Color?) -> void
 
-      # Toggles cheat commands on/off (send only once to enable)
       # Possible values:
       #  Api::DebugGameState::Show_map
       #  Api::DebugGameState::Control_enemy
       #  Api::DebugGameState::Food
       #  Api::DebugGameState::Free
-      #  Api::DebugGameState::all_resources
+      #  Api::DebugGameState::All_resources
       #  Api::DebugGameState::God
       #  Api::DebugGameState::Minerals
       #  Api::DebugGameState::Gas
@@ -807,7 +887,7 @@ module Sc2
       # 
       # _@param_ `units` — can be an Api::Unit, array of Api::Unit#tag or single tag
       # 
-      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
       # 
       # _@param_ `target` — is a unit tag or a Api::Point2D. Nil for addons/orbital
       # 
@@ -819,21 +899,22 @@ module Sc2
                    ?queue_command: bool
                  ) -> untyped
 
-      # sord omit - no YARD type given for "units:", using untyped
       # sord omit - no YARD return type given, using untyped
       # Warps in unit type at target (location or pylon) with optional source units (warp gates)
       # When not specifying the specific warp gate(s), all warpgates will be used
       # 
-      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
       # 
       # _@param_ `queue_command` — shift+command
       # 
       # _@param_ `target` — is a unit tag or a Api::Point2D
+      # 
+      # _@param_ `units`
       def warp: (
                   unit_type_id: Integer,
                   target: (Api::Point2D | Integer),
                   queue_command: bool,
-                  ?units: untyped
+                  ?units: (::Array[Integer] | Integer | Api::Unit)?
                 ) -> untyped
 
       # sord omit - no YARD return type given, using untyped
@@ -985,6 +1066,10 @@ module Sc2
       # Returns the upgrade ids which are researching or queued
       def upgrade_in_progress?: (untyped upgrade_id) -> bool
 
+      # sord omit - no YARD type given for "unit_type_id", using untyped
+      # For this unit type, tells you how many are in progress by checking orders for all it's sources.
+      def units_in_progress: (untyped unit_type_id) -> Integer
+
       # Returns static [Api::UnitTypeData] for a unit
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -1036,6 +1121,14 @@ module Sc2
       # Checks whether you have the resources to
       def can_afford_upgrade?: (untyped upgrade_id) -> bool
 
+      # Returns whether Query Available Ability is true for unit and tag
+      # Queries API if necessary. Uses batching in the background.
+      # 
+      # _@param_ `unit_tag`
+      # 
+      # _@param_ `ability_id`
+      def unit_ability_available?: (unit_tag: Integer, ability_id: Integer) -> bool
+
       # sord warn - Api::Observation wasn't able to be resolved to a constant in this project
       # sord omit - no YARD return type given, using untyped
       # Divides raw data units into various attributes on every step
@@ -1102,6 +1195,10 @@ module Sc2
       # Returns the upgrade ids which are researching or queued
       def upgrade_in_progress?: (untyped upgrade_id) -> bool
 
+      # sord omit - no YARD type given for "unit_type_id", using untyped
+      # For this unit type, tells you how many are in progress by checking orders for all it's sources.
+      def units_in_progress: (untyped unit_type_id) -> Integer
+
       # Returns static [Api::UnitTypeData] for a unit
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -1153,6 +1250,14 @@ module Sc2
       # Checks whether you have the resources to
       def can_afford_upgrade?: (untyped upgrade_id) -> bool
 
+      # Returns whether Query Available Ability is true for unit and tag
+      # Queries API if necessary. Uses batching in the background.
+      # 
+      # _@param_ `unit_tag`
+      # 
+      # _@param_ `ability_id`
+      def unit_ability_available?: (unit_tag: Integer, ability_id: Integer) -> bool
+
       # sord warn - Api::Observation wasn't able to be resolved to a constant in this project
       # sord omit - no YARD return type given, using untyped
       # Divides raw data units into various attributes on every step
@@ -1320,16 +1425,15 @@ module Sc2
       # 
       # _@param_ `radius` — default one tile wide, 1.0
       # 
-      # _@param_ `color` — default white. min(r,b) is used for both r&b
+      # _@param_ `color` — default white
       def debug_draw_sphere: (point: Api::Point, ?radius: Float, ?color: Api::Color?) -> void
 
-      # Toggles cheat commands on/off (send only once to enable)
       # Possible values:
       #  Api::DebugGameState::Show_map
       #  Api::DebugGameState::Control_enemy
       #  Api::DebugGameState::Food
       #  Api::DebugGameState::Free
-      #  Api::DebugGameState::all_resources
+      #  Api::DebugGameState::All_resources
       #  Api::DebugGameState::God
       #  Api::DebugGameState::Minerals
       #  Api::DebugGameState::Gas
@@ -1415,6 +1519,10 @@ module Sc2
       # Returns the upgrade ids which are researching or queued
       def upgrade_in_progress?: (untyped upgrade_id) -> bool
 
+      # sord omit - no YARD type given for "unit_type_id", using untyped
+      # For this unit type, tells you how many are in progress by checking orders for all it's sources.
+      def units_in_progress: (untyped unit_type_id) -> Integer
+
       # Returns static [Api::UnitTypeData] for a unit
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -1466,6 +1574,14 @@ module Sc2
       # Checks whether you have the resources to
       def can_afford_upgrade?: (untyped upgrade_id) -> bool
 
+      # Returns whether Query Available Ability is true for unit and tag
+      # Queries API if necessary. Uses batching in the background.
+      # 
+      # _@param_ `unit_tag`
+      # 
+      # _@param_ `ability_id`
+      def unit_ability_available?: (unit_tag: Integer, ability_id: Integer) -> bool
+
       # sord warn - Api::Observation wasn't able to be resolved to a constant in this project
       # sord omit - no YARD return type given, using untyped
       # Divides raw data units into various attributes on every step
@@ -1497,13 +1613,17 @@ module Sc2
 
       attr_accessor all_units: (Sc2::UnitGroup | untyped)
 
-      # _@return_ — a group of units
+      # _@return_ — a group of placeholder structures
       attr_accessor units: Sc2::UnitGroup
 
       # sord omit - no YARD type given for :structures, using untyped
       # A full list of all your structures (non-units)
       attr_accessor structures: untyped
 
+      # sord omit - no YARD type given for :placeholders, using untyped
+      # A list of structures which haven't started
+      attr_accessor placeholders: untyped
+
       # _@return_ — a group of neutral units
       attr_accessor neutral: Sc2::UnitGroup
 
@@ -1517,7 +1637,7 @@ module Sc2
 
       # sord warn - Api::RadarRing wasn't able to be resolved to a constant in this project
       # sord warn - Api::RadarRing wasn't able to be resolved to a constant in this project
-      # _@return_ — an array of power sources
+      # _@return_ — an array of radar rings sources
       attr_accessor power_sources: ::Array[Api::RadarRing]
 
       # sord omit - no YARD type given for :radar_rings, using untyped
@@ -1612,7 +1732,7 @@ module Sc2
       # 
       # _@param_ `units` — can be an Api::Unit, array of Api::Unit#tag or single tag
       # 
-      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
       # 
       # _@param_ `target` — is a unit tag or a Api::Point2D. Nil for addons/orbital
       # 
@@ -1624,21 +1744,22 @@ module Sc2
                    ?queue_command: bool
                  ) -> untyped
 
-      # sord omit - no YARD type given for "units:", using untyped
       # sord omit - no YARD return type given, using untyped
       # Warps in unit type at target (location or pylon) with optional source units (warp gates)
       # When not specifying the specific warp gate(s), all warpgates will be used
       # 
-      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+      # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
       # 
       # _@param_ `queue_command` — shift+command
       # 
       # _@param_ `target` — is a unit tag or a Api::Point2D
+      # 
+      # _@param_ `units`
       def warp: (
                   unit_type_id: Integer,
                   target: (Api::Point2D | Integer),
                   queue_command: bool,
-                  ?units: untyped
+                  ?units: (::Array[Integer] | Integer | Api::Unit)?
                 ) -> untyped
 
       # sord omit - no YARD return type given, using untyped
@@ -1799,6 +1920,9 @@ module Sc2
       # Effected by crop_to_playable_area
       def map_height: () -> Integer
 
+      # Center of the map
+      def map_center: () -> Api::Point2D
+
       # Returns zero to map_width as range
       # 
       # _@return_ — 0 to map_width
@@ -1835,6 +1959,16 @@ module Sc2
       # One pixel covers one whole block. Rounds fractionated positions down.
       def parsed_placement_grid: () -> Numo::Bit
 
+      # Whether this tile is where an expansion is supposed to be placed.
+      # To see if a unit/structure is blocking an expansion, pass their coordinates to this method.
+      # 
+      # _@param_ `x`
+      # 
+      # _@param_ `y`
+      # 
+      # _@return_ — true if location has creep on it
+      def expo_placement?: (x: (Float | Integer), y: (Float | Integer)) -> bool
+
       # sord warn - Numo::Bit wasn't able to be resolved to a constant in this project
       # Returns a grid where ony the expo locations are marked
       def expo_placement_grid: () -> Numo::Bit
@@ -1891,11 +2025,12 @@ module Sc2
       # _@return_ — z axis position between -16 and 16
       def terrain_height: (x: (Float | Integer), y: (Float | Integer)) -> Float
 
-      # sord omit - no YARD type given for "position", using untyped
       # Returns the terrain height (z) at position x and y for a point
       # 
+      # _@param_ `position`
+      # 
       # _@return_ — z axis position between -16 and 16
-      def terrain_height_for_pos: (untyped position) -> Float
+      def terrain_height_for_pos: (Sc2::Position position) -> Float
 
       # sord warn - Numo::SFloat wasn't able to be resolved to a constant in this project
       # Returns a parsed terrain_height from bot.game_info.start_raw.
@@ -1961,6 +2096,7 @@ module Sc2
 
       # sord warn - Numo::Bit wasn't able to be resolved to a constant in this project
       # Provides parsed minimap representation of creep spread
+      # Caches for 4 frames
       # 
       # _@return_ — Numo array
       def parsed_creep: () -> Numo::Bit
@@ -2035,6 +2171,13 @@ module Sc2
       # _@return_ — UnitGroup of geysers for the base
       def geysers_for_base: ((Api::Unit | Sc2::Position) base) -> Sc2::UnitGroup
 
+      # Gets geysers which have not been taken for a base or base position
+      # 
+      # _@param_ `base` — base Unit or Position
+      # 
+      # _@return_ — UnitGroup of geysers for the base
+      def geysers_open_for_base: ((Api::Unit | Sc2::Position) base) -> Sc2::UnitGroup
+
       # _@param_ `base` — base Unit or Position
       # 
       # _@return_ — UnitGroup of resources (minerals+geysers)
@@ -2070,8 +2213,15 @@ module Sc2
       # 
       # _@param_ `random` — number of nearest points to randomly choose from. 1 for nearest point.
       # 
+      # _@param_ `in_power` — whether this must be on a power field
+      # 
       # _@return_ — buildable location, nil if no buildable location found
-      def build_placement_near: (length: Integer, target: (Api::Unit | Sc2::Position), ?random: Integer) -> Api::Point2D?
+      def build_placement_near: (
+                                  length: Integer,
+                                  target: (Api::Unit | Sc2::Position),
+                                  ?random: Integer,
+                                  ?in_power: bool
+                                ) -> Api::Point2D?
 
       # Draws a grid within a unit (pylon/prisms) radius, then selects points which are placeable
       # 
@@ -2104,7 +2254,6 @@ module Sc2
                                    ?count: Integer
                                  ) -> ::Array[Api::Point2D]
 
-      # sord warn - Sc2::Location wasn't able to be resolved to a constant in this project
       # Gets a random point near a location with a positive/negative offset applied to both x and y
       # 
       # _@param_ `pos`
@@ -2115,13 +2264,12 @@ module Sc2
       # Randomly randomly adjust both x and y by a range of -3.5 or +3.5
       # geo.point_random_near(point: structures.hq.first, offset: 3.5)
       # ```
-      def point_random_near: (pos: Sc2::Location, ?offset: Float) -> Api::Point2D
+      def point_random_near: (pos: Sc2::Position, ?offset: Float) -> Api::Point2D
 
-      # sord warn - Sc2::Location wasn't able to be resolved to a constant in this project
       # _@param_ `pos`
       # 
       # _@param_ `radius`
-      def point_random_on_circle: (pos: Sc2::Location, ?radius: Float) -> Api::Point2D
+      def point_random_on_circle: (pos: Sc2::Position, ?radius: Float) -> Api::Point2D
 
       # _@return_ — player with active connection
       attr_accessor bot: (Sc2::Player | untyped)
@@ -2137,10 +2285,16 @@ module Sc2
       def on_status_change: (Symbol status) -> untyped
 
       # Determines if your game_info will be refreshed at this moment
-      # Has a hard-capped refresh of only ever 2 steps
+      # Has a hard-capped refresh of only ever 4 steps
       # In general game_info is only refreshed Player::Bot reads from pathing_grid or placement_grid
       def game_info_stale?: () -> bool
 
+      # A Hash by unit tag, holding an array of available ability ids
+      # Synchronously calls RequestQueryAvailableAbilities and caches for this game loop.
+      # 
+      # _@return_ — { unit_tag => [ability_id, ...], ... }
+      def available_abilities: () -> ::Hash[Integer, ::Array[Integer]]
+
       # sord warn - Api::PlayerCommon wasn't able to be resolved to a constant in this project
       # An alias for observation.player_common to allow easier access to i.e. common.minerals
       # 
@@ -2151,7 +2305,7 @@ module Sc2
       attr_accessor status: (Symbol | untyped)
 
       # _@return_ — current game loop
-      attr_accessor game_loop: Integer
+      attr_accessor game_loop: (Integer | untyped)
 
       # sord warn - Api::ResponseGameInfo wasn't able to be resolved to a constant in this project
       # sord warn - Api::ResponseGameInfo wasn't able to be resolved to a constant in this project
@@ -2192,6 +2346,10 @@ module Sc2
       # 
       # _@see_ `Unit#build` — and #morph
       attr_accessor spent_supply: (Integer | untyped)
+
+      # This is the last loop at which available_abilities was queried.
+      # Used to determine staleness.
+      attr_accessor available_abilities_loop: Integer
     end
 
     # Container for the previous game state, based on current bot state
@@ -2227,6 +2385,10 @@ module Sc2
       # Returns the upgrade ids which are researching or queued
       def upgrade_in_progress?: (untyped upgrade_id) -> bool
 
+      # sord omit - no YARD type given for "unit_type_id", using untyped
+      # For this unit type, tells you how many are in progress by checking orders for all it's sources.
+      def units_in_progress: (untyped unit_type_id) -> Integer
+
       # Returns static [Api::UnitTypeData] for a unit
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -2278,6 +2440,14 @@ module Sc2
       # Checks whether you have the resources to
       def can_afford_upgrade?: (untyped upgrade_id) -> bool
 
+      # Returns whether Query Available Ability is true for unit and tag
+      # Queries API if necessary. Uses batching in the background.
+      # 
+      # _@param_ `unit_tag`
+      # 
+      # _@param_ `ability_id`
+      def unit_ability_available?: (unit_tag: Integer, ability_id: Integer) -> bool
+
       # sord warn - Api::Observation wasn't able to be resolved to a constant in this project
       # sord omit - no YARD return type given, using untyped
       # Divides raw data units into various attributes on every step
@@ -2312,10 +2482,16 @@ module Sc2
       def on_status_change: (Symbol status) -> untyped
 
       # Determines if your game_info will be refreshed at this moment
-      # Has a hard-capped refresh of only ever 2 steps
+      # Has a hard-capped refresh of only ever 4 steps
       # In general game_info is only refreshed Player::Bot reads from pathing_grid or placement_grid
       def game_info_stale?: () -> bool
 
+      # A Hash by unit tag, holding an array of available ability ids
+      # Synchronously calls RequestQueryAvailableAbilities and caches for this game loop.
+      # 
+      # _@return_ — { unit_tag => [ability_id, ...], ... }
+      def available_abilities: () -> ::Hash[Integer, ::Array[Integer]]
+
       # sord warn - Api::PlayerCommon wasn't able to be resolved to a constant in this project
       # An alias for observation.player_common to allow easier access to i.e. common.minerals
       # 
@@ -2437,83 +2613,6 @@ module Sc2
     end
   end
 
-  # Holds game data from tech tree and Api::ResponseData
-  # Called once on game start
-  class Data
-    # sord warn - Api::ResponseData wasn't able to be resolved to a constant in this project
-    # _@param_ `data`
-    def initialize: (Api::ResponseData data) -> void
-
-    # sord warn - Api::AbilityData wasn't able to be resolved to a constant in this project
-    # sord warn - "Hash<Integer, Api::AbilityData] indexed data" does not appear to be a type
-    # Indexes ability data by ability id
-    # 
-    # _@param_ `abilities`
-    # 
-    # _@return_ — Hash<Integer, Api::AbilityData] indexed data
-    def abilities_from_proto: (::Array[Api::AbilityData] abilities) -> SORD_ERROR_HashIntegerApiAbilityDataindexeddata
-
-    # sord warn - "Hash<Integer, Api::UnitTypeData] indexed data" does not appear to be a type
-    # Indexes unit data by id
-    # 
-    # _@param_ `units`
-    # 
-    # _@return_ — Hash<Integer, Api::UnitTypeData] indexed data
-    def units_from_proto: (::Array[Api::UnitTypeData] units) -> SORD_ERROR_HashIntegerApiUnitTypeDataindexeddata
-
-    # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
-    # sord warn - "Hash<Integer, Api::UpgradeData] indexed data" does not appear to be a type
-    # Indexes upgrades data by id
-    # 
-    # _@param_ `upgrades`
-    # 
-    # _@return_ — Hash<Integer, Api::UpgradeData] indexed data
-    def upgrades_from_proto: (::Array[Api::UpgradeData] upgrades) -> SORD_ERROR_HashIntegerApiUpgradeDataindexeddata
-
-    # sord omit - no YARD type given for "effects", using untyped
-    # sord omit - no YARD return type given, using untyped
-    def effects_from_proto: (untyped effects) -> untyped
-
-    # sord omit - no YARD type given for "buffs", using untyped
-    # sord omit - no YARD return type given, using untyped
-    def buffs_from_proto: (untyped buffs) -> untyped
-
-    # sord omit - no YARD return type given, using untyped
-    # Overrides unit data from api to implement fixes or change context
-    # i.e. Api::UnitTypeId::ORBITALCOMMAND cost is cost-to-upgrade instead of CC + Orbital combined cost.
-    # Run once. Depends on all data already being set.
-    def override_unit_data: () -> untyped
-
-    # sord omit - no YARD return type given, using untyped
-    # Fixes mineral_cost, vespene_cost and food_required values
-    def correct_unit_type_costs: () -> untyped
-
-    # sord omit - no YARD return type given, using untyped
-    # Fixes mineral_cost_sum, vespene_cost_sum
-    def correct_unit_type_sum: () -> untyped
-
-    # sord warn - Api::AbilityData wasn't able to be resolved to a constant in this project
-    # _@return_ — AbilityId => AbilityData
-    attr_accessor abilities: (::Hash[Integer, Api::AbilityData] | untyped)
-
-    # _@return_ — UnitId => UnitTypeData
-    attr_accessor units: (::Hash[Integer, Api::UnitTypeData] | untyped)
-
-    # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
-    # _@return_ — UpgradeId => UpgradeData
-    attr_accessor upgrades: (::Hash[Integer, Api::UpgradeData] | untyped)
-
-    # sord omit - no YARD type given for :buffs, using untyped
-    # Not particularly useful data. Just use BuffId directly
-    #   @return [Hash<Integer, Api::BuffData>] BuffId => BuffData
-    attr_accessor buffs: untyped
-
-    # sord omit - no YARD type given for :effects, using untyped
-    # Not particularly useful data. Just use EffectId directly
-    #   @return [Hash<Integer, Api::EffectData>] EffectId => EffectData
-    attr_accessor effects: untyped
-  end
-
   # Manages client connection to the Api
   class Connection
     include Sc2::Connection::Requests
@@ -2751,20 +2850,16 @@ module Sc2
                ) -> Api::ResponseQuery
 
     # sord warn - Api::RequestQueryPathing wasn't able to be resolved to a constant in this project
-    # sord warn - Api::RequestQueryPathing wasn't able to be resolved to a constant in this project
-    # sord warn - Api::ResponseQueryPathing wasn't able to be resolved to a constant in this project
     # sord warn - Api::ResponseQueryPathing wasn't able to be resolved to a constant in this project
     # Queries one or more pathing queries
     # 
     # _@param_ `queries` — one or more pathing queries
     # 
     # _@return_ — one or more results depending on input size
-    def query_pathings: ((::Array[Api::RequestQueryPathing] | Api::RequestQueryPathing) queries) -> (::Array[Api::ResponseQueryPathing] | Api::ResponseQueryPathing)
+    def query_pathings: (::Array[Api::RequestQueryPathing] queries) -> ::Array[Api::ResponseQueryPathing]
 
-    # sord warn - Api::RequestQueryAvailableAbilities wasn't able to be resolved to a constant in this project
     # sord warn - Api::RequestQueryAvailableAbilities wasn't able to be resolved to a constant in this project
     # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
-    # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
     # Queries one or more ability-available checks
     # 
     # _@param_ `queries` — one or more pathing queries
@@ -2772,9 +2867,8 @@ module Sc2
     # _@param_ `ignore_resource_requirements` — Ignores requirements like food, minerals and so on.
     # 
     # _@return_ — one or more results depending on input size
-    def query_abilities: ((::Array[Api::RequestQueryAvailableAbilities] | Api::RequestQueryAvailableAbilities) queries, ?ignore_resource_requirements: bool) -> (::Array[Api::ResponseQueryAvailableAbilities] | Api::ResponseQueryAvailableAbilities)
+    def query_abilities: (::Array[Api::RequestQueryAvailableAbilities] queries, ?ignore_resource_requirements: bool) -> ::Array[Api::ResponseQueryAvailableAbilities]
 
-    # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
     # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
     # Queries available abilities for units
     # 
@@ -2783,18 +2877,27 @@ module Sc2
     # _@param_ `ignore_resource_requirements` — Ignores requirements like food, minerals and so on.
     # 
     # _@return_ — one or more results depending on input size
-    def query_abilities_for_unit_tags: ((::Array[Integer] | Integer) unit_tags, ?ignore_resource_requirements: bool) -> (::Array[Api::ResponseQueryAvailableAbilities] | Api::ResponseQueryAvailableAbilities)
+    def query_abilities_for_unit_tags: (::Array[Integer] unit_tags, ?ignore_resource_requirements: bool) -> ::Array[Api::ResponseQueryAvailableAbilities]
+
+    # sord omit - no YARD type given for "ignore_resource_requirements:", using untyped
+    # Queries available ability ids for one unit
+    # Shortened response over #query_abilities_for_unit_tags, since we know the tag already
+    # and can just return an array of ability ids.
+    # Note: Querying single units are expensive and should be batched with #query_abilities_for_unit_tags
+    # 
+    # _@param_ `unit` — a unit or a tag.
+    # 
+    # _@return_ — array of ability ids
+    def query_ability_ids_for_unit: ((Api::Unit | Integer) unit, ?ignore_resource_requirements: untyped) -> ::Array[Integer]
 
     # sord warn - Api::RequestQueryBuildingPlacement wasn't able to be resolved to a constant in this project
-    # sord warn - Api::RequestQueryBuildingPlacement wasn't able to be resolved to a constant in this project
-    # sord warn - Api::ResponseQueryBuildingPlacement wasn't able to be resolved to a constant in this project
     # sord warn - Api::ResponseQueryBuildingPlacement wasn't able to be resolved to a constant in this project
     # Queries one or more pathing queries
     # 
     # _@param_ `queries` — one or more placement queries
     # 
     # _@return_ — one or more results depending on input size
-    def query_placements: ((::Array[Api::RequestQueryBuildingPlacement] | Api::RequestQueryBuildingPlacement) queries) -> (::Array[Api::ResponseQueryBuildingPlacement] | Api::ResponseQueryBuildingPlacement)
+    def query_placements: (::Array[Api::RequestQueryBuildingPlacement] queries) -> ::Array[Api::ResponseQueryBuildingPlacement]
 
     # sord omit - no YARD return type given, using untyped
     # Generates a replay.
@@ -3051,19 +3154,15 @@ module Sc2
                  ) -> Api::ResponseQuery
 
       # sord warn - Api::RequestQueryPathing wasn't able to be resolved to a constant in this project
-      # sord warn - Api::RequestQueryPathing wasn't able to be resolved to a constant in this project
-      # sord warn - Api::ResponseQueryPathing wasn't able to be resolved to a constant in this project
       # sord warn - Api::ResponseQueryPathing wasn't able to be resolved to a constant in this project
       # Queries one or more pathing queries
       # 
       # _@param_ `queries` — one or more pathing queries
       # 
       # _@return_ — one or more results depending on input size
-      def query_pathings: ((::Array[Api::RequestQueryPathing] | Api::RequestQueryPathing) queries) -> (::Array[Api::ResponseQueryPathing] | Api::ResponseQueryPathing)
+      def query_pathings: (::Array[Api::RequestQueryPathing] queries) -> ::Array[Api::ResponseQueryPathing]
 
       # sord warn - Api::RequestQueryAvailableAbilities wasn't able to be resolved to a constant in this project
-      # sord warn - Api::RequestQueryAvailableAbilities wasn't able to be resolved to a constant in this project
-      # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
       # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
       # Queries one or more ability-available checks
       # 
@@ -3072,9 +3171,8 @@ module Sc2
       # _@param_ `ignore_resource_requirements` — Ignores requirements like food, minerals and so on.
       # 
       # _@return_ — one or more results depending on input size
-      def query_abilities: ((::Array[Api::RequestQueryAvailableAbilities] | Api::RequestQueryAvailableAbilities) queries, ?ignore_resource_requirements: bool) -> (::Array[Api::ResponseQueryAvailableAbilities] | Api::ResponseQueryAvailableAbilities)
+      def query_abilities: (::Array[Api::RequestQueryAvailableAbilities] queries, ?ignore_resource_requirements: bool) -> ::Array[Api::ResponseQueryAvailableAbilities]
 
-      # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
       # sord warn - Api::ResponseQueryAvailableAbilities wasn't able to be resolved to a constant in this project
       # Queries available abilities for units
       # 
@@ -3083,18 +3181,27 @@ module Sc2
       # _@param_ `ignore_resource_requirements` — Ignores requirements like food, minerals and so on.
       # 
       # _@return_ — one or more results depending on input size
-      def query_abilities_for_unit_tags: ((::Array[Integer] | Integer) unit_tags, ?ignore_resource_requirements: bool) -> (::Array[Api::ResponseQueryAvailableAbilities] | Api::ResponseQueryAvailableAbilities)
+      def query_abilities_for_unit_tags: (::Array[Integer] unit_tags, ?ignore_resource_requirements: bool) -> ::Array[Api::ResponseQueryAvailableAbilities]
+
+      # sord omit - no YARD type given for "ignore_resource_requirements:", using untyped
+      # Queries available ability ids for one unit
+      # Shortened response over #query_abilities_for_unit_tags, since we know the tag already
+      # and can just return an array of ability ids.
+      # Note: Querying single units are expensive and should be batched with #query_abilities_for_unit_tags
+      # 
+      # _@param_ `unit` — a unit or a tag.
+      # 
+      # _@return_ — array of ability ids
+      def query_ability_ids_for_unit: ((Api::Unit | Integer) unit, ?ignore_resource_requirements: untyped) -> ::Array[Integer]
 
       # sord warn - Api::RequestQueryBuildingPlacement wasn't able to be resolved to a constant in this project
-      # sord warn - Api::RequestQueryBuildingPlacement wasn't able to be resolved to a constant in this project
-      # sord warn - Api::ResponseQueryBuildingPlacement wasn't able to be resolved to a constant in this project
       # sord warn - Api::ResponseQueryBuildingPlacement wasn't able to be resolved to a constant in this project
       # Queries one or more pathing queries
       # 
       # _@param_ `queries` — one or more placement queries
       # 
       # _@return_ — one or more results depending on input size
-      def query_placements: ((::Array[Api::RequestQueryBuildingPlacement] | Api::RequestQueryBuildingPlacement) queries) -> (::Array[Api::ResponseQueryBuildingPlacement] | Api::ResponseQueryBuildingPlacement)
+      def query_placements: (::Array[Api::RequestQueryBuildingPlacement] queries) -> ::Array[Api::ResponseQueryBuildingPlacement]
 
       # sord omit - no YARD return type given, using untyped
       # Generates a replay.
@@ -3440,6 +3547,10 @@ module Sc2
     # Allows, i.e. Player#units.workers to fire only the first time it's called per frame
     def cached: (untyped key) -> untyped
 
+    # Returns the center (average) position of all units or nil if the group is empty.
+    # Outliers effect this point
+    def pos_centroid: () -> Api::Point2D?
+
     # Our first unit's bot object.
     # Returns nil if units are empty, so use safetly operator bot&.method(...)
     # 
@@ -3458,7 +3569,7 @@ module Sc2
     # sord omit - no YARD return type given, using untyped
     # Builds target unit type, i.e. issuing a build command to worker.build(...Api::UnitTypeId::BARRACKS)
     # 
-    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
     # 
     # _@param_ `target` — is a unit tag or a Api::Point2D. Nil for addons/orbital
     # 
@@ -3469,12 +3580,12 @@ module Sc2
     # Warps in unit type at target (location or pylon)
     # Will only have affect is this group consists of warp gates, i.e. bot.structures.warpgates
     # 
-    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
     # 
     # _@param_ `target` — a point, which should be inside an energy source
     # 
     # _@param_ `queue_command` — shift+command
-    def warp: (unit_type_id: Integer, ?target: Api::Point2D?, ?queue_command: bool) -> untyped
+    def warp: (unit_type_id: Integer, target: Api::Point2D, ?queue_command: bool) -> untyped
 
     # sord omit - no YARD return type given, using untyped
     # Research a specific upgrade at one of these structures
@@ -3640,9 +3751,26 @@ module Sc2
 
     # Selects only units which have finished constructing, i.o.w. build_progress == 1.0
     # 
-    # _@return_ — gas structures
+    # _@return_ — complete unit group
     def completed: () -> UnitGroup
 
+    # Selects only units which have finished constructing, i.o.w. build_progress != 1.0
+    # 
+    # _@return_ — incomplete unit group
+    def incomplete: () -> UnitGroup
+
+    # sord omit - no YARD return type given, using untyped
+    # Selects only units which do not have orders
+    def idle: () -> untyped
+
+    # Selects units which have this ability available\
+    # Queries API if necessary
+    # 
+    # _@param_ `ability_id`
+    # 
+    # _@return_ — units which have the ability available
+    def ability_available?: (Integer ability_id) -> UnitGroup
+
     # Selects mineral fields
     # 
     # _@return_ — mineral fields
@@ -3697,6 +3825,9 @@ module Sc2
     # Selects overlords
     def overlords: () -> Sc2::UnitGroup
 
+    # Selects overseers
+    def overseers: () -> Sc2::UnitGroup
+
     # Selects creep tumors (all)
     # CREEPTUMORQUEEN is still building & burrowing
     # while CREEPTUMOR was spread from another tumor still building & burrowing
@@ -3784,10 +3915,10 @@ module Sc2
       def initialize: ((Api::Unit | ::Hash[Integer, Api::Unit] | ::Array[Api::Unit] | Sc2::UnitGroup)? unit_group) -> void
 
       # Does the opposite of selector and returns those values for parent
-      def select_type: () -> UnitGroup
+      def select: () -> Sc2::UnitGroup
 
       # Does the opposite of selector and returns those values for parent
-      def reject_type: () -> UnitGroup
+      def reject: () -> Sc2::UnitGroup
 
       # Returns the value of attribute parent.
       attr_accessor parent: untyped
@@ -4131,10 +4262,17 @@ module Sc2
   end
 
   # A unified construct that tames Api::* messages which contain location data
-  # Items which are of type Sc2::Location will have #x and #y property at the least.
+  # Items which are of type Sc2::Position will have #x and #y property at the least.
   module Position
     TOLERANCE: untyped
 
+    # sord omit - no YARD type given for "other", using untyped
+    # sord omit - no YARD return type given, using untyped
+    # Loose equality matches on floats x and y.
+    # We never check z-axis, because the map is single-level.
+    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
+    def ==: (untyped other) -> untyped
+
     # A new point representing the sum of this point and the other point.
     # 
     # _@param_ `other` — The other point/number to add.
@@ -4155,15 +4293,26 @@ module Sc2
     # _@return_ — A new point representing this point divided by the scalar.
     def divide: (Float scalar) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Bug: Psych implements method 'y' on Kernel, but protobuf uses method_missing to read AbstractMethod
-    # We send method missing ourselves when y to fix this chain.
-    def y: () -> untyped
+    # Returns x coordinate
+    def x: () -> Float
+
+    # sord infer - inferred type of parameter "x" as Float using getter's return type
+    # Sets x coordinate
+    def x=: (Float x) -> Float
+
+    # Returns y coordinate
+    def y: () -> Float
+
+    # sord infer - inferred type of parameter "y" as Float using getter's return type
+    # Sets y coordinate
+    def y=: (Float y) -> Float
 
     # Randomly adjusts both x and y by a range of: -offset..offset
     # 
     # _@param_ `offset`
-    def random_offset: (Float offset) -> Api::Point2D
+    # 
+    # _@return_ — new Position
+    def random_offset: (Float offset) -> Sc2::Position
 
     # sord omit - no YARD type given for "offset", using untyped
     # Changes this point's x and y by the supplied offset
@@ -4175,15 +4324,15 @@ module Sc2
     # sord omit - no YARD type given for "y", using untyped
     # Creates a new point with x and y which is offset
     # 
-    # _@return_ — self
-    def offset: (untyped x, untyped y) -> Api::Point2D
+    # _@return_ — new Position
+    def offset: (?untyped x, ?untyped y) -> Sc2::Position
 
     # sord omit - no YARD type given for "x", using untyped
     # sord omit - no YARD type given for "y", using untyped
     # Changes this point's x and y by the supplied offset
     # 
     # _@return_ — self
-    def offset!: (untyped x, untyped y) -> Sc2::Position
+    def offset!: (?untyped x, ?untyped y) -> Sc2::Position
 
     # For vector returns the magnitude, synonymous with Math.hypot
     def magnitude: () -> Float
@@ -4253,7 +4402,7 @@ module Sc2
   end
 end
 
-# Generated from stableid.json, do not edit.
+# This class was partially generated with the help of AI.
 module Api
   # Constant reference of Buff ids
   module BuffId
@@ -4547,23 +4696,16 @@ module Api
     ACCELERATIONZONETEMPORALFIELD: untyped
     ACCELERATIONZONEFLYINGTEMPORALFIELD: untyped
     INHIBITORZONEFLYINGTEMPORALFIELD: untyped
-    DUMMYBUFF000: untyped
+    LOADOUTSPRAYTRACKER: untyped
     INHIBITORZONETEMPORALFIELD: untyped
+    CLOAKFIELD: untyped
     RESONATINGGLAIVESPHASESHIFT: untyped
     NEURALPARASITECHILDREN: untyped
     AMORPHOUSARMORCLOUD: untyped
     RAVENSHREDDERMISSILEARMORREDUCTIONUISUBTRUCT: untyped
-    BATTERYOVERCHARGE: untyped
-    DUMMYBUFF001: untyped
-    DUMMYBUFF002: untyped
-    DUMMYBUFF003: untyped
-    DUMMYBUFF004: untyped
-    DUMMYBUFF005: untyped
-    ONCREEPQUEEN: untyped
-    LOADOUTSPRAYTRACKER: untyped
-    CLOAKFIELD: untyped
     TAKENDAMAGE: untyped
     RAVENSCRAMBLERMISSILECARRIER: untyped
+    BATTERYOVERCHARGE: untyped
 
     # sord omit - no YARD return type given, using untyped
     def self._250MMSTRIKECANNONS: () -> untyped
@@ -4684,6 +4826,21 @@ module Api
     # _@return_ — ability_id
     def self.upgrade_ability_data: (Integer source_unit_type_id) -> ::Hash[Integer, ::Hash[untyped, untyped]]
 
+    # sord omit - no YARD type given for "unit_type_id", using untyped
+    # Returns known abilities fo unit type
+    # 
+    # _@return_ — array of ability_ids
+    def self.unit_abilities: (untyped unit_type_id) -> ::Array[Integer]
+
+    # sord omit - no YARD return type given, using untyped
+    def standard_abilities: () -> untyped
+
+    # sord omit - no YARD type given for "unit_type_id", using untyped
+    # Returns special abilities, excluding basic start/stop/attack commands
+    # 
+    # _@return_ — array of ability_ids
+    def self.unit_special_abilities: (untyped unit_type_id) -> ::Array[Integer]
+
     # sord omit - no YARD return type given, using untyped
     def self.unit_type_creation_abilities_data: () -> untyped
 
@@ -5974,7 +6131,6 @@ module Api
     NEXUSSHIELDRECHARGEONPYLON_NEXUSSHIELDRECHARGEONPYLON: untyped
     INFESTORENSNARE_INFESTORENSNARE: untyped
     EFFECT_RESTORE: untyped
-    SHIELDBATTERYRECHARGECHANNELED_STOP: untyped
     NEXUSSHIELDOVERCHARGE_NEXUSSHIELDOVERCHARGE: untyped
     NEXUSSHIELDOVERCHARGEOFF_NEXUSSHIELDOVERCHARGEOFF: untyped
     ATTACK_BATTLECRUISER: untyped
@@ -6010,317 +6166,14 @@ module Api
     LOADOUTSPRAY_LOADOUTSPRAY12: untyped
     LOADOUTSPRAY_LOADOUTSPRAY13: untyped
     LOADOUTSPRAY_LOADOUTSPRAY14: untyped
-    DUMMYABIL0_DUMMYABIL0: untyped
-    DUMMYABIL1_DUMMYABIL1: untyped
-    DUMMYABIL2_DUMMYABIL2: untyped
-    DUMMYABIL3_DUMMYABIL3: untyped
-    DUMMYABIL4_DUMMYABIL4: untyped
-    DUMMYABIL5_DUMMYABIL5: untyped
-    DUMMYABIL6_DUMMYABIL6: untyped
-    DUMMYABIL7_DUMMYABIL7: untyped
-    DUMMYABIL8_DUMMYABIL8: untyped
-    DUMMYABIL9_DUMMYABIL9: untyped
-    DUMMYABIL10_DUMMYABIL10: untyped
-    DUMMYABIL11_DUMMYABIL11: untyped
-    DUMMYABIL12_DUMMYABIL12: untyped
-    DUMMYABIL13_DUMMYABIL13: untyped
-    DUMMYABIL14_DUMMYABIL14: untyped
-    DUMMYABIL15_DUMMYABIL15: untyped
-    DUMMYABIL16_DUMMYABIL16: untyped
-    DUMMYABIL17_DUMMYABIL17: untyped
-    DUMMYABIL18_DUMMYABIL18: untyped
-    DUMMYABIL19_DUMMYABIL19: untyped
-    DUMMYABIL20_DUMMYABIL20: untyped
-    DUMMYABIL21_DUMMYABIL21: untyped
-    DUMMYABIL22_DUMMYABIL22: untyped
-    DUMMYABIL23_DUMMYABIL23: untyped
-    DUMMYABIL24_DUMMYABIL24: untyped
-    DUMMYABIL25_DUMMYABIL25: untyped
-    DUMMYABIL26_DUMMYABIL26: untyped
-    DUMMYABIL27_DUMMYABIL27: untyped
-    DUMMYABIL28_DUMMYABIL28: untyped
-    DUMMYABIL29_DUMMYABIL29: untyped
-    DUMMYABIL30_DUMMYABIL30: untyped
-    DUMMYABIL31_DUMMYABIL31: untyped
-    DUMMYABIL32_DUMMYABIL32: untyped
-    DUMMYABIL33_DUMMYABIL33: untyped
-    DUMMYABIL34_DUMMYABIL34: untyped
-    DUMMYABIL35_DUMMYABIL35: untyped
-    DUMMYABIL36_DUMMYABIL36: untyped
-    DUMMYABIL37_DUMMYABIL37: untyped
-    DUMMYABIL38_DUMMYABIL38: untyped
-    DUMMYABIL39_DUMMYABIL39: untyped
-    DUMMYABIL40_DUMMYABIL40: untyped
-    DUMMYABIL41_DUMMYABIL41: untyped
-    DUMMYABIL42_DUMMYABIL42: untyped
-    DUMMYABIL43_DUMMYABIL43: untyped
-    DUMMYABIL44_DUMMYABIL44: untyped
-    DUMMYABIL45_DUMMYABIL45: untyped
-    DUMMYABIL46_DUMMYABIL46: untyped
-    DUMMYABIL47_DUMMYABIL47: untyped
-    DUMMYABIL48_DUMMYABIL48: untyped
-    DUMMYABIL49_DUMMYABIL49: untyped
-    DUMMYABIL50_DUMMYABIL50: untyped
-    DUMMYABIL51_DUMMYABIL51: untyped
-    DUMMYABIL52_DUMMYABIL52: untyped
-    DUMMYABIL53_DUMMYABIL53: untyped
-    DUMMYABIL54_DUMMYABIL54: untyped
-    DUMMYABIL55_DUMMYABIL55: untyped
-    DUMMYABIL56_DUMMYABIL56: untyped
-    DUMMYABIL57_DUMMYABIL57: untyped
-    DUMMYABIL58_DUMMYABIL58: untyped
-    DUMMYABIL59_DUMMYABIL59: untyped
-    DUMMYABIL60_DUMMYABIL60: untyped
-    DUMMYABIL61_DUMMYABIL61: untyped
-    DUMMYABIL62_DUMMYABIL62: untyped
-    DUMMYABIL63_DUMMYABIL63: untyped
-    DUMMYABIL64_DUMMYABIL64: untyped
-    DUMMYABIL65_DUMMYABIL65: untyped
-    DUMMYABIL66_DUMMYABIL66: untyped
-    DUMMYABIL67_DUMMYABIL67: untyped
-    DUMMYABIL68_DUMMYABIL68: untyped
-    DUMMYABIL69_DUMMYABIL69: untyped
-    DUMMYABIL70_DUMMYABIL70: untyped
-    DUMMYABIL71_DUMMYABIL71: untyped
-    DUMMYABIL72_DUMMYABIL72: untyped
-    DUMMYABIL73_DUMMYABIL73: untyped
-    DUMMYABIL74_DUMMYABIL74: untyped
-    DUMMYABIL75_DUMMYABIL75: untyped
-    DUMMYABIL76_DUMMYABIL76: untyped
-    DUMMYABIL77_DUMMYABIL77: untyped
-    DUMMYABIL78_DUMMYABIL78: untyped
-    DUMMYABIL79_DUMMYABIL79: untyped
-    DUMMYABIL80_DUMMYABIL80: untyped
-    DUMMYABIL81_DUMMYABIL81: untyped
-    DUMMYABIL82_DUMMYABIL82: untyped
-    DUMMYABIL83_DUMMYABIL83: untyped
-    DUMMYABIL84_DUMMYABIL84: untyped
-    DUMMYABIL85_DUMMYABIL85: untyped
-    DUMMYABIL86_DUMMYABIL86: untyped
-    DUMMYABIL87_DUMMYABIL87: untyped
-    DUMMYABIL88_DUMMYABIL88: untyped
-    DUMMYABIL89_DUMMYABIL89: untyped
-    DUMMYABIL90_DUMMYABIL90: untyped
-    DUMMYABIL91_DUMMYABIL91: untyped
-    DUMMYABIL92_DUMMYABIL92: untyped
-    DUMMYABIL93_DUMMYABIL93: untyped
-    DUMMYABIL94_DUMMYABIL94: untyped
-    DUMMYABIL95_DUMMYABIL95: untyped
-    DUMMYABIL96_DUMMYABIL96: untyped
-    DUMMYABIL97_DUMMYABIL97: untyped
-    DUMMYABIL98_DUMMYABIL98: untyped
-    DUMMYABIL99_DUMMYABIL99: untyped
-    DUMMYABIL100_DUMMYABIL100: untyped
-    DUMMYABIL101_DUMMYABIL101: untyped
-    DUMMYABIL102_DUMMYABIL102: untyped
-    DUMMYABIL103_DUMMYABIL103: untyped
-    DUMMYABIL104_DUMMYABIL104: untyped
-    DUMMYABIL105_DUMMYABIL105: untyped
-    DUMMYABIL106_DUMMYABIL106: untyped
-    DUMMYABIL107_DUMMYABIL107: untyped
-    DUMMYABIL108_DUMMYABIL108: untyped
-    DUMMYABIL109_DUMMYABIL109: untyped
-    DUMMYABIL110_DUMMYABIL110: untyped
-    DUMMYABIL111_DUMMYABIL111: untyped
-    DUMMYABIL112_DUMMYABIL112: untyped
-    DUMMYABIL113_DUMMYABIL113: untyped
-    DUMMYABIL114_DUMMYABIL114: untyped
-    DUMMYABIL115_DUMMYABIL115: untyped
-    DUMMYABIL116_DUMMYABIL116: untyped
-    DUMMYABIL117_DUMMYABIL117: untyped
-    DUMMYABIL118_DUMMYABIL118: untyped
-    DUMMYABIL119_DUMMYABIL119: untyped
-    DUMMYABIL120_DUMMYABIL120: untyped
-    DUMMYABIL121_DUMMYABIL121: untyped
-    DUMMYABIL122_DUMMYABIL122: untyped
-    DUMMYABIL123_DUMMYABIL123: untyped
-    DUMMYABIL124_DUMMYABIL124: untyped
-    DUMMYABIL125_DUMMYABIL125: untyped
-    DUMMYABIL126_DUMMYABIL126: untyped
-    DUMMYABIL127_DUMMYABIL127: untyped
-    DUMMYABIL128_DUMMYABIL128: untyped
-    DUMMYABIL129_DUMMYABIL129: untyped
-    DUMMYABIL130_DUMMYABIL130: untyped
-    DUMMYABIL131_DUMMYABIL131: untyped
-    DUMMYABIL132_DUMMYABIL132: untyped
-    DUMMYABIL133_DUMMYABIL133: untyped
-    DUMMYABIL134_DUMMYABIL134: untyped
-    DUMMYABIL135_DUMMYABIL135: untyped
-    DUMMYABIL136_DUMMYABIL136: untyped
-    DUMMYABIL137_DUMMYABIL137: untyped
-    DUMMYABIL138_DUMMYABIL138: untyped
-    DUMMYABIL139_DUMMYABIL139: untyped
-    DUMMYABIL140_DUMMYABIL140: untyped
-    DUMMYABIL141_DUMMYABIL141: untyped
-    DUMMYABIL142_DUMMYABIL142: untyped
-    DUMMYABIL143_DUMMYABIL143: untyped
-    DUMMYABIL144_DUMMYABIL144: untyped
-    DUMMYABIL145_DUMMYABIL145: untyped
-    DUMMYABIL146_DUMMYABIL146: untyped
-    DUMMYABIL147_DUMMYABIL147: untyped
-    DUMMYABIL148_DUMMYABIL148: untyped
-    DUMMYABIL149_DUMMYABIL149: untyped
-    DUMMYABIL150_DUMMYABIL150: untyped
-    DUMMYABIL151_DUMMYABIL151: untyped
-    DUMMYABIL152_DUMMYABIL152: untyped
-    DUMMYABIL153_DUMMYABIL153: untyped
-    DUMMYABIL154_DUMMYABIL154: untyped
-    DUMMYABIL155_DUMMYABIL155: untyped
-    DUMMYABIL156_DUMMYABIL156: untyped
-    DUMMYABIL157_DUMMYABIL157: untyped
-    DUMMYABIL158_DUMMYABIL158: untyped
-    DUMMYABIL159_DUMMYABIL159: untyped
-    DUMMYABIL160_DUMMYABIL160: untyped
-    DUMMYABIL161_DUMMYABIL161: untyped
-    DUMMYABIL162_DUMMYABIL162: untyped
-    DUMMYABIL163_DUMMYABIL163: untyped
-    DUMMYABIL164_DUMMYABIL164: untyped
-    DUMMYABIL165_DUMMYABIL165: untyped
-    DUMMYABIL166_DUMMYABIL166: untyped
-    DUMMYABIL167_DUMMYABIL167: untyped
-    DUMMYABIL168_DUMMYABIL168: untyped
-    DUMMYABIL169_DUMMYABIL169: untyped
-    DUMMYABIL170_DUMMYABIL170: untyped
-    DUMMYABIL171_DUMMYABIL171: untyped
-    DUMMYABIL172_DUMMYABIL172: untyped
-    DUMMYABIL173_DUMMYABIL173: untyped
-    DUMMYABIL174_DUMMYABIL174: untyped
-    DUMMYABIL175_DUMMYABIL175: untyped
-    DUMMYABIL176_DUMMYABIL176: untyped
-    DUMMYABIL177_DUMMYABIL177: untyped
-    DUMMYABIL178_DUMMYABIL178: untyped
-    DUMMYABIL179_DUMMYABIL179: untyped
-    DUMMYABIL180_DUMMYABIL180: untyped
-    DUMMYABIL181_DUMMYABIL181: untyped
-    DUMMYABIL182_DUMMYABIL182: untyped
-    DUMMYABIL183_DUMMYABIL183: untyped
-    DUMMYABIL184_DUMMYABIL184: untyped
-    DUMMYABIL185_DUMMYABIL185: untyped
-    DUMMYABIL186_DUMMYABIL186: untyped
-    DUMMYABIL187_DUMMYABIL187: untyped
-    DUMMYABIL188_DUMMYABIL188: untyped
-    DUMMYABIL189_DUMMYABIL189: untyped
-    DUMMYABIL190_DUMMYABIL190: untyped
-    DUMMYABIL191_DUMMYABIL191: untyped
-    DUMMYABIL192_DUMMYABIL192: untyped
-    DUMMYABIL193_DUMMYABIL193: untyped
-    DUMMYABIL194_DUMMYABIL194: untyped
-    DUMMYABIL195_DUMMYABIL195: untyped
-    DUMMYABIL196_DUMMYABIL196: untyped
-    DUMMYABIL197_DUMMYABIL197: untyped
-    DUMMYABIL198_DUMMYABIL198: untyped
-    DUMMYABIL199_DUMMYABIL199: untyped
-    DUMMYABIL200_DUMMYABIL200: untyped
-    DUMMYABIL201_DUMMYABIL201: untyped
-    DUMMYABIL202_DUMMYABIL202: untyped
-    DUMMYABIL203_DUMMYABIL203: untyped
-    DUMMYABIL204_DUMMYABIL204: untyped
-    DUMMYABIL205_DUMMYABIL205: untyped
-    DUMMYABIL206_DUMMYABIL206: untyped
-    DUMMYABIL207_DUMMYABIL207: untyped
-    DUMMYABIL208_DUMMYABIL208: untyped
-    DUMMYABIL209_DUMMYABIL209: untyped
-    DUMMYABIL210_DUMMYABIL210: untyped
-    DUMMYABIL211_DUMMYABIL211: untyped
-    DUMMYABIL212_DUMMYABIL212: untyped
-    DUMMYABIL213_DUMMYABIL213: untyped
-    DUMMYABIL214_DUMMYABIL214: untyped
-    DUMMYABIL215_DUMMYABIL215: untyped
-    DUMMYABIL216_DUMMYABIL216: untyped
-    DUMMYABIL217_DUMMYABIL217: untyped
-    DUMMYABIL218_DUMMYABIL218: untyped
-    DUMMYABIL219_DUMMYABIL219: untyped
-    DUMMYABIL220_DUMMYABIL220: untyped
-    DUMMYABIL221_DUMMYABIL221: untyped
-    DUMMYABIL222_DUMMYABIL222: untyped
-    DUMMYABIL223_DUMMYABIL223: untyped
-    DUMMYABIL224_DUMMYABIL224: untyped
-    DUMMYABIL225_DUMMYABIL225: untyped
-    DUMMYABIL226_DUMMYABIL226: untyped
-    DUMMYABIL227_DUMMYABIL227: untyped
-    DUMMYABIL228_DUMMYABIL228: untyped
-    DUMMYABIL229_DUMMYABIL229: untyped
-    DUMMYABIL230_DUMMYABIL230: untyped
-    DUMMYABIL231_DUMMYABIL231: untyped
-    DUMMYABIL232_DUMMYABIL232: untyped
-    DUMMYABIL233_DUMMYABIL233: untyped
-    DUMMYABIL234_DUMMYABIL234: untyped
-    DUMMYABIL235_DUMMYABIL235: untyped
-    DUMMYABIL236_DUMMYABIL236: untyped
-    DUMMYABIL237_DUMMYABIL237: untyped
-    DUMMYABIL238_DUMMYABIL238: untyped
-    DUMMYABIL239_DUMMYABIL239: untyped
-    DUMMYABIL240_DUMMYABIL240: untyped
-    DUMMYABIL241_DUMMYABIL241: untyped
-    DUMMYABIL242_DUMMYABIL242: untyped
-    DUMMYABIL243_DUMMYABIL243: untyped
-    DUMMYABIL244_DUMMYABIL244: untyped
-    DUMMYABIL245_DUMMYABIL245: untyped
-    DUMMYABIL246_DUMMYABIL246: untyped
-    DUMMYABIL247_DUMMYABIL247: untyped
-    DUMMYABIL248_DUMMYABIL248: untyped
-    DUMMYABIL249_DUMMYABIL249: untyped
-    DUMMYABIL250_DUMMYABIL250: untyped
-    DUMMYABIL251_DUMMYABIL251: untyped
-    DUMMYABIL252_DUMMYABIL252: untyped
-    DUMMYABIL253_DUMMYABIL253: untyped
-    DUMMYABIL254_DUMMYABIL254: untyped
-    DUMMYABIL255_DUMMYABIL255: untyped
-    DUMMYABIL256_DUMMYABIL256: untyped
-    DUMMYABIL257_DUMMYABIL257: untyped
-    DUMMYABIL258_DUMMYABIL258: untyped
-    DUMMYABIL259_DUMMYABIL259: untyped
-    DUMMYABIL260_DUMMYABIL260: untyped
-    DUMMYABIL261_DUMMYABIL261: untyped
-    DUMMYABIL262_DUMMYABIL262: untyped
-    DUMMYABIL263_DUMMYABIL263: untyped
-    DUMMYABIL264_DUMMYABIL264: untyped
-    DUMMYABIL265_DUMMYABIL265: untyped
-    DUMMYABIL266_DUMMYABIL266: untyped
-    DUMMYABIL267_DUMMYABIL267: untyped
-    DUMMYABIL268_DUMMYABIL268: untyped
-    DUMMYABIL269_DUMMYABIL269: untyped
-    DUMMYABIL270_DUMMYABIL270: untyped
-    DUMMYABIL271_DUMMYABIL271: untyped
-    DUMMYABIL272_DUMMYABIL272: untyped
-    DUMMYABIL273_DUMMYABIL273: untyped
-    DUMMYABIL274_DUMMYABIL274: untyped
-    DUMMYABIL275_DUMMYABIL275: untyped
-    DUMMYABIL276_DUMMYABIL276: untyped
-    DUMMYABIL277_DUMMYABIL277: untyped
-    DUMMYABIL278_DUMMYABIL278: untyped
-    DUMMYABIL279_DUMMYABIL279: untyped
-    DUMMYABIL280_DUMMYABIL280: untyped
-    DUMMYABIL281_DUMMYABIL281: untyped
-    DUMMYABIL282_DUMMYABIL282: untyped
-    DUMMYABIL283_DUMMYABIL283: untyped
-    DUMMYABIL284_DUMMYABIL284: untyped
-    DUMMYABIL285_DUMMYABIL285: untyped
-    DUMMYABIL286_DUMMYABIL286: untyped
-    DUMMYABIL287_DUMMYABIL287: untyped
-    DUMMYABIL288_DUMMYABIL288: untyped
-    DUMMYABIL289_DUMMYABIL289: untyped
-    DUMMYABIL290_DUMMYABIL290: untyped
-    DUMMYABIL291_DUMMYABIL291: untyped
-    DUMMYABIL292_DUMMYABIL292: untyped
-    DUMMYABIL293_DUMMYABIL293: untyped
-    DUMMYABIL294_DUMMYABIL294: untyped
-    DUMMYABIL295_DUMMYABIL295: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN_CANCEL: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN_CANCEL: untyped
     BATTERYOVERCHARGE_BATTERYOVERCHARGE: untyped
-    DUMMYABIL296_DUMMYABIL296: untyped
     AMORPHOUSARMORCLOUD_AMORPHOUSARMORCLOUD: untyped
-    DUMMYABIL297_DUMMYABIL297: untyped
     SHIELDBATTERYRECHARGEEX5_SHIELDBATTERYRECHARGE: untyped
     SHIELDBATTERYRECHARGEEX5_STOP: untyped
-    DUMMYABIL298_DUMMYABIL298: untyped
-    DUMMYABIL299_DUMMYABIL299: untyped
-    DUMMYABIL300_DUMMYABIL300: untyped
-    DUMMYABIL301_DUMMYABIL301: untyped
-    DUMMYABIL302_DUMMYABIL302: untyped
     MORPHTOBANELING_BANELING: untyped
     MORPHTOBANELING_CANCEL: untyped
-    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN_CANCEL: untyped
-    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN_CANCEL: untyped
     MOTHERSHIPCLOAK_ORACLECLOAKFIELD: untyped
 
     # sord omit - no YARD return type given, using untyped
@@ -6646,15 +6499,15 @@ module Api
     DIGGINGCLAWS: untyped
     CARRIERCARRIERCAPACITY: untyped
     CARRIERLEASHRANGEUPGRADE: untyped
+    HURRICANETHRUSTERS: untyped
     TEMPESTGROUNDATTACKUPGRADE: untyped
     MICROBIALSHROUD: untyped
+    INTERFERENCEMATRIX: untyped
     SUNDERINGIMPACT: untyped
     AMPLIFIEDSHIELDING: untyped
     PSIONICAMPLIFIERS: untyped
     SECRETEDCOATING: untyped
     ENHANCEDSHOCKWAVES: untyped
-    HURRICANETHRUSTERS: untyped
-    INTERFERENCEMATRIX: untyped
 
     # sord omit - no YARD return type given, using untyped
     def self._330MMBARRAGECANNONS: () -> untyped
@@ -8650,64 +8503,12 @@ module Api
     MINERALFIELD450: untyped
     MINERALFIELDOPAQUE: untyped
     MINERALFIELDOPAQUE900: untyped
-    MECHAZERGLINGACGLUESCREENDUMMY_2: untyped
-    MECHABANELINGACGLUESCREENDUMMY_2: untyped
-    MECHAHYDRALISKACGLUESCREENDUMMY_2: untyped
-    MECHAINFESTORACGLUESCREENDUMMY_2: untyped
-    MECHACORRUPTORACGLUESCREENDUMMY_2: untyped
-    MECHAULTRALISKACGLUESCREENDUMMY_2: untyped
-    MECHAOVERSEERACGLUESCREENDUMMY_2: untyped
-    MECHALURKERACGLUESCREENDUMMY_2: untyped
-    MECHABATTLECARRIERLORDACGLUESCREENDUMMY_2: untyped
-    MECHASPINECRAWLERACGLUESCREENDUMMY_2: untyped
-    MECHASPORECRAWLERACGLUESCREENDUMMY_2: untyped
-    TROOPERMENGSKACGLUESCREENDUMMY_2: untyped
-    MEDIVACMENGSKACGLUESCREENDUMMY_2: untyped
-    BLIMPMENGSKACGLUESCREENDUMMY_2: untyped
-    MARAUDERMENGSKACGLUESCREENDUMMY_2: untyped
-    GHOSTMENGSKACGLUESCREENDUMMY_2: untyped
-    SIEGETANKMENGSKACGLUESCREENDUMMY_2: untyped
-    THORMENGSKACGLUESCREENDUMMY_2: untyped
-    VIKINGMENGSKACGLUESCREENDUMMY_2: untyped
-    BATTLECRUISERMENGSKACGLUESCREENDUMMY_2: untyped
-    BUNKERDEPOTMENGSKACGLUESCREENDUMMY_2: untyped
-    MISSILETURRETMENGSKACGLUESCREENDUMMY_2: untyped
-    ARTILLERYMENGSKACGLUESCREENDUMMY_2: untyped
-    LOADOUTSPRAY1_2: untyped
-    LOADOUTSPRAY2_2: untyped
-    LOADOUTSPRAY3_2: untyped
-    LOADOUTSPRAY4_2: untyped
-    LOADOUTSPRAY5_2: untyped
-    LOADOUTSPRAY6_2: untyped
-    LOADOUTSPRAY7_2: untyped
-    LOADOUTSPRAY8_2: untyped
-    LOADOUTSPRAY9_2: untyped
-    LOADOUTSPRAY10_2: untyped
-    LOADOUTSPRAY11_2: untyped
-    LOADOUTSPRAY12_2: untyped
-    LOADOUTSPRAY13_2: untyped
-    LOADOUTSPRAY14_2: untyped
     COLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN: untyped
     COLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN: untyped
     COLLAPSIBLEROCKTOWERPUSHUNITRAMPLEFTGREEN: untyped
     COLLAPSIBLEROCKTOWERPUSHUNITRAMPRIGHTGREEN: untyped
     COLLAPSIBLEROCKTOWERRAMPLEFTGREEN: untyped
     COLLAPSIBLEROCKTOWERRAMPRIGHTGREEN: untyped
-    DUMMYUNIT000: untyped
-    DUMMYUNIT001: untyped
-    DUMMYUNIT002: untyped
-    DUMMYUNIT003: untyped
-    DUMMYUNIT004: untyped
-    DUMMYUNIT005: untyped
-    DUMMYUNIT006: untyped
-    DUMMYUNIT007: untyped
-    DUMMYUNIT008: untyped
-    DUMMYUNIT009: untyped
-    DUMMYUNIT010: untyped
-    DUMMYUNIT011: untyped
-    DUMMYUNIT012: untyped
-    DUMMYUNIT013: untyped
-    DUMMYUNIT014: untyped
 
     # sord omit - no YARD return type given, using untyped
     def self._4SLOTBAG: () -> untyped
@@ -8749,6 +8550,15 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def hash: () -> untyped
 
+    # Returns an integer unique identifier
+    # If the unit goes out of vision and is snapshot-able, they get a random id
+    # - Such a unit gets the same unit tag when it re-enters vision
+    def tag: () -> Integer
+
+    # sord infer - inferred type of parameter "tag" as Integer using getter's return type
+    # Sets unit tag
+    def tag=: (Integer tag) -> Integer
+
     # Returns static [Api::UnitTypeData] for a unit
     def unit_data: () -> Api::UnitTypeData
 
@@ -8827,6 +8637,15 @@ module Api
     # _@return_ — whether unit has attribute :Summoned
     def is_summoned?: () -> bool
 
+    # Whether unit is effected by buff_id
+    # 
+    # _@param_ `buff_id`
+    # 
+    # ```ruby
+    # unit.has_buff??(Api::BuffId::QUEENSPAWNLARVATIMER)
+    # ```
+    def has_buff?: (Integer buff_id) -> bool
+
     # sord omit - no YARD return type given, using untyped
     # Performs action on this unit
     # 
@@ -8883,7 +8702,7 @@ module Api
     # sord omit - no YARD return type given, using untyped
     # Builds target unit type, i.e. issuing a build command to worker.build(...Api::UnitTypeId::BARRACKS)
     # 
-    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
     # 
     # _@param_ `target` — is a unit tag or a Api::Point2D. Nil for addons/orbital
     # 
@@ -8901,7 +8720,7 @@ module Api
     # sord omit - no YARD return type given, using untyped
     # Research a specific upgrade
     # 
-    # _@param_ `upgrade_id` — Api::UnitTypeId the unit type which will do the creation
+    # _@param_ `upgrade_id` — Api::UnitTypeId the unit type you wish to research
     # 
     # _@param_ `queue_command` — shift+command
     def research: (upgrade_id: Integer, ?queue_command: bool) -> untyped
@@ -8978,6 +8797,12 @@ module Api
     # ```
     def can_attack?: (unit: Api::Unit, ?weapon_index: Integer, ?ability_id: Integer?) -> bool
 
+    # Returns whether this unit has an ability available
+    # Queries API if necessary
+    # 
+    # _@param_ `ability_id`
+    def ability_available?: (Integer ability_id) -> bool
+
     # sord warn - Api::unit wasn't able to be resolved to a constant in this project
     # sord warn - Api::Weapon wasn't able to be resolved to a constant in this project
     # Checks whether a weapon can target a unit
@@ -9052,6 +8877,22 @@ module Api
     # For Terran builds a tech lab add-on on the current structure
     def build_tech_lab: (?queue_command: untyped) -> void
 
+    # sord omit - no YARD return type given, using untyped
+    # Warps in unit type at target (location or pylon)
+    # Only works if the source is a Warp Gate
+    # 
+    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
+    # 
+    # _@param_ `target` — a point, which should be inside an energy source
+    # 
+    # _@param_ `queue_command` — shift+command
+    def warp: (unit_type_id: Integer, target: Api::Point2D, ?queue_command: bool) -> untyped
+
+    # Returns true if unit does not have orders
+    # 
+    # _@return_ — whether unit is idle
+    def is_idle?: () -> bool
+
     # sord omit - no YARD type given for "abilities", using untyped
     # sord omit - no YARD type given for "target:", using untyped
     # Reduces repetition in the is_*action*?(target:) methods
@@ -9151,6 +8992,7 @@ module Api
   # Protobuf virtual class.
   class Point < Google::Protobuf::AbstractMessage
     include Sc2::Position
+    include Api::PointDistanceExtension
     include Api::PointExtension
     extend Api::PointExtension::ClassMethods
 
@@ -9176,6 +9018,13 @@ module Api
     # Creates a Point2D using x and y
     def to_p2d: () -> Api::Point2D
 
+    # sord omit - no YARD type given for "other", using untyped
+    # sord omit - no YARD return type given, using untyped
+    # Loose equality matches on floats x and y.
+    # We never check z-axis, because the map is single-level.
+    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
+    def ==: (untyped other) -> untyped
+
     # A new point representing the sum of this point and the other point.
     # 
     # _@param_ `other` — The other point/number to add.
@@ -9196,15 +9045,26 @@ module Api
     # _@return_ — A new point representing this point divided by the scalar.
     def divide: (Float scalar) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Bug: Psych implements method 'y' on Kernel, but protobuf uses method_missing to read AbstractMethod
-    # We send method missing ourselves when y to fix this chain.
-    def y: () -> untyped
+    # Returns x coordinate
+    def x: () -> Float
+
+    # sord infer - inferred type of parameter "x" as Float using getter's return type
+    # Sets x coordinate
+    def x=: (Float x) -> Float
+
+    # Returns y coordinate
+    def y: () -> Float
+
+    # sord infer - inferred type of parameter "y" as Float using getter's return type
+    # Sets y coordinate
+    def y=: (Float y) -> Float
 
     # Randomly adjusts both x and y by a range of: -offset..offset
     # 
     # _@param_ `offset`
-    def random_offset: (Float offset) -> Api::Point2D
+    # 
+    # _@return_ — new Position
+    def random_offset: (Float offset) -> Sc2::Position
 
     # sord omit - no YARD type given for "offset", using untyped
     # Changes this point's x and y by the supplied offset
@@ -9216,15 +9076,15 @@ module Api
     # sord omit - no YARD type given for "y", using untyped
     # Creates a new point with x and y which is offset
     # 
-    # _@return_ — self
-    def offset: (untyped x, untyped y) -> Api::Point2D
+    # _@return_ — new Position
+    def offset: (?untyped x, ?untyped y) -> Sc2::Position
 
     # sord omit - no YARD type given for "x", using untyped
     # sord omit - no YARD type given for "y", using untyped
     # Changes this point's x and y by the supplied offset
     # 
     # _@return_ — self
-    def offset!: (untyped x, untyped y) -> Sc2::Position
+    def offset!: (?untyped x, ?untyped y) -> Sc2::Position
 
     # For vector returns the magnitude, synonymous with Math.hypot
     def magnitude: () -> Float
@@ -9297,6 +9157,7 @@ module Api
   class Point2D < Google::Protobuf::AbstractMessage
     include Sc2::Position
     include Api::Point2DExtension
+    include Api::PointDistanceExtension
     extend Api::Point2DExtension::ClassMethods
 
     # sord omit - no YARD type given for "x", using untyped
@@ -9316,7 +9177,14 @@ module Api
 
     # sord omit - no YARD type given for "z:", using untyped
     # Create a new 3d Point, by adding a y axis.
-    def to_3d: (z: untyped) -> Api::Point
+    def to_3d: (?z: untyped) -> Api::Point
+
+    # sord omit - no YARD type given for "other", using untyped
+    # sord omit - no YARD return type given, using untyped
+    # Loose equality matches on floats x and y.
+    # We never check z-axis, because the map is single-level.
+    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
+    def ==: (untyped other) -> untyped
 
     # A new point representing the sum of this point and the other point.
     # 
@@ -9338,15 +9206,26 @@ module Api
     # _@return_ — A new point representing this point divided by the scalar.
     def divide: (Float scalar) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Bug: Psych implements method 'y' on Kernel, but protobuf uses method_missing to read AbstractMethod
-    # We send method missing ourselves when y to fix this chain.
-    def y: () -> untyped
+    # Returns x coordinate
+    def x: () -> Float
+
+    # sord infer - inferred type of parameter "x" as Float using getter's return type
+    # Sets x coordinate
+    def x=: (Float x) -> Float
+
+    # Returns y coordinate
+    def y: () -> Float
+
+    # sord infer - inferred type of parameter "y" as Float using getter's return type
+    # Sets y coordinate
+    def y=: (Float y) -> Float
 
     # Randomly adjusts both x and y by a range of: -offset..offset
     # 
     # _@param_ `offset`
-    def random_offset: (Float offset) -> Api::Point2D
+    # 
+    # _@return_ — new Position
+    def random_offset: (Float offset) -> Sc2::Position
 
     # sord omit - no YARD type given for "offset", using untyped
     # Changes this point's x and y by the supplied offset
@@ -9358,15 +9237,15 @@ module Api
     # sord omit - no YARD type given for "y", using untyped
     # Creates a new point with x and y which is offset
     # 
-    # _@return_ — self
-    def offset: (untyped x, untyped y) -> Api::Point2D
+    # _@return_ — new Position
+    def offset: (?untyped x, ?untyped y) -> Sc2::Position
 
     # sord omit - no YARD type given for "x", using untyped
     # sord omit - no YARD type given for "y", using untyped
     # Changes this point's x and y by the supplied offset
     # 
     # _@return_ — self
-    def offset!: (untyped x, untyped y) -> Sc2::Position
+    def offset!: (?untyped x, ?untyped y) -> Sc2::Position
 
     # For vector returns the magnitude, synonymous with Math.hypot
     def magnitude: () -> Float
@@ -9438,6 +9317,14 @@ module Api
   # Protobuf virtual class.
   class PointI < Google::Protobuf::AbstractMessage
     include Sc2::Position
+    include Api::PointDistanceExtension
+
+    # sord omit - no YARD type given for "other", using untyped
+    # sord omit - no YARD return type given, using untyped
+    # Loose equality matches on floats x and y.
+    # We never check z-axis, because the map is single-level.
+    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
+    def ==: (untyped other) -> untyped
 
     # A new point representing the sum of this point and the other point.
     # 
@@ -9459,15 +9346,26 @@ module Api
     # _@return_ — A new point representing this point divided by the scalar.
     def divide: (Float scalar) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Bug: Psych implements method 'y' on Kernel, but protobuf uses method_missing to read AbstractMethod
-    # We send method missing ourselves when y to fix this chain.
-    def y: () -> untyped
+    # Returns x coordinate
+    def x: () -> Float
+
+    # sord infer - inferred type of parameter "x" as Float using getter's return type
+    # Sets x coordinate
+    def x=: (Float x) -> Float
+
+    # Returns y coordinate
+    def y: () -> Float
+
+    # sord infer - inferred type of parameter "y" as Float using getter's return type
+    # Sets y coordinate
+    def y=: (Float y) -> Float
 
     # Randomly adjusts both x and y by a range of: -offset..offset
     # 
     # _@param_ `offset`
-    def random_offset: (Float offset) -> Api::Point2D
+    # 
+    # _@return_ — new Position
+    def random_offset: (Float offset) -> Sc2::Position
 
     # sord omit - no YARD type given for "offset", using untyped
     # Changes this point's x and y by the supplied offset
@@ -9479,15 +9377,15 @@ module Api
     # sord omit - no YARD type given for "y", using untyped
     # Creates a new point with x and y which is offset
     # 
-    # _@return_ — self
-    def offset: (untyped x, untyped y) -> Api::Point2D
+    # _@return_ — new Position
+    def offset: (?untyped x, ?untyped y) -> Sc2::Position
 
     # sord omit - no YARD type given for "x", using untyped
     # sord omit - no YARD type given for "y", using untyped
     # Changes this point's x and y by the supplied offset
     # 
     # _@return_ — self
-    def offset!: (untyped x, untyped y) -> Sc2::Position
+    def offset!: (?untyped x, ?untyped y) -> Sc2::Position
 
     # For vector returns the magnitude, synonymous with Math.hypot
     def magnitude: () -> Float
@@ -9571,6 +9469,13 @@ module Api
     # ```
     def self.[]: (untyped x, untyped y, untyped z) -> Api::Point
 
+    # sord omit - no YARD type given for "other", using untyped
+    # sord omit - no YARD return type given, using untyped
+    # Loose equality matches on floats x and y.
+    # We never check z-axis, because the map is single-level.
+    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
+    def ==: (untyped other) -> untyped
+
     # A new point representing the sum of this point and the other point.
     # 
     # _@param_ `other` — The other point/number to add.
@@ -9591,15 +9496,26 @@ module Api
     # _@return_ — A new point representing this point divided by the scalar.
     def divide: (Float scalar) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Bug: Psych implements method 'y' on Kernel, but protobuf uses method_missing to read AbstractMethod
-    # We send method missing ourselves when y to fix this chain.
-    def y: () -> untyped
+    # Returns x coordinate
+    def x: () -> Float
+
+    # sord infer - inferred type of parameter "x" as Float using getter's return type
+    # Sets x coordinate
+    def x=: (Float x) -> Float
+
+    # Returns y coordinate
+    def y: () -> Float
+
+    # sord infer - inferred type of parameter "y" as Float using getter's return type
+    # Sets y coordinate
+    def y=: (Float y) -> Float
 
     # Randomly adjusts both x and y by a range of: -offset..offset
     # 
     # _@param_ `offset`
-    def random_offset: (Float offset) -> Api::Point2D
+    # 
+    # _@return_ — new Position
+    def random_offset: (Float offset) -> Sc2::Position
 
     # sord omit - no YARD type given for "offset", using untyped
     # Changes this point's x and y by the supplied offset
@@ -9611,15 +9527,15 @@ module Api
     # sord omit - no YARD type given for "y", using untyped
     # Creates a new point with x and y which is offset
     # 
-    # _@return_ — self
-    def offset: (untyped x, untyped y) -> Api::Point2D
+    # _@return_ — new Position
+    def offset: (?untyped x, ?untyped y) -> Sc2::Position
 
     # sord omit - no YARD type given for "x", using untyped
     # sord omit - no YARD type given for "y", using untyped
     # Changes this point's x and y by the supplied offset
     # 
     # _@return_ — self
-    def offset!: (untyped x, untyped y) -> Sc2::Position
+    def offset!: (?untyped x, ?untyped y) -> Sc2::Position
 
     # For vector returns the magnitude, synonymous with Math.hypot
     def magnitude: () -> Float
@@ -9691,6 +9607,14 @@ module Api
   # Protobuf virtual class.
   class Size2DI < Google::Protobuf::AbstractMessage
     include Sc2::Position
+    include Api::PointDistanceExtension
+
+    # sord omit - no YARD type given for "other", using untyped
+    # sord omit - no YARD return type given, using untyped
+    # Loose equality matches on floats x and y.
+    # We never check z-axis, because the map is single-level.
+    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
+    def ==: (untyped other) -> untyped
 
     # A new point representing the sum of this point and the other point.
     # 
@@ -9712,15 +9636,26 @@ module Api
     # _@return_ — A new point representing this point divided by the scalar.
     def divide: (Float scalar) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Bug: Psych implements method 'y' on Kernel, but protobuf uses method_missing to read AbstractMethod
-    # We send method missing ourselves when y to fix this chain.
-    def y: () -> untyped
+    # Returns x coordinate
+    def x: () -> Float
+
+    # sord infer - inferred type of parameter "x" as Float using getter's return type
+    # Sets x coordinate
+    def x=: (Float x) -> Float
+
+    # Returns y coordinate
+    def y: () -> Float
+
+    # sord infer - inferred type of parameter "y" as Float using getter's return type
+    # Sets y coordinate
+    def y=: (Float y) -> Float
 
     # Randomly adjusts both x and y by a range of: -offset..offset
     # 
     # _@param_ `offset`
-    def random_offset: (Float offset) -> Api::Point2D
+    # 
+    # _@return_ — new Position
+    def random_offset: (Float offset) -> Sc2::Position
 
     # sord omit - no YARD type given for "offset", using untyped
     # Changes this point's x and y by the supplied offset
@@ -9732,15 +9667,15 @@ module Api
     # sord omit - no YARD type given for "y", using untyped
     # Creates a new point with x and y which is offset
     # 
-    # _@return_ — self
-    def offset: (untyped x, untyped y) -> Api::Point2D
+    # _@return_ — new Position
+    def offset: (?untyped x, ?untyped y) -> Sc2::Position
 
     # sord omit - no YARD type given for "x", using untyped
     # sord omit - no YARD type given for "y", using untyped
     # Changes this point's x and y by the supplied offset
     # 
     # _@return_ — self
-    def offset!: (untyped x, untyped y) -> Sc2::Position
+    def offset!: (?untyped x, ?untyped y) -> Sc2::Position
 
     # For vector returns the magnitude, synonymous with Math.hypot
     def magnitude: () -> Float
@@ -9816,6 +9751,15 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def hash: () -> untyped
 
+    # Returns an integer unique identifier
+    # If the unit goes out of vision and is snapshot-able, they get a random id
+    # - Such a unit gets the same unit tag when it re-enters vision
+    def tag: () -> Integer
+
+    # sord infer - inferred type of parameter "tag" as Integer using getter's return type
+    # Sets unit tag
+    def tag=: (Integer tag) -> Integer
+
     # Returns static [Api::UnitTypeData] for a unit
     def unit_data: () -> Api::UnitTypeData
 
@@ -9894,6 +9838,15 @@ module Api
     # _@return_ — whether unit has attribute :Summoned
     def is_summoned?: () -> bool
 
+    # Whether unit is effected by buff_id
+    # 
+    # _@param_ `buff_id`
+    # 
+    # ```ruby
+    # unit.has_buff??(Api::BuffId::QUEENSPAWNLARVATIMER)
+    # ```
+    def has_buff?: (Integer buff_id) -> bool
+
     # sord omit - no YARD return type given, using untyped
     # Performs action on this unit
     # 
@@ -9950,7 +9903,7 @@ module Api
     # sord omit - no YARD return type given, using untyped
     # Builds target unit type, i.e. issuing a build command to worker.build(...Api::UnitTypeId::BARRACKS)
     # 
-    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type which will do the creation
+    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
     # 
     # _@param_ `target` — is a unit tag or a Api::Point2D. Nil for addons/orbital
     # 
@@ -9968,7 +9921,7 @@ module Api
     # sord omit - no YARD return type given, using untyped
     # Research a specific upgrade
     # 
-    # _@param_ `upgrade_id` — Api::UnitTypeId the unit type which will do the creation
+    # _@param_ `upgrade_id` — Api::UnitTypeId the unit type you wish to research
     # 
     # _@param_ `queue_command` — shift+command
     def research: (upgrade_id: Integer, ?queue_command: bool) -> untyped
@@ -10045,6 +9998,12 @@ module Api
     # ```
     def can_attack?: (unit: Api::Unit, ?weapon_index: Integer, ?ability_id: Integer?) -> bool
 
+    # Returns whether this unit has an ability available
+    # Queries API if necessary
+    # 
+    # _@param_ `ability_id`
+    def ability_available?: (Integer ability_id) -> bool
+
     # sord warn - Api::unit wasn't able to be resolved to a constant in this project
     # sord warn - Api::Weapon wasn't able to be resolved to a constant in this project
     # Checks whether a weapon can target a unit
@@ -10119,6 +10078,22 @@ module Api
     # For Terran builds a tech lab add-on on the current structure
     def build_tech_lab: (?queue_command: untyped) -> void
 
+    # sord omit - no YARD return type given, using untyped
+    # Warps in unit type at target (location or pylon)
+    # Only works if the source is a Warp Gate
+    # 
+    # _@param_ `unit_type_id` — Api::UnitTypeId the unit type you wish to build
+    # 
+    # _@param_ `target` — a point, which should be inside an energy source
+    # 
+    # _@param_ `queue_command` — shift+command
+    def warp: (unit_type_id: Integer, target: Api::Point2D, ?queue_command: bool) -> untyped
+
+    # Returns true if unit does not have orders
+    # 
+    # _@return_ — whether unit is idle
+    def is_idle?: () -> bool
+
     # sord omit - no YARD type given for "abilities", using untyped
     # sord omit - no YARD type given for "target:", using untyped
     # Reduces repetition in the is_*action*?(target:) methods
@@ -10127,7 +10102,83 @@ module Api
 
   # Protobuf virtual class.
   class UnitTypeData < Google::Protobuf::AbstractMessage
+    include Api::UnitTypeExtension
     include Api::UnitTypeDataExtension
+
+    # sord omit - no YARD return type given, using untyped
+    def mood: () -> untyped
+  end
+
+  # Protobuf virtual class.
+  class AvailableAbility < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
+
+  # Protobuf virtual class.
+  class UnitOrder < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
+
+  # Protobuf virtual class.
+  class ActionRawUnitCommand < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
+
+  # Protobuf virtual class.
+  class ActionRawToggleAutocast < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
+
+  # Protobuf virtual class.
+  class ActionError < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
+
+  # Protobuf virtual class.
+  class ActionSpatialUnitCommand < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
+
+  # Protobuf virtual class.
+  class BuildItem < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
+
+  # Protobuf virtual class.
+  class ActionToggleAutocast < Google::Protobuf::AbstractMessage
+    include Api::AbilityRemapable
+
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
   end
 
   # Protobuf virtual enum.
@@ -10156,7 +10207,7 @@ module Api
 
     # sord omit - no YARD type given for "z:", using untyped
     # Create a new 3d Point, by adding a y axis.
-    def to_3d: (z: untyped) -> Api::Point
+    def to_3d: (?z: untyped) -> Api::Point
 
     # Adds additional functionality to message class Api::Point2D
     module ClassMethods
@@ -10171,10 +10222,23 @@ module Api
     end
   end
 
+  # Adds additional functionality to message object Api::Unit
+  module UnitTypeExtension
+    # sord omit - no YARD return type given, using untyped
+    def mood: () -> untyped
+  end
+
   # Adds additional functionality to message object Api::PowerSource
   module PowerSourceExtension
     include Sc2::Position
 
+    # sord omit - no YARD type given for "other", using untyped
+    # sord omit - no YARD return type given, using untyped
+    # Loose equality matches on floats x and y.
+    # We never check z-axis, because the map is single-level.
+    # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
+    def ==: (untyped other) -> untyped
+
     # A new point representing the sum of this point and the other point.
     # 
     # _@param_ `other` — The other point/number to add.
@@ -10195,15 +10259,26 @@ module Api
     # _@return_ — A new point representing this point divided by the scalar.
     def divide: (Float scalar) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Bug: Psych implements method 'y' on Kernel, but protobuf uses method_missing to read AbstractMethod
-    # We send method missing ourselves when y to fix this chain.
-    def y: () -> untyped
+    # Returns x coordinate
+    def x: () -> Float
+
+    # sord infer - inferred type of parameter "x" as Float using getter's return type
+    # Sets x coordinate
+    def x=: (Float x) -> Float
+
+    # Returns y coordinate
+    def y: () -> Float
+
+    # sord infer - inferred type of parameter "y" as Float using getter's return type
+    # Sets y coordinate
+    def y=: (Float y) -> Float
 
     # Randomly adjusts both x and y by a range of: -offset..offset
     # 
     # _@param_ `offset`
-    def random_offset: (Float offset) -> Api::Point2D
+    # 
+    # _@return_ — new Position
+    def random_offset: (Float offset) -> Sc2::Position
 
     # sord omit - no YARD type given for "offset", using untyped
     # Changes this point's x and y by the supplied offset
@@ -10215,15 +10290,15 @@ module Api
     # sord omit - no YARD type given for "y", using untyped
     # Creates a new point with x and y which is offset
     # 
-    # _@return_ — self
-    def offset: (untyped x, untyped y) -> Api::Point2D
+    # _@return_ — new Position
+    def offset: (?untyped x, ?untyped y) -> Sc2::Position
 
     # sord omit - no YARD type given for "x", using untyped
     # sord omit - no YARD type given for "y", using untyped
     # Changes this point's x and y by the supplied offset
     # 
     # _@return_ — self
-    def offset!: (untyped x, untyped y) -> Sc2::Position
+    def offset!: (?untyped x, ?untyped y) -> Sc2::Position
 
     # For vector returns the magnitude, synonymous with Math.hypot
     def magnitude: () -> Float
@@ -10305,6 +10380,10 @@ module Api
     end
   end
 
+  # Adds additional functionality to message object Api::Unit
+  module PointDistanceExtension
+  end
+
   # Adds additional functionality to message object Api::UnitTypeData
   module UnitTypeDataExtension
     # Sum of all morphs mineral cost
@@ -10320,6 +10399,13 @@ module Api
     # _@return_ — sum of vespene gas costs
     attr_accessor vespene_cost_sum: (Integer | untyped)
   end
+
+  # This module make sure that a read from method ability_id always returns the proper source id
+  module AbilityRemapable
+    # Ability Id. The generic id or "remapid".
+    # i.e. Api::AbilityId::ATTACK_BATTLECRUISER returns generic Api::AbilityId::ATTACK
+    def ability_id: () -> Integer
+  end
 end
 
 # Array extensions