mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-10 14:44:58 +00:00
Revert rename of Pokemon#publicID & #obtainLevel
These changes should be done in their own branch.
This commit is contained in:
@@ -109,20 +109,20 @@ class Pokemon
|
|||||||
attr_writer :cool,:beauty,:cute,:smart,:tough,:sheen
|
attr_writer :cool,:beauty,:cute,:smart,:tough,:sheen
|
||||||
|
|
||||||
# Max total IVs
|
# Max total IVs
|
||||||
IV_STAT_LIMIT = 31
|
IV_STAT_LIMIT = 31
|
||||||
# Max total EVs
|
# Max total EVs
|
||||||
EV_LIMIT = 510
|
EV_LIMIT = 510
|
||||||
# Max EVs that a single stat can have
|
# Max EVs that a single stat can have
|
||||||
EV_STAT_LIMIT = 252
|
EV_STAT_LIMIT = 252
|
||||||
# Maximum length a Pokémon's nickname can be
|
# Maximum length a Pokémon's nickname can be
|
||||||
MAX_NAME_SIZE = 10
|
MAX_NAME_SIZE = 10
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
# Ownership, obtained information
|
# Ownership, obtained information
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
|
||||||
# @return [Integer] the public portion of the original trainer's ID
|
# @return [Integer] the public portion of the original trainer's ID
|
||||||
def public_id
|
def publicID
|
||||||
return @trainerID & 0xFFFF
|
return @trainerID & 0xFFFF
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -131,6 +131,7 @@ class Pokemon
|
|||||||
def foreign?(trainer)
|
def foreign?(trainer)
|
||||||
return @trainerID != trainer.id || @ot != trainer.name
|
return @trainerID != trainer.id || @ot != trainer.name
|
||||||
end
|
end
|
||||||
|
alias isForeign? foreign?
|
||||||
|
|
||||||
# @return [0, 1, 2] the gender of this Pokémon original trainer (0 = male, 1 = female, 2 = unknown)
|
# @return [0, 1, 2] the gender of this Pokémon original trainer (0 = male, 1 = female, 2 = unknown)
|
||||||
def otgender
|
def otgender
|
||||||
@@ -138,7 +139,7 @@ class Pokemon
|
|||||||
end
|
end
|
||||||
|
|
||||||
# @return [Integer] this Pokémon's level when it was obtained
|
# @return [Integer] this Pokémon's level when it was obtained
|
||||||
def obtain_level
|
def obtainLevel
|
||||||
return @obtainLevel || 0
|
return @obtainLevel || 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -12,9 +12,6 @@ PokeBattle_Pokemon = Pokemon
|
|||||||
class Pokemon
|
class Pokemon
|
||||||
# @deprecated Use {MAX_NAME_SIZE} instead. This alias is slated to be removed in vXX.
|
# @deprecated Use {MAX_NAME_SIZE} instead. This alias is slated to be removed in vXX.
|
||||||
MAX_POKEMON_NAME_SIZE = MAX_NAME_SIZE
|
MAX_POKEMON_NAME_SIZE = MAX_NAME_SIZE
|
||||||
|
|
||||||
deprecated_instance_method_alias :publicID, :public_id, 'vXX'
|
|
||||||
deprecated_instance_method_alias :isForeign?, :foreign?, 'vXX'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# (see Pokemon#initialize)
|
# (see Pokemon#initialize)
|
||||||
|
|||||||
Reference in New Issue
Block a user