diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 4a47be47b..f5ff7ba1c 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -702,15 +702,12 @@ class Fit: mod.item.requiresSkill("High Speed Maneuvering"), "speedFactor", value, stackingPenalties=True) - if warfareBuffID == 23: # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range + if warfareBuffID == 23: # Mining Burst: Mining Laser Field Enhancement: Mining Range self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting") or mod.item.requiresSkill("Gas Cloud Harvesting"), "maxRange", value, stackingPenalties=True) - self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"), - "surveyScanRange", value, stackingPenalties=True) - if warfareBuffID == 24: # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting") or @@ -944,6 +941,17 @@ class Fit: self.ship.forceItemAttr("miningScannerUpgrade", value) if warfareBuffID == 2481: # Expedition Burst: Salvager duration bonus self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), "duration", value) + if warfareBuffID == 2516: # Mining Burst: Mining Crit Chance + self.modules.filteredItemBoost( + lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"), + "miningCritChance", value) + if warfareBuffID == 2517: # Mining Burst: Mining Residue Chance Reduction + self.modules.filteredItemBoost( + lambda mod: ( + mod.item.requiresSkill("Mining") + or mod.item.requiresSkill("Ice Harvesting") + or mod.item.requiresSkill("Gas Cloud Harvesting")), + "miningWasteProbability", value) del self.commandBonuses[warfareBuffID] diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 041ffc0c5..e013d7905 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -766,9 +766,9 @@ class Miscellanea(ViewColumn): elif buffId == 22: # Skirmish Burst: Rapid Deployment: AB/MWD Speed Increase textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%") tooltipSections.append("AB/MWD speed increase") - elif buffId == 23: # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range + elif buffId == 23: # Mining Burst: Mining Laser Field Enhancement: Mining Range textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%") - tooltipSections.append("mining/survey module range") + tooltipSections.append("mining module range") elif buffId == 24: # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%") tooltipSections.append("mining module duration & capacitor use") @@ -790,6 +790,12 @@ class Miscellanea(ViewColumn): elif buffId == 2481: # Expedition Burst: Salvager duration bonus textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%") tooltipSections.append("salvager cycle time") + elif buffId == 2516: # Mining Burst: Mining Crit Chance + textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%") + tooltipSections.append("crit chance") + elif buffId == 2517: # Mining Burst: Mining Residue Chance Reduction + textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%") + tooltipSections.append("waste chance") if not textSections: return '', None text = ' | '.join(textSections)