sc2ai 0.4.2 → 0.5.0

data/sig/sc2ai.rbs

@@ -266,6 +266,11 @@ module Sc2
     # Terminates connection to Sc2 client
     def disconnect: () -> void
 
+    # Note: Do not document, because ladder players should never quit,
+    # but rather #leave_game instead
+    # Sends quit command to SC2
+    def quit: () -> void
+
     # sord omit - no YARD return type given, using untyped
     # _@param_ `map`
     # 
@@ -4197,6 +4202,19 @@ module Sc2
     # 
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
+
+    # sord warn - "Array[Float,Float]" does not appear to be a type
+    # Returns [x,y] array tuple
+    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+
+    # 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)]
+
+    # sord omit - no YARD return type given, using untyped
+    def to_s: () -> untyped
   end
 end
 
@@ -6351,6 +6369,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :groups, using untyped
     # required field readers
     attr_accessor groups: untyped
@@ -6414,6 +6440,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :control_group_index, using untyped
     # optional field readers
     attr_accessor control_group_index: untyped
@@ -6501,6 +6535,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_type, using untyped
     # optional field readers
     attr_accessor unit_type: untyped
@@ -6594,6 +6636,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :buffs, using untyped
     # required field readers
     attr_accessor buffs: untyped
@@ -6644,6 +6694,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :units, using untyped
     # required field readers
     attr_accessor units: untyped
@@ -6685,6 +6743,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :passengers, using untyped
     # required field readers
     attr_accessor passengers: untyped
@@ -6736,6 +6802,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -6779,6 +6853,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :build_queue, using untyped
     # required field readers
     attr_accessor build_queue: untyped
@@ -6840,6 +6922,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :action, using untyped
     # oneof field readers
     attr_reader action: untyped
@@ -6908,6 +6998,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_action?: () -> bool
+
     def has_control_group_index?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -6923,6 +7015,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :control_group_index, using untyped
     # optional field readers
     attr_accessor control_group_index: untyped
@@ -6977,6 +7077,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :selection_add, using untyped
     # optional field readers
     attr_accessor selection_add: untyped
@@ -7014,6 +7122,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :selection_add, using untyped
     # optional field readers
     attr_accessor selection_add: untyped
@@ -7047,6 +7163,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ActionSelectIdleWorker
@@ -7074,6 +7198,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_type?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -7087,6 +7213,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     module Type
       ENUM_ACTION_SELECT_IDLE_WORKER_TYPE_UNSET: untyped
       SET: untyped
@@ -7131,6 +7265,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_type?: () -> bool
+
     def has_unit_index?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -7146,6 +7282,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_index, using untyped
     # optional field readers
     attr_accessor unit_index: untyped
@@ -7199,6 +7343,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_index, using untyped
     # optional field readers
     attr_accessor unit_index: untyped
@@ -7236,6 +7388,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_index, using untyped
     # optional field readers
     attr_accessor unit_index: untyped
@@ -7276,6 +7436,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -7381,6 +7549,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :start_locations, using untyped
     # required field readers
     attr_accessor start_locations: untyped
@@ -7454,6 +7630,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :units, using untyped
     # required field readers
     attr_accessor units: untyped
@@ -7514,6 +7698,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :pos, using untyped
     # optional field readers
     attr_accessor pos: untyped
@@ -7565,6 +7757,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # Shorthand for creating an instance for [x, y, z]
     # 
     # _@param_ `x`
@@ -7702,6 +7902,19 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
+    # sord warn - "Array[Float,Float]" does not appear to be a type
+    # Returns [x,y] array tuple
+    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+
+    # 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)]
+
+    # sord omit - no YARD return type given, using untyped
+    def to_s: () -> untyped
+
     # sord omit - no YARD type given for :pos, using untyped
     # optional field readers
     attr_accessor pos: untyped
@@ -7749,6 +7962,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :power_sources, using untyped
     # required field readers
     attr_accessor power_sources: untyped
@@ -7807,6 +8028,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -7890,6 +8119,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :tag, using untyped
     # optional field readers
     attr_accessor tag: untyped
@@ -7958,6 +8195,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :point, using untyped
     # optional field readers
     attr_accessor point: untyped
@@ -8098,6 +8343,10 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_display_type?: () -> bool
+
+    def has_alliance?: () -> bool
+
     def has_tag?: () -> bool
 
     def has_unit_type?: () -> bool
