Skip to content

Commit c5f61f4

Browse files
committed
Update static data, buffs and version
1 parent ec4c32e commit c5f61f4

File tree

15 files changed

+2426
-2371
lines changed

15 files changed

+2426
-2371
lines changed

eos/effects.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21468,7 +21468,7 @@ class Effect5647(BaseEffect):
2146821468

2146921469
Used by:
2147021470
Ships from group: Expedition Frigate (2 of 2)
21471-
Ships from group: Gallente Election YC128 Campaign Buses (3 of 3)
21471+
Ships from group: Special Edition Yachts (4 of 5)
2147221472
Ship: Astero
2147321473
Ship: Cenotaph
2147421474
Ship: Cobra
@@ -21477,7 +21477,6 @@ class Effect5647(BaseEffect):
2147721477
Ship: Sidewinder
2147821478
Ship: Tholos
2147921479
Ship: Victor
21480-
Ship: Victorieux Luxury Yacht
2148121480
Ship: Virtuoso
2148221481
"""
2148321482

@@ -34865,12 +34864,20 @@ class Effect7117(BaseEffect):
3486534864
roleBonusWarpSpeed
3486634865

3486734866
Used by:
34868-
Items from category: Ship (45 of 415)
3486934867
Ships from group: Blockade Runner (5 of 5)
3487034868
Ships from group: Covert Ops (9 of 9)
34871-
Ships from group: Gallente Election YC128 Campaign Buses (3 of 3)
34869+
Ships from group: Hauler (5 of 18)
3487234870
Ships from group: Interceptor (10 of 10)
3487334871
Ships from group: Interdictor (4 of 4)
34872+
Ships from group: Special Edition Yachts (4 of 5)
34873+
Ship: Azariel
34874+
Ship: Cynabal
34875+
Ship: Dramiel
34876+
Ship: Khizriel
34877+
Ship: Leopard
34878+
Ship: Machariel
34879+
Ship: Mekubal
34880+
Ship: Sarathiel
3487434881
"""
3487534882

3487634883
type = 'passive'
@@ -37011,10 +37018,9 @@ class Effect8120(BaseEffect):
3701137018
interceptorNullificationRoleBonus
3701237019

