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

Scents now end Hyper Mode, Time Flute now purifies a Shadow Pokémon, Shadow Pokémon now regain 80% of the Exp they missed out on, non-Scent items can't be used on Shadow Pokémon in Hyper Mode

Browse Source
This commit is contained in:
Maruno17
2022-06-13 21:09:48 +01:00
parent 732c167ad5
commit 301ecb0ac7
5 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ def pbPurify(pkmn, scene)
return if !pkmn.shadowPokemon? || pkmn.heart_gauge != 0
$stats.shadow_pokemon_purified += 1
pkmn.shadow = false
pkmn.hyper_mode = false
pkmn.giveRibbon(:NATIONAL)
scene.pbDisplay(_INTL("{1} opened the door to its heart!", pkmn.name))
old_moves = []
@@ -35,7 +36,7 @@ def pbPurify(pkmn, scene)
pkmn.saved_ev = nil
end
if pkmn.saved_exp
newexp = pkmn.growth_rate.add_exp(pkmn.exp, pkmn.saved_exp || 0)
newexp = pkmn.growth_rate.add_exp(pkmn.exp, (pkmn.saved_exp * 4 / 5) || 0)
pkmn.saved_exp = nil
newlevel = pkmn.growth_rate.level_from_exp(newexp)
curlevel = pkmn.level
@@ -232,9 +233,9 @@ end
#===============================================================================
# Shadow item effects.
#===============================================================================
def pbRaiseHappinessAndReduceHeart(pkmn, scene, multiplier)
def pbRaiseHappinessAndReduceHeart(pkmn, scene, multiplier, show_fail_message = true)
if !pkmn.shadowPokemon? || (pkmn.happiness == 255 && pkmn.heart_gauge == 0)
scene.pbDisplay(_INTL("It won't have any effect."))
scene.pbDisplay(_INTL("It won't have any effect.")) if show_fail_message
return false
end
old_gauge = pkmn.heart_gauge
@@ -254,24 +255,41 @@ def pbRaiseHappinessAndReduceHeart(pkmn, scene, multiplier)
end
ItemHandlers::UseOnPokemon.add(:JOYSCENT, proc { |item, qty, pkmn, scene|
pbRaiseHappinessAndReduceHeart(pkmn, scene, 1)
ret = false
if pkmn.hyper_mode
scene.pbDisplay(_INTL("{1} came to its senses from the {2}.", pkmn.name, GameData::Item.get(item).name))
pkmn.hyper_mode = false
ret = true
end
next pbRaiseHappinessAndReduceHeart(pkmn, scene, 1, !ret) || ret
})
ItemHandlers::UseOnPokemon.add(:EXCITESCENT, proc { |item, qty, pkmn, scene|
pbRaiseHappinessAndReduceHeart(pkmn, scene, 2)
ret = false
if pkmn.hyper_mode
scene.pbDisplay(_INTL("{1} came to its senses from the {2}.", pkmn.name, GameData::Item.get(item).name))
pkmn.hyper_mode = false
ret = true
end
next pbRaiseHappinessAndReduceHeart(pkmn, scene, 2, !ret) || ret
})
ItemHandlers::UseOnPokemon.add(:VIVIDSCENT, proc { |item, qty, pkmn, scene|
pbRaiseHappinessAndReduceHeart(pkmn, scene, 3)
ret = false
if pkmn.hyper_mode
scene.pbDisplay(_INTL("{1} came to its senses from the {2}.", pkmn.name, GameData::Item.get(item).name))
pkmn.hyper_mode = false
ret = true
end
next pbRaiseHappinessAndReduceHeart(pkmn, scene, 3, !ret) || ret
})
ItemHandlers::UseOnPokemon.add(:TIMEFLUTE, proc { |item, qty, pkmn, scene|
if !pkmn.shadowPokemon? || pkmn.heart_gauge == 0
if !pkmn.shadowPokemon? || pkmn.heart_gauge == 0 || pkmn.isSpecies?(:LUGIA)
scene.pbDisplay(_INTL("It won't have any effect."))
next false
end
pkmn.heart_gauge = 0
pkmn.check_ready_to_purify
pbPurify(pkmn, scene)
next true
})