sc2ai 0.7.0 → 0.8.0

data/sig/sc2ai.rbs

@@ -197,32 +197,32 @@ module Sc2
     # _@return_ — range of ports
     def self.port_range: (Integer from, Integer num_players) -> ::Range[untyped]
 
-    # sord omit - no YARD type given for "port", using untyped
     # Will bind tcp port and return port if successful
-    # if port is zero, it will return random port bound to
+    # when port is zero, it will return random port bound to
+    # 
+    # _@param_ `port`
     # 
     # _@return_ — port if bind succeeds, false on failure
-    def self.bind: (untyped port) -> (Integer | bool)
+    def self.bind: (Integer port) -> (Integer | bool)
   end
 
   # A port configuration for a Match which allows generating Api::PortSet
   class PortConfig
-    # sord omit - no YARD type given for "start_port:", using untyped
-    # sord omit - no YARD type given for "num_players:", using untyped
-    # sord omit - no YARD type given for "ports:", using untyped
-    def initialize: (start_port: untyped, num_players: untyped, ?ports: untyped) -> void
+    # _@param_ `start_port`
+    # 
+    # _@param_ `num_players`
+    # 
+    # _@param_ `ports`
+    def initialize: (start_port: Integer, num_players: Integer, ?ports: ::Array[Integer]) -> void
 
-    # sord omit - no YARD type given for :start_port, using untyped
     # Returns the value of attribute start_port.
-    attr_reader start_port: untyped
+    attr_accessor start_port: Integer
 
-    # sord omit - no YARD type given for :server_port_set, using untyped
     # Returns the value of attribute server_port_set.
-    attr_reader server_port_set: untyped
+    attr_accessor server_port_set: ::Array[Integer]
 
-    # sord omit - no YARD type given for :client_port_sets, using untyped
     # Returns the value of attribute client_port_sets.
-    attr_reader client_port_sets: untyped
+    attr_accessor client_port_sets: ::Array[Integer]
   end
 
   # Allows defining Ai, Bot, BotProcess (external), Human or Observer for a Match
@@ -396,6 +396,21 @@ module Sc2
     # _@return_ — ladder matches will set an opponent id
     attr_accessor opponent_id: String
 
+    # Keeps track of time spent in steps.
+    # 
+    # ```ruby
+    # # Useful for step-time as on ladder
+    # @timer.avg_step_time
+    # # Recent steps time, updated periodically. Good for debug ui
+    # @timer.avg_recent_step_time
+    # # Step time between now and previous measure and how many steps
+    # @timer.previous_on_step_time # Time we spent on step
+    # @timer.previous_on_step_count # How many steps we took
+    # ```
+    # 
+    # _@see_ `Sc2::StepTimer`
+    attr_accessor timer: (Sc2::StepTimer | untyped)
+
     # _@return_ — callbacks implemented on player class
     attr_accessor callbacks_defined: ::Array[Symbol]
 
@@ -936,6 +951,10 @@ module Sc2
       # Sends actions via api and flushes action_queue
       def perform_actions: () -> Api::ResponseAction?
 
+      # Makes 10x unit moves to the same target turn into one action
+      # with many unit_tags
+      def combine_similar_actions: () -> void
+
       # Empties and resets @action_queue
       def clear_action_queue: () -> void
 
@@ -1381,7 +1400,7 @@ module Sc2
       # Each value in [row][column] holds a float value which is the z height
       # 
       # _@return_ — Numo array
-      def parsed_terrain_height: () -> ::Numo::SFloat
+      def parsed_terrain_height: () -> ::Numo::DFloat
 
       # Returns one of three Integer visibility indicators at tile for x & y
       # 
@@ -1425,7 +1444,7 @@ module Sc2
       # _@return_ — Numo array
       # 
       # _@see_ `#visibility` — for reading from this value
-      def parsed_visibility_grid: () -> ::Numo::SFloat
+      def parsed_visibility_grid: () -> ::Numo::UInt8
 
       # Returns whether a tile has creep on it, as per minimap
       # One pixel covers one whole block. Corrects float inputs on your behalf.
@@ -1955,27 +1974,24 @@ module Sc2
       attr_accessor radar_rings: untyped
 
       # sord omit - no YARD type given for :_all_seen_unit_tags, using untyped
-      # Privately keep track of all seen Unit tags (excl structures) in order to detect new created units
+      # Privately keep track of all seen Unit tags in order to detect new created units
       attr_accessor _all_seen_unit_tags: untyped
 
       # sord omit - no YARD type given for :all_seen_unit_tags, using untyped
-      # Privately keep track of all seen Unit tags (excl structures) in order to detect new created units
+      # Privately keep track of all seen Unit tags in order to detect new created units
       attr_accessor all_seen_unit_tags: untyped
 
       # _@return_ — group of Units and Structures effected
       attr_accessor event_units_damaged: Sc2::UnitGroup
 
-      # sord omit - no YARD type given for :event_units_destroyed, using untyped
-      # TODO: Unit buff disabled, because it calls back too often (mineral in hand). Put back if useful
-      # Units (Unit/Structure) on which a new buff_ids appeared this frame
-      # See which buffs via: unit.buff_ids - unit.previous.buff_ids
-      # Read this on_step. Alternative to callback on_unit_buffed
-      # attr_accessor :event_units_buffed
-      attr_accessor event_units_destroyed: untyped
+      # _@return_ — group of dead units
+      attr_accessor event_units_destroyed: Sc2::UnitGroup
     end
 
     # Holds action list and queues batch
     module Actions
