sc2ai 0.4.3 → 0.5.0

data/lib/sc2ai/protocol/spatial_pb.rb

@@ -130,7 +130,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -141,6 +141,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -215,7 +216,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -226,6 +227,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -632,10 +634,38 @@ module Api
 
     def to_h
       result = {}
-      result["renders".to_sym] = @renders.to_h
-      result["minimap_renders".to_sym] = @minimap_renders.to_h
+
+      result[:"renders"] = @renders.to_h
+      result[:"minimap_renders"] = @minimap_renders.to_h
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["renders"] = (
+        if @renders.nil?
+          {}
+        else
+          @renders.as_json(options)
+        end
+      ) if !options[:compact] || has_renders?
+      result["minimapRenders"] = (
+        if @minimap_renders.nil?
+          {}
+        else
+          @minimap_renders.as_json(options)
+        end
+      ) if !options[:compact] || has_minimap_renders?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class FeatureLayers
     def self.decode(buff)
@@ -1267,7 +1297,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -1278,6 +1308,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -1352,7 +1383,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -1363,6 +1394,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -5800,35 +5832,222 @@ module Api
 
     def to_h
       result = {}
-      result["height_map".to_sym] = @height_map.to_h
-      result["visibility_map".to_sym] = @visibility_map.to_h
-      result["creep".to_sym] = @creep.to_h
-      result["power".to_sym] = @power.to_h
-      result["player_id".to_sym] = @player_id.to_h
-      result["unit_type".to_sym] = @unit_type.to_h
-      result["selected".to_sym] = @selected.to_h
-      result["unit_hit_points".to_sym] = @unit_hit_points.to_h
-      result["unit_hit_points_ratio".to_sym] = @unit_hit_points_ratio.to_h
-      result["unit_energy".to_sym] = @unit_energy.to_h
-      result["unit_energy_ratio".to_sym] = @unit_energy_ratio.to_h
-      result["unit_shields".to_sym] = @unit_shields.to_h
-      result["unit_shields_ratio".to_sym] = @unit_shields_ratio.to_h
-      result["player_relative".to_sym] = @player_relative.to_h
-      result["unit_density_aa".to_sym] = @unit_density_aa.to_h
-      result["unit_density".to_sym] = @unit_density.to_h
-      result["effects".to_sym] = @effects.to_h
-      result["hallucinations".to_sym] = @hallucinations.to_h
-      result["cloaked".to_sym] = @cloaked.to_h
-      result["blip".to_sym] = @blip.to_h
-      result["buffs".to_sym] = @buffs.to_h
-      result["buff_duration".to_sym] = @buff_duration.to_h
-      result["active".to_sym] = @active.to_h
-      result["build_progress".to_sym] = @build_progress.to_h
-      result["buildable".to_sym] = @buildable.to_h
-      result["pathable".to_sym] = @pathable.to_h
-      result["placeholder".to_sym] = @placeholder.to_h
+
+      result[:"height_map"] = @height_map.to_h
+      result[:"visibility_map"] = @visibility_map.to_h
+      result[:"creep"] = @creep.to_h
+      result[:"power"] = @power.to_h
+      result[:"player_id"] = @player_id.to_h
+      result[:"unit_type"] = @unit_type.to_h
+      result[:"selected"] = @selected.to_h
+      result[:"unit_hit_points"] = @unit_hit_points.to_h
+      result[:"unit_energy"] = @unit_energy.to_h
+      result[:"unit_shields"] = @unit_shields.to_h
+      result[:"player_relative"] = @player_relative.to_h
+      result[:"unit_density_aa"] = @unit_density_aa.to_h
+      result[:"unit_density"] = @unit_density.to_h
+      result[:"unit_hit_points_ratio"] = @unit_hit_points_ratio.to_h
+      result[:"unit_energy_ratio"] = @unit_energy_ratio.to_h
+      result[:"unit_shields_ratio"] = @unit_shields_ratio.to_h
+      result[:"effects"] = @effects.to_h
+      result[:"hallucinations"] = @hallucinations.to_h
+      result[:"cloaked"] = @cloaked.to_h
+      result[:"blip"] = @blip.to_h
+      result[:"buffs"] = @buffs.to_h
+      result[:"active"] = @active.to_h
+      result[:"buff_duration"] = @buff_duration.to_h
+      result[:"build_progress"] = @build_progress.to_h
+      result[:"buildable"] = @buildable.to_h
+      result[:"pathable"] = @pathable.to_h
+      result[:"placeholder"] = @placeholder.to_h
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["heightMap"] = (
+        if @height_map.nil?
+          {}
+        else
+          @height_map.as_json(options)
+        end
+      ) if !options[:compact] || has_height_map?
+      result["visibilityMap"] = (
+        if @visibility_map.nil?
+          {}
+        else
+          @visibility_map.as_json(options)
+        end
+      ) if !options[:compact] || has_visibility_map?
+      result["creep"] = @creep.nil? ? {} : @creep.as_json(options) if !options[
+        :compact
+      ] || has_creep?
+      result["power"] = @power.nil? ? {} : @power.as_json(options) if !options[
+        :compact
+      ] || has_power?
+      result["playerId"] = (
+        if @player_id.nil?
+          {}
+        else
+          @player_id.as_json(options)
+        end
+      ) if !options[:compact] || has_player_id?
+      result["unitType"] = (
+        if @unit_type.nil?
+          {}
+        else
+          @unit_type.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_type?
+      result["selected"] = (
+        if @selected.nil?
+          {}
+        else
+          @selected.as_json(options)
+        end
+      ) if !options[:compact] || has_selected?
+      result["unitHitPoints"] = (
+        if @unit_hit_points.nil?
+          {}
+        else
+          @unit_hit_points.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_hit_points?
+      result["unitEnergy"] = (
+        if @unit_energy.nil?
+          {}
+        else
+          @unit_energy.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_energy?
+      result["unitShields"] = (
+        if @unit_shields.nil?
+          {}
+        else
+          @unit_shields.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_shields?
+      result["playerRelative"] = (
+        if @player_relative.nil?
+          {}
+        else
+          @player_relative.as_json(options)
+        end
+      ) if !options[:compact] || has_player_relative?
+      result["unitDensityAa"] = (
+        if @unit_density_aa.nil?
+          {}
+        else
+          @unit_density_aa.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_density_aa?
+      result["unitDensity"] = (
+        if @unit_density.nil?
+          {}
+        else
+          @unit_density.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_density?
+      result["unitHitPointsRatio"] = (
+        if @unit_hit_points_ratio.nil?
+          {}
+        else
+          @unit_hit_points_ratio.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_hit_points_ratio?
+      result["unitEnergyRatio"] = (
+        if @unit_energy_ratio.nil?
+          {}
+        else
+          @unit_energy_ratio.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_energy_ratio?
+      result["unitShieldsRatio"] = (
+        if @unit_shields_ratio.nil?
+          {}
+        else
+          @unit_shields_ratio.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_shields_ratio?
+      result["effects"] = (
+        if @effects.nil?
+          {}
+        else
+          @effects.as_json(options)
+        end
+      ) if !options[:compact] || has_effects?
+      result["hallucinations"] = (
+        if @hallucinations.nil?
+          {}
+        else
+          @hallucinations.as_json(options)
+        end
+      ) if !options[:compact] || has_hallucinations?
+      result["cloaked"] = (
+        if @cloaked.nil?
+          {}
+        else
+          @cloaked.as_json(options)
+        end
+      ) if !options[:compact] || has_cloaked?
+      result["blip"] = @blip.nil? ? {} : @blip.as_json(options) if !options[
+        :compact
+      ] || has_blip?
+      result["buffs"] = @buffs.nil? ? {} : @buffs.as_json(options) if !options[
+        :compact
+      ] || has_buffs?
+      result["active"] = (
+        if @active.nil?
+          {}
+        else
+          @active.as_json(options)
+        end
+      ) if !options[:compact] || has_active?
+      result["buffDuration"] = (
+        if @buff_duration.nil?
+          {}
+        else
+          @buff_duration.as_json(options)
+        end
+      ) if !options[:compact] || has_buff_duration?
+      result["buildProgress"] = (
+        if @build_progress.nil?
+          {}
+        else
+          @build_progress.as_json(options)
+        end
+      ) if !options[:compact] || has_build_progress?
+      result["buildable"] = (
+        if @buildable.nil?
+          {}
+        else
+          @buildable.as_json(options)
+        end
+      ) if !options[:compact] || has_buildable?
+      result["pathable"] = (
+        if @pathable.nil?
+          {}
+        else
+          @pathable.as_json(options)
+        end
+      ) if !options[:compact] || has_pathable?
+      result["placeholder"] = (
+        if @placeholder.nil?
+          {}
+        else
+          @placeholder.as_json(options)
+        end
+      ) if !options[:compact] || has_placeholder?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class FeatureLayersMinimap
     def self.decode(buff)
@@ -6140,7 +6359,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -6151,6 +6370,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -6225,7 +6445,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -6236,6 +6456,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -8083,19 +8304,106 @@ module Api
 
     def to_h
       result = {}
-      result["height_map".to_sym] = @height_map.to_h
-      result["visibility_map".to_sym] = @visibility_map.to_h
-      result["creep".to_sym] = @creep.to_h
-      result["camera".to_sym] = @camera.to_h
-      result["player_id".to_sym] = @player_id.to_h
-      result["player_relative".to_sym] = @player_relative.to_h
-      result["selected".to_sym] = @selected.to_h
-      result["alerts".to_sym] = @alerts.to_h
-      result["buildable".to_sym] = @buildable.to_h
-      result["pathable".to_sym] = @pathable.to_h
-      result["unit_type".to_sym] = @unit_type.to_h
+
+      result[:"height_map"] = @height_map.to_h
+      result[:"visibility_map"] = @visibility_map.to_h
+      result[:"creep"] = @creep.to_h
+      result[:"camera"] = @camera.to_h
+      result[:"player_id"] = @player_id.to_h
+      result[:"player_relative"] = @player_relative.to_h
+      result[:"selected"] = @selected.to_h
+      result[:"unit_type"] = @unit_type.to_h
+      result[:"alerts"] = @alerts.to_h
+      result[:"buildable"] = @buildable.to_h
+      result[:"pathable"] = @pathable.to_h
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["heightMap"] = (
+        if @height_map.nil?
+          {}
+        else
+          @height_map.as_json(options)
+        end
+      ) if !options[:compact] || has_height_map?
+      result["visibilityMap"] = (
+        if @visibility_map.nil?
+          {}
+        else
+          @visibility_map.as_json(options)
+        end
+      ) if !options[:compact] || has_visibility_map?
+      result["creep"] = @creep.nil? ? {} : @creep.as_json(options) if !options[
+        :compact
+      ] || has_creep?
+      result["camera"] = (
+        if @camera.nil?
+          {}
+        else
+          @camera.as_json(options)
+        end
+      ) if !options[:compact] || has_camera?
+      result["playerId"] = (
+        if @player_id.nil?
+          {}
+        else
+          @player_id.as_json(options)
+        end
+      ) if !options[:compact] || has_player_id?
+      result["playerRelative"] = (
+        if @player_relative.nil?
+          {}
+        else
+          @player_relative.as_json(options)
+        end
+      ) if !options[:compact] || has_player_relative?
+      result["selected"] = (
+        if @selected.nil?
+          {}
+        else
+          @selected.as_json(options)
+        end
+      ) if !options[:compact] || has_selected?
+      result["unitType"] = (
+        if @unit_type.nil?
+          {}
+        else
+          @unit_type.as_json(options)
+        end
+      ) if !options[:compact] || has_unit_type?
+      result["alerts"] = (
+        if @alerts.nil?
+          {}
+        else
+          @alerts.as_json(options)
+        end
+      ) if !options[:compact] || has_alerts?
+      result["buildable"] = (
+        if @buildable.nil?
+          {}
+        else
+          @buildable.as_json(options)
+        end
+      ) if !options[:compact] || has_buildable?
+      result["pathable"] = (
+        if @pathable.nil?
+          {}
+        else
+          @pathable.as_json(options)
+        end
+      ) if !options[:compact] || has_pathable?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ObservationRender
     def self.decode(buff)
@@ -8224,7 +8532,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -8235,6 +8543,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -8309,7 +8618,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -8320,6 +8629,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -8718,10 +9028,34 @@ module Api
 
     def to_h
       result = {}
-      result["map".to_sym] = @map.to_h
-      result["minimap".to_sym] = @minimap.to_h
+
+      result[:"map"] = @map.to_h
+      result[:"minimap"] = @minimap.to_h
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["map"] = @map.nil? ? {} : @map.as_json(options) if !options[
+        :compact
+      ] || has_map?
+      result["minimap"] = (
+        if @minimap.nil?
+          {}
+        else
+          @minimap.as_json(options)
+        end
+      ) if !options[:compact] || has_minimap?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ActionSpatial
     def self.decode(buff)
@@ -8876,7 +9210,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -8887,6 +9221,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -8961,7 +9296,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -8972,6 +9307,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -9708,9 +10044,65 @@ module Api
 
     def to_h
       result = {}
-      send("action").tap { |f| result[f.to_sym] = send(f) if f }
+
+      resolved_action = self.action
+
+      result[:"unit_command"] = @unit_command.to_h if resolved_action ==
+        :"unit_command"
+      result[:"camera_move"] = @camera_move.to_h if resolved_action ==
+        :"camera_move"
+      result[
+        :"unit_selection_point"
+      ] = @unit_selection_point.to_h if resolved_action ==
+        :"unit_selection_point"
+      result[
+        :"unit_selection_rect"
+      ] = @unit_selection_rect.to_h if resolved_action == :"unit_selection_rect"
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      resolved_action = self.action
+
+      result["unitCommand"] = (
+        if @unit_command.nil?
+          {}
+        else
+          @unit_command.as_json(options)
+        end
+      ) if resolved_action == :"unit_command"
+      result["cameraMove"] = (
+        if @camera_move.nil?
+          {}
+        else
+          @camera_move.as_json(options)
+        end
+      ) if resolved_action == :"camera_move"
+      result["unitSelectionPoint"] = (
+        if @unit_selection_point.nil?
+          {}
+        else
+          @unit_selection_point.as_json(options)
+        end
+      ) if resolved_action == :"unit_selection_point"
+      result["unitSelectionRect"] = (
+        if @unit_selection_rect.nil?
+          {}
+        else
+          @unit_selection_rect.as_json(options)
+        end
+      ) if resolved_action == :"unit_selection_rect"
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ActionSpatialUnitCommand
     def self.decode(buff)
@@ -9891,7 +10283,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -9902,6 +10294,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -9976,7 +10369,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -9987,6 +10380,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -10466,10 +10860,10 @@ module Api
     end
     def _encode(buff)
       val = @ability_id
-      if val != 0
+      if has_ability_id?
         buff << 0x08
 
-        while val != 0
+        loop do
           byte = val & 0x7F
 
           val >>= 7
@@ -10480,6 +10874,7 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
 
@@ -10579,15 +10974,15 @@ module Api
         buff
       end
 
-      val = @queue_command
-      if val == true
+      if has_queue_command?
+        val = @queue_command
         buff << 0x20
 
-        buff << 1
-      elsif val == false
-        # Default value, encode nothing
-      else
-        raise "bool values should be true or false"
+        if val == true
+          buff << 1
+        elsif val == false
+          buff << 0
+        end
       end
       buff << @_unknown_fields if @_unknown_fields
       buff
@@ -10595,11 +10990,52 @@ module Api
 
     def to_h
       result = {}
-      send("target").tap { |f| result[f.to_sym] = send(f) if f }
-      result["ability_id".to_sym] = @ability_id
-      result["queue_command".to_sym] = @queue_command
+
+      resolved_target = self.target
+
+      result[:"ability_id"] = @ability_id
+      result[
+        :"target_screen_coord"
+      ] = @target_screen_coord.to_h if resolved_target == :"target_screen_coord"
+      result[
+        :"target_minimap_coord"
+      ] = @target_minimap_coord.to_h if resolved_target ==
+        :"target_minimap_coord"
+      result[:"queue_command"] = @queue_command
+
       result
     end
+
+    def as_json(options = {})
+      result = {}
+
+      resolved_target = self.target
+
+      result["abilityId"] = @ability_id if !options[:compact] || has_ability_id?
+      result["targetScreenCoord"] = (
+        if @target_screen_coord.nil?
+          {}
+        else
+          @target_screen_coord.as_json(options)
+        end
+      ) if resolved_target == :"target_screen_coord"
+      result["targetMinimapCoord"] = (
+        if @target_minimap_coord.nil?
+          {}
+        else
+          @target_minimap_coord.as_json(options)
+        end
+      ) if resolved_target == :"target_minimap_coord"
+      result["queueCommand"] = @queue_command if !options[:compact] ||
+        has_queue_command?
+
+      result
+    end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ActionSpatialCameraMove
     def self.decode(buff)
@@ -10709,7 +11145,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -10720,6 +11156,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -10794,7 +11231,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -10805,6 +11242,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -11042,9 +11480,30 @@ module Api
 
     def to_h
       result = {}
-      result["center_minimap".to_sym] = @center_minimap.to_h
+
+      result[:"center_minimap"] = @center_minimap.to_h
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["centerMinimap"] = (
+        if @center_minimap.nil?
+          {}
+        else
+          @center_minimap.as_json(options)
+        end
+      ) if !options[:compact] || has_center_minimap?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ActionSpatialUnitSelectionPoint
     def self.decode(buff)
@@ -11062,31 +11521,19 @@ module Api
       ADD_ALL_TYPE = 4
 
       def self.lookup(val)
-        if val == 0
-          :ENUM_ACTION_SPATIAL_UNIT_SELECTION_POINT_TYPE_UNSET
-        elsif val == 1
-          :SELECT
-        elsif val == 2
-          :TOGGLE
-        elsif val == 3
-          :ALL_TYPE
-        elsif val == 4
-          :ADD_ALL_TYPE
-        end
+        return :ENUM_ACTION_SPATIAL_UNIT_SELECTION_POINT_TYPE_UNSET if val == 0
+        return :SELECT if val == 1
+        return :TOGGLE if val == 2
+        return :ALL_TYPE if val == 3
+        return :ADD_ALL_TYPE if val == 4
       end
 
       def self.resolve(val)
-        if val == :ENUM_ACTION_SPATIAL_UNIT_SELECTION_POINT_TYPE_UNSET
-          0
-        elsif val == :SELECT
-          1
-        elsif val == :TOGGLE
-          2
-        elsif val == :ALL_TYPE
-          3
-        elsif val == :ADD_ALL_TYPE
-          4
-        end
+        return 0 if val == :ENUM_ACTION_SPATIAL_UNIT_SELECTION_POINT_TYPE_UNSET
+        return 1 if val == :SELECT
+        return 2 if val == :TOGGLE
+        return 3 if val == :ALL_TYPE
+        return 4 if val == :ADD_ALL_TYPE
       end
     end
     # required field readers
@@ -11102,6 +11549,7 @@ module Api
     # enum writers
     def type=(v)
       @type = Api::ActionSpatialUnitSelectionPoint::Type.resolve(v) || v
+      @_bitmask |= 0x0000000000000002
     end
 
     # BEGIN writers for optional fields
@@ -11138,6 +11586,10 @@ module Api
       (@_bitmask & 0x0000000000000001) == 0x0000000000000001
     end
 
+    def has_type?
+      (@_bitmask & 0x0000000000000002) == 0x0000000000000002
+    end
+
     def decode_from(buff, index, len)
       @_bitmask = 0
 
@@ -11206,7 +11658,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -11217,6 +11669,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -11291,7 +11744,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -11302,6 +11755,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -11655,10 +12109,10 @@ module Api
       end
 
       val = @type
-      if val != 0
+      if has_type?
         buff << 0x10
 
-        while val != 0
+        loop do
           byte = val & 0x7F
 
           val >>= 7
@@ -11669,6 +12123,7 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
       buff << @_unknown_fields if @_unknown_fields
@@ -11677,10 +12132,32 @@ module Api
 
     def to_h
       result = {}
-      result["selection_screen_coord".to_sym] = @selection_screen_coord.to_h
-      result["type".to_sym] = @type
+
+      result[:"selection_screen_coord"] = @selection_screen_coord.to_h
+      result[:"type"] = @type
+
       result
     end
+
+    def as_json(options = {})
+      result = {}
+
+      result["selectionScreenCoord"] = (
+        if @selection_screen_coord.nil?
+          {}
+        else
+          @selection_screen_coord.as_json(options)
+        end
+      ) if !options[:compact] || has_selection_screen_coord?
+      result["type"] = @type if !options[:compact] || has_type?
+
+      result
+    end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ActionSpatialUnitSelectionRect
     def self.decode(buff)
@@ -11799,7 +12276,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -11810,6 +12287,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -11884,7 +12362,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -11895,6 +12373,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -12216,15 +12695,15 @@ module Api
         end
       end
 
-      val = @selection_add
-      if val == true
+      if has_selection_add?
+        val = @selection_add
         buff << 0x10
 
-        buff << 1
-      elsif val == false
-        # Default value, encode nothing
-      else
-        raise "bool values should be true or false"
+        if val == true
+          buff << 1
+        elsif val == false
+          buff << 0
+        end
       end
       buff << @_unknown_fields if @_unknown_fields
       buff
@@ -12232,9 +12711,32 @@ module Api
 
     def to_h
       result = {}
-      result["selection_screen_coord".to_sym] = @selection_screen_coord
-      result["selection_add".to_sym] = @selection_add
+
+      result[:"selection_screen_coord"] = @selection_screen_coord.map(&:to_h)
+      result[:"selection_add"] = @selection_add
+
       result
     end
+
+    def as_json(options = {})
+      result = {}
+
+      tmp_selection_screen_coord =
+        @selection_screen_coord.map { |v| v.as_json(options) }
+
+      result["selectionScreenCoord"] = tmp_selection_screen_coord if !options[
+        :compact
+      ] || tmp_selection_screen_coord.any?
+
+      result["selectionAdd"] = @selection_add if !options[:compact] ||
+        has_selection_add?
+
+      result
+    end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
 end