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

Merge branch 'dev' into ai

Browse Source
This commit is contained in:
Maruno17
2023-04-13 19:36:18 +01:00
parent c654636bdc af5256ae0f
commit 7f6f57dec3
45 changed files with 449 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,7 +297,7 @@ ItemHandlers::BattleUseOnPokemon.add(:JOYSCENT, proc { |item, pokemon, battler,
if pokemon.hyper_mode
pokemon.hyper_mode = false
scene.pbDisplay(_INTL("{1} came to its senses from the {2}!",
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
end
pbRaiseHappinessAndReduceHeart(pokemon, scene, 1, false)
next true
@@ -307,7 +307,7 @@ ItemHandlers::BattleUseOnPokemon.add(:EXCITESCENT, proc { |item, pokemon, battle
if pokemon.hyper_mode
pokemon.hyper_mode = false
scene.pbDisplay(_INTL("{1} came to its senses from the {2}!",
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
end
pbRaiseHappinessAndReduceHeart(pokemon, scene, 2, false)
next true
@@ -317,7 +317,7 @@ ItemHandlers::BattleUseOnPokemon.add(:VIVIDSCENT, proc { |item, pokemon, battler
if pokemon.hyper_mode
pokemon.hyper_mode = false
scene.pbDisplay(_INTL("{1} came to its senses from the {2}!",
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
battler&.pbThis || pokemon.name, GameData::Item.get(item).name))
end
pbRaiseHappinessAndReduceHeart(pokemon, scene, 3, false)
next true