sc2ai 0.0.4 → 0.0.6

data/sig/sc2ai.rbs

@@ -338,7 +338,7 @@ 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
 
@@ -802,17 +802,18 @@ 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
       # Builds target unit type using units as source at optional target
       # 
+      # _@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_ `target` — is a unit tag or a Api::Point2D. Nil for addons/orbital
       # 
       # _@param_ `queue_command` — shift+command
       def build: (
-                   units: untyped,
+                   units: (::Array[Integer] | Integer | Api::Unit),
                    unit_type_id: Integer,
                    ?target: (Api::Point2D | Integer)?,
                    ?queue_command: bool
@@ -835,6 +836,16 @@ module Sc2
                   ?units: untyped
                 ) -> untyped
 
+      # sord omit - no YARD return type given, using untyped
+      # Research a specific upgrade
+      # 
+      # _@param_ `units` — can be an Api::Unit, array of Api::Unit#tag or single tag
+      # 
+      # _@param_ `upgrade_id` — Api::UpgradeId to research
+      # 
+      # _@param_ `queue_command` — shift+command
+      def research: (units: (::Array[Integer] | Integer | Api::Unit), upgrade_id: Integer, ?queue_command: bool) -> untyped
+
       # Toggles auto-cast ability for units
       # 
       # _@param_ `units` — can be an Api::Unit, array of Tags or single Tag
@@ -966,7 +977,18 @@ module Sc2
       # _@return_ — unit tag array
       def unit_tags_from_source: ((Integer | ::Array[Integer] | Api::Unit | Sc2::UnitGroup) source) -> ::Array[Integer]
 
-      # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
+      # Returns the upgrade ids which are researching or queued
+      # Not set for enemy.
+      def upgrades_in_progress: () -> ::Array[Integer]
+
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # 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
@@ -978,6 +1000,12 @@ module Sc2
       # _@param_ `ability_id` — Api::AbilityId::*
       def ability_data: (Integer ability_id) -> Api::AbilityData
 
+      # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
+      # Returns static [Api::UpgradeData] for an upgrade id
+      # 
+      # _@param_ `upgrade_id` — Api::UpgradeId::*
+      def upgrade_data: (Integer upgrade_id) -> Api::UpgradeData
+
       # Checks unit data for an attribute value
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -1008,6 +1036,10 @@ module Sc2
       # Checks whether you have the resources to construct quantity of unit type
       def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
 
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # Checks whether you have the resources to
+      def can_afford_upgrade?: (untyped upgrade_id) -> 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
@@ -1066,7 +1098,18 @@ module Sc2
       # _@return_ — Api::Race if race detected, false otherwise
       def detect_race_from_units: () -> (bool | Integer)
 
-      # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
+      # Returns the upgrade ids which are researching or queued
+      # Not set for enemy.
+      def upgrades_in_progress: () -> ::Array[Integer]
+
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # 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
@@ -1078,6 +1121,12 @@ module Sc2
       # _@param_ `ability_id` — Api::AbilityId::*
       def ability_data: (Integer ability_id) -> Api::AbilityData
 
+      # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
+      # Returns static [Api::UpgradeData] for an upgrade id
+      # 
+      # _@param_ `upgrade_id` — Api::UpgradeId::*
+      def upgrade_data: (Integer upgrade_id) -> Api::UpgradeData
+
       # Checks unit data for an attribute value
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -1108,6 +1157,10 @@ module Sc2
       # Checks whether you have the resources to construct quantity of unit type
       def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
 
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # Checks whether you have the resources to
+      def can_afford_upgrade?: (untyped upgrade_id) -> 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
@@ -1362,7 +1415,18 @@ module Sc2
 
     # Helper methods for working with units
     module Units
-      # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
+      # Returns the upgrade ids which are researching or queued
+      # Not set for enemy.
+      def upgrades_in_progress: () -> ::Array[Integer]
+
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # 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
@@ -1374,6 +1438,12 @@ module Sc2
       # _@param_ `ability_id` — Api::AbilityId::*
       def ability_data: (Integer ability_id) -> Api::AbilityData
 
+      # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
+      # Returns static [Api::UpgradeData] for an upgrade id
+      # 
+      # _@param_ `upgrade_id` — Api::UpgradeId::*
+      def upgrade_data: (Integer upgrade_id) -> Api::UpgradeData
+
       # Checks unit data for an attribute value
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -1404,6 +1474,10 @@ module Sc2
       # Checks whether you have the resources to construct quantity of unit type
       def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
 
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # Checks whether you have the resources to
+      def can_afford_upgrade?: (untyped upgrade_id) -> 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
@@ -1448,6 +1522,11 @@ module Sc2
       # _@return_ — a group of neutral units
       attr_accessor effects: Sc2::UnitGroup
 