@@ -8112,6 +8361,8 @@ module Api
 
     def has_build_progress?: () -> bool
 
+    def has_cloak?: () -> bool
+
     def has_detect_range?: () -> bool
 
     def has_radar_range?: () -> bool
@@ -8185,6 +8436,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD return type given, using untyped
     def hash: () -> untyped
 
@@ -8740,6 +8999,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :visibility, using untyped
     # optional field readers
     attr_accessor visibility: untyped
@@ -8778,6 +9045,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :dead_units, using untyped
     # required field readers
     attr_accessor dead_units: untyped
@@ -8821,6 +9096,8 @@ module Api
 
     def has_effect_id?: () -> bool
 
+    def has_alliance?: () -> bool
+
     def has_owner?: () -> bool
 
     def has_radius?: () -> bool
@@ -8838,6 +9115,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :pos, using untyped
     # required field readers
     attr_accessor pos: untyped
@@ -8887,6 +9172,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :action, using untyped
     # oneof field readers
     attr_reader action: untyped
@@ -8951,6 +9244,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_tags, using untyped
     # required field readers
     attr_accessor unit_tags: untyped
@@ -9008,6 +9309,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :center_world_space, using untyped
     # optional field readers
     attr_accessor center_world_space: untyped
@@ -9049,6 +9358,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_tags, using untyped
     # required field readers
     attr_accessor unit_tags: untyped
@@ -11184,6 +11501,8 @@ module Api
 
     def has_available?: () -> bool
 
+    def has_target?: () -> bool
+
     def has_allow_minimap?: () -> bool
 
     def has_allow_autocast?: () -> bool
@@ -11209,6 +11528,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -11310,6 +11637,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_attribute?: () -> bool
+
     def has_bonus?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -11325,6 +11654,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :bonus, using untyped
     # optional field readers
     attr_accessor bonus: untyped
@@ -11368,6 +11705,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_type?: () -> bool
+
     def has_damage?: () -> bool
 
     def has_attacks?: () -> bool
@@ -11389,6 +11728,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :damage_bonus, using untyped
     # required field readers
     attr_accessor damage_bonus: untyped
@@ -11523,6 +11870,8 @@ module Api
 
     def has_ability_id?: () -> bool
 
+    def has_race?: () -> bool
+
     def has_build_time?: () -> bool
 
     def has_has_vespene?: () -> bool
@@ -11554,6 +11903,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :tech_alias, using untyped
     # required field readers
     attr_accessor tech_alias: untyped
@@ -11689,6 +12046,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :upgrade_id, using untyped
     # optional field readers
     attr_accessor upgrade_id: untyped
@@ -11749,6 +12114,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :buff_id, using untyped
     # optional field readers
     attr_accessor buff_id: untyped
@@ -11804,6 +12177,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :effect_id, using untyped
     # optional field readers
     attr_accessor effect_id: untyped
@@ -11891,6 +12272,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :command, using untyped
     # oneof field readers
     attr_reader command: untyped
@@ -11965,6 +12354,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :text, using untyped
     # required field readers
     attr_accessor text: untyped
@@ -12017,6 +12414,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :p0, using untyped
     # optional field readers
     attr_accessor p0: untyped
@@ -12068,6 +12473,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # Creates a new Api::Color object with random rgb values
     # 
     # _@return_ — random color
@@ -12136,6 +12549,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :color, using untyped
     # optional field readers
     attr_accessor color: untyped
@@ -12192,6 +12613,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :color, using untyped
     # optional field readers
     attr_accessor color: untyped
@@ -12239,6 +12668,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :color, using untyped
     # optional field readers
     attr_accessor color: untyped
@@ -12290,6 +12727,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :color, using untyped
     # optional field readers
     attr_accessor color: untyped
@@ -12349,6 +12794,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_type, using untyped
     # optional field readers
     attr_accessor unit_type: untyped
@@ -12395,6 +12848,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :tag, using untyped
     # required field readers
     attr_accessor tag: untyped
@@ -12427,6 +12888,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_test?: () -> bool
+
     def has_delay_ms?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -12442,6 +12905,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :delay_ms, using untyped
     # optional field readers
     attr_accessor delay_ms: untyped
@@ -12494,6 +12965,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :score, using untyped
     # optional field readers
     attr_accessor score: untyped
