Merge branch 'Ebag333-Patch_1105543'

2016-12-16 21:27:19 -05:00
parent 291f73b661 58dd629956
commit 4f8493d1bb
26 changed files with 69 additions and 20 deletions
--- a/eos/effects/ammospeedmultiplier.py
+++ b/eos/effects/ammospeedmultiplier.py
@@ -1,7 +1,7 @@
 # ammoSpeedMultiplier
 #
 # Used by:
-# Charges from group: Festival Charges (8 of 8)
+# Charges from group: Festival Charges (9 of 9)
 # Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
 type = "passive"
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 47)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 activeByDefault = False

--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 47)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 activeByDefault = False

--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 47)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 activeByDefault = False

--- a/eos/effects/chargebonuswarfarecharge.py
+++ b/eos/effects/chargebonuswarfarecharge.py
@@ -1,3 +1,7 @@
+# chargeBonusWarfareCharge
+#
+# Used by:
+# Items from market group: Ammunition & Charges > Command Burst Charges (15 of 15)
 type = "active"

 def handler(fit, module, context):
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -10,6 +10,7 @@
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
+# Ship: Rabisu
 type = "passive"


--- a/eos/effects/energyweapondamagemultiply.py
+++ b/eos/effects/energyweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # energyWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Heat Sink (17 of 17)
+# Modules from group: Heat Sink (18 of 18)
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"
--- a/eos/effects/energyweaponspeedmultiply.py
+++ b/eos/effects/energyweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # energyWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Heat Sink (17 of 17)
+# Modules from group: Heat Sink (18 of 18)
 type = "passive"


--- a/eos/effects/hybridweapondamagemultiply.py
+++ b/eos/effects/hybridweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # hybridWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (12 of 12)
+# Modules from group: Magnetic Field Stabilizer (14 of 14)
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"
--- a/eos/effects/hybridweaponspeedmultiply.py
+++ b/eos/effects/hybridweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # hybridWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (12 of 12)
+# Modules from group: Magnetic Field Stabilizer (14 of 14)
 type = "passive"


--- a/eos/effects/modulebonusfightersupportunit.py
+++ b/eos/effects/modulebonusfightersupportunit.py
@@ -6,16 +6,16 @@ type = "passive"


 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
                                   src.getModifiedItemAttr("fighterBonusShieldCapacityPercent"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
                                   src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"),
                                   "fighterAbilityAttackMissileDuration",
                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
                                   src.getModifiedItemAttr("fighterBonusShieldRechargePercent"))
