dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'singularity'

Browse Source
This commit is contained in:
DarkPhoenix
2020-02-11 16:08:46 +03:00
parent e4069a3988 e951ce8e9d
commit a5226fee83
11 changed files with 11206 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

280
eos/effects.py
View File

@@ -961,8 +961,9 @@ class Effect279(BaseEffect):
@staticmethod
def handler(fit, container, context, projectionRange, **kwargs):
level = container.level if 'skill' in context else 1
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Capital Shield Emission Systems'),
'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
class Effect287(BaseEffect):
@@ -3224,8 +3225,9 @@ class Effect1030(BaseEffect):
@staticmethod
def handler(fit, container, context, projectionRange, **kwargs):
level = container.level if 'skill' in context else 1
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level, **kwargs)
class Effect1033(BaseEffect):
@@ -4553,7 +4555,7 @@ class Effect1551(BaseEffect):
class Effect1577(BaseEffect):
"""
angelsetbonus
haloSetBonus
Used by:
Implants named like: grade Halo (18 of 18)
@@ -4565,10 +4567,8 @@ class Effect1577(BaseEffect):
@staticmethod
def handler(fit, implant, context, projectionRange, **kwargs):
fit.appliedImplants.filteredItemMultiply(
lambda implant: 'signatureRadiusBonus' in implant.itemModifiedAttributes and
'implantSetAngel' in implant.itemModifiedAttributes,
'signatureRadiusBonus',
implant.getModifiedItemAttr('implantSetAngel'), **kwargs)
lambda implant: implant.item.requiresSkill('Cybernetics'),
'signatureRadiusBonus', implant.getModifiedItemAttr('implantSetHalo'), **kwargs)
class Effect1579(BaseEffect):
@@ -12370,7 +12370,7 @@ class Effect3992(BaseEffect):
systemShieldHP
Used by:
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
Celestials named like: Class Pulsar Effects (6 of 6)
"""
runTime = 'early'
@@ -12386,8 +12386,8 @@ class Effect3993(BaseEffect):
systemTargetingRange
Used by:
Celestials named like: Black Hole Effect Beacon Class (6 of 6)
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Black Hole Effects (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12404,8 +12404,8 @@ class Effect3995(BaseEffect):
systemSignatureRadius
Used by:
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Pulsar Effects (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -12422,8 +12422,8 @@ class Effect3996(BaseEffect):
systemArmorEmResistance
Used by:
Celestials named like: Class Pulsar Effects (6 of 6)
Celestials named like: Incursion Effect (2 of 2)
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
"""
runTime = 'early'
@@ -12440,8 +12440,8 @@ class Effect3997(BaseEffect):
systemArmorExplosiveResistance
Used by:
Celestials named like: Class Pulsar Effects (6 of 6)
Celestials named like: Incursion Effect (2 of 2)
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
"""
runTime = 'early'
@@ -12459,8 +12459,8 @@ class Effect3998(BaseEffect):
systemArmorKineticResistance
Used by:
Celestials named like: Class Pulsar Effects (6 of 6)
Celestials named like: Incursion Effect (2 of 2)
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
"""
runTime = 'early'
@@ -12478,8 +12478,8 @@ class Effect3999(BaseEffect):
systemArmorThermalResistance
Used by:
Celestials named like: Class Pulsar Effects (6 of 6)
Celestials named like: Incursion Effect (2 of 2)
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
"""
runTime = 'early'
@@ -12497,7 +12497,7 @@ class Effect4002(BaseEffect):
systemMissileVelocity
Used by:
Celestials named like: Black Hole Effect Beacon Class (6 of 6)
Celestials named like: Class Black Hole Effects (6 of 6)
"""
runTime = 'early'
@@ -12515,7 +12515,7 @@ class Effect4003(BaseEffect):
systemMaxVelocity
Used by:
Celestials named like: Black Hole Effect Beacon Class (6 of 6)
Celestials named like: Class Black Hole Effects (6 of 6)
"""
runTime = 'early'
@@ -12532,7 +12532,7 @@ class Effect4016(BaseEffect):
systemDamageMultiplierGunnery
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12550,7 +12550,7 @@ class Effect4017(BaseEffect):
systemDamageThermalMissiles
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12568,7 +12568,7 @@ class Effect4018(BaseEffect):
systemDamageEmMissiles
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12586,7 +12586,7 @@ class Effect4019(BaseEffect):
systemDamageExplosiveMissiles
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12604,7 +12604,7 @@ class Effect4020(BaseEffect):
systemDamageKineticMissiles
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12622,7 +12622,7 @@ class Effect4021(BaseEffect):
systemDamageDrones
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12640,7 +12640,7 @@ class Effect4022(BaseEffect):
systemTracking
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -12658,7 +12658,7 @@ class Effect4023(BaseEffect):
systemAoeVelocity
Used by:
Celestials named like: Black Hole Effect Beacon Class (6 of 6)
Celestials named like: Class Black Hole Effects (6 of 6)
"""
runTime = 'early'
@@ -12675,7 +12675,7 @@ class Effect4033(BaseEffect):
systemHeatDamage
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12692,7 +12692,7 @@ class Effect4034(BaseEffect):
systemOverloadArmor
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12709,7 +12709,7 @@ class Effect4035(BaseEffect):
systemOverloadDamageModifier
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12726,7 +12726,7 @@ class Effect4036(BaseEffect):
systemOverloadDurationBonus
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12743,7 +12743,7 @@ class Effect4037(BaseEffect):
systemOverloadEccmStrength
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12760,7 +12760,7 @@ class Effect4038(BaseEffect):
systemOverloadEcmStrength
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12777,7 +12777,7 @@ class Effect4039(BaseEffect):
systemOverloadHardening
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12794,7 +12794,7 @@ class Effect4040(BaseEffect):
systemOverloadRange
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12811,7 +12811,7 @@ class Effect4041(BaseEffect):
systemOverloadRof
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12828,7 +12828,7 @@ class Effect4042(BaseEffect):
systemOverloadSelfDuration
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12845,7 +12845,7 @@ class Effect4043(BaseEffect):
systemOverloadShieldBonus
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12862,7 +12862,7 @@ class Effect4044(BaseEffect):
systemOverloadSpeedFactor
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12879,7 +12879,7 @@ class Effect4045(BaseEffect):
systemSmartBombRange
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12896,7 +12896,7 @@ class Effect4046(BaseEffect):
systemSmartBombEmDamage
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12913,7 +12913,7 @@ class Effect4047(BaseEffect):
systemSmartBombThermalDamage
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12930,7 +12930,7 @@ class Effect4048(BaseEffect):
systemSmartBombKineticDamage
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12947,7 +12947,7 @@ class Effect4049(BaseEffect):
systemSmartBombExplosiveDamage
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -12964,7 +12964,7 @@ class Effect4054(BaseEffect):
systemSmallEnergyDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -12982,7 +12982,7 @@ class Effect4055(BaseEffect):
systemSmallProjectileDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13000,7 +13000,7 @@ class Effect4056(BaseEffect):
systemSmallHybridDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13018,7 +13018,7 @@ class Effect4057(BaseEffect):
systemRocketEmDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13036,7 +13036,7 @@ class Effect4058(BaseEffect):
systemRocketExplosiveDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13054,7 +13054,7 @@ class Effect4059(BaseEffect):
systemRocketKineticDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13072,7 +13072,7 @@ class Effect4060(BaseEffect):
systemRocketThermalDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13090,7 +13090,7 @@ class Effect4061(BaseEffect):
systemStandardMissileThermalDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13108,7 +13108,7 @@ class Effect4062(BaseEffect):
systemStandardMissileEmDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13126,7 +13126,7 @@ class Effect4063(BaseEffect):
systemStandardMissileExplosiveDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13144,7 +13144,7 @@ class Effect4086(BaseEffect):
systemArmorRepairAmount
Used by:
Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
Celestials named like: Class Cataclysmic Variable Effects (6 of 6)
"""
runTime = 'early'
@@ -13163,7 +13163,7 @@ class Effect4088(BaseEffect):
systemArmorRemoteRepairAmount
Used by:
Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
Celestials named like: Class Cataclysmic Variable Effects (6 of 6)
"""
runTime = 'early'
@@ -13171,10 +13171,9 @@ class Effect4088(BaseEffect):
@staticmethod
def handler(fit, module, context, projectionRange, **kwargs):
fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
'armorDamageAmount',
module.getModifiedItemAttr('armorDamageAmountMultiplierRemote'),
stackingPenalties=True, **kwargs)
fit.modules.filteredItemMultiply(
lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'armorDamageAmount', module.getModifiedItemAttr('armorDamageAmountMultiplierRemote'), stackingPenalties=True, **kwargs)
class Effect4089(BaseEffect):
@@ -13182,7 +13181,7 @@ class Effect4089(BaseEffect):
systemShieldRemoteRepairAmount
Used by:
Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
Celestials named like: Class Cataclysmic Variable Effects (6 of 6)
"""
runTime = 'early'
@@ -13190,9 +13189,9 @@ class Effect4089(BaseEffect):
@staticmethod
def handler(fit, module, context, projectionRange, **kwargs):
fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplierRemote'),
stackingPenalties=True, penaltyGroup='postMul', **kwargs)
fit.modules.filteredItemMultiply(
lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Capital Shield Emission Systems'),
'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplierRemote'), stackingPenalties=True, penaltyGroup='postMul', **kwargs)
class Effect4090(BaseEffect):
@@ -13200,7 +13199,7 @@ class Effect4090(BaseEffect):
systemCapacitorCapacity
Used by:
Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
Celestials named like: Class Cataclysmic Variable Effects (6 of 6)
"""
runTime = 'early'
@@ -13216,8 +13215,8 @@ class Effect4091(BaseEffect):
systemCapacitorRecharge
Used by:
Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
Celestials named like: Class Cataclysmic Variable Effects (6 of 6)
Celestials named like: Class Pulsar Effects (6 of 6)
"""
runTime = 'early'
@@ -13335,7 +13334,7 @@ class Effect4135(BaseEffect):
systemShieldEmResistance
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13352,7 +13351,7 @@ class Effect4136(BaseEffect):
systemShieldExplosiveResistance
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13370,7 +13369,7 @@ class Effect4137(BaseEffect):
systemShieldKineticResistance
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13388,7 +13387,7 @@ class Effect4138(BaseEffect):
systemShieldThermalResistance
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -13993,7 +13992,7 @@ class Effect4280(BaseEffect):
systemAgility
Used by:
Celestials named like: Black Hole Effect Beacon Class (6 of 6)
Celestials named like: Class Black Hole Effects (6 of 6)
"""
runTime = 'early'
@@ -15837,7 +15836,7 @@ class Effect4728(BaseEffect):
Used by:
Celestials named like: Drifter Incursion (6 of 6)
Celestials named like: Incursion ship attributes effects (3 of 3)
Celestials named like: Sansha Incursion System Effects (3 of 3)
"""
runTime = 'early'
@@ -16408,7 +16407,7 @@ class Effect4906(BaseEffect):
systemDamageFighters
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -16733,7 +16732,7 @@ class Effect4961(BaseEffect):
systemShieldRepairAmountShieldSkills
Used by:
Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
Celestials named like: Class Cataclysmic Variable Effects (6 of 6)
"""
runTime = 'early'
@@ -20374,7 +20373,7 @@ class Effect5440(BaseEffect):
systemStandardMissileKineticDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -23074,7 +23073,7 @@ class Effect5912(BaseEffect):
systemRemoteCapTransmitterAmount
Used by:
Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
Celestials named like: Class Cataclysmic Variable Effects (6 of 6)
"""
runTime = 'early'
@@ -23092,7 +23091,7 @@ class Effect5913(BaseEffect):
systemArmorHP
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -23108,7 +23107,7 @@ class Effect5914(BaseEffect):
systemEnergyNeutMultiplier
Used by:
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
Celestials named like: Class Pulsar Effects (6 of 6)
"""
runTime = 'early'
@@ -23127,7 +23126,7 @@ class Effect5915(BaseEffect):
systemEnergyVampireMultiplier
Used by:
Celestials named like: Pulsar Effect Beacon Class (6 of 6)
Celestials named like: Class Pulsar Effects (6 of 6)
"""
runTime = 'early'
@@ -23146,7 +23145,7 @@ class Effect5916(BaseEffect):
systemDamageExplosiveBombs
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23164,7 +23163,7 @@ class Effect5917(BaseEffect):
systemDamageKineticBombs
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23182,7 +23181,7 @@ class Effect5918(BaseEffect):
systemDamageThermalBombs
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23200,7 +23199,7 @@ class Effect5919(BaseEffect):
systemDamageEMBombs
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23218,7 +23217,7 @@ class Effect5920(BaseEffect):
systemAoeCloudSize
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -23235,7 +23234,7 @@ class Effect5921(BaseEffect):
systemTargetPainterMultiplier
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -23254,7 +23253,7 @@ class Effect5922(BaseEffect):
systemWebifierStrengthMultiplier
Used by:
Celestials named like: Black Hole Effect Beacon Class (6 of 6)
Celestials named like: Class Black Hole Effects (6 of 6)
"""
runTime = 'early'
@@ -23272,7 +23271,7 @@ class Effect5923(BaseEffect):
systemNeutBombs
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23291,7 +23290,7 @@ class Effect5924(BaseEffect):
systemGravimetricECMBomb
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23310,7 +23309,7 @@ class Effect5925(BaseEffect):
systemLadarECMBomb
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23329,7 +23328,7 @@ class Effect5926(BaseEffect):
systemMagnetrometricECMBomb
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23348,7 +23347,7 @@ class Effect5927(BaseEffect):
systemRadarECMBomb
Used by:
Celestials named like: Red Giant Beacon Class (6 of 6)
Celestials named like: Class Red Giant Effects (6 of 6)
"""
runTime = 'early'
@@ -23367,7 +23366,7 @@ class Effect5929(BaseEffect):
systemDroneTracking
Used by:
Celestials named like: Magnetar Effect Beacon Class (6 of 6)
Celestials named like: Class Magnetar Effects (6 of 6)
"""
runTime = 'early'
@@ -28171,12 +28170,10 @@ class Effect6526(BaseEffect):
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
mod.item.requiresSkill('Capital Capacitor Emission Systems'),
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Capacitor Emission Systems'),
'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
skill='Amarr Carrier', **kwargs)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
skill='Amarr Carrier', **kwargs)
@@ -28355,12 +28352,10 @@ class Effect6545(BaseEffect):
if src.getModifiedItemAttr('shipBonusForceAuxiliaryC1') is None:
return # See GH Issue 1321
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
mod.item.requiresSkill('Capital Capacitor Emission Systems'),
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Capacitor Emission Systems'),
'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
skill='Caldari Carrier', **kwargs)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
mod.item.requiresSkill('Capital Shield Emission Systems'),
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
'shieldBonus', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
skill='Caldari Carrier', **kwargs)
@@ -28399,14 +28394,9 @@ class Effect6548(BaseEffect):
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
mod.item.requiresSkill('Capital Shield Emission Systems'),
'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
skill='Gallente Carrier', **kwargs)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
skill='Gallente Carrier', **kwargs)
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems') or mod.item.requiresSkill('Capital Shield Emission Systems'),
'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'), skill='Gallente Carrier', **kwargs)
class Effect6549(BaseEffect):
@@ -28439,15 +28429,9 @@ class Effect6551(BaseEffect):
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
mod.item.requiresSkill('Capital Shield Emission Systems'),
'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
skill='Minmatar Carrier', **kwargs)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
skill='Minmatar Carrier', **kwargs)
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems') or mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'), skill='Minmatar Carrier', **kwargs)
class Effect6552(BaseEffect):
@@ -32604,7 +32588,7 @@ class Effect6862(BaseEffect):
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'), skill='Minmatar Carrier', **kwargs)
@@ -35171,8 +35155,9 @@ class Effect7092(BaseEffect):
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'), **kwargs)
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'), **kwargs)
class Effect7093(BaseEffect):
@@ -35218,8 +35203,9 @@ class Effect7094(BaseEffect):
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
'maxRange', ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
'maxRange', ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
class Effect7097(BaseEffect):
@@ -35243,7 +35229,7 @@ class Effect7111(BaseEffect):
systemSmallPrecursorTurretDamage
Used by:
Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
Celestials named like: Class Wolf Rayet Effects (6 of 6)
"""
runTime = 'early'
@@ -35795,7 +35781,7 @@ class Effect7193(BaseEffect):
systemMiningCycleTimeBonus
Used by:
Celestials named like: Invasion Effects (3 of 3)
Celestials named like: Triglavian Invasion System Effects (3 of 3)
"""
runTime = 'early'
@@ -35812,7 +35798,7 @@ class Effect7202(BaseEffect):
systemDroneSpeedBonusPercent
Used by:
Celestials named like: Invasion Effects (3 of 3)
Celestials named like: Triglavian Invasion System Effects (3 of 3)
"""
runTime = 'early'
@@ -35830,7 +35816,7 @@ class Effect7203(BaseEffect):
systemDroneDamageBonusPercent
Used by:
Celestials named like: Invasion Effects (3 of 3)
Celestials named like: Triglavian Invasion System Effects (3 of 3)
"""
runTime = 'early'
@@ -35975,7 +35961,7 @@ class Effect7223(BaseEffect):
systemAgilityBonusPercentItem
Used by:
Celestials named like: Invasion Effects (3 of 3)
Celestials named like: Triglavian Invasion System Effects (3 of 3)
"""
runTime = 'early'
@@ -35991,7 +35977,7 @@ class Effect7227(BaseEffect):
systemHullHPBonusPercentItem
Used by:
Celestials named like: Invasion Effects (3 of 3)
Celestials named like: Triglavian Invasion System Effects (3 of 3)
"""
runTime = 'early'
@@ -36238,3 +36224,37 @@ class Effect8013(BaseEffect):
def handler(fit, implant, context, projectionRange, **kwargs):
fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
'shieldHpBonus', implant.getModifiedItemAttr('ImplantSetNirvana') or 1, **kwargs)
class Effect8017(BaseEffect):
"""
saviorSetBonus
Used by:
Implants named like: grade Savior (18 of 18)
"""
runTime = 'early'
type = 'passive'
@staticmethod
def handler(fit, implant, context, projectionRange, **kwargs):
fit.appliedImplants.filteredItemMultiply(
lambda implant: implant.item.requiresSkill('Cybernetics'),
'remoteRepDurationBonus', implant.getModifiedItemAttr('implantSetSavior'), **kwargs)
class Effect8018(BaseEffect):
"""
subcapRemoteArmorShieldRepDurationBonus
Used by:
Implants named like: grade Savior (15 of 18)
"""
type = 'passive'
@staticmethod
def handler(fit, implant, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Remote Armor Repair Systems'),
'duration', implant.getModifiedItemAttr('remoteRepDurationBonus'), **kwargs)

20
gui/builtinContextMenus/envEffectAdd.py
View File

@@ -121,18 +121,18 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
# Expressions for matching when detecting effects we're looking for
if incursions:
validgroups = ("Incursion ship attributes effects",
"Invasion Effects")
validgroups = ("Sansha Incursion",
"Triglavian Invasion")
else:
validgroups = ("Black Hole Effect Beacon",
"Cataclysmic Variable Effect Beacon",
"Magnetar Effect Beacon",
"Pulsar Effect Beacon",
"Red Giant Beacon",
"Wolf Rayet Effect Beacon")
validgroups = ("Black Hole",
"Cataclysmic Variable",
"Magnetar",
"Pulsar",
"Red Giant",
"Wolf Rayet")
# Stuff we don't want to see in names
garbages = ("Effects?", "Beacon", "ship attributes effects")
garbages = ("System Effects", "Effects")
# Get group with all the system-wide beacons
grp = sMkt.getGroup("Effect Beacon")
@@ -142,7 +142,7 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
# Check if it belongs to any valid group
for group in validgroups:
# Check beginning of the name only
if re.match(group, beacon.name):
if re.search(group, beacon.name):
# Get full beacon name
beaconname = beacon.name
for garbage in garbages:

30
staticdata/fsd_binary/dogmaattributes.json
View File

@@ -10135,7 +10135,7 @@
"displayNameID": 233232,
"highIsGood": 1,
"iconID": 0,
"name": "implantSetAngel",
"name": "implantSetHalo",
"published": 1,
"stackable": 1,
"unitID": 104
@@ -32227,5 +32227,33 @@
"published": 1,
"stackable": 1,
"unitID": 104
},
"3023": {
"attributeID": 3023,
"categoryID": 7,
"dataType": 5,
"defaultValue": 1.0,
"displayName": "Savior Set Bonus",
"displayNameID": 559060,
"highIsGood": 1,
"iconID": 0,
"name": "implantSetSavior",
"published": 1,
"stackable": 1,
"unitID": 104
},
"3024": {
"attributeID": 3024,
"categoryID": 7,
"dataType": 5,
"defaultValue": 0.0,
"displayName": "Remote Rep Cycle Time Bonus",
"displayNameID": 559061,
"highIsGood": 1,
"iconID": 1392,
"name": "remoteRepDurationBonus",
"published": 1,
"stackable": 1,
"unitID": 105
}
}

118
staticdata/fsd_binary/dogmaeffects.json
View File

@@ -2652,6 +2652,14 @@
"modifyingAttributeID": 317,
"operation": 6,
"skillTypeID": 3422
},
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 6,
"modifyingAttributeID": 317,
"operation": 6,
"skillTypeID": 24571
}
],
"propulsionChance": 0,
@@ -8806,6 +8814,14 @@
"modifyingAttributeID": 317,
"operation": 6,
"skillTypeID": 16069
},
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 6,
"modifyingAttributeID": 317,
"operation": 6,
"skillTypeID": 24568
}
],
"propulsionChance": 0,
@@ -12060,7 +12076,7 @@
"disallowAutoRepeat": 0,
"effectCategory": 0,
"effectID": 1577,
"effectName": "angelsetbonus",
"effectName": "haloSetBonus",
"electronicChance": 0,
"guid": "",
"iconID": 0,
@@ -29400,6 +29416,14 @@
"modifyingAttributeID": 1498,
"operation": 4,
"skillTypeID": 16069
},
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 84,
"modifyingAttributeID": 1498,
"operation": 4,
"skillTypeID": 24568
}
],
"propulsionChance": 0,
@@ -29424,6 +29448,14 @@
"modifyingAttributeID": 1497,
"operation": 4,
"skillTypeID": 3422
},
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 68,
"modifyingAttributeID": 1497,
"operation": 4,
"skillTypeID": 24571
}
],
"propulsionChance": 0,
@@ -59220,7 +59252,7 @@
"modifiedAttributeID": 73,
"modifyingAttributeID": 2314,
"operation": 6,
"skillTypeID": 16069
"skillTypeID": 24568
},
{
"domain": "shipID",
@@ -59228,7 +59260,7 @@
"modifiedAttributeID": 73,
"modifyingAttributeID": 2314,
"operation": 6,
"skillTypeID": 3422
"skillTypeID": 24571
}
],
"propulsionChance": 0,
@@ -59284,7 +59316,7 @@
"modifiedAttributeID": 73,
"modifyingAttributeID": 2317,
"operation": 6,
"skillTypeID": 3422
"skillTypeID": 24571
},
{
"domain": "shipID",
@@ -59292,7 +59324,7 @@
"modifiedAttributeID": 73,
"modifyingAttributeID": 2317,
"operation": 6,
"skillTypeID": 16069
"skillTypeID": 24568
}
],
"propulsionChance": 0,
@@ -69408,7 +69440,7 @@
"modifiedAttributeID": 73,
"modifyingAttributeID": 2317,
"operation": 6,
"skillTypeID": 16069
"skillTypeID": 24568
}
],
"propulsionChance": 0,
@@ -75435,6 +75467,14 @@
"modifyingAttributeID": 2299,
"operation": 6,
"skillTypeID": 16069
},
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 6,
"modifyingAttributeID": 2299,
"operation": 6,
"skillTypeID": 24568
}
],
"propulsionChance": 0,
@@ -75485,6 +75525,14 @@
"modifyingAttributeID": 2298,
"operation": 6,
"skillTypeID": 16069
},
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 54,
"modifyingAttributeID": 2298,
"operation": 6,
"skillTypeID": 24568
}
],
"propulsionChance": 0,
@@ -77996,5 +78044,63 @@
"propulsionChance": 0,
"published": 0,
"rangeChance": 0
},
"8017": {
"disallowAutoRepeat": 0,
"effectCategory": 0,
"effectID": 8017,
"effectName": "saviorSetBonus",
"electronicChance": 0,
"guid": "",
"iconID": 0,
"isAssistance": 0,
"isOffensive": 0,
"isWarpSafe": 0,
"modifierInfo": [
{
"domain": "charID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 3024,
"modifyingAttributeID": 3023,
"operation": 0,
"skillTypeID": 3411
}
],
"propulsionChance": 0,
"published": 0,
"rangeChance": 0
},
"8018": {
"disallowAutoRepeat": 0,
"effectCategory": 0,
"effectID": 8018,
"effectName": "subcapRemoteArmorShieldRepDurationBonus",
"electronicChance": 0,
"guid": "",
"iconID": 0,
"isAssistance": 0,
"isOffensive": 0,
"isWarpSafe": 0,
"modifierInfo": [
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 73,
"modifyingAttributeID": 3024,
"operation": 6,
"skillTypeID": 16069
},
{
"domain": "shipID",
"func": "LocationRequiredSkillModifier",
"modifiedAttributeID": 73,
"modifyingAttributeID": 3024,
"operation": 6,
"skillTypeID": 3422
}
],
"propulsionChance": 0,
"published": 0,
"rangeChance": 0
}
}

28
staticdata/fsd_binary/metagroups.json
View File

@@ -35,34 +35,6 @@
"name": "Deadspace",
"nameID": 66677
},
"7": {
"name": "Frigates",
"nameID": 66678
},
"8": {
"name": "Elite Frigates",
"nameID": 66679
},
"9": {
"name": "Commander Frigates",
"nameID": 66680
},
"10": {
"name": "Destroyer",
"nameID": 66681
},
"11": {
"name": "Cruiser",
"nameID": 66682
},
"12": {
"name": "Elite Cruiser",
"nameID": 66683
},
"13": {
"name": "Commander Cruiser",
"nameID": 66684
},
"14": {
"iconID": 24151,
"iconSuffix": "t3",

237
staticdata/fsd_binary/requiredskillsfortypes.json
View File

@@ -9313,9 +9313,6 @@
]
},
"3536": {
"16069": [
1
],
"24568": [
1
]
@@ -9380,9 +9377,6 @@
]
},
"3544": {
"3422": [
1
],
"24571": [
1
]
@@ -9720,9 +9714,6 @@
]
},
"3616": {
"3422": [
1
],
"24571": [
1
]
@@ -9736,9 +9727,6 @@
]
},
"3618": {
"3422": [
5
],
"24571": [
4
]
@@ -42346,9 +42334,6 @@
]
},
"24569": {
"16069": [
1
],
"24568": [
1
]
@@ -77684,97 +77669,61 @@
]
},
"41463": {
"16069": [
1
],
"24568": [
1
]
},
"41464": {
"16069": [
1
],
"24568": [
1
]
},
"41465": {
"16069": [
1
],
"24568": [
1
]
},
"41466": {
"16069": [
5
],
"24568": [
4
]
},
"41467": {
"16069": [
1
],
"24568": [
1
]
},
"41468": {
"16069": [
1
],
"24568": [
1
]
},
"41469": {
"3422": [
1
],
"24571": [
1
]
},
"41470": {
"3422": [
1
],
"24571": [
1
]
},
"41471": {
"3422": [
1
],
"24571": [
1
]
},
"41472": {
"3422": [
1
],
"24571": [
1
]
},
"41473": {
"3422": [
1
],
"24571": [
1
]
},
"41474": {
"3422": [
1
],
"24571": [
1
]
@@ -77803,9 +77752,6 @@
]
},
"41479": {
"16069": [
1
],
"24568": [
1
]
@@ -77826,9 +77772,6 @@
]
},
"41483": {
"3422": [
1
],
"24571": [
1
]
@@ -88046,5 +87989,185 @@
"3380": [
4
]
},
"53890": {
"3411": [
2
]
},
"53891": {
"3411": [
2
]
},
"53892": {
"3411": [
3
]
},
"53893": {
"3411": [
3
]
},
"53894": {
"3411": [
4
]
},
"53895": {
"3411": [
5
]
},
"53896": {
"3411": [
2
]
},
"53897": {
"3411": [
2
]
},
"53898": {
"3411": [
3
]
},
"53899": {
"3411": [
3
]
},
"53900": {
"3411": [
4
]
},
"53901": {
"3411": [
5
]
},
"53902": {
"3411": [
2
]
},
"53903": {
"3411": [
2
]
},
"53904": {
"3411": [
3
]
},
"53905": {
"3411": [
3
]
},
"53906": {
"3411": [
4
]
},
"53907": {
"3411": [
5
]
},
"53908": {
"3380": [
4
]
},
"53909": {
"3380": [
4
]
},
"53910": {
"3380": [
4
]
},
"53911": {
"3380": [
4
]
},
"53912": {
"3380": [
4
]
},
"53913": {
"3380": [
4
]
},
"53914": {
"3380": [
4
]
},
"53915": {
"3380": [
4
]
},
"53916": {
"3380": [
4
]
},
"53917": {
"3380": [
4
]
},
"53918": {
"3380": [
4
]
},
"53919": {
"3380": [
4
]
},
"53920": {
"3380": [
4
]
},
"53921": {
"3380": [
4
]
},
"53922": {
"3380": [
4
]
},
"53923": {
"3380": [
4
]
},
"53924": {
"3380": [
4
]
},
"53925": {
"3380": [
4
]
}
}

6650
staticdata/fsd_binary/typedogma.json
View File

File diff suppressed because it is too large Load Diff

6
staticdata/fsd_lite/evegroups.json
View File

@@ -9441,7 +9441,7 @@
"groupID": 4029,
"groupName": "Talassonite",
"groupNameID": 549008,
"published": false,
"published": true,
"useBasePrice": false
},
"4030": {
@@ -9452,7 +9452,7 @@
"groupID": 4030,
"groupName": "Rakovene",
"groupNameID": 549009,
"published": false,
"published": true,
"useBasePrice": false
},
"4031": {
@@ -9463,7 +9463,7 @@
"groupID": 4031,
"groupName": "Bezdnacine",
"groupNameID": 549010,
"published": false,
"published": true,
"useBasePrice": false
},
"4033": {

2678
staticdata/fsd_lite/evetypes.json
View File

File diff suppressed because it is too large Load Diff

4
staticdata/phobos/metadata.json
View File

@@ -1,10 +1,10 @@
[
{
"field_name": "client_build",
"field_value": 1655072
"field_value": 1657583
},
{
"field_name": "dump_time",
"field_value": 1580211149
"field_value": 1580481349
}
]

2125
staticdata/phobos/traits.json
View File

File diff suppressed because it is too large Load Diff