+      COMBINABLE_ABILITIES: untyped
+
       # Queues action for performing end of step
       # 
       # _@param_ `action`
@@ -2180,6 +2196,10 @@ module Sc2
       # Sends actions via api and flushes action_queue
       def perform_actions: () -> Api::ResponseAction?
 
+      # Makes 10x unit moves to the same target turn into one action
+      # with many unit_tags
+      def combine_similar_actions: () -> void
+
       # Empties and resets @action_queue
       def clear_action_queue: () -> void
 
@@ -2792,6 +2812,9 @@ module Sc2
     #    )[:observation]
     def send_request_for: (**untyped kwargs) -> untyped
 
+    # Total milliseconds spent waiting on SC2 responses
+    attr_accessor external_time: Float
+
     # Returns the value of attribute host.
     attr_accessor host: untyped
 
@@ -3113,6 +3136,68 @@ module Sc2
     end
   end
 
+  # Tracks various metrics about your step time performance.
+  class StepTimer
+    TRUNCATED_TIME_RANGE: untyped
+    HEALTHY_STEP_TIME_MS: untyped
+
+    # _@param_ `bot`
+    def initialize: (Sc2::Player _bot) -> void
+
+    # sord omit - no YARD return type given, using untyped
+    # How much time we have left in this step, to be healthy
+    def allowance: () -> untyped
+
+    # A one-line string summary of all tracked times
+    def summary: () -> String
+
+    # A hash containing :avg_real_time, :avg_step_time, :avg_recent_step_time, :previous_on_step_count, :previous_on_step_time
+    def to_h: () -> ::Hash[untyped, untyped]
+
+    # sord omit - no YARD return type given, using untyped
+    def update: () -> untyped
+
+    # sord omit - no YARD type given for "time", using untyped
+    # _@return_ — time with ansi colour coded
+    def format_time: (untyped time) -> String
+
+    # _@return_ — Realtime average time per step in ms. Includes SC2 wait time
+    attr_reader avg_real_time: Float
+
+    # _@return_ — Total average time per step in ms. "Ladder Time" as measured by aiarena
+    attr_reader avg_step_time: Float
+
+    # _@return_ — Running average time per step in ms for recent couple of steps
+    attr_accessor avg_recent_step_time: Float
+
+    # _@return_ — Running average time per step in ms for recent couple of steps
+    attr_reader recent_average: Float
+
+    # _@return_ — Previous on_step took this amount of ms to run
+    attr_reader previous_on_step_time: Float
+
+    # _@return_ — Number of frames which passed previous on_step
+    attr_reader previous_on_step_count: Integer
+
+    # Returns the value of attribute bot.
+    attr_accessor bot: untyped
+
+    # Returns the value of attribute previous_external_time.
+    attr_accessor previous_external_time: untyped
+
+    # Returns the value of attribute previous_update_time.
+    attr_accessor previous_update_time: untyped
+
+    # Returns the value of attribute recent_sum_time.
+    attr_accessor recent_sum_time: untyped
+
+    # Returns the value of attribute recent_sum_steps.
+    attr_accessor recent_sum_steps: untyped
+
+    # Returns the value of attribute recent_update_counter.
+    attr_accessor recent_update_counter: untyped
+  end
+
   # Manage virtual control groups of units, similar to Hash or Array.
   class UnitGroup
     include Enumerable
@@ -3127,6 +3212,12 @@ module Sc2
     TYPE_BASES: ::Array[Integer]
     TYPE_DETECTORS: ::Array[Integer]
     TYPE_WARPGATE_UNIT: ::Array[Integer]
+    TYPE_MELEE: ::Array[Integer]
+    TYPE_RANGE: untyped
+    TYPE_TERRAN_INFANTRY: ::Array[Integer]
+    TYPE_TERRAN_VEHICLE: ::Array[Integer]
+    TYPE_ZERG_MELEE: ::Array[Integer]
+    TYPE_ZERG_MISSILE: ::Array[Integer]
 
     # _@param_ `units` — default to be added.
     # 
@@ -3309,7 +3400,7 @@ module Sc2
     # _@param_ `other_unit_group`
     # 
     # _@return_ — new unit group
-    def subtract: (UnitGroup other_unit_group) -> UnitGroup
+    def subtract: (UnitGroup other_unit_group) -> Sc2::UnitGroup
 
     # sord omit - no YARD type given for "unit_group", using untyped
     # Merges unit_group with our units and returns a new unit group
@@ -3353,7 +3444,7 @@ module Sc2
     # _@param_ `other_unit_group`
     # 
     # _@return_ — new unit group
-    def intersection: (UnitGroup other_unit_group) -> UnitGroup
+    def intersection: (UnitGroup other_unit_group) -> Sc2::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
@@ -3476,7 +3567,7 @@ module Sc2
     # # Multiple - select space-men
     # ug.select_type([Api::UnitTypeId::MARINE, Api::UnitTypeId::REAPER]) #=> <UnitGroup: ...>
     # ```
-    def select_type: ((Integer | ::Array[Integer]) unit_type_ids) -> UnitGroup
+    def select_type: ((Integer | ::Array[Integer]) unit_type_ids) -> Sc2::UnitGroup
 
     # Returns a new UnitGroup excluding all units matching unit type id(s)
     # 
