Skip to content

Commit

Permalink
Update static data and add new effect
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarkFenX
DarkFenX committed Jun 12, 2024
1 parent d147db2 commit f5d8be7
Show file tree
Hide file tree
Showing 9 changed files with 584 additions and 289 deletions.
29 changes: 25 additions & 4 deletions eos/effects.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26919,7 +26919,6 @@ class Effect6431(BaseEffect):

Used by:
Items from category: Fighter (56 of 94)
Fighters from group: Light Fighter (40 of 40)
"""

dealsDamage = True
Expand Down Expand Up @@ -27047,7 +27046,8 @@ class Effect6439(BaseEffect):
fighterAbilityEvasiveManeuvers

Used by:
Fighters from group: Light Fighter (20 of 40)
Fighters from group: Light Fighter (12 of 24)
Fighters from group: Structure Light Fighter (8 of 16)
"""

displayName = 'Evasive Maneuvers'
Expand Down Expand Up @@ -27199,7 +27199,6 @@ class Effect6465(BaseEffect):

Used by:
Items from category: Fighter (54 of 94)
Fighters from group: Heavy Fighter (34 of 34)
"""

dealsDamage = True
Expand Down Expand Up @@ -27472,7 +27471,8 @@ class Effect6485(BaseEffect):
fighterAbilityLaunchBomb

Used by:
Fighters from group: Heavy Fighter (16 of 34)
Fighters from group: Heavy Fighter (8 of 17)
Fighters from group: Structure Heavy Fighter (8 of 17)
"""

dealsDamage = True
Expand Down Expand Up @@ -40789,3 +40789,24 @@ def handler(fit, skill, context, projectionRange, **kwargs):
fit.modules.filteredItemBoost(
lambda mod: mod.item.requiresSkill('Capital Micro Jump Drive Operation'), 'capacitorNeed',
skill.getModifiedItemAttr('capitalMJDCapReductionBonus') * skill.level, **kwargs)


class Effect12127(BaseEffect):
"""
shipRoleBonusUpwellHaulersMediumMissileFittingBonus

Used by:
Variations of ship: Squall (3 of 3)
"""

type = 'passive'

