sc2ai 0.6.5 → 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.
@@ -1473,6 +1492,9 @@ module Sc2
       # ```
       def expansions: () -> ::Hash[Api::Point2D, UnitGroup]
 
+      # Mineral walls. Defined once upon start of game, mostly based on layout.
+      def mineral_walls: () -> Sc2::UnitGroup
+
       # Returns a list of 2d points for expansion build locations
       # Does not contain mineral info, but the value can be checked against geo.expansions
       # 
@@ -1952,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`
@@ -2177,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
 
@@ -2789,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
 
@@ -3110,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
@@ -3124,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.
     # 
@@ -3306,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
@@ -3350,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
@@ -3473,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)
     # 
@@ -3485,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.
@@ -3509,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
@@ -3523,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
@@ -3576,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
@@ -3603,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
     # 
@@ -3715,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
@@ -3755,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
@@ -3901,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
 
@@ -3941,11 +4060,6 @@ module Sc2
     # _@return_ — command to launch Sc2
     def command_string: () -> String
 
-    # Reads bundled versions.json
-    # 
-    # _@return_ — JSON contents of versions.json
-    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
@@ -4031,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
@@ -4111,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.
@@ -4145,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
     # 
@@ -4190,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
     # 
@@ -4236,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
 
@@ -4543,7 +4666,7 @@ module Api
     ACCELERATIONZONETEMPORALFIELD: untyped
     ACCELERATIONZONEFLYINGTEMPORALFIELD: untyped
     INHIBITORZONEFLYINGTEMPORALFIELD: untyped
-    LOADOUTSPRAYTRACKER: untyped
+    DUMMYBUFF000: untyped
     INHIBITORZONETEMPORALFIELD: untyped
     CLOAKFIELD: untyped
     RESONATINGGLAIVESPHASESHIFT: untyped
@@ -4553,6 +4676,11 @@ module Api
     TAKENDAMAGE: untyped
     RAVENSCRAMBLERMISSILECARRIER: untyped
     BATTERYOVERCHARGE: untyped
+    DUMMYBUFF002: untyped
+    DUMMYBUFF001: untyped
+    DUMMYBUFF003: untyped
+    DUMMYBUFF004: untyped
+    DUMMYBUFF005: untyped
 
     # sord omit - no YARD return type given, using untyped
     def self._250MMSTRIKECANNONS: () -> untyped
@@ -4742,36 +4870,27 @@ module Api
 
   # Constant reference of Ability ids
   module AbilityId
-    NULL_NULL: untyped
     SMART: untyped
     TAUNT_TAUNT: untyped
     STOP_STOP: untyped
     STOP_HOLDFIRESPECIAL: untyped
     STOP_CHEER: untyped
     STOP_DANCE: untyped
-    HOLDFIRE_STOPSPECIAL: untyped
-    HOLDFIRE_HOLDFIRE: untyped
     MOVE_MOVE: untyped
     PATROL_PATROL: untyped
     HOLDPOSITION_HOLD: untyped
     SCAN_MOVE: untyped
     MOVE_TURN: untyped
-    BEACON_CANCEL: untyped
-    BEACON_BEACONMOVE: untyped
     ATTACK_ATTACK: untyped
     ATTACK_ATTACKTOWARDS: untyped
     ATTACK_ATTACKBARRAGE: untyped
     EFFECT_SPRAY_TERRAN: untyped
     EFFECT_SPRAY_ZERG: untyped
     EFFECT_SPRAY_PROTOSS: untyped
-    EFFECT_SALVAGE: untyped
-    CORRUPTION_CORRUPTIONABILITY: untyped
-    CORRUPTION_CANCEL: untyped
     BEHAVIOR_HOLDFIREON_GHOST: untyped
     BEHAVIOR_HOLDFIREOFF_GHOST: untyped
     MORPHTOINFESTEDTERRAN_INFESTEDTERRANS: untyped
     EXPLODE_EXPLODE: untyped
-    RESEARCH_INTERCEPTORGRAVITONCATAPULT: untyped
     FLEETBEACONRESEARCH_RESEARCHINTERCEPTORLAUNCHSPEEDUPGRADE: untyped
     RESEARCH_PHOENIXANIONPULSECRYSTALS: untyped
     FLEETBEACONRESEARCH_TEMPESTRANGEUPGRADE: untyped
@@ -4780,11 +4899,9 @@ module Api
     FUNGALGROWTH_FUNGALGROWTH: untyped
     GUARDIANSHIELD_GUARDIANSHIELD: untyped
     EFFECT_REPAIR_MULE: untyped
-    MORPHZERGLINGTOBANELING_BANELING: untyped
     NEXUSTRAINMOTHERSHIP_MOTHERSHIP: untyped
     FEEDBACK_FEEDBACK: untyped
     EFFECT_MASSRECALL_STRATEGICRECALL: untyped
-    PLACEPOINTDEFENSEDRONE_POINTDEFENSEDRONE: untyped
     HALLUCINATION_ARCHON: untyped
     HALLUCINATION_COLOSSUS: untyped
     HALLUCINATION_HIGHTEMPLAR: untyped
@@ -4797,21 +4914,11 @@ module Api
     HALLUCINATION_ZEALOT: untyped
     HARVEST_GATHER_MULE: untyped
     HARVEST_RETURN_MULE: untyped
-    SEEKERMISSILE_HUNTERSEEKERMISSILE: untyped
     CALLDOWNMULE_CALLDOWNMULE: untyped
     GRAVITONBEAM_GRAVITONBEAM: untyped
     CANCEL_GRAVITONBEAM: untyped
     BUILDINPROGRESSNYDUSCANAL_CANCEL: untyped
-    SIPHON_SIPHON: untyped
-    SIPHON_CANCEL: untyped
-    LEECH_LEECH: untyped
     SPAWNCHANGELING_SPAWNCHANGELING: untyped
-    DISGUISEASZEALOT_ZEALOT: untyped
-    DISGUISEASMARINEWITHSHIELD_MARINE: untyped
-    DISGUISEASMARINEWITHOUTSHIELD_MARINE: untyped
-    DISGUISEASZERGLINGWITHWINGS_ZERGLING: untyped
-    DISGUISEASZERGLINGWITHOUTWINGS_ZERGLING: untyped
-    PHASESHIFT_PHASESHIFT: untyped
     RALLY_BUILDING: untyped
     RALLY_MORPHING_UNIT: untyped
     RALLY_COMMANDCENTER: untyped
@@ -4822,17 +4929,13 @@ module Api
     RESEARCH_TUNNELINGCLAWS: untyped
     ROACHWARRENRESEARCH_ROACHSUPPLY: untyped
     SAPSTRUCTURE_SAPSTRUCTURE: untyped
-    INFESTEDTERRANS_INFESTEDTERRANS: untyped
     NEURALPARASITE_NEURALPARASITE: untyped
     CANCEL_NEURALPARASITE: untyped
     EFFECT_INJECTLARVA: untyped
     EFFECT_STIM_MARAUDER: untyped
     SUPPLYDROP_SUPPLYDROP: untyped
-    TEMPORALRIFT_TEMPORALRIFT: untyped
-    EFFECT_CHRONOBOOST: untyped
     RESEARCH_ANABOLICSYNTHESIS: untyped
     RESEARCH_CHITINOUSPLATING: untyped
-    WORMHOLETRANSIT_WORMHOLETRANSIT: untyped
     HARVEST_GATHER_SCV: untyped
     HARVEST_RETURN_SCV: untyped
     HARVEST_GATHER_PROBE: untyped
@@ -4846,8 +4949,6 @@ module Api
     CANCELSLOT_QUEUE5: untyped
     CANCEL_QUEUECANCELTOSELECTION: untyped
     CANCELSLOT_QUEUECANCELTOSELECTION: untyped
-    QUE5LONGBLEND_CANCEL: untyped
-    QUE5LONGBLEND_CANCELSLOT: untyped
     CANCEL_QUEUEADDON: untyped
     CANCELSLOT_ADDON: untyped
     CANCEL_BUILDINPROGRESS: untyped
@@ -4867,12 +4968,9 @@ module Api
     TERRANBUILD_ARMORY: untyped
     TERRANBUILD_FUSIONCORE: untyped
     HALT_TERRANBUILD: untyped
-    RAVENBUILD_AUTOTURRET: untyped
-    RAVENBUILD_CANCEL: untyped
     EFFECT_STIM_MARINE: untyped
     BEHAVIOR_CLOAKON_GHOST: untyped
     BEHAVIOR_CLOAKOFF_GHOST: untyped
-    SNIPE_SNIPE: untyped
     MEDIVACHEAL_HEAL: untyped
     SIEGEMODE_SIEGEMODE: untyped
     UNSIEGE_UNSIEGE: untyped
@@ -4888,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
@@ -4915,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
@@ -4936,7 +5036,6 @@ module Api
     ENGINEERINGBAYRESEARCH_TERRANINFANTRYARMORLEVEL1: untyped
     ENGINEERINGBAYRESEARCH_TERRANINFANTRYARMORLEVEL2: untyped
     ENGINEERINGBAYRESEARCH_TERRANINFANTRYARMORLEVEL3: untyped
-    MERCCOMPOUNDRESEARCH_REAPERSPEED: untyped
     BUILD_NUKE: untyped
     BARRACKSTECHLABRESEARCH_STIMPACK: untyped
     RESEARCH_COMBATSHIELD: untyped
@@ -4951,7 +5050,6 @@ module Api
     RESEARCH_CYCLONELOCKONDAMAGE: untyped
     FACTORYTECHLABRESEARCH_CYCLONERESEARCHHURRICANETHRUSTERS: untyped
     RESEARCH_BANSHEECLOAKINGFIELD: untyped
-    STARPORTTECHLABRESEARCH_RESEARCHMEDIVACENERGYUPGRADE: untyped
     RESEARCH_RAVENCORVIDREACTOR: untyped
     STARPORTTECHLABRESEARCH_RESEARCHSEEKERMISSILE: untyped
     STARPORTTECHLABRESEARCH_RESEARCHDURABLEMATERIALS: untyped
@@ -4959,8 +5057,6 @@ module Api
     STARPORTTECHLABRESEARCH_RESEARCHLIBERATORAGMODE: untyped
     STARPORTTECHLABRESEARCH_RESEARCHRAPIDDEPLOYMENT: untyped
     RESEARCH_RAVENRECALIBRATEDEXPLOSIVES: untyped
-    RESEARCH_HIGHCAPACITYFUELTANKS: untyped
-    RESEARCH_ADVANCEDBALLISTICS: untyped
     STARPORTTECHLABRESEARCH_RAVENRESEARCHENHANCEDMUNITIONS: untyped
     STARPORTTECHLABRESEARCH_RESEARCHRAVENINTERFERENCEMATRIX: untyped
     RESEARCH_PERSONALCLOAKING: untyped
@@ -5077,7 +5173,7 @@ module Api
     RESEARCH_ZERGLINGMETABOLICBOOST: untyped
     RESEARCH_GROOVEDSPINES: untyped
     RESEARCH_MUSCULARAUGMENTS: untyped
-    HYDRALISKDENRESEARCH_RESEARCHLURKERRANGE: untyped
+    HYDRALISKDENRESEARCH_RESEARCHFRENZY: untyped
     RESEARCH_ZERGFLYERATTACKLEVEL1: untyped
     RESEARCH_ZERGFLYERATTACKLEVEL2: untyped
     RESEARCH_ZERGFLYERATTACKLEVEL3: untyped
@@ -5114,10 +5210,6 @@ module Api
     BURROWUP_ZERGLING: untyped
     BURROWDOWN_INFESTORTERRAN: untyped
     BURROWUP_INFESTORTERRAN: untyped
-    REDSTONELAVACRITTERBURROW_BURROWDOWN: untyped
-    REDSTONELAVACRITTERINJUREDBURROW_BURROWDOWN: untyped
-    REDSTONELAVACRITTERUNBURROW_BURROWUP: untyped
-    REDSTONELAVACRITTERINJUREDUNBURROW_BURROWUP: untyped
     LOAD_OVERLORD: untyped
     UNLOADALLAT_OVERLORD: untyped
     UNLOADUNIT_OVERLORD: untyped
@@ -5183,24 +5275,21 @@ module Api
     TWILIGHTCOUNCILRESEARCH_RESEARCHPSIONICAMPLIFIERS: untyped
     TACNUKESTRIKE_NUKECALLDOWN: untyped
     CANCEL_NUKE: untyped
-    SALVAGEBUNKERREFUND_SALVAGE: untyped
-    SALVAGEBUNKER_SALVAGE: untyped
     EMP_EMP: untyped
-    VORTEX_VORTEX: untyped
     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
     ATTACK_REDIRECT: untyped
     EFFECT_STIM_MARINE_REDIRECT: untyped
     EFFECT_STIM_MARAUDER_REDIRECT: untyped
-    BURROWEDSTOP_STOPROACHBURROWED: untyped
-    BURROWEDSTOP_HOLDFIRESPECIAL: untyped
     STOP_REDIRECT: untyped
     BEHAVIOR_GENERATECREEPON: untyped
     BEHAVIOR_GENERATECREEPOFF: untyped
@@ -5222,95 +5311,47 @@ module Api
     BUILD_NYDUSWORM: untyped
     BUILDNYDUSCANAL_SUMMONNYDUSCANALATTACKER: untyped
     BUILDNYDUSCANAL_CANCEL: untyped
+    BROODLORDHANGAR_BROODLORDHANGAR: untyped
     EFFECT_CHARGE: untyped
+    TOWERCAPTURE_TOWERCAPTURE: untyped
     HERDINTERACT_HERD: untyped
-    FRENZY_FRENZY: untyped
     CONTAMINATE_CONTAMINATE: untyped
-    INFESTEDTERRANSLAYEGG_INFESTEDTERRANS: untyped
+    SHATTER_SHATTER: untyped
     CANCEL_QUEUEPASIVE: untyped
     CANCELSLOT_QUEUEPASSIVE: untyped
     CANCEL_QUEUEPASSIVECANCELTOSELECTION: untyped
     CANCELSLOT_QUEUEPASSIVECANCELTOSELECTION: untyped
-    MORPHTOGHOSTALTERNATE_MOVE: 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
-    MOTHERSHIPSTASIS_MOTHERSHIPSTASIS: untyped
-    CANCEL_MOTHERSHIPSTASIS: untyped
-    MOTHERSHIPCOREWEAPON_MOTHERSHIPSTASIS: untyped
-    NEXUSTRAINMOTHERSHIPCORE_MOTHERSHIPCORE: untyped
-    MOTHERSHIPCORETELEPORT_MOTHERSHIPCORETELEPORT: untyped
-    SALVAGEDRONEREFUND_SALVAGE: untyped
-    SALVAGEDRONE_SALVAGE: untyped
-    SALVAGEZERGLINGREFUND_SALVAGE: untyped
-    SALVAGEZERGLING_SALVAGE: untyped
-    SALVAGEQUEENREFUND_SALVAGE: untyped
-    SALVAGEQUEEN_SALVAGE: untyped
-    SALVAGEROACHREFUND_SALVAGE: untyped
-    SALVAGEROACH_SALVAGE: untyped
-    SALVAGEBANELINGREFUND_SALVAGE: untyped
-    SALVAGEBANELING_SALVAGE: untyped
-    SALVAGEHYDRALISKREFUND_SALVAGE: untyped
-    SALVAGEHYDRALISK_SALVAGE: untyped
-    SALVAGEINFESTORREFUND_SALVAGE: untyped
-    SALVAGEINFESTOR_SALVAGE: untyped
-    SALVAGESWARMHOSTREFUND_SALVAGE: untyped
-    SALVAGESWARMHOST_SALVAGE: untyped
-    SALVAGEULTRALISKREFUND_SALVAGE: untyped
-    SALVAGEULTRALISK_SALVAGE: untyped
-    DIGESTERTRANSPORT_LOADDIGESTER: untyped
-    SPECTRESHIELD_SPECTRESHIELD: untyped
     XELNAGAHEALINGSHRINE_XELNAGAHEALINGSHRINE: untyped
     NEXUSINVULNERABILITY_NEXUSINVULNERABILITY: untyped
-    NEXUSPHASESHIFT_NEXUSPHASESHIFT: untyped
-    SPAWNCHANGELINGTARGET_SPAWNCHANGELING: untyped
-    QUEENLAND_QUEENLAND: untyped
-    QUEENFLY_QUEENFLY: untyped
-    ORACLECLOAKFIELD_ORACLECLOAKFIELD: untyped
-    FLYERSHIELD_FLYERSHIELD: untyped
-    LOCUSTTRAIN_SWARMHOST: untyped
     EFFECT_MASSRECALL_MOTHERSHIPCORE: untyped
-    SINGLERECALL_SINGLERECALL: untyped
     MORPH_HELLION: untyped
-    RESTORESHIELDS_RESTORESHIELDS: untyped
-    SCRYER_SCRYER: untyped
-    LEECHRESOURCES_CANCEL: untyped
-    SNIPEDOT_SNIPEDOT: untyped
-    SWARMHOSTSPAWNLOCUSTS_LOCUSTMP: untyped
-    CLONE_CLONE: untyped
-    BUILDINGSHIELD_BUILDINGSHIELD: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRIS_MORPHTOCOLLAPSIBLEROCKTOWERDEBRIS: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRIS_CANCEL: untyped
     MORPH_HELLBAT: untyped
-    BUILDINGSTASIS_BUILDINGSTASIS: untyped
-    MAXIUMTHRUST_MAXIMUMTHRUST: untyped
     BURROWDOWN_SWARMHOST: untyped
     MORPHTOSWARMHOSTBURROWEDMP_CANCEL: untyped
     BURROWUP_SWARMHOST: untyped
-    SPAWNINFESTEDTERRAN_LOCUSTMP: untyped
     ATTACKPROTOSSBUILDING_ATTACKBUILDING: untyped
     ATTACKPROTOSSBUILDING_ATTACKTOWARDS: untyped
     ATTACKPROTOSSBUILDING_ATTACKBARRAGE: untyped
-    BURROWEDBANELINGSTOP_STOPROACHBURROWED: untyped
-    BURROWEDBANELINGSTOP_HOLDFIRESPECIAL: untyped
     STOP_BUILDING: untyped
     STOPPROTOSSBUILDING_HOLDFIRE: untyped
     STOPPROTOSSBUILDING_CHEER: untyped
     STOPPROTOSSBUILDING_DANCE: untyped
     BLINDINGCLOUD_BLINDINGCLOUD: untyped
-    EYESTALK_EYESTALK: untyped
-    EYESTALK_CANCEL: untyped
     EFFECT_ABDUCT: untyped
-    VIPERCONSUME_VIPERCONSUME: untyped
-    VIPERCONSUMEMINERALS_VIPERCONSUME: untyped
     VIPERCONSUMESTRUCTURE_VIPERCONSUME: untyped
-    CANCEL_PROTOSSBUILDINGQUEUE: untyped
-    PROTOSSBUILDINGQUEUE_CANCELSLOT: untyped
-    QUE8_CANCEL: untyped
-    QUE8_CANCELSLOT: untyped
+    TESTZERG_TESTZERG: untyped
     TESTZERG_CANCEL: untyped
     BEHAVIOR_BUILDINGATTACKON: untyped
     BEHAVIOR_BUILDINGATTACKOFF: untyped
@@ -5325,179 +5366,72 @@ module Api
     BURROWUP_WIDOWMINE: untyped
     WIDOWMINEATTACK_WIDOWMINEATTACK: untyped
     TORNADOMISSILE_TORNADOMISSILE: untyped
-    MOTHERSHIPCOREENERGIZE_MOTHERSHIPCOREENERGIZE: untyped
-    MOTHERSHIPCOREENERGIZE_CANCEL: untyped
-    LURKERASPECTMPFROMHYDRALISKBURROWED_LURKERMPFROMHYDRALISKBURROWED: untyped
-    LURKERASPECTMPFROMHYDRALISKBURROWED_CANCEL: untyped
-    LURKERASPECTMP_LURKERMP: untyped
-    LURKERASPECTMP_CANCEL: untyped
     BURROWDOWN_LURKER: untyped
     BURROWLURKERMPDOWN_CANCEL: untyped
     BURROWUP_LURKER: untyped
-    MORPH_LURKERDEN: untyped
-    CANCEL_MORPHLURKERDEN: untyped
     HALLUCINATION_ORACLE: untyped
     EFFECT_MEDIVACIGNITEAFTERBURNERS: untyped
-    EXTENDINGBRIDGENEWIDE8OUT_BRIDGEEXTEND: untyped
-    EXTENDINGBRIDGENEWIDE8_BRIDGERETRACT: untyped
-    EXTENDINGBRIDGENWWIDE8OUT_BRIDGEEXTEND: untyped
-    EXTENDINGBRIDGENWWIDE8_BRIDGERETRACT: untyped
-    EXTENDINGBRIDGENEWIDE10OUT_BRIDGEEXTEND: untyped
-    EXTENDINGBRIDGENEWIDE10_BRIDGERETRACT: untyped
-    EXTENDINGBRIDGENWWIDE10OUT_BRIDGEEXTEND: untyped
-    EXTENDINGBRIDGENWWIDE10_BRIDGERETRACT: untyped
-    EXTENDINGBRIDGENEWIDE12OUT_BRIDGEEXTEND: untyped
-    EXTENDINGBRIDGENEWIDE12_BRIDGERETRACT: untyped
-    EXTENDINGBRIDGENWWIDE12OUT_BRIDGEEXTEND: untyped
-    EXTENDINGBRIDGENWWIDE12_BRIDGERETRACT: untyped
-    INVULNERABILITYSHIELD_INVULNERABILITYSHIELD: untyped
-    CRITTERFLEE_CRITTERFLEE: untyped
     ORACLEREVELATION_ORACLEREVELATION: untyped
-    ORACLEREVELATIONMODE_ORACLEREVELATIONMODE: untyped
-    ORACLEREVELATIONMODE_CANCEL: untyped
-    ORACLENORMALMODE_ORACLENORMALMODE: untyped
-    ORACLENORMALMODE_CANCEL: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHT_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHT: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHT_CANCEL: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFT_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFT: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFT_CANCEL: untyped
-    VOIDSIPHON_VOIDSIPHON: untyped
     ULTRALISKWEAPONCOOLDOWN_ULTRALISKWEAPONCOOLDOWN: untyped
-    MOTHERSHIPCOREPURIFYNEXUSCANCEL_CANCEL: untyped
     EFFECT_PHOTONOVERCHARGE: untyped
-    XELNAGA_CAVERNS_DOORE_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
-    XELNAGA_CAVERNS_DOOREOPENED_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
-    XELNAGA_CAVERNS_DOORN_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
-    XELNAGA_CAVERNS_DOORNE_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
     XELNAGA_CAVERNS_DOORNEOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
     XELNAGA_CAVERNS_DOORNOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
-    XELNAGA_CAVERNS_DOORNW_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
     XELNAGA_CAVERNS_DOORNWOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
-    XELNAGA_CAVERNS_DOORS_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
-    XELNAGA_CAVERNS_DOORSE_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
     XELNAGA_CAVERNS_DOORSEOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
     XELNAGA_CAVERNS_DOORSOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
-    XELNAGA_CAVERNS_DOORSW_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
     XELNAGA_CAVERNS_DOORSWOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
-    XELNAGA_CAVERNS_DOORW_XELNAGA_CAVERNS_DOORDEFAULTCLOSE: untyped
     XELNAGA_CAVERNS_DOORWOPENED_XELNAGA_CAVERNS_DOORDEFAULTOPEN: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENE8OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENE8_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENW8OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENW8_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENE10OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENE10_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENW10OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENW10_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENE12OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENE12_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENW12OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGENW12_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEH8OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEH8_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEV8OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEV8_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEH10OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEH10_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEV10OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEV10_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEH12OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEH12_BRIDGERETRACT: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEV12OUT_BRIDGEEXTEND: untyped
-    XELNAGA_CAVERNS_FLOATING_BRIDGEV12_BRIDGERETRACT: untyped
     EFFECT_TIMEWARP: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENESHORT8OUT_BRIDGEEXTEND: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENESHORT8_BRIDGERETRACT: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENWSHORT8OUT_BRIDGEEXTEND: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENWSHORT8_BRIDGERETRACT: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENESHORT10OUT_BRIDGEEXTEND: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENESHORT10_BRIDGERETRACT: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENWSHORT10OUT_BRIDGEEXTEND: untyped
-    SNOWREFINERY_TERRAN_EXTENDINGBRIDGENWSHORT10_BRIDGERETRACT: untyped
-    ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPWEAPONSLEVEL1: untyped
-    ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPWEAPONSLEVEL2: untyped
-    ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPWEAPONSLEVEL3: untyped
-    ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPPLATINGLEVEL1: untyped
-    ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPPLATINGLEVEL2: untyped
-    ARMORYRESEARCHSWARM_TERRANVEHICLEANDSHIPPLATINGLEVEL3: 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
-    ORACLECLOAKINGFIELDTARGETED_ORACLECLOAKINGFIELDTARGETED: untyped
-    EFFECT_IMMORTALBARRIER: untyped
     MORPHTORAVAGER_RAVAGER: untyped
     CANCEL_MORPHRAVAGER: untyped
     MORPH_LURKER: untyped
     CANCEL_MORPHLURKER: untyped
-    ORACLEPHASESHIFT_ORACLEPHASESHIFT: untyped
-    RELEASEINTERCEPTORS_RELEASEINTERCEPTORS: untyped
     EFFECT_CORROSIVEBILE: untyped
     BURROWDOWN_RAVAGER: untyped
     BURROWRAVAGERDOWN_CANCEL: untyped
     BURROWUP_RAVAGER: untyped
     PURIFICATIONNOVA_PURIFICATIONNOVA: untyped
     EFFECT_PURIFICATIONNOVA: untyped
-    IMPALE_IMPALE: untyped
     LOCKON_LOCKON: untyped
-    LOCKONAIR_LOCKONAIR: untyped
     CANCEL_LOCKON: untyped
-    CORRUPTIONBOMB_CORRUPTIONBOMB: untyped
-    CORRUPTIONBOMB_CANCEL: untyped
     EFFECT_TACTICALJUMP: untyped
-    OVERCHARGE_OVERCHARGE: untyped
     MORPH_THORHIGHIMPACTMODE: untyped
     THORAPMODE_CANCEL: untyped
     MORPH_THOREXPLOSIVEMODE: untyped
     CANCEL_MORPHTHOREXPLOSIVEMODE: untyped
-    LIGHTOFAIUR_LIGHTOFAIUR: untyped
-    EFFECT_MASSRECALL_MOTHERSHIP: untyped
     LOAD_NYDUSWORM: untyped
     UNLOADALL_NYDUSWORM: untyped
     BEHAVIOR_PULSARBEAMON: untyped
     BEHAVIOR_PULSARBEAMOFF: untyped
-    PULSARBEAM_RIPFIELD: untyped
-    PULSARCANNON_PULSARCANNON: untyped
-    VOIDSWARMHOSTSPAWNLOCUST_VOIDSWARMHOSTSPAWNLOCUST: untyped
     LOCUSTMPFLYINGMORPHTOGROUND_LOCUSTMPFLYINGSWOOP: untyped
     LOCUSTMPMORPHTOAIR_LOCUSTMPFLYINGSWOOP: untyped
     EFFECT_LOCUSTSWOOP: untyped
     HALLUCINATION_DISRUPTOR: untyped
     HALLUCINATION_ADEPT: untyped
     EFFECT_VOIDRAYPRISMATICALIGNMENT: untyped
-    AIURLIGHTBRIDGENE8OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGENE8_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGENE10OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGENE10_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGENE12OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGENE12_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGENW8OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGENW8_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGENW10OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGENW10_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGENW12OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGENW12_BRIDGERETRACT: untyped
-    AIURTEMPLEBRIDGENE8OUT_BRIDGEEXTEND: untyped
-    AIURTEMPLEBRIDGENE8_BRIDGERETRACT: untyped
-    AIURTEMPLEBRIDGENE10OUT_BRIDGEEXTEND: untyped
-    AIURTEMPLEBRIDGENE10_BRIDGERETRACT: untyped
-    AIURTEMPLEBRIDGENE12OUT_BRIDGEEXTEND: untyped
-    AIURTEMPLEBRIDGENE12_BRIDGERETRACT: untyped
-    AIURTEMPLEBRIDGENW8OUT_BRIDGEEXTEND: untyped
-    AIURTEMPLEBRIDGENW8_BRIDGERETRACT: untyped
-    AIURTEMPLEBRIDGENW10OUT_BRIDGEEXTEND: untyped
-    AIURTEMPLEBRIDGENW10_BRIDGERETRACT: untyped
-    AIURTEMPLEBRIDGENW12OUT_BRIDGEEXTEND: untyped
-    AIURTEMPLEBRIDGENW12_BRIDGERETRACT: untyped
-    SHAKURASLIGHTBRIDGENE8OUT_BRIDGEEXTEND: untyped
-    SHAKURASLIGHTBRIDGENE8_BRIDGERETRACT: untyped
-    SHAKURASLIGHTBRIDGENE10OUT_BRIDGEEXTEND: untyped
-    SHAKURASLIGHTBRIDGENE10_BRIDGERETRACT: untyped
-    SHAKURASLIGHTBRIDGENE12OUT_BRIDGEEXTEND: untyped
-    SHAKURASLIGHTBRIDGENE12_BRIDGERETRACT: untyped
-    SHAKURASLIGHTBRIDGENW8OUT_BRIDGEEXTEND: untyped
-    SHAKURASLIGHTBRIDGENW8_BRIDGERETRACT: untyped
-    SHAKURASLIGHTBRIDGENW10OUT_BRIDGEEXTEND: untyped
-    SHAKURASLIGHTBRIDGENW10_BRIDGERETRACT: untyped
-    SHAKURASLIGHTBRIDGENW12OUT_BRIDGEEXTEND: untyped
-    SHAKURASLIGHTBRIDGENW12_BRIDGERETRACT: untyped
+    SEEKERDUMMYCHANNEL_SEEKERDUMMYCHANNEL: untyped
     VOIDMPIMMORTALREVIVEREBUILD_IMMORTAL: untyped
-    VOIDMPIMMORTALREVIVEDEATH_IMMORTAL: untyped
     ARBITERMPSTASISFIELD_ARBITERMPSTASISFIELD: untyped
     ARBITERMPRECALL_ARBITERMPRECALL: untyped
     CORSAIRMPDISRUPTIONWEB_CORSAIRMPDISRUPTIONWEB: untyped
@@ -5514,18 +5448,11 @@ module Api
     QUEENMPENSNARE_QUEENMPENSNARE: untyped
     QUEENMPSPAWNBROODLINGS_QUEENMPSPAWNBROODLINGS: untyped
     QUEENMPINFESTCOMMANDCENTER_QUEENMPINFESTCOMMANDCENTER: untyped
-    LIGHTNINGBOMB_LIGHTNINGBOMB: untyped
-    GRAPPLE_GRAPPLE: untyped
-    ORACLESTASISTRAP_ORACLEBUILDSTASISTRAP: untyped
     BUILD_STASISTRAP: untyped
     CANCEL_STASISTRAP: untyped
     ORACLESTASISTRAPACTIVATE_ACTIVATESTASISWARD: untyped
-    SELFREPAIR_SELFREPAIR: untyped
-    SELFREPAIR_CANCEL: untyped
-    AGGRESSIVEMUTATION_AGGRESSIVEMUTATION: untyped
     PARASITICBOMB_PARASITICBOMB: untyped
     ADEPTPHASESHIFT_ADEPTPHASESHIFT: untyped
-    PURIFICATIONNOVAMORPH_PURIFICATIONNOVA: untyped
     PURIFICATIONNOVAMORPHBACK_PURIFICATIONNOVA: untyped
     BEHAVIOR_HOLDFIREON_LURKER: untyped
     BEHAVIOR_HOLDFIREOFF_LURKER: untyped
@@ -5533,77 +5460,12 @@ module Api
     LIBERATORMORPHTOAA_LIBERATORAAMODE: untyped
     MORPH_LIBERATORAGMODE: untyped
     MORPH_LIBERATORAAMODE: untyped
-    TIMESTOP_TIMESTOP: untyped
-    TIMESTOP_CANCEL: untyped
-    AIURLIGHTBRIDGEABANDONEDNE8OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGEABANDONEDNE8_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGEABANDONEDNE10OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGEABANDONEDNE10_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGEABANDONEDNE12OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGEABANDONEDNE12_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGEABANDONEDNW8OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGEABANDONEDNW8_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGEABANDONEDNW10OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGEABANDONEDNW10_BRIDGERETRACT: untyped
-    AIURLIGHTBRIDGEABANDONEDNW12OUT_BRIDGEEXTEND: untyped
-    AIURLIGHTBRIDGEABANDONEDNW12_BRIDGERETRACT: untyped
     KD8CHARGE_KD8CHARGE: untyped
-    PENETRATINGSHOT_PENETRATINGSHOT: untyped
-    CLOAKINGDRONE_CLOAKINGDRONE: untyped
     CANCEL_ADEPTPHASESHIFT: untyped
     CANCEL_ADEPTSHADEPHASESHIFT: untyped
     SLAYNELEMENTALGRAB_SLAYNELEMENTALGRAB: untyped
+    MORPHTOCOLLAPSIBLEPURIFIERTOWERDEBRIS_MORPHTOCOLLAPSIBLEPURIFIERTOWERDEBRIS: untyped
     MORPHTOCOLLAPSIBLEPURIFIERTOWERDEBRIS_CANCEL: untyped
-    PORTCITY_BRIDGE_UNITNE8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITNE8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITSE8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITSE8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITNW8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITNW8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITSW8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITSW8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITNE10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITNE10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITSE10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITSE10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITNW10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITNW10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITSW10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITSW10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITNE12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITNE12_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITSE12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITSE12_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITNW12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITNW12_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITSW12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITSW12_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITN8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITN8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITS8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITS8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITE8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITE8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITW8OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITW8_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITN10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITN10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITS10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITS10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITE10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITE10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITW10OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITW10_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITN12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITN12_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITS12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITS12_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITE12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITE12_BRIDGERETRACT: untyped
-    PORTCITY_BRIDGE_UNITW12OUT_BRIDGEEXTEND: untyped
-    PORTCITY_BRIDGE_UNITW12_BRIDGERETRACT: untyped
-    TEMPESTDISRUPTIONBLAST_TEMPESTDISRUPTIONBLAST: untyped
-    CANCEL_TEMPESTDISRUPTIONBLAST: untyped
     EFFECT_SHADOWSTRIDE: untyped
     EFFECT_SPAWNLOCUSTS: untyped
     LOCUSTMPFLYINGSWOOPATTACK_LOCUSTMPFLYINGSWOOP: untyped
@@ -5614,305 +5476,6 @@ module Api
     PURIFYMORPHPYLON_MOTHERSHIPCOREWEAPON: untyped
     PURIFYMORPHPYLONBACK_MOTHERSHIPCOREWEAPON: untyped
     RESEARCH_SHADOWSTRIKE: untyped
-    HEAL_MEDICHEAL: untyped
-    LURKERASPECT_LURKER: untyped
-    LURKERASPECT_CANCEL: untyped
-    BURROWLURKERDOWN_BURROWDOWN: untyped
-    BURROWLURKERDOWN_CANCEL: untyped
-    BURROWLURKERUP_BURROWUP: untyped
-    D8CHARGE_D8CHARGE: untyped
-    DEFENSIVEMATRIX_DEFENSIVEMATRIX: untyped
-    MISSILEPODS_MISSILEPODS: untyped
-    LOKIMISSILEPODS_MISSILEPODS: untyped
-    HUTTRANSPORT_HUTLOAD: untyped
-    HUTTRANSPORT_HUTUNLOADALL: untyped
-    LEVIATHANSPAWNBROODLORD_SPAWNBROODLORD: untyped
-    SS_CARRIERBOSSATTACKLAUNCH_SS_SHOOTING: untyped
-    SS_CARRIERSPAWNINTERCEPTOR_SS_CARRIERSPAWNINTERCEPTOR: untyped
-    SS_CARRIERBOSSATTACKTARGET_SS_SHOOTING: untyped
-    SS_FIGHTERBOMB_SS_FIGHTERBOMB: untyped
-    SS_PHOENIXSHOOTING_SS_SHOOTING: untyped
-    SS_BATTLECRUISERMISSILEATTACK_SS_SHOOTING: untyped
-    SS_LEVIATHANSPAWNBOMBS_SS_LEVIATHANSPAWNBOMBS: untyped
-    SS_BATTLECRUISERHUNTERSEEKERATTACK_SS_SHOOTING: untyped
-    SS_LEVIATHANTENTACLEATTACKL1NODELAY_SS_LEVIATHANTENTACLEATTACKL1NODELAY: untyped
-    SS_LEVIATHANTENTACLEATTACKL2NODELAY_SS_LEVIATHANTENTACLEATTACKL2NODELAY: untyped
-    SS_LEVIATHANTENTACLEATTACKR1NODELAY_SS_LEVIATHANTENTACLEATTACKR1NODELAY: untyped
-    SS_LEVIATHANTENTACLEATTACKR2NODELAY_SS_LEVIATHANTENTACLEATTACKR2NODELAY: untyped
-    SS_SCIENCEVESSELTELEPORT_ZERATULBLINK: untyped
-    SS_TERRATRONBEAMATTACK_SS_TERRATRONBEAMATTACK: untyped
-    SS_TERRATRONSAWATTACK_SS_TERRATRONSAWATTACK: untyped
-    SS_WRAITHATTACK_SS_SHOOTING: untyped
-    SS_SWARMGUARDIANATTACK_SS_SHOOTING: untyped
-    SS_SCOUTATTACK_SS_SHOOTING: untyped
-    SS_INTERCEPTORATTACK_SS_SHOOTING: untyped
-    SS_CORRUPTORATTACK_SS_SHOOTING: untyped
-    SS_LEVIATHANTENTACLEATTACKL2_SS_LEVIATHANTENTACLEATTACKL2: untyped
-    SS_LEVIATHANTENTACLEATTACKR1_SS_LEVIATHANTENTACLEATTACKR1: untyped
-    SS_LEVIATHANTENTACLEATTACKL1_SS_LEVIATHANTENTACLEATTACKL1: untyped
-    SS_LEVIATHANTENTACLEATTACKR2_SS_LEVIATHANTENTACLEATTACKR2: untyped
-    SS_SCIENCEVESSELATTACK_SS_SHOOTING: untyped
-    LURKERASPECTFROMHYDRALISKBURROWED_LURKERFROMHYDRALISKBURROWED: untyped
-    LURKERASPECTFROMHYDRALISKBURROWED_CANCEL: untyped
-    UPGRADETOLURKERDEN_LURKERDEN: untyped
-    UPGRADETOLURKERDEN_CANCEL: untyped
-    ADVANCEDCONSTRUCTION_CANCEL: untyped
-    BUILDINPROGRESSNONCANCELLABLE_CANCEL: untyped
-    INFESTEDVENTSPAWNCORRUPTOR_SPAWNCORRUPTOR: untyped
-    INFESTEDVENTSPAWNBROODLORD_SPAWNBROODLORD: untyped
-    IRRADIATE_IRRADIATE: untyped
-    IRRADIATE_CANCEL: untyped
-    INFESTEDVENTSPAWNMUTALISK_LEVIATHANSPAWNMUTALISK: untyped
-    MAKEVULTURESPIDERMINES_SPIDERMINEREPLENISH: untyped
-    MEDIVACDOUBLEBEAMHEAL_HEAL: untyped
-    MINDCONTROL_MINDCONTROL: untyped
-    OBLITERATE_OBLITERATE: untyped
-    VOODOOSHIELD_VOODOOSHIELD: untyped
-    RELEASEMINION_RELEASEMINION: untyped
-    ULTRASONICPULSE_ULTRASONICPULSE: untyped
-    ARCHIVESEAL_ARCHIVESEAL: untyped
-    ARTANISVORTEX_VORTEX: untyped
-    ARTANISWORMHOLETRANSIT_WORMHOLETRANSIT: untyped
-    BUNKERATTACK_BUNKERATTACK: untyped
-    BUNKERATTACK_ATTACKTOWARDS: untyped
-    BUNKERATTACK_ATTACKBARRAGE: untyped
-    BUNKERSTOP_STOPBUNKER: untyped
-    BUNKERSTOP_HOLDFIRESPECIAL: untyped
-    CANCELTERRAZINEHARVEST_CANCEL: untyped
-    LEVIATHANSPAWNMUTALISK_LEVIATHANSPAWNMUTALISK: untyped
-    PARKCOLONISTVEHICLE_PARKCOLONISTVEHICLE: untyped
-    STARTCOLONISTVEHICLE_STARTCOLONISTVEHICLE: untyped
-    CONSUMPTION_CONSUMPTION: untyped
-    CONSUMEDNA_CONSUMEDNA: untyped
-    EGGPOP_EGGPOP: untyped
-    EXPERIMENTALPLASMAGUN_EXPERIMENTALPLASMAGUN: untyped
-    GATHERSPECIALOBJECT_GATHERSPECIALOBJECT: untyped
-    LOKIUNDOCK_LIFT: untyped
-    MINDBLAST_MINDBLAST: untyped
-    MORPHTOINFESTEDCIVILIAN_MORPHTOINFESTEDCIVILIAN: untyped
-    QUEENSHOCKWAVE_QUEENSHOCKWAVE: untyped
-    TAURENOUTHOUSELIFTOFF_TAURENOUTHOUSEFLY: untyped
-    TAURENOUTHOUSETRANSPORT_LOADTAURENOUTHOUSE: untyped
-    TAURENOUTHOUSETRANSPORT_UNLOADTAURENOUTHOUSE: untyped
-    TYCHUS03OMEGASTORM_OMEGASTORM: untyped
-    RAYNORSNIPE_RAYNORSNIPE: untyped
-    BONESHEAL_BONESHEAL: untyped
-    BONESTOSSGRENADE_TOSSGRENADETYCHUS: untyped
-    HERCULESTRANSPORT_MEDIVACLOAD: untyped
-    HERCULESTRANSPORT_MEDIVACUNLOADALL: untyped
-    SPECOPSDROPSHIPTRANSPORT_MEDIVACLOAD: untyped
-    SPECOPSDROPSHIPTRANSPORT_MEDIVACUNLOADALL: untyped
-    DUSKWINGBANSHEECLOAKINGFIELD_CLOAKONBANSHEE: untyped
-    DUSKWINGBANSHEECLOAKINGFIELD_CLOAKOFF: untyped
-    HYPERIONYAMATOSPECIAL_HYPERIONYAMATOGUN: untyped
-    INFESTABLEHUTTRANSPORT_HUTLOAD: untyped
-    INFESTABLEHUTTRANSPORT_HUTUNLOADALL: untyped
-    DUTCHPLACETURRET_DUTCHPLACETURRET: untyped
-    BURROWINFESTEDCIVILIANDOWN_BURROWDOWN: untyped
-    BURROWINFESTEDCIVILIANUP_BURROWUP: untyped
-    SELENDISHANGAR_INTERCEPTOR: untyped
-    SIEGEBREAKERSIEGE_SIEGEMODE: untyped
-    SIEGEBREAKERUNSIEGE_UNSIEGE: untyped
-    SOULCHANNEL_CANCEL: untyped
-    SENTRYGUNBURROW_BURROWTURRET: untyped
-    SENTRYGUNUNBURROW_UNBURROWTURRET: untyped
-    GRAVITONPRISON_GRAVITONPRISON: untyped
-    IMPLOSION_IMPLOSION: untyped
-    OMEGASTORM_OMEGASTORM: untyped
-    PSIONICSHOCKWAVE_PSIONICSHOCKWAVE: untyped
-    HYBRIDFAOESTUN_HYBRIDFAOESTUN: untyped
-    SUMMONMERCENARIES_HIREKELMORIANMINERS: untyped
-    SUMMONMERCENARIES_HIREDEVILDOGS: untyped
-    SUMMONMERCENARIES_HIRESPARTANCOMPANY: untyped
-    SUMMONMERCENARIES_HIREHAMMERSECURITIES: untyped
-    SUMMONMERCENARIES_HIRESIEGEBREAKERS: untyped
-    SUMMONMERCENARIES_HIREHELSANGELS: untyped
-    SUMMONMERCENARIES_HIREDUSKWING: untyped
-    SUMMONMERCENARIES_HIREDUKESREVENGE: untyped
-    SUMMONMERCENARIESPH_HIREKELMORIANMINERSPH: untyped
-    ENERGYNOVA_ENERGYNOVA: untyped
-    THEMOROSDEVICE_THEMOROSDEVICE: untyped
-    TOSSGRENADE_TOSSGRENADE: untyped
-    VOIDSEEKERTRANSPORT_MEDIVACLOAD: untyped
-    VOIDSEEKERTRANSPORT_MEDIVACUNLOADALL: untyped
-    TERRANBUILDDROP_SUPPLYDEPOTDROP: untyped
-    TERRANBUILDDROP_CANCEL: untyped
-    ODINNUCLEARSTRIKE_ODINNUKECALLDOWN: untyped
-    ODINNUCLEARSTRIKE_CANCEL: untyped
-    ODINWRECKAGE_ODIN: untyped
-    RESEARCHLABTRANSPORT_HUTLOAD: untyped
-    RESEARCHLABTRANSPORT_HUTUNLOADALL: untyped
-    COLONYSHIPTRANSPORT_MEDIVACLOAD: untyped
-    COLONYSHIPTRANSPORT_MEDIVACUNLOADALL: untyped
-    COLONYINFESTATION_COLONYINFESTATION: untyped
-    DOMINATION_DOMINATION: untyped
-    DOMINATION_CANCEL: untyped
-    KARASSPLASMASURGE_KARASSPLASMASURGE: untyped
-    KARASSPSISTORM_PSISTORM: untyped
-    HYBRIDBLINK_ZERATULBLINK: untyped
-    HYBRIDCPLASMABLAST_HYBRIDCPLASMABLAST: untyped
-    HEROARMNUKE_NUKEARM: untyped
-    HERONUCLEARSTRIKE_NUKECALLDOWN: untyped
-    HERONUCLEARSTRIKE_CANCEL: untyped
-    ODINBARRAGE_ODINBARRAGE: untyped
-    ODINBARRAGE_CANCEL: untyped
-    PURIFIERTOGGLEPOWER_PURIFIERPOWERDOWN: untyped
-    PURIFIERTOGGLEPOWER_PURIFIERPOWERUP: untyped
-    PHASEMINEBLAST_PHASEMINEBLAST: untyped
-    VOIDSEEKERPHASEMINEBLAST_PHASEMINEBLAST: untyped
-    TRANSPORTTRUCKTRANSPORT_TRANSPORTTRUCKLOAD: untyped
-    TRANSPORTTRUCKTRANSPORT_TRANSPORTTRUCKUNLOADALL: untyped
-    VAL03QUEENOFBLADESBURROW_BURROWDOWN: untyped
-    VAL03QUEENOFBLADESDEEPTUNNEL_DEEPTUNNEL: untyped
-    VAL03QUEENOFBLADESUNBURROW_BURROWUP: untyped
-    LOKIYAMATO_LOKIYAMATOGUN: untyped
-    DUKESREVENGEYAMATO_YAMATOGUN: untyped
-    ZERATULBLINK_ZERATULBLINK: untyped
-    ROGUEGHOSTCLOAK_CLOAKONSPECTRE: untyped
-    ROGUEGHOSTCLOAK_CLOAKOFF: untyped
-    VULTURESPIDERMINES_SPIDERMINE: untyped
-    VULTUREQUEUE3_CANCEL: untyped
-    VULTUREQUEUE3_CANCELSLOT: untyped
-    SUPERWARPGATETRAIN_ZEALOT: untyped
-    SUPERWARPGATETRAIN_STALKER: untyped
-    SUPERWARPGATETRAIN_IMMORTAL: untyped
-    SUPERWARPGATETRAIN_HIGHTEMPLAR: untyped
-    SUPERWARPGATETRAIN_DARKTEMPLAR: untyped
-    SUPERWARPGATETRAIN_SENTRY: untyped
-    SUPERWARPGATETRAIN_CARRIER: untyped
-    SUPERWARPGATETRAIN_PHOENIX: untyped
-    SUPERWARPGATETRAIN_VOIDRAY: untyped
-    SUPERWARPGATETRAIN_ARCHON: untyped
-    SUPERWARPGATETRAIN_WARPINZERATUL: untyped
-    SUPERWARPGATETRAIN_WARPINURUN: untyped
-    SUPERWARPGATETRAIN_WARPINMOHANDAR: untyped
-    SUPERWARPGATETRAIN_WARPINSELENDIS: untyped
-    SUPERWARPGATETRAIN_WARPINSCOUT: untyped
-    SUPERWARPGATETRAIN_COLOSSUS: untyped
-    SUPERWARPGATETRAIN_WARPPRISM: untyped
-    BURROWOMEGALISKDOWN_BURROWDOWN: untyped
-    BURROWOMEGALISKUP_BURROWUP: untyped
-    BURROWINFESTEDABOMINATIONDOWN_BURROWDOWN: untyped
-    BURROWINFESTEDABOMINATIONUP_BURROWUP: untyped
-    BURROWHUNTERKILLERDOWN_BURROWDOWN: untyped
-    BURROWHUNTERKILLERDOWN_CANCEL: untyped
-    BURROWHUNTERKILLERUP_BURROWUP: untyped
-    NOVASNIPE_NOVASNIPE: untyped
-    VORTEXPURIFIER_VORTEX: untyped
-    TALDARIMVORTEX_VORTEX: untyped
-    PURIFIERPLANETCRACKER_PLANETCRACKER: untyped
-    BURROWINFESTEDTERRANCAMPAIGNDOWN_BURROWDOWN: untyped
-    BURROWINFESTEDTERRANCAMPAIGNUP_BURROWUP: untyped
-    INFESTEDMONSTERTRAIN_INFESTEDCIVILIAN: untyped
-    INFESTEDMONSTERTRAIN_INFESTEDTERRANCAMPAIGN: untyped
-    INFESTEDMONSTERTRAIN_INFESTEDABOMINATION: untyped
-    BIODOMETRANSPORT_BIODOMELOAD: untyped
-    BIODOMETRANSPORT_BIODOMEUNLOADALL: untyped
-    ATTACKALLOWSINVULNERABLE_ATTACKALLOWSINVULNERABLE: untyped
-    ATTACKALLOWSINVULNERABLE_ATTACKTOWARDS: untyped
-    ATTACKALLOWSINVULNERABLE_ATTACKBARRAGE: untyped
-    ZERATULSTUN_ZERATULSTUN: untyped
-    WRAITHCLOAK_CLOAKOFF: untyped
-    BARRACKSTECHREACTORMORPH_TECHLABBARRACKS: untyped
-    FACTORYTECHREACTORMORPH_TECHLABFACTORY: untyped
-    STARPORTTECHREACTORMORPH_TECHLABSTARPORT: untyped
-    SS_FIGHTERSHOOTING_SS_SHOOTING: untyped
-    RAYNORC4_PLANTC4CHARGE: untyped
-    DUKESREVENGEDEFENSIVEMATRIX_DEFENSIVEMATRIX: untyped
-    DUKESREVENGEMISSILEPODS_MISSILEPODS: untyped
-    THORWRECKAGE_THOR: untyped
-    THORREBORN_THOR: untyped
-    THORREBORN_CANCEL: untyped
-    SPECTRENUKE_SPECTRENUKECALLDOWN: untyped
-    SPECTRENUKE_CANCEL: untyped
-    SPECTRENUKESILOARMMAGAZINE_SPECTRENUKEARM: untyped
-    COLONISTSHIPLIFTOFF_LIFT: untyped
-    COLONISTSHIPLAND_LAND: untyped
-    BIODOMECOMMANDLIFTOFF_LIFT: untyped
-    BIODOMECOMMANDLAND_LAND: untyped
-    HERCULESLIFTOFF_LIFT: untyped
-    HERCULESLAND_HERCULESLAND: untyped
-    LIGHTBRIDGEOFF_LIGHTBRIDGEOFF: untyped
-    LIGHTBRIDGEON_LIGHTBRIDGEON: untyped
-    LIBRARYDOWN_LIBRARYDOWN: untyped
-    LIBRARYUP_LIBRARYUP: untyped
-    TEMPLEDOORDOWN_TEMPLEDOORDOWN: untyped
-    TEMPLEDOORUP_TEMPLEDOORUP: untyped
-    TEMPLEDOORDOWNURDL_TEMPLEDOORDOWNURDL: untyped
-    TEMPLEDOORUPURDL_TEMPLEDOORUPURDL: untyped
-    PSYTROUSOXIDE_PSYTROUSOXIDEON: untyped
-    PSYTROUSOXIDE_PSYTROUSOXIDEOFF: untyped
-    BIOPLASMIDDISCHARGE_BIOPLASMIDDISCHARGE: untyped
-    WRECKINGCREWASSAULTMODE_ASSAULTMODE: untyped
-    WRECKINGCREWFIGHTERMODE_FIGHTERMODE: untyped
-    BIOSTASIS_BIOSTASIS: untyped
-    COLONISTTRANSPORTTRANSPORT_COLONISTTRANSPORTLOAD: untyped
-    COLONISTTRANSPORTTRANSPORT_COLONISTTRANSPORTUNLOADALL: untyped
-    DROPTOSUPPLYDEPOT_RAISE: untyped
-    REFINERYTOAUTOMATEDREFINERY_RAISE: untyped
-    HELIOSCRASHMORPH_CRASHMORPH: untyped
-    NANOREPAIR_HEAL: untyped
-    PICKUP_PICKUP: untyped
-    PICKUPARCADE_PICKUP: untyped
-    PICKUPGAS100_PICKUPGAS100: untyped
-    PICKUPMINERALS100_PICKUPMINERALS100: untyped
-    TAURENSTIMPACK_STIM: untyped
-    TESTREVIVE_SCV: untyped
-    TESTINTERACT_DESIGNATE: untyped
-    CLIFFDOOROPEN0_SPACEPLATFORMDOOROPEN: untyped
-    CLIFFDOORCLOSE0_SPACEPLATFORMDOORCLOSE: untyped
-    CLIFFDOOROPEN1_SPACEPLATFORMDOOROPEN: untyped
-    CLIFFDOORCLOSE1_SPACEPLATFORMDOORCLOSE: untyped
-    DESTRUCTIBLEGATEDIAGONALBLURLOWERED_GATEOPEN: untyped
-    DESTRUCTIBLEGATEDIAGONALULBRLOWERED_GATEOPEN: untyped
-    DESTRUCTIBLEGATESTRAIGHTHORIZONTALBFLOWERED_GATEOPEN: untyped
-    DESTRUCTIBLEGATESTRAIGHTHORIZONTALLOWERED_GATEOPEN: untyped
-    DESTRUCTIBLEGATESTRAIGHTVERTICALLFLOWERED_GATEOPEN: untyped
-    DESTRUCTIBLEGATESTRAIGHTVERTICALLOWERED_GATEOPEN: untyped
-    DESTRUCTIBLEGATEDIAGONALBLUR_GATECLOSE: untyped
-    DESTRUCTIBLEGATEDIAGONALULBR_GATECLOSE: untyped
-    DESTRUCTIBLEGATESTRAIGHTHORIZONTALBF_GATECLOSE: untyped
-    DESTRUCTIBLEGATESTRAIGHTHORIZONTAL_GATECLOSE: untyped
-    DESTRUCTIBLEGATESTRAIGHTVERTICALLF_GATECLOSE: untyped
-    DESTRUCTIBLEGATESTRAIGHTVERTICAL_GATECLOSE: untyped
-    TESTLEARN_TESTLEARN: untyped
-    TESTLEVELEDSPELL_YAMATOGUN: untyped
-    METALGATEDIAGONALBLURLOWERED_GATEOPEN: untyped
-    METALGATEDIAGONALULBRLOWERED_GATEOPEN: untyped
-    METALGATESTRAIGHTHORIZONTALBFLOWERED_GATEOPEN: untyped
-    METALGATESTRAIGHTHORIZONTALLOWERED_GATEOPEN: untyped
-    METALGATESTRAIGHTVERTICALLFLOWERED_GATEOPEN: untyped
-    METALGATESTRAIGHTVERTICALLOWERED_GATEOPEN: untyped
-    METALGATEDIAGONALBLUR_GATECLOSE: untyped
-    METALGATEDIAGONALULBR_GATECLOSE: untyped
-    METALGATESTRAIGHTHORIZONTALBF_GATECLOSE: untyped
-    METALGATESTRAIGHTHORIZONTAL_GATECLOSE: untyped
-    METALGATESTRAIGHTVERTICALLF_GATECLOSE: untyped
-    METALGATESTRAIGHTVERTICAL_GATECLOSE: untyped
-    SECURITYGATEDIAGONALBLURLOWERED_GATEOPEN: untyped
-    SECURITYGATEDIAGONALULBRLOWERED_GATEOPEN: untyped
-    SECURITYGATESTRAIGHTHORIZONTALBFLOWERED_GATEOPEN: untyped
-    SECURITYGATESTRAIGHTHORIZONTALLOWERED_GATEOPEN: untyped
-    SECURITYGATESTRAIGHTVERTICALLFLOWERED_GATEOPEN: untyped
-    SECURITYGATESTRAIGHTVERTICALLOWERED_GATEOPEN: untyped
-    SECURITYGATEDIAGONALBLUR_GATECLOSE: untyped
-    SECURITYGATEDIAGONALULBR_GATECLOSE: untyped
-    SECURITYGATESTRAIGHTHORIZONTALBF_GATECLOSE: untyped
-    SECURITYGATESTRAIGHTHORIZONTAL_GATECLOSE: untyped
-    SECURITYGATESTRAIGHTVERTICALLF_GATECLOSE: untyped
-    SECURITYGATESTRAIGHTVERTICAL_GATECLOSE: untyped
-    CHANGESHRINETERRAN_CHANGESHRINETERRAN: untyped
-    CHANGESHRINEPROTOSS_CHANGESHRINEPROTOSS: untyped
-    SPECTREHOLDFIRE_SPECTREHOLDFIRE: untyped
-    SPECTREWEAPONSFREE_WEAPONSFREE: untyped
-    GWALEARN_TESTLEARN: untyped
-    LIGHTBRIDGEOFFTOPRIGHT_LIGHTBRIDGEOFF: untyped
-    LIGHTBRIDGEONTOPRIGHT_LIGHTBRIDGEON: untyped
-    TESTHEROGRAB_GRABZERGLING: untyped
-    TESTHEROTHROW_THROWZERGLING: untyped
-    TESTHERODEBUGMISSILEABILITY_TESTHERODEBUGMISSILEABILITY: untyped
-    TESTHERODEBUGTRACKINGABILITY_TESTHERODEBUGTRACKINGABILITY: untyped
-    TESTHERODEBUGTRACKINGABILITY_CANCEL: untyped
     CANCEL: untyped
     HALT: untyped
     BURROWDOWN: untyped
@@ -5924,7 +5487,6 @@ module Api
     HARVEST_RETURN: untyped
     LOAD: untyped
     UNLOADALLAT: untyped
-    UNLOADUNIT: untyped
     CANCEL_LAST: untyped
     CANCEL_SLOT: untyped
     RALLY_UNITS: untyped
@@ -5946,21 +5508,6 @@ module Api
     BEHAVIOR_HOLDFIREOFF: untyped
     RALLY_WORKERS: untyped
     BUILD_CREEPTUMOR: untyped
-    RESEARCH_PROTOSSAIRARMOR: untyped
-    RESEARCH_PROTOSSAIRWEAPONS: untyped
-    RESEARCH_PROTOSSGROUNDARMOR: untyped
-    RESEARCH_PROTOSSGROUNDWEAPONS: untyped
-    RESEARCH_PROTOSSSHIELDS: untyped
-    RESEARCH_TERRANINFANTRYARMOR: untyped
-    RESEARCH_TERRANINFANTRYWEAPONS: untyped
-    RESEARCH_TERRANSHIPWEAPONS: untyped
-    RESEARCH_TERRANVEHICLEANDSHIPPLATING: untyped
-    RESEARCH_TERRANVEHICLEWEAPONS: untyped
-    RESEARCH_ZERGFLYERARMOR: untyped
-    RESEARCH_ZERGFLYERATTACK: untyped
-    RESEARCH_ZERGGROUNDARMOR: untyped
-    RESEARCH_ZERGMELEEWEAPONS: untyped
-    RESEARCH_ZERGMISSILEWEAPONS: untyped
     CANCEL_VOIDRAYPRISMATICALIGNMENT: untyped
     RESEARCH_ADAPTIVETALONS: untyped
     LURKERDENRESEARCH_RESEARCHLURKERRANGE: untyped
@@ -5969,27 +5516,19 @@ module Api
     MORPH_OVERSIGHTMODE: untyped
     MORPH_OVERSEERMODE: untyped
     EFFECT_INTERFERENCEMATRIX: untyped
-    EFFECT_REPAIRDRONE: untyped
     EFFECT_REPAIR_REPAIRDRONE: untyped
     EFFECT_ANTIARMORMISSILE: untyped
     EFFECT_CHRONOBOOSTENERGYCOST: untyped
     EFFECT_MASSRECALL_NEXUS: untyped
-    NEXUSSHIELDRECHARGE_NEXUSSHIELDRECHARGE: untyped
-    NEXUSSHIELDRECHARGEONPYLON_NEXUSSHIELDRECHARGEONPYLON: untyped
     INFESTORENSNARE_INFESTORENSNARE: untyped
-    EFFECT_RESTORE: untyped
-    NEXUSSHIELDOVERCHARGE_NEXUSSHIELDOVERCHARGE: untyped
-    NEXUSSHIELDOVERCHARGEOFF_NEXUSSHIELDOVERCHARGEOFF: untyped
     ATTACK_BATTLECRUISER: untyped
     BATTLECRUISERATTACK_ATTACKTOWARDS: untyped
     BATTLECRUISERATTACK_ATTACKBARRAGE: untyped
-    BATTLECRUISERATTACKEVALUATOR_MOTHERSHIPCOREATTACK: untyped
     MOVE_BATTLECRUISER: untyped
     PATROL_BATTLECRUISER: untyped
     HOLDPOSITION_BATTLECRUISER: untyped
     BATTLECRUISERMOVE_ACQUIREMOVE: untyped
     BATTLECRUISERMOVE_TURN: untyped
-    BATTLECRUISERSTOPEVALUATOR_STOP: untyped
     STOP_BATTLECRUISER: untyped
     BATTLECRUISERSTOP_HOLDFIRE: untyped
     BATTLECRUISERSTOP_CHEER: untyped
@@ -5999,41 +5538,21 @@ module Api
     HOLDPOSITION: untyped
     MOVE: untyped
     PATROL: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY1: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY2: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY3: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY4: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY5: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY6: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY7: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY8: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY9: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY10: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY11: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY12: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY13: untyped
-    LOADOUTSPRAY_LOADOUTSPRAY14: untyped
+    UNLOADUNIT: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN_CANCEL: untyped
+    MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN_MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN: untyped
     MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN_CANCEL: untyped
-    BATTERYOVERCHARGE_BATTERYOVERCHARGE: untyped
+    HYDRALISKFRENZY_HYDRALISKFRENZY: untyped
     AMORPHOUSARMORCLOUD_AMORPHOUSARMORCLOUD: untyped
     SHIELDBATTERYRECHARGEEX5_SHIELDBATTERYRECHARGE: untyped
     SHIELDBATTERYRECHARGEEX5_STOP: untyped
     MORPHTOBANELING_BANELING: untyped
     MORPHTOBANELING_CANCEL: untyped
     MOTHERSHIPCLOAK_ORACLECLOAKFIELD: untyped
-
-    # sord omit - no YARD return type given, using untyped
-    def self._250MMSTRIKECANNONS_250MMSTRIKECANNONS: () -> untyped
-
-    # sord omit - no YARD return type given, using untyped
-    def self._250MMSTRIKECANNONS_CANCEL: () -> untyped
-
-    # sord omit - no YARD return type given, using untyped
-    def self._330MMBARRAGECANNONS_330MMBARRAGECANNONS: () -> untyped
-
-    # sord omit - no YARD return type given, using untyped
-    def self._330MMBARRAGECANNONS_CANCEL: () -> untyped
+    ENERGYRECHARGE_ENERGYRECHARGE: untyped
+    SALVAGEEFFECT_SALVAGE: untyped
+    WORKERSTOPIDLEABILITYVESPENE_GATHER: untyped
 
     # Returns an array of all constants
     def self.ids: () -> ::Array[Integer]
@@ -6051,7 +5570,6 @@ module Api
 
   # Constant reference of Upgrade ids
   module UpgradeId
-    NULL: untyped
     CARRIERLAUNCHSPEEDUPGRADE: untyped
     GLIALRECONSTITUTION: untyped
     TUNNELINGCLAWS: untyped
@@ -6069,7 +5587,6 @@ module Api
     STIMPACK: untyped
     SHIELDWALL: untyped
     PUNISHERGRENADES: untyped
-    SIEGETECH: untyped
     HIGHCAPACITYBARRELS: untyped
     BANSHEECLOAK: untyped
     MEDIVACCADUCEUSREACTOR: untyped
@@ -6077,7 +5594,6 @@ module Api
     HUNTERSEEKER: untyped
     DURABLEMATERIALS: untyped
     PERSONALCLOAKING: untyped
-    GHOSTMOEBIUSREACTOR: untyped
     TERRANVEHICLEARMORSLEVEL1: untyped
     TERRANVEHICLEARMORSLEVEL2: untyped
     TERRANVEHICLEARMORSLEVEL3: untyped
@@ -6102,7 +5618,6 @@ module Api
     OBSERVERGRAVITICBOOSTER: untyped
     GRAVITICDRIVE: untyped
     EXTENDEDTHERMALLANCE: untyped
-    HIGHTEMPLARKHAYDARINAMULET: untyped
     PSISTORMTECH: untyped
     ZERGMELEEWEAPONSLEVEL1: untyped
     ZERGMELEEWEAPONSLEVEL2: untyped
@@ -6118,17 +5633,14 @@ module Api
     BURROW: untyped
     ZERGLINGATTACKSPEED: untyped
     ZERGLINGMOVEMENTSPEED: untyped
-    HYDRALISKSPEED: untyped
     ZERGFLYERWEAPONSLEVEL1: untyped
     ZERGFLYERWEAPONSLEVEL2: untyped
     ZERGFLYERWEAPONSLEVEL3: untyped
     ZERGFLYERARMORSLEVEL1: untyped
     ZERGFLYERARMORSLEVEL2: untyped
     ZERGFLYERARMORSLEVEL3: untyped
-    INFESTORENERGYUPGRADE: untyped
     CENTRIFICALHOOKS: untyped
     BATTLECRUISERENABLESPECIALIZATIONS: untyped
-    BATTLECRUISERBEHEMOTHREACTOR: untyped
     PROTOSSAIRWEAPONSLEVEL1: untyped
     PROTOSSAIRWEAPONSLEVEL2: untyped
     PROTOSSAIRWEAPONSLEVEL3: untyped
@@ -6140,51 +5652,24 @@ module Api
     CHARGE: untyped
     BLINKTECH: untyped
     ANABOLICSYNTHESIS: untyped
-    OBVERSEINCUBATION: untyped
-    VIKINGJOTUNBOOSTERS: untyped
-    ORGANICCARAPACE: untyped
-    INFESTORPERISTALSIS: untyped
-    ABDOMINALFORTITUDE: untyped
-    HYDRALISKSPEEDUPGRADE: untyped
-    BANELINGBURROWMOVE: untyped
-    COMBATDRUGS: untyped
-    STRIKECANNONS: untyped
     TRANSFORMATIONSERVOS: untyped
     PHOENIXRANGEUPGRADE: untyped
     TEMPESTRANGEUPGRADE: untyped
     NEURALPARASITE: untyped
     LOCUSTLIFETIMEINCREASE: untyped
-    ULTRALISKBURROWCHARGEUPGRADE: untyped
-    ORACLEENERGYUPGRADE: untyped
-    RESTORESHIELDS: untyped
-    PROTOSSHEROSHIPWEAPON: untyped
-    PROTOSSHEROSHIPDETECTOR: untyped
-    PROTOSSHEROSHIPSPELL: untyped
-    REAPERJUMP: untyped
-    INCREASEDRANGE: untyped
-    ZERGBURROWMOVE: untyped
-    ANIONPULSECRYSTALS: untyped
     TERRANVEHICLEANDSHIPWEAPONSLEVEL1: untyped
     TERRANVEHICLEANDSHIPWEAPONSLEVEL2: untyped
     TERRANVEHICLEANDSHIPWEAPONSLEVEL3: untyped
     TERRANVEHICLEANDSHIPARMORSLEVEL1: untyped
     TERRANVEHICLEANDSHIPARMORSLEVEL2: untyped
     TERRANVEHICLEANDSHIPARMORSLEVEL3: untyped
-    FLYINGLOCUSTS: untyped
     ROACHSUPPLY: untyped
     IMMORTALREVIVE: untyped
     DRILLCLAWS: untyped
     CYCLONELOCKONRANGEUPGRADE: untyped
-    CYCLONEAIRUPGRADE: untyped
     LIBERATORMORPH: untyped
-    ADEPTSHIELDUPGRADE: untyped
     LURKERRANGE: untyped
-    IMMORTALBARRIER: untyped
-    ADEPTKILLBOUNCE: untyped
     ADEPTPIERCINGATTACK: untyped
-    CINEMATICMODE: untyped
-    CURSORDEBUG: untyped
-    MAGFIELDLAUNCHERS: untyped
     EVOLVEGROOVEDSPINES: untyped
     EVOLVEMUSCULARAUGMENTS: untyped
     BANSHEESPEED: untyped
@@ -6193,171 +5678,22 @@ module Api
     MEDIVACINCREASESPEEDBOOST: untyped
     LIBERATORAGRANGEUPGRADE: untyped
     DARKTEMPLARBLINKUPGRADE: untyped
-    RAVAGERRANGE: untyped
-    RAVENDAMAGEUPGRADE: untyped
     CYCLONELOCKONDAMAGEUPGRADE: untyped
-    ARESCLASSWEAPONSSYSTEMVIKING: untyped
-    AUTOHARVESTER: untyped
-    HYBRIDCPLASMAUPGRADEHARD: untyped
-    HYBRIDCPLASMAUPGRADEINSANE: untyped
-    INTERCEPTORLIMIT4: untyped
-    INTERCEPTORLIMIT6: untyped
-    NOTPOSSIBLESIEGEMODE: untyped
-    NEOSTEELFRAME_2: untyped
-    NEOSTEELANDSHRIKETURRETICONUPGRADE: untyped
-    OCULARIMPLANTS: untyped
-    CROSSSPECTRUMDAMPENERS: untyped
-    ORBITALSTRIKE: untyped
-    CLUSTERBOMB: untyped
-    SHAPEDHULL: untyped
-    SPECTRETOOLTIPUPGRADE: untyped
-    ULTRACAPACITORS: untyped
-    VANADIUMPLATING: untyped
-    COMMANDCENTERREACTOR: untyped
-    REGENERATIVEBIOSTEEL: untyped
-    CELLULARREACTORS: untyped
-    BANSHEECLOAKEDDAMAGE: untyped
-    DISTORTIONBLASTERS: untyped
-    EMPTOWER: untyped
-    SUPPLYDEPOTDROP: untyped
-    HIVEMINDEMULATOR: untyped
-    FORTIFIEDBUNKERCARAPACE: untyped
-    PREDATOR: untyped
-    SCIENCEVESSEL: untyped
-    DUALFUSIONWELDERS: untyped
-    ADVANCEDCONSTRUCTION: untyped
-    ADVANCEDMEDICTRAINING: untyped
-    PROJECTILEACCELERATORS: untyped
-    REINFORCEDSUPERSTRUCTURE: untyped
-    MULE: untyped
-    ORBITALRELAY: untyped
-    RAZORWIRE: untyped
-    ADVANCEDHEALINGAI: untyped
-    TWINLINKEDFLAMETHROWERS: untyped
-    NANOCONSTRUCTOR: untyped
-    CERBERUSMINES: untyped
-    HYPERFLUXOR: untyped
-    TRILITHIUMPOWERCELLS: untyped
-    PERMANENTCLOAKGHOST: untyped
-    PERMANENTCLOAKSPECTRE: untyped
-    ULTRASONICPULSE: untyped
-    SURVIVALPODS: untyped
-    ENERGYSTORAGE: untyped
-    FULLBORECANISTERAMMO: untyped
-    CAMPAIGNJOTUNBOOSTERS: untyped
-    MICROFILTERING: untyped
-    PARTICLECANNONAIR: untyped
-    VULTUREAUTOREPAIR: untyped
-    PSIDISRUPTOR: untyped
-    SCIENCEVESSELENERGYMANIPULATION: untyped
-    SCIENCEVESSELPLASMAWEAPONRY: untyped
-    SHOWGATLINGGUN: untyped
-    TECHREACTOR: untyped
-    TECHREACTORAI: untyped
-    TERRANDEFENSERANGEBONUS: untyped
-    X88TNAPALMUPGRADE: untyped
-    HURRICANEMISSILES: untyped
-    MECHANICALREBIRTH: untyped
-    MARINESTIMPACK: untyped
-    DARKTEMPLARTACTICS: untyped
-    CLUSTERWARHEADS: untyped
-    CLOAKDISTORTIONFIELD: untyped
-    DEVASTATORMISSILES: untyped
-    DISTORTIONTHRUSTERS: untyped
-    DYNAMICPOWERROUTING: untyped
-    IMPALERROUNDS: untyped
-    KINETICFIELDS: untyped
-    BURSTCAPACITORS: untyped
-    HAILSTORMMISSILEPODS: untyped
-    RAPIDDEPLOYMENT: untyped
-    REAPERSTIMPACK: untyped
-    REAPERD8CHARGE: untyped
-    TYCHUS05BATTLECRUISERPENETRATION: untyped
-    VIRALPLASMA: untyped
-    FIREBATJUGGERNAUTPLATING: untyped
-    MULTILOCKTARGETINGSYSTEMS: untyped
-    TURBOCHARGEDENGINES: untyped
-    DISTORTIONSENSORS: untyped
-    INFERNALPREIGNITERS: untyped
-    HELLIONCAMPAIGNINFERNALPREIGNITER: untyped
-    NAPALMFUELTANKS: untyped
-    AUXILIARYMEDBOTS: untyped
-    JUGGERNAUTPLATING: untyped
-    MARAUDERLIFEBOOST: untyped
-    COMBATSHIELD: untyped
-    REAPERU238ROUNDS: untyped
-    MAELSTROMROUNDS: untyped
-    SIEGETANKSHAPEDBLAST: untyped
-    TUNGSTENSPIKES: untyped
-    BEARCLAWNOZZLES: untyped
-    NANOBOTINJECTORS: untyped
-    STABILIZERMEDPACKS: untyped
-    HALOROCKETS: untyped
-    SCAVENGINGSYSTEMS: untyped
-    EXTRAMINES: untyped
-    ARESCLASSWEAPONSSYSTEM: untyped
-    WHITENAPALM: untyped
-    VIRALMUNITIONS: untyped
-    JACKHAMMERCONCUSSIONGRENADES: untyped
-    FIRESUPPRESSIONSYSTEMS: untyped
-    FLARERESEARCH: untyped
-    MODULARCONSTRUCTION: untyped
-    EXPANDEDHULL: untyped
-    SHRIKETURRET: untyped
-    MICROFUSIONREACTORS: untyped
-    WRAITHCLOAK: untyped
-    SINGULARITYCHARGE: untyped
-    GRAVITICTHRUSTERS: untyped
-    YAMATOCANNON: untyped
-    DEFENSIVEMATRIX: untyped
-    DARKPROTOSS: untyped
-    TERRANINFANTRYWEAPONSULTRACAPACITORSLEVEL1: untyped
-    TERRANINFANTRYWEAPONSULTRACAPACITORSLEVEL2: untyped
-    TERRANINFANTRYWEAPONSULTRACAPACITORSLEVEL3: untyped
-    TERRANINFANTRYARMORSVANADIUMPLATINGLEVEL1: untyped
-    TERRANINFANTRYARMORSVANADIUMPLATINGLEVEL2: untyped
-    TERRANINFANTRYARMORSVANADIUMPLATINGLEVEL3: untyped
-    TERRANVEHICLEWEAPONSULTRACAPACITORSLEVEL1: untyped
-    TERRANVEHICLEWEAPONSULTRACAPACITORSLEVEL2: untyped
-    TERRANVEHICLEWEAPONSULTRACAPACITORSLEVEL3: untyped
-    TERRANVEHICLEARMORSVANADIUMPLATINGLEVEL1: untyped
-    TERRANVEHICLEARMORSVANADIUMPLATINGLEVEL2: untyped
-    TERRANVEHICLEARMORSVANADIUMPLATINGLEVEL3: untyped
-    TERRANSHIPWEAPONSULTRACAPACITORSLEVEL1: untyped
-    TERRANSHIPWEAPONSULTRACAPACITORSLEVEL2: untyped
-    TERRANSHIPWEAPONSULTRACAPACITORSLEVEL3: untyped
-    TERRANSHIPARMORSVANADIUMPLATINGLEVEL1: untyped
-    TERRANSHIPARMORSVANADIUMPLATINGLEVEL2: untyped
-    TERRANSHIPARMORSVANADIUMPLATINGLEVEL3: untyped
-    HIREKELMORIANMINERSPH: untyped
-    HIREDEVILDOGSPH: untyped
-    HIRESPARTANCOMPANYPH: untyped
-    HIREHAMMERSECURITIESPH: untyped
-    HIRESIEGEBREAKERSPH: untyped
-    HIREHELSANGELSPH: untyped
-    HIREDUSKWINGPH: untyped
-    HIREDUKESREVENGE: untyped
-    TOSHEASYMODE: untyped
     VOIDRAYSPEEDUPGRADE: untyped
     SMARTSERVOS: untyped
     ARMORPIERCINGROCKETS: untyped
     CYCLONERAPIDFIRELAUNCHERS: untyped
     RAVENENHANCEDMUNITIONS: untyped
     DIGGINGCLAWS: untyped
-    CARRIERCARRIERCAPACITY: untyped
-    CARRIERLEASHRANGEUPGRADE: untyped
     HURRICANETHRUSTERS: untyped
     TEMPESTGROUNDATTACKUPGRADE: untyped
+    FRENZY: untyped
     MICROBIALSHROUD: untyped
     INTERFERENCEMATRIX: untyped
     SUNDERINGIMPACT: untyped
     AMPLIFIEDSHIELDING: untyped
     PSIONICAMPLIFIERS: untyped
     SECRETEDCOATING: untyped
-    ENHANCEDSHOCKWAVES: untyped
-
-    # sord omit - no YARD return type given, using untyped
-    def self._330MMBARRAGECANNONS: () -> untyped
   end
 
   class ObservationUI
@@ -7843,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
     # 
@@ -7888,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
     # 
@@ -7934,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
@@ -8815,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
@@ -11405,12 +10738,38 @@ module Api
     MINERALFIELD450: untyped
     MINERALFIELDOPAQUE: untyped
     MINERALFIELDOPAQUE900: untyped
+    MECHAZERGLINGACGLUESCREENDUMMY_2: untyped
+    MECHABANELINGACGLUESCREENDUMMY_2: untyped
+    MECHAHYDRALISKACGLUESCREENDUMMY_2: untyped
+    MECHAINFESTORACGLUESCREENDUMMY_2: untyped
+    MECHACORRUPTORACGLUESCREENDUMMY_2: untyped
+    MECHAULTRALISKACGLUESCREENDUMMY_2: untyped
+    MECHAOVERSEERACGLUESCREENDUMMY_2: untyped
+    MECHALURKERACGLUESCREENDUMMY_2: untyped
+    MECHABATTLECARRIERLORDACGLUESCREENDUMMY_2: untyped
+    MECHASPINECRAWLERACGLUESCREENDUMMY_2: untyped
+    MECHASPORECRAWLERACGLUESCREENDUMMY_2: untyped
     COLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN: untyped
     COLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN: untyped
     COLLAPSIBLEROCKTOWERPUSHUNITRAMPLEFTGREEN: untyped
     COLLAPSIBLEROCKTOWERPUSHUNITRAMPRIGHTGREEN: untyped
     COLLAPSIBLEROCKTOWERRAMPLEFTGREEN: untyped
     COLLAPSIBLEROCKTOWERRAMPRIGHTGREEN: untyped
+    DUMMYUNIT000: untyped
+    DUMMYUNIT001: untyped
+    DUMMYUNIT002: untyped
+    DUMMYUNIT003: untyped
+    DUMMYUNIT004: untyped
+    DUMMYUNIT005: untyped
+    DUMMYUNIT006: untyped
+    DUMMYUNIT007: untyped
+    DUMMYUNIT008: untyped
+    DUMMYUNIT009: untyped
+    DUMMYUNIT010: untyped
+    DUMMYUNIT011: untyped
+    DUMMYUNIT012: untyped
+    DUMMYUNIT013: untyped
+    DUMMYUNIT014: untyped
 
     # sord omit - no YARD return type given, using untyped
     def self._4SLOTBAG: () -> untyped
@@ -14475,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.
@@ -14509,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
     # 
@@ -14554,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
     # 
@@ -14600,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
@@ -14732,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.
@@ -14766,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
     # 
@@ -14811,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
     # 
@@ -14857,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
@@ -14957,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.
@@ -14991,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
     # 
@@ -15036,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
     # 
@@ -15082,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
@@ -15162,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.
@@ -15196,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
     # 
@@ -15241,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
     # 
@@ -15287,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
@@ -20763,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
@@ -20802,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
@@ -20925,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.
@@ -20959,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
     # 
@@ -21004,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
     # 
@@ -21050,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