Merge branch 'singularity'

eos/effects.py

@@ -1731,7 +1731,7 @@ class Effect596(BaseEffect):
     ammoInfluenceRange
 
     Used by:
-    Items from category: Charge (587 of 951)
+    Items from category: Charge (588 of 952)
     """
 
     type = 'passive'
@@ -1783,7 +1783,7 @@ class Effect600(BaseEffect):
     ammoTrackingMultiplier
 
     Used by:
-    Items from category: Charge (182 of 951)
+    Items from category: Charge (182 of 952)
     Charges from group: Projectile Ammo (128 of 128)
     """
 
@@ -2310,7 +2310,7 @@ class Effect804(BaseEffect):
     ammoInfluenceCapNeed
 
     Used by:
-    Items from category: Charge (493 of 951)
+    Items from category: Charge (494 of 952)
     """
 
     type = 'passive'
@@ -9215,7 +9215,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)
     """
 
@@ -29036,7 +29036,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'),
@@ -33923,7 +33924,7 @@ class Effect6995(BaseEffect):
     targetDisintegratorAttack
 
     Used by:
-    Modules from group: Precursor Weapon (18 of 18)
+    Modules from group: Precursor Weapon (19 of 19)
     """
 
     type = 'active'
@@ -35121,6 +35122,7 @@ class Effect7092(BaseEffect):
     Ship: Hydra
     Ship: Leshak
     Ship: Tiamat
+    Ship: Triglavian Dreadnought
     """
 
     type = 'passive'
@@ -35144,6 +35146,7 @@ class Effect7093(BaseEffect):
     Ship: Hydra
     Ship: Leshak
     Ship: Tiamat
+    Ship: Triglavian Dreadnought
     """
 
     type = 'passive'
@@ -35166,6 +35169,7 @@ class Effect7094(BaseEffect):
     Ship: Hydra
     Ship: Leshak
     Ship: Tiamat
+    Ship: Triglavian Dreadnought
     """
 
     type = 'passive'
@@ -35222,6 +35226,7 @@ class Effect7112(BaseEffect):
     Ship: Hydra
     Ship: Leshak
     Ship: Tiamat
+    Ship: Triglavian Dreadnought
     """
 
     type = 'passive'
@@ -36011,7 +36016,7 @@ class Effect7232(BaseEffect):
     modifyDamageMultiplierBonusMax
 
     Used by:
-    Implants named like: Grade Mimesis (10 of 12)
+    Implants named like: Grade Mimesis (10 of 18)
     """
 
     type = 'passive'
@@ -36028,7 +36033,7 @@ class Effect7233(BaseEffect):
     modifyDamageMultiplierBonusPerCycle
 
     Used by:
-    Implants named like: Grade Mimesis (10 of 12)
+    Implants named like: Grade Mimesis (10 of 18)
     """
 
     type = 'passive'
@@ -36045,7 +36050,7 @@ class Effect7234(BaseEffect):
     implantSetMimesis
 
     Used by:
-    Implants named like: Grade Mimesis (12 of 12)
+    Implants named like: Grade Mimesis (12 of 18)
     """
 
     runTime = 'early'
@@ -36059,3 +36064,69 @@ 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: Triglavian Dreadnought
+    """
+
+    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: Triglavian Dreadnought
+    """
+
+    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: Triglavian Dreadnought
+    """
+
+    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)

service/conversions/trigDread.py

@@ -0,0 +1,11 @@
+"""
+In October 2019 we released triglavian dread preview builds, we had custom names for
+ship itself and its gun. Here we make sure that legacy names are converted into proper ones.
+"""
+
+CONVERSIONS = {
+    'Triglavian Dreadnought': 'Zirnitra',
+    'PLACEHOLDER TRIG DREAD': 'Zirnitra',
+    'XL Entropic Disintegrator': 'Ultratidal Entropic Disintegrator I',
+    'PLACEHOLDER TRIG XL WEAPON': 'Ultratidal Entropic Disintegrator I'
+}