Merge pull request #160 from blitzmann/fix-159

Fixes for stacking penalties for various wormhole effects
2014-09-09 19:16:42 +04:00
parent c262acd0dc 0524b901f5
commit a2499cc070
23 changed files with 32 additions and 31 deletions
--- a/eos/effects/systemagility.py
+++ b/eos/effects/systemagility.py
@@ -3,4 +3,4 @@
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("agility", beacon.getModifiedItemAttr("agilityMultiplier"))
+    fit.ship.multiplyItemAttr("agility", beacon.getModifiedItemAttr("agilityMultiplier"), stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemarmorremoterepairamount.py
+++ b/eos/effects/systemarmorremoterepairamount.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Armor Repairer",
-                                     "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"))
+                                     "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"),
+                                     stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagedrones.py
+++ b/eos/effects/systemdamagedrones.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Drones"),
-                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
+                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
+                                    stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemdamageemmissiles.py
+++ b/eos/effects/systemdamageemmissiles.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "emDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties = True)
+                                       "emDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
--- a/eos/effects/systemdamageexplosivemissiles.py
+++ b/eos/effects/systemdamageexplosivemissiles.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties = True)
+                                       "explosiveDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
--- a/eos/effects/systemdamagefighters.py
+++ b/eos/effects/systemdamagefighters.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Fighters"),
-                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
+                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier")
+                                    stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagekineticmissiles.py
+++ b/eos/effects/systemdamagekineticmissiles.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties = True)
+                                       "kineticDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
--- a/eos/effects/systemdamagemultipliergunnery.py
+++ b/eos/effects/systemdamagemultipliergunnery.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                     "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                     stackingPenalties = True)
+                                     stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagethermalmissiles.py
+++ b/eos/effects/systemdamagethermalmissiles.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties = True)
+                                       "thermalDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
--- a/eos/effects/systemdronetracking.py
+++ b/eos/effects/systemdronetracking.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.drones.filteredItemMultiply(lambda drone: True,
-                                    "trackingSpeed", beacon.getModifiedItemAttr("trackingSpeedMultiplier"))
+                                    "trackingSpeed", beacon.getModifiedItemAttr("trackingSpeedMultiplier"),
+                                    stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemmaxvelocity.py
+++ b/eos/effects/systemmaxvelocity.py
@@ -3,4 +3,4 @@
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"))
+    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemmissilevelocity.py
+++ b/eos/effects/systemmissilevelocity.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "maxVelocity", beacon.getModifiedItemAttr("missileVelocityMultiplier"))
+                                       "maxVelocity", beacon.getModifiedItemAttr("missileVelocityMultiplier"),
+                                       stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemshieldremoterepairamount.py
+++ b/eos/effects/systemshieldremoterepairamount.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"))
+                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"),
+                                     stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemsignatureradius.py
+++ b/eos/effects/systemsignatureradius.py
@@ -4,4 +4,5 @@
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("signatureRadius", beacon.getModifiedItemAttr("signatureRadiusMultiplier"))
+    fit.ship.multiplyItemAttr("signatureRadius", beacon.getModifiedItemAttr("signatureRadiusMultiplier"),
+                                    stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemsmallenergydamage.py
+++ b/eos/effects/systemsmallenergydamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties = True)
+                                     stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemsmallhybriddamage.py
+++ b/eos/effects/systemsmallhybriddamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties = True)
+                                     stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemsmallprojectiledamage.py
+++ b/eos/effects/systemsmallprojectiledamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties = True)
+                                     stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemstandardmissileemdamage.py
+++ b/eos/effects/systemstandardmissileemdamage.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties = True)
+                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
--- a/eos/effects/systemstandardmissileexplosivedamage.py
+++ b/eos/effects/systemstandardmissileexplosivedamage.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties = True)
+                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
--- a/eos/effects/systemstandardmissilekineticdamage.py
+++ b/eos/effects/systemstandardmissilekineticdamage.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties = True)
+                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
--- a/eos/effects/systemstandardmissilethermaldamage.py
+++ b/eos/effects/systemstandardmissilethermaldamage.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties = True)
+                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
--- a/eos/effects/systemtargetingrange.py
+++ b/eos/effects/systemtargetingrange.py
@@ -4,4 +4,5 @@
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxTargetRange", beacon.getModifiedItemAttr("maxTargetRangeMultiplier"))
+    fit.ship.multiplyItemAttr("maxTargetRange", beacon.getModifiedItemAttr("maxTargetRangeMultiplier"),
+                                        stackingPenalties = True, penaltyGroup="postMul")
--- a/eos/effects/systemtracking.py
+++ b/eos/effects/systemtracking.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                     "trackingSpeed", module.getModifiedItemAttr("trackingSpeedMultiplier"))
+                                     "trackingSpeed", module.getModifiedItemAttr("trackingSpeedMultiplier"),
+                                     stackingPenalties = True, penaltyGroup="postMul")