@@ -12524,6 +13003,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_end_result?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -12537,6 +13018,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     module EndResult
       ENUM_END_RESULT_UNSET: untyped
       SURRENDER: untyped
@@ -12580,6 +13069,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_unit_value?: () -> bool
+
     def has_value?: () -> bool
 
     def has_unit_tag?: () -> bool
@@ -12597,6 +13088,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :value, using untyped
     # optional field readers
     attr_accessor value: untyped
@@ -12888,6 +13387,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :pathing, using untyped
     # required field readers
     attr_accessor pathing: untyped
@@ -12936,6 +13443,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :pathing, using untyped
     # required field readers
     attr_accessor pathing: untyped
@@ -12983,9 +13498,17 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
-    # sord omit - no YARD type given for :end_pos, using untyped
-    # optional field readers
-    attr_accessor end_pos: untyped
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
+    # sord omit - no YARD type given for :end_pos, using untyped
+    # optional field readers
+    attr_accessor end_pos: untyped
 
     # sord omit - no YARD type given for :start, using untyped
     # oneof field readers
@@ -13032,6 +13555,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :distance, using untyped
     # optional field readers
     attr_accessor distance: untyped
@@ -13069,6 +13600,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_tag, using untyped
     # optional field readers
     attr_accessor unit_tag: untyped
@@ -13110,6 +13649,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :abilities, using untyped
     # required field readers
     attr_accessor abilities: untyped
@@ -13161,6 +13708,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -13199,6 +13754,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_result?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -13211,6 +13768,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class Score
@@ -13241,6 +13806,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_score_type?: () -> bool
+
     def has_score?: () -> bool
 
     def has_score_details?: () -> bool
@@ -13258,6 +13825,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :score, using untyped
     # optional field readers
     attr_accessor score: untyped
@@ -13331,6 +13906,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :none, using untyped
     # optional field readers
     attr_accessor none: untyped
@@ -13390,6 +13973,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :life, using untyped
     # optional field readers
     attr_accessor life: untyped
@@ -13545,6 +14136,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :idle_production_time, using untyped
     # optional field readers
     attr_accessor idle_production_time: untyped
@@ -13713,6 +14312,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -13760,6 +14367,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :bits_per_pixel, using untyped
     # optional field readers
     attr_accessor bits_per_pixel: untyped
@@ -13775,8 +14390,8 @@ module Api
 
   # Protobuf virtual class.
   class PointI
-    include Sc2::Position
     include Api::PointDistanceExtension
+    include Sc2::Position
 
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD return type given, using untyped
@@ -13812,6 +14427,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # Loose equality matches on floats x and y.
     # We never check z-axis, because the map is single-level.
     # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
@@ -13936,6 +14559,19 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
+    # sord warn - "Array[Float,Float]" does not appear to be a type
+    # Returns [x,y] array tuple
+    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+
+    # 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)]
+
+    # sord omit - no YARD return type given, using untyped
+    def to_s: () -> untyped
+
     # sord omit - no YARD type given for :x, using untyped
     # optional field readers
     attr_accessor x: untyped
@@ -13980,6 +14616,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :p0, using untyped
     # optional field readers
     attr_accessor p0: untyped
@@ -13991,9 +14635,9 @@ module Api
 
   # Protobuf virtual class.
   class Point2D
-    include Sc2::Position
-    include Api::Point2DExtension
     include Api::PointDistanceExtension
+    include Api::Point2DExtension
+    include Sc2::Position
     extend Api::Point2DExtension::ClassMethods
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -14030,6 +14674,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # Shorthand for creating an instance for [x, y]
     # 
     # _@param_ `x`
@@ -14041,21 +14693,6 @@ module Api
     # ```
     def self.[]: ((Float | Integer) x, (Float | Integer) y) -> Api::Point2D
 
-    # sord omit - no YARD return type given, using untyped
-    # Hashes on x and y
-    def hash: () -> untyped
-
-    # sord omit - no YARD type given for "other", using untyped
-    def eql?: (untyped other) -> bool
-
-    # Returns self
-    def to_p2d: () -> self
-
-    # Create a new 3d Point, by adding a y axis.
-    # 
-    # _@param_ `z`
-    def to_3d: (?z: (Float | Integer)) -> Api::Point
-
     # 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.
@@ -14180,6 +14817,34 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
+    # sord warn - "Array[Float,Float]" does not appear to be a type
+    # Returns [x,y] array tuple
+    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+
+    # 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)]
+
+    # sord omit - no YARD return type given, using untyped
+    def to_s: () -> untyped
+
+    # sord omit - no YARD return type given, using untyped
+    # Hashes on x and y
+    def hash: () -> untyped
+
+    # sord omit - no YARD type given for "other", using untyped
+    def eql?: (untyped other) -> bool
+
+    # Returns self
+    def to_p2d: () -> self
+
+    # Create a new 3d Point, by adding a y axis.
+    # 
+    # _@param_ `z`
+    def to_3d: (?z: (Float | Integer)) -> Api::Point
+
     # sord omit - no YARD type given for :x, using untyped
     # optional field readers
     attr_accessor x: untyped
@@ -14191,9 +14856,9 @@ module Api
 
   # Protobuf virtual class.
   class Point
+    include Api::PointDistanceExtension
     include Api::PointExtension
     include Sc2::Position
-    include Api::PointDistanceExtension
     extend Api::PointExtension::ClassMethods
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -14233,6 +14898,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # Shorthand for creating an instance for [x, y, z]
     # 
     # _@param_ `x`
@@ -14370,6 +15043,19 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
+    # sord warn - "Array[Float,Float]" does not appear to be a type
+    # Returns [x,y] array tuple
+    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+
+    # 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)]
+
+    # sord omit - no YARD return type given, using untyped
+    def to_s: () -> untyped
+
     # sord omit - no YARD return type given, using untyped
     def hash: () -> untyped
 
@@ -14394,8 +15080,8 @@ module Api
 
   # Protobuf virtual class.
   class Size2DI
-    include Sc2::Position
     include Api::PointDistanceExtension
+    include Sc2::Position
 
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD return type given, using untyped
@@ -14431,6 +15117,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # Loose equality matches on floats x and y.
     # We never check z-axis, because the map is single-level.
     # TODO: We should almost certainly introduce TOLERANCE here, but verify it's cost first.
@@ -14555,6 +15249,19 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
+    # sord warn - "Array[Float,Float]" does not appear to be a type
+    # Returns [x,y] array tuple
+    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+
+    # 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)]
+
+    # sord omit - no YARD return type given, using untyped
+    def to_s: () -> untyped
+
     # sord omit - no YARD type given for :x, using untyped
     # optional field readers
     attr_accessor x: untyped
@@ -14769,6 +15476,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :id, using untyped
     # optional field readers
     attr_accessor id: untyped
@@ -14944,6 +15659,8 @@ module Api
 
     def has_id?: () -> bool
 
+    def has_status?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -14957,6 +15674,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :error, using untyped
     # required field readers
     attr_accessor error: untyped
@@ -15106,6 +15831,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_setup, using untyped
     # required field readers
     attr_accessor player_setup: untyped
@@ -15170,6 +15903,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :map_path, using untyped
     # optional field readers
     attr_accessor map_path: untyped
@@ -15206,6 +15947,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_error?: () -> bool
+
     def has_error_details?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -15221,6 +15964,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :error_details, using untyped
     # optional field readers
     attr_accessor error_details: untyped
@@ -15302,6 +16053,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :client_ports, using untyped
     # required field readers
     attr_accessor client_ports: untyped
@@ -15374,6 +16133,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :game_port, using untyped
     # optional field readers
     attr_accessor game_port: untyped
@@ -15413,6 +16180,8 @@ module Api
 
     def has_player_id?: () -> bool
 
+    def has_error?: () -> bool
+
     def has_error_details?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -15428,6 +16197,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_id, using untyped
     # optional field readers
     attr_accessor player_id: untyped
@@ -15490,6 +16267,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseRestartGame
@@ -15520,6 +16305,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_error?: () -> bool
+
     def has_error_details?: () -> bool
 
     def has_need_hard_reset?: () -> bool
@@ -15537,6 +16324,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :error_details, using untyped
     # optional field readers
     attr_accessor error_details: untyped
@@ -15617,6 +16412,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :map_data, using untyped
     # optional field readers
     attr_accessor map_data: untyped
@@ -15681,6 +16484,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_error?: () -> bool
+
     def has_error_details?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -15696,6 +16501,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :error_details, using untyped
     # optional field readers
     attr_accessor error_details: untyped
@@ -15752,6 +16565,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :trigger_cmd, using untyped
     # optional field readers
     attr_accessor trigger_cmd: untyped
@@ -15784,6 +16605,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_error?: () -> bool
+
     def has_error_details?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -15799,6 +16622,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :error_details, using untyped
     # optional field readers
     attr_accessor error_details: untyped
@@ -15845,6 +16676,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseLeaveGame
@@ -15875,6 +16714,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class RequestQuickSave
@@ -15905,6 +16752,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseQuickSave
@@ -15935,6 +16790,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class RequestQuickLoad
@@ -15965,6 +16828,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseQuickLoad
@@ -15995,6 +16866,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class RequestQuit
@@ -16025,6 +16904,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseQuit
@@ -16055,6 +16942,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class RequestGameInfo
@@ -16085,6 +16980,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseGameInfo
@@ -16137,6 +17040,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_info, using untyped
     # required field readers
     attr_accessor player_info: untyped
@@ -16197,6 +17108,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :disable_fog, using untyped
     # optional field readers
     attr_accessor disable_fog: untyped
@@ -16248,6 +17167,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :actions, using untyped
     # required field readers
     attr_accessor actions: untyped
@@ -16304,6 +17231,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_id, using untyped
     # optional field readers
     attr_accessor player_id: untyped
@@ -16342,6 +17277,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :actions, using untyped
     # required field readers
     attr_accessor actions: untyped
@@ -16384,6 +17327,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class RequestObserverAction
@@ -16415,6 +17366,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :actions, using untyped
     # required field readers
     attr_accessor actions: untyped
@@ -16448,6 +17407,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class RequestStep
@@ -16482,6 +17449,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :count, using untyped
     # optional field readers
     attr_accessor count: untyped
@@ -16519,6 +17494,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :simulation_loop, using untyped
     # optional field readers
     attr_accessor simulation_loop: untyped
@@ -16574,6 +17557,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -16634,6 +17625,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :abilities, using untyped
     # required field readers
     attr_accessor abilities: untyped
@@ -16683,6 +17682,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseSaveReplay
@@ -16717,6 +17724,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :data, using untyped
     # optional field readers
     attr_accessor data: untyped
@@ -16756,6 +17771,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :download_data, using untyped
     # optional field readers
     attr_accessor download_data: untyped
@@ -16819,6 +17842,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_info, using untyped
     # optional field readers
     attr_accessor player_info: untyped
@@ -16900,6 +17931,8 @@ module Api
 
     def has_base_build?: () -> bool
 
+    def has_error?: () -> bool
+
     def has_error_details?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -16915,6 +17948,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_info, using untyped
     # required field readers
     attr_accessor player_info: untyped
@@ -17001,6 +18042,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponseAvailableMaps
@@ -17033,6 +18082,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :local_map_paths, using untyped
     # required field readers
     attr_accessor local_map_paths: untyped
@@ -17077,6 +18134,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :map_path, using untyped
     # optional field readers
     attr_accessor map_path: untyped
@@ -17111,6 +18176,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_error?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -17124,6 +18191,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     module Error
       ENUM_RESPONSE_SAVE_MAP_ERROR_UNSET: untyped
       INVALID_MAP_DATA: untyped
@@ -17166,6 +18241,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class ResponsePing
@@ -17214,6 +18297,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :game_version, using untyped
     # optional field readers
     attr_accessor game_version: untyped
@@ -17260,6 +18351,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :debug, using untyped
     # required field readers
     attr_accessor debug: untyped
@@ -17293,6 +18392,14 @@ module Api
 
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
+
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
   end
 
   class PlayerSetup
@@ -17352,8 +18459,16 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_type?: () -> bool
+
+    def has_race?: () -> bool
+
+    def has_difficulty?: () -> bool
+
     def has_player_name?: () -> bool
 
+    def has_ai_build?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -17367,6 +18482,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_name, using untyped
     # optional field readers
     attr_accessor player_name: untyped
@@ -17422,6 +18545,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :resolution, using untyped
     # optional field readers
     attr_accessor resolution: untyped
@@ -17509,6 +18640,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :raw, using untyped
     # optional field readers
     attr_accessor raw: untyped
@@ -17616,6 +18755,16 @@ module Api
 
     def has_player_id?: () -> bool
 
+    def has_type?: () -> bool
+
+    def has_race_requested?: () -> bool
+
+    def has_race_actual?: () -> bool
+
+    def has_difficulty?: () -> bool
+
+    def has_ai_build?: () -> bool
+
     def has_player_name?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -17631,6 +18780,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_id, using untyped
     # optional field readers
     attr_accessor player_id: untyped
@@ -17714,6 +18871,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_id, using untyped
     # optional field readers
     attr_accessor player_id: untyped
@@ -17830,6 +18995,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :abilities, using untyped
     # required field readers
     attr_accessor abilities: untyped
@@ -17919,6 +19092,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # Checks the action type and returns corresponding class
     # 
     # _@return_ — class of type, i.e. Api::ActionRaw
@@ -17986,6 +19167,8 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_proto: (?untyped _options) -> untyped
 
+    def has_channel?: () -> bool
+
     def has_message?: () -> bool
 
     # sord omit - no YARD type given for "buff", using untyped
@@ -18001,6 +19184,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :message, using untyped
     # optional field readers
     attr_accessor message: untyped
@@ -18055,6 +19246,8 @@ module Api
 
     def has_ability_id?: () -> bool
 
+    def has_result?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -18068,6 +19261,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_tag, using untyped
     # optional field readers
     attr_accessor unit_tag: untyped
@@ -18115,6 +19316,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :action, using untyped
     # oneof field readers
     attr_reader action: untyped
@@ -18168,6 +19377,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_id, using untyped
     # optional field readers
     attr_accessor player_id: untyped
@@ -18208,6 +19425,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :world_pos, using untyped
     # optional field readers
     attr_accessor world_pos: untyped
@@ -18249,6 +19474,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_id, using untyped
     # optional field readers
     attr_accessor player_id: untyped
@@ -18283,6 +19516,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :unit_tags, using untyped
     # required field readers
     attr_accessor unit_tags: untyped
@@ -18317,6 +19558,8 @@ module Api
 
     def has_player_id?: () -> bool
 
+    def has_result?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -18330,6 +19573,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :player_id, using untyped
     # optional field readers
     attr_accessor player_id: untyped
@@ -18370,6 +19621,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :renders, using untyped
     # optional field readers
     attr_accessor renders: untyped
@@ -18517,6 +19776,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :height_map, using untyped
     # optional field readers
     attr_accessor height_map: untyped
@@ -18700,6 +19967,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :height_map, using untyped
     # optional field readers
     attr_accessor height_map: untyped
@@ -18780,6 +20055,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :map, using untyped
     # optional field readers
     attr_accessor map: untyped
@@ -18827,6 +20110,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :action, using untyped
     # oneof field readers
     attr_reader action: untyped
@@ -18893,6 +20184,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :ability_id, using untyped
     # optional field readers
     attr_accessor ability_id: untyped
@@ -18946,6 +20245,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :center_minimap, using untyped
     # optional field readers
     attr_accessor center_minimap: untyped
@@ -18980,6 +20287,8 @@ module Api
 
     def has_selection_screen_coord?: () -> bool
 
+    def has_type?: () -> bool
+
     # sord omit - no YARD type given for "buff", using untyped
     # sord omit - no YARD type given for "index", using untyped
     # sord omit - no YARD type given for "len", using untyped
@@ -18993,6 +20302,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :selection_screen_coord, using untyped
     # optional field readers
     attr_accessor selection_screen_coord: untyped
@@ -19047,6 +20364,14 @@ module Api
     # sord omit - no YARD return type given, using untyped
     def to_h: () -> untyped
 
+    # sord omit - no YARD type given for "options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def as_json: (?untyped options) -> untyped
+
+    # sord omit - no YARD type given for "as_json_options", using untyped
+    # sord omit - no YARD return type given, using untyped
+    def to_json: (?untyped as_json_options) -> untyped
+
     # sord omit - no YARD type given for :selection_screen_coord, using untyped
     # required field readers
     attr_accessor selection_screen_coord: untyped
@@ -19666,6 +20991,19 @@ module Api
     # _@param_ `distance` — The distance to move.
     def away_from: (Api::Point2D other, Float distance) -> Api::Point2D
 
+    # sord warn - "Array[Float,Float]" does not appear to be a type
+    # Returns [x,y] array tuple
+    def to_axy: () -> SORD_ERROR_ArrayFloatFloat
+
+    # 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)]
+
+    # sord omit - no YARD return type given, using untyped
+    def to_s: () -> untyped
+
     # Adds additional functionality to message class Api::PowerSource
     module ClassMethods
       # Shorthand for creating an instance for [x, y, z]