mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 21:54:58 +00:00
Fixed code assuming map metadata exists, fixed misplaced species data methods, rewrote class PokeBattle_Pokemon
This commit is contained in:
@@ -3,11 +3,85 @@
|
||||
# These will be removed in a future Essentials version.
|
||||
#===============================================================================
|
||||
|
||||
# @deprecated Use {Pokemon} instead. PokeBattle_Pokemon has been turned into an alias
|
||||
# and is slated to be removed in v20.
|
||||
class PokeBattle_Pokemon; end
|
||||
# @deprecated Use {Pokemon} instead. PokeBattle_Pokemon is slated to be removed
|
||||
# in v20.
|
||||
class PokeBattle_Pokemon
|
||||
attr_reader :name, :species, :form, :formTime, :forcedForm, :fused
|
||||
attr_reader :personalID, :exp, :hp, :status, :statusCount
|
||||
attr_reader :abilityflag, :genderflag, :natureflag, :natureOverride, :shinyflag
|
||||
attr_reader :moves, :firstmoves
|
||||
attr_reader :item, :mail
|
||||
attr_reader :iv, :ivMaxed, :ev
|
||||
attr_reader :happiness, :eggsteps, :pokerus
|
||||
attr_reader :ballused, :markings, :ribbons
|
||||
attr_reader :obtainMode, :obtainMap, :obtainText, :obtainLevel, :hatchedMap
|
||||
attr_reader :timeReceived, :timeEggHatched
|
||||
attr_reader :cool, :beauty, :cute, :smart, :tough, :sheen
|
||||
attr_reader :trainerID, :ot, :otgender, :language
|
||||
attr_reader :shadow, :heartgauge, :savedexp, :savedev, :hypermode
|
||||
attr_reader :shadowmoves, :shadowmovenum
|
||||
|
||||
PokeBattle_Pokemon = Pokemon
|
||||
def initialise
|
||||
raise "PokeBattle_Pokemon.new is deprecated. Use Pokemon.new instead."
|
||||
end
|
||||
|
||||
def self.copy(pkmn)
|
||||
owner = Pokemon::Owner.new(pkmn.trainerID, pkmn.ot, pkmn.otgender, pkmn.language)
|
||||
ret = Pokemon.new(pkmn.species, pkmn.level, owner, false)
|
||||
ret.name = pkmn.name
|
||||
ret.exp = pkmn.exp
|
||||
ret.formTime = pkmn.formTime
|
||||
ret.forcedForm = pkmn.forcedForm
|
||||
ret.hp = pkmn.hp
|
||||
ret.abilityflag = pkmn.abilityflag
|
||||
ret.genderflag = pkmn.genderflag
|
||||
ret.natureflag = pkmn.natureflag
|
||||
ret.natureOverride = pkmn.natureOverride
|
||||
ret.shinyflag = pkmn.shinyflag
|
||||
ret.item_id = pkmn.item
|
||||
ret.mail = pkmn.mail
|
||||
ret.moves = pkmn.moves
|
||||
ret.firstmoves = pkmn.firstmoves.clone
|
||||
ret.status = pkmn.status
|
||||
ret.statusCount = pkmn.statusCount
|
||||
ret.iv = pkmn.iv.clone
|
||||
ret.ev = pkmn.ev.clone
|
||||
ret.ivMaxed = pkmn.ivMaxed if pkmn.ivMaxed
|
||||
ret.happiness = pkmn.happiness
|
||||
ret.ballused = pkmn.ballused
|
||||
ret.eggsteps = pkmn.eggsteps
|
||||
ret.markings = pkmn.markings if pkmn.markings
|
||||
ret.ribbons = pkmn.ribbons.clone
|
||||
ret.pokerus = pkmn.pokerus
|
||||
ret.personalID = pkmn.personalID
|
||||
ret.obtainMode = pkmn.obtainMode
|
||||
ret.obtainMap = pkmn.obtainMap
|
||||
ret.obtainText = pkmn.obtainText
|
||||
ret.obtainLevel = pkmn.obtainLevel if pkmn.obtainLevel
|
||||
ret.hatchedMap = pkmn.hatchedMap
|
||||
ret.timeReceived = pkmn.timeReceived
|
||||
ret.timeEggHatched = pkmn.timeEggHatched
|
||||
ret.cool = pkmn.cool if pkmn.cool
|
||||
ret.beauty = pkmn.beauty if pkmn.beauty
|
||||
ret.cute = pkmn.cute if pkmn.cute
|
||||
ret.smart = pkmn.smart if pkmn.smart
|
||||
ret.tough = pkmn.tough if pkmn.tough
|
||||
ret.sheen = pkmn.sheen if pkmn.sheen
|
||||
if pkmn.fused
|
||||
ret.fused = PokeBattle_Pokemon.copy(pkmn.fused) if pkmn.fused.is_a?(PokeBattle_Pokemon)
|
||||
ret.fused = pkmn.fused if pkmn.fused.is_a?(Pokemon)
|
||||
end
|
||||
ret.shadow = pkmn.shadow
|
||||
ret.heartgauge = pkmn.heartgauge
|
||||
ret.savedexp = pkmn.savedexp
|
||||
ret.savedev = pkmn.savedev.clone
|
||||
ret.hypermode = pkmn.hypermode
|
||||
ret.shadowmoves = pkmn.shadowmoves.clone
|
||||
ret.shadowmovenum = pkmn.shadowmovenum
|
||||
# NOTE: Intentionally set last, as it recalculates stats.
|
||||
ret.formSimple = pkmn.form
|
||||
end
|
||||
end
|
||||
|
||||
class Pokemon
|
||||
# @deprecated Use {MAX_NAME_SIZE} instead. This alias is slated to be removed in v20.
|
||||
|
||||
Reference in New Issue
Block a user