From d6a2b4dfc4d7a0fadfc8d7e8c88438c6513638f9 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 29 Jan 2020 15:58:02 +0300 Subject: [PATCH] Fix projected system-wide effects menu after multiple renames --- gui/builtinContextMenus/envEffectAdd.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gui/builtinContextMenus/envEffectAdd.py b/gui/builtinContextMenus/envEffectAdd.py index d797b7f24..2afe3b81c 100644 --- a/gui/builtinContextMenus/envEffectAdd.py +++ b/gui/builtinContextMenus/envEffectAdd.py @@ -121,18 +121,18 @@ class AddEnvironmentEffect(ContextMenuUnconditional): # Expressions for matching when detecting effects we're looking for if incursions: - validgroups = ("Incursion ship attributes effects", - "Invasion Effects") + validgroups = ("Sansha Incursion", + "Triglavian Invasion") else: - validgroups = ("Black Hole Effect Beacon", - "Cataclysmic Variable Effect Beacon", - "Magnetar Effect Beacon", - "Pulsar Effect Beacon", - "Red Giant Beacon", - "Wolf Rayet Effect Beacon") + validgroups = ("Black Hole", + "Cataclysmic Variable", + "Magnetar", + "Pulsar", + "Red Giant", + "Wolf Rayet") # Stuff we don't want to see in names - garbages = ("Effects?", "Beacon", "ship attributes effects") + garbages = ("System Effects", "Effects") # Get group with all the system-wide beacons grp = sMkt.getGroup("Effect Beacon") @@ -142,7 +142,7 @@ class AddEnvironmentEffect(ContextMenuUnconditional): # Check if it belongs to any valid group for group in validgroups: # Check beginning of the name only - if re.match(group, beacon.name): + if re.search(group, beacon.name): # Get full beacon name beaconname = beacon.name for garbage in garbages: