pokeapi_client 2.1.0 → 2.2.0

data/lib/pokeapi_client/models/{pokemon_detail_cries.rb → pokemon_cries.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
 
@@ -14,9 +14,11 @@ require 'date'
 require 'time'
 
 module PokeApiClient
-  class PokemonDetailCries < ApiModelBase
+  class PokemonCries < ApiModelBase
+    # The latest depiction of this Pokémon's cry.
     attr_accessor :latest
 
+    # The legacy depiction of this Pokémon's cry.
     attr_accessor :legacy
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -48,21 +50,33 @@ module PokeApiClient
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'latest',
+        :'legacy'
       ])
     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 = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::PokemonDetailCries` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::PokemonCries` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!acceptable_attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PokeApiClient::PokemonDetailCries`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PokeApiClient::PokemonCries`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -85,14 +99,6 @@ module PokeApiClient
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @latest.nil?
-        invalid_properties.push('invalid value for "latest", latest cannot be nil.')
-      end
-
-      if @legacy.nil?
-        invalid_properties.push('invalid value for "legacy", legacy cannot be nil.')
-      end
-
       invalid_properties
     end
 
@@ -100,31 +106,9 @@ module PokeApiClient
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @latest.nil?
-      return false if @legacy.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] latest Value to be assigned
-    def latest=(latest)
-      if latest.nil?
-        fail ArgumentError, 'latest cannot be nil'
-      end
-
-      @latest = latest
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] legacy Value to be assigned
-    def legacy=(legacy)
-      if legacy.nil?
-        fail ArgumentError, 'legacy cannot be nil'
-      end
-
-      @legacy = legacy
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -152,18 +136,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)
@@ -173,10 +159,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/pokemon_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,44 +15,67 @@ require 'time'
 
 module PokeApiClient
   class PokemonDetail < ApiModelBase
+    # The identifier for this resource.
     attr_accessor :id
 
+    # The name for this resource.
     attr_accessor :name
 
+    # The base experience gained for defeating this Pokémon.
     attr_accessor :base_experience
 
+    # The height of this Pokémon in decimetres.
     attr_accessor :height
 
+    # Set for exactly one Pokémon used as the default for each species.
     attr_accessor :is_default
 
+    # Order for sorting. Almost national order, except families are grouped together.
     attr_accessor :order
 
+    # The weight of this Pokémon in hectograms.
     attr_accessor :weight
 
+    # A list of abilities this Pokémon could potentially have.
     attr_accessor :abilities
 
+    # A list of details showing abilities this pokémon had in previous generations
     attr_accessor :past_abilities
 
+    # A list of forms this Pokémon can take on.
     attr_accessor :forms
 
+    # A list of game indices relevent to Pokémon item by generation.
     attr_accessor :game_indices
 
+    # A list of items this Pokémon may be holding when encountered.
     attr_accessor :held_items
 
+    # A link to a list of location areas, as well as encounter details pertaining to specific versions.
     attr_accessor :location_area_encounters
 
+    # A list of moves along with learn methods and level details pertaining to specific version groups.
     attr_accessor :moves
 
+    # The species this Pokémon belongs to.
     attr_accessor :species
 
+    # A set of sprites used to depict this Pokémon in the game. A visual representation of the various sprites can be found at <a href='https://github.com/PokeAPI/sprites#sprites'>PokeAPI/sprites</a>
     attr_accessor :sprites
 
+    # A set of cries used to depict this Pokémon in the game. A visual representation of the various cries can be found at <a href='https://github.com/PokeAPI/cries#cries'>PokeAPI/cries</a>
     attr_accessor :cries
 
+    # A list of base stat values for this Pokémon.
     attr_accessor :stats
 
+    # A list of details showing stats this pokémon had in previous generations
+    attr_accessor :past_stats
+
+    # A list of details showing types this Pokémon has.
     attr_accessor :types
 
+    # A list of details showing types this pokémon had in previous generations
     attr_accessor :past_types
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -76,6 +99,7 @@ module PokeApiClient
         :'sprites' => :'sprites',
         :'cries' => :'cries',
         :'stats' => :'stats',