3701337020
Used by:
37014-
Ships from group: Gallente Election YC128 Campaign Buses (3 of 3)
3701537021
Ships from group: Interceptor (6 of 10)
37022+
Ships from group: Special Edition Yachts (4 of 5)
3701637023
Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
37017-
Ship: Victorieux Luxury Yacht
3701837024
"""
3701937025

3702037026
type = 'passive'

eos/saveddata/fit.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -958,11 +958,15 @@ def __runCommandBoosts(self, runTime="normal"):
958958
self.ship.boostItemAttr("warpSpeedMultiplier", value, stackingPenalties=True)
959959
elif warfareBuffID == 2538: # Triglavian System Effect - Remote Armor Repair Percentage
960960
self.modules.filteredItemBoost(
961-
lambda mod: mod.item.group.name == 'Remote Armor Repairer',
961+
lambda mod: (
962+
mod.item.requiresSkill("Remote Armor Repair Systems")
963+
or mod.item.requiresSkill("Capital Remote Armor Repair Systems")),
962964
"armorDamageAmount", value, stackingPenalties=True)
963965
elif warfareBuffID == 2539: # Triglavian System Effect - Remote Shield Boost Percentage
964966
self.modules.filteredItemBoost(
965-
lambda mod: mod.item.group.name == 'Remote Shield Booster',
967+
lambda mod: (
968+
mod.item.requiresSkill("Shield Emission Systems")
969+
or mod.item.requiresSkill("Capital Shield Emission Systems")),
966970
"shieldBonus", value, stackingPenalties=True)
967971

968972
del self.commandBonuses[warfareBuffID]

staticdata/fsd_built/groups.0.json

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30448,15 +30448,15 @@
3044830448
"categoryID": 11,
3044930449
"fittableNonSingleton": 0,
3045030450
"groupID": 5063,
30451-
"groupName_de": "FW Amarr Empire Hauler",
30451+
"groupName_de": "FK-Transporter des Imperiums der Amarr",
3045230452
"groupName_en-us": "FW Amarr Empire Hauler",
30453-
"groupName_es": "FW Amarr Empire Hauler",
30454-
"groupName_fr": "FW Amarr Empire Hauler",
30453+
"groupName_es": "Nave de mercancías de GF del Imperio Amarr",
30454+
"groupName_fr": "Cargo de l'Empire amarr de la GF",
3045530455
"groupName_it": "FW Amarr Empire Hauler",
30456-
"groupName_ja": "FW Amarr Empire Hauler",
30457-
"groupName_ko": "FW Amarr Empire Hauler",
30458-
"groupName_ru": "FW Amarr Empire Hauler",
30459-
"groupName_zh": "FW Amarr Empire Hauler",
30456+
"groupName_ja": "FWアマー帝国ハウラー",
30457+
"groupName_ko": "FW 아마르 제국 운반선",
30458+
"groupName_ru": "Амаррский перевозчик в МВ",
30459+
"groupName_zh": "势力战争艾玛帝国运载舰",
3046030460
"groupNameID": 1035583,
3046130461
"published": 0,
3046230462
"useBasePrice": 0
@@ -30467,15 +30467,15 @@
3046730467
"categoryID": 11,
3046830468
"fittableNonSingleton": 0,
3046930469
"groupID": 5064,
30470-
"groupName_de": "FW Caldari State Hauler",
30470+
"groupName_de": "FK-Transporter des Staats der Caldari",
3047130471
"groupName_en-us": "FW Caldari State Hauler",
30472-
"groupName_es": "FW Caldari State Hauler",
30473-
"groupName_fr": "FW Caldari State Hauler",
30472+
"groupName_es": "Nave de mercancías de GF del Estado Caldari",
30473+
"groupName_fr": "Cargo de l'État caldari de la GF",
3047430474
"groupName_it": "FW Caldari State Hauler",
30475-
"groupName_ja": "FW Caldari State Hauler",
30476-
"groupName_ko": "FW Caldari State Hauler",
30477-
"groupName_ru": "FW Caldari State Hauler",
30478-
"groupName_zh": "FW Caldari State Hauler",
30475+
"groupName_ja": "FWカルダリ連合ハウラー",
30476+
"groupName_ko": "FW 칼다리 연합 운반선",
30477+
"groupName_ru": "Калдарский перевозчик в МВ",
30478+
"groupName_zh": "势力战争加达里合众国运载舰",
3047930479
"groupNameID": 1035584,
3048030480
"published": 0,
3048130481
"useBasePrice": 0
@@ -30486,15 +30486,15 @@
3048630486
"categoryID": 11,
3048730487
"fittableNonSingleton": 0,
3048830488
"groupID": 5065,
30489-
"groupName_de": "FW Gallente Federation Hauler",
30489+
"groupName_de": "FK-Transporter der Föderation der Gallente",
3049030490
"groupName_en-us": "FW Gallente Federation Hauler",
30491-
"groupName_es": "FW Gallente Federation Hauler",
30492-
"groupName_fr": "FW Gallente Federation Hauler",
30491+
"groupName_es": "Nave de mercancías de GF de la Federación Gallente",
30492+
"groupName_fr": "Cargo de la Fédération gallente de la GF",
3049330493
"groupName_it": "FW Gallente Federation Hauler",
30494-
"groupName_ja": "FW Gallente Federation Hauler",
30495-
"groupName_ko": "FW Gallente Federation Hauler",
30496-
"groupName_ru": "FW Gallente Federation Hauler",
30497-
"groupName_zh": "FW Gallente Federation Hauler",
30494+
"groupName_ja": "FWガレンテ連邦ハウラー",
30495+
"groupName_ko": "FW 갈란테 연방 운반선",
30496+
"groupName_ru": "Галлентский перевозчик в МВ",
30497+
"groupName_zh": "势力战争盖伦特联邦运载舰",
3049830498
"groupNameID": 1035585,
3049930499
"published": 0,
3050030500
"useBasePrice": 0
@@ -30505,15 +30505,15 @@
3050530505
"categoryID": 11,
3050630506
"fittableNonSingleton": 0,
3050730507
"groupID": 5066,
30508-
"groupName_de": "FW Minmatar Republic Hauler",
30508+
"groupName_de": "FK-Transporter der Republik Minmatar",
3050930509
"groupName_en-us": "FW Minmatar Republic Hauler",
30510-
"groupName_es": "FW Minmatar Republic Hauler",
30511-
"groupName_fr": "FW Minmatar Republic Hauler",
30510+
"groupName_es": "Nave de mercancías de GF de la República Minmatar",
30511+
"groupName_fr": "Cargo de la République minmatar de la GF",
3051230512
"groupName_it": "FW Minmatar Republic Hauler",
30513-
"groupName_ja": "FW Minmatar Republic Hauler",
30514-
"groupName_ko": "FW Minmatar Republic Hauler",
30515-
"groupName_ru": "FW Minmatar Republic Hauler",
30516-
"groupName_zh": "FW Minmatar Republic Hauler",
30513+
"groupName_ja": "FWミンマター共和国ハウラー",
30514+
"groupName_ko": "FW 민마타 공화국 운반선",
30515+
"groupName_ru": "Минматарский перевозчик в МВ",
30516+
"groupName_zh": "势力战争米玛塔尔共和国运载舰",
3051730517
"groupNameID": 1035586,
3051830518
"published": 0,
3051930519
"useBasePrice": 0
@@ -30638,15 +30638,15 @@
3063830638
"categoryID": 6,
3063930639
"fittableNonSingleton": 0,
3064030640
"groupID": 5087,
30641-
"groupName_de": "Gallente Election YC128 Campaign Buses",
30642-
"groupName_en-us": "Gallente Election YC128 Campaign Buses",
30643-
"groupName_es": "Gallente Election YC128 Campaign Buses",
30644-
"groupName_fr": "Gallente Election YC128 Campaign Buses",
30645-
"groupName_it": "Gallente Election YC128 Campaign Buses",
30646-
"groupName_ja": "Gallente Election YC128 Campaign Buses",
30647-
"groupName_ko": "Gallente Election YC128 Campaign Buses",
30648-
"groupName_ru": "Gallente Election YC128 Campaign Buses",
30649-
"groupName_zh": "Gallente Election YC128 Campaign Buses",
30641+
"groupName_de": "Special Edition Yachts",
30642+
"groupName_en-us": "Special Edition Yachts",
30643+
"groupName_es": "Special Edition Yachts",
30644+
"groupName_fr": "Special Edition Yachts",
30645+
"groupName_it": "Special Edition Yachts",
30646+
"groupName_ja": "Special Edition Yachts",
30647+
"groupName_ko": "Special Edition Yachts",
30648+
"groupName_ru": "Special Edition Yachts",
30649+
"groupName_zh": "Special Edition Yachts",
3065030650
"groupNameID": 1038882,
3065130651
"published": 1,
3065230652
"useBasePrice": 0

staticdata/fsd_built/marketgroups.0.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10702,15 +10702,15 @@
1070210702
"descriptionID": 64867,
1070310703
"hasTypes": 1,
1070410704
"iconID": 2732,
10705-
"name_de": "Bergbau-Sensor-Anlagen",
10705+
"name_de": "Bergbauvermessungs-Chipsätze",
1070610706
"name_en-us": "Mining Survey Chipsets",
10707-
"name_es": "Redes de sensores mineras",
10708-
"name_fr": "Modules de détection d'extraction minière",
10707+
"name_es": "Chipsets de prospección de minería",
10708+
"name_fr": "Puces d'arpentage d'extraction minière",
1070910709
"name_it": "Mining Survey Chipsets",
10710-
"name_ja": "採掘用センサーアレイ",
10711-
"name_ko": "채굴 센서 장비",
10712-
"name_ru": "Усилители буровых сенсоров",
10713-
"name_zh": "采矿传感器阵列",
10710+
"name_ja": "採掘調査用チップセット",
10711+
"name_ko": "채굴 조사 칩셋",
10712+
"name_ru": "Считывающие буровые чипы",
10713+
"name_zh": "采矿调查芯片组",
1071410714
"nameID": 65941,
1071510715
"parentGroupID": 1708
1071610716
},

staticdata/fsd_built/requiredskillsfortypes.0.json

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30436,20 +30436,23 @@
3043630436
"92033": {
3043730437
"3435": 3,
3043830438
"3436": 5,
30439+
"12305": 1,
3043930440
"23566": 1,
3044030441
"24241": 1
3044130442
},
3044230443
"92034": {
3044330444
"3435": 3,
3044430445
"3436": 5,
30445-
"23566": 1,
30446+
"12305": 2,
30447+
"23566": 2,
3044630448
"33699": 1
3044730449
},
3044830450
"92035": {
3044930451
"3435": 3,
3045030452
"3436": 5,
3045130453
"3441": 1,
30452-
"23566": 1
30454+
"12305": 3,
30455+
"23566": 3
3045330456
},
3045430457
"92036": {
3045530458
"3423": 3,
@@ -30460,14 +30463,14 @@
3046030463
"92037": {
3046130464
"3423": 3,
3046230465
"3436": 5,
30463-
"23566": 1,
30466+
"23566": 2,
3046430467
"33699": 1
3046530468
},
3046630469
"92038": {
3046730470
"3423": 3,
3046830471
"3436": 5,
3046930472
"3441": 1,
30470-
"23566": 1
30473+
"23566": 3
3047130474
},
3047230475
"92039": {
3047330476
"3427": 4,
@@ -30478,14 +30481,14 @@
3047830481
"92040": {
3047930482
"3427": 4,
3048030483
"3436": 5,
30481-
"23566": 1,
30484+
"23566": 2,
3048230485
"33699": 1
3048330486
},
3048430487
"92041": {
3048530488
"3427": 4,
3048630489
"3436": 5,
3048730490
"3441": 1,
30488-
"23566": 1
30491+
"23566": 3
3048930492
},
3049030493
"92144": {
3049130494
"21718": 1
@@ -30551,58 +30554,58 @@
3055130554
"11572": 1
3055230555
},
3055330556
"92461": {
30554-
"3435": 3,
3055530557
"3436": 5,
30558+
"19921": 3,
3055630559
"23566": 1,
3055730560
"24241": 1
3055830561
},
3055930562
"92462": {
30560-
"3435": 3,
3056130563
"3436": 5,
30562-
"23566": 1,
30564+
"19921": 3,
30565+
"23566": 2,
3056330566
"33699": 1
3056430567
},
3056530568
"92463": {
30566-
"3435": 3,
3056730569
"3436": 5,
3056830570
"3441": 1,
30569-
"23566": 1
30571+
"19921": 3,
30572+
"23566": 3
3057030573
},
3057130574
"92464": {
30572-
"3427": 4,
30575+
"3433": 3,
3057330576
"3436": 5,
3057430577
"23566": 1,
3057530578
"24241": 1
3057630579
},
3057730580
"92465": {
30578-
"3427": 4,
30581+
"3433": 3,
3057930582
"3436": 5,
30580-
"23566": 1,
30583+
"23566": 2,
3058130584
"33699": 1
3058230585
},
3058330586
"92466": {
30584-
"3427": 4,
30587+
"3433": 3,
3058530588
"3436": 5,
3058630589
"3441": 1,
30587-
"23566": 1
30590+
"23566": 3
3058830591
},
3058930592
"92467": {
30590-
"3423": 3,
30593+
"3434": 3,
3059130594
"3436": 5,
3059230595
"23566": 1,
3059330596
"24241": 1
3059430597
},
3059530598
"92468": {
30596-
"3423": 3,
30599+
"3434": 3,
3059730600
"3436": 5,
30598-
"23566": 1,
30601+
"23566": 2,
3059930602
"33699": 1
3060030603
},
3060130604
"92469": {
30602-
"3423": 3,
30605+
"3434": 3,
3060330606
"3436": 5,
3060430607
"3441": 1,
30605-
"23566": 1
30608+
"23566": 3
3060630609
},
3060730610
"92514": {
3060830611
"3300": 5,

0 commit comments

Comments
 (0)