@@ -3488,7 +3579,7 @@ module Sc2
     # # Multiple - reject immovable army
     # ug.reject_type([Api::UnitTypeId::SIEGETANKSIEGED, Api::UnitTypeId::WIDOWMINEBURROWED]) #=> <UnitGroup: ...>
     # ```
-    def reject_type: ((Integer | ::Array[Integer]) unit_type_ids) -> UnitGroup
+    def reject_type: ((Integer | ::Array[Integer]) unit_type_ids) -> Sc2::UnitGroup
 
     # Creates a negative selector, which will perform the opposite on the current scope
     #   for it's next select_type/reject_type call.
@@ -3512,7 +3603,7 @@ module Sc2
     # # Multiple - select mechanical flying units
     # ug.select_attribute([:MECHANICAL, :FLYING]) #=> <UnitGroup: ...>
     # ```
-    def select_attribute: ((Integer | ::Array[Integer]) attributes) -> UnitGroup
+    def select_attribute: ((Integer | ::Array[Integer]) attributes) -> Sc2::UnitGroup
 
     # Returns a new UnitGroup containing all units excluding attribute id(s)
     # Multiple values work as an "AND" filter
@@ -3526,7 +3617,7 @@ module Sc2
     # # Multiple - reject mechanical flying units
     # ug.reject_attribute(:Mechanical, :Flying) #=> <UnitGroup: ...>
     # ```
-    def reject_attribute: ((Integer | ::Array[Integer]) attributes) -> UnitGroup
+    def reject_attribute: ((Integer | ::Array[Integer]) attributes) -> Sc2::UnitGroup
 
     # Selects units you own
     # i.e. @bot.all_units.owned # => Units you own
@@ -3579,26 +3670,25 @@ module Sc2
     # Selects gas structures (refinery/extractor/assimilator)
     # 
     # _@return_ — gas structures
-    def gas: () -> UnitGroup
+    def gas: () -> Sc2::UnitGroup
 
     # Selects units passively have Detection
     # 
     # _@return_ — gas structures
-    def detectors: () -> UnitGroup
+    def detectors: () -> Sc2::UnitGroup
 
     # Selects only units which have finished constructing, i.o.w. build_progress == 1.0
     # 
     # _@return_ — complete unit group
-    def completed: () -> UnitGroup
+    def completed: () -> Sc2::UnitGroup
 
     # Selects only units which have finished constructing, i.o.w. build_progress != 1.0
     # 
     # _@return_ — incomplete unit group
-    def incomplete: () -> UnitGroup
+    def incomplete: () -> Sc2::UnitGroup
 
-    # sord omit - no YARD return type given, using untyped
     # Selects only units which do not have orders
-    def idle: () -> untyped
+    def idle: () -> Sc2::UnitGroup
 
     # Selects units which have this ability available
     # Queries API if necessary
@@ -3606,7 +3696,7 @@ module Sc2
     # _@param_ `ability_id`
     # 
     # _@return_ — units which have the ability available
-    def ability_available?: (Integer ability_id) -> UnitGroup
+    def ability_available?: (Integer ability_id) -> Sc2::UnitGroup
 
     # Checks whether any unit's first order matches these abilities
     # 
@@ -3718,18 +3808,19 @@ module Sc2
     # _@return_ — return group or single unit if amount is not supplied
     def nearest_to: (pos: Sc2::Position, ?amount: untyped) -> (Sc2::UnitGroup | Api::Unit)?
 
-    # sord omit - no YARD return type given, using untyped
     # Selects units which are in a particular circle
     # 
     # _@param_ `point` — center of circle
     # 
     # _@param_ `radius`
-    def select_in_circle: (point: (Api::Point2D | Api::Point), radius: Float) -> untyped
+    # 
+    # _@return_ — new unit group
+    def select_in_circle: (point: (Api::Point2D | Api::Point), radius: Float) -> Sc2::UnitGroup
 
-    # sord omit - no YARD type given for :units, using untyped
     # A hash of units by tag.
-    #   @return [Hash<Integer, Api::Unit>] Api::Unit.tag => Api::Unit
-    attr_accessor units: untyped
+    # 
+    # _@return_ — Api::Unit.tag => Api::Unit
+    attr_accessor units: ::Hash[Integer, Api::Unit]
 
     # Returns the value of attribute _cache_hash.
     attr_accessor _cache_hash: untyped
@@ -3758,6 +3849,12 @@ module Sc2
       TYPE_BASES: ::Array[Integer]
       TYPE_DETECTORS: ::Array[Integer]
       TYPE_WARPGATE_UNIT: ::Array[Integer]
+      TYPE_MELEE: ::Array[Integer]
+      TYPE_RANGE: untyped
+      TYPE_TERRAN_INFANTRY: ::Array[Integer]
+      TYPE_TERRAN_VEHICLE: ::Array[Integer]
+      TYPE_ZERG_MELEE: ::Array[Integer]
+      TYPE_ZERG_MISSILE: ::Array[Integer]
 
       # _@param_ `unit_group`
       def initialize: (Sc2::UnitGroup unit_group) -> void
@@ -3904,6 +4001,25 @@ module Sc2
   class Client
     include Sc2::Client::ConfigurableOptions
 