+        :'past_stats' => :'past_stats',
         :'types' => :'types',
         :'past_types' => :'past_types'
       }
@@ -101,19 +125,20 @@ module PokeApiClient
         :'is_default' => :'Boolean',
         :'order' => :'Integer',
         :'weight' => :'Integer',
-        :'abilities' => :'Array<PokemonDetailAbilitiesInner>',
-        :'past_abilities' => :'Array<PokemonDetailPastAbilitiesInner>',
+        :'abilities' => :'Array<PokemonAbility>',
+        :'past_abilities' => :'Array<PokemonPastAbility>',
         :'forms' => :'Array<PokemonFormSummary>',
         :'game_indices' => :'Array<PokemonGameIndex>',
-        :'held_items' => :'PokemonDetailHeldItems',
+        :'held_items' => :'Array<PokemonHeldItemSummary>',
         :'location_area_encounters' => :'String',
-        :'moves' => :'Array<PokemonDetailMovesInner>',
+        :'moves' => :'Array<PokemonMove>',
         :'species' => :'PokemonSpeciesSummary',
-        :'sprites' => :'PokemonDetailSprites',
-        :'cries' => :'PokemonDetailCries',
+        :'sprites' => :'PokemonSprites',
+        :'cries' => :'PokemonCries',
         :'stats' => :'Array<PokemonStat>',
-        :'types' => :'Array<PokemonDetailTypesInner>',
-        :'past_types' => :'Array<PokemonDetailPastTypesInner>'
+        :'past_stats' => :'Array<PokemonPastStat>',
+        :'types' => :'Array<PokemonType>',
+        :'past_types' => :'Array<PokemonPastType>'
       }
     end
 
@@ -127,6 +152,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 = {})
@@ -208,7 +243,9 @@ module PokeApiClient
       end
 
       if attributes.key?(:'held_items')
-        self.held_items = attributes[:'held_items']
+        if (value = attributes[:'held_items']).is_a?(Array)
+          self.held_items = value
+        end
       else
         self.held_items = nil
       end
@@ -253,6 +290,14 @@ module PokeApiClient
         self.stats = nil
       end
 
+      if attributes.key?(:'past_stats')
+        if (value = attributes[:'past_stats']).is_a?(Array)
+          self.past_stats = value
+        end
+      else
+        self.past_stats = nil
+      end
+
       if attributes.key?(:'types')
         if (value = attributes[:'types']).is_a?(Array)
           self.types = value
