Merge branch 'alpha' into Issue_754_Imports_need_to_be_more_graceful

.github/workflows/autodeploy.yml

@@ -0,0 +1,28 @@
+# This is a basic deployment workflow triggered by pushes to the alpha branch.
+
+name: Auto-Deploy
+
+# Controls when the action will run. Workflow runs when the alpha branch receives a push event
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - alpha
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  downloadcode:
+    runs-on: self-hosted
+    steps:
+      - shell: bash
+        run: |
+          rm -Rf ./coriolis
+          rm -Rf ./coriolis-data
+          git clone https://github.com/alex-williams/coriolis.git --single-branch --branch alpha
+          git clone https://github.com/alex-williams/coriolis-data.git --single-branch --branch alpha
+          cd coriolis-data
+          npm install
+          cd ../coriolis
+          npm install
+          npm run build
+          sudo -u www-data cp -r ./build/* /var/www/newdisk/coriolis.brighter-applications.co.uk/

src/app/components/AvailableModulesMenu.jsx

@@ -39,13 +39,17 @@ const GRPCAT = {
   'ml': 'lasers',
   'c': 'projectiles',
   'mc': 'projectiles',
+  'advmc': 'projectiles',
   'axmc': 'experimental',
+  'axmce': 'experimental',
+  'ntp': 'experimental',
   'fc': 'projectiles',
   'rfl': 'experimental',
   'pa': 'projectiles',
   'rg': 'projectiles',
   'mr': 'ordnance',
   'axmr': 'experimental',
+  'axmre': 'experimental',
   'rcpl': 'experimental',
   'dtl': 'experimental',
   'tbsc': 'experimental',
@@ -104,7 +108,7 @@ const CATEGORIES = {
 
   // Hardpoints
   'lasers': ['pl', 'ul', 'bl'],
-  'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'],
+  'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
   'ordnance': ['mr', 'tp', 'nl'],
   // Utilities
   'sb': ['sb'],
@@ -113,7 +117,7 @@ const CATEGORIES = {
   'defence': ['ch', 'po', 'ec'],
   'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
   // Experimental
-  'experimental': ['axmc', 'axmr', 'rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],
+  'experimental': ['axmc', 'axmce', 'axmr', 'axmre', 'ntp','rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],
   'weapon stabilizers': ['ews'],
   // Guardian
   'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'],

src/app/i18n/en.json

@@ -112,11 +112,14 @@
     "mc": "Multi-cannon",
     "mh": "Missing Weapon/Utility",
     "mm": "Missing Module",
+    "advmc": "Multi-cannon (Advanced)",
     "axmc": "AX Multi-cannon",
+    "axmce": "AX Multi-cannon (Enhanced)",
     "ml": "Mining Laser",
     "mlc": "Multi Limpet Controller",
     "mr": "Missile Rack",
     "axmr": "AX Missile Rack",
+    "axmre": "AX Missile Rack (Enhanced)",
     "ews": "Experimental Weapon Stabilizer",
     "mrp": "Module Reinforcement Package",
     "nl": "Mine Launcher",
@@ -162,6 +165,7 @@
     "sua": "Supercruise Assist",
     "t": "thrusters",
     "tp": "Torpedo Pylon",
+    "ntp": "Nanite Torpedo Pylon",
     "ul": "Burst Laser",
     "Send To EDEngineer": "Send To EDEngineer",
     "Send To EDOMH": "Send To EDOMH",