DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new Pokemon::Owner methods

Browse Source
This commit is contained in:
jonisavo
2020-10-16 12:19:15 +03:00
parent 66c255546d
commit 2b2df4ae8f
7 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
View File

@@ -141,8 +141,7 @@ module PokeBattle_BattleCommon
end end
# Modify the Pokémon's properties because of the capture # Modify the Pokémon's properties because of the capture
if pbIsSnagBall?(ball) if pbIsSnagBall?(ball)
pkmn.ot = pbPlayer.name pkmn.owner = Pokemon::Owner.new_from_trainer(pbPlayer)
pkmn.trainerID = pbPlayer.id
end end
BallHandlers.onCatch(ball,self,pkmn) BallHandlers.onCatch(ball,self,pkmn)
pkmn.ballused = pbGetBallType(ball) pkmn.ballused = pbGetBallType(ball)

3
Data/Scripts/013_Overworld/002_PField_Field.rb
View File

@@ -882,8 +882,7 @@ def pbRegisterPartner(trainerid,trainername,partyid=0)
trainerobject = PokeBattle_Trainer.new(_INTL(trainer[0].name),trainerid) trainerobject = PokeBattle_Trainer.new(_INTL(trainer[0].name),trainerid)
trainerobject.setForeignID($Trainer) trainerobject.setForeignID($Trainer)
for i in trainer[2] for i in trainer[2]
i.trainerID = trainerobject.id i.owner = Pokemon::Owner.new_from_trainer(trainerobject)
i.ot = trainerobject.name
i.calcStats i.calcStats
end end
$PokemonGlobal.partner = [trainerid,trainerobject.name,trainerobject.id,trainer[2]] $PokemonGlobal.partner = [trainerid,trainerobject.name,trainerobject.id,trainer[2]]

4
Data/Scripts/017_UI/006_PScreen_Summary.rb
View File

@@ -401,7 +401,7 @@ class PokemonSummary_Scene
textpos.push([sprintf("%03d",dexnum),435,80,2,dexNumBase,dexNumShadow]) textpos.push([sprintf("%03d",dexnum),435,80,2,dexNumBase,dexNumShadow])
end end
# Write Original Trainer's name and ID number # 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([_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)]) textpos.push(["?????",435,208,2,Color.new(64,64,64),Color.new(176,176,176)])
else else
@@ -411,7 +411,7 @@ class PokemonSummary_Scene
when 0; ownerbase = Color.new(24,112,216); ownershadow = Color.new(136,168,208) 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) when 1; ownerbase = Color.new(248,56,32); ownershadow = Color.new(224,152,144)
end 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)]) textpos.push([sprintf("%05d",@pokemon.owner.public_id),435,208,2,Color.new(64,64,64),Color.new(176,176,176)])
end end
# Write Exp text OR heart gauge message (if a Shadow Pokémon) # Write Exp text OR heart gauge message (if a Shadow Pokémon)

3
Data/Scripts/017_UI/020_PScreen_EggHatching.rb
View File

@@ -192,8 +192,7 @@ end
def pbHatch(pokemon) def pbHatch(pokemon)
speciesname = pokemon.speciesName speciesname = pokemon.speciesName
pokemon.name = speciesname pokemon.name = speciesname
pokemon.trainerID = $Trainer.id pokemon.owner = Pokemon::Owner.new_from_trainer($Trainer)
pokemon.ot = $Trainer.name
pokemon.happiness = 120 pokemon.happiness = 120
pokemon.timeEggHatched = pbGetTimeNow pokemon.timeEggHatched = pbGetTimeNow
pokemon.obtainMode = 1 # hatched from egg pokemon.obtainMode = 1 # hatched from egg

4
Data/Scripts/017_UI/022_PScreen_Trading.rb
View File

@@ -170,7 +170,7 @@ class PokemonTrade_Scene
speciesname2=PBSpecies.getName(@pokemon2.species) speciesname2=PBSpecies.getName(@pokemon2.species)
pbMessageDisplay(@sprites["msgwindow"], pbMessageDisplay(@sprites["msgwindow"],
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}\\wtnp[0]", _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 } pbMessageWaitForInput(@sprites["msgwindow"],50,true) { pbUpdate }
pbPlayDecisionSE pbPlayDecisionSE
pbScene1 pbScene1
@@ -181,7 +181,7 @@ class PokemonTrade_Scene
pbScene2 pbScene2
pbMessageDisplay(@sprites["msgwindow"], pbMessageDisplay(@sprites["msgwindow"],
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}\1", _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"], pbMessageDisplay(@sprites["msgwindow"],
_INTL("Take good care of {1}.",speciesname2)) { pbUpdate } _INTL("Take good care of {1}.",speciesname2)) { pbUpdate }
end end

2
Data/Scripts/017_UI/027_PScreen_HallOfFame.rb
View File

@@ -302,7 +302,7 @@ class HallOfFame_Scene
end end
pokename+="/"+speciesname pokename+="/"+speciesname
pokename=_INTL("Egg")+"/"+_INTL("Egg") if pokemon.egg? 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) dexnumber=pokemon.egg? ? _INTL("No. ???") : _ISPRINTF("No. {1:03d}",pokemon.species)
textPositions=[ textPositions=[
[dexnumber,32,Graphics.height-80,0,BASECOLOR,SHADOWCOLOR], [dexnumber,32,Graphics.height-80,0,BASECOLOR,SHADOWCOLOR],

6
Data/Scripts/021_Debug/003_Debug_Pokemon.rb
View File

@@ -668,8 +668,8 @@ module PokemonDebugMixin
cmd = 0 cmd = 0
loop do loop do
gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.otgender] 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), 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.ot,gender,pkmn.owner.public_id,pkmn.trainerID) _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] ][pkmn.foreign?($Trainer) ? 1 : 0]
cmd = pbShowCommands(msg,[ cmd = pbShowCommands(msg,[
_INTL("Make player's"), _INTL("Make player's"),
@@ -682,7 +682,7 @@ module PokemonDebugMixin
when 0 # Make player's when 0 # Make player's
pkmn.owner = Pokemon::Owner.new_from_trainer($Trainer) pkmn.owner = Pokemon::Owner.new_from_trainer($Trainer)
when 1 # Set OT's name 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 when 2 # Set OT's gender
cmd2 = pbShowCommands(_INTL("Set OT's gender."), cmd2 = pbShowCommands(_INTL("Set OT's gender."),
[_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.otgender) [_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.otgender)