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

Merge branch 'pr/43' into refactor

Browse Source
This commit is contained in:
Maruno17
2020-10-17 14:40:52 +01:00
parent 7640736188 47a1cb5462
commit a6d21de0c1
18 changed files with 201 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -401,18 +401,18 @@ 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
ownerbase = Color.new(64,64,64)
ownershadow = Color.new(176,176,176)
case @pokemon.otgender
case @pokemon.owner.gender
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([sprintf("%05d",@pokemon.publicID),435,208,2,Color.new(64,64,64),Color.new(176,176,176)])
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)
if @pokemon.shadowPokemon?

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

@@ -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

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

@@ -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.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.publicID,@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
@@ -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

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

@@ -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.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],