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

Merge branch 'master' into ammo_graph

Browse Source
This commit is contained in:
DarkPhoenix
2019-12-07 03:34:26 +03:00
parent 61e32d0b1b 2962ce1945
commit 78423f67dd
129 changed files with 17059 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
eos/effects.py
View File

@@ -1350,7 +1350,6 @@ class Effect508(BaseEffect):
Ship: Cheetah
Ship: Freki
Ship: Republic Fleet Firetail
Ship: Rifter
Ship: Slasher
Ship: Stiletto
Ship: Wolf
@@ -1737,7 +1736,7 @@ class Effect596(BaseEffect):
ammoInfluenceRange
Used by:
Items from category: Charge (587 of 951)
Items from category: Charge (590 of 954)
"""
type = 'passive'
@@ -1789,7 +1788,13 @@ class Effect600(BaseEffect):
ammoTrackingMultiplier
Used by:
Items from category: Charge (182 of 951)
Charges from group: Advanced Artillery Ammo (8 of 8)
Charges from group: Advanced Autocannon Ammo (8 of 8)
Charges from group: Advanced Beam Laser Crystal (8 of 8)
Charges from group: Advanced Blaster Charge (8 of 8)
Charges from group: Advanced Exotic Plasma Charge (6 of 6)
Charges from group: Advanced Pulse Laser Crystal (8 of 8)
Charges from group: Advanced Railgun Charge (8 of 8)
Charges from group: Projectile Ammo (128 of 128)
"""
@@ -2316,7 +2321,7 @@ class Effect804(BaseEffect):
ammoInfluenceCapNeed
Used by:
Items from category: Charge (493 of 951)
Items from category: Charge (496 of 954)
"""
type = 'passive'
@@ -4793,7 +4798,7 @@ class Effect1615(BaseEffect):
shipAdvancedSpaceshipCommandAgilityBonus
Used by:
Items from market group: Ships > Capital Ships (40 of 40)
Items from market group: Ships > Capital Ships (40 of 41)
"""
type = 'passive'
@@ -4826,7 +4831,7 @@ class Effect1617(BaseEffect):
shipCapitalAgilityBonus
Used by:
Items from market group: Ships > Capital Ships (31 of 40)
Items from market group: Ships > Capital Ships (31 of 41)
"""
type = 'passive'
@@ -9158,7 +9163,7 @@ class Effect3001(BaseEffect):
Used by:
Modules from group: Missile Launcher Torpedo (22 of 22)
Items from market group: Ship Equipment > Turrets & Bays (429 of 888)
Items from market group: Ship Equipment > Turrets & Bays (429 of 889)
Module: Interdiction Sphere Launcher I
"""
@@ -9221,7 +9226,7 @@ class Effect3025(BaseEffect):
Used by:
Modules from group: Energy Weapon (101 of 214)
Modules from group: Hybrid Weapon (105 of 221)
Modules from group: Precursor Weapon (18 of 18)
Modules from group: Precursor Weapon (19 of 19)
Modules from group: Projectile Weapon (99 of 165)
"""
@@ -24474,7 +24479,7 @@ class Effect6104(BaseEffect):
entosisDurationMultiply
Used by:
Items from market group: Ships > Capital Ships (31 of 40)
Items from market group: Ships > Capital Ships (31 of 41)
"""
type = 'passive'
@@ -29051,7 +29056,8 @@ class Effect6582(BaseEffect):
# Turrets
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret') or
mod.item.requiresSkill('Capital Hybrid Turret') or
mod.item.requiresSkill('Capital Projectile Turret'),
mod.item.requiresSkill('Capital Projectile Turret') or
mod.item.requiresSkill('Capital Precursor Weapon'),
'damageMultiplier', src.getModifiedItemAttr('siegeTurretDamageBonus'), **kwargs)
fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Motion Prediction'),
@@ -33938,7 +33944,7 @@ class Effect6995(BaseEffect):
targetDisintegratorAttack
Used by:
Modules from group: Precursor Weapon (18 of 18)
Modules from group: Precursor Weapon (19 of 19)
"""
dealsDamage = True
@@ -35137,6 +35143,7 @@ class Effect7092(BaseEffect):
Ship: Hydra
Ship: Leshak
Ship: Tiamat
Ship: Zirnitra
"""
type = 'passive'
@@ -35160,6 +35167,7 @@ class Effect7093(BaseEffect):
Ship: Hydra
Ship: Leshak
Ship: Tiamat
Ship: Zirnitra
"""
type = 'passive'
@@ -35182,6 +35190,7 @@ class Effect7094(BaseEffect):
Ship: Hydra
Ship: Leshak
Ship: Tiamat
Ship: Zirnitra
"""
type = 'passive'
@@ -35238,6 +35247,7 @@ class Effect7112(BaseEffect):
Ship: Hydra
Ship: Leshak
Ship: Tiamat
Ship: Zirnitra
"""
type = 'passive'
@@ -36027,7 +36037,7 @@ class Effect7232(BaseEffect):
modifyDamageMultiplierBonusMax
Used by:
Implants named like: Grade Mimesis (10 of 12)
Implants named like: Grade Mimesis (15 of 18)
"""
type = 'passive'
@@ -36044,7 +36054,7 @@ class Effect7233(BaseEffect):
modifyDamageMultiplierBonusPerCycle
Used by:
Implants named like: Grade Mimesis (10 of 12)
Implants named like: Grade Mimesis (15 of 18)
"""
type = 'passive'
@@ -36061,7 +36071,7 @@ class Effect7234(BaseEffect):
implantSetMimesis
Used by:
Implants named like: Grade Mimesis (12 of 12)
Implants named like: Grade Mimesis (18 of 18)
"""
runTime = 'early'
@@ -36075,3 +36085,103 @@ class Effect7234(BaseEffect):
fit.appliedImplants.filteredItemMultiply(
lambda imp: imp.item.group.name == 'Cyberimplant', 'damageMultiplierBonusPerCycleModifier',
implant.getModifiedItemAttr('setBonusMimesis'), **kwargs)
class Effect7238(BaseEffect):
"""
shipBonusDreadnoughtPC1DamageMultMax
Used by:
Ship: Zirnitra
"""
type = 'passive'
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Precursor Weapon'), 'damageMultiplier',
src.getModifiedItemAttr('shipBonusDreadnoughtPC1'), skill='Precursor Dreadnought', **kwargs)
class Effect7239(BaseEffect):
"""
shipBonusDreadnoughtPC2ArmorResists
Used by:
Ship: Zirnitra
"""
type = 'passive'
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
for type in ('Em', 'Explosive', 'Kinetic', 'Thermal'):
fit.ship.boostItemAttr('armor{0}DamageResonance'.format(type), src.getModifiedItemAttr('shipBonusDreadnoughtPC2'),
skill='Precursor Dreadnought', **kwargs)
class Effect7240(BaseEffect):
"""
shipBonusDreadnoughtPC3WeaponSpeed
Used by:
Ship: Zirnitra
"""
type = 'passive'
@staticmethod
def handler(fit, src, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Precursor Weapon'), 'speed',
src.getModifiedItemAttr('shipBonusDreadnoughtPC3'), skill='Precursor Dreadnought', **kwargs)
class Effect7242(BaseEffect):
"""
capitalPrecursorTurretDmgBonusRequiredSkill
Used by:
Skill: Capital Precursor Weapon
"""
type = 'passive'
@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('Capital Precursor Weapon'),
'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level, **kwargs)
class Effect7247(BaseEffect):
"""
shipBonusHAMHMLAoeVelocityMC
Used by:
Ship: Bellicose
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredChargeBoost(lambda mod: (mod.charge.requiresSkill('Heavy Missiles') or
mod.charge.requiresSkill('Heavy Assault Missiles')),
'aoeVelocity', ship.getModifiedItemAttr('shipBonusMC'),
skill='Minmatar Cruiser', **kwargs)
class Effect7248(BaseEffect):
"""
shipPBonusROFMF
Used by:
Ship: Rifter
"""
type = 'passive'
@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
'speed', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)