sc2ai 0.4.3 → 0.5.0

data/lib/sc2ai/protocol/data_pb.rb

@@ -18,59 +18,33 @@ module Api
     SUMMONED = 11
 
     def self.lookup(val)
-      if val == 0
-        :ENUM_ATTRIBUTE_UNSET
-      elsif val == 1
-        :LIGHT
-      elsif val == 2
-        :ARMORED
-      elsif val == 3
-        :BIOLOGICAL
-      elsif val == 4
-        :MECHANICAL
-      elsif val == 5
-        :ROBOTIC
-      elsif val == 6
-        :PSIONIC
-      elsif val == 7
-        :MASSIVE
-      elsif val == 8
-        :STRUCTURE
-      elsif val == 9
-        :HOVER
-      elsif val == 10
-        :HEROIC
-      elsif val == 11
-        :SUMMONED
-      end
+      return :ENUM_ATTRIBUTE_UNSET if val == 0
+      return :LIGHT if val == 1
+      return :ARMORED if val == 2
+      return :BIOLOGICAL if val == 3
+      return :MECHANICAL if val == 4
+      return :ROBOTIC if val == 5
+      return :PSIONIC if val == 6
+      return :MASSIVE if val == 7
+      return :STRUCTURE if val == 8
+      return :HOVER if val == 9
+      return :HEROIC if val == 10
+      return :SUMMONED if val == 11
     end
 
     def self.resolve(val)
-      if val == :ENUM_ATTRIBUTE_UNSET
-        0
-      elsif val == :LIGHT
-        1
-      elsif val == :ARMORED
-        2
-      elsif val == :BIOLOGICAL
-        3
-      elsif val == :MECHANICAL
-        4
-      elsif val == :ROBOTIC
-        5
-      elsif val == :PSIONIC
-        6
-      elsif val == :MASSIVE
-        7
-      elsif val == :STRUCTURE
-        8
-      elsif val == :HOVER
-        9
-      elsif val == :HEROIC
-        10
-      elsif val == :SUMMONED
-        11
-      end
+      return 0 if val == :ENUM_ATTRIBUTE_UNSET
+      return 1 if val == :LIGHT
+      return 2 if val == :ARMORED
+      return 3 if val == :BIOLOGICAL
+      return 4 if val == :MECHANICAL
+      return 5 if val == :ROBOTIC
+      return 6 if val == :PSIONIC
+      return 7 if val == :MASSIVE
+      return 8 if val == :STRUCTURE
+      return 9 if val == :HOVER
+      return 10 if val == :HEROIC
+      return 11 if val == :SUMMONED
     end
   end
 
@@ -91,35 +65,21 @@ module Api
       POINT_OR_NONE = 5
 
       def self.lookup(val)
-        if val == 0
-          :ENUM_TARGET_UNSET
-        elsif val == 1
-          :NONE
-        elsif val == 2
-          :POINT
-        elsif val == 3
-          :UNIT
-        elsif val == 4
-          :POINT_OR_UNIT
-        elsif val == 5
-          :POINT_OR_NONE
-        end
+        return :ENUM_TARGET_UNSET if val == 0
+        return :NONE if val == 1
+        return :POINT if val == 2
+        return :UNIT if val == 3
+        return :POINT_OR_UNIT if val == 4
+        return :POINT_OR_NONE if val == 5
       end
 
       def self.resolve(val)
-        if val == :ENUM_TARGET_UNSET
-          0
-        elsif val == :NONE
-          1
-        elsif val == :POINT
-          2
-        elsif val == :UNIT
-          3
-        elsif val == :POINT_OR_UNIT
-          4
-        elsif val == :POINT_OR_NONE
-          5
-        end
+        return 0 if val == :ENUM_TARGET_UNSET
+        return 1 if val == :NONE
+        return 2 if val == :POINT
+        return 3 if val == :UNIT
+        return 4 if val == :POINT_OR_UNIT
+        return 5 if val == :POINT_OR_NONE
       end
     end
     # required field readers
@@ -161,6 +121,7 @@ module Api
     # enum writers
     def target=(v)
       @target = Api::AbilityData::Target.resolve(v) || v
