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

Improvement to Scent items' in-battle effects

Browse Source
This commit is contained in:
Maruno17
2022-06-13 21:23:51 +01:00
parent 301ecb0ac7
commit 8d4015c903
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,7 +294,7 @@ ItemHandlers::UseOnPokemon.add(:TIMEFLUTE, proc { |item, qty, pkmn, scene|
}) })
ItemHandlers::CanUseInBattle.add(:JOYSCENT, proc { |item, pokemon, battler, move, firstAction, battle, scene, showMessages| ItemHandlers::CanUseInBattle.add(:JOYSCENT, proc { |item, pokemon, battler, move, firstAction, battle, scene, showMessages|
if !battler || !battler.shadowPokemon? || !battler.inHyperMode? if !pokemon.shadowPokemon? || (pokemon.happiness == 255 && pokemon.heart_gauge == 0)
scene.pbDisplay(_INTL("It won't have any effect.")) if showMessages scene.pbDisplay(_INTL("It won't have any effect.")) if showMessages
next false next false
end end
@@ -303,24 +303,33 @@ ItemHandlers::CanUseInBattle.add(:JOYSCENT, proc { |item, pokemon, battler, move
ItemHandlers::CanUseInBattle.copy(:JOYSCENT, :EXCITESCENT, :VIVIDSCENT) ItemHandlers::CanUseInBattle.copy(:JOYSCENT, :EXCITESCENT, :VIVIDSCENT)
ItemHandlers::BattleUseOnBattler.add(:JOYSCENT, proc { |item, battler, scene| ItemHandlers::BattleUseOnPokemon.add(:JOYSCENT, proc { |item, pokemon, battler, choices, scene|
battler.pokemon.hyper_mode = false if pokemon.hyper_mode
battler.pokemon.change_heart_gauge("scent", 1) pokemon.hyper_mode = false
scene.pbDisplay(_INTL("{1} came to its senses from the {2}!", battler.pbThis, GameData::Item.get(item).name)) scene.pbDisplay(_INTL("{1} came to its senses from the {2}!",
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
end
pbRaiseHappinessAndReduceHeart(pokemon, scene, 1, false)
next true next true
}) })
ItemHandlers::BattleUseOnBattler.add(:EXCITESCENT, proc { |item, battler, scene| ItemHandlers::BattleUseOnPokemon.add(:EXCITESCENT, proc { |item, pokemon, battler, choices, scene|
battler.pokemon.hyper_mode = false if pokemon.hyper_mode
battler.pokemon.change_heart_gauge("scent", 2) pokemon.hyper_mode = false
scene.pbDisplay(_INTL("{1} came to its senses from the {2}!", battler.pbThis, GameData::Item.get(item).name)) scene.pbDisplay(_INTL("{1} came to its senses from the {2}!",
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
end
pbRaiseHappinessAndReduceHeart(pokemon, scene, 2, false)
next true next true
}) })
ItemHandlers::BattleUseOnBattler.add(:VIVIDSCENT, proc { |item, battler, scene| ItemHandlers::BattleUseOnPokemon.add(:VIVIDSCENT, proc { |item, pokemon, battler, choices, scene|
battler.pokemon.hyper_mode = false if pokemon.hyper_mode
battler.pokemon.change_heart_gauge("scent", 3) pokemon.hyper_mode = false
scene.pbDisplay(_INTL("{1} came to its senses from the {2}!", battler.pbThis, GameData::Item.get(item).name)) scene.pbDisplay(_INTL("{1} came to its senses from the {2}!",
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
end
pbRaiseHappinessAndReduceHeart(pokemon, scene, 3, false)
next true next true
}) })