pokeapi_client 2.1.0 → 2.2.0

data/lib/pokeapi_client/models/move_meta.rb

@@ -1,12 +1,12 @@
 =begin
 #PokéAPI
 
-#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**(]https://github.com/phalt) and other [**PokéAPI contributors***](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.     
+#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**](https://github.com/phalt) and other [**PokéAPI contributors**](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.
 
-The version of the OpenAPI document: 2.7.0
+The version of the OpenAPI document: 2.10.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -15,28 +15,40 @@ require 'time'
 
 module PokeApiClient
   class MoveMeta < ApiModelBase
+    # The status ailment this move inflicts on its target.
     attr_accessor :ailment
 
+    # The category of move this move falls under, e.g. damage or ailment.
     attr_accessor :category
 
+    # The minimum number of times this move hits. Null if it always only hits once.
     attr_accessor :min_hits
 
+    # The maximum number of times this move hits. Null if it always only hits once.
     attr_accessor :max_hits
 
+    # The minimum number of turns this move continues to take effect. Null if it always only lasts one turn.
     attr_accessor :min_turns
 
+    # The maximum number of turns this move continues to take effect. Null if it always only lasts one turn.
     attr_accessor :max_turns
 
+    # HP drain (if positive) or Recoil damage (if negative), in percent of damage done.
     attr_accessor :drain
 
+    # The amount of hp gained by the attacking Pokemon, in percent of it's maximum HP.
     attr_accessor :healing
 
+    # Critical hit rate bonus.
     attr_accessor :crit_rate
 
+    # The likelihood this attack will cause an ailment.
     attr_accessor :ailment_chance
 
+    # The likelihood this attack will cause the target Pokémon to flinch.
     attr_accessor :flinch_chance
 
+    # The likelihood this attack will cause a stat change in the target Pokémon.
     attr_accessor :stat_chance
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -101,6 +113,16 @@ module PokeApiClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -183,6 +205,86 @@ module PokeApiClient
         invalid_properties.push('invalid value for "category", category cannot be nil.')
       end
 