@@ -283,8 +328,40 @@ 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 !@base_experience.nil? && @base_experience > 2147483647
+        invalid_properties.push('invalid value for "base_experience", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@base_experience.nil? && @base_experience < -2147483648
+        invalid_properties.push('invalid value for "base_experience", must be greater than or equal to -2147483648.')
+      end
+
+      if !@height.nil? && @height > 2147483647
+        invalid_properties.push('invalid value for "height", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@height.nil? && @height < -2147483648
+        invalid_properties.push('invalid value for "height", must be greater than or equal to -2147483648.')
+      end
+
+      if !@order.nil? && @order > 2147483647
+        invalid_properties.push('invalid value for "order", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@order.nil? && @order < -2147483648
+        invalid_properties.push('invalid value for "order", must be greater than or equal to -2147483648.')
+      end
+
+      if !@weight.nil? && @weight > 2147483647
+        invalid_properties.push('invalid value for "weight", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@weight.nil? && @weight < -2147483648
+        invalid_properties.push('invalid value for "weight", must be greater than or equal to -2147483648.')
       end
 
       if @abilities.nil?
@@ -331,6 +408,10 @@ module PokeApiClient
         invalid_properties.push('invalid value for "stats", stats cannot be nil.')
       end
 
+      if @past_stats.nil?
+        invalid_properties.push('invalid value for "past_stats", past_stats cannot be nil.')
+      end
+
       if @types.nil?
         invalid_properties.push('invalid value for "types", types cannot be nil.')
       end
@@ -348,7 +429,15 @@ 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 !@base_experience.nil? && @base_experience > 2147483647
+      return false if !@base_experience.nil? && @base_experience < -2147483648
+      return false if !@height.nil? && @height > 2147483647
+      return false if !@height.nil? && @height < -2147483648
+      return false if !@order.nil? && @order > 2147483647
+      return false if !@order.nil? && @order < -2147483648
+      return false if !@weight.nil? && @weight > 2147483647
+      return false if !@weight.nil? && @weight < -2147483648
       return false if @abilities.nil?
       return false if @past_abilities.nil?
       return false if @forms.nil?
@@ -360,6 +449,7 @@ module PokeApiClient
       return false if @sprites.nil?
       return false if @cries.nil?
       return false if @stats.nil?
+      return false if @past_stats.nil?
       return false if @types.nil?
       return false if @past_types.nil?
       true
@@ -382,13 +472,69 @@ 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
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] base_experience Value to be assigned
+    def base_experience=(base_experience)
+      if !base_experience.nil? && base_experience > 2147483647
+        fail ArgumentError, 'invalid value for "base_experience", must be smaller than or equal to 2147483647.'
+      end
+
+      if !base_experience.nil? && base_experience < -2147483648
+        fail ArgumentError, 'invalid value for "base_experience", must be greater than or equal to -2147483648.'
+      end
+
+      @base_experience = base_experience
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] height Value to be assigned
+    def height=(height)
+      if !height.nil? && height > 2147483647
+        fail ArgumentError, 'invalid value for "height", must be smaller than or equal to 2147483647.'
+      end
+
+      if !height.nil? && height < -2147483648
+        fail ArgumentError, 'invalid value for "height", must be greater than or equal to -2147483648.'
+      end
+
+      @height = height
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] order Value to be assigned
+    def order=(order)
+      if !order.nil? && order > 2147483647
+        fail ArgumentError, 'invalid value for "order", must be smaller than or equal to 2147483647.'
+      end
+
+      if !order.nil? && order < -2147483648
+        fail ArgumentError, 'invalid value for "order", must be greater than or equal to -2147483648.'
+      end
+
+      @order = order
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] weight Value to be assigned
+    def weight=(weight)
+      if !weight.nil? && weight > 2147483647
+        fail ArgumentError, 'invalid value for "weight", must be smaller than or equal to 2147483647.'
+      end
+
+      if !weight.nil? && weight < -2147483648
+        fail ArgumentError, 'invalid value for "weight", must be greater than or equal to -2147483648.'
+      end
+
+      @weight = weight
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] abilities Value to be assigned
     def abilities=(abilities)
@@ -499,6 +645,16 @@ module PokeApiClient
       @stats = stats
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] past_stats Value to be assigned
+    def past_stats=(past_stats)
+      if past_stats.nil?
+        fail ArgumentError, 'past_stats cannot be nil'
+      end
+
+      @past_stats = past_stats
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] types Value to be assigned
     def types=(types)
@@ -542,6 +698,7 @@ module PokeApiClient
           sprites == o.sprites &&
           cries == o.cries &&
           stats == o.stats &&
+          past_stats == o.past_stats &&
           types == o.types &&
           past_types == o.past_types
     end
@@ -555,7 +712,7 @@ module PokeApiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, name, base_experience, height, is_default, order, weight, abilities, past_abilities, forms, game_indices, held_items, location_area_encounters, moves, species, sprites, cries, stats, types, past_types].hash
+      [id, name, base_experience, height, is_default, order, weight, abilities, past_abilities, forms, game_indices, held_items, location_area_encounters, moves, species, sprites, cries, stats, past_stats, types, past_types].hash
     end
 
     # Builds the object from hash
@@ -564,18 +721,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)
@@ -585,10 +744,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/pokemon_dex_entry.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 PokemonDexEntry < ApiModelBase
+    # The index number within the Pokédex.
     attr_accessor :entry_number
 
+    # The Pokédex the referenced Pokémon species can be found in.
     attr_accessor :pokedex
 
     # 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 = {})
@@ -152,18 +164,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)
@@ -173,10 +187,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