+      # sord omit - no YARD type given for :upgrades_completed, using untyped
+      # Returns the upgrade ids you have acquired such as weapon upgrade and armor upgrade ids.
+      # Shorthand for observation.raw_data.player.upgrade_ids
+      attr_reader upgrades_completed: untyped
+
       # 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
@@ -1540,17 +1619,18 @@ 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
       # Builds target unit type using units as source at optional target
       # 
+      # _@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_ `target` — is a unit tag or a Api::Point2D. Nil for addons/orbital
       # 
       # _@param_ `queue_command` — shift+command
       def build: (
-                   units: untyped,
+                   units: (::Array[Integer] | Integer | Api::Unit),
                    unit_type_id: Integer,
                    ?target: (Api::Point2D | Integer)?,
                    ?queue_command: bool
@@ -1573,6 +1653,16 @@ module Sc2
                   ?units: untyped
                 ) -> untyped
 
+      # sord omit - no YARD return type given, using untyped
+      # Research a specific upgrade
+      # 
+      # _@param_ `units` — can be an Api::Unit, array of Api::Unit#tag or single tag
+      # 
+      # _@param_ `upgrade_id` — Api::UpgradeId to research
+      # 
+      # _@param_ `queue_command` — shift+command
+      def research: (units: (::Array[Integer] | Integer | Api::Unit), upgrade_id: Integer, ?queue_command: bool) -> untyped
+
       # Toggles auto-cast ability for units
       # 
       # _@param_ `units` — can be an Api::Unit, array of Tags or single Tag
@@ -1757,6 +1847,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
@@ -1813,6 +1913,13 @@ module Sc2
       # _@return_ — z axis position between -16 and 16
       def terrain_height: (x: (Float | Integer), y: (Float | Integer)) -> Float
 
+      # 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: (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.
       # Each value in [row][column] holds a float value which is the z height
@@ -1877,6 +1984,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
@@ -1951,6 +2059,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)
@@ -1986,8 +2101,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
       # 
