Merge branch 'master' into test-3

# Conflicts:
#	config.py
#	eos/effects/warpdisruptsphere.py
#	service/update.py

config.py

@@ -21,10 +21,10 @@ saveInRoot = False
 
 # Version data
 
-version = "2.0.0b4"
+version = "2.0.0b5"
 tag = "git"
-expansionName = "YC120.2"
-expansionVersion = "1.2"
+expansionName = "YC120.3"
+expansionVersion = "1.8"
 evemonMinVersion = "4081"
 
 pyfaPath = None

eos/effects/ammoinfluencecapneed.py

@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (478 of 925)
+# Items from category: Charge (478 of 928)
 type = "passive"
 
 

eos/effects/ammoinfluencerange.py

@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (572 of 925)
+# Items from category: Charge (572 of 928)
 type = "passive"
 
 

eos/effects/ammospeedmultiplier.py

@@ -3,6 +3,7 @@
 # Used by:
 # Charges from group: Festival Charges (23 of 23)
 # Charges from group: Interdiction Probe (2 of 2)
+# Charges from group: Structure Festival Charges (3 of 3)
 type = "passive"
 
 

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 54)
+# Implants from group: Booster (12 of 62)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 54)
+# Implants from group: Booster (12 of 62)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 54)
+# Implants from group: Booster (12 of 62)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

eos/effects/doomsdayaoebubble.py

@@ -1,7 +1,7 @@
 # doomsdayAOEBubble
 #
 # Used by:
-# Module: Standup Warp Disruption Burst Projector
+# Module: Warp Disruption Burst Projector
 type = "projected", "active"
 
 

eos/effects/doomsdaybeamdot.py

@@ -1,7 +1,7 @@
 # doomsdayBeamDOT
 #
 # Used by:
-# Module: Lance type modules
+# Modules named like: Lance (4 of 4)
 type = "active"
 
 

eos/effects/doomsdayhog.py

@@ -1,7 +1,7 @@
 # doomsdayHOG
 #
 # Used by:
-# Module: GTFO - Gravitational Transportation Field Oscillator
+# Module: Gravitational Transportation Field Oscillator
 type = "active"
 
 

eos/effects/doomsdayslash.py

@@ -1,7 +1,7 @@
 # doomsdaySlash
 #
 # Used by:
-# Module: Reaper type modules
+# Modules named like: Reaper (4 of 4)
 type = "active"
 
 

eos/effects/elitebonusflagcruiserallresistances1.py

@@ -0,0 +1,20 @@
+# eliteBonusFlagCruiserAllResistances1
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("explosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("thermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("kineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("emDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")

eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py

@@ -9,4 +9,4 @@ type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capacitorNeedMultiplier") * level)
+                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)

eos/effects/microjumpportaldrive.py

@@ -1,7 +1,7 @@
 # microJumpPortalDrive
 #
 # Used by:
-# Module: MJFG - Micro Jump Field Generator (used on command destroyers)
+# Module: Micro Jump Field Generator
 type = "active"
 
 

eos/effects/missiledmgbonus.py

@@ -1,7 +1,7 @@
 # missileDMGBonus
 #
 # Used by:
-# Modules from group: Ballistic Control system (18 of 18)
+# Modules from group: Ballistic Control system (20 of 20)
 type = "passive"
 
 

eos/effects/missilelauncherspeedmultiplier.py

@@ -1,7 +1,7 @@
 # missileLauncherSpeedMultiplier
 #
 # Used by:
-# Modules from group: Ballistic Control system (18 of 18)
+# Modules from group: Ballistic Control system (20 of 20)
 type = "passive"
 
 

eos/effects/modulebonusdronedamageamplifier.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Drone Damage Modules (11 of 11)
+# Modules named like: C3 'Hivaa Saitsuo' Ballistic Control System (2 of 2)
 type = "passive"
 
 

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 (429 of 861)
+# Items from market group: Ship Equipment > Turrets & Bays (429 of 863)
 # Module: Interdiction Sphere Launcher I
 type = "overheat"
 

eos/effects/overloadselfdamagebonus.py

@@ -1,7 +1,7 @@
 # overloadSelfDamageBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (101 of 213)
+# Modules from group: Energy Weapon (101 of 214)
 # Modules from group: Hybrid Weapon (105 of 221)
 # Modules from group: Projectile Weapon (99 of 165)
 type = "overheat"

eos/effects/rolebonusflagcruisermodulefittingreduction.py

@@ -0,0 +1,17 @@
+# roleBonusFlagCruiserModuleFittingReduction
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Propulsion Module", "Micro Jump Drive"),
+                                  "power", src.getModifiedItemAttr("flagCruiserFittingBonusPropMods"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Propulsion Module", "Micro Jump Drive"),
+                                  "cpu", src.getModifiedItemAttr("flagCruiserFittingBonusPropMods"))
+
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Target Painter", "Scan Probe Launcher"),
+                                  "cpu", src.getModifiedItemAttr("flagCruiserFittingBonusPainterProbes"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Target Painter", "Scan Probe Launcher"),
+                                  "power", src.getModifiedItemAttr("flagCruiserFittingBonusPainterProbes"))

eos/effects/rolebonusflagcruisertargetpaintermodifications.py

@@ -0,0 +1,12 @@
+# roleBonusFlagCruiserTargetPainterModifications
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", "signatureRadiusBonus",
+                                  src.getModifiedItemAttr("targetPainterStrengthModifierFlagCruisers"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", "maxRange",
+                                  src.getModifiedItemAttr("targetPainterRangeModifierFlagCruisers"))

eos/effects/shipagilitybonusgc1.py

@@ -0,0 +1,9 @@
+# shipAgilityBonusGC1
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")

eos/effects/shiparmorhitpointsac1.py

@@ -0,0 +1,9 @@
+# shipArmorHitPointsAC1
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")

eos/effects/shipbonusdronedamagemultiplierrookie.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Gnosis
+# Ship: Praxis
 # Ship: Sunesis
 # Ship: Taipan
 # Ship: Velator

eos/effects/shipbonusdronehitpointsrookie.py

@@ -3,6 +3,7 @@
 # Used by:
 # Variations of ship: Procurer (2 of 2)
 # Ship: Gnosis
+# Ship: Praxis
 # Ship: Sunesis
 # Ship: Taipan
 # Ship: Velator

eos/effects/shipbonusheavyassaultmissileemdamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyAssaultMissileEMDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusheavyassaultmissileexplosivedamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyAssaultMissileExplosiveDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusheavyassaultmissilekineticdamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyAssaultMissileKineticDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
+                                    "kineticDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusheavyassaultmissilethermaldamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyAssaultMissileThermalDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
+                                    "thermalDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusheavymissileemdamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyMissileEMDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                    "emDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusheavymissileexplosivedamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyMissileExplosiveDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusheavymissilekineticdamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyMissileKineticDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusheavymissilethermaldamagecbc2.py

@@ -0,0 +1,10 @@
+# shipBonusHeavyMissileThermalDamageCBC2
+#
+# Used by:
+# Ship: Drake Navy Issue
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipbonusminingdroneamountpercentrookie.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Gnosis
+# Ship: Praxis
 # Ship: Taipan
 # Ship: Velator
 type = "passive"

eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py

@@ -9,4 +9,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusPirateFaction2"))
+                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusRole8"))

eos/effects/shipbonusremoterepairrangepiratefaction2.py

@@ -7,6 +7,6 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction2"))
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole8"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusPirateFaction2"))
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusRole8"))

