sc2ai 0.5.0 → 0.6.2

data/sig/sc2ai.rbs

@@ -396,6 +396,9 @@ module Sc2
     # _@return_ — ladder matches will set an opponent id
     attr_accessor opponent_id: String
 
+    # _@return_ — callbacks implemented on player class
+    attr_accessor callbacks_defined: ::Array[Symbol]
+
     # An object which interacts with an SC2 client and is game-aware.
     class Bot < Sc2::Player
       include Sc2::Player::Units
@@ -406,7 +409,6 @@ module Sc2
 
       def initialize: (race: Integer, name: String) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Override to customize initialization
       # Alias of before_join
       # You can enable_feature_layer=true, set step_count, define
@@ -418,7 +420,7 @@ module Sc2
       # 
       # end
       # ```
-      def configure: () -> untyped
+      def configure: () -> void
 
       # TODO: If this suffices for Bot and Observer, they should share this code.
       # Initializes and refreshes game data and runs the game loop
@@ -426,17 +428,14 @@ module Sc2
       # _@return_ — One of Api::Result::VICTORY, Api::Result::DEFEAT, Api::Result::TIE, Api::Result::UNDECIDED
       def play: () -> Integer
 
-      # sord omit - no YARD return type given, using untyped
       # Override to perform steps before first on_step gets called.
       # Current game_loop is 0 and @api is available
-      def on_start: () -> untyped
+      def on_start: () -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Override to implement your own game logic.
       # Gets called whenever the game moves forward.
-      def on_step: () -> untyped
+      def on_step: () -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Override to handle game result (:Victory/:Loss/:Tie)
       # Called when game has ended with a result, i.e. result = :Victory
       # 
@@ -451,30 +450,26 @@ module Sc2
       #   end
       # end
       # ```
-      def on_finish: (Symbol result) -> untyped
+      def on_finish: (Symbol result) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Called when Random race is first detected.
       # Override to handle race identification of random enemy.
       # 
       # _@param_ `race` — see {Api::Race}
-      def on_random_race_detected: (Integer race) -> untyped
+      def on_random_race_detected: (Integer race) -> void
 
-      # 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.
       # 
       # _@param_ `errors`
-      def on_action_errors: (::Array[Api::ActionError] errors) -> untyped
+      def on_action_errors: (::Array[Api::ActionError] errors) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Actions this player performed since the last Observation.
       # Override to read actions successfully performed
       # 
       # _@param_ `actions` — a list of actions which were performed
-      def on_actions_performed: (::Array[Api::Action] actions) -> untyped
+      def on_actions_performed: (::Array[Api::Action] actions) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback when observation.alerts is populated
       # Override to use alerts or read Player.observation.alerts
       # 
@@ -492,22 +487,19 @@ module Sc2
       # ```
       # 
       # _@see_ `enum` — Alert in sc2api.proto for options
-      def on_alerts: (::Array[Integer] alerts) -> untyped
+      def on_alerts: (::Array[Integer] alerts) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback when upgrades are completed, multiple might finish on the same observation.
       # 
       # _@param_ `upgrade_ids` — Api::UpgradeId::*
-      def on_upgrades_completed: (::Array[Integer] upgrade_ids) -> untyped
+      def on_upgrades_completed: (::Array[Integer] upgrade_ids) -> void
 
       # sord omit - no YARD type given for "unit", using untyped
-      # sord omit - no YARD return type given, using untyped
       # Callback, on observation parse when iterating over every unit
       # Can be useful for decorating additional properties on a unit before on_step
       # A Sc2::Player should override this to decorate additional properties
-      def on_parse_observation_unit: (untyped unit) -> untyped
+      def on_parse_observation_unit: (untyped unit) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback for unit destroyed. Tags might be found in `previous.all_units`
       # This excludes unknown objects, like projectiles and only shows things the API has "seen" as a unit
       # Override to use in your bot class or use Player.
@@ -515,16 +507,14 @@ module Sc2
       # _@param_ `unit`
       # 
       # _@see_ `Sc2::Player::Units#units_destroyed`
-      def on_unit_destroyed: (Api::Unit unit) -> untyped
+      def on_unit_destroyed: (Api::Unit unit) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback for unit created.
       # Override to use in your bot class.
       # 
       # _@param_ `unit`