@@ -2020,7 +2142,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`
@@ -2031,13 +2152,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)
@@ -2053,7 +2173,7 @@ 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
 
@@ -2067,7 +2187,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
@@ -2135,7 +2255,18 @@ module Sc2
       # _@param_ `bot`
       def after_reset: (Sc2::Player::Bot _bot) -> untyped
 
-      # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
+      # Returns the upgrade ids which are researching or queued
+      # Not set for enemy.
+      def upgrades_in_progress: () -> ::Array[Integer]
+
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # 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
@@ -2147,6 +2278,12 @@ module Sc2
       # _@param_ `ability_id` — Api::AbilityId::*
       def ability_data: (Integer ability_id) -> Api::AbilityData
 
+      # sord warn - Api::UpgradeData wasn't able to be resolved to a constant in this project
+      # Returns static [Api::UpgradeData] for an upgrade id
+      # 
+      # _@param_ `upgrade_id` — Api::UpgradeId::*
+      def upgrade_data: (Integer upgrade_id) -> Api::UpgradeData
+
       # Checks unit data for an attribute value
       # 
       # _@param_ `unit` — Api::UnitTypeId or Api::Unit
@@ -2177,6 +2314,10 @@ module Sc2
       # Checks whether you have the resources to construct quantity of unit type
       def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
 
+      # sord omit - no YARD type given for "upgrade_id", using untyped
+      # Checks whether you have the resources to
+      def can_afford_upgrade?: (untyped upgrade_id) -> 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
@@ -2211,7 +2352,7 @@ 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
 
@@ -2352,7 +2493,6 @@ module Sc2
     # _@return_ — Hash<Integer, Api::AbilityData] indexed data
     def abilities_from_proto: (::Array[Api::AbilityData] abilities) -> SORD_ERROR_HashIntegerApiAbilityDataindexeddata
 
-    # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
     # sord warn - "Hash<Integer, Api::UnitTypeData] indexed data" does not appear to be a type
     # Indexes unit data by id
     # 
@@ -2378,17 +2518,30 @@ module Sc2
     # 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)
 
-    # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
-    # _@return_ — UnitId => UnitData
+    # _@return_ — UnitId => UnitTypeData
     attr_accessor units: (::Hash[Integer, Api::UnitTypeData] | untyped)
 
-    # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
-    # _@return_ — UnitTypeId => UnitTypeData
-    attr_accessor upgrades: (::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
@@ -2638,19 +2791,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
     # 
@@ -2659,9 +2808,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
     # 
@@ -2670,18 +2818,26 @@ 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
+    # sord omit - no YARD return type given, 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.
+    def query_ability_ids_for_unit: ((Api::Unit | Integer) unit, ?ignore_resource_requirements: untyped) -> untyped
 
-    # 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.
@@ -2937,20 +3093,16 @@ module Sc2
                    ?ignore_resource_requirements: bool
                  ) -> 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
       # 
@@ -2959,9 +3111,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
       # 
@@ -2970,18 +3121,26 @@ 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
+      # sord omit - no YARD return type given, 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.
+      def query_ability_ids_for_unit: ((Api::Unit | Integer) unit, ?ignore_resource_requirements: untyped) -> untyped
 
       # 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.
@@ -3296,11 +3455,18 @@ module Sc2
     # _@return_ — new unit group
     def except: () -> Sc2::UnitGroup
 
-    # Returns a hash containing the entries for given tag(s).
+    # Returns a new unit group containing the entries for given tag(s).
     # 
     # _@return_ — new unit group
     def slice: () -> Sc2::UnitGroup
 
+    # Returns a new unit group containing each element found both in self and in all of the given other_arrays; duplicates are omitted; items are compared using eql? (items must also implement hash correctly):
+    # 
+    # _@param_ `other_unit_group`
+    # 
+    # _@return_ — new unit group
+    def intersection: (UnitGroup other_unit_group) -> UnitGroup
+
     # Selects a single random Unit without a parameter or an array of Units with a param, i.e. self.random(2)
     def sample: () -> Api::Unit
 
@@ -3320,6 +3486,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(...)
     # 
@@ -3356,6 +3526,14 @@ module Sc2
     # _@param_ `queue_command` — shift+command
     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
+    # 
+    # _@param_ `upgrade_id` — Api::UpgradeId to research
+    # 
+    # _@param_ `queue_command` — shift+command
+    def research: (upgrade_id: Integer, ?queue_command: bool) -> untyped
+
     # sord omit - no YARD return type given, using untyped
     # Shorthand for performing action SMART (right-click)
     # 
@@ -3510,6 +3688,15 @@ module Sc2
     # _@return_ — gas structures
     def gas: () -> UnitGroup
 
+    # Selects only units which have finished constructing, i.o.w. build_progress == 1.0
+    # 
+    # _@return_ — gas structures
+    def completed: () -> UnitGroup
+
+    # sord omit - no YARD return type given, using untyped
+    # Selects only units which do not have orders
+    def idle: () -> untyped
+
     # Selects mineral fields
     # 
     # _@return_ — mineral fields
@@ -3564,6 +3751,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
@@ -3985,6 +4175,9 @@ module Sc2
     # _@param_ `player_index`
     def stop: (Integer player_index) -> void
 
+    # sord omit - no YARD return type given, using untyped
+    def stop_all: () -> untyped
+
     def initialize: () -> void
 
     # Returns the value of attribute clients.
@@ -3995,10 +4188,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.
@@ -4019,10 +4219,19 @@ 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
     # 
@@ -4528,6 +4737,26 @@ module Api
     # _@return_ — unit_type_id an array of unit type ids as per Api:UnitTypeId
     def self.upgrade_researched_from: (upgrade_id: Integer) -> Integer
 
+    # sord omit - no YARD type given for "upgrade_id:", using untyped
+    # Returns the ability which researches this upgrade
+    # 
+    # _@return_ — ability_id
+    def self.upgrade_research_ability_id: (upgrade_id: untyped) -> Integer
+
+    # Returns a full list of structure unit id's which perform upgrades
+    # This is a useful list when checking if any updates are in progress,
+    # because we scan these structure types for orders
+    # 
+    # _@return_ — unit type ids
+    def self.upgrade_structure_unit_type_ids: () -> ::Array[Integer]
+
+    # Returns hash of upgrade info for a specific structure where the upgrade id is the key
+    # 
+    # _@param_ `source_unit_type_id` — source structure unit type id
+    # 
+    # _@return_ — ability_id
+    def self.upgrade_ability_data: (Integer source_unit_type_id) -> ::Hash[Integer, ::Hash[untyped, untyped]]
+
     # sord omit - no YARD return type given, using untyped
     def self.unit_type_creation_abilities_data: () -> untyped
 
@@ -8593,7 +8822,15 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def hash: () -> untyped
 
-    # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
+    # 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
 
@@ -8612,9 +8849,8 @@ module Api
     # _@return_ — whether unit has attribute
     # 
     # ```ruby
-    # has_attribute?(Api::UnitTypeId::SCV, Api::Attribute::Mechanical)
-    # has_attribute?(units.workers.first, :Mechanical)
-    # has_attribute?(Api::UnitTypeId::SCV, :Mechanical)
+    # unit.has_attribute?(Api::Attribute::Mechanical)
+    # unit.has_attribute?(:Mechanical)
     # ```
     def has_attribute?: (untyped attribute) -> bool
 
@@ -8673,6 +8909,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
     # 
@@ -8736,12 +8981,21 @@ module Api
     # _@param_ `queue_command` — shift+command
     def build: (unit_type_id: Integer, ?target: (Api::Point2D | Integer)?, ?queue_command: bool) -> untyped
 