eos/effects/shiplargeweaponsdamagebonus.py

@@ -0,0 +1,38 @@
+# shipLargeWeaponsDamageBonus
+#
+# Used by:
+# Ship: Praxis
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusRole7"))

eos/effects/shipscanprobestrengthbonuspiratecruiser.py

@@ -4,10 +4,11 @@
 # Ships named like: Stratios (2 of 2)
 # Ship: Astero
 # Ship: Gnosis
+# Ship: Praxis
 # Ship: Sunesis
 type = "passive"
 
 
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", container.getModifiedItemAttr("shipBonusPirateFaction2"))
+                                    "baseSensorStrength", container.getModifiedItemAttr("shipBonusRole8"))

eos/effects/shipshieldemresistance1cbc2.py

@@ -1,7 +1,8 @@
 # shipShieldEmResistance1CBC2
 #
 # Used by:
-# Variations of ship: Drake (3 of 3)
+# Ship: Drake
+# Ship: Nighthawk
 # Ship: Vulture
 type = "passive"
 

eos/effects/shipshieldexplosiveresistance1cbc2.py

@@ -1,7 +1,8 @@
 # shipShieldExplosiveResistance1CBC2
 #
 # Used by:
-# Variations of ship: Drake (3 of 3)
+# Ship: Drake
+# Ship: Nighthawk
 # Ship: Vulture
 type = "passive"
 

eos/effects/shipshieldhitpointscc1.py

@@ -0,0 +1,9 @@
+# shipShieldHitpointsCC1
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")

eos/effects/shipshieldkineticresistance1cbc2.py

@@ -1,7 +1,8 @@
 # shipShieldKineticResistance1CBC2
 #
 # Used by:
-# Variations of ship: Drake (3 of 3)
+# Ship: Drake
+# Ship: Nighthawk
 # Ship: Vulture
 type = "passive"
 

eos/effects/shipshieldthermalresistance1cbc2.py

@@ -1,7 +1,8 @@
 # shipShieldThermalResistance1CBC2
 #
 # Used by:
-# Variations of ship: Drake (3 of 3)
+# Ship: Drake
+# Ship: Nighthawk
 # Ship: Vulture
 type = "passive"
 

eos/effects/shipsignatureradiusmc1.py

@@ -0,0 +1,9 @@
+# shipSignatureRadiusMC1
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")

eos/effects/targetattack.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Drones from group: Combat Drone (74 of 74)
-# Modules from group: Energy Weapon (212 of 213)
+# Modules from group: Energy Weapon (212 of 214)
 type = 'active'
 
 

eos/effects/warpdisruptsphere.py

@@ -1,3 +1,4 @@
+
 # warpDisruptSphere
 #
 # Used by:

gui/builtinAdditionPanes/cargoView.py

@@ -135,7 +135,7 @@ class CargoView(d.Display):
         sFit = Fit.getInstance()
         fit = sFit.getFit(event.fitID)
 
-        self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
+        # self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
 
         # Clear list and get out if current fitId is None
         if event.fitID is None and self.lastFitId is not None: