pokeapi_client 2.1.0 → 2.2.0

data/lib/pokeapi_client/models/location_area_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,18 +15,25 @@ require 'time'
 
 module PokeApiClient
   class LocationAreaDetail < ApiModelBase
+    # The identifier for this resource.
     attr_accessor :id
 
+    # The name for this resource.
     attr_accessor :name
 
+    # The internal id of an API resource within game data.
     attr_accessor :game_index
 
+    # A list of methods in which Pokémon may be encountered in this area and how likely the method will occur depending on the version of the game.
     attr_accessor :encounter_method_rates
 
+    # The region this location area can be found in.
     attr_accessor :location
 
+    # The name of this resource listed in different languages.
     attr_accessor :names
 
+    # A list of Pokémon that can be encountered in this area along with version specific details about the encounter.
     attr_accessor :pokemon_encounters
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -58,10 +65,10 @@ module PokeApiClient
         :'id' => :'Integer',
         :'name' => :'String',
         :'game_index' => :'Integer',
-        :'encounter_method_rates' => :'Array<LocationAreaDetailEncounterMethodRatesInner>',
+        :'encounter_method_rates' => :'Array<LocationAreaEncounterRate>',
         :'location' => :'LocationSummary',
         :'names' => :'Array<LocationAreaName>',
-        :'pokemon_encounters' => :'Array<LocationAreaDetailPokemonEncountersInner>'
+        :'pokemon_encounters' => :'Array<LocationAreaPokemonEncounter>'
       }
     end
 
@@ -71,6 +78,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 = {})
@@ -149,14 +166,22 @@ 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 @game_index.nil?
         invalid_properties.push('invalid value for "game_index", game_index cannot be nil.')
       end
 
+      if @game_index > 2147483647
+        invalid_properties.push('invalid value for "game_index", must be smaller than or equal to 2147483647.')
+      end
+
+      if @game_index < -2147483648
+        invalid_properties.push('invalid value for "game_index", must be greater than or equal to -2147483648.')
+      end
+
       if @encounter_method_rates.nil?
         invalid_properties.push('invalid value for "encounter_method_rates", encounter_method_rates cannot be nil.')
       end
@@ -182,8 +207,10 @@ 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 @game_index.nil?
+      return false if @game_index > 2147483647
+      return false if @game_index < -2147483648
       return false if @encounter_method_rates.nil?
       return false if @location.nil?
       return false if @names.nil?
@@ -208,8 +235,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
@@ -222,6 +249,14 @@ module PokeApiClient
         fail ArgumentError, 'game_index cannot be nil'
       end
 
+      if game_index > 2147483647
+        fail ArgumentError, 'invalid value for "game_index", must be smaller than or equal to 2147483647.'
+      end
+
+      if game_index < -2147483648
+        fail ArgumentError, 'invalid value for "game_index", must be greater than or equal to -2147483648.'
+      end
+
       @game_index = game_index
     end
 
@@ -297,18 +332,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)
@@ -318,10 +355,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/location_area_encounter_detail.rb

