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 Exp Candies only raising happiness for one item if multiple are used at once

Browse Source
This commit is contained in:
Maruno17
2021-10-31 20:54:53 +00:00
parent 0ec67f78fa
commit e8170a267c
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Data/Scripts/013_Items/002_Item_Effects.rb
View File

@@ -910,6 +910,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYXS, proc { |item, pkmn, scene|
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty == 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen) scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
if qty > 1
(qty - 1).times { pkmn.changeHappiness("vitamin") }
end
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$bag.remove(item, qty - 1) $bag.remove(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -928,6 +931,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYS, proc { |item, pkmn, scene|
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty == 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen) scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
if qty > 1
(qty - 1).times { pkmn.changeHappiness("vitamin") }
end
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$bag.remove(item, qty - 1) $bag.remove(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -946,6 +952,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYM, proc { |item, pkmn, scene|
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty == 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen) scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
if qty > 1
(qty - 1).times { pkmn.changeHappiness("vitamin") }
end
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$bag.remove(item, qty - 1) $bag.remove(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -964,6 +973,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYL, proc { |item, pkmn, scene|
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty == 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen) scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
if qty > 1
(qty - 1).times { pkmn.changeHappiness("vitamin") }
end
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$bag.remove(item, qty - 1) $bag.remove(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh
@@ -982,6 +994,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYXL, proc { |item, pkmn, scene|
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum) _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
next false if qty == 0 next false if qty == 0
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen) scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
if qty > 1
(qty - 1).times { pkmn.changeHappiness("vitamin") }
end
pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene) pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
$bag.remove(item, qty - 1) $bag.remove(item, qty - 1)
scene.pbHardRefresh scene.pbHardRefresh