diff --git a/config.py b/config.py index df540bbd7..1ce7b1445 100644 --- a/config.py +++ b/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 diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py index d5110c5f1..b798f0f4b 100644 --- a/eos/effects/ammoinfluencecapneed.py +++ b/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" diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py index 1c7d4ea44..078b2b205 100644 --- a/eos/effects/ammoinfluencerange.py +++ b/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" diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/ammospeedmultiplier.py index 31ebe295b..ac7ada2ad 100644 --- a/eos/effects/ammospeedmultiplier.py +++ b/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" diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py index c65338065..63fb57cd1 100644 --- a/eos/effects/boosterarmorhppenalty.py +++ b/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 diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py index c6b7d99e0..b6decaf9f 100644 --- a/eos/effects/boostermaxvelocitypenalty.py +++ b/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 diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py index 9497300b9..7bc929983 100644 --- a/eos/effects/boostershieldcapacitypenalty.py +++ b/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 diff --git a/eos/effects/doomsdayaoebubble.py b/eos/effects/doomsdayaoebubble.py index c4945d697..1eb899ac0 100644 --- a/eos/effects/doomsdayaoebubble.py +++ b/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" diff --git a/eos/effects/doomsdaybeamdot.py b/eos/effects/doomsdaybeamdot.py index fff941579..b97beb097 100644 --- a/eos/effects/doomsdaybeamdot.py +++ b/eos/effects/doomsdaybeamdot.py @@ -1,7 +1,7 @@ # doomsdayBeamDOT # # Used by: -# Module: Lance type modules +# Modules named like: Lance (4 of 4) type = "active" diff --git a/eos/effects/doomsdayhog.py b/eos/effects/doomsdayhog.py index 182d0c29f..4e0fcc1dd 100644 --- a/eos/effects/doomsdayhog.py +++ b/eos/effects/doomsdayhog.py @@ -1,7 +1,7 @@ # doomsdayHOG # # Used by: -# Module: GTFO - Gravitational Transportation Field Oscillator +# Module: Gravitational Transportation Field Oscillator type = "active" diff --git a/eos/effects/doomsdayslash.py b/eos/effects/doomsdayslash.py index e6b55ede9..934766b11 100644 --- a/eos/effects/doomsdayslash.py +++ b/eos/effects/doomsdayslash.py @@ -1,7 +1,7 @@ # doomsdaySlash # # Used by: -# Module: Reaper type modules +# Modules named like: Reaper (4 of 4) type = "active" diff --git a/eos/effects/elitebonusflagcruiserallresistances1.py b/eos/effects/elitebonusflagcruiserallresistances1.py new file mode 100644 index 000000000..5ca4a504d --- /dev/null +++ b/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") diff --git a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py b/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py index d2b5f33c2..12ae33b27 100644 --- a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py +++ b/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) diff --git a/eos/effects/microjumpportaldrive.py b/eos/effects/microjumpportaldrive.py index 40925b491..1e5a02569 100644 --- a/eos/effects/microjumpportaldrive.py +++ b/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" diff --git a/eos/effects/missiledmgbonus.py b/eos/effects/missiledmgbonus.py index 3abc18387..d565bdaaf 100644 --- a/eos/effects/missiledmgbonus.py +++ b/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" diff --git a/eos/effects/missilelauncherspeedmultiplier.py b/eos/effects/missilelauncherspeedmultiplier.py index 9e2a28559..cc339b5ab 100644 --- a/eos/effects/missilelauncherspeedmultiplier.py +++ b/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" diff --git a/eos/effects/modulebonusdronedamageamplifier.py b/eos/effects/modulebonusdronedamageamplifier.py index f37ea4a1d..ac7fb062d 100644 --- a/eos/effects/modulebonusdronedamageamplifier.py +++ b/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" diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py index 6248b687d..4d5707173 100644 --- 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 (429 of 861) +# Items from market group: Ship Equipment > Turrets & Bays (429 of 863) # Module: Interdiction Sphere Launcher I type = "overheat" diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/overloadselfdamagebonus.py index 451c95201..a60a741e4 100644 --- a/eos/effects/overloadselfdamagebonus.py +++ b/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" diff --git a/eos/effects/rolebonusflagcruisermodulefittingreduction.py b/eos/effects/rolebonusflagcruisermodulefittingreduction.py new file mode 100644 index 000000000..2020db2d9 --- /dev/null +++ b/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")) diff --git a/eos/effects/rolebonusflagcruisertargetpaintermodifications.py b/eos/effects/rolebonusflagcruisertargetpaintermodifications.py new file mode 100644 index 000000000..7400a0707 --- /dev/null +++ b/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")) diff --git a/eos/effects/shipagilitybonusgc1.py b/eos/effects/shipagilitybonusgc1.py new file mode 100644 index 000000000..6c08d527f --- /dev/null +++ b/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") diff --git a/eos/effects/shiparmorhitpointsac1.py b/eos/effects/shiparmorhitpointsac1.py new file mode 100644 index 000000000..853eed5d1 --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusdronedamagemultiplierrookie.py b/eos/effects/shipbonusdronedamagemultiplierrookie.py index a5e45f38c..23c9a4b5b 100644 --- a/eos/effects/shipbonusdronedamagemultiplierrookie.py +++ b/eos/effects/shipbonusdronedamagemultiplierrookie.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Gnosis +# Ship: Praxis # Ship: Sunesis # Ship: Taipan # Ship: Velator diff --git a/eos/effects/shipbonusdronehitpointsrookie.py b/eos/effects/shipbonusdronehitpointsrookie.py index 27413bed0..3862e2144 100644 --- a/eos/effects/shipbonusdronehitpointsrookie.py +++ b/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 diff --git a/eos/effects/shipbonusheavyassaultmissileemdamagecbc2.py b/eos/effects/shipbonusheavyassaultmissileemdamagecbc2.py new file mode 100644 index 000000000..dc9dfef75 --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusheavyassaultmissileexplosivedamagecbc2.py b/eos/effects/shipbonusheavyassaultmissileexplosivedamagecbc2.py new file mode 100644 index 000000000..3ea3ea593 --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc2.py b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc2.py new file mode 100644 index 000000000..fdb946508 --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusheavyassaultmissilethermaldamagecbc2.py b/eos/effects/shipbonusheavyassaultmissilethermaldamagecbc2.py new file mode 100644 index 000000000..dd3e5b94a --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusheavymissileemdamagecbc2.py b/eos/effects/shipbonusheavymissileemdamagecbc2.py new file mode 100644 index 000000000..a2e53af5a --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusheavymissileexplosivedamagecbc2.py b/eos/effects/shipbonusheavymissileexplosivedamagecbc2.py new file mode 100644 index 000000000..c4a2df83e --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusheavymissilekineticdamagecbc2.py b/eos/effects/shipbonusheavymissilekineticdamagecbc2.py new file mode 100644 index 000000000..f9ef052fa --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusheavymissilethermaldamagecbc2.py b/eos/effects/shipbonusheavymissilethermaldamagecbc2.py new file mode 100644 index 000000000..cf22a33c3 --- /dev/null +++ b/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") diff --git a/eos/effects/shipbonusminingdroneamountpercentrookie.py b/eos/effects/shipbonusminingdroneamountpercentrookie.py index bffbe6b81..5cde2c087 100644 --- a/eos/effects/shipbonusminingdroneamountpercentrookie.py +++ b/eos/effects/shipbonusminingdroneamountpercentrookie.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Gnosis +# Ship: Praxis # Ship: Taipan # Ship: Velator type = "passive" diff --git a/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py b/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py index e1976dc49..e7634c7ec 100644 --- a/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py +++ b/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")) diff --git a/eos/effects/shipbonusremoterepairrangepiratefaction2.py b/eos/effects/shipbonusremoterepairrangepiratefaction2.py index 551227691..7a8923b45 100644 --- a/eos/effects/shipbonusremoterepairrangepiratefaction2.py +++ b/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")) diff --git a/eos/effects/shiplargeweaponsdamagebonus.py b/eos/effects/shiplargeweaponsdamagebonus.py new file mode 100644 index 000000000..a734806d8 --- /dev/null +++ b/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")) diff --git a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py index 79874dbef..c57d3adff 100644 --- a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py +++ b/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")) diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/shipshieldemresistance1cbc2.py index 83a19ed65..82fe621bc 100644 --- a/eos/effects/shipshieldemresistance1cbc2.py +++ b/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" diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/shipshieldexplosiveresistance1cbc2.py index 5f5559e19..c3e3846de 100644 --- a/eos/effects/shipshieldexplosiveresistance1cbc2.py +++ b/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" diff --git a/eos/effects/shipshieldhitpointscc1.py b/eos/effects/shipshieldhitpointscc1.py new file mode 100644 index 000000000..06fdfea96 --- /dev/null +++ b/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") diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/shipshieldkineticresistance1cbc2.py index 4fccf027e..8db3ea8be 100644 --- a/eos/effects/shipshieldkineticresistance1cbc2.py +++ b/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" diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/shipshieldthermalresistance1cbc2.py index fad8935c7..4268d279f 100644 --- a/eos/effects/shipshieldthermalresistance1cbc2.py +++ b/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" diff --git a/eos/effects/shipsignatureradiusmc1.py b/eos/effects/shipsignatureradiusmc1.py new file mode 100644 index 000000000..e366d23af --- /dev/null +++ b/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") diff --git a/eos/effects/targetattack.py b/eos/effects/targetattack.py index 236a426d8..4f0625c89 100644 --- a/eos/effects/targetattack.py +++ b/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' diff --git a/eos/effects/warpdisruptsphere.py b/eos/effects/warpdisruptsphere.py index ef640f5ff..22787465b 100644 --- a/eos/effects/warpdisruptsphere.py +++ b/eos/effects/warpdisruptsphere.py @@ -1,3 +1,4 @@ + # warpDisruptSphere # # Used by: diff --git a/eve.db b/eve.db index 90d9e3b6a..5493b4e20 100644 Binary files a/eve.db and b/eve.db differ diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index 91b566283..ed5687cfc 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/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: diff --git a/imgs/renders/45534.png b/imgs/renders/45534.png new file mode 100644 index 000000000..c1aec27af Binary files /dev/null and b/imgs/renders/45534.png differ diff --git a/imgs/renders/47466.png b/imgs/renders/47466.png new file mode 100644 index 000000000..0da4159c9 Binary files /dev/null and b/imgs/renders/47466.png differ