+      if !@min_hits.nil? && @min_hits > 2147483647
+        invalid_properties.push('invalid value for "min_hits", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@min_hits.nil? && @min_hits < -2147483648
+        invalid_properties.push('invalid value for "min_hits", must be greater than or equal to -2147483648.')
+      end
+
+      if !@max_hits.nil? && @max_hits > 2147483647
+        invalid_properties.push('invalid value for "max_hits", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@max_hits.nil? && @max_hits < -2147483648
+        invalid_properties.push('invalid value for "max_hits", must be greater than or equal to -2147483648.')
+      end
+
+      if !@min_turns.nil? && @min_turns > 2147483647
+        invalid_properties.push('invalid value for "min_turns", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@min_turns.nil? && @min_turns < -2147483648
+        invalid_properties.push('invalid value for "min_turns", must be greater than or equal to -2147483648.')
+      end
+
+      if !@max_turns.nil? && @max_turns > 2147483647
+        invalid_properties.push('invalid value for "max_turns", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@max_turns.nil? && @max_turns < -2147483648
+        invalid_properties.push('invalid value for "max_turns", must be greater than or equal to -2147483648.')
+      end
+
+      if !@drain.nil? && @drain > 2147483647
+        invalid_properties.push('invalid value for "drain", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@drain.nil? && @drain < -2147483648
+        invalid_properties.push('invalid value for "drain", must be greater than or equal to -2147483648.')
+      end
+
+      if !@healing.nil? && @healing > 2147483647
+        invalid_properties.push('invalid value for "healing", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@healing.nil? && @healing < -2147483648
+        invalid_properties.push('invalid value for "healing", must be greater than or equal to -2147483648.')
+      end
+
+      if !@crit_rate.nil? && @crit_rate > 2147483647
+        invalid_properties.push('invalid value for "crit_rate", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@crit_rate.nil? && @crit_rate < -2147483648
+        invalid_properties.push('invalid value for "crit_rate", must be greater than or equal to -2147483648.')
+      end
+
+      if !@ailment_chance.nil? && @ailment_chance > 2147483647
+        invalid_properties.push('invalid value for "ailment_chance", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@ailment_chance.nil? && @ailment_chance < -2147483648
+        invalid_properties.push('invalid value for "ailment_chance", must be greater than or equal to -2147483648.')
+      end
+
+      if !@flinch_chance.nil? && @flinch_chance > 2147483647
+        invalid_properties.push('invalid value for "flinch_chance", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@flinch_chance.nil? && @flinch_chance < -2147483648
+        invalid_properties.push('invalid value for "flinch_chance", must be greater than or equal to -2147483648.')
+      end
+
+      if !@stat_chance.nil? && @stat_chance > 2147483647
+        invalid_properties.push('invalid value for "stat_chance", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@stat_chance.nil? && @stat_chance < -2147483648
+        invalid_properties.push('invalid value for "stat_chance", must be greater than or equal to -2147483648.')
+      end
+
       invalid_properties
     end
 
@@ -192,6 +294,26 @@ module PokeApiClient
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @ailment.nil?
       return false if @category.nil?
+      return false if !@min_hits.nil? && @min_hits > 2147483647
+      return false if !@min_hits.nil? && @min_hits < -2147483648
+      return false if !@max_hits.nil? && @max_hits > 2147483647
+      return false if !@max_hits.nil? && @max_hits < -2147483648
+      return false if !@min_turns.nil? && @min_turns > 2147483647
+      return false if !@min_turns.nil? && @min_turns < -2147483648
+      return false if !@max_turns.nil? && @max_turns > 2147483647
+      return false if !@max_turns.nil? && @max_turns < -2147483648
+      return false if !@drain.nil? && @drain > 2147483647
+      return false if !@drain.nil? && @drain < -2147483648
+      return false if !@healing.nil? && @healing > 2147483647
+      return false if !@healing.nil? && @healing < -2147483648
+      return false if !@crit_rate.nil? && @crit_rate > 2147483647
+      return false if !@crit_rate.nil? && @crit_rate < -2147483648
+      return false if !@ailment_chance.nil? && @ailment_chance > 2147483647
+      return false if !@ailment_chance.nil? && @ailment_chance < -2147483648
+      return false if !@flinch_chance.nil? && @flinch_chance > 2147483647
+      return false if !@flinch_chance.nil? && @flinch_chance < -2147483648
+      return false if !@stat_chance.nil? && @stat_chance > 2147483647
+      return false if !@stat_chance.nil? && @stat_chance < -2147483648
       true
     end
 
@@ -215,6 +337,146 @@ module PokeApiClient
       @category = category
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] min_hits Value to be assigned
+    def min_hits=(min_hits)
+      if !min_hits.nil? && min_hits > 2147483647
+        fail ArgumentError, 'invalid value for "min_hits", must be smaller than or equal to 2147483647.'
+      end
+
+      if !min_hits.nil? && min_hits < -2147483648
+        fail ArgumentError, 'invalid value for "min_hits", must be greater than or equal to -2147483648.'
+      end
+
+      @min_hits = min_hits
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] max_hits Value to be assigned
+    def max_hits=(max_hits)
+      if !max_hits.nil? && max_hits > 2147483647
+        fail ArgumentError, 'invalid value for "max_hits", must be smaller than or equal to 2147483647.'
+      end
+
+      if !max_hits.nil? && max_hits < -2147483648
+        fail ArgumentError, 'invalid value for "max_hits", must be greater than or equal to -2147483648.'
+      end
+
+      @max_hits = max_hits
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] min_turns Value to be assigned
+    def min_turns=(min_turns)
+      if !min_turns.nil? && min_turns > 2147483647
+        fail ArgumentError, 'invalid value for "min_turns", must be smaller than or equal to 2147483647.'
+      end
+
+      if !min_turns.nil? && min_turns < -2147483648
+        fail ArgumentError, 'invalid value for "min_turns", must be greater than or equal to -2147483648.'
+      end
+
+      @min_turns = min_turns
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] max_turns Value to be assigned
+    def max_turns=(max_turns)
+      if !max_turns.nil? && max_turns > 2147483647
+        fail ArgumentError, 'invalid value for "max_turns", must be smaller than or equal to 2147483647.'
+      end
+
+      if !max_turns.nil? && max_turns < -2147483648
+        fail ArgumentError, 'invalid value for "max_turns", must be greater than or equal to -2147483648.'
+      end
+
+      @max_turns = max_turns
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] drain Value to be assigned
+    def drain=(drain)
+      if !drain.nil? && drain > 2147483647
+        fail ArgumentError, 'invalid value for "drain", must be smaller than or equal to 2147483647.'
+      end
+
+      if !drain.nil? && drain < -2147483648
+        fail ArgumentError, 'invalid value for "drain", must be greater than or equal to -2147483648.'
+      end
+
+      @drain = drain
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] healing Value to be assigned
+    def healing=(healing)
+      if !healing.nil? && healing > 2147483647
+        fail ArgumentError, 'invalid value for "healing", must be smaller than or equal to 2147483647.'
+      end
+
+      if !healing.nil? && healing < -2147483648
+        fail ArgumentError, 'invalid value for "healing", must be greater than or equal to -2147483648.'
+      end
+
+      @healing = healing
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] crit_rate Value to be assigned
+    def crit_rate=(crit_rate)
+      if !crit_rate.nil? && crit_rate > 2147483647
+        fail ArgumentError, 'invalid value for "crit_rate", must be smaller than or equal to 2147483647.'
+      end
+
+      if !crit_rate.nil? && crit_rate < -2147483648
+        fail ArgumentError, 'invalid value for "crit_rate", must be greater than or equal to -2147483648.'
+      end
+
+      @crit_rate = crit_rate
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] ailment_chance Value to be assigned
+    def ailment_chance=(ailment_chance)
+      if !ailment_chance.nil? && ailment_chance > 2147483647
+        fail ArgumentError, 'invalid value for "ailment_chance", must be smaller than or equal to 2147483647.'
+      end
+
+      if !ailment_chance.nil? && ailment_chance < -2147483648
+        fail ArgumentError, 'invalid value for "ailment_chance", must be greater than or equal to -2147483648.'
+      end
+
+      @ailment_chance = ailment_chance
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] flinch_chance Value to be assigned
+    def flinch_chance=(flinch_chance)
+      if !flinch_chance.nil? && flinch_chance > 2147483647
+        fail ArgumentError, 'invalid value for "flinch_chance", must be smaller than or equal to 2147483647.'
+      end
+
+      if !flinch_chance.nil? && flinch_chance < -2147483648
+        fail ArgumentError, 'invalid value for "flinch_chance", must be greater than or equal to -2147483648.'
+      end
+
+      @flinch_chance = flinch_chance
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] stat_chance Value to be assigned
+    def stat_chance=(stat_chance)
+      if !stat_chance.nil? && stat_chance > 2147483647
+        fail ArgumentError, 'invalid value for "stat_chance", must be smaller than or equal to 2147483647.'
+      end
+
+      if !stat_chance.nil? && stat_chance < -2147483648
+        fail ArgumentError, 'invalid value for "stat_chance", must be greater than or equal to -2147483648.'
+      end
+
+      @stat_chance = stat_chance
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -252,18 +514,20 @@ module PokeApiClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -273,10 +537,11 @@ module PokeApiClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/pokeapi_client/models/move_meta_ailment_detail.rb