+      @_bitmask |= 0x0000000000000100
     end
 
     # BEGIN writers for optional fields
@@ -425,6 +386,10 @@ module Api
       (@_bitmask & 0x0000000000000080) == 0x0000000000000080
     end
 
+    def has_target?
+      (@_bitmask & 0x0000000000000100) == 0x0000000000000100
+    end
+
     def has_allow_minimap?
       (@_bitmask & 0x0000000000000200) == 0x0000000000000200
     end
@@ -530,7 +495,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -541,6 +506,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -615,7 +581,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -626,6 +592,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -2010,109 +1977,116 @@ 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
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @link_name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_link_name?
         buff << 0x12
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
       val = @link_index
-      if val != 0
+      if has_link_index?
         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
 
       val = @button_name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_button_name?
         buff << 0x22
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
       val = @friendly_name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_friendly_name?
         buff << 0x2a
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
       val = @hotkey
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_hotkey?
         buff << 0x32
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
       val = @remaps_to_ability_id
-      if val != 0
+      if has_remaps_to_ability_id?
         buff << 0x38
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
-      val = @available
-      if val == true
+      if has_available?
+        val = @available
         buff << 0x40
 
-        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
 
       val = @target
-      if val != 0
+      if has_target?
         buff << 0x48
 
-        while val != 0
+        loop do
           byte = val & 0x7F
 
           val >>= 7
@@ -2123,62 +2097,63 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
 
-      val = @allow_minimap
-      if val == true
+      if has_allow_minimap?
+        val = @allow_minimap
         buff << 0x50
 
-        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
 
-      val = @allow_autocast
-      if val == true
+      if has_allow_autocast?
+        val = @allow_autocast
         buff << 0x58
 
-        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
 
-      val = @is_building
-      if val == true
+      if has_is_building?
+        val = @is_building
         buff << 0x60
 
-        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
 
       val = @footprint_radius
-      if val != 0
+      if has_footprint_radius?
         buff << 0x6d
 
         [val].pack("e", buffer: buff)
       end
 
-      val = @is_instant_placement
-      if val == true
+      if has_is_instant_placement?
+        val = @is_instant_placement
         buff << 0x70
 
-        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
 
       val = @cast_range
-      if val != 0
+      if has_cast_range?
         buff << 0x7d
 
         [val].pack("e", buffer: buff)
@@ -2189,23 +2164,62 @@ module Api
 
     def to_h
       result = {}
-      result["ability_id".to_sym] = @ability_id
-      result["link_name".to_sym] = @link_name
-      result["link_index".to_sym] = @link_index
-      result["button_name".to_sym] = @button_name
-      result["friendly_name".to_sym] = @friendly_name
-      result["hotkey".to_sym] = @hotkey
-      result["remaps_to_ability_id".to_sym] = @remaps_to_ability_id
-      result["available".to_sym] = @available
-      result["target".to_sym] = @target
-      result["allow_minimap".to_sym] = @allow_minimap
-      result["allow_autocast".to_sym] = @allow_autocast
-      result["is_building".to_sym] = @is_building
-      result["footprint_radius".to_sym] = @footprint_radius
-      result["is_instant_placement".to_sym] = @is_instant_placement
-      result["cast_range".to_sym] = @cast_range
+
+      result[:"ability_id"] = @ability_id
+      result[:"link_name"] = @link_name
+      result[:"link_index"] = @link_index
+      result[:"button_name"] = @button_name
+      result[:"friendly_name"] = @friendly_name
+      result[:"hotkey"] = @hotkey
+      result[:"remaps_to_ability_id"] = @remaps_to_ability_id
+      result[:"available"] = @available
+      result[:"target"] = @target
+      result[:"allow_minimap"] = @allow_minimap
+      result[:"allow_autocast"] = @allow_autocast
+      result[:"is_building"] = @is_building
+      result[:"footprint_radius"] = @footprint_radius
+      result[:"is_instant_placement"] = @is_instant_placement
+      result[:"cast_range"] = @cast_range
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["abilityId"] = @ability_id if !options[:compact] || has_ability_id?
+      result["linkName"] = @link_name if !options[:compact] || has_link_name?
+      result["linkIndex"] = @link_index if !options[:compact] || has_link_index?
+      result["buttonName"] = @button_name if !options[:compact] ||
+        has_button_name?
+      result["friendlyName"] = @friendly_name if !options[:compact] ||
+        has_friendly_name?
+      result["hotkey"] = @hotkey if !options[:compact] || has_hotkey?
+      result["remapsToAbilityId"] = @remaps_to_ability_id if !options[
+        :compact
+      ] || has_remaps_to_ability_id?
+      result["available"] = @available if !options[:compact] || has_available?
+      result["target"] = @target if !options[:compact] || has_target?
+      result["allowMinimap"] = @allow_minimap if !options[:compact] ||
+        has_allow_minimap?
+      result["allowAutocast"] = @allow_autocast if !options[:compact] ||
+        has_allow_autocast?
+      result["isBuilding"] = @is_building if !options[:compact] ||
+        has_is_building?
+      result["footprintRadius"] = @footprint_radius if !options[:compact] ||
+        has_footprint_radius?
+      result["isInstantPlacement"] = @is_instant_placement if !options[
+        :compact
+      ] || has_is_instant_placement?
+      result["castRange"] = @cast_range if !options[:compact] || has_cast_range?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class DamageBonus
     def self.decode(buff)