-      def on_unit_created: (Api::Unit unit) -> untyped
+      def on_unit_created: (Api::Unit unit) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback for unit type changing.
       # To detect certain unit creations, you should use this method to watch morphs.
       # Override to use in your bot class or use Player.
@@ -532,30 +522,27 @@ module Sc2
       # _@param_ `unit`
       # 
       # _@param_ `previous_unit_type_id` — Api::UnitTypeId::*
-      def on_unit_type_changed: (Api::Unit unit, Integer previous_unit_type_id) -> untyped
+      def on_unit_type_changed: (Api::Unit unit, Integer previous_unit_type_id) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback for structure building began
       # Override to use in your bot class.
       # 
       # _@param_ `unit`
-      def on_structure_started: (Api::Unit unit) -> untyped
+      def on_structure_started: (Api::Unit unit) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback for structure building is completed
       # Override to use in your bot class or use Player.
       # 
       # _@param_ `unit`
-      def on_structure_completed: (Api::Unit unit) -> untyped
+      def on_structure_completed: (Api::Unit unit) -> void
 
-      # sord omit - no YARD return type given, using untyped
       # Callback for unit (Unit/Structure) taking damage
       # Override to use in your bot class or use Player.
       # 
       # _@param_ `unit`
       # 
       # _@param_ `amount` — of damage
-      def on_unit_damaged: (Api::Unit unit, Integer amount) -> untyped
+      def on_unit_damaged: (Api::Unit unit, Integer amount) -> void
 
       # sord omit - no YARD return type given, using untyped
       # Writes the current observation as json to data/debug_observation.json
@@ -1016,10 +1003,10 @@ module Sc2
       # This is called internally when building/morphing/training
       def subtract_cost: (untyped unit_type_id) -> void
 
-      # sord omit - no YARD type given for "unit_type_id:", using untyped
+      # sord omit - no YARD type given for "unit_type_id", using untyped
       # sord omit - no YARD type given for "quantity:", using untyped
       # Checks whether you have the resources to construct quantity of unit type
-      def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
+      def can_afford?: (untyped unit_type_id, ?quantity: untyped) -> bool
 
       # sord omit - no YARD type given for "upgrade_id", using untyped
       # Checks whether you have the resources to
@@ -1146,10 +1133,10 @@ module Sc2
       # This is called internally when building/morphing/training
       def subtract_cost: (untyped unit_type_id) -> void
 
-      # sord omit - no YARD type given for "unit_type_id:", using untyped
+      # sord omit - no YARD type given for "unit_type_id", using untyped
       # sord omit - no YARD type given for "quantity:", using untyped
       # Checks whether you have the resources to construct quantity of unit type
-      def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
+      def can_afford?: (untyped unit_type_id, ?quantity: untyped) -> bool
 
       # sord omit - no YARD type given for "upgrade_id", using untyped
       # Checks whether you have the resources to
@@ -1281,6 +1268,12 @@ module Sc2
       # Returns zero to map_height-1 as range
       def map_tile_range_y: () -> ::Range[untyped]
 
+      # Ensures a Sc2::Position's x/y stays in map tile range
+      # Prevents out of bound exceptions when working with minimap
+      # 
+      # _@param_ `position`
+      def clamp_to_grid: ((Sc2::Position | Api::Point2D) position) -> (Sc2::Position | Api::Point2D)
+
       # Returns whether a x/y (integer) is placeable as per minimap image data.
       # It does not say whether a position is occupied by another building.
       # One pixel covers one whole block. Corrects floats on your behalf
@@ -1864,10 +1857,10 @@ module Sc2
       # This is called internally when building/morphing/training
       def subtract_cost: (untyped unit_type_id) -> void
 
-      # sord omit - no YARD type given for "unit_type_id:", using untyped
+      # sord omit - no YARD type given for "unit_type_id", using untyped
       # sord omit - no YARD type given for "quantity:", using untyped
       # Checks whether you have the resources to construct quantity of unit type
-      def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
+      def can_afford?: (untyped unit_type_id, ?quantity: untyped) -> bool
 
       # sord omit - no YARD type given for "upgrade_id", using untyped
       # Checks whether you have the resources to
