pokeapi_client 2.1.0 → 2.2.0

data/lib/pokeapi_client/models/pokemon_shape_summary.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 PokemonShapeSummary < ApiModelBase
+    # The name of the referenced resource.
     attr_accessor :name
 
+    # The URL of the referenced resource.
     attr_accessor :url
 
     # 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 @url.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 @url.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
 

data/lib/pokeapi_client/models/pokemon_species_description.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 PokemonSpeciesDescription < ApiModelBase
+    # The localized description for an API resource in a specific language.
     attr_accessor :description
 
+    # 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 = {})
@@ -83,8 +95,8 @@ module PokeApiClient
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if !@description.nil? && @description.to_s.length > 1000
-        invalid_properties.push('invalid value for "description", the character length must be smaller than or equal to 1000.')
+      if !@description.nil? && @description.to_s.length > 2000
+        invalid_properties.push('invalid value for "description", the character length must be smaller than or equal to 2000.')
       end
 
       if @language.nil?
@@ -98,7 +110,7 @@ module PokeApiClient
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if !@description.nil? && @description.to_s.length > 1000
+      return false if !@description.nil? && @description.to_s.length > 2000
       return false if @language.nil?
       true
     end
@@ -110,8 +122,8 @@ module PokeApiClient
         fail ArgumentError, 'description cannot be nil'
       end
 
-      if description.to_s.length > 1000
-        fail ArgumentError, 'invalid value for "description", the character length must be smaller than or equal to 1000.'
+      if description.to_s.length > 2000
+        fail ArgumentError, 'invalid value for "description", the character length must be smaller than or equal to 2000.'
       end
 
       @description = description
@@ -154,18 +166,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)
@@ -175,10 +189,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_species_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,58 +15,85 @@ require 'time'
 
 module PokeApiClient
   class PokemonSpeciesDetail < ApiModelBase
+    # The identifier for this resource.
     attr_accessor :id
 
+    # The name for this resource.
     attr_accessor :name
 
+    # The order in which species should be sorted. Based on National Dex order, except families are grouped together and sorted by stage.
     attr_accessor :order
 
+    # The chance of this Pokémon being female, in eighths; or -1 for genderless.
     attr_accessor :gender_rate
 
+    # The base capture rate; up to 255. The higher the number, the easier the catch.
     attr_accessor :capture_rate
 
+    # The happiness when caught by a normal Pokéball; up to 255. The higher the number, the happier the Pokémon.
     attr_accessor :base_happiness
 
+    # Whether or not this is a baby Pokémon.
     attr_accessor :is_baby
 
+    # Whether or not this is a legendary Pokémon.
     attr_accessor :is_legendary
 
+    # Whether or not this is a mythical Pokémon.
     attr_accessor :is_mythical
 
+    # Initial hatch counter: one must walk Y × (hatch_counter + 1) steps before this Pokémon's egg hatches, unless utilizing bonuses like Flame Body's. Y varies per generation. In Generations II, III, and VII, Egg cycles are 256 steps long. In Generation IV, Egg cycles are 255 steps long. In Pokémon Brilliant Diamond and Shining Pearl, Egg cycles are also 255 steps long, but are shorter on special dates. In Generations V and VI, Egg cycles are 257 steps long. In Pokémon Sword and Shield, and in Pokémon Scarlet and Violet, Egg cycles are 128 steps long.
     attr_accessor :hatch_counter
 
+    # Whether or not this Pokémon has visual gender differences.
     attr_accessor :has_gender_differences
 
+    # Whether or not this Pokémon has multiple forms and can switch between them.
     attr_accessor :forms_switchable
 
+    # The rate at which this Pokémon species gains levels.
     attr_accessor :growth_rate
 
+    # A list of Pokedexes and the indexes reserved within them for this Pokémon species.
     attr_accessor :pokedex_numbers
 
+    # A list of egg groups this Pokémon species is a member of.
     attr_accessor :egg_groups
 
+    # The color of this Pokémon for Pokédex search.
     attr_accessor :color
 
+    # The shape of this Pokémon for Pokédex search.
     attr_accessor :shape
 
+    # The Pokémon species that evolves into this Pokemon_species.
     attr_accessor :evolves_from_species
 
+    # The evolution chain this Pokémon species is a member of.
     attr_accessor :evolution_chain
 
+    # The habitat this Pokémon species can be encountered in.
     attr_accessor :habitat
 
