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

Fixed swapped baseDmg and type parameters in DamageCalcUserAbility

Browse Source
This commit is contained in:
m3rein
2020-09-05 13:18:11 +02:00
parent 990be3757c
commit 9aebe1e4d2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb
View File

@@ -255,7 +255,7 @@ class PokeBattle_Move
target.damageState.calcDamage = damage target.damageState.calcDamage = damage
end end
def pbCalcDamageMultipliers(user,target,numTargets,baseDmg,type,multipliers) def pbCalcDamageMultipliers(user,target,numTargets,type,baseDmg,multipliers)
# Global abilities # Global abilities
if (@battle.pbCheckGlobalAbility(:DARKAURA) && isConst?(type,PBTypes,:DARK)) || if (@battle.pbCheckGlobalAbility(:DARKAURA) && isConst?(type,PBTypes,:DARK)) ||
(@battle.pbCheckGlobalAbility(:FAIRYAURA) && isConst?(type,PBTypes,:FAIRY)) (@battle.pbCheckGlobalAbility(:FAIRYAURA) && isConst?(type,PBTypes,:FAIRY))
@@ -488,4 +488,4 @@ class PokeBattle_Move
user.pbOwnSide.effects[PBEffects::Rainbow]>0 user.pbOwnSide.effects[PBEffects::Rainbow]>0
return ret return ret
end end
end end

6
Data/Scripts/011_Battle/007_BattleHandlers_Abilities.rb
View File

@@ -656,7 +656,7 @@ BattleHandlers::MoveImmunityTargetAbility.add(:SOUNDPROOF,
end end
battle.pbHideAbilitySplash(target) battle.pbHideAbilitySplash(target)
next true next true
} }
) )
@@ -2239,7 +2239,7 @@ BattleHandlers::AbilityOnSwitchIn.add(:FOREWARN,
# Counter, Mirror Coat, Metal Burst # Counter, Mirror Coat, Metal Burst
power = 120 if ["071","072","073"].include?(moveData[MOVE_FUNCTION_CODE]) power = 120 if ["071","072","073"].include?(moveData[MOVE_FUNCTION_CODE])
# Sonic Boom, Dragon Rage, Night Shade, Endeavor, Psywave, # Sonic Boom, Dragon Rage, Night Shade, Endeavor, Psywave,
# Return, Frustration, Crush Grip, Gyro Ball, Hidden Power, # Return, Frustration, Crush Grip, Gyro Ball, Hidden Power,
# Natural Gift, Trump Card, Flail, Grass Knot # Natural Gift, Trump Card, Flail, Grass Knot
power = 80 if ["06A","06B","06D","06E","06F", power = 80 if ["06A","06B","06D","06E","06F",
"089","08A","08C","08D","090", "089","08A","08C","08D","090",
@@ -2504,4 +2504,4 @@ BattleHandlers::RunFromBattleAbility.add(:RUNAWAY,
proc { |ability,battler| proc { |ability,battler|
next true next true
} }
) )