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

Fixed party screen not animating while using Rare Candy, and party icons refreshing late after Rare Candy evolution

Browse Source
This commit is contained in:
Maruno17
2020-09-12 01:13:05 +01:00
parent 7f522cee43
commit 32ac1d995c
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/015_Items/001_PItem_Items.rb
View File

@@ -366,7 +366,11 @@ def pbChangeLevel(pkmn,newlevel,scene)
pkmn.changeHappiness("vitamin") pkmn.changeHappiness("vitamin")
pkmn.calcStats pkmn.calcStats
scene.pbRefresh scene.pbRefresh
if scene.is_a?(PokemonPartyScreen)
scene.pbDisplay(_INTL("{1} grew to Lv. {2}!",pkmn.name,pkmn.level))
else
pbMessage(_INTL("{1} grew to Lv. {2}!",pkmn.name,pkmn.level)) pbMessage(_INTL("{1} grew to Lv. {2}!",pkmn.name,pkmn.level))
end
attackdiff = pkmn.attack-attackdiff attackdiff = pkmn.attack-attackdiff
defensediff = pkmn.defense-defensediff defensediff = pkmn.defense-defensediff
speeddiff = pkmn.speed-speeddiff speeddiff = pkmn.speed-speeddiff
@@ -374,14 +378,14 @@ def pbChangeLevel(pkmn,newlevel,scene)
spdefdiff = pkmn.spdef-spdefdiff spdefdiff = pkmn.spdef-spdefdiff
totalhpdiff = pkmn.totalhp-totalhpdiff totalhpdiff = pkmn.totalhp-totalhpdiff
pbTopRightWindow(_INTL("Max. HP<r>+{1}\r\nAttack<r>+{2}\r\nDefense<r>+{3}\r\nSp. Atk<r>+{4}\r\nSp. Def<r>+{5}\r\nSpeed<r>+{6}", pbTopRightWindow(_INTL("Max. HP<r>+{1}\r\nAttack<r>+{2}\r\nDefense<r>+{3}\r\nSp. Atk<r>+{4}\r\nSp. Def<r>+{5}\r\nSpeed<r>+{6}",
totalhpdiff,attackdiff,defensediff,spatkdiff,spdefdiff,speeddiff)) totalhpdiff,attackdiff,defensediff,spatkdiff,spdefdiff,speeddiff),scene)
pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}", pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
pkmn.totalhp,pkmn.attack,pkmn.defense,pkmn.spatk,pkmn.spdef,pkmn.speed)) pkmn.totalhp,pkmn.attack,pkmn.defense,pkmn.spatk,pkmn.spdef,pkmn.speed),scene)
# Learn new moves upon level up # Learn new moves upon level up
movelist = pkmn.getMoveList movelist = pkmn.getMoveList
for i in movelist for i in movelist
next if i[0]!=pkmn.level next if i[0]!=pkmn.level
pbLearnMove(pkmn,i[1],true) pbLearnMove(pkmn,i[1],true) { scene.pbUpdate }
end end
# Check for evolution # Check for evolution
newspecies = pbCheckEvolution(pkmn) newspecies = pbCheckEvolution(pkmn)
@@ -391,12 +395,13 @@ def pbChangeLevel(pkmn,newlevel,scene)
evo.pbStartScreen(pkmn,newspecies) evo.pbStartScreen(pkmn,newspecies)
evo.pbEvolution evo.pbEvolution
evo.pbEndScreen evo.pbEndScreen
scene.pbRefresh if scene.is_a?(PokemonPartyScreen)
} }
end end
end end
end end
def pbTopRightWindow(text) def pbTopRightWindow(text, scene = nil)
window = Window_AdvancedTextPokemon.new(text) window = Window_AdvancedTextPokemon.new(text)
window.width = 198 window.width = 198
window.x = Graphics.width-window.width window.x = Graphics.width-window.width
@@ -407,6 +412,7 @@ def pbTopRightWindow(text)
Graphics.update Graphics.update
Input.update Input.update
window.update window.update
scene.pbUpdate if scene
break if Input.trigger?(Input::C) break if Input.trigger?(Input::C)
end end
window.dispose window.dispose

5
Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb
View File

@@ -163,8 +163,9 @@ class RelicStoneScreen
@scene.pbConfirm(x) @scene.pbConfirm(x)
end end
def pbRefresh def pbUpdate; end
end
def pbRefresh; end
def pbStartScreen(pokemon) def pbStartScreen(pokemon)
@scene.pbStartScene(pokemon) @scene.pbStartScene(pokemon)