pokeapi_client 2.1.0 → 2.2.0

data/lib/pokeapi_client/models/pokemon_sprites.rb

@@ -0,0 +1,277 @@
+=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.
+
+The version of the OpenAPI document: 2.10.0
+Contact: blah+oapicf@cliffano.com
+Generated by: https://openapi-generator.tech
+Generator version: 7.26.0
+
+=end
+
+require 'date'
+require 'time'
+
+module PokeApiClient
+  class PokemonSprites < ApiModelBase
+    # The default depiction of this Pokémon from the front in battle.
+    attr_accessor :front_default
+
+    # The shiny depiction of this Pokémon from the front in battle.
+    attr_accessor :front_shiny
+
+    # The female depiction of this Pokémon from the front in battle.
+    attr_accessor :front_female
+
+    # The shiny female depiction of this Pokémon from the front in battle.
+    attr_accessor :front_shiny_female
+
+    # The default depiction of this Pokémon from the back in battle.
+    attr_accessor :back_default
+
+    # The shiny depiction of this Pokémon from the back in battle.
+    attr_accessor :back_shiny
+
+    # The female depiction of this Pokémon from the back in battle.
+    attr_accessor :back_female
+
+    # The shiny female depiction of this Pokémon from the back in battle.
+    attr_accessor :back_shiny_female
+
+    # Additional sprites grouped by source, such as official artwork, HOME, and Showdown. Available keys vary by resource.
+    attr_accessor :other
+
+    # Sprites grouped by generation and game. Available keys vary by resource.
+    attr_accessor :versions
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'front_default' => :'front_default',
+        :'front_shiny' => :'front_shiny',
+        :'front_female' => :'front_female',
+        :'front_shiny_female' => :'front_shiny_female',
+        :'back_default' => :'back_default',
+        :'back_shiny' => :'back_shiny',
+        :'back_female' => :'back_female',
+        :'back_shiny_female' => :'back_shiny_female',
+        :'other' => :'other',
+        :'versions' => :'versions'
+      }
+    end
+
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'front_default' => :'String',
+        :'front_shiny' => :'String',
+        :'front_female' => :'String',
+        :'front_shiny_female' => :'String',
+        :'back_default' => :'String',
+        :'back_shiny' => :'String',
+        :'back_female' => :'String',
+        :'back_shiny_female' => :'String',
+        :'other' => :'PokemonSpritesOther',
+        :'versions' => :'Hash<String, Hash<String, Object>>'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'front_default',
+        :'front_shiny',
+        :'front_female',
+        :'front_shiny_female',
+        :'back_default',
+        :'back_shiny',
+        :'back_female',
+        :'back_shiny_female',
+      ])
+    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::PokemonSprites` 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::PokemonSprites`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      if attributes.key?(:'front_default')
+        self.front_default = attributes[:'front_default']
+      else
+        self.front_default = nil
+      end
+
+      if attributes.key?(:'front_shiny')
+        self.front_shiny = attributes[:'front_shiny']
+      else
+        self.front_shiny = nil
+      end
+
+      if attributes.key?(:'front_female')
+        self.front_female = attributes[:'front_female']
+      else
+        self.front_female = nil
+      end
+
+      if attributes.key?(:'front_shiny_female')
+        self.front_shiny_female = attributes[:'front_shiny_female']
+      else
+        self.front_shiny_female = nil
+      end
+
+      if attributes.key?(:'back_default')
+        self.back_default = attributes[:'back_default']
+      else
+        self.back_default = nil
+      end
+
+      if attributes.key?(:'back_shiny')
+        self.back_shiny = attributes[:'back_shiny']
+      else
+        self.back_shiny = nil
+      end
+
+      if attributes.key?(:'back_female')
+        self.back_female = attributes[:'back_female']
+      else
+        self.back_female = nil
+      end
+
+      if attributes.key?(:'back_shiny_female')
+        self.back_shiny_female = attributes[:'back_shiny_female']
+      else
+        self.back_shiny_female = nil
+      end
+
+      if attributes.key?(:'other')
+        self.other = attributes[:'other']
+      end
+
+      if attributes.key?(:'versions')
+        if (value = attributes[:'versions']).is_a?(Hash)
+          self.versions = value
+        end
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
+      invalid_properties = Array.new
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          front_default == o.front_default &&
+          front_shiny == o.front_shiny &&
+          front_female == o.front_female &&
+          front_shiny_female == o.front_shiny_female &&
+          back_default == o.back_default &&
+          back_shiny == o.back_shiny &&
+          back_female == o.back_female &&
+          back_shiny_female == o.back_shiny_female &&
+          other == o.other &&
+          versions == o.versions
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [front_default, front_shiny, front_female, front_shiny_female, back_default, back_shiny, back_female, back_shiny_female, other, versions].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    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 = {}
+      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[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
+          end
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
+        end
+      end
+      new(transformed_hash)
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      # 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.acceptable_openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+  end
+
+end

data/lib/pokeapi_client/models/{move_detail_machines_inner.rb → pokemon_sprites_other.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,16 +14,26 @@ require 'date'
 require 'time'
 
 module PokeApiClient
-  class MoveDetailMachinesInner < ApiModelBase
-    attr_accessor :machine
+  class PokemonSpritesOther < ApiModelBase
+    # Pokémon Dream World artwork URLs.
+    attr_accessor :dream_world
 
-    attr_accessor :version_group
+    # Pokémon HOME sprite URLs.
+    attr_accessor :home
+
+    # Pokémon Showdown sprite URLs.
+    attr_accessor :showdown
+
+    # Official Pokémon artwork URLs, including shiny artwork and version-specific variants.
+    attr_accessor :official_artwork
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'machine' => :'machine',
-        :'version_group' => :'version_group'
+        :'dream_world' => :'dream_world',
+        :'home' => :'home',
+        :'showdown' => :'showdown',
+        :'official_artwork' => :'official-artwork'
       }
     end
 
@@ -40,8 +50,10 @@ module PokeApiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'machine' => :'MoveDetailMachinesInnerMachine',
-        :'version_group' => :'AbilityDetailPokemonInnerPokemon'
+        :'dream_world' => :'PokemonSpritesOtherDreamWorld',
+        :'home' => :'PokemonSpritesOtherHome',
+        :'showdown' => :'PokemonSpritesOtherShowdown',
+        :'official_artwork' => :'PokemonSpritesOtherOfficialArtwork'
       }
     end
 