@@ -2228,6 +2242,7 @@ module Api
     # enum writers
     def attribute=(v)
       @attribute = Api::Attribute.resolve(v) || v
+      @_bitmask |= 0x0000000000000001
     end
 
     # BEGIN writers for optional fields
@@ -2260,6 +2275,10 @@ module Api
       self.class.encode(self)
     end
 
+    def has_attribute?
+      (@_bitmask & 0x0000000000000001) == 0x0000000000000001
+    end
+
     def has_bonus?
       (@_bitmask & 0x0000000000000002) == 0x0000000000000002
     end
@@ -2332,7 +2351,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -2343,6 +2362,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -2417,7 +2437,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -2428,6 +2448,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -2678,10 +2699,10 @@ module Api
     end
     def _encode(buff)
       val = @attribute
-      if val != 0
+      if has_attribute?
         buff << 0x08
 
-        while val != 0
+        loop do
           byte = val & 0x7F
 
           val >>= 7
@@ -2692,11 +2713,12 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @bonus
-      if val != 0
+      if has_bonus?
         buff << 0x15
 
         [val].pack("e", buffer: buff)
@@ -2707,10 +2729,26 @@ module Api
 
     def to_h
       result = {}
-      result["attribute".to_sym] = @attribute
-      result["bonus".to_sym] = @bonus
+
+      result[:"attribute"] = @attribute
+      result[:"bonus"] = @bonus
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["attribute"] = @attribute if !options[:compact] || has_attribute?
+      result["bonus"] = @bonus if !options[:compact] || has_bonus?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class Weapon
     def self.decode(buff)
@@ -2727,27 +2765,17 @@ module Api
       ANY = 3
 
       def self.lookup(val)
-        if val == 0
-          :ENUM_TARGET_TYPE_UNSET
-        elsif val == 1
-          :GROUND
-        elsif val == 2
-          :AIR
-        elsif val == 3
-          :ANY
-        end
+        return :ENUM_TARGET_TYPE_UNSET if val == 0
+        return :GROUND if val == 1
+        return :AIR if val == 2
+        return :ANY if val == 3
       end
 
       def self.resolve(val)
-        if val == :ENUM_TARGET_TYPE_UNSET
-          0
-        elsif val == :GROUND
-          1
-        elsif val == :AIR
-          2
-        elsif val == :ANY
-          3
-        end
+        return 0 if val == :ENUM_TARGET_TYPE_UNSET
+        return 1 if val == :GROUND
+        return 2 if val == :AIR
+        return 3 if val == :ANY
       end
     end
     # required field readers
@@ -2775,6 +2803,7 @@ module Api
     # enum writers
     def type=(v)
       @type = Api::Weapon::TargetType.resolve(v) || v
+      @_bitmask |= 0x0000000000000001
     end
 
     # BEGIN writers for optional fields
@@ -2861,6 +2890,10 @@ module Api
       self.class.encode(self)
     end
 
