From 5d66454e52beed10f5b1a269af7a1acb531927fd Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 2 Dec 2021 13:35:28 +0300 Subject: [PATCH] Update waste calculation --- eos/saveddata/drone.py | 4 ++-- eos/saveddata/module.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py index cc4b8c3b1..5cebbf5c0 100644 --- a/eos/saveddata/drone.py +++ b/eos/saveddata/drone.py @@ -263,9 +263,9 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu cycleTime = cycleParams.averageTime yield_ = sum([getter(d) for d in self.MINING_ATTRIBUTES]) * self.amountActive yps = yield_ / (cycleTime / 1000.0) - wasteChance = max(0, min(1, self.getModifiedItemAttr("miningWasteProbability"))) + wasteChance = max(0, min(100, self.getModifiedItemAttr("miningWasteProbability"))) wasteMult = self.getModifiedItemAttr("miningWastedVolumeMultiplier") - wps = yps * wasteChance * wasteMult + wps = yps * (wasteChance / 100) * wasteMult return yps, wps else: return 0, 0 diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 1b61fa2aa..8a7e27722 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -443,8 +443,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M if self.charge is not None: wasteChance += self.getModifiedChargeAttr("specializationCrystalMiningWasteProbabilityBonus", 0) wasteMult *= self.getModifiedChargeAttr("specializationCrystalMiningWastedVolumeMultiplierBonus", 1) - wasteChance = max(0, min(1, wasteChance)) - wps = yps * wasteChance * wasteMult + wasteChance = max(0, min(100, wasteChance)) + wps = yps * (wasteChance / 100) * wasteMult return yps, wps def isDealingDamage(self, ignoreState=False):