diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py index 51e49cce3..7e3c72b84 100644 --- a/gui/builtinContextMenus/moduleAmmoChange.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -28,10 +28,10 @@ class ChangeModuleAmmo(ContextMenuCombined): 'kinetic': _t('Kinetic'), 'mixed': _t('Mixed')} self.oreChargeCatTrans = OrderedDict([ - ('a1', _t('Asteroid Common')), - ('a2', _t('Asteroid Uncommon')), - ('a3', _t('Asteroid Rare')), - ('a4', _t('Asteroid Premium')), + ('a1', _t('Asteroid Simple')), + ('a2', _t('Asteroid Coherent')), + ('a3', _t('Asteroid Variegated')), + ('a4', _t('Asteroid Complex')), ('a5', _t('Asteroid Abyssal')), ('a6', _t('Asteroid Mercoxit')), ('r4', _t('Moon Ubiquitous')), diff --git a/service/conversions/releaseDec2021.py b/service/conversions/releaseDec2021.py index aa47a3a93..97730d696 100644 --- a/service/conversions/releaseDec2021.py +++ b/service/conversions/releaseDec2021.py @@ -1,17 +1,22 @@ CONVERSIONS = { # Renamed items - 'Mercoxit Mining Crystal I': 'Mercoxit Asteroid Mining Crystal Type A I', - 'Mercoxit Mining Crystal II': 'Mercoxit Asteroid Mining Crystal Type A II', - 'Ubiquitous Moon Ore Mining Crystal I': 'Ubiquitous Moon Mining Crystal Type A I', - 'Ubiquitous Moon Ore Mining Crystal II': 'Ubiquitous Moon Mining Crystal Type A II', - 'Common Moon Ore Mining Crystal I': 'Common Moon Mining Crystal Type A I', - 'Common Moon Ore Mining Crystal II': 'Common Moon Mining Crystal Type A II', - 'Uncommon Moon Ore Mining Crystal I': 'Uncommon Moon Mining Crystal Type A I', - 'Uncommon Moon Ore Mining Crystal II': 'Uncommon Moon Mining Crystal Type A II', - 'Rare Moon Ore Mining Crystal I': 'Rare Moon Mining Crystal Type A I', - 'Rare Moon Ore Mining Crystal II': 'Rare Moon Mining Crystal Type A II', - 'Exceptional Moon Ore Mining Crystal I': 'Exceptional Moon Mining Crystal Type A I', - 'Exceptional Moon Ore Mining Crystal II': 'Exceptional Moon Mining Crystal Type A II', - 'Industrial Core I': 'Capital Industrial Core I', - 'Industrial Core II': 'Capital Industrial Core II', + "Gas Cloud Harvester I": "Gas Cloud Scoop I", + "Gas Cloud Harvester II": "Gas Cloud Scoop II", + "'Crop' Gas Cloud Harvester": "'Crop' Gas Cloud Scoop", + "'Plow' Gas Cloud Harvester": "'Plow' Gas Cloud Scoop", + "Syndicate Gas Cloud Harvester": "Syndicate Gas Cloud Scoop", + "Mercoxit Mining Crystal I": "Mercoxit Asteroid Mining Crystal Type A I", + "Mercoxit Mining Crystal II": "Mercoxit Asteroid Mining Crystal Type A II", + "Ubiquitous Moon Ore Mining Crystal I": "Ubiquitous Moon Mining Crystal Type A I", + "Ubiquitous Moon Ore Mining Crystal II": "Ubiquitous Moon Mining Crystal Type A II", + "Common Moon Ore Mining Crystal I": "Common Moon Mining Crystal Type A I", + "Common Moon Ore Mining Crystal II": "Common Moon Mining Crystal Type A II", + "Uncommon Moon Ore Mining Crystal I": "Uncommon Moon Mining Crystal Type A I", + "Uncommon Moon Ore Mining Crystal II": "Uncommon Moon Mining Crystal Type A II", + "Rare Moon Ore Mining Crystal I": "Rare Moon Mining Crystal Type A I", + "Rare Moon Ore Mining Crystal II": "Rare Moon Mining Crystal Type A II", + "Exceptional Moon Ore Mining Crystal I": "Exceptional Moon Mining Crystal Type A I", + "Exceptional Moon Ore Mining Crystal II": "Exceptional Moon Mining Crystal Type A II", + "Industrial Core I": "Capital Industrial Core I", + "Industrial Core II": "Capital Industrial Core II", }