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

Rename PokeBattle_Pokemon to Pokemon

Browse Source 
Deprecate PokeBattle_Pokemon and pbNewPkmn
This commit is contained in:
jonisavo
2020-09-20 20:55:51 +03:00
parent 4517a16537
commit c73906170a
25 changed files with 102 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,7 +362,7 @@ class PokemonSummary_Scene
dexNumShadow = (@pokemon.shiny?) ? Color.new(224,152,144) : Color.new(176,176,176)
# If a Shadow Pokémon, draw the heart gauge area and bar
if @pokemon.shadowPokemon?
shadowfract = @pokemon.heartgauge*1.0/PokeBattle_Pokemon::HEARTGAUGESIZE
shadowfract = @pokemon.heartgauge*1.0/Pokemon::HEARTGAUGESIZE
imagepos = [
["Graphics/Pictures/Summary/overlay_shadow",224,240],
["Graphics/Pictures/Summary/overlay_shadowbar",242,280,0,0,(shadowfract*248).floor,-1]

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

@@ -109,7 +109,7 @@ class PokemonEggHatch_Scene
if pbConfirmMessage(
_INTL("Would you like to nickname the newly hatched {1}?",@pokemon.name)) { update }
nickname=pbEnterPokemonName(_INTL("{1}'s nickname?",@pokemon.name),
0,PokeBattle_Pokemon::MAX_POKEMON_NAME_SIZE,"",@pokemon,true)
0, Pokemon::MAX_POKEMON_NAME_SIZE, "", @pokemon, true)
@pokemon.name=nickname if nickname!=""
@nicknamed=true
end
@@ -209,7 +209,7 @@ def pbHatch(pokemon)
pbMessage(_INTL("{1} hatched from the Egg!",speciesname))
if pbConfirmMessage(_INTL("Would you like to nickname the newly hatched {1}?",speciesname))
nickname = pbEnterPokemonName(_INTL("{1}'s nickname?",speciesname),
0,PokeBattle_Pokemon::MAX_POKEMON_NAME_SIZE,"",pokemon)
0, Pokemon::MAX_POKEMON_NAME_SIZE, "", pokemon)
pokemon.name = nickname if nickname!=""
end
end

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

@@ -194,7 +194,7 @@ def pbStartTrade(pokemonIndex,newpoke,nickname,trainerName,trainerGender=0)
opponent = PokeBattle_Trainer.new(trainerName,trainerGender)
opponent.setForeignID($Trainer)
yourPokemon = nil; resetmoves = true
if newpoke.is_a?(PokeBattle_Pokemon)
if newpoke.is_a?(Pokemon)
newpoke.trainerID = opponent.id
newpoke.ot = opponent.name
newpoke.otgender = opponent.gender

12
Data/Scripts/017_UI/024_PScreen_PurifyChamber.rb
View File

@@ -676,9 +676,9 @@ class Window_PurifyChamberSets < Window_DrawableCommand
Color.new(0,0,256),@chamber[index].tempo,PurifyChamber.maximumTempo())
end
if @chamber.getShadow(index)
pbDrawGauge(self.contents,Rect.new(rect.x+16,rect.y+18,48,8),
Color.new(192,0,256),@chamber.getShadow(index).heartgauge,
PokeBattle_Pokemon::HEARTGAUGESIZE)
pbDrawGauge(self.contents, Rect.new(rect.x+16,rect.y+18,48,8),
Color.new(192,0,256), @chamber.getShadow(index).heartgauge,
Pokemon::HEARTGAUGESIZE)
end
pbDrawTextPositions(self.contents,textpos)
end
@@ -964,9 +964,9 @@ class PurifyChamberSetView < SpriteWrapper
textpos.push([_INTL("FLOW"),2+@info.bitmap.width/2,24,0,
Color.new(248,248,248),Color.new(128,128,128)])
# draw heart gauge
pbDrawGauge(@info.bitmap,Rect.new(@info.bitmap.width*3/4,8,@info.bitmap.width*1/4,8),
Color.new(192,0,256),pkmn.heartgauge,
PokeBattle_Pokemon::HEARTGAUGESIZE)
pbDrawGauge(@info.bitmap, Rect.new(@info.bitmap.width*3/4,8,@info.bitmap.width*1/4,8),
Color.new(192,0,256), pkmn.heartgauge,
Pokemon::HEARTGAUGESIZE)
# draw flow gauge
pbDrawGauge(@info.bitmap,Rect.new(@info.bitmap.width*3/4,24+8,@info.bitmap.width*1/4,8),
Color.new(0,0,248),@chamber.chamberFlow(@set),6)