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

Merge branch 'dev' into ai

Browse Source
This commit is contained in:
Maruno17
2023-01-08 21:56:33 +00:00
parent 3fa94bacc6 632b0f8b4b
commit a22f75f500
46 changed files with 1701 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
View File

@@ -75,7 +75,7 @@ class Battle
end
def pbUseItemMessage(item, trainerName)
itemName = GameData::Item.get(item).name
itemName = GameData::Item.get(item).portion_name
if itemName.starts_with_vowel?
pbDisplayBrief(_INTL("{1} used an {2}.", trainerName, itemName))
else

2
Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb
View File

@@ -191,5 +191,5 @@ Battle::PokeBallEffects::OnCatch.add(:HEALBALL, proc { |ball, battle, pkmn|
})
Battle::PokeBallEffects::OnCatch.add(:FRIENDBALL, proc { |ball, battle, pkmn|
pkmn.happiness = 200
pkmn.happiness = (Settings::APPLY_HAPPINESS_SOFT_CAP) ? 150 : 200
})