+    # The generation this Pokémon species was introduced in.
     attr_accessor :generation
 
+    # The name of this resource listed in different languages.
     attr_accessor :names
 
+    # A list of encounters that can be had with this Pokémon species in pal park.
     attr_accessor :pal_park_encounters
 
+    # Descriptions of different forms Pokémon take on within the Pokémon species.
     attr_accessor :form_descriptions
 
+    # A list of flavor text entries for this Pokémon species.
     attr_accessor :flavor_text_entries
 
+    # The genus of this Pokémon species listed in multiple languages.
     attr_accessor :genera
 
+    # A list of the Pokémon that exist within this Pokémon species.
     attr_accessor :varieties
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -129,19 +156,19 @@ module PokeApiClient
         :'forms_switchable' => :'Boolean',
         :'growth_rate' => :'GrowthRateSummary',
         :'pokedex_numbers' => :'Array<PokemonDexEntry>',
-        :'egg_groups' => :'Array<AbilityDetailPokemonInnerPokemon>',
+        :'egg_groups' => :'Array<EggGroupSummary>',
         :'color' => :'PokemonColorSummary',
         :'shape' => :'PokemonShapeSummary',
         :'evolves_from_species' => :'PokemonSpeciesSummary',
         :'evolution_chain' => :'EvolutionChainSummary',
         :'habitat' => :'PokemonHabitatSummary',
         :'generation' => :'GenerationSummary',
-        :'names' => :'Array<PokemonFormDetailFormNamesInner>',
-        :'pal_park_encounters' => :'Array<PokemonSpeciesDetailPalParkEncountersInner>',
+        :'names' => :'Array<PokemonSpeciesName>',
+        :'pal_park_encounters' => :'Array<PokemonSpeciesPalParkEncounter>',
         :'form_descriptions' => :'Array<PokemonSpeciesDescription>',
         :'flavor_text_entries' => :'Array<PokemonSpeciesFlavorText>',
-        :'genera' => :'Array<PokemonSpeciesDetailGeneraInner>',
-        :'varieties' => :'Array<PokemonSpeciesDetailVarietiesInner>'
+        :'genera' => :'Array<PokemonSpeciesGenus>',
+        :'varieties' => :'Array<PokemonSpeciesVariety>'
       }
     end
 
@@ -153,9 +180,21 @@ module PokeApiClient
         :'capture_rate',
         :'base_happiness',
         :'hatch_counter',
+        :'evolves_from_species',
+        :'habitat',
       ])
     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 = {})