@@ -0,0 +1,269 @@
+=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 LocationAreaEncounterDetail < ApiModelBase
+    # The lowest level the Pokémon could be encountered at.
+    attr_accessor :min_level
+
+    # The highest level the Pokémon could be encountered at.
+    attr_accessor :max_level
+
+    # Percent chance that this encounter will occur.
+    attr_accessor :chance
+
+    # The method by which this encounter happens.
+    attr_accessor :method
+
+    # A list of condition values that must be in effect for this encounter to occur.
+    attr_accessor :condition_values
+
+    # Additional properties of the encountered Pokémon, or null if unspecified.
+    attr_accessor :pokemon_details
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'min_level' => :'min_level',
+        :'max_level' => :'max_level',
+        :'chance' => :'chance',
+        :'method' => :'method',
+        :'condition_values' => :'condition_values',
+        :'pokemon_details' => :'pokemon_details'
+      }
+    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
+      {
+        :'min_level' => :'Integer',
+        :'max_level' => :'Integer',
+        :'chance' => :'Integer',
+        :'method' => :'EncounterMethodSummary',
+        :'condition_values' => :'Array<EncounterConditionValueSummary>',
+        :'pokemon_details' => :'EncounterPokemonDetail'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'pokemon_details'
+      ])
+    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::LocationAreaEncounterDetail` 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::LocationAreaEncounterDetail`. 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?(:'min_level')
+        self.min_level = attributes[:'min_level']
+      else
+        self.min_level = nil
+      end
+
+      if attributes.key?(:'max_level')
+        self.max_level = attributes[:'max_level']
+      else
+        self.max_level = nil
+      end
+
+      if attributes.key?(:'chance')
+        self.chance = attributes[:'chance']
+      else
+        self.chance = 0
+      end
+
+      if attributes.key?(:'method')
+        self.method = attributes[:'method']
+      end
+
+      if attributes.key?(:'condition_values')
+        if (value = attributes[:'condition_values']).is_a?(Array)
+          self.condition_values = value
+        end
+      else
+        self.condition_values = nil
+      end
+
+      if attributes.key?(:'pokemon_details')
+        self.pokemon_details = attributes[:'pokemon_details']
+      else
+        self.pokemon_details = nil
+      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
+      if @min_level.nil?
+        invalid_properties.push('invalid value for "min_level", min_level cannot be nil.')
+      end
+
+      if @max_level.nil?
+        invalid_properties.push('invalid value for "max_level", max_level cannot be nil.')
+      end
+
+      if @condition_values.nil?
+        invalid_properties.push('invalid value for "condition_values", condition_values cannot be nil.')
+      end
+
+      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'
+      return false if @min_level.nil?
+      return false if @max_level.nil?
+      return false if @condition_values.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] min_level Value to be assigned
+    def min_level=(min_level)
+      if min_level.nil?
+        fail ArgumentError, 'min_level cannot be nil'
+      end
+
+      @min_level = min_level
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] max_level Value to be assigned
+    def max_level=(max_level)
+      if max_level.nil?
+        fail ArgumentError, 'max_level cannot be nil'
+      end
+
+      @max_level = max_level
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] condition_values Value to be assigned
+    def condition_values=(condition_values)
+      if condition_values.nil?
+        fail ArgumentError, 'condition_values cannot be nil'
+      end
+
+      @condition_values = condition_values
+    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 &&
+          min_level == o.min_level &&
+          max_level == o.max_level &&
+          chance == o.chance &&
+          method == o.method &&
+          condition_values == o.condition_values &&
+          pokemon_details == o.pokemon_details
+    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
+      [min_level, max_level, chance, method, condition_values, pokemon_details].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/{location_area_detail_encounter_method_rates_inner.rb → location_area_encounter_rate.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 LocationAreaDetailEncounterMethodRatesInner < ApiModelBase
+  class LocationAreaEncounterRate < ApiModelBase
+    # The method in which Pokémon may be encountered in an area..
     attr_accessor :encounter_method
 
+    # The chance of the encounter to occur on a version of the game.
     attr_accessor :version_details
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -40,8 +42,8 @@ module PokeApiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'encounter_method' => :'AbilityDetailPokemonInnerPokemon',
-        :'version_details' => :'Array<LocationAreaDetailEncounterMethodRatesInnerVersionDetailsInner>'
+        :'encounter_method' => :'EncounterMethodSummary',
+        :'version_details' => :'Array<LocationAreaEncounterVersionDetail>'
       }
     end
 
@@ -51,18 +53,28 @@ 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::LocationAreaDetailEncounterMethodRatesInner` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::LocationAreaEncounterRate` 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::LocationAreaDetailEncounterMethodRatesInner`. 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::LocationAreaEncounterRate`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -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/{location_area_detail_encounter_method_rates_inner_version_details_inner.rb → location_area_encounter_version_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
 
@@ -14,9 +14,11 @@ require 'date'
 require 'time'
 
 module PokeApiClient
-  class LocationAreaDetailEncounterMethodRatesInnerVersionDetailsInner < ApiModelBase
+  class LocationAreaEncounterVersionDetail < ApiModelBase
+    # The chance of an encounter to occur.
     attr_accessor :rate
 
+    # The version of the game in which the encounter can occur with the given chance.
     attr_accessor :version
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -41,7 +43,7 @@ module PokeApiClient
     def self.openapi_types
       {
         :'rate' => :'Integer',
-        :'version' => :'AbilityDetailPokemonInnerPokemon'
+        :'version' => :'VersionSummary'
       }
     end
 
@@ -51,18 +53,28 @@ 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::LocationAreaDetailEncounterMethodRatesInnerVersionDetailsInner` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::LocationAreaEncounterVersionDetail` 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::LocationAreaDetailEncounterMethodRatesInnerVersionDetailsInner`. 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::LocationAreaEncounterVersionDetail`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -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