diff --git a/eos/effects.py b/eos/effects.py index 15e98a14e..6605ade98 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -25267,6 +25267,7 @@ class Effect6281(BaseEffect): shipBonusEnergyNeutOptimalAF2 Used by: + Ship: Cruor Ship: Malice """ @@ -25283,6 +25284,7 @@ class Effect6285(BaseEffect): shipBonusEnergyNeutFalloffAF3 Used by: + Ship: Cruor Ship: Malice """ @@ -25299,6 +25301,7 @@ class Effect6287(BaseEffect): shipBonusEnergyNosOptimalAF2 Used by: + Ship: Cruor Ship: Malice """ @@ -25315,6 +25318,7 @@ class Effect6291(BaseEffect): shipBonusEnergyNosFalloffAF3 Used by: + Ship: Cruor Ship: Malice """ @@ -25347,6 +25351,7 @@ class Effect6299(BaseEffect): shipBonusEnergyNeutFalloffAC3 Used by: + Ship: Ashimmu Ship: Vangel """ @@ -25397,6 +25402,7 @@ class Effect6305(BaseEffect): shipBonusEnergyNosFalloffAC3 Used by: + Ship: Ashimmu Ship: Vangel """ @@ -42232,6 +42238,40 @@ class Effect12596(BaseEffect): src.getModifiedItemAttr('shipMiningBonusYieldOreDestroyerRoleBonus'), **kwargs) +class Effect12739(BaseEffect): + """ + shipBonusEnergyNeutOptimalAC2 + + Used by: + Ship: Ashimmu + """ + + type = 'passive' + + @staticmethod + def handler(fit, src, context, projectionRange, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange', + src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs) + + +class Effect12740(BaseEffect): + """ + shipBonusEnergyNosOptimalAC2 + + Used by: + Ship: Ashimmu + """ + + type = 'passive' + + @staticmethod + def handler(fit, src, context, projectionRange, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange', + src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs) + + class Effect12753(BaseEffect): """ shipRoleBonusOREExecutiveIssueMiningCriticalHitChanceBonus diff --git a/staticdata/fsd_built/typedogma.0.json b/staticdata/fsd_built/typedogma.0.json index 555e8369f..bbebc6d21 100644 --- a/staticdata/fsd_built/typedogma.0.json +++ b/staticdata/fsd_built/typedogma.0.json @@ -824833,6 +824833,10 @@ "attributeID": 633, "value": 8.0 }, + { + "attributeID": 656, + "value": 20.0 + }, { "attributeID": 659, "value": 20.0 @@ -824847,7 +824851,7 @@ }, { "attributeID": 793, - "value": 100.0 + "value": 125.0 }, { "attributeID": 1132, @@ -824933,6 +824937,10 @@ "attributeID": 2045, "value": 1.0 }, + { + "attributeID": 2070, + "value": 10.0 + }, { "attributeID": 2113, "value": 1.0 @@ -824966,6 +824974,22 @@ { "effectID": 5854, "isDefault": 0 + }, + { + "effectID": 6299, + "isDefault": 0 + }, + { + "effectID": 6305, + "isDefault": 0 + }, + { + "effectID": 12739, + "isDefault": 0 + }, + { + "effectID": 12740, + "isDefault": 0 } ] }, @@ -825579,6 +825603,10 @@ "attributeID": 484, "value": 0.75 }, + { + "attributeID": 485, + "value": 20.0 + }, { "attributeID": 511, "value": 0.0 @@ -825621,7 +825649,7 @@ }, { "attributeID": 793, - "value": 100.0 + "value": 125.0 }, { "attributeID": 1132, @@ -825691,6 +825719,10 @@ "attributeID": 1555, "value": 38.0 }, + { + "attributeID": 1623, + "value": 10.0 + }, { "attributeID": 1692, "value": 4.0 @@ -825740,6 +825772,22 @@ { "effectID": 5854, "isDefault": 0 + }, + { + "effectID": 6281, + "isDefault": 0 + }, + { + "effectID": 6285, + "isDefault": 0 + }, + { + "effectID": 6287, + "isDefault": 0 + }, + { + "effectID": 6291, + "isDefault": 0 } ] }, diff --git a/staticdata/phobos/traits.0.json b/staticdata/phobos/traits.0.json index 85a3b2402..644e74e06 100644 --- a/staticdata/phobos/traits.0.json +++ b/staticdata/phobos/traits.0.json @@ -162145,7 +162145,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "Bonus auf den Schaden von mittelgroßen Energiegeschütztürmen" }, { @@ -162169,6 +162169,14 @@ { "number": "15%", "text": "Bonus auf die Transfermenge von Nosferatu- und Energieneutralisierer-Modulen" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Amarr Cruiser Boni (je Skillstufe):" @@ -162179,7 +162187,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "bonus to Medium Energy Turret damage" }, { @@ -162203,6 +162211,14 @@ { "number": "15%", "text": "bonus to Energy Nosferatu and Energy Neutralizer drain amount" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Amarr Cruiser bonuses (per skill level):" @@ -162213,7 +162229,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "de bonificación al daño de la torreta de energía mediana." }, { @@ -162237,6 +162253,14 @@ { "number": "15%", "text": "de bonificación a la cantidad drenada por el nosferatu de energía y el neutralizador energético." + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Bonificaciones de Crucero amarriano (por nivel de habilidad):" @@ -162247,7 +162271,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "de bonus aux dégâts des tourelles à énergie intermédiaires" }, { @@ -162271,6 +162295,14 @@ { "number": "15%", "text": "de bonus à la quantité d'énergie récupérée par le Nosferatu à énergie et le neutraliseur d'énergie" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": " Bonus (par niveau de compétence) Croiseur amarr :" @@ -162281,7 +162313,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "bonus to Medium Energy Turret damage" }, { @@ -162305,6 +162337,14 @@ { "number": "15%", "text": "bonus to Energy Nosferatu and Energy Neutralizer drain amount" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Amarr Cruiser bonuses (per skill level):" @@ -162315,7 +162355,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "中型エネルギータレットのダメージが増加" }, { @@ -162339,6 +162379,14 @@ { "number": "15%", "text": "エネルギーノスフェラトゥおよびエネルギーニュートライザーの消費量が改善" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "アマー巡洋艦ボーナス(スキルレベルごとに):" @@ -162349,7 +162397,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "중형 에너지 터렛 피해량 증가" }, { @@ -162373,6 +162421,14 @@ { "number": "15%", "text": "에너지 노스페라투 및 에너지 뉴트럴라이저 흡수량 증가" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "아마르 크루저 보너스 (스킬 레벨당):" @@ -162383,7 +162439,7 @@ "role": { "bonuses": [ { - "number": "на 100%", + "number": "на 125%", "text": "увеличивается урон средних лазерных орудий" }, { @@ -162407,6 +162463,14 @@ { "number": "на 15%", "text": "увеличивается пропускная способность устройств паразитной подзарядки накопителя и дистанционных нейтрализаторов заряда" + }, + { + "number": "на 20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "на 10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "За каждую степень освоения навыка Амаррские крейсеры:" @@ -162417,7 +162481,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "中型能量炮台伤害加成" }, { @@ -162441,6 +162505,14 @@ { "number": "15%", "text": "掠能器和能量中和器吸取量加成" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "艾玛巡洋舰操作每升一级：" @@ -162871,7 +162943,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "Bonus auf den Schaden von kleinen Energiegeschütztürmen" }, { @@ -162895,6 +162967,14 @@ { "number": "15%", "text": "Bonus auf die Transfermenge von Nosferatu- und Energieneutralisierer-Modulen" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Amarr Frigate Boni (je Skillstufe):" @@ -162905,7 +162985,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "bonus to Small Energy Turret damage" }, { @@ -162929,6 +163009,14 @@ { "number": "15%", "text": "bonus to Energy Nosferatu and Energy Neutralizer drain amount" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Amarr Frigate bonuses (per skill level):" @@ -162939,7 +163027,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "de bonificación al daño de la torreta de energía pequeña." }, { @@ -162963,6 +163051,14 @@ { "number": "15%", "text": "de bonificación a la cantidad drenada por el nosferatu de energía y el neutralizador energético." + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Bonificaciones de Fragata amarriana (por nivel de habilidad):" @@ -162973,7 +163069,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "de bonus aux dégâts des petites tourelles à énergie" }, { @@ -162997,6 +163093,14 @@ { "number": "15%", "text": "de bonus à la quantité d'énergie récupérée par le Nosferatu à énergie et le neutraliseur d'énergie" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": " Bonus (par niveau de compétence) Frégate amarr :" @@ -163007,7 +163111,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "bonus to Small Energy Turret damage" }, { @@ -163031,6 +163135,14 @@ { "number": "15%", "text": "bonus to Energy Nosferatu and Energy Neutralizer drain amount" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "Amarr Frigate bonuses (per skill level):" @@ -163041,7 +163153,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "小型エネルギータレットのダメージが増加" }, { @@ -163065,6 +163177,14 @@ { "number": "15%", "text": "エネルギーノスフェラトゥおよびエネルギーニュートライザーの消費量が改善" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "アマーフリゲートボーナス(スキルレベルごとに):" @@ -163075,7 +163195,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "소형 에너지 터렛 피해량 증가" }, { @@ -163099,6 +163219,14 @@ { "number": "15%", "text": "에너지 노스페라투 및 에너지 뉴트럴라이저 흡수량 증가" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "아마르 프리깃 보너스 (스킬 레벨당):" @@ -163109,7 +163237,7 @@ "role": { "bonuses": [ { - "number": "на 100%", + "number": "на 125%", "text": "увеличивается урон малых лазерных орудий" }, { @@ -163133,6 +163261,14 @@ { "number": "на 15%", "text": "увеличивается пропускная способность устройств паразитной подзарядки накопителя и дистанционных нейтрализаторов заряда" + }, + { + "number": "на 20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "на 10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "За каждую степень освоения навыка Амаррские фрегаты:" @@ -163143,7 +163279,7 @@ "role": { "bonuses": [ { - "number": "100%", + "number": "125%", "text": "小型能量炮台伤害加成" }, { @@ -163167,6 +163303,14 @@ { "number": "15%", "text": "掠能器和能量中和器吸取量加成" + }, + { + "number": "20%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer optimal range" + }, + { + "number": "10%", + "text": "bonus to Energy Nosferatu and Energy Neutralizer falloff range" } ], "header": "艾玛护卫舰操作每升一级："