sc2ai 0.4.3 → 0.5.0

data/lib/sc2ai/protocol/query_pb.rb

@@ -143,7 +143,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -154,6 +154,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -228,7 +229,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -239,6 +240,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -938,15 +940,15 @@ module Api
         end
       end
 
-      val = @ignore_resource_requirements
-      if val == true
+      if has_ignore_resource_requirements?
+        val = @ignore_resource_requirements
         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
@@ -954,14 +956,44 @@ module Api
 
     def to_h
       result = {}
-      result["pathing".to_sym] = @pathing
-      result["abilities".to_sym] = @abilities
-      result["placements".to_sym] = @placements
+
+      result[:"pathing"] = @pathing.map(&:to_h)
+      result[:"abilities"] = @abilities.map(&:to_h)
+      result[:"placements"] = @placements.map(&:to_h)
+      result[:"ignore_resource_requirements"] = @ignore_resource_requirements
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      tmp_pathing = @pathing.map { |v| v.as_json(options) }
+
+      result["pathing"] = tmp_pathing if !options[:compact] || tmp_pathing.any?
+
+      tmp_abilities = @abilities.map { |v| v.as_json(options) }
+
+      result["abilities"] = tmp_abilities if !options[:compact] ||
+        tmp_abilities.any?
+
+      tmp_placements = @placements.map { |v| v.as_json(options) }
+
+      result["placements"] = tmp_placements if !options[:compact] ||
+        tmp_placements.any?
+
       result[
-        "ignore_resource_requirements".to_sym
-      ] = @ignore_resource_requirements
+        "ignoreResourceRequirements"
+      ] = @ignore_resource_requirements if !options[:compact] ||
+        has_ignore_resource_requirements?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ResponseQuery
     def self.decode(buff)
@@ -1070,7 +1102,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -1081,6 +1113,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -1155,7 +1188,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -1166,6 +1199,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -1809,11 +1843,38 @@ module Api
 
     def to_h
       result = {}
-      result["pathing".to_sym] = @pathing
-      result["abilities".to_sym] = @abilities
-      result["placements".to_sym] = @placements
+
+      result[:"pathing"] = @pathing.map(&:to_h)
+      result[:"abilities"] = @abilities.map(&:to_h)
+      result[:"placements"] = @placements.map(&:to_h)
+
       result
     end
+
+    def as_json(options = {})
+      result = {}
+
+      tmp_pathing = @pathing.map { |v| v.as_json(options) }
+
+      result["pathing"] = tmp_pathing if !options[:compact] || tmp_pathing.any?
+
+      tmp_abilities = @abilities.map { |v| v.as_json(options) }
+
+      result["abilities"] = tmp_abilities if !options[:compact] ||
+        tmp_abilities.any?
+
+      tmp_placements = @placements.map { |v| v.as_json(options) }
+
+      result["placements"] = tmp_placements if !options[:compact] ||
+        tmp_placements.any?
+
+      result
+    end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class RequestQueryPathing
     def self.decode(buff)
@@ -1971,7 +2032,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -1982,6 +2043,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -2056,7 +2118,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -2067,6 +2129,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -2524,11 +2587,12 @@ module Api
       if val != 0
         buff << 0x10
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
@@ -2585,10 +2649,44 @@ module Api
 
     def to_h
       result = {}
-      send("start").tap { |f| result[f.to_sym] = send(f) if f }
-      result["end_pos".to_sym] = @end_pos.to_h
+
+      resolved_start = self.start
+
+      result[:"start_pos"] = @start_pos.to_h if resolved_start == :"start_pos"
+      result[:"unit_tag"] = @unit_tag if resolved_start == :"unit_tag"
+      result[:"end_pos"] = @end_pos.to_h
+
       result
     end
+
+    def as_json(options = {})
+      result = {}
+
+      resolved_start = self.start
+
+      result["startPos"] = (
+        if @start_pos.nil?
+          {}
+        else
+          @start_pos.as_json(options)
+        end
+      ) if resolved_start == :"start_pos"
+      result["unitTag"] = @unit_tag if resolved_start == :"unit_tag"
+      result["endPos"] = (
+        if @end_pos.nil?
+          {}
+        else
+          @end_pos.as_json(options)
+        end
+      ) if !options[:compact] || has_end_pos?
+
+      result
+    end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ResponseQueryPathing
     def self.decode(buff)
@@ -2698,7 +2796,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -2709,6 +2807,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -2783,7 +2882,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -2794,6 +2893,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -2924,7 +3024,7 @@ module Api
     end
     def _encode(buff)
       val = @distance
-      if val != 0
+      if has_distance?
         buff << 0x0d
 
         [val].pack("e", buffer: buff)
@@ -2935,9 +3035,24 @@ module Api
 
     def to_h
       result = {}
-      result["distance".to_sym] = @distance
+
+      result[:"distance"] = @distance
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["distance"] = @distance if !options[:compact] || has_distance?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class RequestQueryAvailableAbilities
     def self.decode(buff)
@@ -3056,7 +3171,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -3067,6 +3182,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -3141,7 +3257,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -3152,6 +3268,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -3332,14 +3449,15 @@ module Api
     end
     def _encode(buff)
       val = @unit_tag
-      if val != 0
+      if has_unit_tag?
         buff << 0x08
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
       buff << @_unknown_fields if @_unknown_fields
@@ -3348,9 +3466,24 @@ module Api
 
     def to_h
       result = {}
-      result["unit_tag".to_sym] = @unit_tag
+
+      result[:"unit_tag"] = @unit_tag
+
       result
     end
+
+    def as_json(options = {})
+      result = {}
+
+      result["unitTag"] = @unit_tag if !options[:compact] || has_unit_tag?
+
+      result
+    end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ResponseQueryAvailableAbilities
     def self.decode(buff)
@@ -3506,7 +3639,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -3517,6 +3650,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -3591,7 +3725,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -3602,6 +3736,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -4079,26 +4214,28 @@ module Api
       end
 
       val = @unit_tag
-      if val != 0
+      if has_unit_tag?
         buff << 0x10
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @unit_type_id
-      if val != 0
+      if has_unit_type_id?
         buff << 0x18
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
       buff << @_unknown_fields if @_unknown_fields
@@ -4107,11 +4244,33 @@ module Api
 
     def to_h
       result = {}
-      result["abilities".to_sym] = @abilities
-      result["unit_tag".to_sym] = @unit_tag
-      result["unit_type_id".to_sym] = @unit_type_id
+
+      result[:"abilities"] = @abilities.map(&:to_h)
+      result[:"unit_tag"] = @unit_tag
+      result[:"unit_type_id"] = @unit_type_id
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      tmp_abilities = @abilities.map { |v| v.as_json(options) }
+
+      result["abilities"] = tmp_abilities if !options[:compact] ||
+        tmp_abilities.any?
+
+      result["unitTag"] = @unit_tag if !options[:compact] || has_unit_tag?
+      result["unitTypeId"] = @unit_type_id if !options[:compact] ||
+        has_unit_type_id?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class RequestQueryBuildingPlacement
     def self.decode(buff)
@@ -4278,7 +4437,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -4289,6 +4448,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -4363,7 +4523,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -4374,6 +4534,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -4787,10 +4948,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
@@ -4801,6 +4962,7 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
 
@@ -4853,14 +5015,15 @@ module Api
       end
 
       val = @placing_unit_tag
-      if val != 0
+      if has_placing_unit_tag?
         buff << 0x18
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
       buff << @_unknown_fields if @_unknown_fields
@@ -4869,11 +5032,35 @@ module Api
 
     def to_h
       result = {}
-      result["ability_id".to_sym] = @ability_id
-      result["target_pos".to_sym] = @target_pos.to_h
-      result["placing_unit_tag".to_sym] = @placing_unit_tag
+
+      result[:"ability_id"] = @ability_id
+      result[:"target_pos"] = @target_pos.to_h
+      result[:"placing_unit_tag"] = @placing_unit_tag
+
       result
     end
+
+    def as_json(options = {})
+      result = {}
+
+      result["abilityId"] = @ability_id if !options[:compact] || has_ability_id?
+      result["targetPos"] = (
+        if @target_pos.nil?
+          {}
+        else
+          @target_pos.as_json(options)
+        end
+      ) if !options[:compact] || has_target_pos?
+      result["placingUnitTag"] = @placing_unit_tag if !options[:compact] ||
+        has_placing_unit_tag?
+
+      result
+    end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class ResponseQueryBuildingPlacement
     def self.decode(buff)
@@ -4892,9 +5079,12 @@ module Api
     # enum writers
     def result=(v)
       @result = Api::ActionResult.resolve(v) || v
+      @_bitmask |= 0x0000000000000001
     end
 
     def initialize(result: nil)
+      @_bitmask = 0
+
       if result == nil
         @result = 0
       else
@@ -4907,7 +5097,13 @@ module Api
       self.class.encode(self)
     end
 
+    def has_result?
+      (@_bitmask & 0x0000000000000001) == 0x0000000000000001
+    end
+
     def decode_from(buff, index, len)
+      @_bitmask = 0
+
       @result = 0
 
       return self if index >= len
@@ -4972,7 +5168,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -4983,6 +5179,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -5057,7 +5254,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -5068,6 +5265,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -5260,10 +5458,10 @@ module Api
     end
     def _encode(buff)
       val = @result
-      if val != 0
+      if has_result?
         buff << 0x08
 
-        while val != 0
+        loop do
           byte = val & 0x7F
 
           val >>= 7
@@ -5274,6 +5472,7 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
       buff << @_unknown_fields if @_unknown_fields
@@ -5282,8 +5481,23 @@ module Api
 
     def to_h
       result = {}
-      result["result".to_sym] = @result
+
+      result[:"result"] = @result
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["result"] = @result if !options[:compact] || has_result?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
 end