Update static data & other stuff to 2151933

wuxubiao · Nov 4, 2022 · 1824d1b · 1824d1b
1 parent 90025f2
commit 1824d1b
Show file tree

Hide file tree

Showing 46 changed files with 3,945 additions and 3,193 deletions.
diff --git a/eos/effects.py b/eos/effects.py
@@ -12396,6 +12396,7 @@ class Effect3993(BaseEffect):
     Used by:
     Celestials named like: Class Black Hole Effects (6 of 6)
     Celestials named like: Class Magnetar Effects (6 of 6)
+    Celestial: Turnur Aftermath
     """
 
     runTime = 'early'
@@ -35591,6 +35592,7 @@ class Effect7237(BaseEffect):
 
     Used by:
     Celestial: Dazh Liminality Locus
+    Celestial: Turnur Aftermath
     """
 
     runTime = 'early'
@@ -36377,6 +36379,23 @@ def handler(fit, beacon, context, projectionRange, **kwargs):
                                stackingPenalties=True, **kwargs)
 
 
+class Effect8082(BaseEffect):
+    """
+    systemScanResolutionBonus
+
+    Used by:
+    Celestial: Turnur Aftermath
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context, projectionRange, **kwargs):
+        fit.ship.boostItemAttr('scanResolution', beacon.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, **kwargs)
+
+
 class Effect8091(BaseEffect):
     """
     shipBonusForceAuxiliaryG2CapBoosterStrength
@@ -38556,7 +38575,7 @@ def handler(fit, src, context, projectionRange, **kwargs):
 
 class Effect11374(BaseEffect):
     """
-    shipBonusDreadnoughtA4EnergyWarfareAmountBonus
+    shipBonusDreadnoughtA4EnergyWarfareRangeAmountBonus
 
     Used by:
     Ship: Revelation Navy Issue
@@ -38572,26 +38591,6 @@ def handler(fit, ship, context, projectionRange, **kwargs):
                 ship.getModifiedItemAttr('shipBonusDreadnoughtA4'), skill='Amarr Dreadnought', **kwargs)
 
 
-class Effect11375(BaseEffect):
-    """
-    shipBonusDreadnoughtA4EnergyWarfareRangeBonus
-
-    Used by:
-    Ship: Revelation Navy Issue
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(
-            lambda mod: mod.item.group.name == 'Energy Nosferatu', 'powerTransferRange',
-            ship.getModifiedItemAttr('shipBonusDreadnoughtA4'), skill='Amarr Dreadnought', **kwargs)
-        fit.modules.filteredItemBoost(
-            lambda mod: mod.item.group.name == 'Energy Neutralizer', 'energyNeutralizerRangeOptimal',
-            ship.getModifiedItemAttr('shipBonusDreadnoughtA4'), skill='Amarr Dreadnought', **kwargs)
-
-
 class Effect11376(BaseEffect):
     """
     shipBonusDreadnoughtG1OptimalRangeBonus
@@ -39370,6 +39369,24 @@ def handler(fit, ship, context, projectionRange, **kwargs):
             ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates', **kwargs)
 
 
+class Effect11445(BaseEffect):
+    """
+    systemSensorStrengthBonus
+
+    Used by:
+    Celestial: Turnur Aftermath
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context, projectionRange, **kwargs):
+        for sensor_type in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
+            fit.ship.boostItemAttr(f'scan{sensor_type}Strength', beacon.getModifiedItemAttr('sensorStrengthBonus'),
+                                   stackingPenalties=True, **kwargs)
+
+
 class Effect11446(BaseEffect):
     """
     shipBonusDreadnoughtG4DamageBonus
@@ -39419,3 +39436,20 @@ def handler(fit, ship, context, projectionRange, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.group.name == 'Warp Scrambler', 'warpScrambleStrength',
             ship.getModifiedItemAttr('shipBonusDreadnoughtG5'), skill='Gallente Dreadnought', **kwargs)
+
+
+class Effect11454(BaseEffect):
+    """
+    shipBonusGrapplerFalloffM4
+
+    Used by:
+    Ship: Naglfar Fleet Issue
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name == 'Stasis Grappler', 'falloffEffectiveness',
+            ship.getModifiedItemAttr('shipBonusDreadnoughtM4'), skill='Minmatar Dreadnought', **kwargs)
diff --git a/gui/builtinContextMenus/envEffectAdd.py b/gui/builtinContextMenus/envEffectAdd.py
@@ -123,7 +123,7 @@ def getData(self):
         data.groups[_t('Abyssal Weather')] = self.getAbyssalWeather()
         data.groups[_t('Sansha Incursion')] = self.getEffectBeacons(
             _t('ContextMenu|ProjectedEffectManipulation|Sansha Incursion'))
-        data.groups[_t('Triglavian Invasion')] = self.getDestructibleBeacons()
+        data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
         return data
 
     def getEffectBeacons(self, *groups, extra_garbage=()):
@@ -231,5 +231,12 @@ def getDestructibleBeacons(self):
         data.sort()
         return data
 
+    def getInvasionBeacons(self):
+        data = self.getDestructibleBeacons()
+        # Turnur weather
+        item = Market.getInstance().getItem(74002)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
 
 AddEnvironmentEffect.register()
