pokeapi_client 2.1.0 → 2.2.0

data/lib/pokeapi_client/models/move_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,52 +15,76 @@ require 'time'
 
 module PokeApiClient
   class MoveDetail < ApiModelBase
+    # The identifier for this resource.
     attr_accessor :id
 
+    # The name for this resource.
     attr_accessor :name
 
+    # The percent value of how likely this move is to be successful.
     attr_accessor :accuracy
 
+    # The percent value of how likely it is this moves effect will happen.
     attr_accessor :effect_chance
 
+    # Power points. The number of times this move can be used.
     attr_accessor :pp
 
+    # A value between -8 and 8. Sets the order in which moves are executed during battle. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Priority) for greater detail.
     attr_accessor :priority
 
+    # The base power of this move, or null if it has no fixed base power.
     attr_accessor :power
 
+    # A detail of normal and super contest combos that require this move.
     attr_accessor :contest_combos
 
+    # The type of appeal this move gives a Pokémon when used in a contest.
     attr_accessor :contest_type
 
+    # The effect the move has when used in a contest.
     attr_accessor :contest_effect
 
+    # The type of damage the move inflicts on the target, e.g. physical.
     attr_accessor :damage_class
 
+    # The effect of this move listed in different languages.
     attr_accessor :effect_entries
 
+    # The list of previous effects this move has had across version groups of the games.
     attr_accessor :effect_changes
 
+    # The generation in which this move was introduced.
     attr_accessor :generation
 
+    # Metadata about this move
     attr_accessor :meta
 
+    # The name of this resource listed in different languages.
     attr_accessor :names
 
+    # A list of move resource value changes across version groups of the game.
     attr_accessor :past_values
 
+    # A list of stats this moves effects and how much it effects them.
     attr_accessor :stat_changes
 
+    # The effect the move has when used in a super contest.
     attr_accessor :super_contest_effect
 
+    # The type of target that will receive the effects of the attack.
     attr_accessor :target
 
+    # The elemental type of this move.
     attr_accessor :type
 
+    # A list of the machines that teach this move.
     attr_accessor :machines
 
+    # The flavor text of this move listed in different languages.
     attr_accessor :flavor_text_entries
 
+    # List of Pokemon that can learn the move
     attr_accessor :learned_by_pokemon
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -113,23 +137,23 @@ module PokeApiClient
         :'pp' => :'Integer',
         :'priority' => :'Integer',
         :'power' => :'Integer',
-        :'contest_combos' => :'MoveDetailContestCombos',
+        :'contest_combos' => :'MoveCombos',
         :'contest_type' => :'ContestTypeSummary',
         :'contest_effect' => :'ContestEffectSummary',
         :'damage_class' => :'MoveDamageClassSummary',
-        :'effect_entries' => :'Array<MoveChangeEffectEntriesInner>',
-        :'effect_changes' => :'Array<MoveDetailEffectChangesInner>',
+        :'effect_entries' => :'Array<MoveEffectEffectText>',
+        :'effect_changes' => :'Array<MoveEffectChange>',
         :'generation' => :'GenerationSummary',
         :'meta' => :'MoveMeta',
         :'names' => :'Array<MoveName>',
         :'past_values' => :'Array<MoveChange>',
-        :'stat_changes' => :'Array<MoveDetailStatChangesInner>',
+        :'stat_changes' => :'Array<MoveMetaStatChange>',
         :'super_contest_effect' => :'SuperContestEffectSummary',
         :'target' => :'MoveTargetSummary',
         :'type' => :'TypeSummary',
-        :'machines' => :'Array<MoveDetailMachinesInner>',
+        :'machines' => :'Array<ItemMachine>',
         :'flavor_text_entries' => :'Array<MoveFlavorText>',
-        :'learned_by_pokemon' => :'Array<AbilityDetailPokemonInnerPokemon>'
+        :'learned_by_pokemon' => :'Array<PokemonSummary>'
       }
     end
 
@@ -137,12 +161,28 @@ module PokeApiClient
     def self.openapi_nullable
       Set.new([
         :'accuracy',
+        :'effect_chance',
         :'pp',
         :'priority',
         :'power',
+        :'contest_combos',
+        :'contest_type',
+        :'contest_effect',
+        :'meta',
+        :'super_contest_effect',
       ])
     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 = {})
@@ -325,24 +365,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 @effect_chance.nil?
-        invalid_properties.push('invalid value for "effect_chance", effect_chance cannot be nil.')
+      if !@accuracy.nil? && @accuracy > 2147483647
+        invalid_properties.push('invalid value for "accuracy", must be smaller than or equal to 2147483647.')
       end
 
-      if @contest_combos.nil?
-        invalid_properties.push('invalid value for "contest_combos", contest_combos cannot be nil.')
+      if !@accuracy.nil? && @accuracy < -2147483648
+        invalid_properties.push('invalid value for "accuracy", must be greater than or equal to -2147483648.')
       end
 
