Add new FW sites

Author: DarkFenX

db_update.py

@@ -174,11 +174,9 @@ def processEveTypes():
                 # Micro Bombs (Fighters)
                 row['typeID'] in (41549, 41548, 41551, 41550) or
                 # Abyssal weather (environment)
-                row['groupID'] in (
-                    1882,
-                    1975,
-                    1971,
-                    1983)  # the "container" for the abyssal environments
+                row['groupID'] in (1882, 1975, 1971, 1983) or
+                # FW-specific proximity beacons
+                row['typeID'] in (92609, 95625)
             ):
                 newData.append(row)
         map = {'typeName_en-us': 'typeName', 'description_en-us': '_description'}
@@ -754,6 +752,25 @@ def hardcodeTrigSystemEffects():
             _hardcodeEffects(typeID, effectMap, clearEffects=True)
             eos.db.gamedata_session.flush()
 
+    def hardcodeFwProxyEffects():
+        typeBuffMap = {
+            # BC level up
+            92609: ('FW Moderate Site BC Skill Bonus', {
+                'warfareBuff1ID': 2544,
+                'warfareBuff1Value': 20}),
+            # T3D HP
+            95625: ('FW ELT-5 Site T3D HP Bonus', {
+                'warfareBuff1ID': 2545,
+                'warfareBuff1Value': 500})}
+        effectMap = {100003: 'pyfaCustomFwProxyBuffEffect'}
+        for typeID, (name, attrMap) in typeBuffMap.items():
+            item = eos.db.gamedata_session.query(eos.gamedata.Item).filter(eos.gamedata.Item.ID == typeID).one()
+            item.published = True
+            item.name = name
+            _hardcodeAttribs(typeID, attrMap)
+            _hardcodeEffects(typeID, effectMap, clearEffects=True)
+            eos.db.gamedata_session.flush()
+
 
     def hardcodeShapash():
         shapashTypeID = 1000000
@@ -901,6 +918,7 @@ def hardcodeCybele():
     hardcodeSuppressionTackleRange()
     hardcodeSovUpgradeBuffs()
     hardcodeTrigSystemEffects()
+    hardcodeFwProxyEffects()
 
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')

eos/effects.py

@@ -95,6 +95,25 @@ def handler(fit, beacon, context, projectionRange, **kwargs):
                 fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
+class Effect100003(BaseEffect):
+    """
+    pyfaCustomFwProxyBuffEffect
+
+    Used by:
+    Celestials from group: Cloud (2 of 2)
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, projectionRange, **kwargs):
+        for i in range(1, 5):
+            if id := beacon.getModifiedItemAttr(f'warfareBuff{i}ID'):
+                value = beacon.getModifiedItemAttr(f'warfareBuff{i}Value')
+                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
 class Effect4(BaseEffect):
     """
     shieldBoosting

eos/saveddata/fit.py

@@ -968,6 +968,12 @@ def __runCommandBoosts(self, runTime="normal"):
                             mod.item.requiresSkill("Shield Emission Systems")
                             or mod.item.requiresSkill("Capital Shield Emission Systems")),
                         "shieldBonus", value, stackingPenalties=True)
+                elif warfareBuffID == 2544:  # FW Moderate Site BC Skill Bonus
+                    for base in ('shipBonusABC', 'shipBonusCBC', 'shipBonusGBC', 'shipBonusMBC'):
+                        for i in range(1, 5):
+                            self.ship.boostItemAttr(f'{base}{i}', value)
+                elif warfareBuffID == 2545:  # FW ELT-5 Site T3D HP Bonus
+                    self.ship.increaseItemAttr("proximityDbuffEffectTacticalDestroyerHP", value)
 
             del self.commandBonuses[warfareBuffID]
 

eos/saveddata/module.py

@@ -67,7 +67,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
     MINING_ATTRIBUTES = ("miningAmount",)
     SYSTEM_GROUPS = (
         "Effect Beacon", "MassiveEnvironments", "Abyssal Hazards", "Non-Interactable Object",
-        "Destructible Effect Beacon", "Sovereignty Hub System Effect Generator Upgrades")
+        "Destructible Effect Beacon", "Sovereignty Hub System Effect Generator Upgrades", "Cloud")
 
     def __init__(self, item, baseItem=None, mutaplasmid=None):
         """Initialize a module from the program"""

gui/builtinContextMenus/envEffectAdd.py

@@ -125,9 +125,7 @@ def getData(self):
             _t('ContextMenu|ProjectedEffectManipulation|Sansha Incursion'))
         data.groups[_t('Drifter Incursion')] = self.getDrifterIncursion()
         data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
-        data.groups[_t('Pirate Insurgency')] = self.getEffectBeacons(
-            _t('ContextMenu|ProjectedEffectManipulation|Insurgency'),
-            extra_garbage=(_t('ContextMenu|ProjectedEffectManipulation|Beacon'),))
+        data.groups[_t('FW/Insurgency')] = self.getFwEffects()
         data.groups[_t('IHub Upgrades')] = self.getIHubEffects()
         return data
 
@@ -242,6 +240,19 @@ def getInvasionBeacons(self):
         data.items.append(Entry(item.ID, item.name, item.name))
         return data
 
+    def getFwEffects(self):
+        data = Group()
+        # Insurgency suppression buff
+        item = Market.getInstance().getItem(79839)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        # FW BC buff
+        item = Market.getInstance().getItem(92609)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        # FW T3D buff
+        item = Market.getInstance().getItem(95625)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
     def getIHubEffects(self):
         data = Group()
         # Electric