From 803ada4b278568fec4a4e986a0c2c9c3db4ba6f0 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 13 Apr 2016 20:05:39 -0400 Subject: [PATCH] Fix siege, bastion, and triage effects. --- eos/effects/modulebonusbastionmodule.py | 7 ++++--- eos/effects/modulebonussiegemodule.py | 11 ++++++----- eos/effects/modulebonustriagemodule.py | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/eos/effects/modulebonusbastionmodule.py b/eos/effects/modulebonusbastionmodule.py index 6ceb33715..cb6316d95 100644 --- a/eos/effects/modulebonusbastionmodule.py +++ b/eos/effects/modulebonusbastionmodule.py @@ -54,15 +54,16 @@ def handler(fit, src, context): # new with April 2016 release for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'): fit.ship.boostItemAttr("scan{}Strength".format(scanType), - src.getModifiedItemAttr("scan{}StrengthPercent").format(scanType), + src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)), stackingPenalties=True) fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus")) fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus")) fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus")) fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "activationBlocked", src.getModifiedItemAttr("activationBlockedStrenght")) - fit.ship.increaseItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking")) fit.ship.boostItemAttr("targetPainterResistance", src.getModifiedItemAttr("targetPainterResistanceBonus")) fit.ship.boostItemAttr("weaponDisruptionResistance", src.getModifiedItemAttr("weaponDisruptionResistanceBonus")) - fit.ship.increaseItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering")) fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus")) + + fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking")) + fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering")) diff --git a/eos/effects/modulebonussiegemodule.py b/eos/effects/modulebonussiegemodule.py index f57dd9dcc..12d117f01 100644 --- a/eos/effects/modulebonussiegemodule.py +++ b/eos/effects/modulebonussiegemodule.py @@ -7,14 +7,14 @@ def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or \ mod.item.requiresSkill("Capital Hybrid Turret") or \ mod.item.requiresSkill("Capital Projectile Turret"), - "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus")) + "damageMultiplier", src.getModifiedItemAttr("siegeTurretDamageBonus")) #Missiles for type in ("kinetic", "thermal", "explosive", "em"): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or \ mod.charge.requiresSkill("XL Cruise Missiles") or \ mod.charge.requiresSkill("Torpedoes"), - "%sDamage" % type, src.getModifiedItemAttr("damageMultiplierBonus")) + "%sDamage" % type, src.getModifiedItemAttr("siegeMissileDamageBonus")) # Reppers fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or \ @@ -44,7 +44,7 @@ def handler(fit, src, context): # 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), + src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)), stackingPenalties=True) # missile ROF bonus @@ -55,8 +55,9 @@ def handler(fit, src, context): fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus")) fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus")) - fit.ship.increaseItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering")) fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus")) fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus")) fit.ship.boostItemAttr("weaponDisruptionResistance", src.getModifiedItemAttr("weaponDisruptionResistanceBonus")) - fit.ship.increaseItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking")) + + fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking")) + fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering")) diff --git a/eos/effects/modulebonustriagemodule.py b/eos/effects/modulebonustriagemodule.py index c22cc6b46..83756d9ce 100644 --- a/eos/effects/modulebonustriagemodule.py +++ b/eos/effects/modulebonustriagemodule.py @@ -8,7 +8,7 @@ def handler(fit, src, context): ("Capital Remote Armor Repair Systems", "armorDamageAmount", True), ("Capital Shield Emission Systems", "shieldBonus", True), ("Capital Capacitor Emission Systems", "powerTransferAmount", False), - ("Capital Remote Hull Repair Systems", "structureDamageAmount"), False): + ("Capital Remote Hull Repair Systems", "structureDamageAmount", False)): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration", src.getModifiedItemAttr("siegeRemoteLogisticsDurationBonus")) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr, src.getModifiedItemAttr("siegeRemoteLogisticsAmountBonus"), stackingPenalties=stack) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "maxRange", src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True) @@ -58,7 +58,7 @@ def handler(fit, src, context): for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'): fit.ship.boostItemAttr("scan{}Strength".format(scanType), - src.getModifiedItemAttr("scan{}StrengthPercent").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) @@ -66,6 +66,7 @@ def handler(fit, src, context): fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus")) fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus")) fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus")) - fit.ship.increaseItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking")) fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus")) - fit.ship.increaseItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering")) \ No newline at end of file + + fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering")) + fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))