@@ -1928,6 +1921,9 @@ module Sc2
       # _@return_ — a group of neutral units
       attr_accessor effects: Sc2::UnitGroup
 
+      # _@return_ — a group of blip units
+      attr_accessor blips: 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
@@ -2210,10 +2206,6 @@ module Sc2
       # Holds Api::ResponseGameInfo::#start_locations.
       attr_accessor game_info: Api::ResponseGameInfo
 
-      # This is the last loop at which game_info was set.
-      # Used to determine staleness.
-      attr_accessor game_info_loop: Integer
-
       attr_accessor data: (Api::ResponseData | untyped)
 
       # _@return_ — snapshot of current game state
@@ -2326,10 +2318,10 @@ module Sc2
       # This is called internally when building/morphing/training
       def subtract_cost: (untyped unit_type_id) -> void
 
-      # sord omit - no YARD type given for "unit_type_id:", using untyped
+      # sord omit - no YARD type given for "unit_type_id", using untyped
       # sord omit - no YARD type given for "quantity:", using untyped
       # Checks whether you have the resources to construct quantity of unit type
-      def can_afford?: (unit_type_id: untyped, ?quantity: untyped) -> bool
+      def can_afford?: (untyped unit_type_id, ?quantity: untyped) -> bool
 
       # sord omit - no YARD type given for "upgrade_id", using untyped
       # Checks whether you have the resources to
@@ -2441,6 +2433,14 @@ module Sc2
     # Adds placement_length to units if applicable
     def decorate_unit_type_placement_length: () -> untyped
 
+    # sord omit - no YARD return type given, using untyped
+    # Adds values missing from the API
+    def decorate_missing_values: () -> untyped
+
+    # sord omit - no YARD return type given, using untyped
+    # Adds ground_damage, air_damage, ground_range, air_range, ground_dps and air_dps
+    def decorate_weapon_helpers: () -> untyped
+
     # _@return_ — AbilityId => AbilityData
     attr_accessor abilities: (::Hash[Integer, Api::AbilityData] | untyped)
 
@@ -2585,8 +2585,9 @@ module Sc2
     #     game_info = observer.api.game_info
     #   end
     # ensure
+    #   observer.disconnect
     #   Sc2::ClientManager.stop(0)
-    # end
+    # end.wait
     # ```
     def start_replay: (
                         ?replay_path: String?,
@@ -2637,11 +2638,10 @@ module Sc2
                 ?effect_id: bool
               ) -> Api::ResponseData
 
-    # sord omit - no YARD return type given, using untyped
     # Snapshot of the current game state. Primary source for raw information
     # 
     # _@param_ `game_loop` — you wish to wait for (realtime only)
-    def observation: (?game_loop: Integer?) -> untyped
+    def observation: (?game_loop: Integer?) -> Api::ResponseObservation
 
     # Executes an array of [Api::Action] for a participant
     # 
@@ -2869,8 +2869,9 @@ module Sc2
       #     game_info = observer.api.game_info
       #   end
       # ensure
+      #   observer.disconnect
       #   Sc2::ClientManager.stop(0)
-      # end
+      # end.wait
       # ```
       def start_replay: (
                           ?replay_path: String?,
@@ -2921,11 +2922,10 @@ module Sc2
                   ?effect_id: bool
                 ) -> Api::ResponseData
 
-      # sord omit - no YARD return type given, using untyped
       # Snapshot of the current game state. Primary source for raw information
       # 
       # _@param_ `game_loop` — you wish to wait for (realtime only)
-      def observation: (?game_loop: Integer?) -> untyped
+      def observation: (?game_loop: Integer?) -> Api::ResponseObservation
 
       # Executes an array of [Api::Action] for a participant
       # 
@@ -3102,6 +3102,7 @@ module Sc2
     TYPE_TECHLAB: untyped
     TYPE_REACTOR: ::Array[Integer]
     TYPE_BASES: ::Array[Integer]
+    TYPE_DETECTORS: ::Array[Integer]
 
     # _@param_ `units` — default to be added.
     # 
@@ -3556,6 +3557,11 @@ module Sc2
     # _@return_ — gas structures
     def gas: () -> UnitGroup
 
