From ae0e13c22867e2cbf7a666af9bc8d3f2720cb494 Mon Sep 17 00:00:00 2001 From: Joni Savolainen Date: Tue, 13 Oct 2020 20:55:15 +0300 Subject: [PATCH] Deprecate Pokemon#trainerID and Pokemon#publicID --- Data/Scripts/016_Pokemon/001_Pokemon.rb | 9 --------- .../016_Pokemon/009_Pokemon_Deprecated.rb | 18 ++++++++++++++++++ Data/Scripts/017_UI/006_PScreen_Summary.rb | 2 +- Data/Scripts/017_UI/022_PScreen_Trading.rb | 9 +++------ Data/Scripts/017_UI/027_PScreen_HallOfFame.rb | 2 +- .../018_Minigames/005_PMinigame_Lottery.rb | 4 ++-- Data/Scripts/021_Debug/003_Debug_Pokemon.rb | 10 ++++------ 7 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Data/Scripts/016_Pokemon/001_Pokemon.rb b/Data/Scripts/016_Pokemon/001_Pokemon.rb index f198df348..17bf39192 100644 --- a/Data/Scripts/016_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/016_Pokemon/001_Pokemon.rb @@ -77,10 +77,6 @@ class Pokemon attr_accessor :pokerus # @return [Integer] this Pokémon's personal ID attr_accessor :personalID - # The 32-bit ID of this Pokémon's trainer. The secret ID is in the - # upper 16 bits. - # @return [Integer] the ID of this Pokémon's trainer - attr_accessor :trainerID # @return [Integer] the manner this Pokémon was obtained: # 0 (met), 1 (as egg), 2 (traded), 4 (fateful encounter) attr_accessor :obtainMode @@ -198,11 +194,6 @@ class Pokemon @owner = new_owner end - # @return [Integer] the public portion of the original trainer's ID - def publicID - return @trainerID & 0xFFFF - end - # @param trainer [PokeBattle_Trainer] the trainer to compare to the OT # @return [Boolean] whether the given trainer and this Pokémon's original trainer don't match def foreign?(trainer) diff --git a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb index 8f89c4b55..e48105942 100644 --- a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb +++ b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb @@ -12,6 +12,24 @@ PokeBattle_Pokemon = Pokemon class Pokemon # @deprecated Use {MAX_NAME_SIZE} instead. This alias is slated to be removed in vXX. MAX_POKEMON_NAME_SIZE = MAX_NAME_SIZE + + # @deprecated Use {Owner#public_id} instead. This alias is slated to be removed in vXX. + def publicID + Deprecation.warn_method('Pokemon#publicID', 'vXX', 'Pokemon::Owner#public_id') + return @owner.public_id + end + + # @deprecated Use {Owner#id} instead. This alias is slated to be removed in vXX. + def trainerID + Deprecation.warn_method('Pokemon#trainerID', 'vXX', 'Pokemon::Owner#id') + return @owner.id + end + + # @deprecated Use {Owner#id=} instead. This alias is slated to be removed in vXX. + def trainerID=(value) + Deprecation.warn_method('Pokemon#trainerID=', 'vXX', 'Pokemon::Owner#id=') + @owner.id = value + end end # (see Pokemon#initialize) diff --git a/Data/Scripts/017_UI/006_PScreen_Summary.rb b/Data/Scripts/017_UI/006_PScreen_Summary.rb index 463e1f085..1fb59bb87 100644 --- a/Data/Scripts/017_UI/006_PScreen_Summary.rb +++ b/Data/Scripts/017_UI/006_PScreen_Summary.rb @@ -412,7 +412,7 @@ class PokemonSummary_Scene when 1; ownerbase = Color.new(248,56,32); ownershadow = Color.new(224,152,144) end textpos.push([@pokemon.ot,435,176,2,ownerbase,ownershadow]) - textpos.push([sprintf("%05d",@pokemon.publicID),435,208,2,Color.new(64,64,64),Color.new(176,176,176)]) + textpos.push([sprintf("%05d",@pokemon.owner.public_id),435,208,2,Color.new(64,64,64),Color.new(176,176,176)]) end # Write Exp text OR heart gauge message (if a Shadow Pokémon) if @pokemon.shadowPokemon? diff --git a/Data/Scripts/017_UI/022_PScreen_Trading.rb b/Data/Scripts/017_UI/022_PScreen_Trading.rb index 0c9a1aec4..d95fa3950 100644 --- a/Data/Scripts/017_UI/022_PScreen_Trading.rb +++ b/Data/Scripts/017_UI/022_PScreen_Trading.rb @@ -170,7 +170,7 @@ class PokemonTrade_Scene speciesname2=PBSpecies.getName(@pokemon2.species) pbMessageDisplay(@sprites["msgwindow"], _ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}\\wtnp[0]", - @pokemon.name,@pokemon.publicID,@pokemon.ot)) { pbUpdate } + @pokemon.name,@pokemon.owner.public_id,@pokemon.ot)) { pbUpdate } pbMessageWaitForInput(@sprites["msgwindow"],50,true) { pbUpdate } pbPlayDecisionSE pbScene1 @@ -181,7 +181,7 @@ class PokemonTrade_Scene pbScene2 pbMessageDisplay(@sprites["msgwindow"], _ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}\1", - @pokemon2.name,@pokemon2.publicID,@pokemon2.ot)) { pbUpdate } + @pokemon2.name,@pokemon2.owner.public_id,@pokemon2.ot)) { pbUpdate } pbMessageDisplay(@sprites["msgwindow"], _INTL("Take good care of {1}.",speciesname2)) { pbUpdate } end @@ -195,10 +195,7 @@ def pbStartTrade(pokemonIndex,newpoke,nickname,trainerName,trainerGender=0) opponent.setForeignID($Trainer) yourPokemon = nil; resetmoves = true if newpoke.is_a?(Pokemon) - newpoke.trainerID = opponent.id - newpoke.ot = opponent.name - newpoke.otgender = opponent.gender - newpoke.language = opponent.language + newpoke.owner = Pokemon::Owner.new_from_trainer(opponent) yourPokemon = newpoke resetmoves = false else diff --git a/Data/Scripts/017_UI/027_PScreen_HallOfFame.rb b/Data/Scripts/017_UI/027_PScreen_HallOfFame.rb index de153a00f..e66d59684 100644 --- a/Data/Scripts/017_UI/027_PScreen_HallOfFame.rb +++ b/Data/Scripts/017_UI/027_PScreen_HallOfFame.rb @@ -302,7 +302,7 @@ class HallOfFame_Scene end pokename+="/"+speciesname pokename=_INTL("Egg")+"/"+_INTL("Egg") if pokemon.egg? - idno=(pokemon.ot=="" || pokemon.egg?) ? "?????" : sprintf("%05d",pokemon.publicID) + idno=(pokemon.ot=="" || pokemon.egg?) ? "?????" : sprintf("%05d",pokemon.owner.public_id) dexnumber=pokemon.egg? ? _INTL("No. ???") : _ISPRINTF("No. {1:03d}",pokemon.species) textPositions=[ [dexnumber,32,Graphics.height-80,0,BASECOLOR,SHADOWCOLOR], diff --git a/Data/Scripts/018_Minigames/005_PMinigame_Lottery.rb b/Data/Scripts/018_Minigames/005_PMinigame_Lottery.rb index 485940fbd..7c397cc62 100644 --- a/Data/Scripts/018_Minigames/005_PMinigame_Lottery.rb +++ b/Data/Scripts/018_Minigames/005_PMinigame_Lottery.rb @@ -18,7 +18,7 @@ def pbLottery(winnum,nameVar=2,positionVar=3,matchedVar=4) winmatched=0 for i in $Trainer.party thismatched=0 - id=i.publicID + id=i.owner.public_id for j in 0...5 if (id/(10**j))%10 == (winnum/(10**j))%10 thismatched+=1 @@ -34,7 +34,7 @@ def pbLottery(winnum,nameVar=2,positionVar=3,matchedVar=4) end pbEachPokemon { |poke,_box| thismatched=0 - id=poke.publicID + id=poke.owner.public_id for j in 0...5 if (id/(10**j))%10 == (winnum/(10**j))%10 thismatched+=1 diff --git a/Data/Scripts/021_Debug/003_Debug_Pokemon.rb b/Data/Scripts/021_Debug/003_Debug_Pokemon.rb index 2ec78f7e0..31deae790 100644 --- a/Data/Scripts/021_Debug/003_Debug_Pokemon.rb +++ b/Data/Scripts/021_Debug/003_Debug_Pokemon.rb @@ -668,8 +668,8 @@ module PokemonDebugMixin cmd = 0 loop do gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.otgender] - msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.ot,gender,pkmn.publicID,pkmn.trainerID), - _INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.ot,gender,pkmn.publicID,pkmn.trainerID) + msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.ot,gender,pkmn.owner.public_id,pkmn.trainerID), + _INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.ot,gender,pkmn.owner.public_id,pkmn.trainerID) ][pkmn.foreign?($Trainer) ? 1 : 0] cmd = pbShowCommands(msg,[ _INTL("Make player's"), @@ -680,9 +680,7 @@ module PokemonDebugMixin break if cmd<0 case cmd when 0 # Make player's - pkmn.trainerID = $Trainer.id - pkmn.ot = $Trainer.name - pkmn.otgender = $Trainer.gender + pkmn.owner = Pokemon::Owner.new_from_trainer($Trainer) when 1 # Set OT's name pkmn.ot = pbEnterPlayerName(_INTL("{1}'s OT's name?",pkmn.name),1,MAX_PLAYER_NAME_SIZE) when 2 # Set OT's gender @@ -694,7 +692,7 @@ module PokemonDebugMixin when 4 # Set foreign ID params = ChooseNumberParams.new params.setRange(0,65535) - params.setDefaultValue(pkmn.publicID) + params.setDefaultValue(pkmn.owner.public_id) val = pbMessageChooseNumber( _INTL("Set the new ID (max. 65535)."),params) { pbUpdate } pkmn.trainerID = val