+    # Reads bundled versions.json
+    # See tact archive or blizztrack for update config file
+    # https://github.com/mdX7/tact_configs/blob/77ecc4176689ab6c50be342e1ad73127ffe358d7/tpr/sc2/config/08/b3/08b331b39d9fbe95c338ec370e63f2e2#L4
+    # https://blizztrack.com/config/s2/bc/8453c2f1c98b955334c7284215429c36
+    # 
+    # _@return_ — JSON contents of versions.json
+    # 
+    # ```ruby
+    # {
+    #   "base-version": 92028, # <- from "build-name" [1..-1] = "B92028"
+    #   "data-hash": "2B7746A6706F919775EF1BADFC95EA1C", # <- from "root"
+    #   "fixed-hash": "163B1CDF46F09B621F6312CD6901228E", # <- from "build-fixed-hash"
+    #   "label": "5.0.13", # <- check game client
+    #   "replay-hash": "BE64E420B329BD2A7D10EEBC0039D6E5", # <- from "build-replay-hash"
+    #   "version": 92028 <- always same as base-version these days
+    # },
+    # ```
+    def self.versions_json: () -> ::Array[untyped]
+
     # Whether the Sc2 process is running or not
     def running?: () -> bool
 
@@ -3944,25 +4060,6 @@ module Sc2
     # _@return_ — command to launch Sc2
     def command_string: () -> String
 
-    # Reads bundled versions.json
-    # See tact archive or blizztrack for update config file
-    # https://github.com/mdX7/tact_configs/blob/77ecc4176689ab6c50be342e1ad73127ffe358d7/tpr/sc2/config/08/b3/08b331b39d9fbe95c338ec370e63f2e2#L4
-    # https://blizztrack.com/config/s2/bc/8453c2f1c98b955334c7284215429c36return
-    # 
-    # _@return_ — JSON contents of versions.json
-    # 
-    # ```ruby
-    # {
-    #   "base-version": 92028, # <- from "build-name" [1..-1] = "B92028"
-    #   "data-hash": "2B7746A6706F919775EF1BADFC95EA1C", # <- from "root"
-    #   "fixed-hash": "163B1CDF46F09B621F6312CD6901228E", # <- from "build-fixed-hash"
-    #   "label": "5.0.13", # <- check game client
-    #   "replay-hash": "BE64E420B329BD2A7D10EEBC0039D6E5", # <- from "build-replay-hash"
-    #   "version": 92028 <- always same as base-version these days
-    # },
-    # ```
-    def versions_json: () -> ::Array[untyped]
-
     # sord omit - no YARD return type given, using untyped
     # Resets configurable launch options to their defaults
     def load_default_launch_options: () -> untyped
@@ -4048,7 +4145,7 @@ module Sc2
       # top position of window if windowed
       attr_accessor windowy: Integer
 
-      # Version number such as "4.10". Leave blank to use latest
+      # Version number such as "ladder" or "4.10". Leave blank to use latest
       attr_accessor version: String?
     end
   end
@@ -4128,6 +4225,15 @@ module Sc2
   module Position
     TOLERANCE: untyped
 
+    # Returns self.
+    # If you're ever unsure if you have a Unit or Position in hand,
+    # this method allows safely calling `unknown_target.pos` to return a position.
+    # 
+    # ```ruby
+    # target.pos
+    # ```
+    def pos: () -> Sc2::Position
+
     # 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.
@@ -4162,11 +4268,13 @@ module Sc2
     # _@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
+    # Randomly change this point's x and y by the supplied offset.
+    # i.e. offset=2 can adjust x and y by any number in range -2..2
+    # 
+    # _@param_ `offset`
     # 
     # _@return_ — self
-    def random_offset!: (untyped offset) -> Sc2::Position
+    def random_offset!: (Float offset) -> Sc2::Position
 
     # Creates a new point with x and y which is offset
     # 
@@ -4207,12 +4315,13 @@ module Sc2
     # A new point representing the normalized version of this vector (unit length).
     def normalize: () -> Api::Point2D
 
-    # sord omit - no YARD type given for "other", using untyped
     # Linear interpolation between this point and another for scale
     # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
     # 
+    # _@param_ `other`
+    # 
     # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (untyped other, Float scale) -> Api::Point2D
+    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
 
     # Calculates the distance between self and other
     # 
@@ -4253,16 +4362,13 @@ module Sc2
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
     # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[(Float | Float)]
+    def to_axy: () -> ::Array[Float]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
-    # 
-    # _@return_ — Array<Integer, Integer>
-    def to_atile: () -> ::Array[(Integer | Integer)]
+    def to_atile: () -> ::Array[Integer]
 
-    # sord omit - no YARD return type given, using untyped
-    def to_s: () -> untyped
+    def to_s: () -> String
   end
 end
 
@@ -4570,8 +4676,6 @@ module Api
     TAKENDAMAGE: untyped
     RAVENSCRAMBLERMISSILECARRIER: untyped
     BATTERYOVERCHARGE: untyped
-    LOADOUTSPRAYTRACKER: untyped
-    HYDRALISKFRENZY: untyped
     DUMMYBUFF002: untyped
     DUMMYBUFF001: untyped
     DUMMYBUFF003: untyped
@@ -4882,6 +4986,7 @@ module Api
     LOAD_BUNKER: untyped
     UNLOADALL_BUNKER: untyped
     UNLOADUNIT_BUNKER: untyped
+    COMMANDCENTERTRANSPORT_COMMANDCENTERTRANSPORT: untyped
     UNLOADALL_COMMANDCENTER: untyped
     UNLOADUNIT_COMMANDCENTER: untyped
     LOADALL_COMMANDCENTER: untyped
@@ -4909,6 +5014,7 @@ module Api
     BARRACKSTRAIN_REAPER: untyped
     BARRACKSTRAIN_GHOST: untyped
     BARRACKSTRAIN_MARAUDER: untyped
+    FACTORYTRAIN_FACTORYTRAIN: untyped
     FACTORYTRAIN_SIEGETANK: untyped
     FACTORYTRAIN_THOR: untyped
     FACTORYTRAIN_HELLION: untyped
@@ -5173,9 +5279,11 @@ module Api
     TRAINQUEEN_QUEEN: untyped
     BURROWCREEPTUMORDOWN_BURROWDOWN: untyped
     TRANSFUSION_TRANSFUSION: untyped
+    TECHLABMORPH_TECHLABMORPH: untyped
     BARRACKSTECHLABMORPH_TECHLABBARRACKS: untyped
     FACTORYTECHLABMORPH_TECHLABFACTORY: untyped
     STARPORTTECHLABMORPH_TECHLABSTARPORT: untyped
+    REACTORMORPH_REACTORMORPH: untyped
     BARRACKSREACTORMORPH_REACTOR: untyped
     FACTORYREACTORMORPH_REACTOR: untyped
     STARPORTREACTORMORPH_REACTOR: untyped
@@ -5203,17 +5311,23 @@ module Api
     BUILD_NYDUSWORM: untyped
     BUILDNYDUSCANAL_SUMMONNYDUSCANALATTACKER: untyped
     BUILDNYDUSCANAL_CANCEL: untyped
+    BROODLORDHANGAR_BROODLORDHANGAR: untyped
     EFFECT_CHARGE: untyped
+    TOWERCAPTURE_TOWERCAPTURE: untyped
     HERDINTERACT_HERD: untyped
     CONTAMINATE_CONTAMINATE: untyped
+    SHATTER_SHATTER: untyped
     CANCEL_QUEUEPASIVE: untyped
     CANCELSLOT_QUEUEPASSIVE: untyped
     CANCEL_QUEUEPASSIVECANCELTOSELECTION: untyped
     CANCELSLOT_QUEUEPASSIVECANCELTOSELECTION: untyped
     MORPHTOGHOSTNOVA_MOVE: untyped
     DIGESTERCREEPSPRAY_DIGESTERCREEPSPRAY: untyped
+    MORPHTOCOLLAPSIBLETERRANTOWERDEBRIS_MORPHTOCOLLAPSIBLETERRANTOWERDEBRIS: untyped
     MORPHTOCOLLAPSIBLETERRANTOWERDEBRIS_CANCEL: untyped
+    MORPHTOCOLLAPSIBLETERRANTOWERDEBRISRAMPLEFT_MORPHTOCOLLAPSIBLETERRANTOWERDEBRISRAMPLEFT: untyped
     MORPHTOCOLLAPSIBLETERRANTOWERDEBRISRAMPLEFT_CANCEL: untyped
+    MORPHTOCOLLAPSIBLETERRANTOWERDEBRISRAMPRIGHT_MORPHTOCOLLAPSIBLETERRANTOWERDEBRISRAMPRIGHT: untyped
     MORPHTOCOLLAPSIBLETERRANTOWERDEBRISRAMPRIGHT_CANCEL: untyped
     MORPH_MOTHERSHIP: untyped
     CANCEL_MORPHMOTHERSHIP: untyped
@@ -5221,6 +5335,7 @@ module Api
     NEXUSINVULNERABILITY_NEXUSINVULNERABILITY: untyped
     EFFECT_MASSRECALL_MOTHERSHIPCORE: untyped
     MORPH_HELLION: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRIS_MORPHTOCOLLAPSIBLEROCKTOWERDEBRIS: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRIS_CANCEL: untyped
     MORPH_HELLBAT: untyped
     BURROWDOWN_SWARMHOST: untyped
@@ -5236,6 +5351,7 @@ module Api
     BLINDINGCLOUD_BLINDINGCLOUD: untyped
     EFFECT_ABDUCT: untyped
     VIPERCONSUMESTRUCTURE_VIPERCONSUME: untyped
+    TESTZERG_TESTZERG: untyped
     TESTZERG_CANCEL: untyped
     BEHAVIOR_BUILDINGATTACKON: untyped
     BEHAVIOR_BUILDINGATTACKOFF: untyped
@@ -5256,7 +5372,9 @@ module Api
     HALLUCINATION_ORACLE: untyped
     EFFECT_MEDIVACIGNITEAFTERBURNERS: untyped
     ORACLEREVELATION_ORACLEREVELATION: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHT_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHT: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHT_CANCEL: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFT_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFT: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFT_CANCEL: untyped
     ULTRALISKWEAPONCOOLDOWN_ULTRALISKWEAPONCOOLDOWN: untyped
     EFFECT_PHOTONOVERCHARGE: untyped
@@ -5268,6 +5386,22 @@ module Api
     XELNAGA_CAVERNS_DOORSWOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
     XELNAGA_CAVERNS_DOORWOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
     EFFECT_TIMEWARP: untyped