+    def has_type?
+      (@_bitmask & 0x0000000000000001) == 0x0000000000000001
+    end
+
     def has_damage?
       (@_bitmask & 0x0000000000000002) == 0x0000000000000002
     end
@@ -2949,7 +2982,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -2960,6 +2993,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -3034,7 +3068,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -3045,6 +3079,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -3655,10 +3690,10 @@ module Api
     end
     def _encode(buff)
       val = @type
-      if val != 0
+      if has_type?
         buff << 0x08
 
-        while val != 0
+        loop do
           byte = val & 0x7F
 
           val >>= 7
@@ -3669,11 +3704,12 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @damage
-      if val != 0
+      if has_damage?
         buff << 0x15
 
         [val].pack("e", buffer: buff)
@@ -3733,26 +3769,27 @@ module Api
       end
 
       val = @attacks
-      if val != 0
+      if has_attacks?
         buff << 0x20
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @range
-      if val != 0
+      if has_range?
         buff << 0x2d
 
         [val].pack("e", buffer: buff)
       end
 
       val = @speed
-      if val != 0
+      if has_speed?
         buff << 0x35
 
         [val].pack("e", buffer: buff)
@@ -3763,14 +3800,38 @@ module Api
 
     def to_h
       result = {}
-      result["type".to_sym] = @type
-      result["damage".to_sym] = @damage
-      result["damage_bonus".to_sym] = @damage_bonus
-      result["attacks".to_sym] = @attacks
-      result["range".to_sym] = @range
-      result["speed".to_sym] = @speed
+
+      result[:"type"] = @type
+      result[:"damage"] = @damage
+      result[:"damage_bonus"] = @damage_bonus.map(&:to_h)
+      result[:"attacks"] = @attacks
+      result[:"range"] = @range
+      result[:"speed"] = @speed
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["type"] = @type if !options[:compact] || has_type?
+      result["damage"] = @damage if !options[:compact] || has_damage?
+      tmp_damage_bonus = @damage_bonus.map { |v| v.as_json(options) }
+
+      result["damageBonus"] = tmp_damage_bonus if !options[:compact] ||
+        tmp_damage_bonus.any?
+
+      result["attacks"] = @attacks if !options[:compact] || has_attacks?
+      result["range"] = @range if !options[:compact] || has_range?
+      result["speed"] = @speed if !options[:compact] || has_speed?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class UnitTypeData
     def self.decode(buff)
@@ -3849,6 +3910,7 @@ module Api
     # enum writers
     def race=(v)
       @race = Api::Race.resolve(v) || v
+      @_bitmask |= 0x0000000000000200
     end
     def attributes=(v)
       @attributes = Api::Attribute.resolve(v) || v
@@ -4221,6 +4283,10 @@ module Api
       (@_bitmask & 0x0000000000000100) == 0x0000000000000100
     end
 
+    def has_race?
+      (@_bitmask & 0x0000000000000200) == 0x0000000000000200
+    end
+
     def has_build_time?
       (@_bitmask & 0x0000000000000400) == 0x0000000000000400
     end
@@ -4345,7 +4411,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -4356,6 +4422,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -4430,7 +4497,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -4441,6 +4508,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -6482,86 +6550,91 @@ module Api
     end
     def _encode(buff)
       val = @unit_id
-      if val != 0
+      if has_unit_id?
         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
 
       val = @name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_name?
         buff << 0x12
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
-      val = @available
-      if val == true
+      if has_available?
+        val = @available
         buff << 0x18
 
-        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
 
       val = @cargo_size
-      if val != 0
+      if has_cargo_size?
         buff << 0x20
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @mineral_cost
-      if val != 0
+      if has_mineral_cost?
         buff << 0x60
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @vespene_cost
-      if val != 0
+      if has_vespene_cost?
         buff << 0x68
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @food_required
-      if val != 0
+      if has_food_required?
         buff << 0x75
 
         [val].pack("e", buffer: buff)
       end
 
       val = @food_provided
-      if val != 0
+      if has_food_provided?
         buff << 0x95
         buff << 0x01
 
@@ -6569,23 +6642,24 @@ module Api
       end
 
       val = @ability_id
