Merge branch 'singularity'

eos/effects/elitereconbonusenergyneutamount2.py

@@ -6,4 +6,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")

eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py

@@ -4,5 +4,5 @@
 # Skill: EM Shield Compensation
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
                                   "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)

eos/effects/energydestabilizationnew.py

@@ -5,6 +5,6 @@ def handler(fit, container, context):
     if "projected" in context and ((hasattr(container, "state") \
     and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
         multiplier = container.amountActive if hasattr(container, "amountActive") else 1
-        amount = container.getModifiedItemAttr("energyDestabilizationAmount")
+        amount = container.getModifiedItemAttr("energyNeutralizerAmount")
         time = container.getModifiedItemAttr("duration")
         fit.addDrain(time, amount * multiplier, 0)

eos/effects/energyneutralizerentity.py

@@ -7,6 +7,6 @@
 def handler(fit, container, context):
     if "projected" in context and ((hasattr(container, "state") \
     and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
-        amount = container.getModifiedItemAttr("energyDestabilizationAmount")
+        amount = container.getModifiedItemAttr("energyNeutralizerAmount")
         time = container.getModifiedItemAttr("duration")
         fit.addDrain(time, amount, 0)

eos/effects/energyneutralizerfalloff.py

@@ -7,6 +7,6 @@
 def handler(fit, container, context):
     if "projected" in context and ((hasattr(container, "state") \
     and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
-        amount = container.getModifiedItemAttr("energyDestabilizationAmount")
+        amount = container.getModifiedItemAttr("energyNeutralizerAmount")
         time = container.getModifiedItemAttr("duration")
         fit.addDrain(time, amount, 0)

eos/effects/entityecmfalloff.py

@@ -0,0 +1,7 @@
+type = "projected", "active"
+def handler(fit, module, context):
+    if "projected" in context:
+        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType))/fit.scanStrength
+
+        fit.ecmProjectedStr *= strModifier

eos/effects/entityenergyneutralizerfalloff.py

@@ -0,0 +1,12 @@
+# energyNeutralizerFalloff
+#
+# Used by:
+# Modules from group: Energy Neutralizer (51 of 51)
+from eos.types import State
+type = "active", "projected"
+def handler(fit, container, context):
+    if "projected" in context and ((hasattr(container, "state") \
+    and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
+        amount = container.getModifiedItemAttr("energyNeutralizerAmount")
+        time = container.getModifiedItemAttr("energyNeutralizerDuration")
+        fit.addDrain(time, amount, 0)

eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py

@@ -4,5 +4,5 @@
 # Skill: Explosive Shield Compensation
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
                                   "explosiveDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)

eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py

@@ -4,6 +4,6 @@
 # Skill: Kinetic Shield Compensation
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
                                   "kineticDamageResistanceBonus",
                                   skill.getModifiedItemAttr("hardeningBonus") * skill.level)

eos/effects/modifyshieldresonancepostpercent.py

@@ -1,7 +1,7 @@
 # modifyShieldResonancePostPercent
 #
 # Used by:
-# Modules from group: Shield Amplifier (88 of 88)
+# Modules from group: Shield Resistance Amplifier (88 of 88)
 type = "passive"
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):

eos/effects/modulebonusnetworkedsensorarray.py

@@ -4,9 +4,8 @@
 # Module: Networked Sensor Array
 type = "active"
 def handler(fit, src, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus"))
     fit.ship.multiplyItemAttr("maxTargetRange", src.getModifiedItemAttr("maxTargetRangeMultiplier"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.ship.multiplyItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionMultiplier"), stackingPenalties=True)
+    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionBonus"), stackingPenalties=True)
 
     for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
         fit.ship.boostItemAttr("scan{}Strength".format(scanType),

eos/effects/modulebonussiegemodule.py

@@ -44,14 +44,9 @@ def handler(fit, src, context):
     fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
 
     # new in April 2016 release
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        fit.ship.boostItemAttr("scan{}Strength".format(scanType),
-                               src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-                               stackingPenalties=True)
-
     # missile ROF bonus
     for group in ("Missile Launcher XL Torpedo", "Missile Launcher Rapid Torpedo", "Missile Launcher XL Cruise"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, "speed", src.getModifiedItemAttr("siegeLauncherROFBonus"), stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, "speed", src.getModifiedItemAttr("siegeLauncherROFBonus"))
 
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity", src.getModifiedItemAttr("siegeTorpedoVelocityBonus"), stackingPenalties=True)
 

eos/effects/modulebonustriagemodule.py

@@ -56,12 +56,6 @@ def handler(fit, src, context):
     fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
 
     # new in April 2016 release
-
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        fit.ship.boostItemAttr("scan{}Strength".format(scanType),
-                               src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-                               stackingPenalties=True)
-
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
 
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))

eos/effects/rigdrawbackreductionarmor.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Armor", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Resource Processing", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductionastronautics.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Navigation", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Anchor", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductiondrones.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Drones", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductionelectronic.py

@@ -0,0 +1,6 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Electronic Systems", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Scanning", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Targeting", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductionenergyweapon.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Energy Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductionhybrid.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Hybrid Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductionlauncher.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Launcher", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductionprojectile.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Projectile Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/rigdrawbackreductionshield.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Shield", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)

eos/effects/shieldcapacitybonusonline.py

@@ -1,7 +1,7 @@
 # shieldCapacityBonusOnline
 #
 # Used by:
-# Modules from group: Shield Amplifier (88 of 88)
+# Modules from group: Shield Resistance Amplifier (88 of 88)
 # Modules from group: Shield Extender (33 of 33)
 type = "passive"
 def handler(fit, module, context):

eos/effects/shipbonusdreadnoughtm1webbonus.py

@@ -0,0 +1,3 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")

eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py

@@ -0,0 +1,3 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "speedFactor", src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")

eos/effects/shipbonustitanm1webbonus.py

@@ -0,0 +1,3 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")

eos/effects/shipbonustitanrole3damagebonus.py

@@ -0,0 +1,3 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))

eos/effects/shipenergyneutralizertransferamountbonusab.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")

eos/effects/shipenergyneutralizertransferamountbonusac.py

@@ -6,4 +6,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")

eos/effects/shipenergyneutralizertransferamountbonusaf.py

@@ -6,4 +6,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")

eos/effects/shipenergyneutralizertransferamountbonusaf2.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")

eos/effects/shipneutdestabilizationamountbonusrookie.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationAmount", ship.getModifiedItemAttr("rookieNeutDrain"))
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("rookieNeutDrain"))

eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyDestabilizationAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")
+                                  "energyNeutralizerAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")

eos/effects/systemenergyneutmultiplier.py

@@ -6,5 +6,5 @@
 type = ("projected", "passive")
 def handler(fit, beacon, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                     "energyDestabilizationAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
+                                     "energyNeutralizerAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")

eos/effects/systemneutbombs.py

@@ -6,5 +6,5 @@
 type = ("projected", "passive")
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "energyDestabilizationAmount", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       "energyNeutralizerAmount", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
                                        stackingPenalties=True, penaltyGroup="postMul")

eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py

@@ -4,5 +4,5 @@
 # Skill: Thermal Shield Compensation
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
                                   "thermalDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)

eos/graph/fitDps.py

@@ -95,11 +95,10 @@ def calculateMissileMultiplier(self, mod, data):
         targetSigRad = explosionRadius if targetSigRad is None else targetSigRad
         explosionVelocity = mod.getModifiedChargeAttr("aoeVelocity")
         damageReductionFactor = mod.getModifiedChargeAttr("aoeDamageReductionFactor")
-        damageReductionSensitivity = mod.getModifiedChargeAttr("aoeDamageReductionSensitivity")
 
         sigRadiusFactor = targetSigRad / explosionRadius
         if targetVelocity:
-            velocityFactor = (explosionVelocity / explosionRadius * targetSigRad / targetVelocity) ** (log(damageReductionFactor) / log(damageReductionSensitivity))
+            velocityFactor = (explosionVelocity / explosionRadius * targetSigRad / targetVelocity) ** damageReductionFactor
         else:
             velocityFactor = 1
 

gui/builtinStatsViews/resistancesViewFull.py

@@ -168,10 +168,6 @@ def refreshPanel(self, fit):
             self.showEffective = True
             wx.PostEvent(self.mainFrame, EffectiveHpToggled(effective=True))
             return
-        elif fit is not None and fit.ID != self.activeFit and not self.showEffective:
-            self.showEffective = True
-            wx.PostEvent(self.mainFrame, EffectiveHpToggled(effective=True))
-            return
 
         self.stEHPs.SetLabel("EHP" if self.showEffective else "HP")
         self.activeFit = fit.ID if fit is not None else None

gui/builtinViewColumns/misc.py

@@ -86,7 +86,7 @@ def __getData(self, stuff):
                     info.append("{0}{1}".format(n, slot[0].upper()))
             return "+ "+", ".join(info), "Slot Modifiers"
         elif itemGroup == "Energy Neutralizer":
-            neutAmount = stuff.getModifiedItemAttr("energyDestabilizationAmount")
+            neutAmount = stuff.getModifiedItemAttr("energyNeutralizerAmount")
             cycleTime = stuff.cycleTime
             if not neutAmount or not cycleTime:
                 return "", None
@@ -429,8 +429,8 @@ def __getData(self, stuff):
             tooltip = "{0} repaired per second".format(formatList(ttEntries)).capitalize()
             return text, tooltip
         elif itemGroup == "Energy Neutralizer Drone":
-            neutAmount = stuff.getModifiedItemAttr("energyDestabilizationAmount")
-            cycleTime = stuff.getModifiedItemAttr("duration")
+            neutAmount = stuff.getModifiedItemAttr("energyNeutralizerAmount")
+            cycleTime = stuff.getModifiedItemAttr("energyNeutralizerDuration")
             if not neutAmount or not cycleTime:
                 return "", None
             capPerSec = float(-neutAmount) * 1000 / cycleTime

gui/builtinViews/entityEditor.py

@@ -98,7 +98,8 @@ def OnNew(self, event):
         dlg.CenterOnParent()
 
         if dlg.ShowModal() == wx.ID_OK:
-            new = self.DoNew(dlg.GetValue().strip())
+            # using dlg.textctrl.GetValue instead of simply dlg.GetValue because the proper way does not work in wxPython 2.8
+            new = self.DoNew(dlg.txtctrl.GetValue().strip())
             self.refreshEntityList(new)
             wx.PostEvent(self.entityChoices, wx.CommandEvent(wx.wxEVT_COMMAND_CHOICE_SELECTED))
         else:
@@ -114,7 +115,7 @@ def OnCopy(self, event):
         dlg.CenterOnParent()
 
         if dlg.ShowModal() == wx.ID_OK:
-            copy = self.DoCopy(active, dlg.GetValue().strip())
+            copy = self.DoCopy(active, dlg.txtctrl.GetValue().strip())
             self.refreshEntityList(copy)
             wx.PostEvent(self.entityChoices, wx.CommandEvent(wx.wxEVT_COMMAND_CHOICE_SELECTED))
 
@@ -128,7 +129,7 @@ def OnRename(self, event):
         dlg.CenterOnParent()
 
         if dlg.ShowModal() == wx.ID_OK:
-            self.DoRename(active, dlg.GetValue().strip())
+            self.DoRename(active, dlg.txtctrl.GetValue().strip())
             self.refreshEntityList(active)
             wx.PostEvent(self.entityChoices, wx.CommandEvent(wx.wxEVT_COMMAND_CHOICE_SELECTED))
 

gui/characterEditor.py

@@ -37,14 +37,14 @@ def Clone(self):
         return CharacterTextValidor()
 
     def Validate(self, win):
-        profileEditor = win.Parent
+        entityEditor = win.parent
         textCtrl = self.GetWindow()
         text = textCtrl.GetValue().strip()
 
         try:
             if len(text) == 0:
                 raise ValueError("You must supply a name for the Character!")
-            elif text in [x.name for x in profileEditor.entityEditor.choices]:
+            elif text in [x.name for x in entityEditor.choices]:
                 raise ValueError("Character name already in use, please choose another.")
 
             return True