From 2b2df4ae8f953282b935e494469f78ce5f6371c2 Mon Sep 17 00:00:00 2001 From: jonisavo Date: Fri, 16 Oct 2020 12:19:15 +0300 Subject: [PATCH] Use new Pokemon::Owner methods --- .../012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb | 3 +-- Data/Scripts/013_Overworld/002_PField_Field.rb | 3 +-- Data/Scripts/017_UI/006_PScreen_Summary.rb | 4 ++-- Data/Scripts/017_UI/020_PScreen_EggHatching.rb | 3 +-- Data/Scripts/017_UI/022_PScreen_Trading.rb | 4 ++-- Data/Scripts/017_UI/027_PScreen_HallOfFame.rb | 2 +- Data/Scripts/021_Debug/003_Debug_Pokemon.rb | 6 +++--- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb b/Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb index 7abda421a..0db7ea9b4 100644 --- a/Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb +++ b/Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb @@ -141,8 +141,7 @@ module PokeBattle_BattleCommon end # Modify the Pokémon's properties because of the capture if pbIsSnagBall?(ball) - pkmn.ot = pbPlayer.name - pkmn.trainerID = pbPlayer.id + pkmn.owner = Pokemon::Owner.new_from_trainer(pbPlayer) end BallHandlers.onCatch(ball,self,pkmn) pkmn.ballused = pbGetBallType(ball) diff --git a/Data/Scripts/013_Overworld/002_PField_Field.rb b/Data/Scripts/013_Overworld/002_PField_Field.rb index 344f38f16..7e23bf01c 100644 --- a/Data/Scripts/013_Overworld/002_PField_Field.rb +++ b/Data/Scripts/013_Overworld/002_PField_Field.rb @@ -882,8 +882,7 @@ def pbRegisterPartner(trainerid,trainername,partyid=0) trainerobject = PokeBattle_Trainer.new(_INTL(trainer[0].name),trainerid) trainerobject.setForeignID($Trainer) for i in trainer[2] - i.trainerID = trainerobject.id - i.ot = trainerobject.name + i.owner = Pokemon::Owner.new_from_trainer(trainerobject) i.calcStats end $PokemonGlobal.partner = [trainerid,trainerobject.name,trainerobject.id,trainer[2]] diff --git a/Data/Scripts/017_UI/006_PScreen_Summary.rb b/Data/Scripts/017_UI/006_PScreen_Summary.rb index 1fb59bb87..63e3c2cfc 100644 --- a/Data/Scripts/017_UI/006_PScreen_Summary.rb +++ b/Data/Scripts/017_UI/006_PScreen_Summary.rb @@ -401,7 +401,7 @@ class PokemonSummary_Scene textpos.push([sprintf("%03d",dexnum),435,80,2,dexNumBase,dexNumShadow]) end # Write Original Trainer's name and ID number - if @pokemon.ot=="" + if @pokemon.owner.name.empty? textpos.push([_INTL("RENTAL"),435,176,2,Color.new(64,64,64),Color.new(176,176,176)]) textpos.push(["?????",435,208,2,Color.new(64,64,64),Color.new(176,176,176)]) else @@ -411,7 +411,7 @@ class PokemonSummary_Scene when 0; ownerbase = Color.new(24,112,216); ownershadow = Color.new(136,168,208) 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([@pokemon.owner.name,435,176,2,ownerbase,ownershadow]) 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) diff --git a/Data/Scripts/017_UI/020_PScreen_EggHatching.rb b/Data/Scripts/017_UI/020_PScreen_EggHatching.rb index 9cc898fbb..6da810e3b 100644 --- a/Data/Scripts/017_UI/020_PScreen_EggHatching.rb +++ b/Data/Scripts/017_UI/020_PScreen_EggHatching.rb @@ -192,8 +192,7 @@ end def pbHatch(pokemon) speciesname = pokemon.speciesName pokemon.name = speciesname - pokemon.trainerID = $Trainer.id - pokemon.ot = $Trainer.name + pokemon.owner = Pokemon::Owner.new_from_trainer($Trainer) pokemon.happiness = 120 pokemon.timeEggHatched = pbGetTimeNow pokemon.obtainMode = 1 # hatched from egg diff --git a/Data/Scripts/017_UI/022_PScreen_Trading.rb b/Data/Scripts/017_UI/022_PScreen_Trading.rb index d95fa3950..a3ee6ada9 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.owner.public_id,@pokemon.ot)) { pbUpdate } + @pokemon.name,@pokemon.owner.public_id,@pokemon.owner.name)) { 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.owner.public_id,@pokemon2.ot)) { pbUpdate } + @pokemon2.name,@pokemon2.owner.public_id,@pokemon2.owner.name)) { pbUpdate } pbMessageDisplay(@sprites["msgwindow"], _INTL("Take good care of {1}.",speciesname2)) { pbUpdate } end diff --git a/Data/Scripts/017_UI/027_PScreen_HallOfFame.rb b/Data/Scripts/017_UI/027_PScreen_HallOfFame.rb index e66d59684..8859ef734 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.owner.public_id) + idno=(pokemon.owner.name.empty? || 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/021_Debug/003_Debug_Pokemon.rb b/Data/Scripts/021_Debug/003_Debug_Pokemon.rb index 31deae790..0ac50d75d 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.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) + msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id), + _INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id) ][pkmn.foreign?($Trainer) ? 1 : 0] cmd = pbShowCommands(msg,[ _INTL("Make player's"), @@ -682,7 +682,7 @@ module PokemonDebugMixin when 0 # Make player's 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) + pkmn.owner.name = pbEnterPlayerName(_INTL("{1}'s OT's name?",pkmn.name),1,MAX_PLAYER_NAME_SIZE) when 2 # Set OT's gender cmd2 = pbShowCommands(_INTL("Set OT's gender."), [_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.otgender)