Skip to content

Commit 72567a7

Browse files
committed
Add new mining charge effects
1 parent 0d4c255 commit 72567a7

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

eos/saveddata/fit.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -702,15 +702,12 @@ def __runCommandBoosts(self, runTime="normal"):
702702
mod.item.requiresSkill("High Speed Maneuvering"),
703703
"speedFactor", value, stackingPenalties=True)
704704

705-
if warfareBuffID == 23: # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range
705+
if warfareBuffID == 23: # Mining Burst: Mining Laser Field Enhancement: Mining Range
706706
self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or
707707
mod.item.requiresSkill("Ice Harvesting") or
708708
mod.item.requiresSkill("Gas Cloud Harvesting"),
709709
"maxRange", value, stackingPenalties=True)
710710

711-
self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
712-
"surveyScanRange", value, stackingPenalties=True)
713-
714711
if warfareBuffID == 24: # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration
715712
self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or
716713
mod.item.requiresSkill("Ice Harvesting") or
@@ -944,6 +941,17 @@ def __runCommandBoosts(self, runTime="normal"):
944941
self.ship.forceItemAttr("miningScannerUpgrade", value)
945942
if warfareBuffID == 2481: # Expedition Burst: Salvager duration bonus
946943
self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), "duration", value)
944+
if warfareBuffID == 2516: # Mining Burst: Mining Crit Chance
945+
self.modules.filteredItemBoost(
946+
lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"),
947+
"miningCritChance", value)
948+
if warfareBuffID == 2517: # Mining Burst: Mining Residue Chance Reduction
949+
self.modules.filteredItemBoost(
950+
lambda mod: (
951+
mod.item.requiresSkill("Mining")
952+
or mod.item.requiresSkill("Ice Harvesting")
953+
or mod.item.requiresSkill("Gas Cloud Harvesting")),
954+
"miningWasteProbability", value)
947955

948956
del self.commandBonuses[warfareBuffID]
949957

gui/builtinViewColumns/misc.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,9 +766,9 @@ def __getData(self, stuff):
766766
elif buffId == 22: # Skirmish Burst: Rapid Deployment: AB/MWD Speed Increase
767767
textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
768768
tooltipSections.append("AB/MWD speed increase")
769-
elif buffId == 23: # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range
769+
elif buffId == 23: # Mining Burst: Mining Laser Field Enhancement: Mining Range
770770
textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
771-
tooltipSections.append("mining/survey module range")
771+
tooltipSections.append("mining module range")
772772
elif buffId == 24: # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration
773773
textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
774774
tooltipSections.append("mining module duration & capacitor use")
@@ -790,6 +790,12 @@ def __getData(self, stuff):
790790
elif buffId == 2481: # Expedition Burst: Salvager duration bonus
791791
textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
792792
tooltipSections.append("salvager cycle time")
793+
elif buffId == 2516: # Mining Burst: Mining Crit Chance
794+
textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
795+
tooltipSections.append("crit chance")
796+
elif buffId == 2517: # Mining Burst: Mining Residue Chance Reduction
797+
textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
798+
tooltipSections.append("waste chance")
793799
if not textSections:
794800
return '', None
795801
text = ' | '.join(textSections)

0 commit comments

Comments
 (0)