-    # sord omit - no YARD type given for "queue_command:", using untyped
     # sord omit - no YARD return type given, using untyped
     # Issues repair command on target
     # 
     # _@param_ `target` — is a unit or unit tag
-    def repair: (target: (Api::Unit | Integer), ?queue_command: untyped) -> untyped
+    # 
+    # _@param_ `queue_command` — shift+command
+    def repair: (target: (Api::Unit | Integer), ?queue_command: bool) -> untyped
+
+    # 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_ `queue_command` — shift+command
+    def research: (upgrade_id: Integer, ?queue_command: bool) -> untyped
 
     # Draws a placement outline
     # noinspection RubyArgCount
@@ -9013,6 +9267,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.
@@ -9033,10 +9294,19 @@ 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
     # 
@@ -9151,6 +9421,17 @@ module Api
     # sord omit - no YARD type given for "other", using untyped
     def eql?: (untyped other) -> bool
 
+    # 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
+
+    # 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.
@@ -9171,10 +9452,19 @@ 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
     # 
@@ -9272,6 +9562,13 @@ module Api
   class PointI < Google::Protobuf::AbstractMessage
     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.
@@ -9292,10 +9589,19 @@ 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
     # 
@@ -9404,6 +9710,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.
@@ -9424,10 +9737,19 @@ 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
     # 
@@ -9525,6 +9847,13 @@ module Api
   class Size2DI < Google::Protobuf::AbstractMessage
     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.
@@ -9545,10 +9874,19 @@ 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
     # 
@@ -9649,7 +9987,15 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def hash: () -> untyped
 
-    # sord warn - Api::UnitTypeData wasn't able to be resolved to a constant in this project
+    # 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
 
@@ -9668,9 +10014,8 @@ module Api
     # _@return_ — whether unit has attribute
     # 
     # ```ruby
-    # has_attribute?(Api::UnitTypeId::SCV, Api::Attribute::Mechanical)
-    # has_attribute?(units.workers.first, :Mechanical)
-    # has_attribute?(Api::UnitTypeId::SCV, :Mechanical)
+    # unit.has_attribute?(Api::Attribute::Mechanical)
+    # unit.has_attribute?(:Mechanical)
     # ```
     def has_attribute?: (untyped attribute) -> bool
 
@@ -9729,6 +10074,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
     # 
@@ -9792,12 +10146,21 @@ module Api
     # _@param_ `queue_command` — shift+command
     def build: (unit_type_id: Integer, ?target: (Api::Point2D | Integer)?, ?queue_command: bool) -> untyped
 
-    # sord omit - no YARD type given for "queue_command:", using untyped
     # sord omit - no YARD return type given, using untyped
     # Issues repair command on target
     # 
     # _@param_ `target` — is a unit or unit tag
-    def repair: (target: (Api::Unit | Integer), ?queue_command: untyped) -> untyped
+    # 
+    # _@param_ `queue_command` — shift+command
+    def repair: (target: (Api::Unit | Integer), ?queue_command: bool) -> untyped
+
+    # 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_ `queue_command` — shift+command
+    def research: (upgrade_id: Integer, ?queue_command: bool) -> untyped
 
     # Draws a placement outline
     # noinspection RubyArgCount
@@ -9951,6 +10314,11 @@ module Api
     def is_performing_ability_on_target?: (untyped abilities, ?target: untyped) -> bool
   end
 
+  # Protobuf virtual class.
+  class UnitTypeData < Google::Protobuf::AbstractMessage
+    include Api::UnitTypeDataExtension
+  end
+
   # Protobuf virtual enum.
   class Race < Google::Protobuf::AbstractMessage
   end
@@ -9975,6 +10343,10 @@ module Api
     # sord omit - no YARD type given for "other", using untyped
     def eql?: (untyped other) -> bool
 
+    # 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
+
     # Adds additional functionality to message class Api::Point2D
     module ClassMethods
       # sord omit - no YARD type given for "x", using untyped
@@ -9992,6 +10364,13 @@ module Api
   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.
@@ -10012,10 +10391,19 @@ 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
     # 
@@ -10121,6 +10509,29 @@ module Api
       def []: (untyped x, untyped y, untyped z) -> Api::Point
     end
   end
+
+  # Adds additional functionality to message object Api::UnitTypeData
+  module UnitTypeDataExtension
+    # Sum of all morphs mineral cost
+    # i.e. 550M Orbital command = 400M CC + 150M Upgrade
+    # i.e. 350M Hatchery = 50M Drone + 300M Build
+    # 
+    # _@return_ — sum of mineral costs
+    attr_accessor mineral_cost_sum: (Integer | untyped)
+
+    # Sum of all morphs vespene gas cost
+    # i.e. 250G Broodlord = 100G Corruptor + 150G Morph
+    # 
+    # _@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