-      if val != 0
+      if has_ability_id?
         buff << 0x78
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @race
-      if val != 0
+      if has_race?
         buff << 0x80
         buff << 0x01
 
-        while val != 0
+        loop do
           byte = val & 0x7F
 
           val >>= 7
@@ -6596,43 +6670,44 @@ module Api
 
           byte |= 0x80 if val != 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @build_time
-      if val != 0
+      if has_build_time?
         buff << 0x8d
         buff << 0x01
 
         [val].pack("e", buffer: buff)
       end
 
-      val = @has_vespene
-      if val == true
+      if has_has_vespene?
+        val = @has_vespene
         buff << 0x98
         buff << 0x01
 
-        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
 
-      val = @has_minerals
-      if val == true
+      if has_has_minerals?
+        val = @has_minerals
         buff << 0xa0
         buff << 0x01
 
-        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
 
       val = @sight_range
-      if val != 0
+      if has_sight_range?
         buff << 0xcd
         buff << 0x01
 
@@ -6647,52 +6722,55 @@ module Api
             buff << 0xa8
             buff << 0x01
 
-            while val != 0
+            loop do
               byte = val & 0x7F
               val >>= 7
               byte |= 0x80 if val > 0
               buff << byte
+              break if val == 0
             end
           end
         end
       end
 
       val = @unit_alias
-      if val != 0
+      if has_unit_alias?
         buff << 0xb0
         buff << 0x01
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @tech_requirement
-      if val != 0
+      if has_tech_requirement?
         buff << 0xb8
         buff << 0x01
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
-      val = @require_attached
-      if val == true
+      if has_require_attached?
+        val = @require_attached
         buff << 0xc0
         buff << 0x01
 
-        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
 
       list = @attributes
@@ -6702,7 +6780,7 @@ module Api
           if val != 0
             buff << 0x40
 
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -6713,20 +6791,21 @@ module Api
 
               byte |= 0x80 if val != 0
               buff << byte
+              break if val == 0
             end
           end
         end
       end
 
       val = @movement_speed
-      if val != 0
+      if has_movement_speed?
         buff << 0x4d
 
         [val].pack("e", buffer: buff)
       end
 
       val = @armor
-      if val != 0
+      if has_armor?
         buff << 0x55
 
         [val].pack("e", buffer: buff)
@@ -6790,30 +6869,87 @@ module Api
 
     def to_h
       result = {}
