From 5f20f249f719278a92b904d1b3651ab8b083cb46 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 9 Jul 2019 07:41:10 +0300 Subject: [PATCH] Change reaper DD to show only one instance of damage --- eos/saveddata/module.py | 3 ++- gui/builtinViewColumns/misc.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 65bf971a2..b690d203a 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -431,7 +431,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): dmgDelay = self.getModifiedItemAttr("damageDelayDuration", 0) or self.getModifiedItemAttr("doomsdayWarningDuration", 0) dmgDuration = self.getModifiedItemAttr("doomsdayDamageDuration", 0) dmgSubcycle = self.getModifiedItemAttr("doomsdayDamageCycleTime", 0) - if dmgDuration != 0 and dmgSubcycle != 0: + # Reaper DD can damage each target only once + if dmgDuration != 0 and dmgSubcycle != 0 and 'doomsdaySlash' not in self.item.effects: subcycles = math.floor(floatUnerr(dmgDuration / dmgSubcycle)) else: subcycles = 1 diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index d9f465cf3..11c7a725e 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -99,7 +99,7 @@ class Miscellanea(ViewColumn): formatAmount((doomsday_duration / 1000), 0, 0, 0)) tooltip = "Raw damage done over time" else: - text = "{0} dmg".format(formatAmount(volley * (doomsday_duration / doomsday_dottime), 3, 0, 3)) + text = "{} dmg".format(formatAmount(volley * (doomsday_duration / doomsday_dottime), 3, 0, 3)) tooltip = "Raw damage done" return text, tooltip