+    # Selects units passively have Detection
+    # 
+    # _@return_ — gas structures
+    def detectors: () -> UnitGroup
+
     # Selects only units which have finished constructing, i.o.w. build_progress == 1.0
     # 
     # _@return_ — complete unit group
@@ -3726,6 +3732,7 @@ module Sc2
       TYPE_TECHLAB: untyped
       TYPE_REACTOR: ::Array[Integer]
       TYPE_BASES: ::Array[Integer]
+      TYPE_DETECTORS: ::Array[Integer]
 
       # _@param_ `unit_group`
       def initialize: (Sc2::UnitGroup unit_group) -> void
@@ -4067,6 +4074,9 @@ module Sc2
 
     def initialize: () -> void
 
+    # Returns the value of attribute host.
+    attr_accessor host: untyped
+
     # Returns the value of attribute clients.
     attr_accessor clients: untyped
 
@@ -4203,9 +4213,8 @@ module Sc2
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
-    # sord warn - "Array[Float,Float]" does not appear to be a type
     # Returns [x,y] array tuple
-    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+    def to_axy: () -> ::Array[(Float | Float)]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
@@ -7902,9 +7911,8 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
-    # sord warn - "Array[Float,Float]" does not appear to be a type
     # Returns [x,y] array tuple
-    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+    def to_axy: () -> ::Array[(Float | Float)]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
@@ -8466,7 +8474,7 @@ module Api
     # _@return_ — true if refreshed or false unchanged
     def refresh!: () -> bool
 
-    # Returns static [Api::UnitTypeData] for a unit
+    # Returns static an array of attributes for a unit
     def attributes: () -> ::Array[Api::Attribute]
 
     # sord omit - no YARD type given for "attribute", using untyped
@@ -8520,7 +8528,7 @@ module Api
     # _@return_ — whether unit has attribute :Structure
     def is_structure?: () -> bool
 
-    # Checks if unit is hover
+    # Checks if unit is hovering
     # 
     # _@return_ — whether unit has attribute :Hover
     def is_hover?: () -> bool
@@ -8535,6 +8543,10 @@ module Api
     # _@return_ — whether unit has attribute :Summoned
     def is_summoned?: () -> bool
 
+    # Returns whether the unit is cloaked. Revealed cloak units also return true.
+    # For further distinction, use Unit#cloaked, which uses enum CloakedState
+    def is_cloaked?: () -> bool
+
     # Whether unit is effected by buff_id
     # 
     # _@param_ `buff_id`
@@ -8630,12 +8642,12 @@ module Api
     def debug_draw_placement: (?Api::Color? color) -> void
 
     # sord omit - no YARD return type given, using untyped
-    # Draws a sphere around the unit's attack range
+    # Draws a sphere around the unit's attack range (weapon range + radius)
     # 
-    # _@param_ `weapon_index` — default first weapon, see UnitTypeData.weapons
+    # _@param_ `weapon_index` — default first weapon, see UnitTypeData#weapons
     # 
     # _@param_ `color` — optional api color, default red
-    def debug_fire_range: (?Api::Color weapon_index, ?Api::Color? color) -> untyped
+    def debug_fire_range: (?Integer weapon_index, ?Api::Color? color) -> untyped
 
     # sord omit - no YARD return type given, using untyped
     # Calculates the distance between self and other
@@ -8685,18 +8697,22 @@ module Api
     def is_engaged_with?: ((Api::Unit | Integer) unit) -> bool
 
     # Checks whether enemy is within range of weapon or ability and can target ground/air.
-    # Defaults to basic weapon. Pass in ability to override
+    # By default, checks all weapons.
+    # Pass weapon_index or ability_id to target a specific source of damage.
     # 
     # _@param_ `unit` — enemy
     # 
-    # _@param_ `weapon_index` — defaults to 0 which is it's basic weapon for it's current form
+    # _@param_ `weapon_index` — passing this will select a specific Weapon
     # 
     # _@param_ `ability_id` — passing this will override weapon Api::AbilityId::*
     # 
     # ```ruby
