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

Fixed crash when using a Shadow Pokémon Scent or Time Flute item

Browse Source
This commit is contained in:
Maruno17
2022-06-05 14:48:54 +01:00
parent d383d69cf4
commit 038be447fb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb
View File

@@ -253,25 +253,25 @@ def pbRaiseHappinessAndReduceHeart(pkmn, scene, multiplier)
return true
end
ItemHandlers::UseOnPokemon.add(:JOYSCENT, proc { |item, pokemon, scene|
pbRaiseHappinessAndReduceHeart(pokemon, scene, 1)
ItemHandlers::UseOnPokemon.add(:JOYSCENT, proc { |item, qty, pkmn, scene|
pbRaiseHappinessAndReduceHeart(pkmn, scene, 1)
})
ItemHandlers::UseOnPokemon.add(:EXCITESCENT, proc { |item, pokemon, scene|
pbRaiseHappinessAndReduceHeart(pokemon, scene, 2)
ItemHandlers::UseOnPokemon.add(:EXCITESCENT, proc { |item, qty, pkmn, scene|
pbRaiseHappinessAndReduceHeart(pkmn, scene, 2)
})
ItemHandlers::UseOnPokemon.add(:VIVIDSCENT, proc { |item, pokemon, scene|
pbRaiseHappinessAndReduceHeart(pokemon, scene, 3)
ItemHandlers::UseOnPokemon.add(:VIVIDSCENT, proc { |item, qty, pkmn, scene|
pbRaiseHappinessAndReduceHeart(pkmn, scene, 3)
})
ItemHandlers::UseOnPokemon.add(:TIMEFLUTE, proc { |item, pokemon, scene|
if !pokemon.shadowPokemon? || pokemon.heart_gauge == 0
ItemHandlers::UseOnPokemon.add(:TIMEFLUTE, proc { |item, qty, pkmn, scene|
if !pkmn.shadowPokemon? || pkmn.heart_gauge == 0
scene.pbDisplay(_INTL("It won't have any effect."))
next false
end
pokemon.heart_gauge = 0
pokemon.check_ready_to_purify
pkmn.heart_gauge = 0
pkmn.check_ready_to_purify
next true
})