Skip to content

Commit ae8405d

Browse files
committed
Update static data and remove some now-unused data
1 parent 977cf61 commit ae8405d

23 files changed

+79787
-55610
lines changed

eos/effects.py

Lines changed: 19 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class Effect17(BaseEffect):
121121
mining
122122

123123
Used by:
124-
Drones from group: Mining Drone (10 of 10)
124+
Drones from group: Mining Drone (14 of 14)
125125
"""
126126

127127
grouped = True
@@ -498,9 +498,9 @@ class Effect67(BaseEffect):
498498
miningLaser
499499

500500
Used by:
501-
Modules from group: Frequency Mining Laser (3 of 3)
502-
Modules from group: Mining Laser (15 of 15)
503-
Modules from group: Strip Miner (6 of 6)
501+
Modules from group: Frequency Mining Laser (6 of 6)
502+
Modules from group: Mining Laser (18 of 18)
503+
Modules from group: Strip Miner (9 of 9)
504504
Module: Citizen Miner
505505
"""
506506

@@ -3764,7 +3764,7 @@ class Effect1212(BaseEffect):
37643764
crystalMiningamountInfo2
37653765

37663766
Used by:
3767-
Modules from group: Frequency Mining Laser (3 of 3)
3767+
Modules from group: Frequency Mining Laser (6 of 6)
37683768
"""
37693769

37703770
runTime = 'late'
@@ -7836,7 +7836,7 @@ class Effect2726(BaseEffect):
78367836
miningClouds
78377837

78387838
Used by:
7839-
Modules named like: Gas Cloud (8 of 8)
7839+
Modules named like: Gas Cloud (10 of 10)
78407840
"""
78417841

78427842
type = 'active'
@@ -9350,6 +9350,7 @@ class Effect3025(BaseEffect):
93509350
Modules from group: Hybrid Weapon (107 of 223)
93519351
Modules from group: Precursor Weapon (19 of 19)
93529352
Modules from group: Projectile Weapon (101 of 167)
9353+
Modules named like: Pulse Laser (89 of 90)
93539354
"""
93549355

93559356
type = 'overheat'
@@ -10512,6 +10513,7 @@ class Effect3483(BaseEffect):
1051210513
shipBonusMediumEnergyTurretDamagePirateFaction
1051310514

1051410515
Used by:
10516+
Ships named like: Stratios (2 of 2)
1051510517
Ship: Ashimmu
1051610518
Ship: Fiend
1051710519
Ship: Gnosis
@@ -10598,22 +10600,6 @@ def handler(fit, ship, context, projectionRange, **kwargs):
1059810600
'cargoScanRange', ship.getModifiedItemAttr('cargoScannerRangeBonus'), **kwargs)
1059910601

1060010602

10601-
class Effect3494(BaseEffect):
10602-
"""
10603-
rorqualSurveyScannerRangeBonus
10604-
10605-
Used by:
10606-
Ship: Rorqual
10607-
"""
10608-
10609-
type = 'passive'
10610-
10611-
@staticmethod
10612-
def handler(fit, ship, context, projectionRange, **kwargs):
10613-
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner',
10614-
'surveyScanRange', ship.getModifiedItemAttr('surveyScannerRangeBonus'), **kwargs)
10615-
10616-
1061710603
class Effect3495(BaseEffect):
1061810604
"""
1061910605
shipCapPropulsionJamming
@@ -11687,23 +11673,6 @@ def handler(fit, src, context, projectionRange, **kwargs):
1168711673
src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships', **kwargs)
1168811674

1168911675

11690-
class Effect3745(BaseEffect):
11691-
"""
11692-
zColinOrcaSurveyScannerBonus
11693-
11694-
Used by:
11695-
Ships from group: Industrial Command Ship (2 of 2)
11696-
Ship: Outrider
11697-
"""
11698-
11699-
type = 'passive'
11700-
11701-
@staticmethod
11702-
def handler(fit, src, context, projectionRange, **kwargs):
11703-
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner', 'surveyScanRange',
11704-
src.getModifiedItemAttr('roleBonusSurveyScannerRange'), **kwargs)
11705-
11706-
1170711676
class Effect3765(BaseEffect):
1170811677
"""
1170911678
covertOpsStealthBomberSiegeMissileLauncherPowerNeedBonus
@@ -29440,7 +29409,7 @@ def handler(fit, src, context, projectionRange, **kwargs):
2944029409

2944129410
class Effect6625(BaseEffect):
2944229411
"""
29443-
shipBonusCarrierA2SupportFighterBonus
29412+
shipBonusCarrierA2SupportFighterBonusRange
2944429413

2944529414
Used by:
2944629415
Ship: Archon
@@ -29459,7 +29428,7 @@ def handler(fit, src, context, projectionRange, **kwargs):
2945929428