+    # queen.can_attack?(enemy, weapon_index: 0) # Air attack
+    # queen.can_attack?(enemy, weapon_index: 1) # Ground attack
+    # queen.can_attack?(enemy) # Auto detect (scans all weapons)
     # ghost.can_attack?(enemy, weapon_index: 0, ability_id: Api::AbilityId::SNIPE)
     # ```
-    def can_attack?: (unit: Api::Unit, ?weapon_index: Integer, ?ability_id: Integer?) -> bool
+    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
@@ -8711,9 +8727,12 @@ module Api
     # _@param_ `weapon`
     def can_weapon_target_unit?: (unit: Api::Unit, weapon: Api::Weapon) -> bool
 
-    # sord omit - no YARD type given for "unit:", using untyped
-    # sord omit - no YARD type given for "ability:", using untyped
-    def can_ability_target_unit?: (unit: untyped, ability: untyped) -> bool
+    # Checks whether an ability can target a unit
+    # 
+    # _@param_ `unit`
+    # 
+    # _@param_ `ability`
+    def can_ability_target_unit?: (unit: Api::Unit, ability: Api::AbilityData) -> bool
 
     # Checks whether opposing unit is in the attack range.
     # 
@@ -14559,9 +14578,8 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
-    # sord warn - "Array[Float,Float]" does not appear to be a type
     # Returns [x,y] array tuple
-    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+    def to_axy: () -> ::Array[(Float | Float)]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
@@ -14817,9 +14835,8 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
-    # sord warn - "Array[Float,Float]" does not appear to be a type
     # Returns [x,y] array tuple
-    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+    def to_axy: () -> ::Array[(Float | Float)]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
@@ -15043,9 +15060,8 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
-    # sord warn - "Array[Float,Float]" does not appear to be a type
     # Returns [x,y] array tuple
-    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+    def to_axy: () -> ::Array[(Float | Float)]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
@@ -15249,9 +15265,8 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
-    # sord warn - "Array[Float,Float]" does not appear to be a type
     # Returns [x,y] array tuple
-    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+    def to_axy: () -> ::Array[(Float | Float)]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
@@ -18798,6 +18813,8 @@ module Api
   end
 
   class PlayerCommon
+    include Api::PlayerCommonExt
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD return type given, using untyped
     def self.decode: (untyped buff) -> untyped
@@ -20406,7 +20423,7 @@ module Api
     # _@return_ — true if refreshed or false unchanged
     def refresh!: () -> bool
 
-    # Returns static [Api::UnitTypeData] for a unit
+    # Returns static an array of attributes for a unit
     def attributes: () -> ::Array[Api::Attribute]
 
     # sord omit - no YARD type given for "attribute", using untyped
@@ -20460,7 +20477,7 @@ module Api
     # _@return_ — whether unit has attribute :Structure
     def is_structure?: () -> bool
 
-    # Checks if unit is hover
+    # Checks if unit is hovering
     # 
     # _@return_ — whether unit has attribute :Hover
     def is_hover?: () -> bool
@@ -20475,6 +20492,10 @@ module Api
     # _@return_ — whether unit has attribute :Summoned
     def is_summoned?: () -> bool
 
+    # Returns whether the unit is cloaked. Revealed cloak units also return true.
+    # For further distinction, use Unit#cloaked, which uses enum CloakedState
+    def is_cloaked?: () -> bool
+
     # Whether unit is effected by buff_id
     # 
     # _@param_ `buff_id`
@@ -20570,12 +20591,12 @@ module Api
     def debug_draw_placement: (?Api::Color? color) -> void
 
     # sord omit - no YARD return type given, using untyped
-    # Draws a sphere around the unit's attack range
+    # Draws a sphere around the unit's attack range (weapon range + radius)
     # 
-    # _@param_ `weapon_index` — default first weapon, see UnitTypeData.weapons
+    # _@param_ `weapon_index` — default first weapon, see UnitTypeData#weapons
     # 
     # _@param_ `color` — optional api color, default red
-    def debug_fire_range: (?Api::Color weapon_index, ?Api::Color? color) -> untyped
+    def debug_fire_range: (?Integer weapon_index, ?Api::Color? color) -> untyped
 
     # sord omit - no YARD return type given, using untyped
     # Calculates the distance between self and other
