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

Made more use of nil_or_empty?, fixed incorrect default species body shape, fixed Illusion, fixed potential foreign Pokémon with blank names

Browse Source
This commit is contained in:
Maruno17
2021-05-03 17:34:19 +01:00
parent 8e6ee21c20
commit 474281712b
30 changed files with 71 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb
View File

@@ -344,7 +344,7 @@ class PokeBattle_Battler
def hasActiveAbility?(check_ability, ignore_fainted = false)
return false if !abilityActive?(ignore_fainted)
return check_ability.include?(@ability_id) if check_ability.is_a?(Array)
return check_ability == self.ability
return self.ability == check_ability
end
alias hasWorkingAbility hasActiveAbility?

2
Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb
View File

@@ -37,7 +37,7 @@ class PokeBattle_Battler
@battle.pbHideAbilitySplash(target)
pbItemHPHealCheck
else
msg = _INTL("{1} had its energy drained!",target.pbThis) if !msg || msg==""
msg = _INTL("{1} had its energy drained!",target.pbThis) if nil_or_empty?(msg)
@battle.pbDisplay(msg)
if canHeal?
amt = (amt*1.3).floor if hasActiveItem?(:BIGROOT)

4
Data/Scripts/011_Battle/001_Battler/004_Battler_Statuses.rb
View File

@@ -484,7 +484,7 @@ class PokeBattle_Battler
def pbConfuse(msg=nil)
@effects[PBEffects::Confusion] = pbConfusionDuration
@battle.pbCommonAnimation("Confusion",self)
msg = _INTL("{1} became confused!",pbThis) if !msg || msg==""
msg = _INTL("{1} became confused!",pbThis) if nil_or_empty?(msg)
@battle.pbDisplay(msg)
PBDebug.log("[Lingering effect] #{pbThis}'s confusion count is #{@effects[PBEffects::Confusion]}")
# Confusion cures
@@ -551,7 +551,7 @@ class PokeBattle_Battler
def pbAttract(user,msg=nil)
@effects[PBEffects::Attract] = user.index
@battle.pbCommonAnimation("Attract",self)
msg = _INTL("{1} fell in love!",pbThis) if !msg || msg==""
msg = _INTL("{1} fell in love!",pbThis) if nil_or_empty?(msg)
@battle.pbDisplay(msg)
# Destiny Knot
if hasActiveItem?(:DESTINYKNOT) && user.pbCanAttract?(self,false)