-      result["unit_id".to_sym] = @unit_id
-      result["name".to_sym] = @name
-      result["available".to_sym] = @available
-      result["cargo_size".to_sym] = @cargo_size
-      result["mineral_cost".to_sym] = @mineral_cost
-      result["vespene_cost".to_sym] = @vespene_cost
-      result["food_required".to_sym] = @food_required
-      result["food_provided".to_sym] = @food_provided
-      result["ability_id".to_sym] = @ability_id
-      result["race".to_sym] = @race
-      result["build_time".to_sym] = @build_time
-      result["has_vespene".to_sym] = @has_vespene
-      result["has_minerals".to_sym] = @has_minerals
-      result["sight_range".to_sym] = @sight_range
-      result["tech_alias".to_sym] = @tech_alias
-      result["unit_alias".to_sym] = @unit_alias
-      result["tech_requirement".to_sym] = @tech_requirement
-      result["require_attached".to_sym] = @require_attached
-      result["attributes".to_sym] = @attributes
-      result["movement_speed".to_sym] = @movement_speed
-      result["armor".to_sym] = @armor
-      result["weapons".to_sym] = @weapons
+
+      result[:"unit_id"] = @unit_id
+      result[:"name"] = @name
+      result[:"available"] = @available
+      result[:"cargo_size"] = @cargo_size
+      result[:"attributes"] = @attributes
+      result[:"movement_speed"] = @movement_speed
+      result[:"armor"] = @armor
+      result[:"weapons"] = @weapons.map(&:to_h)
+      result[:"mineral_cost"] = @mineral_cost
+      result[:"vespene_cost"] = @vespene_cost
+      result[:"food_required"] = @food_required
+      result[:"ability_id"] = @ability_id
+      result[:"race"] = @race
+      result[:"build_time"] = @build_time
+      result[:"food_provided"] = @food_provided
+      result[:"has_vespene"] = @has_vespene
+      result[:"has_minerals"] = @has_minerals
+      result[:"tech_alias"] = @tech_alias
+      result[:"unit_alias"] = @unit_alias
+      result[:"tech_requirement"] = @tech_requirement
+      result[:"require_attached"] = @require_attached
+      result[:"sight_range"] = @sight_range
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["unitId"] = @unit_id if !options[:compact] || has_unit_id?
+      result["name"] = @name if !options[:compact] || has_name?
+      result["available"] = @available if !options[:compact] || has_available?
+      result["cargoSize"] = @cargo_size if !options[:compact] || has_cargo_size?
+      tmp_attributes = @attributes
+
+      result["attributes"] = tmp_attributes if !options[:compact] ||
+        tmp_attributes.any?
+
+      result["movementSpeed"] = @movement_speed if !options[:compact] ||
+        has_movement_speed?
+      result["armor"] = @armor if !options[:compact] || has_armor?
+      tmp_weapons = @weapons.map { |v| v.as_json(options) }
+
+      result["weapons"] = tmp_weapons if !options[:compact] || tmp_weapons.any?
+
+      result["mineralCost"] = @mineral_cost if !options[:compact] ||
+        has_mineral_cost?
+      result["vespeneCost"] = @vespene_cost if !options[:compact] ||
+        has_vespene_cost?
+      result["foodRequired"] = @food_required if !options[:compact] ||
+        has_food_required?
+      result["abilityId"] = @ability_id if !options[:compact] || has_ability_id?
+      result["race"] = @race if !options[:compact] || has_race?
+      result["buildTime"] = @build_time if !options[:compact] || has_build_time?
+      result["foodProvided"] = @food_provided if !options[:compact] ||
+        has_food_provided?
+      result["hasVespene"] = @has_vespene if !options[:compact] ||
+        has_has_vespene?
+      result["hasMinerals"] = @has_minerals if !options[:compact] ||
+        has_has_minerals?
+      tmp_tech_alias = @tech_alias
+
+      result["techAlias"] = tmp_tech_alias if !options[:compact] ||
+        tmp_tech_alias.any?
+
+      result["unitAlias"] = @unit_alias if !options[:compact] || has_unit_alias?
+      result["techRequirement"] = @tech_requirement if !options[:compact] ||
+        has_tech_requirement?
+      result["requireAttached"] = @require_attached if !options[:compact] ||
+        has_require_attached?
+      result["sightRange"] = @sight_range if !options[:compact] ||
+        has_sight_range?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class UpgradeData
     def self.decode(buff)
@@ -7061,7 +7197,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -7072,6 +7208,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -7146,7 +7283,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -7157,6 +7294,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -7830,70 +7968,75 @@ module Api
     end
     def _encode(buff)
       val = @upgrade_id
-      if val != 0
+      if has_upgrade_id?
         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
 
       val = @name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_name?
         buff << 0x12
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
       val = @mineral_cost
-      if val != 0
+      if has_mineral_cost?
         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
 
       val = @vespene_cost
-      if val != 0
+      if has_vespene_cost?
         buff << 0x20
 
-        while val != 0
+        loop do
           byte = val & 0x7F
           val >>= 7
           byte |= 0x80 if val > 0
           buff << byte
+          break if val == 0
         end
       end
 
       val = @research_time
-      if val != 0
+      if has_research_time?
         buff << 0x2d
 
         [val].pack("e", buffer: buff)
       end
 
       val = @ability_id
-      if val != 0
+      if has_ability_id?
         buff << 0x30
 
-        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
@@ -7902,14 +8045,37 @@ module Api
 
     def to_h
       result = {}
