Update to 1015913

This commit is contained in:
blitzmann
2016-03-05 21:37:12 -05:00
parent 53a46dcec6
commit 38cc13ff2c
25 changed files with 96 additions and 12 deletions

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
"falloff", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
"falloff", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")

View File

@@ -2,7 +2,7 @@
#
# Used by:
# Modules from group: Damage Control (14 of 14)
type = "active"
type = "passive"
def handler(fit, module, context):
for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, skill, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst",
"falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level)
"falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, skill, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
"falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level)
"falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, skill, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
"falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level)
"falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, skill, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
"falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level)
"falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, skill, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
"falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level)
"falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)

View File

@@ -0,0 +1,5 @@
type = "passive"
def handler(fit, module, context):
fit.ship.boostItemAttr("energyWarfareResistance",
module.getModifiedItemAttr("energyWarfareResistanceBonus"),
stackingPenalties = True

View File

@@ -9,3 +9,10 @@ def handler(fit, module, context):
module.boostItemAttr("maxTargetRangeBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"))
module.boostItemAttr("scanResolutionBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
stackingPenalties=True)
for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
module.boostItemAttr(
"scan{}StrengthPercent".format(scanType),
module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
stackingPenalties=True
)

View File

@@ -5,7 +5,7 @@
# Skill: Propulsion Jamming
type = "passive"
def handler(fit, container, context):
groups = ("Stasis Web", "Warp Scrambler", "Warp Disrupt Field Generator")
groups = ("Stasis Web", "Stasis Grappler", "Warp Scrambler", "Warp Disrupt Field Generator")
level = container.level if "skill" in context else 1
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
"capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)

View File

@@ -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

View File

@@ -0,0 +1,16 @@
type= "projected", "active"
def handler(fit, module, context):
if "projected" not in context:
return
fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
stackingPenalties = True)
fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
stackingPenalties = True)
for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
fit.ship.boostItemAttr(
"scan{}Strength".format(scanType),
module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
stackingPenalties=True
)

View File

@@ -0,0 +1,8 @@
type= "projected", "active"
def handler(fit, module, context):
if "projected" not in context:
return
fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
stackingPenalties = True)
fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
stackingPenalties = True

View File

@@ -0,0 +1,5 @@
type = "projected", "active"
def handler(fit, container, context):
if "projected" in context:
fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
stackingPenalties = True)

View File

@@ -0,0 +1,12 @@
type= "projected", "active"
def handler(fit, module, context):
if "projected" in context:
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
"trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
stackingPenalties = True)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
"maxRange", module.getModifiedItemAttr("maxRangeBonus"),
stackingPenalties = True)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
"falloff", module.getModifiedItemAttr("falloffBonus"),
stackingPenalties = True)

View File

@@ -0,0 +1,5 @@
type = "active", "projected"
def handler(fit, module, context):
if "projected" not in context: return
fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
stackingPenalties = True)

View File

@@ -4,5 +4,5 @@
# Ship: Griffin Navy Issue
type = "passive"
def handler(fit, src, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloff", src.getModifiedItemAttr("roleBonus"))
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloffEffectiveness", src.getModifiedItemAttr("roleBonus"))
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange", src.getModifiedItemAttr("roleBonus"))

View File

@@ -0,0 +1,4 @@
type = "active"
def handler(fit, module, context):
for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
module.boostItemAttr("scan{}StrengthPercent".format(scanType), module.getModifiedChargeAttr("sensorStrengthBonusBonus"))

View File

@@ -8,3 +8,10 @@ def handler(fit, module, context):
stackingPenalties = True)
fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
stackingPenalties = True)
for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
fit.ship.boostItemAttr(
"scan{}Strength".format(scanType),
module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
stackingPenalties=True
)

View File

@@ -5,4 +5,4 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
"falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")

View File

@@ -0,0 +1,4 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")

View File

@@ -0,0 +1,4 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")

View File

@@ -254,7 +254,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
@property
def falloff(self):
attrs = ("falloff", "shipScanFalloff", "falloffEffectiveness")
attrs = ("falloffEffectiveness", "falloff", "shipScanFalloff")
for attr in attrs:
falloff = self.getModifiedItemAttr(attr)
if falloff is not None: return falloff

BIN
eve.db

Binary file not shown.