+    TARSONIS_DOORN_TARSONIS_DOORN: untyped
+    TARSONIS_DOORNLOWERED_TARSONIS_DOORNLOWERED: untyped
+    TARSONIS_DOORNE_TARSONIS_DOORNE: untyped
+    TARSONIS_DOORNELOWERED_TARSONIS_DOORNELOWERED: untyped
+    TARSONIS_DOORE_TARSONIS_DOORE: untyped
+    TARSONIS_DOORELOWERED_TARSONIS_DOORELOWERED: untyped
+    TARSONIS_DOORNW_TARSONIS_DOORNW: untyped
+    TARSONIS_DOORNWLOWERED_TARSONIS_DOORNWLOWERED: untyped
+    COMPOUNDMANSION_DOORN_COMPOUNDMANSION_DOORN: untyped
+    COMPOUNDMANSION_DOORNLOWERED_COMPOUNDMANSION_DOORNLOWERED: untyped
+    COMPOUNDMANSION_DOORNE_COMPOUNDMANSION_DOORNE: untyped
+    COMPOUNDMANSION_DOORNELOWERED_COMPOUNDMANSION_DOORNELOWERED: untyped
+    COMPOUNDMANSION_DOORE_COMPOUNDMANSION_DOORE: untyped
+    COMPOUNDMANSION_DOORELOWERED_COMPOUNDMANSION_DOORELOWERED: untyped
+    COMPOUNDMANSION_DOORNW_COMPOUNDMANSION_DOORNW: untyped
+    COMPOUNDMANSION_DOORNWLOWERED_COMPOUNDMANSION_DOORNWLOWERED: untyped
     CAUSTICSPRAY_CAUSTICSPRAY: untyped
     MORPHTORAVAGER_RAVAGER: untyped
     CANCEL_MORPHRAVAGER: untyped
@@ -5296,6 +5430,7 @@ module Api
     HALLUCINATION_DISRUPTOR: untyped
     HALLUCINATION_ADEPT: untyped
     EFFECT_VOIDRAYPRISMATICALIGNMENT: untyped
+    SEEKERDUMMYCHANNEL_SEEKERDUMMYCHANNEL: untyped
     VOIDMPIMMORTALREVIVEREBUILD_IMMORTAL: untyped
     ARBITERMPSTASISFIELD_ARBITERMPSTASISFIELD: untyped
     ARBITERMPRECALL_ARBITERMPRECALL: untyped
@@ -5329,6 +5464,7 @@ module Api
     CANCEL_ADEPTPHASESHIFT: untyped
     CANCEL_ADEPTSHADEPHASESHIFT: untyped
     SLAYNELEMENTALGRAB_SLAYNELEMENTALGRAB: untyped
+    MORPHTOCOLLAPSIBLEPURIFIERTOWERDEBRIS_MORPHTOCOLLAPSIBLEPURIFIERTOWERDEBRIS: untyped
     MORPHTOCOLLAPSIBLEPURIFIERTOWERDEBRIS_CANCEL: untyped
     EFFECT_SHADOWSTRIDE: untyped
     EFFECT_SPAWNLOCUSTS: untyped
@@ -5403,8 +5539,11 @@ module Api
     MOVE: untyped
     PATROL: untyped
     UNLOADUNIT: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN_CANCEL: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN_CANCEL: untyped
+    HYDRALISKFRENZY_HYDRALISKFRENZY: untyped
     AMORPHOUSARMORCLOUD_AMORPHOUSARMORCLOUD: untyped
     SHIELDBATTERYRECHARGEEX5_SHIELDBATTERYRECHARGE: untyped
     SHIELDBATTERYRECHARGEEX5_STOP: untyped
@@ -5414,7 +5553,6 @@ module Api
     ENERGYRECHARGE_ENERGYRECHARGE: untyped
     SALVAGEEFFECT_SALVAGE: untyped
     WORKERSTOPIDLEABILITYVESPENE_GATHER: untyped
-    FRENZY: untyped
 
     # Returns an array of all constants
     def self.ids: () -> ::Array[Integer]
@@ -7041,11 +7179,13 @@ module Api
     # _@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
+    # Randomly change this point's x and y by the supplied offset.
+    # i.e. offset=2 can adjust x and y by any number in range -2..2
+    # 
+    # _@param_ `offset`
     # 
     # _@return_ — self
-    def random_offset!: (untyped offset) -> Sc2::Position
+    def random_offset!: (Float offset) -> Sc2::Position
 
     # Creates a new point with x and y which is offset
     # 
@@ -7086,12 +7226,13 @@ module Api
     # A new point representing the normalized version of this vector (unit length).
     def normalize: () -> Api::Point2D
 
-    # sord omit - no YARD type given for "other", using untyped
     # Linear interpolation between this point and another for scale
     # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
     # 
+    # _@param_ `other`
+    # 
     # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (untyped other, Float scale) -> Api::Point2D
+    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
 
     # Calculates the distance between self and other
     # 
@@ -7132,16 +7273,13 @@ module Api
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
     # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[(Float | Float)]
+    def to_axy: () -> ::Array[Float]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
-    # 
-    # _@return_ — Array<Integer, Integer>
-    def to_atile: () -> ::Array[(Integer | Integer)]
+    def to_atile: () -> ::Array[Integer]
 
-    # sord omit - no YARD return type given, using untyped
-    def to_s: () -> untyped
+    def to_s: () -> String
 
     # sord omit - no YARD type given for :pos, using untyped
     # optional field readers
