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

Additional #isSpecies? and #hasItem? refactoring

Browse Source
This commit is contained in:
jonisavo
2020-09-06 20:58:13 +03:00
parent 6252407160
commit 0b1bab3b5c
8 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Battle/002_Move/002_Move_Usage.rb
View File

@@ -164,7 +164,7 @@ class PokeBattle_Move
return
end
# Disguise will take the damage
if !@battle.moldBreaker && isConst?(target.species,PBSpecies,:MIMIKYU) &&
if !@battle.moldBreaker && target.isSpecies?(:MIMIKYU) &&
target.form==0 && isConst?(target.ability,PBAbilities,:DISGUISE)
target.damageState.disguise = true
return

8
Data/Scripts/012_Battle/008_BattleHandlers_Items.rb
View File

@@ -852,7 +852,7 @@ BattleHandlers::DamageCalcTargetItem.add(:COLBURBERRY,
BattleHandlers::DamageCalcTargetItem.add(:DEEPSEASCALE,
proc { |item,user,target,move,mults,baseDmg,type|
if isConst?(target.species,PBSpecies,:CLAMPERL) && move.specialMove?
if target.isSpecies?(:CLAMPERL) && move.specialMove?
mults[DEF_MULT] *= 2
end
}
@@ -889,8 +889,7 @@ BattleHandlers::DamageCalcTargetItem.add(:KEBIABERRY,
BattleHandlers::DamageCalcTargetItem.add(:METALPOWDER,
proc { |item,user,target,move,mults,baseDmg,type|
if isConst?(target.species,PBSpecies,:DITTO) &&
!target.effects[PBEffects::Transform]
if target.isSpecies?(:DITTO) && !target.effects[PBEffects::Transform]
mults[DEF_MULT] = (mults[DEF_MULT]*1.5).round
end
}
@@ -935,8 +934,7 @@ BattleHandlers::DamageCalcTargetItem.add(:SHUCABERRY,
BattleHandlers::DamageCalcTargetItem.add(:SOULDEW,
proc { |item,user,target,move,mults,baseDmg,type|
next if NEWEST_BATTLE_MECHANICS
next if !isConst?(target.species,PBSpecies,:LATIAS) &&
!isConst?(target.species,PBSpecies,:LATIOS)
next if !target.isSpecies?(:LATIAS) && !target.isSpecies?(:LATIOS)
if move.specialMove? && !user.battle.rules["souldewclause"]
mults[DEF_MULT] = (mults[DEF_MULT]*1.5).round
end