From 8ed9257dfa9cffb660ae8cb9be1f25d1182ca0bc Mon Sep 17 00:00:00 2001 From: Neugeniko Date: Wed, 12 Aug 2020 02:56:13 +1000 Subject: [PATCH 1/8] Updated 'Retaliating Caldari Entities' target profile 2020/08/12 Eve Online Patch increased Em Resists for some npc in the group of 'Retaliating Caldari Entities' The groups target profile has been recalculated and edited. --- eos/saveddata/targetProfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/saveddata/targetProfile.py b/eos/saveddata/targetProfile.py index e2a816d52..4cb1aa94a 100644 --- a/eos/saveddata/targetProfile.py +++ b/eos/saveddata/targetProfile.py @@ -86,7 +86,7 @@ BUILTINS = OrderedDict([ # Source: ticket #2067 (-52, ('[NPC][Invasion]Invading Precursor Entities', 0.422, 0.367, 0.453, 0.411)), (-53, ('[NPC][Invasion]Retaliating Amarr Entities', 0.360, 0.310, 0.441, 0.602)), - (-54, ('[NPC][Invasion]Retaliating Caldari Entities', 0.287, 0.610, 0.487, 0.401)), + (-54, ('[NPC][Invasion]Retaliating Caldari Entities', 0.303, 0.610, 0.487, 0.401)), (-55, ('[NPC][Invasion]Retaliating Gallente Entities', 0.383, 0.414, 0.578, 0.513)), (-56, ('[NPC][Invasion]Retaliating Minmatar Entities', 0.620, 0.422, 0.355, 0.399)), (-57, ('[NPC][Abyssal][Dark Matter All Tiers]Drones', 0.439, 0.522, 0.529, 0.435)), From 5707bddacd53d0645cade575e5a47096f828ab3d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 11 Aug 2020 19:56:33 +0300 Subject: [PATCH 2/8] Update staticdata to 1782806 --- staticdata/fsd_lite/evetypes.json | 67 +++++++++++++++++++++++++++---- staticdata/phobos/metadata.json | 4 +- 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/staticdata/fsd_lite/evetypes.json b/staticdata/fsd_lite/evetypes.json index 6f91798c4..65cf28578 100644 --- a/staticdata/fsd_lite/evetypes.json +++ b/staticdata/fsd_lite/evetypes.json @@ -622408,7 +622408,7 @@ "mass": 0.0, "metaLevel": 0, "portionSize": 1, - "published": true, + "published": false, "radius": 1.0, "techLevel": 1, "typeID": 55821, @@ -622423,11 +622423,10 @@ "descriptionID": 567626, "groupID": 4050, "iconID": 24497, - "marketGroupID": 2747, "mass": 0.0, "metaLevel": 0, "portionSize": 1, - "published": true, + "published": false, "radius": 1.0, "techLevel": 1, "typeID": 55822, @@ -622442,11 +622441,10 @@ "descriptionID": 567627, "groupID": 4050, "iconID": 24499, - "marketGroupID": 2747, "mass": 0.0, "metaLevel": 0, "portionSize": 1, - "published": true, + "published": false, "radius": 1.0, "techLevel": 1, "typeID": 55823, @@ -622475,7 +622473,7 @@ "description": "The format for this event will be announced soon.\r\n\r\nThe proving ground event accessed through this filament will be accessible from August 21st to 25th, YC122", "descriptionID": 568728, "groupID": 4050, - "iconID": 24497, + "iconID": 24498, "marketGroupID": 2747, "mass": 0.0, "metaLevel": 0, @@ -624532,10 +624530,11 @@ "descriptionID": 568732, "groupID": 4050, "iconID": 24498, + "marketGroupID": 2747, "mass": 0.0, "metaLevel": 0, "portionSize": 1, - "published": false, + "published": true, "radius": 1.0, "techLevel": 1, "typeID": 55983, @@ -624926,6 +624925,60 @@ "typeNameID": 568977, "volume": 20.0 }, + "56092": { + "basePrice": 10000.0, + "capacity": 0.0, + "description": "The format for this event will be announced soon.\r\n\r\nThe proving ground event accessed through this filament will be accessible from September 4th to 8th, YC122", + "descriptionID": 569061, + "groupID": 4050, + "iconID": 24498, + "mass": 0.0, + "metaLevel": 0, + "portionSize": 1, + "published": false, + "radius": 1.0, + "techLevel": 1, + "typeID": 56092, + "typeName": "Event 7 Proving Filament", + "typeNameID": 569060, + "volume": 0.1 + }, + "56093": { + "basePrice": 10000.0, + "capacity": 0.0, + "description": "The format for this event will be announced soon.\r\n\r\nThe proving ground event accessed through this filament will be accessible from September 4th to 8th, YC122", + "descriptionID": 569063, + "groupID": 4050, + "iconID": 24498, + "mass": 0.0, + "metaLevel": 0, + "portionSize": 1, + "published": false, + "radius": 1.0, + "techLevel": 1, + "typeID": 56093, + "typeName": "Event 8 Proving Filament", + "typeNameID": 569062, + "volume": 0.1 + }, + "56094": { + "basePrice": 10000.0, + "capacity": 0.0, + "description": "The format for this event will be announced soon.\r\n\r\nThe proving ground event accessed through this filament will be accessible from September 4th to 8th, YC122", + "descriptionID": 569065, + "groupID": 4050, + "iconID": 24498, + "mass": 0.0, + "metaLevel": 0, + "portionSize": 1, + "published": false, + "radius": 1.0, + "techLevel": 1, + "typeID": 56094, + "typeName": "Event 9 Proving Filament", + "typeNameID": 569064, + "volume": 0.1 + }, "561": { "basePrice": 2000.0, "capacity": 0.5, diff --git a/staticdata/phobos/metadata.json b/staticdata/phobos/metadata.json index d960f3ff3..cad8ce726 100644 --- a/staticdata/phobos/metadata.json +++ b/staticdata/phobos/metadata.json @@ -1,10 +1,10 @@ [ { "field_name": "client_build", - "field_value": 1780302 + "field_value": 1782806 }, { "field_name": "dump_time", - "field_value": 1596637914 + "field_value": 1597151359 } ] \ No newline at end of file From 0fcbedba4552298a91fa28b68b66498fcc422eda Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 11 Aug 2020 19:58:44 +0300 Subject: [PATCH 3/8] Disable metaliminal storm context menu --- gui/builtinContextMenus/envEffectAdd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/builtinContextMenus/envEffectAdd.py b/gui/builtinContextMenus/envEffectAdd.py index 66bf4ca0f..a6bddf9b1 100644 --- a/gui/builtinContextMenus/envEffectAdd.py +++ b/gui/builtinContextMenus/envEffectAdd.py @@ -102,9 +102,9 @@ class AddEnvironmentEffect(ContextMenuUnconditional): def getData(self): data = Group() - data.groups['Metaliminal Storm'] = self.getEffectBeacons( - 'Electrical', 'Exotic', 'Gamma', 'Plasma', - extra_garbage=('Metaliminal', 'Storm', 'Matter', 'Ray', 'Firestorm')) + # data.groups['Metaliminal Storm'] = self.getEffectBeacons( + # 'Electrical', 'Exotic', 'Gamma', 'Plasma', + # extra_garbage=('Metaliminal', 'Storm', 'Matter', 'Ray', 'Firestorm')) data.groups['Wormhole'] = self.getEffectBeacons( 'Black Hole', 'Cataclysmic Variable', 'Magnetar', 'Pulsar', 'Red Giant', 'Wolf Rayet') From f850fdf0d5383332f4a550343beb41aaedfcf770 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 11 Aug 2020 19:59:46 +0300 Subject: [PATCH 4/8] Bump version --- version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.yml b/version.yml index 97f405e70..9ecadc3f6 100644 --- a/version.yml +++ b/version.yml @@ -1 +1 @@ -version: v2.24.1 +version: v2.25.0 From a976fb33f0b0cd737ce7908db8080ba764361fa3 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 12 Aug 2020 00:11:52 +0300 Subject: [PATCH 5/8] Fix defender velocity hardwiring --- eos/effects.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eos/effects.py b/eos/effects.py index 4fa4fd2c6..7cbaf1486 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -8691,8 +8691,8 @@ class Effect2872(BaseEffect): @staticmethod def handler(fit, container, context, projectionRange, **kwargs): - fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Defender Missiles'), - 'maxVelocity', container.getModifiedItemAttr('missileVelocityBonus'), **kwargs) + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Defender Missiles'), + 'maxVelocity', container.getModifiedItemAttr('missileVelocityBonus'), **kwargs) class Effect2881(BaseEffect): From a387bc8d0914be85c7dd27230d2f16f4e72426bb Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 13 Aug 2020 01:15:41 +0300 Subject: [PATCH 6/8] Fix import of ship/structure names containing single quotes --- service/port/eft.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/port/eft.py b/service/port/eft.py index c9db04d9c..4161692aa 100644 --- a/service/port/eft.py +++ b/service/port/eft.py @@ -598,7 +598,7 @@ def _importCreateFit(lines): """Create fit and set top-level entity (ship or citadel).""" fit = Fit() header = lines.pop(0) - m = re.match('\[(?P[\w\s]+),\s*(?P.+)\]', header) + m = re.match('\[(?P[\w\s\']+),\s*(?P.+)\]', header) if not m: pyfalog.warning('service.port.eft.importEft: corrupted fit header') raise EftImportError From 3d039724c9e9df29e2dfe87d71af1c7d9a7ecc6e Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 13 Aug 2020 01:18:03 +0300 Subject: [PATCH 7/8] Relax ship name format restrictions even further --- service/port/eft.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/port/eft.py b/service/port/eft.py index 4161692aa..585b8d0f1 100644 --- a/service/port/eft.py +++ b/service/port/eft.py @@ -598,7 +598,7 @@ def _importCreateFit(lines): """Create fit and set top-level entity (ship or citadel).""" fit = Fit() header = lines.pop(0) - m = re.match('\[(?P[\w\s\']+),\s*(?P.+)\]', header) + m = re.match('\[(?P[^,]+),\s*(?P.+)\]', header) if not m: pyfalog.warning('service.port.eft.importEft: corrupted fit header') raise EftImportError From ccb395d592242b39e6d7c7e475b80e2dcc43c3d7 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 13 Aug 2020 13:17:50 +0300 Subject: [PATCH 8/8] Add standard outpost rig effect --- eos/effects.py | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/eos/effects.py b/eos/effects.py index 7cbaf1486..0ab21bc7a 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -26973,15 +26973,12 @@ class Effect6406(BaseEffect): @staticmethod def handler(fit, src, context, projectionRange, **kwargs): groups = ('Structure ECM Battery', 'Structure Disruption Battery') - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, 'falloff', src.getModifiedItemAttr('structureRigEwarFalloffBonus'), stackingPenalties=True, **kwargs) - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, 'maxRange', src.getModifiedItemAttr('structureRigEwarOptimalBonus'), stackingPenalties=True, **kwargs) - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, 'falloffEffectiveness', src.getModifiedItemAttr('structureRigEwarFalloffBonus'), stackingPenalties=True, **kwargs) @@ -27002,8 +26999,7 @@ class Effect6407(BaseEffect): def handler(fit, src, context, projectionRange, **kwargs): groups = ('Structure ECM Battery', 'Structure Disruption Battery') fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, - 'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'), - stackingPenalties=True, **kwargs) + 'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'), **kwargs) class Effect6408(BaseEffect): @@ -27108,8 +27104,7 @@ class Effect6413(BaseEffect): @staticmethod def handler(fit, src, context, projectionRange, **kwargs): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module', - 'capacitorNeed', src.getModifiedItemAttr('structureRigPDCapUseBonus'), - stackingPenalties=True, **kwargs) + 'capacitorNeed', src.getModifiedItemAttr('structureRigPDCapUseBonus'), **kwargs) class Effect6417(BaseEffect): @@ -35213,6 +35208,39 @@ class Effect7097(BaseEffect): 'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level, **kwargs) +class Effect7098(BaseEffect): + """ + structureConversionRigBasicBonuses + + Used by: + Structure Modules from group: Outpost Conversion Rigs (104 of 104) + """ + + type = 'passive' + + @staticmethod + def handler(fit, src, context, projectionRange, **kwargs): + for attr in ('hp', 'armorHP', 'shieldCapacity', 'capacitorCapacity'): + fit.ship.boostItemAttr(attr, src.getModifiedItemAttr('conversionRigHPCapBonus'), **kwargs) + fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('structureRigMaxTargetRangeBonus'), + stackingPenalties=True, **kwargs) + fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('structureRigScanResBonus'), + stackingPenalties=True, **kwargs) + fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('structureRigMaxTargetBonus'), **kwargs) + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module', + 'capacitorNeed', src.getModifiedItemAttr('structureRigPDCapUseBonus'), **kwargs) + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module', + 'empFieldRange', src.getModifiedItemAttr('structureRigPDRangeBonus'), **kwargs) + for attr in ('structureRigMaxTargetBonus', 'structureRigMaxTargetRangeBonus', 'structureRigScanResBonus'): + fit.modules.filteredItemForce( + lambda mod: mod.item.group.name == 'Structure Combat Rig L - Max Targets and Sensor Boosting', + attr, src.getModifiedItemAttr('constantZero'), **kwargs) + for attr in ('structureRigPDCapUseBonus', 'structureRigPDRangeBonus'): + fit.modules.filteredItemForce( + lambda mod: mod.item.group.name == 'Structure Combat Rig L - Point Defense Battery Application and Projection', + attr, src.getModifiedItemAttr('constantZero'), **kwargs) + + class Effect7111(BaseEffect): """ systemSmallPrecursorTurretDamage