@@ -8013,9 +8151,6 @@ 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
-    def target_for_addon_placement: () -> untyped
-
     # 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
@@ -10614,32 +10749,6 @@ module Api
     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
@@ -13725,6 +13834,15 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_json: (?untyped as_json_options) -> untyped
 
+    # Returns self.
+    # If you're ever unsure if you have a Unit or Position in hand,
+    # this method allows safely calling `unknown_target.pos` to return a position.
+    # 
+    # ```ruby
+    # target.pos
+    # ```
+    def pos: () -> Sc2::Position
+
     # 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.
@@ -13759,11 +13877,13 @@ module Api
     # _@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
+    # Randomly change this point's x and y by the supplied offset.
+    # i.e. offset=2 can adjust x and y by any number in range -2..2
+    # 
+    # _@param_ `offset`
     # 
     # _@return_ — self
-    def random_offset!: (untyped offset) -> Sc2::Position
+    def random_offset!: (Float offset) -> Sc2::Position
 
     # Creates a new point with x and y which is offset
     # 
@@ -13804,12 +13924,13 @@ module Api
     # A new point representing the normalized version of this vector (unit length).
     def normalize: () -> Api::Point2D
 
-    # sord omit - no YARD type given for "other", using untyped
     # Linear interpolation between this point and another for scale
     # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
     # 
+    # _@param_ `other`
+    # 
     # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (untyped other, Float scale) -> Api::Point2D
+    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
 
     # Calculates the distance between self and other
     # 
@@ -13850,16 +13971,13 @@ module Api
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
     # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[(Float | Float)]
+    def to_axy: () -> ::Array[Float]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
-    # 
-    # _@return_ — Array<Integer, Integer>
-    def to_atile: () -> ::Array[(Integer | Integer)]
+    def to_atile: () -> ::Array[Integer]
 
-    # sord omit - no YARD return type given, using untyped
-    def to_s: () -> untyped
+    def to_s: () -> String
 
     # sord omit - no YARD type given for :x, using untyped
     # optional field readers
@@ -13982,6 +14100,15 @@ module Api
     # ```
     def self.[]: ((Float | Integer) x, (Float | Integer) y) -> Api::Point2D
 
+    # Returns self.
+    # If you're ever unsure if you have a Unit or Position in hand,
+    # this method allows safely calling `unknown_target.pos` to return a position.
+    # 
+    # ```ruby
+    # target.pos
+    # ```
+    def pos: () -> Sc2::Position
+
     # 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.
@@ -14016,11 +14143,13 @@ module Api
     # _@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
+    # Randomly change this point's x and y by the supplied offset.
+    # i.e. offset=2 can adjust x and y by any number in range -2..2
+    # 
+    # _@param_ `offset`
     # 
     # _@return_ — self
-    def random_offset!: (untyped offset) -> Sc2::Position
+    def random_offset!: (Float offset) -> Sc2::Position
 
     # Creates a new point with x and y which is offset
     # 
@@ -14061,12 +14190,13 @@ module Api
     # A new point representing the normalized version of this vector (unit length).
     def normalize: () -> Api::Point2D
 
-    # sord omit - no YARD type given for "other", using untyped
     # Linear interpolation between this point and another for scale
     # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
     # 
+    # _@param_ `other`
+    # 
     # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (untyped other, Float scale) -> Api::Point2D
+    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
 
     # Calculates the distance between self and other
     # 
@@ -14107,16 +14237,13 @@ module Api
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
     # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[(Float | Float)]
+    def to_axy: () -> ::Array[Float]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
-    # 
-    # _@return_ — Array<Integer, Integer>
-    def to_atile: () -> ::Array[(Integer | Integer)]
+    def to_atile: () -> ::Array[Integer]
 
-    # sord omit - no YARD return type given, using untyped
-    def to_s: () -> untyped
+    def to_s: () -> String
 
     # sord omit - no YARD return type given, using untyped
     # Hashes on x and y
@@ -14207,6 +14334,15 @@ module Api
     # ```
     def self.[]: (Float x, Float y, Float z) -> Api::Point
 
+    # Returns self.
+    # If you're ever unsure if you have a Unit or Position in hand,
+    # this method allows safely calling `unknown_target.pos` to return a position.
+    # 
+    # ```ruby
+    # target.pos
+    # ```
+    def pos: () -> Sc2::Position
+
     # 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.
@@ -14241,11 +14377,13 @@ module Api
     # _@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
+    # Randomly change this point's x and y by the supplied offset.
+    # i.e. offset=2 can adjust x and y by any number in range -2..2
+    # 
+    # _@param_ `offset`
     # 
     # _@return_ — self
-    def random_offset!: (untyped offset) -> Sc2::Position
+    def random_offset!: (Float offset) -> Sc2::Position
 
     # Creates a new point with x and y which is offset
     # 
@@ -14286,12 +14424,13 @@ module Api
     # A new point representing the normalized version of this vector (unit length).
     def normalize: () -> Api::Point2D
 
-    # sord omit - no YARD type given for "other", using untyped
     # Linear interpolation between this point and another for scale
     # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
     # 
+    # _@param_ `other`
+    # 
     # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (untyped other, Float scale) -> Api::Point2D
+    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
 
     # Calculates the distance between self and other
     # 