@staticmethod
def handler(fit, ship, context, projectionRange, **kwargs):
for attr in ('cpu', 'power'):
fit.modules.filteredItemMultiply(
lambda mod: mod.item.group.name in (
'Missile Launcher Heavy Assault',
'Missile Launcher Heavy',
'Missile Launcher Rapid Light'),
attr, ship.getModifiedItemAttr('upwellHaulersMediumMissileFittingBonus'), **kwargs)
15 changes: 13 additions & 2 deletions staticdata/fsd_binary/dogmaattributes.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47502,10 +47502,10 @@
"published": 1,
"stackable": 0,
"tooltipDescription_de": "Das Gesamtvolumen an Infrastruktur-bezogenen Gegenständen, die im Infrastruktur-Hangar des Schiffes gelagert werden können. <br><br>Diese Gegenstände umfassen: <br>Kolonie-Reagenzien, Upwell-Strukturen, Strukturmodifikationen, Strukturmodule, Quantumkerne, orbitale Skyhooks, Zollamtgerüste, Souveränitätsstrukturen, Souveränitäts-Upgrades, Mondmaterialien, Treibstoffblöcke, planetarische Güter und raffinierte Eisprodukte.",
"tooltipDescription_en-us": "The total volume of infrastructure related items that can be stored in the ship's infrastructure hold. <br><br>These items include;<br>Colony Reagents, Upwell Structures, Structure Rigs, Structure Modules, Quantum Cores, Orbital Skyhooks, Custom Gantrys, Sovereignty Structures, Sovereignty Upgrades, Moon Materials, Fuel Blocks, Planetary Commodities and Refined Ice Products.",
"tooltipDescription_en-us": "The total volume of infrastructure related items that can be stored in the ship's infrastructure hold. <br><br>These items include;<br>Colony Reagents, Upwell Structures, Structure Rigs, Structure Modules, Standup Fighters, Structure Ammo, Quantum Cores, Orbital Skyhooks, Custom Gantrys, Sovereignty Structures, Sovereignty Upgrades, Moon Materials, Fuel Blocks, Planetary Commodities and Refined Ice Products.",
"tooltipDescription_es": "El volumen total de objetos relacionados con infraestructuras que pueden almacenarse en la bodega de la nave.<br><br>Estos objetos incluyen<br>reactivos de colonia, estructuras de Upwell, complementos de estructura, módulos de estructuras, núcleos cuánticos, ganchos orbitales, andamiajes de Aduana, estructuras de soberanía, mejoras de soberanía, materiales lunares, bloques de combustible, mercancías planetarias y productos de hielo refinados.",
"tooltipDescription_fr": "Le volume total des articles liés à l'infrastructure qui peuvent être stockés dans la baie d'infrastructure du vaisseau. <br><br>Ces articles comprennent : <br>Réactifs de colonie, Structures Upwell, Modules d'optimisation de structure, Modules de structure, Réacteurs quantiques, Grappins orbitaux, Grues de bureau de douane, Structures de souveraineté, Améliorations de souveraineté, Matériaux lunaires, Blocs de carburant, Marchandises planétaires et Produits de glace raffinée.",
"tooltipDescription_it": "The total volume of infrastructure related items that can be stored in the ship's infrastructure hold. <br><br>These items include;<br>Colony Reagents, Upwell Structures, Structure Rigs, Structure Modules, Quantum Cores, Orbital Skyhooks, Custom Gantrys, Sovereignty Structures, Sovereignty Upgrades, Moon Materials, Fuel Blocks, Planetary Commodities and Refined Ice Products.",
"tooltipDescription_it": "The total volume of infrastructure related items that can be stored in the ship's infrastructure hold. <br><br>These items include;<br>Colony Reagents, Upwell Structures, Structure Rigs, Structure Modules, Standup Fighters, Structure Ammo, Quantum Cores, Orbital Skyhooks, Custom Gantrys, Sovereignty Structures, Sovereignty Upgrades, Moon Materials, Fuel Blocks, Planetary Commodities and Refined Ice Products.",
"tooltipDescription_ja": "艦船のインフラホールドに収容できるインフラ関連アイテムの合計体積。<br><br>以下のアイテムが含まれる：<br>コロニーの反応試剤、アップウェルストラクチャ、ストラクチャ用リグ、ストラクチャ用モジュール、クアンタムコア、軌道スカイフック、税関ガントリー、領有権管理設備、領有権用アップグレード、衛星資源、燃料ブロック、惑星商品、アイス精錬品。",
"tooltipDescription_ko": "구조물 격납고에 적재할 수 있는 인프라 관련 아이템의 양입니다.<br><br>적재 가능 아이템:<br>콜로니 촉매, 업웰 구조물, 구조물 리그, 구조물 모듈, 양자코어, 궤도 스카이훅, 세관 사무소 갠트리, 소버린티 구조물, 소버린티 업그레이드, 위성 자원, 연료 블록, 행성 생산품, 정제 아이스 가공품",
"tooltipDescription_ru": "Максимальная вместимость логистического отсека корабля, где хранятся грузы инфраструктурного значения. <br><br>К таким грузам относятся:<br>реагенты из колоний, сооружения «Апвелл», модули и надстройки для сооружений, квантовые ядра, орбитальные подъёмники, каркасы для отделений таможни, объекты системы суверенитета, улучшения штаба владений, материалы со спутников, топливные блоки, планетарные товары и продукты переработки льда.",
Expand Down Expand Up @@ -47832,5 +47832,16 @@
"name": "preFitStructureCore",
"published": 0,
"stackable": 1
},
"5705": {
"attributeID": 5705,
"categoryID": 37,
"dataType": 5,
"defaultValue": 0.0,
"displayWhenZero": 0,
"highIsGood": 1,
"name": " upwellHaulersMediumMissileFittingBonus",
"published": 0,
"stackable": 1
}
}
74 changes: 74 additions & 0 deletions staticdata/fsd_binary/dogmaeffects.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95693,5 +95693,79 @@
"propulsionChance": 0,
"published": 0,
"rangeChance": 0
},
"12127": {
"description_de": "Automatically generated effect",
"description_en-us": "Automatically generated effect",
"description_es": "Automatically generated effect",
"description_fr": "Automatically generated effect",
"description_it": "Automatically generated effect",
"description_ja": "Automatically generated effect",
"description_ko": "Automatically generated effect",
"description_ru": "Automatically generated effect",
"description_zh": "Automatically generated effect",
"descriptionID": 723567,
"disallowAutoRepeat": 0,
"effectCategory": 0,
"effectID": 12127,
"effectName": "shipRoleBonusUpwellHaulersMediumMissileFittingBonus",
"electronicChance": 0,
"isAssistance": 0,
"isOffensive": 0,
"isWarpSafe": 0,
"modifierInfo": [
{
"domain": "shipID",
"func": "LocationGroupModifier",
"groupID": 771,
"modifiedAttributeID": 30,
"modifyingAttributeID": 5705,
"operation": 0
},
{
"domain": "shipID",
"func": "LocationGroupModifier",
"groupID": 510,
"modifiedAttributeID": 30,
"modifyingAttributeID": 5705,
"operation": 0
},
{
"domain": "shipID",
"func": "LocationGroupModifier",
"groupID": 511,
"modifiedAttributeID": 30,
"modifyingAttributeID": 5705,
"operation": 0
},
{
"domain": "shipID",
"func": "LocationGroupModifier",
"groupID": 771,
"modifiedAttributeID": 50,
"modifyingAttributeID": 5705,
"operation": 0
},
{
"domain": "shipID",
"func": "LocationGroupModifier",
"groupID": 510,
"modifiedAttributeID": 50,
"modifyingAttributeID": 5705,
"operation": 0
},
{
"domain": "shipID",
"func": "LocationGroupModifier",
"groupID": 511,
"modifiedAttributeID": 50,
"modifyingAttributeID": 5705,
"operation": 0
}
],
"propulsionChance": 0,
"published": 0,
"rangeAttributeID": 54,
"rangeChance": 0
}
}
57 changes: 57 additions & 0 deletions staticdata/fsd_binary/groups.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29446,6 +29446,63 @@
"published": 1,
"useBasePrice": 1
},
"4777": {
"anchorable": 0,
"anchored": 0,
"categoryID": 87,
"fittableNonSingleton": 0,
"groupID": 4777,
"groupName_de": "Structure Light Fighter",
"groupName_en-us": "Structure Light Fighter",
"groupName_es": "Structure Light Fighter",
"groupName_fr": "Structure Light Fighter",
"groupName_it": "Structure Light Fighter",
"groupName_ja": "Structure Light Fighter",
"groupName_ko": "Structure Light Fighter",
"groupName_ru": "Structure Light Fighter",
"groupName_zh": "Structure Light Fighter",
"groupNameID": 723473,
"published": 1,
"useBasePrice": 0
},
"4778": {
"anchorable": 0,
"anchored": 0,
"categoryID": 87,
"fittableNonSingleton": 0,
"groupID": 4778,
"groupName_de": "Structure Support Fighter",
"groupName_en-us": "Structure Support Fighter",
"groupName_es": "Structure Support Fighter",
"groupName_fr": "Structure Support Fighter",
"groupName_it": "Structure Support Fighter",
"groupName_ja": "Structure Support Fighter",
"groupName_ko": "Structure Support Fighter",
"groupName_ru": "Structure Support Fighter",
"groupName_zh": "Structure Support Fighter",
"groupNameID": 723474,
"published": 1,
"useBasePrice": 0
},
"4779": {
"anchorable": 0,
"anchored": 0,
"categoryID": 87,
"fittableNonSingleton": 0,
"groupID": 4779,
"groupName_de": "Structure Heavy Fighter",
"groupName_en-us": "Structure Heavy Fighter",
"groupName_es": "Structure Heavy Fighter",
"groupName_fr": "Structure Heavy Fighter",
"groupName_it": "Structure Heavy Fighter",
"groupName_ja": "Structure Heavy Fighter",
"groupName_ko": "Structure Heavy Fighter",
"groupName_ru": "Structure Heavy Fighter",
"groupName_zh": "Structure Heavy Fighter",
"groupNameID": 723475,
"published": 1,
"useBasePrice": 0
},
"350858": {
"anchorable": 0,
"anchored": 0,
Expand Down
38 changes: 31 additions & 7 deletions staticdata/fsd_binary/typedogma.2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540357,7 +540357,7 @@
},
{
"attributeID": 11,
"value": 400.0
"value": 215.0
},
{
"attributeID": 12,
Expand Down Expand Up @@ -540389,7 +540389,7 @@
},
{
"attributeID": 48,
"value": 380.0
"value": 395.0
},
{
"attributeID": 49,
Expand Down Expand Up @@ -540690,6 +540690,10 @@
{
"attributeID": 5682,
"value": 0.0
},
{
"attributeID": 5705,
"value": 0.1
}
],
"dogmaEffects": [
Expand All @@ -540716,6 +540720,10 @@
{
"effectID": 12054,
"isDefault": 0
},
{
"effectID": 12127,
"isDefault": 0
}
]
},
Expand Down Expand Up @@ -541291,7 +541299,7 @@
},
{
"attributeID": 11,
"value": 430.0
"value": 180.0
},
{
"attributeID": 12,
Expand Down Expand Up @@ -541323,7 +541331,7 @@
},
{
"attributeID": 48,
"value": 400.0
"value": 300.0
},
{
"attributeID": 49,
Expand All @@ -541335,7 +541343,7 @@
},
{
"attributeID": 70,
"value": 0.51
"value": 0.59
},
{
"attributeID": 76,
Expand Down Expand Up @@ -541656,6 +541664,10 @@
{
"attributeID": 5682,
"value": 0.0
},
{
"attributeID": 5705,
"value": 0.1
}
],
"dogmaEffects": [
Expand Down Expand Up @@ -541694,6 +541706,10 @@
{
"effectID": 12054,
"isDefault": 0
},
{
"effectID": 12127,
"isDefault": 0
}
]
},
Expand All @@ -541709,7 +541725,7 @@
},
{
"attributeID": 11,
"value": 460.0
"value": 230.0
},
{
"attributeID": 12,
Expand Down Expand Up @@ -541741,7 +541757,7 @@
},
{
"attributeID": 48,
"value": 420.0
"value": 305.0
},
{
"attributeID": 49,
Expand Down Expand Up @@ -542074,6 +542090,10 @@
{
"attributeID": 5682,
"value": 0.0
},
{
"attributeID": 5705,
"value": 0.1
}
],
"dogmaEffects": [
Expand Down Expand Up @@ -542140,6 +542160,10 @@
{
"effectID": 12072,
"isDefault": 0
},
{
"effectID": 12127,
"isDefault": 0
}
]
},
Expand Down
Loading

0 comments on commit f5d8be7

Please sign in to comment.