-      result["upgrade_id".to_sym] = @upgrade_id
-      result["name".to_sym] = @name
-      result["mineral_cost".to_sym] = @mineral_cost
-      result["vespene_cost".to_sym] = @vespene_cost
-      result["research_time".to_sym] = @research_time
-      result["ability_id".to_sym] = @ability_id
+
+      result[:"upgrade_id"] = @upgrade_id
+      result[:"name"] = @name
+      result[:"mineral_cost"] = @mineral_cost
+      result[:"vespene_cost"] = @vespene_cost
+      result[:"research_time"] = @research_time
+      result[:"ability_id"] = @ability_id
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["upgradeId"] = @upgrade_id if !options[:compact] || has_upgrade_id?
+      result["name"] = @name if !options[:compact] || has_name?
+      result["mineralCost"] = @mineral_cost if !options[:compact] ||
+        has_mineral_cost?
+      result["vespeneCost"] = @vespene_cost if !options[:compact] ||
+        has_vespene_cost?
+      result["researchTime"] = @research_time if !options[:compact] ||
+        has_research_time?
+      result["abilityId"] = @ability_id if !options[:compact] || has_ability_id?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class BuffData
     def self.decode(buff)
@@ -8047,7 +8213,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -8058,6 +8224,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -8132,7 +8299,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -8143,6 +8310,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -8434,25 +8602,27 @@ module Api
     end
     def _encode(buff)
       val = @buff_id
-      if val != 0
+      if has_buff_id?
         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
 
       val = @name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_name?
         buff << 0x12
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
@@ -8463,10 +8633,26 @@ module Api
 
     def to_h
       result = {}
-      result["buff_id".to_sym] = @buff_id
-      result["name".to_sym] = @name
+
+      result[:"buff_id"] = @buff_id
+      result[:"name"] = @name
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["buffId"] = @buff_id if !options[:compact] || has_buff_id?
+      result["name"] = @name if !options[:compact] || has_name?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
   class EffectData
     def self.decode(buff)
@@ -8642,7 +8828,7 @@ module Api
 
           unknown_bytes = +"".b
           val = tag
-          while val != 0
+          loop do
             byte = val & 0x7F
 
             val >>= 7
@@ -8653,6 +8839,7 @@ module Api
 
             byte |= 0x80 if val != 0
             unknown_bytes << byte
+            break if val == 0
           end
 
           case wire_type
@@ -8727,7 +8914,7 @@ module Api
               end
 
             val = value
-            while val != 0
+            loop do
               byte = val & 0x7F
 
               val >>= 7
@@ -8738,6 +8925,7 @@ module Api
 
               byte |= 0x80 if val != 0
               unknown_bytes << byte
+              break if val == 0
             end
 
             unknown_bytes << buff.byteslice(index, value)
@@ -9199,45 +9387,48 @@ module Api
     end
     def _encode(buff)
       val = @effect_id
-      if val != 0
+      if has_effect_id?
         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
 
       val = @name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_name?
         buff << 0x12
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
       val = @friendly_name
-      if ((len = val.bytesize) > 0)
+      if (len = val.bytesize) > 0 || has_friendly_name?
         buff << 0x1a
-        while len != 0
+        loop do
           byte = len & 0x7F
           len >>= 7
           byte |= 0x80 if len > 0
           buff << byte
+          break if len == 0
         end
 
         buff << (val.ascii_only? ? val : val.b)
       end
 
       val = @radius
-      if val != 0
+      if has_radius?
         buff << 0x25
 
         [val].pack("e", buffer: buff)
@@ -9248,11 +9439,30 @@ module Api
 
     def to_h
       result = {}
-      result["effect_id".to_sym] = @effect_id
-      result["name".to_sym] = @name
-      result["friendly_name".to_sym] = @friendly_name
-      result["radius".to_sym] = @radius
+
+      result[:"effect_id"] = @effect_id
+      result[:"name"] = @name
+      result[:"friendly_name"] = @friendly_name
+      result[:"radius"] = @radius
+
+      result
+    end
+
+    def as_json(options = {})
+      result = {}
+
+      result["effectId"] = @effect_id if !options[:compact] || has_effect_id?
+      result["name"] = @name if !options[:compact] || has_name?
+      result["friendlyName"] = @friendly_name if !options[:compact] ||
+        has_friendly_name?
+      result["radius"] = @radius if !options[:compact] || has_radius?
+
       result
     end
+
+    def to_json(as_json_options = {})
+      require "json"
+      JSON.dump(as_json(as_json_options))
+    end
   end
 end