diff --git a/imgs/renders/1067@1x.png b/imgs/renders/1067@1x.png
diff --git a/imgs/renders/1067@2x.png b/imgs/renders/1067@2x.png
diff --git a/imgs/renders/1730@1x.png b/imgs/renders/1730@1x.png
diff --git a/imgs/renders/1730@2x.png b/imgs/renders/1730@2x.png
diff --git a/imgs/renders/1731@1x.png b/imgs/renders/1731@1x.png
diff --git a/imgs/renders/1731@2x.png b/imgs/renders/1731@2x.png
diff --git a/imgs/renders/1733@1x.png b/imgs/renders/1733@1x.png
diff --git a/imgs/renders/1733@2x.png b/imgs/renders/1733@2x.png
diff --git a/imgs/renders/20227@1x.png b/imgs/renders/20227@1x.png
diff --git a/imgs/renders/20227@2x.png b/imgs/renders/20227@2x.png
diff --git a/imgs/renders/21279@1x.png b/imgs/renders/21279@1x.png
diff --git a/imgs/renders/21279@2x.png b/imgs/renders/21279@2x.png
diff --git a/imgs/renders/2239@1x.png b/imgs/renders/2239@1x.png
diff --git a/imgs/renders/2239@2x.png b/imgs/renders/2239@2x.png
diff --git a/imgs/renders/25573@1x.png b/imgs/renders/25573@1x.png
diff --git a/imgs/renders/25573@2x.png b/imgs/renders/25573@2x.png
diff --git a/imgs/renders/25576@1x.png b/imgs/renders/25576@1x.png
diff --git a/imgs/renders/25576@2x.png b/imgs/renders/25576@2x.png
diff --git a/imgs/renders/25602@1x.png b/imgs/renders/25602@1x.png
diff --git a/imgs/renders/25602@2x.png b/imgs/renders/25602@2x.png
diff --git a/imgs/renders/25608@1x.png b/imgs/renders/25608@1x.png
diff --git a/imgs/renders/25608@2x.png b/imgs/renders/25608@2x.png
diff --git a/imgs/renders/2786@1x.png b/imgs/renders/2786@1x.png
diff --git a/imgs/renders/2786@2x.png b/imgs/renders/2786@2x.png
diff --git a/imgs/renders/2905@1x.png b/imgs/renders/2905@1x.png
diff --git a/imgs/renders/2905@2x.png b/imgs/renders/2905@2x.png
diff --git a/imgs/renders/3814@1x.png b/imgs/renders/3814@1x.png
diff --git a/imgs/renders/3814@2x.png b/imgs/renders/3814@2x.png
diff --git a/staticdata/fsd_binary/categories.0.json b/staticdata/fsd_binary/categories.0.json
@@ -630,14 +630,14 @@
   }, 
   "2118": {
     "categoryID": 2118, 
-    "categoryName_de": "Personalization", 
+    "categoryName_de": "Anpassung", 
     "categoryName_en-us": "Personalization", 
-    "categoryName_es": "Personalization", 
-    "categoryName_fr": "Personalization", 
+    "categoryName_es": "Personalización", 
+    "categoryName_fr": "Personnalisation", 
     "categoryName_it": "Personalization", 
-    "categoryName_ja": "Personalization", 
-    "categoryName_ko": "Personalization", 
-    "categoryName_ru": "Personalization", 
+    "categoryName_ja": "カスタマイズ", 
+    "categoryName_ko": "개인화", 
+    "categoryName_ru": "Персонализация", 
     "categoryName_zh": "Personalization", 
     "categoryNameID": 631766, 
     "published": 1

diff --git a/staticdata/fsd_binary/dogmaattributes.0.json b/staticdata/fsd_binary/dogmaattributes.0.json
@@ -46730,14 +46730,14 @@
     "dataType": 3, 
     "defaultValue": 0.0, 
     "description": "It is a Boolean Value that defaults to false. If true, it will only allow players to Hack if they belong to the Faction that is an enemy of the Occupier of the Star System.", 
-    "displayName_de": "Allow Only Factional Warfare Attackers", 
+    "displayName_de": "Nur Angreifer aus dem Fraktionskrieg zulassen", 
     "displayName_en-us": "Allow Only Factional Warfare Attackers", 
-    "displayName_es": "Allow Only Factional Warfare Attackers", 
-    "displayName_fr": "Allow Only Factional Warfare Attackers", 
+    "displayName_es": "Permitir solo atacantes de la guerra de facciones", 
+    "displayName_fr": "N'autoriser que les assaillants de la guerre de faction", 
     "displayName_it": "Allow Only Factional Warfare Attackers", 
-    "displayName_ja": "Allow Only Factional Warfare Attackers", 
-    "displayName_ko": "Allow Only Factional Warfare Attackers", 
-    "displayName_ru": "Allow Only Factional Warfare Attackers", 
+    "displayName_ja": "国家間戦争の攻撃側のみが利用可能", 
+    "displayName_ko": "팩션 전쟁 공격 측 입장 가능", 
+    "displayName_ru": "Допускать только нападающую сторону МВ", 
     "displayName_zh": "Allow Only Factional Warfare Attackers", 
     "displayNameID": 635862, 
     "displayWhenZero": 0, 
@@ -47069,5 +47069,16 @@
     "name": "shipBonusGB3", 
     "published": 0, 
     "stackable": 1
+  }, 
+  "5248": {
+    "attributeID": 5248, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtM4", 
+    "published": 0, 
+    "stackable": 1
   }
 }