@@ -20625,18 +20646,22 @@ module Api
     def is_engaged_with?: ((Api::Unit | Integer) unit) -> bool
 
     # Checks whether enemy is within range of weapon or ability and can target ground/air.
-    # Defaults to basic weapon. Pass in ability to override
+    # By default, checks all weapons.
+    # Pass weapon_index or ability_id to target a specific source of damage.
     # 
     # _@param_ `unit` — enemy
     # 
-    # _@param_ `weapon_index` — defaults to 0 which is it's basic weapon for it's current form
+    # _@param_ `weapon_index` — passing this will select a specific Weapon
     # 
     # _@param_ `ability_id` — passing this will override weapon Api::AbilityId::*
     # 
     # ```ruby
+    # queen.can_attack?(enemy, weapon_index: 0) # Air attack
+    # queen.can_attack?(enemy, weapon_index: 1) # Ground attack
+    # queen.can_attack?(enemy) # Auto detect (scans all weapons)
     # ghost.can_attack?(enemy, weapon_index: 0, ability_id: Api::AbilityId::SNIPE)
     # ```
-    def can_attack?: (unit: Api::Unit, ?weapon_index: Integer, ?ability_id: Integer?) -> bool
+    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
@@ -20651,9 +20676,12 @@ module Api
     # _@param_ `weapon`
     def can_weapon_target_unit?: (unit: Api::Unit, weapon: Api::Weapon) -> bool
 
-    # sord omit - no YARD type given for "unit:", using untyped
-    # sord omit - no YARD type given for "ability:", using untyped
-    def can_ability_target_unit?: (unit: untyped, ability: untyped) -> bool
+    # Checks whether an ability can target a unit
+    # 
+    # _@param_ `unit`
+    # 
+    # _@param_ `ability`
+    def can_ability_target_unit?: (unit: Api::Unit, ability: Api::AbilityData) -> bool
 
     # Checks whether opposing unit is in the attack range.
     # 
@@ -20748,6 +20776,12 @@ module Api
     # width = radius * 2
     attr_accessor width: Float
 
+    attr_reader full_health?: bool
+
+    attr_reader full_shields?: bool
+
+    attr_reader full_energy?: bool
+
     attr_reader is_flying?: bool
 
     attr_reader is_burrowed?: bool
@@ -20766,6 +20800,10 @@ module Api
 
     # Returns whether the unit is grounded (not flying).
     attr_reader is_ground?: bool
+
+    # Returns whether the unit is cloaked. Revealed cloak units also return true.
+    # For further distinction, use Unit#cloaked, which uses enum CloakedState
+    attr_reader is_cloaked??: bool
   end
 
   # Adds additional functionality and fixes quirks with color specifically pertaining to debug commands
@@ -20991,9 +21029,8 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
-    # sord warn - "Array[Float,Float]" does not appear to be a type
     # Returns [x,y] array tuple
-    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+    def to_axy: () -> ::Array[(Float | Float)]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
@@ -21021,6 +21058,17 @@ module Api
     end
   end
 
+  # Adds additional functionality to message object Api::Point2D
+  module PlayerCommonExt
+    attr_accessor supply_cap: Integer
+
+    attr_accessor supply_used: Integer
+
+    attr_accessor supply_army: Integer
+
+    attr_accessor supply_workers: Integer
+  end
+
   # Adds additional functionality to message object Api::Unit
   module PointDistanceExtension
   end
@@ -21047,6 +21095,24 @@ module Api
     # 
     # _@return_ — side-length for placement
     attr_accessor placement_length: (Integer | untyped)
+
+    # Ground weapon range or 0.0 when it can't shoot ground
+    attr_accessor ground_range: (Float | untyped)
+
+    # Air weapon range or 0.0 when it can't shoot air
+    attr_accessor air_range: (Float | untyped)
+
+    # Ground weapon damage or 0.0
+    attr_accessor ground_damage: (Float | untyped)
+
+    # Air weapon damage or 0.0
+    attr_accessor air_damage: (Float | untyped)
+
+    # Ground weapon damage per second or 0.0
+    attr_accessor ground_dps: (Float | untyped)
+
+    # Air weapon damage per second or 0.0
+    attr_accessor air_dps: (Float | untyped)
   end
 
   # This module make sure that a read from method ability_id always returns the proper source id