@@ -1,12 +1,12 @@
 =begin
 #PokéAPI
 
-#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**(]https://github.com/phalt) and other [**PokéAPI contributors***](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.     
+#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**](https://github.com/phalt) and other [**PokéAPI contributors**](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.
 
-The version of the OpenAPI document: 2.7.0
+The version of the OpenAPI document: 2.10.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -15,12 +15,16 @@ require 'time'
 
 module PokeApiClient
   class MoveMetaAilmentDetail < ApiModelBase
+    # The identifier for this resource.
     attr_accessor :id
 
+    # The name for this resource.
     attr_accessor :name
 
+    # A list of moves that cause this ailment.
     attr_accessor :moves
 
+    # The name of this resource listed in different languages.
     attr_accessor :names
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -48,7 +52,7 @@ module PokeApiClient
       {
         :'id' => :'Integer',
         :'name' => :'String',
-        :'moves' => :'Array<AbilityDetailPokemonInnerPokemon>',
+        :'moves' => :'Array<MoveSummary>',
         :'names' => :'Array<MoveMetaAilmentName>'
       }
     end
@@ -59,6 +63,16 @@ module PokeApiClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -117,8 +131,8 @@ module PokeApiClient
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
-      if @name.to_s.length > 100
-        invalid_properties.push('invalid value for "name", the character length must be smaller than or equal to 100.')
+      if @name.to_s.length > 200
+        invalid_properties.push('invalid value for "name", the character length must be smaller than or equal to 200.')
       end
 
       if @moves.nil?
