From e85b618cbc3cb867bbe9526a2aed666cd82fecb5 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 8 Dec 2020 19:40:48 +0300 Subject: [PATCH] Add set of hacks to rename caustic to tachyon --- eos/gamedata.py | 10 +++++++++- gui/builtinContextMenus/envEffectAdd.py | 5 ++--- gui/builtinViewColumns/baseName.py | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/eos/gamedata.py b/eos/gamedata.py index e1e550537..895caf2bc 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -19,7 +19,7 @@ import json -from collections import OrderedDict +import re from logbook import Logger from sqlalchemy.orm import reconstructor @@ -33,6 +33,10 @@ from .eqBase import EqBase pyfalog = Logger(__name__) +def _t(x): + return x + + class Effect(EqBase): """ The effect handling class, it is used to proxy and load effect handler code, @@ -245,6 +249,10 @@ class Item(EqBase): pass return shortName + @property + def customName(self): + return re.sub(_t('Caustic'), _t('Tachyon'), self.name) + @property def attributes(self): return self.__attributes diff --git a/gui/builtinContextMenus/envEffectAdd.py b/gui/builtinContextMenus/envEffectAdd.py index 2507c6c31..d2fdb3397 100644 --- a/gui/builtinContextMenus/envEffectAdd.py +++ b/gui/builtinContextMenus/envEffectAdd.py @@ -206,17 +206,16 @@ class AddEnvironmentEffect(ContextMenuUnconditional): for beacon in sMkt.getGroup("Abyssal Hazards").items: if not beacon.isType('projected'): continue - name = beacon.name.replace(_t('Caustic'), _t('Tachyon')) groups = (_t('Bioluminescence'), _t('Tachyon'), _t('Filament')) for group in groups: - if re.search(group, name): + if re.search(group, beacon.customName): key = group break else: continue subsubdata = subdata.groups.setdefault(key, Group()) - subsubdata.items.append(Entry(beacon.ID, name, name)) + subsubdata.items.append(Entry(beacon.ID, beacon.customName, beacon.customName)) subdata.sort() # PVP weather diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index 6e98aa71c..2677b904c 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/gui/builtinViewColumns/baseName.py @@ -107,17 +107,17 @@ class BaseName(ViewColumn): elif isinstance(stuff, Module): if self.projectedView: # check for projected abyssal name - name_check = stuff.item.name[0:-2] + name_check = stuff.item.customName[0:-2] type = AddEnvironmentEffect.abyssal_mapping.get(name_check, None) if type: sMkt = Market.getInstance() type = sMkt.getItem(type) - return "{} {}".format(type.name, stuff.item.name[-1:]) + return "{} {}".format(type.name, stuff.item.customName[-1:]) if stuff.isEmpty: return "%s Slot" % FittingSlot(stuff.slot).name.capitalize() else: - return stuff.item.name + return stuff.item.customName elif isinstance(stuff, Implant): return stuff.item.name elif isinstance(stuff, TargetProfile):