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

addIf now need an identifier symbol, fixed clas between using Future Sight and being locked into a move, fixed IV inheritance

Browse Source
This commit is contained in:
Maruno17
2022-10-16 22:53:41 +01:00
parent 9ad45d6b07
commit 9eb90b784e
6 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,8 @@ ItemHandlers::UseFromBag.add(:TOWNMAP, proc { |item|
next ($game_temp.fly_destination) ? 2 : 0
})
ItemHandlers::UseFromBag.addIf(proc { |item| GameData::Item.get(item).is_machine? },
ItemHandlers::UseFromBag.addIf(:move_machines,
proc { |item| GameData::Item.get(item).is_machine? },
proc { |item|
if $player.pokemon_count == 0
pbMessage(_INTL("There is no Pokémon."))
@@ -361,7 +362,8 @@ ItemHandlers::UseInField.add(:EXPALLOFF, proc { |item|
# Applies to all items defined as an evolution stone.
# No need to add more code for new ones.
ItemHandlers::UseOnPokemon.addIf(proc { |item| GameData::Item.get(item).is_evolution_stone? },
ItemHandlers::UseOnPokemon.addIf(:evolution_stones,
proc { |item| GameData::Item.get(item).is_evolution_stone? },
proc { |item, qty, pkmn, scene|
if pkmn.shadowPokemon?
scene.pbDisplay(_INTL("It won't have any effect."))

6
Data/Scripts/013_Items/003_Item_BattleEffects.rb
View File

@@ -25,7 +25,8 @@ ItemHandlers::CanUseInBattle.add(:POKEDOLL, proc { |item, pokemon, battler, move
ItemHandlers::CanUseInBattle.copy(:POKEDOLL, :FLUFFYTAIL, :POKETOY)
ItemHandlers::CanUseInBattle.addIf(proc { |item| GameData::Item.get(item).is_poke_ball? }, # Poké Balls
ItemHandlers::CanUseInBattle.addIf(:poke_balls,
proc { |item| GameData::Item.get(item).is_poke_ball? },
proc { |item, pokemon, battler, move, firstAction, battle, scene, showMessages|
if battle.pbPlayer.party_full? && $PokemonStorage.full?
scene.pbDisplay(_INTL("There is no room left in the PC!")) if showMessages
@@ -314,7 +315,8 @@ ItemHandlers::UseInBattle.add(:POKEFLUTE, proc { |item, battler, battle|
battle.pbDisplay(_INTL("All Pokémon were roused by the tune!"))
})
ItemHandlers::UseInBattle.addIf(proc { |item| GameData::Item.get(item).is_poke_ball? }, # Poké Balls
ItemHandlers::UseInBattle.addIf(:poke_balls,
proc { |item| GameData::Item.get(item).is_poke_ball? },
proc { |item, battler, battle|
battle.pbThrowPokeBall(battler.index, item)
}