2946029429
class Effect6626(BaseEffect):
2946129430
"""
29462-
shipBonusCarrierC2SupportFighterBonus
29431+
shipBonusCarrierC2SupportFighterBonusRange
2946329432

2946429433
Used by:
2946529434
Ship: Chimera
@@ -29478,7 +29447,7 @@ def handler(fit, src, context, projectionRange, **kwargs):
2947829447

2947929448
class Effect6627(BaseEffect):
2948029449
"""
29481-
shipBonusCarrierG2SupportFighterBonus
29450+
shipBonusCarrierG2SupportFighterBonusRange
2948229451

2948329452
Used by:
2948429453
Ship: Thanatos
@@ -29497,7 +29466,7 @@ def handler(fit, src, context, projectionRange, **kwargs):
2949729466

2949829467
class Effect6628(BaseEffect):
2949929468
"""
29500-
shipBonusCarrierM2SupportFighterBonus
29469+
shipBonusCarrierM2SupportFighterBonusRange
2950129470

2950229471
Used by:
2950329472
Ship: Nidhoggur
@@ -40772,6 +40741,7 @@ class Effect12098(BaseEffect):
4077240741

4077340742
Used by:
4077440743
Ships from group: Carrier (4 of 4)
40744+
Ships from group: Supercarrier (6 of 6)
4077540745
"""
4077640746

4077740747
type = 'passive'
@@ -41882,10 +41852,7 @@ def handler(fit, src, context, projectionRange, **kwargs):
4188241852

4188341853
class Effect12552(BaseEffect):
4188441854
"""
41885-
shipRoleBonusOREExecutiveIssueMiningHoldAmount
41886-
41887-
Used by:
41888-
Ships named like: Consortium Issue (2 of 2)
41855+
Not used by any item
4188941856
"""
4189041857

4189141858
type = 'passive'
@@ -42211,7 +42178,7 @@ class Effect12591(BaseEffect):
4221142178
miningSensorArrayScannerUpgrade
4221242179

4221342180
Used by:
42214-
Modules from group: Survey Scanner (3 of 3)
42181+
Modules from group: Mining Survey Chipset (4 of 4)
4221542182
"""
4221642183

4221742184
type = 'passive'
@@ -42311,7 +42278,7 @@ class Effect12757(BaseEffect):
4231142278
miningCritYieldSkillPostPercentLRSMBonus
4231242279

4231342280
Used by:
42314-
Skill: Mining Bonanza Exploitation
42281+
Skill: Mining Exploitation
4231542282
"""
4231642283

4231742284
type = 'passive'
@@ -42328,7 +42295,7 @@ class Effect12759(BaseEffect):
4232842295
miningCritChanceBonusOreIceOnline
4232942296

4233042297
Used by:
42331-
Modules from group: Survey Scanner (3 of 3)
42298+
Modules from group: Mining Survey Chipset (4 of 4)
4233242299
"""
4233342300

4233442301
type = 'passive'
@@ -42345,7 +42312,7 @@ class Effect12760(BaseEffect):
4234542312
miningCritBonusYieldBonusOreIceOnline
4234642313

4234742314
Used by:
42348-
Modules from group: Survey Scanner (3 of 3)
42315+
Modules from group: Mining Survey Chipset (4 of 4)
4234942316
"""
4235042317

4235142318
type = 'passive'
@@ -42362,7 +42329,7 @@ class Effect12761(BaseEffect):
4236242329
miningWasteChanceBonusOreIceOnline
4236342330

4236442331
Used by:
42365-
Modules from group: Survey Scanner (3 of 3)
42332+
Modules from group: Mining Survey Chipset (4 of 4)
4236642333
"""
4236742334

4236842335
type = 'passive'

gui/builtinViewColumns/misc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ def __getData(self, stuff):
701701
formatAmount(itemArmorResistanceShiftHardenerExp, 3, 0, 3),
702702
)
703703
return text, tooltip
704-
elif itemGroup in ("Cargo Scanner", "Ship Scanner", "Survey Scanner"):
704+
elif itemGroup in ("Cargo Scanner", "Ship Scanner"):
705705
duration = stuff.getModifiedItemAttr("duration")
706706
if not duration:
707707
return "", None

staticdata/fsd_built/categories.0.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,20 @@
657657
"iconID": 24296,
658658
"published": 1
659659
},
660+
"2152": {
661+
"categoryID": 2152,
662+
"categoryName_de": "QA- und Dev-Gruppen",
663+
"categoryName_en-us": "QA and Dev Groups",
664+
"categoryName_es": "Control de calidad y grupos de desarrolladores",
665+
"categoryName_fr": "Groupes QA et Dev",
666+
"categoryName_it": "QA and Dev Groups",
667+
"categoryName_ja": "QAと開発者グループ",
668+
"categoryName_ko": "QA and Dev Groups",
669+
"categoryName_ru": "Группы разработки и КК",
670+
"categoryName_zh": "质量保证和开发团队",
671+
"categoryNameID": 1025580,
672+
"published": 0
673+
},
660674
"350001": {
661675
"categoryID": 350001,
662676
"categoryName_de": "Infanterie",

0 commit comments

Comments
 (0)