--- a/eos/effects/modulebonuswarfarelinkarmor.py
+++ b/eos/effects/modulebonuswarfarelinkarmor.py
@@ -1,3 +1,7 @@
+# moduleBonusWarfareLinkArmor
+#
+# Used by:
+# Variations of module: Armor Command Burst I (2 of 2)

 '''
 Some documentation:
--- a/eos/effects/modulebonuswarfarelinkinfo.py
+++ b/eos/effects/modulebonuswarfarelinkinfo.py
@@ -1,3 +1,7 @@
+# moduleBonusWarfareLinkInfo
+#
+# Used by:
+# Variations of module: Information Command Burst I (2 of 2)

 type = "active", "gang"
 def handler(fit, module, context, **kwargs):
--- a/eos/effects/modulebonuswarfarelinkmining.py
+++ b/eos/effects/modulebonuswarfarelinkmining.py
@@ -1,3 +1,7 @@
+# moduleBonusWarfareLinkMining
+#
+# Used by:
+# Variations of module: Mining Foreman Burst I (2 of 2)

 type = "active", "gang"
 def handler(fit, module, context, **kwargs):
--- a/eos/effects/modulebonuswarfarelinkshield.py
+++ b/eos/effects/modulebonuswarfarelinkshield.py
@@ -1,3 +1,7 @@
+# moduleBonusWarfareLinkShield
+#
+# Used by:
+# Variations of module: Shield Command Burst I (2 of 2)

 type = "active", "gang"
 def handler(fit, module, context, **kwargs):
--- a/eos/effects/modulebonuswarfarelinkskirmish.py
+++ b/eos/effects/modulebonuswarfarelinkskirmish.py
@@ -1,3 +1,7 @@
+# moduleBonusWarfareLinkSkirmish
+#
+# Used by:
+# Variations of module: Skirmish Command Burst I (2 of 2)

 type = "active", "gang"
 def handler(fit, module, context, **kwargs):
--- a/eos/effects/moduletitaneffectgenerator.py
+++ b/eos/effects/moduletitaneffectgenerator.py
@@ -1,3 +1,7 @@
+# moduleTitanEffectGenerator
+#
+# Used by:
+# Modules from group: Titan Phenomena Generator (4 of 4)
 type = "active", "gang"
 def handler(fit, module, context, **kwargs):
    for x in xrange(1, 5):
--- a/eos/effects/overloadrofbonus.py
+++ b/eos/effects/overloadrofbonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Torpedo (22 of 22)
-# Items from market group: Ship Equipment > Turrets & Bays (428 of 854)
+# Items from market group: Ship Equipment > Turrets & Bays (428 of 859)
 # Module: Interdiction Sphere Launcher I
 type = "overheat"

--- a/eos/effects/projectileweapondamagemultiply.py
+++ b/eos/effects/projectileweapondamagemultiply.py
@@ -1,7 +1,7 @@
 # projectileWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Gyrostabilizer (12 of 12)
+# Modules from group: Gyrostabilizer (13 of 13)
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"
--- a/eos/effects/projectileweaponspeedmultiply.py
+++ b/eos/effects/projectileweaponspeedmultiply.py
@@ -1,7 +1,7 @@
 # projectileWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Gyrostabilizer (12 of 12)
+# Modules from group: Gyrostabilizer (13 of 13)
 type = "passive"


--- a/eos/effects/setbonusasklepian.py
+++ b/eos/effects/setbonusasklepian.py
@@ -1,8 +1,8 @@
 # setBonusAsklepian
 #
 # Used by:
+# Implants named like: Asklepian Omega (3 of 3)
 # Implants named like: Grade Asklepian (16 of 16)
-# Implants named like: grade Asklepian Omega (2 of 2)
 runTime = "early"
 type = "passive"

--- a/eos/effects/shipbonuscommanddestroyerrole1defenderbonus.py
+++ b/eos/effects/shipbonuscommanddestroyerrole1defenderbonus.py
@@ -0,0 +1,10 @@
+# shipBonusCommandDestroyerRole1DefenderBonus
+#
+# Used by:
+# Ships from group: Command Destroyer (4 of 4)
+type = "passive"
+
+
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Defender Missiles"),
+                                  "moduleReactivationDelay", ship.getModifiedItemAttr("shipBonusRole1"))
--- a/eos/effects/skillmultiplierdefendermissilevelocity.py
+++ b/eos/effects/skillmultiplierdefendermissilevelocity.py
@@ -0,0 +1,10 @@
+# skillMultiplierDefenderMissileVelocity
+#
+# Used by:
+# Skill: Defender Missiles
+type = "passive"
+
+
+def handler(fit, skill, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
+                                    "maxVelocity", skill.getModifiedItemAttr("missileVelocityBonus") * skill.level)
--- a/eos/effects/usemissiles.py
+++ b/eos/effects/usemissiles.py
@@ -3,7 +3,7 @@
 # Used by:
 # Modules from group: Missile Launcher Heavy (12 of 12)
 # Modules from group: Missile Launcher Rocket (15 of 15)
-# Modules named like: Launcher (151 of 151)
+# Modules named like: Launcher (153 of 153)
 type = 'active'


--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -265,7 +265,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
            flightTime = self.getModifiedChargeAttr("explosionDelay") / 1000.0
            mass = self.getModifiedChargeAttr("mass")
            agility = self.getModifiedChargeAttr("agility")
-            if maxVelocity and flightTime and mass and agility:
+            if maxVelocity and (flightTime or mass or agility):
                accelTime = min(flightTime, mass * agility / 1000000)
                # Average distance done during acceleration
                duringAcceleration = maxVelocity / 2 * accelTime
--- a/eve.db
+++ b/eve.db