@@ -138,7 +152,7 @@ module PokeApiClient
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @id.nil?
       return false if @name.nil?
-      return false if @name.to_s.length > 100
+      return false if @name.to_s.length > 200
       return false if @moves.nil?
       return false if @names.nil?
       true
@@ -161,8 +175,8 @@ module PokeApiClient
         fail ArgumentError, 'name cannot be nil'
       end
 
-      if name.to_s.length > 100
-        fail ArgumentError, 'invalid value for "name", the character length must be smaller than or equal to 100.'
+      if name.to_s.length > 200
+        fail ArgumentError, 'invalid value for "name", the character length must be smaller than or equal to 200.'
       end
 
       @name = name
@@ -217,18 +231,20 @@ module PokeApiClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -238,10 +254,11 @@ module PokeApiClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/pokeapi_client/models/move_meta_ailment_name.rb

@@ -1,12 +1,12 @@
 =begin
 #PokéAPI
 
-#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**(]https://github.com/phalt) and other [**PokéAPI contributors***](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.     
+#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**](https://github.com/phalt) and other [**PokéAPI contributors**](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.
 
-The version of the OpenAPI document: 2.7.0
+The version of the OpenAPI document: 2.10.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -15,8 +15,10 @@ require 'time'
 
 module PokeApiClient
   class MoveMetaAilmentName < ApiModelBase
+    # The localized name for an API resource in a specific language.
     attr_accessor :name
 
+    # The language this name is in.
     attr_accessor :language
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -51,6 +53,16 @@ module PokeApiClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -89,8 +101,8 @@ module PokeApiClient
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
-      if @name.to_s.length > 100
-        invalid_properties.push('invalid value for "name", the character length must be smaller than or equal to 100.')
+      if @name.to_s.length > 200
+        invalid_properties.push('invalid value for "name", the character length must be smaller than or equal to 200.')
       end
 
       if @language.nil?
@@ -105,7 +117,7 @@ module PokeApiClient
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @name.nil?
-      return false if @name.to_s.length > 100
+      return false if @name.to_s.length > 200
       return false if @language.nil?
       true
     end
@@ -117,8 +129,8 @@ module PokeApiClient
         fail ArgumentError, 'name cannot be nil'
       end
 
-      if name.to_s.length > 100
-        fail ArgumentError, 'invalid value for "name", the character length must be smaller than or equal to 100.'
+      if name.to_s.length > 200
+        fail ArgumentError, 'invalid value for "name", the character length must be smaller than or equal to 200.'
       end
 
       @name = name
@@ -161,18 +173,20 @@ module PokeApiClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -182,10 +196,11 @@ module PokeApiClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end