@@ -51,32 +63,46 @@ 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 = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::MoveDetailMachinesInner` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::PokemonSpritesOther` 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::MoveDetailMachinesInner`. 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::PokemonSpritesOther`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'machine')
-        self.machine = attributes[:'machine']
-      else
-        self.machine = nil
+      if attributes.key?(:'dream_world')
+        self.dream_world = attributes[:'dream_world']
       end
 
-      if attributes.key?(:'version_group')
-        self.version_group = attributes[:'version_group']
-      else
-        self.version_group = nil
+      if attributes.key?(:'home')
+        self.home = attributes[:'home']
+      end
+
+      if attributes.key?(:'showdown')
+        self.showdown = attributes[:'showdown']
+      end
+
+      if attributes.key?(:'official_artwork')
+        self.official_artwork = attributes[:'official_artwork']
       end
     end
 
@@ -85,14 +111,6 @@ module PokeApiClient
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @machine.nil?
-        invalid_properties.push('invalid value for "machine", machine cannot be nil.')
-      end
-
-      if @version_group.nil?
-        invalid_properties.push('invalid value for "version_group", version_group cannot be nil.')
-      end
-
       invalid_properties
     end
 
@@ -100,38 +118,18 @@ module PokeApiClient
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @machine.nil?
-      return false if @version_group.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] machine Value to be assigned
-    def machine=(machine)
-      if machine.nil?
-        fail ArgumentError, 'machine cannot be nil'
-      end
-
-      @machine = machine
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] version_group Value to be assigned
-    def version_group=(version_group)
-      if version_group.nil?
-        fail ArgumentError, 'version_group cannot be nil'
-      end
-
-      @version_group = version_group
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          machine == o.machine &&
-          version_group == o.version_group
+          dream_world == o.dream_world &&
+          home == o.home &&
+          showdown == o.showdown &&
+          official_artwork == o.official_artwork
     end
 
     # @see the `==` method
@@ -143,7 +141,7 @@ module PokeApiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [machine, version_group].hash
+      [dream_world, home, showdown, official_artwork].hash
     end
 
     # Builds the object from hash
@@ -152,18 +150,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 +173,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_sprites.rb → pokemon_sprites_other_dream_world.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,13 +14,18 @@ require 'date'
 require 'time'
 
 module PokeApiClient
-  class PokemonDetailSprites < ApiModelBase
+  class PokemonSpritesOtherDreamWorld < ApiModelBase
+    # The URL of the default Pokémon Dream World front image, or null if unavailable.
     attr_accessor :front_default
 
+    # The URL of the female Pokémon Dream World front image, or null if unavailable.
+    attr_accessor :front_female
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'front_default' => :'front_default'
+        :'front_default' => :'front_default',
+        :'front_female' => :'front_female'
       }
     end
 
@@ -37,34 +42,55 @@ module PokeApiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'front_default' => :'String'
+        :'front_default' => :'String',
+        :'front_female' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'front_default',
+        :'front_female'
       ])
     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::PokemonDetailSprites` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::PokemonSpritesOtherDreamWorld` 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::PokemonDetailSprites`. 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::PokemonSpritesOtherDreamWorld`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
       if attributes.key?(:'front_default')
         self.front_default = attributes[:'front_default']
+      else
+        self.front_default = nil
+      end
+
+      if attributes.key?(:'front_female')
+        self.front_female = attributes[:'front_female']
+      else
+        self.front_female = nil
       end
     end
 
@@ -88,7 +114,8 @@ module PokeApiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          front_default == o.front_default
+          front_default == o.front_default &&
+          front_female == o.front_female
     end
 
     # @see the `==` method
@@ -100,7 +127,7 @@ module PokeApiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [front_default].hash
+      [front_default, front_female].hash
     end
 
     # Builds the object from hash
@@ -109,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)
@@ -130,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