@@ -14332,16 +14471,13 @@ module Api
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
     # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[(Float | Float)]
+    def to_axy: () -> ::Array[Float]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
-    # 
-    # _@return_ — Array<Integer, Integer>
-    def to_atile: () -> ::Array[(Integer | Integer)]
+    def to_atile: () -> ::Array[Integer]
 
-    # sord omit - no YARD return type given, using untyped
-    def to_s: () -> untyped
+    def to_s: () -> String
 
     # sord omit - no YARD return type given, using untyped
     def hash: () -> untyped
@@ -14412,6 +14548,15 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_json: (?untyped as_json_options) -> untyped
 
+    # Returns self.
+    # If you're ever unsure if you have a Unit or Position in hand,
+    # this method allows safely calling `unknown_target.pos` to return a position.
+    # 
+    # ```ruby
+    # target.pos
+    # ```
+    def pos: () -> Sc2::Position
+
     # 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.
@@ -14446,11 +14591,13 @@ module Api
     # _@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
+    # Randomly change this point's x and y by the supplied offset.
+    # i.e. offset=2 can adjust x and y by any number in range -2..2
+    # 
+    # _@param_ `offset`
     # 
     # _@return_ — self
-    def random_offset!: (untyped offset) -> Sc2::Position
+    def random_offset!: (Float offset) -> Sc2::Position
 
     # Creates a new point with x and y which is offset
     # 
@@ -14491,12 +14638,13 @@ module Api
     # A new point representing the normalized version of this vector (unit length).
     def normalize: () -> Api::Point2D
 
-    # sord omit - no YARD type given for "other", using untyped
     # Linear interpolation between this point and another for scale
     # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
     # 
+    # _@param_ `other`
+    # 
     # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (untyped other, Float scale) -> Api::Point2D
+    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
 
     # Calculates the distance between self and other
     # 
@@ -14537,16 +14685,13 @@ module Api
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
     # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[(Float | Float)]
+    def to_axy: () -> ::Array[Float]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
-    # 
-    # _@return_ — Array<Integer, Integer>
-    def to_atile: () -> ::Array[(Integer | Integer)]
+    def to_atile: () -> ::Array[Integer]
 
-    # sord omit - no YARD return type given, using untyped
-    def to_s: () -> untyped
+    def to_s: () -> String
 
     # sord omit - no YARD type given for :x, using untyped
     # optional field readers
@@ -20013,9 +20158,6 @@ 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
-    def target_for_addon_placement: () -> untyped
-
     # 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
@@ -20052,6 +20194,17 @@ module Api
 
     attr_reader full_energy?: bool
 
+    # Returns whether this is a melee (non-ranged) attacker
+    # Archon isn't melee; 3 range
+    # Hellbat is melee, but Hellion isn't melee; 5 range
+    # Roach isn't melee; just an attack animation when nearby
+    attr_reader is_melee?: bool
+
+    # Returns ranged attack units
+    # 
+    # _@see_ `Sc2::UnitGroup::TYPE_RANGE`
+    attr_reader is_ranged?: bool
+
     attr_reader is_flying?: bool
 
     attr_reader is_burrowed?: bool
@@ -20175,6 +20328,15 @@ module Api
   module PowerSourceExtension
     include Sc2::Position
 
+    # Returns self.
+    # If you're ever unsure if you have a Unit or Position in hand,
+    # this method allows safely calling `unknown_target.pos` to return a position.
+    # 
+    # ```ruby
+    # target.pos
+    # ```
+    def pos: () -> Sc2::Position
+
     # 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.
@@ -20209,11 +20371,13 @@ module Api
     # _@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
+    # Randomly change this point's x and y by the supplied offset.
+    # i.e. offset=2 can adjust x and y by any number in range -2..2
+    # 
+    # _@param_ `offset`
     # 
     # _@return_ — self
-    def random_offset!: (untyped offset) -> Sc2::Position
+    def random_offset!: (Float offset) -> Sc2::Position
 
     # Creates a new point with x and y which is offset
     # 
@@ -20254,12 +20418,13 @@ module Api
     # A new point representing the normalized version of this vector (unit length).
     def normalize: () -> Api::Point2D
 
-    # sord omit - no YARD type given for "other", using untyped
     # Linear interpolation between this point and another for scale
     # Finds a point on a line between two points at % along the way. 0.0 returns self,  1.0 returns other, 0.5 is halfway.
     # 
+    # _@param_ `other`
+    # 
     # _@param_ `scale` — a value between 0.0..1.0
-    def lerp: (untyped other, Float scale) -> Api::Point2D
+    def lerp: (Sc2::Position other, Float scale) -> Api::Point2D
 
     # Calculates the distance between self and other
     # 
@@ -20300,16 +20465,13 @@ module Api
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
     # Returns [x,y] array tuple
-    def to_axy: () -> ::Array[(Float | Float)]
+    def to_axy: () -> ::Array[Float]
 
     # Returns [x,y] array tuple where floats are cast to ints
     # Useful when trying to find the tile which something is on
-    # 
-    # _@return_ — Array<Integer, Integer>
-    def to_atile: () -> ::Array[(Integer | Integer)]
+    def to_atile: () -> ::Array[Integer]
 
-    # sord omit - no YARD return type given, using untyped
-    def to_s: () -> untyped
+    def to_s: () -> String
 
     # Adds additional functionality to message class Api::PowerSource
     module ClassMethods