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

Refactored ability/item/ball battle handlers, added "UltraBeast" species flag for Beast Ball

Browse Source
This commit is contained in:
Maruno17
2021-11-18 22:52:19 +00:00
parent 8307222009
commit 048a18b415
33 changed files with 1265 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/011_Battle/002_Battler/001_Battle_Battler.rb
View File

@@ -248,11 +248,11 @@ class Battle::Battler
speedMult = 1.0
# Ability effects that alter calculated Speed
if abilityActive?
speedMult = BattleHandlers.triggerSpeedCalcAbility(self.ability,self,speedMult)
speedMult = Battle::AbilityEffects.triggerSpeedCalc(self.ability, self, speedMult)
end
# Item effects that alter calculated Speed
if itemActive?
speedMult = BattleHandlers.triggerSpeedCalcItem(self.item,self,speedMult)
speedMult = Battle::ItemEffects.triggerSpeedCalc(self.item, self, speedMult)
end
# Other effects
speedMult *= 2 if pbOwnSide.effects[PBEffects::Tailwind]>0
@@ -275,10 +275,10 @@ class Battle::Battler
ret += @effects[PBEffects::WeightChange]
ret = 1 if ret<1
if abilityActive? && !@battle.moldBreaker
ret = BattleHandlers.triggerWeightCalcAbility(self.ability,self,ret)
ret = Battle::AbilityEffects.triggerWeightCalc(self.ability, self, ret)
end
if itemActive?
ret = BattleHandlers.triggerWeightCalcItem(self.item,self,ret)
ret = Battle::ItemEffects.triggerWeightCalc(self.item, self, ret)
end
return [ret,1].max
end