-      if @contest_type.nil?
-        invalid_properties.push('invalid value for "contest_type", contest_type cannot be nil.')
+      if !@pp.nil? && @pp > 2147483647
+        invalid_properties.push('invalid value for "pp", must be smaller than or equal to 2147483647.')
       end
 
-      if @contest_effect.nil?
-        invalid_properties.push('invalid value for "contest_effect", contest_effect cannot be nil.')
+      if !@pp.nil? && @pp < -2147483648
+        invalid_properties.push('invalid value for "pp", must be greater than or equal to -2147483648.')
+      end
+
+      if !@priority.nil? && @priority > 2147483647
+        invalid_properties.push('invalid value for "priority", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@priority.nil? && @priority < -2147483648
+        invalid_properties.push('invalid value for "priority", must be greater than or equal to -2147483648.')
+      end
+
+      if !@power.nil? && @power > 2147483647
+        invalid_properties.push('invalid value for "power", must be smaller than or equal to 2147483647.')
+      end
+
+      if !@power.nil? && @power < -2147483648
+        invalid_properties.push('invalid value for "power", must be greater than or equal to -2147483648.')
       end
 
       if @damage_class.nil?
@@ -361,10 +417,6 @@ module PokeApiClient
         invalid_properties.push('invalid value for "generation", generation cannot be nil.')
       end
 
-      if @meta.nil?
-        invalid_properties.push('invalid value for "meta", meta cannot be nil.')
-      end
-
       if @names.nil?
         invalid_properties.push('invalid value for "names", names cannot be nil.')
       end
@@ -377,10 +429,6 @@ module PokeApiClient
         invalid_properties.push('invalid value for "stat_changes", stat_changes cannot be nil.')
       end
 
-      if @super_contest_effect.nil?
-        invalid_properties.push('invalid value for "super_contest_effect", super_contest_effect cannot be nil.')
-      end
-
       if @target.nil?
         invalid_properties.push('invalid value for "target", target cannot be nil.')
       end
@@ -410,20 +458,22 @@ 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 @effect_chance.nil?
-      return false if @contest_combos.nil?
-      return false if @contest_type.nil?
-      return false if @contest_effect.nil?
+      return false if @name.to_s.length > 200
+      return false if !@accuracy.nil? && @accuracy > 2147483647
+      return false if !@accuracy.nil? && @accuracy < -2147483648
+      return false if !@pp.nil? && @pp > 2147483647
+      return false if !@pp.nil? && @pp < -2147483648
+      return false if !@priority.nil? && @priority > 2147483647
+      return false if !@priority.nil? && @priority < -2147483648
+      return false if !@power.nil? && @power > 2147483647
+      return false if !@power.nil? && @power < -2147483648
       return false if @damage_class.nil?
       return false if @effect_entries.nil?
       return false if @effect_changes.nil?
       return false if @generation.nil?
-      return false if @meta.nil?
       return false if @names.nil?
       return false if @past_values.nil?
       return false if @stat_changes.nil?
-      return false if @super_contest_effect.nil?
       return false if @target.nil?
       return false if @type.nil?
       return false if @machines.nil?
@@ -449,51 +499,67 @@ 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] effect_chance Value to be assigned
-    def effect_chance=(effect_chance)
-      if effect_chance.nil?
-        fail ArgumentError, 'effect_chance cannot be nil'
+    # @param [Object] accuracy Value to be assigned
+    def accuracy=(accuracy)
+      if !accuracy.nil? && accuracy > 2147483647
+        fail ArgumentError, 'invalid value for "accuracy", must be smaller than or equal to 2147483647.'
+      end
+
+      if !accuracy.nil? && accuracy < -2147483648
+        fail ArgumentError, 'invalid value for "accuracy", must be greater than or equal to -2147483648.'
       end
 
-      @effect_chance = effect_chance
+      @accuracy = accuracy
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] contest_combos Value to be assigned
-    def contest_combos=(contest_combos)
-      if contest_combos.nil?
-        fail ArgumentError, 'contest_combos cannot be nil'
+    # @param [Object] pp Value to be assigned
+    def pp=(pp)
+      if !pp.nil? && pp > 2147483647
+        fail ArgumentError, 'invalid value for "pp", must be smaller than or equal to 2147483647.'
+      end
+
+      if !pp.nil? && pp < -2147483648
+        fail ArgumentError, 'invalid value for "pp", must be greater than or equal to -2147483648.'
       end
 
-      @contest_combos = contest_combos
+      @pp = pp
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] contest_type Value to be assigned
-    def contest_type=(contest_type)
-      if contest_type.nil?
-        fail ArgumentError, 'contest_type cannot be nil'
+    # @param [Object] priority Value to be assigned
+    def priority=(priority)
+      if !priority.nil? && priority > 2147483647
+        fail ArgumentError, 'invalid value for "priority", must be smaller than or equal to 2147483647.'
+      end
+
+      if !priority.nil? && priority < -2147483648
+        fail ArgumentError, 'invalid value for "priority", must be greater than or equal to -2147483648.'
       end
 