@@ -344,8 +383,48 @@ 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 !@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 !@gender_rate.nil? && @gender_rate > 2147483647
+        invalid_properties.push('invalid value for "gender_rate", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@gender_rate.nil? && @gender_rate < -2147483648
+        invalid_properties.push('invalid value for "gender_rate", must be greater than or equal to -2147483648.')
+      end
+
+      if !@capture_rate.nil? && @capture_rate > 2147483647
+        invalid_properties.push('invalid value for "capture_rate", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@capture_rate.nil? && @capture_rate < -2147483648
+        invalid_properties.push('invalid value for "capture_rate", must be greater than or equal to -2147483648.')
+      end
+
+      if !@base_happiness.nil? && @base_happiness > 2147483647
+        invalid_properties.push('invalid value for "base_happiness", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@base_happiness.nil? && @base_happiness < -2147483648
+        invalid_properties.push('invalid value for "base_happiness", must be greater than or equal to -2147483648.')
+      end
+
+      if !@hatch_counter.nil? && @hatch_counter > 2147483647
+        invalid_properties.push('invalid value for "hatch_counter", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@hatch_counter.nil? && @hatch_counter < -2147483648
+        invalid_properties.push('invalid value for "hatch_counter", must be greater than or equal to -2147483648.')
       end
 
       if @growth_rate.nil?
@@ -368,18 +447,10 @@ module PokeApiClient
         invalid_properties.push('invalid value for "shape", shape cannot be nil.')
       end
 
-      if @evolves_from_species.nil?
-        invalid_properties.push('invalid value for "evolves_from_species", evolves_from_species cannot be nil.')
-      end
-
       if @evolution_chain.nil?
         invalid_properties.push('invalid value for "evolution_chain", evolution_chain cannot be nil.')
       end
 
-      if @habitat.nil?
-        invalid_properties.push('invalid value for "habitat", habitat cannot be nil.')
-      end
-
       if @generation.nil?
         invalid_properties.push('invalid value for "generation", generation cannot be nil.')
       end
@@ -417,15 +488,23 @@ 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 !@order.nil? && @order > 2147483647
+      return false if !@order.nil? && @order < -2147483648
+      return false if !@gender_rate.nil? && @gender_rate > 2147483647
+      return false if !@gender_rate.nil? && @gender_rate < -2147483648
+      return false if !@capture_rate.nil? && @capture_rate > 2147483647
+      return false if !@capture_rate.nil? && @capture_rate < -2147483648
+      return false if !@base_happiness.nil? && @base_happiness > 2147483647
+      return false if !@base_happiness.nil? && @base_happiness < -2147483648
+      return false if !@hatch_counter.nil? && @hatch_counter > 2147483647
+      return false if !@hatch_counter.nil? && @hatch_counter < -2147483648
       return false if @growth_rate.nil?
       return false if @pokedex_numbers.nil?
       return false if @egg_groups.nil?
       return false if @color.nil?
       return false if @shape.nil?
-      return false if @evolves_from_species.nil?
       return false if @evolution_chain.nil?
-      return false if @habitat.nil?
       return false if @generation.nil?
       return false if @names.nil?
       return false if @pal_park_encounters.nil?
@@ -453,13 +532,83 @@ 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] 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] gender_rate Value to be assigned
+    def gender_rate=(gender_rate)
+      if !gender_rate.nil? && gender_rate > 2147483647
+        fail ArgumentError, 'invalid value for "gender_rate", must be smaller than or equal to 2147483647.'
+      end
+
+      if !gender_rate.nil? && gender_rate < -2147483648
+        fail ArgumentError, 'invalid value for "gender_rate", must be greater than or equal to -2147483648.'
+      end
+
+      @gender_rate = gender_rate
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] capture_rate Value to be assigned
+    def capture_rate=(capture_rate)
+      if !capture_rate.nil? && capture_rate > 2147483647
+        fail ArgumentError, 'invalid value for "capture_rate", must be smaller than or equal to 2147483647.'
+      end
+
+      if !capture_rate.nil? && capture_rate < -2147483648
+        fail ArgumentError, 'invalid value for "capture_rate", must be greater than or equal to -2147483648.'
+      end
+
+      @capture_rate = capture_rate
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] base_happiness Value to be assigned
+    def base_happiness=(base_happiness)
+      if !base_happiness.nil? && base_happiness > 2147483647
+        fail ArgumentError, 'invalid value for "base_happiness", must be smaller than or equal to 2147483647.'
+      end
+
+      if !base_happiness.nil? && base_happiness < -2147483648
+        fail ArgumentError, 'invalid value for "base_happiness", must be greater than or equal to -2147483648.'
+      end
+
+      @base_happiness = base_happiness
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] hatch_counter Value to be assigned
+    def hatch_counter=(hatch_counter)
+      if !hatch_counter.nil? && hatch_counter > 2147483647
+        fail ArgumentError, 'invalid value for "hatch_counter", must be smaller than or equal to 2147483647.'
+      end
+
+      if !hatch_counter.nil? && hatch_counter < -2147483648
+        fail ArgumentError, 'invalid value for "hatch_counter", must be greater than or equal to -2147483648.'
+      end
+
+      @hatch_counter = hatch_counter
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] growth_rate Value to be assigned
     def growth_rate=(growth_rate)
@@ -510,16 +659,6 @@ module PokeApiClient
       @shape = shape
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] evolves_from_species Value to be assigned
-    def evolves_from_species=(evolves_from_species)
-      if evolves_from_species.nil?
-        fail ArgumentError, 'evolves_from_species cannot be nil'
-      end
-
-      @evolves_from_species = evolves_from_species
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] evolution_chain Value to be assigned
     def evolution_chain=(evolution_chain)
@@ -530,16 +669,6 @@ module PokeApiClient
       @evolution_chain = evolution_chain
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] habitat Value to be assigned
-    def habitat=(habitat)
-      if habitat.nil?
-        fail ArgumentError, 'habitat cannot be nil'
-      end
-
-      @habitat = habitat
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] generation Value to be assigned
     def generation=(generation)
@@ -662,18 +791,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)
@@ -683,10 +814,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