From 13a0bf9d429e25389d872ca1aef85c85bb36487d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 22 Aug 2019 19:34:38 +0300 Subject: [PATCH] Do not delay any damage besides doomsday mods --- eos/saveddata/module.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index ab72e25b9..7caafb96d 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -428,7 +428,13 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): self.__baseVolley = {} dmgGetter = self.getModifiedChargeAttr if self.charge else self.getModifiedItemAttr dmgMult = self.getModifiedItemAttr("damageMultiplier", 1) - dmgDelay = self.getModifiedItemAttr("damageDelayDuration", 0) or self.getModifiedItemAttr("doomsdayWarningDuration", 0) + # Some delay attributes have non-0 default value, so we have to pick according to effects + if {'superWeaponAmarr', 'superWeaponCaldari', 'superWeaponGallente', 'superWeaponMinmatar', 'lightningWeapon'}.intersection(self.item.effects): + dmgDelay = self.getModifiedItemAttr("damageDelayDuration", 0) + elif {'doomsdayBeamDOT', 'doomsdaySlash', 'doomsdayConeDOT'}.intersection(self.item.effects): + dmgDelay = self.getModifiedItemAttr("doomsdayWarningDuration", 0) + else: + dmgDelay = 0 dmgDuration = self.getModifiedItemAttr("doomsdayDamageDuration", 0) dmgSubcycle = self.getModifiedItemAttr("doomsdayDamageCycleTime", 0) # Reaper DD can damage each target only once