-      @contest_type = contest_type
+      @priority = priority
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] contest_effect Value to be assigned
-    def contest_effect=(contest_effect)
-      if contest_effect.nil?
-        fail ArgumentError, 'contest_effect cannot be nil'
+    # @param [Object] power Value to be assigned
+    def power=(power)
+      if !power.nil? && power > 2147483647
+        fail ArgumentError, 'invalid value for "power", must be smaller than or equal to 2147483647.'
       end
 
-      @contest_effect = contest_effect
+      if !power.nil? && power < -2147483648
+        fail ArgumentError, 'invalid value for "power", must be greater than or equal to -2147483648.'
+      end
+
+      @power = power
     end
 
     # Custom attribute writer method with validation
@@ -536,16 +602,6 @@ module PokeApiClient
       @generation = generation
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] meta Value to be assigned
-    def meta=(meta)
-      if meta.nil?
-        fail ArgumentError, 'meta cannot be nil'
-      end
-
-      @meta = meta
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] names Value to be assigned
     def names=(names)
@@ -576,16 +632,6 @@ module PokeApiClient
       @stat_changes = stat_changes
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] super_contest_effect Value to be assigned
-    def super_contest_effect=(super_contest_effect)
-      if super_contest_effect.nil?
-        fail ArgumentError, 'super_contest_effect cannot be nil'
-      end
-
-      @super_contest_effect = super_contest_effect
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] target Value to be assigned
     def target=(target)
@@ -685,18 +731,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)
@@ -706,10 +754,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_detail_effect_changes_inner.rb → move_effect_change.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,18 @@ require 'date'
 require 'time'
 
 module PokeApiClient
-  class MoveDetailEffectChangesInner < ApiModelBase
-    attr_accessor :effect_entries
-
+  class MoveEffectChange < ApiModelBase
+    # The version group in which the previous effect of this ability originated.
     attr_accessor :version_group
 
+    # The previous effect of this ability listed in different languages.
+    attr_accessor :effect_entries
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'effect_entries' => :'effect_entries',
-        :'version_group' => :'version_group'
+        :'version_group' => :'version_group',
+        :'effect_entries' => :'effect_entries'
       }
     end
 
@@ -40,8 +42,8 @@ module PokeApiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'effect_entries' => :'Array<MoveDetailEffectChangesInnerEffectEntriesInner>',
-        :'version_group' => :'AbilityDetailPokemonInnerPokemon'
+        :'version_group' => :'VersionGroupSummary',
+        :'effect_entries' => :'Array<MoveEffectChangeEffectText>'
       }
     end
 
@@ -51,22 +53,38 @@ 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::MoveDetailEffectChangesInner` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::MoveEffectChange` 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::MoveDetailEffectChangesInner`. 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::MoveEffectChange`. 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?(:'version_group')
+        self.version_group = attributes[:'version_group']
+      else
+        self.version_group = nil
+      end
+
       if attributes.key?(:'effect_entries')
         if (value = attributes[:'effect_entries']).is_a?(Array)
           self.effect_entries = value
@@ -74,12 +92,6 @@ module PokeApiClient
       else
         self.effect_entries = nil
       end
-
-      if attributes.key?(:'version_group')
-        self.version_group = attributes[:'version_group']
-      else
-        self.version_group = nil
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -87,14 +99,14 @@ module PokeApiClient
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @effect_entries.nil?
-        invalid_properties.push('invalid value for "effect_entries", effect_entries cannot be nil.')
-      end
-
       if @version_group.nil?
         invalid_properties.push('invalid value for "version_group", version_group cannot be nil.')
       end
 
+      if @effect_entries.nil?
+        invalid_properties.push('invalid value for "effect_entries", effect_entries cannot be nil.')
+      end
+
       invalid_properties
     end
 
@@ -102,21 +114,11 @@ module PokeApiClient
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @effect_entries.nil?
       return false if @version_group.nil?
+      return false if @effect_entries.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] effect_entries Value to be assigned
-    def effect_entries=(effect_entries)
-      if effect_entries.nil?
-        fail ArgumentError, 'effect_entries cannot be nil'
-      end
-
-      @effect_entries = effect_entries
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] version_group Value to be assigned
     def version_group=(version_group)
@@ -127,13 +129,23 @@ module PokeApiClient
       @version_group = version_group
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] effect_entries Value to be assigned
+    def effect_entries=(effect_entries)
+      if effect_entries.nil?
+        fail ArgumentError, 'effect_entries cannot be nil'
+      end
+
+      @effect_entries = effect_entries
+    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 &&
-          effect_entries == o.effect_entries &&
-          version_group == o.version_group
+          version_group == o.version_group &&
+          effect_entries == o.effect_entries
     end
 
     # @see the `==` method
@@ -145,7 +157,7 @@ module PokeApiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [effect_entries, version_group].hash
+      [version_group, effect_entries].hash
     end
 
     # Builds the object from hash
@@ -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