v0.4.13-alpha-rc5

Fixed incorrect colour

.gitignore

@@ -1,5 +1,8 @@
 bin
 /scripts/old
+/scripts/python/configurator/dist
+/scripts/python/configurator/build
+/scripts/python/configurator/venv
 .vs
 x64
 core.user
@@ -14,3 +17,5 @@ node_modules
 /client/plugins/controltips/index.js
 hgt
 /client/public/databases/units/old
+/client/plugins/databasemanager/index.js
+

LEGAL

@@ -1,4 +1,34 @@
-                    GNU GENERAL PUBLIC LICENSE
+DCS Olympus
+
+A real-time AI unit control mod for DCS World
+
+Copyright (C) 2023 Veltro & Gang (the "DCS Olympus Team" or the 
+"Rightsholders")
+
+DCS Olympus (the "MATERIAL" or "Software") is provided completely free 
+to users subject to the it under both the terms of version 3 of the GNU 
+General Public License ("GPLv3") as published by the Free Software Foundation, 
+and the additional terms set out below (the "Additional Terms"). In the event
+that the terms of GPLv3 conflict with the Additional Terms, the 
+Additional Terms shall prevail. 
+
+The authors and/or copyright holders of the Software have not received any 
+financial benefit in connection with the Software. In any event, the 
+Software is provided “as is”, without warranty of any kind, express or 
+implied, including but not limited to the warranties of merchantability, 
+fitness for a particular purpose and non-infringement. In no event shall 
+the authors and/or copyright holders be liable for any claim, damages or 
+other liability, whether in an action of contract, tort or otherwise, 
+arising from, out of or in connection with the Software or the use or 
+other dealings in the Software. 
+
+THIS MATERIAL IS NOT MADE OR SUPPORTED BY EAGLE DYNAMICS SA.
+
+Any party making use of the Software in any manner agrees to be bound by 
+the entirety of this document. 
+
+
+                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
@@ -618,57 +648,31 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS
+              END OF GNU GENERAL PUBLIC LICENCE
 
-            How to Apply These Terms to Your New Programs
+                ADDITIONAL TERMS & CONDITIONS
 
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+1. Governing Law
 
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
+  Save where specifically provided for otherwise, the provisions of the 
+GNU General Public Licence Version 3 above shall be governed by and 
+interpreted in accordance with English Law and the parties submit to the 
+exclusive jurisdiction of the English Courts.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+2. Entire Agreement
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+  The text of this document contains the entire understanding between
+you, the licensee, and the authors and/or copyright holders of the
+Software with respect to the subject matter to which it pertains. 
+It supersedes all prior agreements and understandings (if applicable), 
+oral or written, with respect to such matters.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+3. Unilateral Modification
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+  The parties agree that the DCS Olympus Team shall have the right to
+unilaterally modify these terms (i.e. the agreement between you and the 
+DCS Olympus Team for the use of the Software), and that parties shall
+be bound by such terms as modified from time to time. The DCS Olympus Team 
+shall not have an obligation to inform you of such modification, save that 
+such changes will be published on the DCS Olympus Github Repository located at
+https://github.com/Pax1601/DCSOlympus.

README.md

@@ -1,4 +1,4 @@
-# Important note: DCS Olympus is in alpha state. No official release has been produced yet. The first public version is planned for Q4 2023.
+# Important note: DCS Olympus is in alpha state. No official release has been produced yet. The first public version is planned for mid december 2023.
 
 # DCS Olympus
 *A real-time web interface to spawn and control units in DCS World*
@@ -6,32 +6,68 @@
 ![alt text](https://github.com/Pax1601/DCSOlympus/blob/main/client/sample.png?raw=true)
 
 ### What is this?
-DCS Olympus is a mod for DCS World. It allows users to spawn, control, task, group, and remove units from a DCS World server using a real-time map interface, similarly to Real Time Strategy games. The user interface also provides useful informations units, like loadouts, fuel, tasking, and so on. In the future, more features for DCS World GCI and JTAC will be available.
+DCS: Olympus is a free and open-source mod for DCS that enables dynamic real-time control through a map interface. The user is able to spawn units/groups, deploy a variety of effects such as smoke, flares, or explosions, and waypoints/tasks can be given to AI units in real-time in a way similar to a classic RTS game. 
 
-### Features and how to use it
-- Spawn air and ground units, with preset loadouts
-    - Double click on the map to spawn a blue and red units, both in the air and in the ground, with preset loadouts for air-to-air or air-to-ground tasks;
-- Control units
-    - Select one ore more units to move them around. Hold down ctrl and click to create a route for the unit to follow;
-- Attack other units
-    - After selecting one ore more units, double click on another unit and select "Attack" to attack it, depending on the available weapons.
+Additionally Olympus is able to run several effects and unit behaviours beyond the core DCS offerings. This includes such things as napalm and white phosphosous explosions, or setting up AA units to fire at players and miss, and more.
+
+It even includes Red and Blue modes which limit your view and powers to just seeing what your coalition sees, with a spawning budget you could play against your friends even with no-one in the game piloting, or have a Red commander working against a squadron of blue pilots, and/or a blue commander working with them. 
+
+Even better it requires no client mods be installed if used on a server
+
+The full feature list is simply too long to enumerate in a short summary but needless to say Olympus offers up a lot of unique gameplay that has previously not existed, and enhances many other elements of DCS in exciting ways 
 
 ### Installing DCS Olympus
 A prebuilt installer will soon be released and available here
 
-### Building DCS Olympus
-DCS Olympus is comprised of two modules:
+# Frequently Asked Questions
+### Can I join up and help out with the project? ###
+We are currently running towards first release in the very near future so we are not looking to add more people to the core team for the moment. However that does not mean we are not open to collaborations and help going forward, if you want to help for now we are committed to the free and open source model so feel free to check out the github, familiarize yourself with the project and maybe even start submitting pull requests for open issues.
 
-A "core" c++ .dll module, which is run by DCS and exposes all the necessary data, and provides endpoints for commands from a REST server. A Visual Studio 2017/2019/2022 solution is provided, and requires no additional configuration. The core dll solution has two dependencies, both can be installed using vcpkg (https://vcpkg.io/en/getting-started.html):
-- cpprestsdk: `vcpkg install cpprestsdk:x64-windows`
-- geographiclib: `vcpkg install geographiclib:x64-windows`
-    
-    
-A "client" node.js typescript web app, which can be hosted on the server using express.js. A Visual Studio Code configuration is provided for debugging. The client requires node.js to be installed for building (https://nodejs.org/en/). After installing node.js, move in the client folder and run the following commands:
-- `npm install`
-- `npm -g install`
- 
- After installing all the necessary dependencies you can start a development server executing the *client/debug.bat* batch file, and visiting http:\\localhost:3000 with any modern browser (tested with updated Chrome, Firefox and Edge). However, it is highly suggested to simply run the `Launch Chrome against localhost` debug configuration in Visual Studio Code.
+Post-release we will be more interested in developing partnerships/collaborations with other teams/projects and potentially bringing in more team members, we will update this after release on how that will be managed!
+
+### Can I be a beta/alpha-tester? ###
+With first public release planned for the very-near future we are fully committed to the final sprint, as such we will not be formally recruiting more people to test pre-release. 
+
+Post-release we will be eager to hear feedback of all forms and take in bug-reports, at this time after release we will begin considering bringing in more team members to test in development versions as we go.
+
+### Do you have a roadmap? ###
+We do not have a roadmap no, we have a laundry list of things we are hoping to do. 
+
+These include but are not limited to:
+1) Enhancements to helicopter play
+2) More features around use of ground units
+3) More unique effects and behaviours
+4) ATC/AIC features
+5) Usability features like unit painters etc
+
+However we cannot commit to specific features, feature release order, or timelines, please remember this isn't our job and we work on it in our free time because we love DCS
+
+### Does Olympus support mods? ###
+Generally OIympus will not have any issues with other mods, however you may need to tell olympus about modded units in order to be able to dynamically spawn them etc
+
+Keep in mind that any mods you do choose to spawn your players will need to have, some mod unit just appear as a su27 or leo2 etc. when a player is missing them, others can cause client crashes. So be smart about how you use them
+
+### Is Olympus compatible with mission scripts? ###
+We have tried hard to keep Olympus from interfering with other scripts, we have tested with a variety of new and old mission scripts and generally expect it will not be an issue.
+
+However we cannot foresee everything people come up with so we suggest testing with what you have in mind once olympus releases
+
+### How does it work? ###
+The quick answer is magic. 
+
+The long answer is well all the code is there for you to read. 
+
+The middle answer is a bit like SRS does. Olympus consists of two parts. 
+
+(A) Olympus back end: A dll, run by DCS, that sends data out and gets commands in via a REST API;
+(B) Webserver exe: The one you start when starting the server via the desktop shortcut. 
+
+A and B never communicate when you connect the client you download the web page and some other minor stuff from B, and you get the DCS data from and send commands to A.
+
+### How much does Olympus impact performance? ###
+Olympus by itself should not have a noticeable impact on server performance, however the ability for the user to spawn arbitrary units and command engagements means Olympus can be used in such a way that brings the game to it's knees.
+
+Be cognizant of how you play, whether it's done through Olympus or the mission editor 500 MLRS units firing at once is not going to go over well with most servers
  
     
     

build.bat

@@ -0,0 +1,28 @@
+call git clean -fx
+
+cd src
+msbuild olympus.sln /t:Rebuild /p:Configuration=Release
+cd ..
+
+cd scripts/python/configurator
+call build_configurator.bat
+cd ../../..
+
+cd client
+rmdir /s /q "hgt"
+call npm install
+call npm run emit-declarations
+call npm run build-release
+
+cd "plugins\controltips"
+call npm install
+call npm run build-release
+cd "..\.."
+
+cd "plugins\databasemanager"
+call npm install
+call npm run build-release
+cd "..\.."
+
+call npm prune --production
+cd ..

build_package.bat

@@ -1,17 +1,2 @@
-cd src
-msbuild olympus.sln /t:Rebuild /p:Configuration=Release
-cd ..
-cd client
-call npm install
-rmdir /s /q "hgt"
-call npm run emit-declarations
-call npm run build
-cd "plugins\controltips"
-call npm run build
-cd "..\.."
-cd "plugins\databasemanager"
-call npm run build
-cd "..\.."
-call npm prune --production
-cd ..
+call build.bat
 call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss"

client/app.js

@@ -43,7 +43,7 @@ if (config["server"] != undefined)
 module.exports = app;
 
 const DemoDataGenerator = require('./demo.js');
-var demoDataGenerator = new DemoDataGenerator(app);
+var demoDataGenerator = new DemoDataGenerator(app, config);
 
 
 

client/bin/www

@@ -1,5 +1,22 @@
 #!/usr/bin/env node
 
+console.log('\x1b[36m%s\x1b[0m', "*********************************************************************");
+console.log('\x1b[36m%s\x1b[0m', "*  _____   _____  _____    ____  _                                  *");
+console.log('\x1b[36m%s\x1b[0m', "* |  __ \\ / ____|/ ____|  / __ \\| |                                 *");
+console.log('\x1b[36m%s\x1b[0m', "* | |  | | |    | (___   | |  | | |_   _ _ __ ___  _ __  _   _ ___  *");
+console.log('\x1b[36m%s\x1b[0m', "* | |  | | |     \\___ \\  | |  | | | | | | '_ ` _ \\| '_ \\| | | / __| *");
+console.log('\x1b[36m%s\x1b[0m', "* | |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \\__ \\ *");
+console.log('\x1b[36m%s\x1b[0m', "* |_____/ \\_____|_____/   \\____/|_|\\__, |_| |_| |_| .__/ \\__,_|___/ *");
+console.log('\x1b[36m%s\x1b[0m', "*                                   __/ |         | |               *");
+console.log('\x1b[36m%s\x1b[0m', "*                                  |___/          |_|               *");
+console.log('\x1b[36m%s\x1b[0m', "*********************************************************************");
+console.log('\x1b[36m%s\x1b[0m', "");
+console.log("Please wait while DCS Olympus Server starts up...");
+
+var fs = require('fs');
+let rawdata = fs.readFileSync('../olympus.json');
+let config = JSON.parse(rawdata);
+
 /**
  * Module dependencies.
  */
@@ -12,8 +29,14 @@ var http = require('http');
  * Get port from environment and store in Express.
  */
 
-var port = normalizePort(process.env.PORT || '3000');
+var configPort = null;
+if (config["client"] != undefined && config["client"]["port"] != undefined) {
+	configPort = config["client"]["port"];
+}
+
+var port = normalizePort(configPort || '3000');
 app.set('port', port);
+console.log("Express server listening on port: " + port)
 
 /**
  * Create HTTP server.
@@ -88,3 +111,6 @@ function onListening() {
     : 'port ' + addr.port;
   debug('Listening on ' + bind);
 }
+
+console.log("DCS Olympus server v0.4.13-alpha-rc5 started correctly!")
+console.log("Waiting for connections...")

client/demo.js

@@ -2,128 +2,19 @@ const { random } = require('@turf/turf');
 var basicAuth = require('express-basic-auth')
 var enc = new TextEncoder();
 
-const DEMO_UNIT_DATA = {
-    ["1"]:{ category: "Aircraft", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "KC-135", unitName: "Cool guy 1-1 who also has a very long name", groupName: "Cool group 1", state: 1, task: "Being cool!",
-        hasTask: true, position: { lat: 37, lng: -116, alt: 1000 }, speed: 200, heading: 45, isActiveTanker: true, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile with a longer name\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } ,  { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }   ],
-        contacts: [{ID: 2, detectionMethod: 1}, {ID: 3, detectionMethod: 4}, {ID: 4, detectionMethod: 1}],
-        activePath: [{lat: 38, lng: -115, alt: 0}, {lat: 38, lng: -114, alt: 0}]
-    },
-    ["2"]:{ category: "Aircraft", alive: true, human: false, controlled: true, coalition: 1, country: 0, name: "E-3A", unitName: "Cool guy 1-2", groupName: "Cool group 2", state: 1, task: "Being cool",
-        hasTask: true, position: { lat: 36.9, lng: -116, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: true, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 4, detectionMethod: 1}],
-        activePath: [ ]
-    }, ["3"]:{ category: "Helicopter", alive: true, human: false, controlled: false, coalition: 1, country: 0, name: "AH-64D_BLK_II", unitName: "Cool guy 1-4", groupName: "Cool group 3", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 37.1, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 1, detectionMethod: 16}],
-        activePath: [ ]
-    }, ["4"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "Tor 9A331", unitName: "Cool guy 2-1", groupName: "Cool group 4", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 37.2, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: false, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 1001, detectionMethod: 16}],
-        activePath: [ ],
-        isLeader: true,
-        operateAs: 2
-    }, ["5"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "Gepard", unitName: "Cool guy 2-2", groupName: "Cool group 4", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 37.21, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: false, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [],
-        activePath: [ ],
-        isLeader: false,
-        operateAs: 2
-    },
-    ["6"]:{ category: "Aircraft", alive: true, human: false, controlled: false, coalition: 1, country: 0, name: "FA-18C_hornet", unitName: "Bad boi 1-2", groupName: "Bad group 1", state: 1, task: "Being bad",
-        hasTask: false, position: { lat: 36.8, lng: -116, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 1, detectionMethod: 16}],
-        activePath: [ ]
-    }, ["7"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 1, country: 0, name: "Tor 9A331", unitName: "Cool guy 2-1", groupName: "Cool group 10", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 37.2, lng: -116.2, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 1001, detectionMethod: 16}],
-        activePath: [ ],
-        isLeader: true
-    }, 
-}
+const aircraftDatabase = require('./public/databases/units/aircraftDatabase.json');
+const helicopterDatabase = require('./public/databases/units/helicopterDatabase.json');
+const groundUnitDatabase = require('./public/databases/units/groundUnitDatabase.json');
+const navyUnitDatabase = require('./public/databases/units/navyUnitDatabase.json');
+
+const DEMO_UNIT_DATA = {}
 
 const DEMO_WEAPONS_DATA = {
-    ["1001"]:{ category: "Missile", alive: true, coalition: 2, name: "", position: { lat: 37.1, lng: -116, alt: 1000 }, speed: 200, heading: 45 * Math.PI / 180 },
+    /*["1001"]:{ category: "Missile", alive: true, coalition: 2, name: "", position: { lat: 37.1, lng: -116, alt: 1000 }, speed: 200, heading: 45 * Math.PI / 180 }, */
 }
 
 class DemoDataGenerator {
-    constructor(app)
+    constructor(app, config)
     { 
         app.get('/demo/units', (req, res) => this.units(req, res));
         app.get('/demo/weapons', (req, res) => this.weapons(req, res));
@@ -136,32 +27,133 @@ class DemoDataGenerator {
 
         app.use('/demo', basicAuth({
             users: { 
-                'admin': 'password',
-                'blue': 'bluepassword',
-                'red': 'redpassword'
+                'admin': config["authentication"]["gameMasterPassword"],
+                'blue': config["authentication"]["blueCommanderPassword"],
+                'red': config["authentication"]["redCommanderPassword"]
             },
         }))
 
-        //for (let i = 8; i < 100; i++) {
-        //    var randomUnit = { category: "Aircraft", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "KC-135", unitName: "Cool guy 1-1 who also has a very long name", groupName: "Cool group 1", state: 1, task: "Being cool!",
-        //        hasTask: true, position: { lat: 37 + Math.random(), lng: -116 + Math.random(), alt: 1000 }, speed: 200, heading: 45, isActiveTanker: true, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        //        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        //        formationOffset: { x: 0, y: 0, z: 0 },
-        //        targetID: 0,
-        //        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        //        ROE: 1,
-        //        reactionToThreat: 1,
-        //        emissionsCountermeasures: 1,
-        //        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        //        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        //        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        //        ammo: [{ quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile with a longer name\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } ,  { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }   ],
-        //        contacts: [{ID: 2, detectionMethod: 1}, {ID: 3, detectionMethod: 4}, {ID: 4, detectionMethod: 1}],
-        //        activePath: []
-        //    }
-        //    DEMO_UNIT_DATA[i.toString()] = randomUnit;
-        //}
+        
+        let baseData = { alive: true, human: false, controlled: true, coalition: 2, country: 0, unitName: "Cool guy", groupName: "Cool group 1", state: 13, task: "Being cool!",
+            hasTask: true, position: { lat: 37, lng: -116, alt: 1000 }, speed: 200, horizontalVelocity: 200, verticalVelicity: 0, heading: 45, track: 45, isActiveTanker: false, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
+            desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
+            formationOffset: { x: 0, y: 0, z: 0 },
+            targetID: 0,
+            targetPosition: { lat: 0, lng: 0, alt: 0 },
+            ROE: 1,
+            reactionToThreat: 1,
+            emissionsCountermeasures: 1,
+            TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
+            radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
+            generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
+            ammo:  [],
+            contacts: [],
+            activePath: [],
+            isLeader: true
+        }
 
+        
+        
+        // UNCOMMENT TO TEST ALL UNITS ****************
+        /*
+        var databases = Object.assign({}, aircraftDatabase, helicopterDatabase, groundUnitDatabase, navyUnitDatabase);
+        var t = Object.keys(databases).length;
+        var l = Math.floor(Math.sqrt(t));
+        let latIdx = 0;
+        let lngIdx = 0;
+        let idx = 1;
+        console.log(l)
+        for (let name in databases) {
+            if (databases[name].enabled) {
+                DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+                DEMO_UNIT_DATA[idx].name = name;
+                DEMO_UNIT_DATA[idx].groupName = `Group-${idx}`;
+                DEMO_UNIT_DATA[idx].position.lat += latIdx / 5;
+                DEMO_UNIT_DATA[idx].position.lng += lngIdx / 5;
+                DEMO_UNIT_DATA[idx].coalition = Math.floor(Math.random() * 3)
+                
+                latIdx += 1;
+                if (latIdx === l) {
+                    latIdx = 0;
+                    lngIdx += 1;
+                }
+
+                if (name in aircraftDatabase)
+                    DEMO_UNIT_DATA[idx].category = "Aircraft";
+                else if (name in helicopterDatabase)
+                    DEMO_UNIT_DATA[idx].category = "Helicopter";
+                else if (name in groundUnitDatabase)
+                    DEMO_UNIT_DATA[idx].category = "GroundUnit";
+                else if (name in navyUnitDatabase)
+                    DEMO_UNIT_DATA[idx].category = "NavyUnit";
+
+                idx += 1;
+            }
+        }
+        
+
+        */
+        let idx = 1;
+        DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+        DEMO_UNIT_DATA[idx].name = "S_75M_Volhov";
+        DEMO_UNIT_DATA[idx].groupName = `Group`;
+        DEMO_UNIT_DATA[idx].position.lat += idx / 100;
+        DEMO_UNIT_DATA[idx].category = "GroundUnit";
+        DEMO_UNIT_DATA[idx].isLeader = true;
+
+        idx += 1;
+        DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+        DEMO_UNIT_DATA[idx].name = "SNR_75V";
+        DEMO_UNIT_DATA[idx].groupName = `Group`;
+        DEMO_UNIT_DATA[idx].position.lat += idx / 100;
+        DEMO_UNIT_DATA[idx].category = "GroundUnit";
+        DEMO_UNIT_DATA[idx].isLeader = false;
+
+        idx += 1;
+        DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+        DEMO_UNIT_DATA[idx].name = "Ural-4320 APA-5D";
+        DEMO_UNIT_DATA[idx].groupName = `Group`;
+        DEMO_UNIT_DATA[idx].position.lat += idx / 100;
+        DEMO_UNIT_DATA[idx].category = "GroundUnit";
+        DEMO_UNIT_DATA[idx].isLeader = false;
+    
+        
+        idx += 1;
+        DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+        DEMO_UNIT_DATA[idx].name = "F-14B";
+        DEMO_UNIT_DATA[idx].groupName = `Group-1`;
+        DEMO_UNIT_DATA[idx].position.lat += idx / 100;
+        DEMO_UNIT_DATA[idx].category = "Aircraft";
+        DEMO_UNIT_DATA[idx].isLeader = false;
+
+        idx += 1;
+        DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+        DEMO_UNIT_DATA[idx].name = "Infantry AK";
+        DEMO_UNIT_DATA[idx].groupName = `Group-2`;
+        DEMO_UNIT_DATA[idx].position.lat += idx / 100;
+        DEMO_UNIT_DATA[idx].category = "GroundUnit";
+        DEMO_UNIT_DATA[idx].isLeader = true;
+        DEMO_UNIT_DATA[idx].coalition = 0;
+        DEMO_UNIT_DATA[idx].operateAs = 2;
+
+        idx += 1;
+        DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+        DEMO_UNIT_DATA[idx].name = "Infantry AK";
+        DEMO_UNIT_DATA[idx].groupName = `Group-3`;
+        DEMO_UNIT_DATA[idx].position.lat += idx / 100;
+        DEMO_UNIT_DATA[idx].category = "GroundUnit";
+        DEMO_UNIT_DATA[idx].isLeader = true;
+        DEMO_UNIT_DATA[idx].coalition = 0;
+        DEMO_UNIT_DATA[idx].operateAs = 1;
+
+        idx += 1;
+        DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData));
+        DEMO_UNIT_DATA[idx].name = "KC-135";
+        DEMO_UNIT_DATA[idx].groupName = `Group-4`;
+        DEMO_UNIT_DATA[idx].position.lat += idx / 100;
+        DEMO_UNIT_DATA[idx].category = "Aircraft";
+        DEMO_UNIT_DATA[idx].isLeader = true;
+        
 
         this.startTime = Date.now();
     }
@@ -170,49 +162,55 @@ class DemoDataGenerator {
         var array = new Uint8Array();
         var time = Date.now();
         array = this.concat(array, this.uint64ToByteArray(BigInt(time)));
-        for (let idx in DEMO_UNIT_DATA) {
-            const unit = DEMO_UNIT_DATA[idx];
-            array = this.concat(array, this.uint32ToByteArray(idx));
-            array = this.appendString(array, unit.category, 1);
-            array = this.appendUint8(array, unit.alive, 2);
-            array = this.appendUint8(array, unit.human, 3);
-            array = this.appendUint8(array, unit.controlled, 4);
-            array = this.appendUint16(array, unit.coalition, 5);
-            array = this.appendUint8(array, unit.country, 6);
-            array = this.appendString(array, unit.name, 7);
-            array = this.appendString(array, unit.unitName, 8);
-            array = this.appendString(array, unit.groupName, 9);
-            array = this.appendUint8(array, unit.state, 10);
-            array = this.appendString(array, unit.task, 11);
-            array = this.appendUint8(array, unit.hasTask, 12);
-            array = this.appendCoordinates(array, unit.position, 13);
-            array = this.appendDouble(array, unit.speed, 14);
-            array = this.appendDouble(array, unit.heading, 15);
-            array = this.appendUint8(array, unit.isActiveTanker, 16);
-            array = this.appendUint8(array, unit.isActiveAWACS, 17);
-            array = this.appendUint8(array, unit.onOff, 18);
-            array = this.appendUint8(array, unit.followRoads, 19);
-            array = this.appendUint16(array, unit.fuel, 20);
-            array = this.appendDouble(array, unit.desiredSpeed, 21);
-            array = this.appendUint8(array, unit.desiredSpeedType, 22);
-            array = this.appendDouble(array, unit.desiredAltitude, 23);
-            array = this.appendUint8(array, unit.desiredAltitudeType, 24);
-            array = this.appendUint32(array, unit.leaderID, 25);
-            array = this.appendOffset(array, unit.formationOffset, 26);
-            array = this.appendUint32(array, unit.targetID, 27);
-            array = this.appendCoordinates(array, unit.targetPosition, 28);
-            array = this.appendUint8(array, unit.ROE, 29);
-            array = this.appendUint8(array, unit.reactionToThreat, 30);
-            array = this.appendUint8(array, unit.emissionsCountermeasures, 31);
-            array = this.appendTACAN(array, unit.TACAN, 32);
-            array = this.appendRadio(array, unit.radio, 33);
-            array = this.appendRadio(array, unit.generalSettings, 34);
-            array = this.appendAmmo(array, unit.ammo, 35);
-            array = this.appendContacts(array, unit.contacts, 36);
-            array = this.appendActivePath(array, unit.activePath, 37);
-            array = this.appendUint8(array, unit.isLeader, 38);
-            array = this.appendUint8(array, unit.operateAs, 39);
-            array = this.concat(array, this.uint8ToByteArray(255));
+        if (req.query["time"] == 0){
+            for (let idx in DEMO_UNIT_DATA) {
+                const unit = DEMO_UNIT_DATA[idx];
+                var dataIndex = 1;
+                array = this.concat(array, this.uint32ToByteArray(idx));
+                array = this.appendString(array, unit.category, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.alive, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.human, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.controlled, dataIndex); dataIndex++;
+                array = this.appendUint16(array, unit.coalition, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.country, dataIndex); dataIndex++;
+                array = this.appendString(array, unit.name, dataIndex); dataIndex++;
+                array = this.appendString(array, unit.unitName, dataIndex); dataIndex++;
+                array = this.appendString(array, unit.groupName, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.state, dataIndex); dataIndex++;
+                array = this.appendString(array, unit.task, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.hasTask, dataIndex); dataIndex++;
+                array = this.appendCoordinates(array, unit.position, dataIndex); dataIndex++;
+                array = this.appendDouble(array, unit.speed, dataIndex); dataIndex++;
+                array = this.appendDouble(array, unit.horizontalVelocity, dataIndex); dataIndex++;
+                array = this.appendDouble(array, unit.verticalVelicity, dataIndex); dataIndex++;
+                array = this.appendDouble(array, unit.heading, dataIndex); dataIndex++;
+                array = this.appendDouble(array, unit.track, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.isActiveTanker, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.isActiveAWACS, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.onOff, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.followRoads, dataIndex); dataIndex++;
+                array = this.appendUint16(array, unit.fuel, dataIndex); dataIndex++;
+                array = this.appendDouble(array, unit.desiredSpeed, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.desiredSpeedType, dataIndex); dataIndex++;
+                array = this.appendDouble(array, unit.desiredAltitude, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.desiredAltitudeType, dataIndex); dataIndex++;
+                array = this.appendUint32(array, unit.leaderID, dataIndex); dataIndex++;
+                array = this.appendOffset(array, unit.formationOffset, dataIndex); dataIndex++;
+                array = this.appendUint32(array, unit.targetID, dataIndex); dataIndex++;
+                array = this.appendCoordinates(array, unit.targetPosition, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.ROE, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.reactionToThreat, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.emissionsCountermeasures, dataIndex); dataIndex++;
+                array = this.appendTACAN(array, unit.TACAN, dataIndex); dataIndex++;
+                array = this.appendRadio(array, unit.radio, dataIndex); dataIndex++;
+                array = this.appendRadio(array, unit.generalSettings, dataIndex); dataIndex++;
+                array = this.appendAmmo(array, unit.ammo, dataIndex); dataIndex++;
+                array = this.appendContacts(array, unit.contacts, dataIndex); dataIndex++;
+                array = this.appendActivePath(array, unit.activePath, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.isLeader, dataIndex); dataIndex++;
+                array = this.appendUint8(array, unit.operateAs, dataIndex); dataIndex++;
+                array = this.concat(array, this.uint8ToByteArray(255));
+            }
         }
         res.end(Buffer.from(array, 'binary'));
     };

client/package.json

@@ -2,10 +2,11 @@
   "name": "DCSOlympus",
   "node-main": "./bin/www",
   "main": "http://localhost:3000",
-  "version": "v0.4.5-alpha",
+  "version": "v0.4.13-alpha-rc5",
   "private": true,
   "scripts": {
-	  "build": "browserify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat",
+    "build": "browserify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat",
+    "build-release": "browserify .\\src\\index.ts -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat",
     "emit-declarations": "tsc --project tsconfig.json --declaration --emitDeclarationOnly --outfile ./@types/olympus/index.d.ts",
     "copy": "copy.bat",
     "start": "node ./bin/www",
@@ -20,14 +21,16 @@
     "ejs": "^3.1.8",
     "express": "~4.16.1",
     "express-basic-auth": "^1.2.1",
+    "js-sha256": "^0.10.1",
     "leaflet-gesture-handling": "^1.2.2",
     "morgan": "~1.9.1",
     "save": "^2.9.0",
-    "srtm-elevation": "^2.1.2"
+    "srtm-elevation": "^2.1.2",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.21.4",
-    "@tanem/svg-injector": "^10.1.55",
+    "@tanem/svg-injector": "^10.1.68",
     "@types/formatcoords": "^1.1.0",
     "@types/geojson": "^7946.0.10",
     "@types/leaflet": "^1.9.0",
@@ -48,10 +51,9 @@
     "nodemon": "^2.0.20",
     "requirejs": "^2.3.6",
     "sortablejs": "^1.15.0",
+    "tinyify": "^4.0.0",
     "tsify": "^5.0.4",
     "tslib": "latest",
-    "typedoc": "^0.24.8",
-    "typedoc-umlclass": "^0.7.1",
     "typescript": "^4.9.4",
     "usng.js": "^0.4.5",
     "watchify": "^4.0.0"

client/plugins/_boilerplate/copy.bat

@@ -0,0 +1,8 @@
+mkdir .\\..\\DCSOlympus\\client\\public\\plugins\\boilerplateplugin
+
+copy .\\index.js .\\..\\DCSOlympus\\client\\public\\plugins\\boilerplateplugin\\index.js
+copy .\\plugin.json .\\..\\DCSOlympus\\client\\public\\plugins\\boilerplateplugin\\plugin.json
+copy .\\style.css .\\..\\DCSOlympus\\client\\public\\plugins\\boilerplateplugin\\style.css
+
+mkdir .\\..\\DCSOlympus\\client\\public\\plugins\\boilerplateplugin\\images
+copy .\\images\\*.* .\\..\\DCSOlympus\\client\\public\\plugins\\boilerplateplugin\\images\\

client/plugins/_boilerplate/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "boilerplateplugin",
+  "version": "v0.0.1",
+  "private": true,
+  "scripts": {
+    "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat"
+  },
+  "devDependencies": {
+    "@types/sortablejs": "^1.15.4",
+    "browserify": "^17.0.0",
+    "sortablejs": "^1.15.0",
+    "tsify": "^5.0.4"
+  }
+}

client/plugins/_boilerplate/plugin.json

@@ -0,0 +1,7 @@
+{
+    "name": "Boilerplate",
+    "version": "0.0.1",
+    "description": "Base plugin starter",
+    "authorName": "",
+    "authorContact": ""
+}

client/plugins/_boilerplate/readme.md

@@ -0,0 +1,3 @@
+# Boilerplate plugin
+
+See: https://github.com/Pax1601/DCSOlympus/wiki/Developer-Guide

client/plugins/_boilerplate/src/boilerplate.ts

@@ -0,0 +1,27 @@
+import { OlympusPlugin } from "interfaces";
+import { OlympusApp } from "olympusapp";
+
+
+export class BoilerplatePlugin implements OlympusPlugin {
+    #app!: OlympusApp;
+    
+    constructor() {
+    }
+
+    /**
+     * @param app <OlympusApp>
+     * 
+     * @returns boolean on success/fail
+     */
+
+    initialize(app: OlympusApp) : boolean {
+        this.#app = app;
+
+        return true;  //  Return true on success
+    }
+
+    getName() {
+        return "Boilerplate";
+    }
+
+}

client/plugins/_boilerplate/src/index.ts

@@ -0,0 +1,5 @@
+import { BoilerplatePlugin } from "./boilerplate";
+
+globalThis.getOlympusPlugin = () => {
+    return new BoilerplatePlugin();
+}

client/plugins/_boilerplate/tsconfig.json

@@ -0,0 +1,104 @@
+{
+    "compilerOptions": {
+      /* Visit https://aka.ms/tsconfig to read more about this file */
+      /* Projects */
+      // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+      // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+      // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+      // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+      // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+      // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+      /* Language and Environment */
+      "target": "ES2017", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+      // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+      // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+      // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+      // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+      // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+      // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+      // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+      // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+      // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+      // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+      // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
+      /* Modules */
+      "module": "commonjs", /* Specify what module code is generated. */
+      "rootDirs": ["./src",  "./@types"], /* Specify the root folder within your source files. */
+      // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+      // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+      // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+      // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+      "typeRoots": [
+        "./node_modules/@types",
+        "@types"
+      ], /* Specify multiple folders that act like './node_modules/@types'. */
+      "types": [
+        "olympus"
+      ], /* Specify type package names to be included without being referenced in a source file. */
+      // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+      // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+      // "resolveJsonModule": true,                        /* Enable importing .json files. */
+      // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+      /* JavaScript Support */
+       "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+      // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+      // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+      /* Emit */
+      // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+      // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+      // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+      // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+      // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+      // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+      // "removeComments": true,                           /* Disable emitting comments. */
+      // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+      // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+      // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+      // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+      // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+      // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+      // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+      // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+      // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+      // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+      // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+      // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+      // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+      // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+      // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+      // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+      /* Interop Constraints */
+      // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+      // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+      "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+      // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+      "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
+      /* Type Checking */
+      "strict": true, /* Enable all strict type-checking options. */
+      // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+      // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+      // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+      // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+      // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+      // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+      // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+      // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+      // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+      // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+      // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+      // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+      // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+      // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+      // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+      // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+      // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+      // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+      /* Completeness */
+      // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+      "skipLibCheck": true /* Skip type checking all .d.ts files. */
+    },
+    "include": [ 
+        "src/*.ts",
+        "../DCSOlympus/client/@types/olympus/index.d.ts"
+    ]
+}

client/plugins/controltips/index.js

@@ -1,366 +0,0 @@
-(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-"use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ControlTipsPlugin_instances, _ControlTipsPlugin_element, _ControlTipsPlugin_app, _ControlTipsPlugin_shortcutManager, _ControlTipsPlugin_cursorIsHoveringOverUnit, _ControlTipsPlugin_cursorIsHoveringOverAirbase, _ControlTipsPlugin_mouseoverElement, _ControlTipsPlugin_updateTips;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControlTipsPlugin = void 0;
-const SHOW_CONTROL_TIPS = "Show control tips";
-class ControlTipsPlugin {
-    constructor() {
-        _ControlTipsPlugin_instances.add(this);
-        _ControlTipsPlugin_element.set(this, void 0);
-        _ControlTipsPlugin_app.set(this, void 0);
-        _ControlTipsPlugin_shortcutManager.set(this, void 0);
-        _ControlTipsPlugin_cursorIsHoveringOverUnit.set(this, false);
-        _ControlTipsPlugin_cursorIsHoveringOverAirbase.set(this, false);
-        _ControlTipsPlugin_mouseoverElement.set(this, void 0);
-        __classPrivateFieldSet(this, _ControlTipsPlugin_element, document.createElement("div"), "f");
-        __classPrivateFieldGet(this, _ControlTipsPlugin_element, "f").id = "control-tips-panel";
-        document.body.appendChild(__classPrivateFieldGet(this, _ControlTipsPlugin_element, "f"));
-    }
-    getName() {
-        return "Control Tips Plugin";
-    }
-    initialize(app) {
-        __classPrivateFieldSet(this, _ControlTipsPlugin_app, app, "f");
-        __classPrivateFieldSet(this, _ControlTipsPlugin_shortcutManager, __classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getShortcutManager(), "f");
-        __classPrivateFieldGet(this, _ControlTipsPlugin_shortcutManager, "f").onKeyDown(() => {
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        __classPrivateFieldGet(this, _ControlTipsPlugin_shortcutManager, "f").onKeyUp(() => {
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("airbaseMouseover", (ev) => {
-            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverAirbase, true, "f");
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("airbaseMouseout", (ev) => {
-            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverAirbase, false, "f");
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("unitDeselection", (ev) => {
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("unitMouseover", (ev) => {
-            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverUnit, true, "f");
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("unitMouseout", (ev) => {
-            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverUnit, false, "f");
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("unitsSelection", (ev) => {
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("mapVisibilityOptionsChanged", () => {
-            this.toggle(!__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getMap().getVisibilityOptions()[SHOW_CONTROL_TIPS]);
-        });
-        document.addEventListener("mouseover", (ev) => {
-            if (ev.target instanceof HTMLElement) {
-                __classPrivateFieldSet(this, _ControlTipsPlugin_mouseoverElement, ev.target, "f");
-            }
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        document.addEventListener("mouseup", (ev) => {
-            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        });
-        __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
-        __classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getMap().addVisibilityOption(SHOW_CONTROL_TIPS, true);
-        return true;
-    }
-    getElement() {
-        return __classPrivateFieldGet(this, _ControlTipsPlugin_element, "f");
-    }
-    toggle(bool) {
-        this.getElement().classList.toggle("hide", bool);
-    }
-}
-exports.ControlTipsPlugin = ControlTipsPlugin;
-_ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap(), _ControlTipsPlugin_shortcutManager = new WeakMap(), _ControlTipsPlugin_cursorIsHoveringOverUnit = new WeakMap(), _ControlTipsPlugin_cursorIsHoveringOverAirbase = new WeakMap(), _ControlTipsPlugin_mouseoverElement = new WeakMap(), _ControlTipsPlugin_instances = new WeakSet(), _ControlTipsPlugin_updateTips = function _ControlTipsPlugin_updateTips() {
-    const combos = [
-        {
-            "keys": [],
-            "tips": [
-                {
-                    "key": `SHIFT`,
-                    "action": `Box select`,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": false,
-                    "showIfUnitSelected": false
-                },
-                {
-                    "key": `Mouse1`,
-                    "action": `Deselect`,
-                    "showIfUnitSelected": true
-                },
-                {
-                    "key": `Mouse1+drag`,
-                    "action": `Move map`,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": false,
-                    "showIfUnitSelected": false
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": `Spawn menu`,
-                    "showIfUnitSelected": false,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": false
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": `Quick options`,
-                    "showIfUnitSelected": false,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": true
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": `Airbase menu`,
-                    "showIfUnitSelected": false,
-                    "showIfHoveringOverAirbase": true,
-                    "showIfHoveringOverUnit": false
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": `Set first waypoint`,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfUnitSelected": true,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": `Mouse2 (hold)`,
-                    "action": `Interact (ground)`,
-                    "showIfUnitSelected": true,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": false,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": `Shift`,
-                    "action": "<em>  in formation...</em>",
-                    "showIfUnitSelected": true,
-                    "minSelectedUnits": 2
-                },
-                {
-                    "key": "CTRL",
-                    "action": "<em>  ... more</em>",
-                    "showIfUnitSelected": true,
-                    "showIfHoveringOverAirbase": false,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": "CTRL",
-                    "action": " Pin tool",
-                    "showIfUnitSelected": false,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": false,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": "CTRL+Mouse2",
-                    "action": " Airbase menu",
-                    "showIfUnitSelected": true,
-                    "showIfHoveringOverAirbase": true,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": `Mouse1`,
-                    "action": "Toggle Blue/Red",
-                    "mouseoverSelector": "#coalition-switch .ol-switch-fill"
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": "Set Neutral",
-                    "mouseoverSelector": "#coalition-switch .ol-switch-fill"
-                },
-                {
-                    "key": `Mouse1`,
-                    "action": "Toggle time display",
-                    "mouseoverSelector": "#connection-status-panel[data-is-connected] #connection-status-message abbr"
-                },
-                {
-                    "key": `Mouse1 or Z`,
-                    "action": "Change location system",
-                    "mouseoverSelector": "#coordinates-tool, #coordinates-tool *"
-                },
-                {
-                    "key": `Comma`,
-                    "action": "Decrease precision",
-                    "mouseoverSelector": `#coordinates-tool[data-location-system="MGRS"], #coordinates-tool[data-location-system="MGRS"] *`
-                },
-                {
-                    "key": `Period`,
-                    "action": "Increase precision",
-                    "mouseoverSelector": `#coordinates-tool[data-location-system="MGRS"], #coordinates-tool[data-location-system="MGRS"] *`
-                }
-            ]
-        },
-        {
-            "keys": ["ControlLeft"],
-            "tips": [
-                {
-                    "key": `Mouse1`,
-                    "action": "Toggle pin",
-                    "showIfUnitSelected": false,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": false
-                },
-                {
-                    "key": `Mouse1`,
-                    "action": "Toggle selection",
-                    "showIfUnitSelected": true,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": true
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": `Add waypoint`,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": false,
-                    "showIfUnitSelected": true,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": `Interact (airbase)`,
-                    "showIfHoveringOverAirbase": true,
-                    "showIfUnitSelected": true,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": `Interact (unit)`,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfHoveringOverUnit": true,
-                    "showIfUnitSelected": true,
-                    "unitsMustBeControlled": true
-                },
-                {
-                    "key": `Shift`,
-                    "action": "<em>  in formation...</em>",
-                    "showIfUnitSelected": true,
-                    "minSelectedUnits": 2
-                },
-                {
-                    "key": `[Num 1-9]`,
-                    "action": "Set hotgroup",
-                    "showIfUnitSelected": true
-                }
-            ]
-        },
-        {
-            "keys": ["ShiftLeft"],
-            "tips": [
-                {
-                    "key": `Mouse1+drag`,
-                    "action": "Box select",
-                    "showIfUnitSelected": false
-                },
-                {
-                    "key": `Mouse2`,
-                    "action": "Set first formation waypoint",
-                    "showIfUnitSelected": true,
-                    "minSelectedUnits": 2
-                },
-                {
-                    "key": "CTRL",
-                    "action": "<em>  ... more</em>",
-                    "minSelectedUnits": 2,
-                    "showIfUnitSelected": true,
-                    "showIfHoveringOverAirbase": false,
-                    "unitsMustBeControlled": true
-                }
-            ]
-        },
-        {
-            "keys": ["ControlLeft", "ShiftLeft"],
-            "tips": [
-                {
-                    "key": `Mouse2`,
-                    "action": "Add formation waypoint",
-                    "showIfUnitSelected": true,
-                    "minSelectedUnits": 2,
-                    "unitsMustBeControlled": true
-                }
-            ]
-        }
-    ];
-    const currentCombo = combos.find((combo) => __classPrivateFieldGet(this, _ControlTipsPlugin_shortcutManager, "f").keyComboMatches(combo.keys)) || combos[0];
-    const element = this.getElement();
-    element.innerHTML = "";
-    let numSelectedUnits = 0;
-    let numSelectedControlledUnits = 0;
-    let unitSelectionContainsControlled = false;
-    if (__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getUnitsManager()) {
-        let selectedUnits = Object.values(__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getUnitsManager().getSelectedUnits());
-        numSelectedUnits = selectedUnits.length;
-        numSelectedControlledUnits = selectedUnits.filter((unit) => unit.getControlled()).length;
-        unitSelectionContainsControlled = numSelectedControlledUnits > 0;
-    }
-    const tipsIncludesActiveMouseover = (currentCombo.tips.some((tip) => {
-        if (!tip.mouseoverSelector) {
-            return false;
-        }
-        if (__classPrivateFieldGet(this, _ControlTipsPlugin_mouseoverElement, "f") instanceof HTMLElement === false) {
-            return false;
-        }
-        if (!__classPrivateFieldGet(this, _ControlTipsPlugin_mouseoverElement, "f").matches(tip.mouseoverSelector)) {
-            return false;
-        }
-        return true;
-    }));
-    currentCombo.tips.filter((tip) => {
-        if (numSelectedUnits > 0) {
-            if (tip.showIfUnitSelected === false) {
-                return false;
-            }
-            if (tip.unitsMustBeControlled === true && unitSelectionContainsControlled === false) {
-                return false;
-            }
-            if (typeof tip.minSelectedUnits === "number" && numSelectedControlledUnits < tip.minSelectedUnits) {
-                return false;
-            }
-        }
-        if (numSelectedUnits === 0 && tip.showIfUnitSelected === true) {
-            return false;
-        }
-        if (typeof tip.showIfHoveringOverAirbase === "boolean") {
-            if (tip.showIfHoveringOverAirbase !== __classPrivateFieldGet(this, _ControlTipsPlugin_cursorIsHoveringOverAirbase, "f")) {
-                return false;
-            }
-        }
-        if (typeof tip.showIfHoveringOverUnit === "boolean") {
-            if (tip.showIfHoveringOverUnit !== __classPrivateFieldGet(this, _ControlTipsPlugin_cursorIsHoveringOverUnit, "f")) {
-                return false;
-            }
-        }
-        if (tipsIncludesActiveMouseover && (typeof tip.mouseoverSelector !== "string" || !__classPrivateFieldGet(this, _ControlTipsPlugin_mouseoverElement, "f").matches(tip.mouseoverSelector))) {
-            return false;
-        }
-        if (!tipsIncludesActiveMouseover && typeof tip.mouseoverSelector === "string") {
-            return false;
-        }
-        element.innerHTML += `<div><span class="key">${tip.key}</span><span class="action">${tip.action}</span></div>`;
-    });
-};
-
-},{}],2:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const controltipsplugin_1 = require("./controltipsplugin");
-globalThis.getOlympusPlugin = () => {
-    return new controltipsplugin_1.ControlTipsPlugin();
-};
-
-},{"./controltipsplugin":1}]},{},[2]);

client/plugins/controltips/package.json

@@ -3,8 +3,27 @@
   "version": "v0.0.1",
   "private": true,
   "scripts": {
-    "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat"
+    "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat",
+    "build-release": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat"
   },
   "dependencies": {},
-  "devDependencies": {}
+  "devDependencies": {
+    "@babel/preset-env": "^7.21.4",
+    "@types/node": "^18.16.1",
+    "@types/sortablejs": "^1.15.0",
+    "babelify": "^10.0.0",
+    "browserify": "^17.0.0",
+    "concurrently": "^7.6.0",
+    "cp": "^0.2.0",
+    "esmify": "^2.1.1",
+    "nodemon": "^2.0.20",
+    "requirejs": "^2.3.6",
+    "sortablejs": "^1.15.0",
+    "tinyify": "^4.0.0",
+    "tsify": "^5.0.4",
+    "tslib": "latest",
+    "typescript": "^4.9.4",
+    "usng.js": "^0.4.5",
+    "watchify": "^4.0.0"
+  }
 }

client/plugins/controltips/src/controltipsplugin.ts

@@ -1,4 +1,6 @@
 import { OlympusPlugin } from "interfaces";
+import { OlympusApp } from "olympusapp";
+import { Unit } from "unit/unit";
 
 
 const SHOW_CONTROL_TIPS = "Show control tips"
@@ -62,7 +64,7 @@ export class ControlTipsPlugin implements OlympusPlugin {
             this.#updateTips();
         });
 
-        document.addEventListener("mapVisibilityOptionsChanged", () => {
+        document.addEventListener("mapOptionsChanged", () => {
             this.toggle( !this.#app.getMap().getVisibilityOptions()[SHOW_CONTROL_TIPS] );
         });
 
@@ -123,13 +125,6 @@ export class ControlTipsPlugin implements OlympusPlugin {
                         "showIfHoveringOverAirbase": false,
                         "showIfHoveringOverUnit": false
                     },
-                    {
-                        "key": `Mouse2`,
-                        "action": `Quick options`,
-                        "showIfUnitSelected": false,
-                        "showIfHoveringOverAirbase": false,
-                        "showIfHoveringOverUnit": true
-                    },
                     {
                         "key": `Mouse2`,
                         "action": `Airbase menu`,
@@ -279,6 +274,11 @@ export class ControlTipsPlugin implements OlympusPlugin {
                         "showIfUnitSelected": true,
                         "minSelectedUnits": 2
                     },
+                    {
+                        "key": `[Num 1-9]`,
+                        "action": "Add to hotgroup",
+                        "showIfUnitSelected": true
+                    },
                     {
                         "key": "CTRL",
                         "action": "<em>  ... more</em>",
@@ -298,6 +298,16 @@ export class ControlTipsPlugin implements OlympusPlugin {
                         "showIfUnitSelected": true,
                         "minSelectedUnits": 2,
                         "unitsMustBeControlled": true
+                    }, {
+                        "key": `[Num 1-9]`,
+                        "action": "Add hotgroup to selection",
+                        "callback": ( tip:object ) => {
+                            return (Object.values<Unit>( this.#app.getUnitsManager().getUnits() ).some( ( unit:Unit ) => {
+                                return unit.getAlive() && unit.getControlled() && unit.getHotgroup();
+                            }));
+                        },
+                        "showIfUnitSelected": true,
+                        "minSelectedUnits": 1
                     }
                 ]
             }
@@ -375,6 +385,10 @@ export class ControlTipsPlugin implements OlympusPlugin {
                 return false;
             }
 
+            if ( typeof tip.callback === "function" && !tip.callback( tip ) ) {
+                return false;
+            }
+
             element.innerHTML += `<div><span class="key">${tip.key}</span><span class="action">${tip.action}</span></div>`;
 
         });

client/plugins/databasemanager/package.json

@@ -4,10 +4,29 @@
   "private": true,
   "scripts": {
     "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat",
+    "build-release": "browserify ./src/index.ts -p [ tsify --noImplicitAny] -p [ tinyify ] > index.js && copy.bat",
     "start": "npm run copy & concurrently --kill-others \"npm run watch\"",
     "copy": "copy.bat",
-    "watch": "watchify ./src/index.ts --debug -o ../../public/plugins/databasemanager/index.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]"
+    "watch": "watchify ./src/index.ts --debug -o ../../public/plugins/databasemanager/index.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js']"
   },
   "dependencies": {},
-  "devDependencies": {}
+  "devDependencies": {
+    "@babel/preset-env": "^7.21.4",
+    "@types/node": "^18.16.1",
+    "@types/sortablejs": "^1.15.0",
+    "babelify": "^10.0.0",
+    "browserify": "^17.0.0",
+    "concurrently": "^7.6.0",
+    "cp": "^0.2.0",
+    "esmify": "^2.1.1",
+    "nodemon": "^2.0.20",
+    "requirejs": "^2.3.6",
+    "sortablejs": "^1.15.0",
+    "tinyify": "^4.0.0",
+    "tsify": "^5.0.4",
+    "tslib": "latest",
+    "typescript": "^4.9.4",
+    "usng.js": "^0.4.5",
+    "watchify": "^4.0.0"
+  }
 }

client/plugins/databasemanager/src/airuniteditor.ts

@@ -46,7 +46,7 @@ export class AirUnitEditor extends UnitEditor {
             addStringInput(this.contentDiv2, "Cost", String(blueprint.cost) ?? "", "number", (value: string) => { blueprint.cost = parseFloat(value); });
             addCheckboxInput(this.contentDiv2, "Can target point", blueprint.canTargetPoint ?? false, (value: boolean) => {blueprint.canTargetPoint = value;})
             addStringInput(this.contentDiv2, "Description", blueprint.description ?? "", "text", (value: string) => {blueprint.description = value; });
-            addStringInput(this.contentDiv2, "Abilities", blueprint.abilities ?? "", "text", (value: string) => {blueprint.abilities = value; });
+            addStringInput(this.contentDiv2, "Tags", blueprint.tags ?? "", "text", (value: string) => {blueprint.tags = value; });
 
             /* Add a scrollable list of loadouts that the user can edit */
             var title = document.createElement("label");

client/plugins/databasemanager/src/databasemanagerplugin.ts

@@ -16,7 +16,7 @@ import { NavyUnitEditor } from "./navyuniteditor";
  */
  
 export class DatabaseManagerPlugin implements OlympusPlugin {
-    #app: OlympusApp | null = null;
+    #app!: OlympusApp;
 
     #element: HTMLElement;
     #mainContentContainer: HTMLElement;
@@ -86,18 +86,18 @@ export class DatabaseManagerPlugin implements OlympusPlugin {
         /* Create the container for the database editor elements  and the elements themselves */
         this.#mainContentContainer = document.createElement("div");
         this.#mainContentContainer.classList.add("dm-container");
-        this.#element.appendChild(this.#mainContentContainer)
+        this.#element.appendChild(this.#mainContentContainer);
 
         this.#contentDiv1 = document.createElement("div");
-        this.#contentDiv1.classList.add("dm-content-container");
+        this.#contentDiv1.classList.add("dm-content-container", "ol-scrollable");
         this.#mainContentContainer.appendChild(this.#contentDiv1);
 
         this.#contentDiv2 = document.createElement("div");
-        this.#contentDiv2.classList.add("dm-content-container");
+        this.#contentDiv2.classList.add("dm-content-container", "ol-scrollable");
         this.#mainContentContainer.appendChild(this.#contentDiv2);
 
         this.#contentDiv3 = document.createElement("div");
-        this.#contentDiv3.classList.add("dm-content-container");
+        this.#contentDiv3.classList.add("dm-content-container", "ol-scrollable");
         this.#mainContentContainer.appendChild(this.#contentDiv3);
 
         /* Create the database editors, which use the three divs created before */
@@ -157,6 +157,15 @@ export class DatabaseManagerPlugin implements OlympusPlugin {
      */
     initialize(app: any) {
         this.#app = app;
+
+        const contextManager = this.#app.getContextManager();
+        contextManager.add( "databaseManager", {
+            "allowUnitCopying": false,
+            "allowUnitPasting": false,
+            "useSpawnMenu": false,
+            "useUnitControlPanel": false,
+            "useUnitInfoPanel": false
+        });
     
         /* Load the databases and initialize the editors */
         this.#loadDatabases();
@@ -169,7 +178,7 @@ export class DatabaseManagerPlugin implements OlympusPlugin {
         var toolbar: PrimaryToolbar = this.#app?.getToolbarsManager().get("primaryToolbar") as PrimaryToolbar;
         var elements = toolbar.getMainDropdown().getOptionElements();
         var arr = Array.prototype.slice.call(elements);
-        arr.splice(arr.length - 1, 0, mainButtonDiv);
+        arr.splice(arr.length - 3, 0, mainButtonDiv);
         toolbar.getMainDropdown().setOptionsElements(arr);
         mainButton.onclick = () => {
             toolbar.getMainDropdown().close();
@@ -197,6 +206,9 @@ export class DatabaseManagerPlugin implements OlympusPlugin {
             this.getElement().classList.toggle("hide", !bool);
         else
             this.getElement().classList.toggle("hide");
+
+        if ( this.#app )
+            this.#app.getContextManager().setContext( this.getElement().classList.contains("hide") ? "olympus" : "databaseManager" );
     }
 
     /** Hide all the editors

client/plugins/databasemanager/src/grounduniteditor.ts

@@ -30,20 +30,29 @@ export class GroundUnitEditor extends UnitEditor {
             addStringInput(this.contentDiv2, "Label", blueprint.label, "text", (value: string) => {blueprint.label = value; });
             addStringInput(this.contentDiv2, "Short label", blueprint.shortLabel, "text", (value: string) => {blueprint.shortLabel = value; });
             addStringInput(this.contentDiv2, "Type", blueprint.type?? "", "text", (value: string) => {blueprint.type = value; });
+            addStringInput(this.contentDiv2, "Unit when grouped", blueprint.unitWhenGrouped?? "", "text", (value: string) => {blueprint.unitWhenGrouped = value; });
             addDropdownInput(this.contentDiv2, "Coalition", blueprint.coalition, ["", "blue", "red"], (value: string) => {blueprint.coalition = value; });
             addDropdownInput(this.contentDiv2, "Era", blueprint.era, ["WW2", "Early Cold War", "Mid Cold War", "Late Cold War", "Modern"], (value: string) => {blueprint.era = value; });
             //addStringInput(this.contentDiv2, "Filename", blueprint.filename?? "", "text", (value: string) => {blueprint.filename = value; });
             addStringInput(this.contentDiv2, "Cost", String(blueprint.cost)?? "", "number", (value: string) => {blueprint.cost = parseFloat(value); });
             addStringInput(this.contentDiv2, "Acquisition range [m]", String(blueprint.acquisitionRange)?? "", "number", (value: string) => {blueprint.acquisitionRange = parseFloat(value); });
             addStringInput(this.contentDiv2, "Engagement range [m]", String(blueprint.engagementRange)?? "", "number", (value: string) => {blueprint.engagementRange = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Targeting range [m]", String(blueprint.targetingRange)?? "", "number", (value: string) => {blueprint.targetingRange = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Aim method range [m]", String(blueprint.aimMethodRange)?? "", "number", (value: string) => {blueprint.aimMethodRange = parseFloat(value); });
             addStringInput(this.contentDiv2, "Barrel height [m]", String(blueprint.barrelHeight)?? "", "number", (value: string) => {blueprint.barrelHeight = parseFloat(value); });
             addStringInput(this.contentDiv2, "Muzzle velocity [m/s]", String(blueprint.muzzleVelocity)?? "", "number", (value: string) => {blueprint.muzzleVelocity = parseFloat(value); });
             addStringInput(this.contentDiv2, "Aim time [s]", String(blueprint.aimTime)?? "", "number", (value: string) => {blueprint.aimTime = parseFloat(value); });
-            addStringInput(this.contentDiv2, "Burst quantity", String(blueprint.shotsToFire)?? "", "number", (value: string) => {blueprint.shotsToFire = Math.round(parseFloat(value)); });
+            addStringInput(this.contentDiv2, "Shots to fire", String(blueprint.shotsToFire)?? "", "number", (value: string) => {blueprint.shotsToFire = Math.round(parseFloat(value)); });
+            addStringInput(this.contentDiv2, "Shots base interval [s]", String(blueprint.shotsBaseInterval)?? "", "number", (value: string) => {blueprint.shotsBaseInterval = Math.round(parseFloat(value)); });
+            addStringInput(this.contentDiv2, "Shots base scatter [°]", String(blueprint.shotsBaseScatter)?? "", "number", (value: string) => {blueprint.shotsBaseScatter = Math.round(parseFloat(value)); });            
+            addStringInput(this.contentDiv2, "Alertness time constant [s]", String(blueprint.alertnessTimeConstant)?? "", "number", (value: string) => {blueprint.alertnessTimeConstant = Math.round(parseFloat(value)); });            
             addCheckboxInput(this.contentDiv2, "Can target point", blueprint.canTargetPoint ?? false, (value: boolean) => {blueprint.canTargetPoint = value;})
             addCheckboxInput(this.contentDiv2, "Can rearm", blueprint.canRearm ?? false, (value: boolean) => {blueprint.canRearm = value;})
+            addCheckboxInput(this.contentDiv2, "Can operate as AAA", blueprint.canAAA ?? false, (value: boolean) => {blueprint.canAAA = value;})
+            addCheckboxInput(this.contentDiv2, "Indirect fire (e.g. mortar)", blueprint.indirectFire ?? false, (value: boolean) => {blueprint.indirectFire = value;})
             addStringInput(this.contentDiv2, "Description", blueprint.description ?? "", "text", (value: string) => {blueprint.description = value; });
-            addStringInput(this.contentDiv2, "Abilities", blueprint.abilities ?? "", "text", (value: string) => {blueprint.abilities = value; });
+            addStringInput(this.contentDiv2, "Tags", blueprint.tags ?? "", "text", (value: string) => {blueprint.tags = value; });
+            addStringInput(this.contentDiv2, "Marker file", blueprint.markerFile ?? "", "text", (value: string) => {blueprint.markerFile = value; });
         }
     }
 

client/plugins/databasemanager/src/loadouteditor.ts

@@ -37,10 +37,10 @@ export class LoadoutEditor {
         this.#contentDiv.appendChild(title);
 
         if (this.#loadout) {
-            var laodout = this.#loadout;
-            addStringInput(this.#contentDiv, "Name", laodout.name, "text", (value: string) => {laodout.name = value; this.#contentDiv.dispatchEvent(new Event("refresh"));});
-            addStringInput(this.#contentDiv, "Code", laodout.code, "text", (value: string) => {laodout.code = value; });
-            addStringInput(this.#contentDiv, "Roles", arrayToString(laodout.roles), "text", (value: string) => {laodout.roles = stringToArray(value);});
+            var loadout = this.#loadout;
+            addStringInput(this.#contentDiv, "Name", loadout.name, "text", (value: string) => {loadout.name = value; this.#contentDiv.dispatchEvent(new Event("refresh"));});
+            addStringInput(this.#contentDiv, "Code", loadout.code, "text", (value: string) => {loadout.code = value; });
+            addStringInput(this.#contentDiv, "Roles", arrayToString(loadout.roles), "text", (value: string) => {loadout.roles = stringToArray(value);});
             addLoadoutItemsEditor(this.#contentDiv, this.#loadout);
         }
     }

client/plugins/databasemanager/src/uniteditor.ts

@@ -49,9 +49,9 @@ export abstract class UnitEditor {
     }
 
     /** Show the editor
-     * 
+     * @param filter String filter
      */
-    show() {
+    show(filter: string = "") {
         this.visible = true;
         this.contentDiv1.replaceChildren();
         this.contentDiv2.replaceChildren();
@@ -62,20 +62,20 @@ export abstract class UnitEditor {
             var title = document.createElement("label");
             title.innerText = "Units list";
             this.contentDiv1.appendChild(title);
-            
-            addBlueprintsScroll(this.contentDiv1, this.database, (key: string) => {
-                if (this.database != null) 
-                    this.setBlueprint(this.database.blueprints[key])
-            })
 
-            addNewElementInput(this.contentDiv1, (ev: MouseEvent, input: HTMLInputElement) => {
-                if (input.value != "")
-                    this.addBlueprint((input).value);
-            });
+            var filterInput = document.createElement("input");
+            filterInput.value = filter;
+            this.contentDiv1.appendChild(filterInput);
+
+            filterInput.onchange = (e: Event) => {
+                this.show((e.target as HTMLInputElement).value);
+            }
+            
+            this.addBlueprints(filter);
         }
     }
 
-    /** Hid the editor
+    /** Hide the editor
      * 
      */
     hide() {
@@ -93,6 +93,24 @@ export abstract class UnitEditor {
         return this.database;
     }
 
+    /**
+     * 
+     * @param filter String filter
+     */
+    addBlueprints(filter: string = "") {
+        if (this.database) {
+            addBlueprintsScroll(this.contentDiv1, this.database, filter, (key: string) => {
+                if (this.database != null) 
+                    this.setBlueprint(this.database.blueprints[key])
+            });
+
+            addNewElementInput(this.contentDiv1, (ev: MouseEvent, input: HTMLInputElement) => {
+                if (input.value != "")
+                    this.addBlueprint((input).value);
+            });
+        }
+    }
+
     /* Abstract methods which will depend on the specific type of units */
     abstract setBlueprint(blueprint: UnitBlueprint): void;
     abstract addBlueprint(key: string): void;

client/plugins/databasemanager/src/utils.ts

@@ -174,40 +174,60 @@ export function addNewElementInput(div: HTMLElement, callback: CallableFunction)
  * 
  * @param div The HTMLElement that will contain the list
  * @param database The database that will be used to fill the list of blueprints
+ * @param filter A string filter that will be executed to filter the blueprints to add
  * @param callback Callback called when the user clicks on one of the elements
  */
-export function addBlueprintsScroll(div: HTMLElement, database: {blueprints: {[key: string]: UnitBlueprint}}, callback: CallableFunction) {
+export function addBlueprintsScroll(div: HTMLElement, database: {blueprints: {[key: string]: UnitBlueprint}}, filter: string, callback: CallableFunction) {
     var scrollDiv = document.createElement("div");
     scrollDiv.classList.add("dm-scroll-container");
     if (database !== null) {
         var blueprints: {[key: string]: UnitBlueprint} = database.blueprints;
 
         for (let key of Object.keys(blueprints).sort((a, b) => a.localeCompare(b, undefined, {sensitivity: 'base'}))) {
-            var rowDiv = document.createElement("div");
-            scrollDiv.appendChild(rowDiv);
-
-            var text = document.createElement("label");
-            text.textContent = key;
-            text.onclick = () => callback(key);
-            rowDiv.appendChild(text);
-
-            let checkbox = document.createElement("input");
-            checkbox.type = "checkbox";
-            checkbox.checked = blueprints[key].enabled;
-            checkbox.onclick = () => {
-                console.log(checkbox.checked);
-                blueprints[key].enabled = checkbox.checked;
+            var addKey = true;
+            if (filter !== "") {
+                try {
+                    var blueprint = blueprints[key];
+                    addKey = eval(filter);
+                } catch {
+                    console.error("An error has occurred evaluating the blueprint filter")
+                }
             }
-            rowDiv.appendChild(checkbox);
 
-            /* This button allows to remove an element from the list. It requires a refresh. */
-            var button = document.createElement("button");
-            button.innerText = "X";
-            button.onclick = () => {
-                delete blueprints[key];
-                div.dispatchEvent(new Event("refresh"));
+            if (addKey) {
+                var rowDiv = document.createElement("div");
+                scrollDiv.appendChild(rowDiv);
+
+                let text = document.createElement("div");
+                text.innerHTML = `<div>${key}</div> <div>${blueprints[key].label}</div>`;
+                text.onclick = () => { 
+                    callback(key);
+                    const collection = document.getElementsByClassName("blueprint-selected");
+                    for (let i = 0; i < collection.length; i++) {
+                        collection[i].classList.remove("blueprint-selected");
+                    }
+                    text.classList.add("blueprint-selected");
+                }
+                rowDiv.appendChild(text);
+
+                let checkbox = document.createElement("input");
+                checkbox.type = "checkbox";
+                checkbox.checked = blueprints[key].enabled;
+                checkbox.onclick = () => {
+                    console.log(checkbox.checked);
+                    blueprints[key].enabled = checkbox.checked;
+                }
+                rowDiv.appendChild(checkbox);
+
+                /* This button allows to remove an element from the list. It requires a refresh. */
+                var button = document.createElement("button");
+                button.innerText = "X";
+                button.onclick = () => {
+                    delete blueprints[key];
+                    div.dispatchEvent(new Event("refresh"));
+                }
+                rowDiv.appendChild(button);
             }
-            rowDiv.appendChild(button);
         }      
     }
     div.appendChild(scrollDiv);
@@ -264,24 +284,14 @@ export function addLoadoutsScroll(div: HTMLElement, loadouts: LoadoutBlueprint[]
  * @returns The string
  */
 export function arrayToString(array: string[]) {
-    var value = "[";
-    var firstRole = true;
-    array.forEach((role: string) => {
-        value += firstRole? "": ", ";
-        firstRole = false; 
-        value += role;
-    })
-    value += "]";
-    return value;
+    return "[" + array.join( ", " ) + "]";
 }
 
-
+/** Converts an a single string like [val1, val2, val3] into an array
+ *
+ * @param input The input string
+ * @returns The array
+ */
 export function stringToArray(input: string) {
-    input = input.replace("[", "").replace("]", "");
-    var values = input.split(",");
-    var result: string[] = [];
-    values.forEach((value: string) => {
-        result.push(value.trim());
-    })
-    return result;
+    return input.match( /(\w)+/g ) ?? [];
 }

client/plugins/databasemanager/style.css

@@ -63,6 +63,8 @@
     display: flex;
     flex-direction: column;
     row-gap: 5px;
+    max-height: 100%;
+    padding: 10px;
 }
 
 @media (min-width: 1200px) {
@@ -71,7 +73,7 @@
     }
 
     .dm-content-container:nth-of-type(1) {
-        width: 300px;
+        width: 400px;
     }
 
     .dm-content-container:nth-of-type(2) {
@@ -115,6 +117,10 @@
     font-weight: bold;
 }
 
+#database-manager-panel input {
+    font-weight: bold;
+}
+
 .dm-scroll-container>div:nth-child(even) {
     background-color: gainsboro;
 }
@@ -131,23 +137,45 @@
 }
 
 .dm-scroll-container>div *:nth-child(1):hover {
-    background-color: var(--secondary-blue-text);
+    background-color: var(--accent-dark-blue);
     color: white;
     cursor: pointer;
 }
 
+.blueprint-selected {
+    background-color: var(--accent-light-blue) !important;
+    color: white;
+}
+
 .dm-scroll-container>div {
     display: flex;
     align-items: center;
     justify-content: space-between;
 }
 
+.dm-scroll-container>div>div {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
 .dm-scroll-container>div>button {
     height: 20px;
     width: 20px;
     padding: 0px;
 }
 
+.dm-scroll-container>div>div>div:nth-child(1) {
+    width: fit-content;
+}
+
+.dm-scroll-container>div>div>div:nth-child(2) {
+    overflow: hidden;
+    text-wrap: nowrap;
+    text-overflow: ellipsis;
+    font-weight: normal;
+}
+
 .input-row {
     width: 100%;
     display: flex;

client/public/databases/units/default/navyunitdatabase.json

@@ -1,25 +1,8 @@
 {
-	"BDK-775": {
-		"name": "BDK-775",
-		"coalition": "blue",
-		"type": "Landing Ship",
-		"era": "Mid Cold War",
-		"label": "LS Ropucha",
-		"shortLabel": "LS Ropucha",
-		"range": "",
-		"filename": "",
-		"enabled": true,
-		"acquisitionRange": 25000,
-		"engagementRange": 6000,
-		"description": "Landing ship Ropucha",
-		"abilities": "",
-		"canTargetPoint": true,
-		"canRearm": false
-	},
 	"CVN_71": {
 		"name": "CVN_71",
 		"coalition": "blue",
-		"type": "Super Aircraft Carrier",
+		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "CVN-71 Theodore Roosevelt",
 		"shortLabel": "CVN-71",
@@ -28,7 +11,8 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -36,7 +20,7 @@
 	"CVN_72": {
 		"name": "CVN_72",
 		"coalition": "blue",
-		"type": "Super Aircraft Carrier",
+		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "CVN-72 Abraham Lincoln",
 		"shortLabel": "CVN-72",
@@ -45,7 +29,8 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -53,7 +38,7 @@
 	"CVN_73": {
 		"name": "CVN_73",
 		"coalition": "blue",
-		"type": "Super Aircraft Carrier",
+		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "CVN-73 George Washington",
 		"shortLabel": "CVN-73",
@@ -62,7 +47,8 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -101,7 +87,8 @@
 		},
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -111,13 +98,14 @@
 		"coalition": "red",
 		"type": "Aircraft Carrier",
 		"era": "Modern",
-		"label": "CV Admiral Kuznetsov(2017)",
-		"shortLabel": "Admiral Kuznetsov(2017)",
+		"label": "Admiral Kuznetsov (2017)",
+		"shortLabel": "Admiral Kuznetsov",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 25000,
 		"engagementRange": 12000,
+		"tags": "",
 		"description": "Admiral Kuznetsov. Conventional STOBAR carrier",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -126,8 +114,8 @@
 	"CastleClass_01": {
 		"name": "CastleClass_01",
 		"coalition": "blue",
-		"type": "Patrol",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Leeds Castle (P-258)",
 		"shortLabel": "HMS Leeds Castle (P-258)",
 		"range": "",
@@ -141,7 +129,8 @@
 		},
 		"acquisitionRange": 25000,
 		"engagementRange": 3000,
-		"description": "HMS Leeds Castle. Smaller. Patrol craft",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -149,7 +138,7 @@
 	"HandyWind": {
 		"name": "HandyWind",
 		"coalition": "blue",
-		"type": "Cargoship",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
 		"label": "Bulker Handy Wind",
 		"shortLabel": "Bulker Handy Wind",
@@ -176,6 +165,7 @@
 		},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -184,7 +174,7 @@
 	"HarborTug": {
 		"name": "HarborTug",
 		"coalition": "",
-		"type": "Tug",
+		"type": "Cargo/Transport",
 		"era": "Mid Cold War",
 		"label": "Harbor Tug",
 		"shortLabel": "Harbor Tug",
@@ -211,6 +201,7 @@
 		},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -228,7 +219,8 @@
 		"enabled": true,
 		"acquisitionRange": 150000,
 		"engagementRange": 20000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -481,6 +473,7 @@
 		},
 		"acquisitionRange": 19000,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -489,15 +482,16 @@
 	"Seawise_Giant": {
 		"name": "Seawise_Giant",
 		"coalition": "blue",
-		"type": "Tanker",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
-		"label": "Tanker Seawise Giant",
+		"label": "Seawise Giant (Tanker)",
 		"shortLabel": "Seawise Giant",
 		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -506,7 +500,7 @@
 	"Ship_Tilde_Supply": {
 		"name": "Ship_Tilde_Supply",
 		"coalition": "blue",
-		"type": "Transport",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
 		"label": "Supply Ship MV Tilde",
 		"shortLabel": "Supply Ship Tilde",
@@ -515,6 +509,7 @@
 		"enabled": true,
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -532,6 +527,7 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -540,9 +536,9 @@
 	"TICONDEROG": {
 		"name": "TICONDEROG",
 		"coalition": "blue",
-		"type": "Cruiser",
+		"type": "Combatants",
 		"era": "Late Cold War",
-		"label": "Ticonderoga",
+		"label": "Ticonderoga Class (Cruiser)",
 		"shortLabel": "Ticonderoga",
 		"range": "Medium",
 		"filename": "",
@@ -611,7 +607,8 @@
 		},
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -619,9 +616,9 @@
 	"Type_052B": {
 		"name": "Type_052B",
 		"coalition": "red",
-		"type": "Destroyer",
+		"type": "Combatants",
 		"era": "Modern",
-		"label": "052B DDG-168 Guangzhou",
+		"label": "Type 52B Guangzhou",
 		"shortLabel": "Type 52B",
 		"range": "Short",
 		"filename": "",
@@ -646,7 +643,8 @@
 		},
 		"acquisitionRange": 100000,
 		"engagementRange": 30000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -654,9 +652,9 @@
 	"Type_052C": {
 		"name": "Type_052C",
 		"coalition": "red",
-		"type": "Destroyer",
+		"type": "Combatants",
 		"era": "Modern",
-		"label": "052C DDG-171 Haikou",
+		"label": "Type 52C Haikou (Destroyer)",
 		"shortLabel": "Type 52C",
 		"range": "Short",
 		"filename": "",
@@ -705,17 +703,18 @@
 		},
 		"acquisitionRange": 260000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
 	},
 	"Type_054A": {
-		"name": "",
+		"name": "Type_054A",
 		"coalition": "red",
-		"type": "Frigate",
+		"type": "Combatants",
 		"era": "Modern",
-		"label": "054A FFG-538 Yantai",
+		"label": "Type 54A Yantai (Frigate)",
 		"shortLabel": "Type 54A",
 		"range": "Medium",
 		"filename": "",
@@ -872,15 +871,16 @@
 		},
 		"acquisitionRange": 160000,
 		"engagementRange": 45000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "35nm >50,000ft range"
 	},
 	"Type_071": {
 		"name": "Type_071",
 		"coalition": "red",
-		"type": "Transport",
+		"type": "Cargo/Transport",
 		"era": "Modern",
-		"label": "Type 071",
+		"label": "Type 071 (Transport dock)",
 		"shortLabel": "Type 071",
 		"range": "",
 		"filename": "",
@@ -925,7 +925,8 @@
 		},
 		"acquisitionRange": 300000,
 		"engagementRange": 150000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -935,7 +936,7 @@
 		"coalition": "red",
 		"type": "Submarine",
 		"era": "Modern",
-		"label": "Type 093",
+		"label": "Type 093 (Shang)",
 		"shortLabel": "Type 093",
 		"range": "",
 		"filename": "",
@@ -948,6 +949,7 @@
 		},
 		"acquisitionRange": 40000,
 		"engagementRange": 40000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -956,10 +958,10 @@
 	"USS_Arleigh_Burke_IIa": {
 		"name": "USS_Arleigh_Burke_IIa",
 		"coalition": "blue",
-		"type": "Destroyer",
+		"type": "Combatants",
 		"era": "Late Cold War",
-		"label": "DDG Arleigh Burke lla",
-		"shortLabel": "DDG Arleigh Burke",
+		"label": "Arleigh Burke Class (Destroyer)",
+		"shortLabel": "Arleigh Burke Class (Destroyer)",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
@@ -1064,6 +1066,7 @@
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
 		"abilities": "",
+		"tags": "",
 		"description": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1080,7 +1083,8 @@
 		"enabled": true,
 		"acquisitionRange": 18000,
 		"engagementRange": 5000,
-		"description": "ARA Vienticinco de Mayo. Conventional CATOBAR carrier",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1089,15 +1093,16 @@
 		"name": "hms_invincible",
 		"coalition": "blue",
 		"type": "Aircraft Carrier",
-		"era": "Mid Cold War",
-		"label": "HMS Invincible (R05)",
+		"era": "Late Cold War",
+		"label": "HMS Invincible",
 		"shortLabel": "HMS Invincible",
 		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 100000,
 		"engagementRange": 74000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1105,8 +1110,8 @@
 	"leander-gun-achilles": {
 		"name": "leander-gun-achilles",
 		"coalition": "blue",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Achilles (F12)",
 		"shortLabel": "HMS Achilles",
 		"range": "",
@@ -1114,7 +1119,8 @@
 		"enabled": true,
 		"acquisitionRange": 180000,
 		"engagementRange": 8000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1122,8 +1128,8 @@
 	"leander-gun-andromeda": {
 		"name": "leander-gun-andromeda",
 		"coalition": "blue",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Andromeda (F57)",
 		"shortLabel": "HMS Andromeda",
 		"range": "",
@@ -1131,7 +1137,8 @@
 		"enabled": true,
 		"acquisitionRange": 180000,
 		"engagementRange": 140000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1139,8 +1146,8 @@
 	"leander-gun-ariadne": {
 		"name": "leander-gun-ariadne",
 		"coalition": "blue",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Ariadne (F72)",
 		"shortLabel": "HMS Ariadne",
 		"range": "",
@@ -1148,7 +1155,8 @@
 		"enabled": true,
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1156,8 +1164,8 @@
 	"leander-gun-condell": {
 		"name": "leander-gun-condell",
 		"coalition": "",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "Almirante Condell PFG-06",
 		"shortLabel": "Almirante Condell",
 		"range": "",
@@ -1165,7 +1173,8 @@
 		"enabled": true,
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1173,8 +1182,8 @@
 	"leander-gun-lynch": {
 		"name": "leander-gun-lynch",
 		"coalition": "",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "CNS Almirante Lynch (PFG-07)",
 		"shortLabel": "CNS Almirante Lynch",
 		"range": "",
@@ -1182,7 +1191,8 @@
 		"enabled": true,
 		"acquisitionRange": 180000,
 		"engagementRange": 140000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1191,7 +1201,7 @@
 		"name": "santafe",
 		"coalition": "",
 		"type": "Submarine",
-		"era": "Early Cold War",
+		"era": "WW2",
 		"label": "ARA Santa Fe S-21",
 		"shortLabel": "ARA Santa",
 		"range": "",
@@ -1199,6 +1209,7 @@
 		"enabled": true,
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1210,36 +1221,21 @@
 		"era": "",
 		"label": "Boat Armed Hi-speed",
 		"shortLabel": "Boat Armed Hi-speed",
-		"type": "Speedboat",
+		"type": "Fast Attack Craft",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 5000,
 		"engagementRange": 1000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
 	},
-	"VINSON": {
-		"name": "VINSON",
-		"coalition": "",
-		"era": "",
-		"label": "CVN-70 Carl Vinson",
-		"shortLabel": "CVN-70 Carl Vinson",
-		"type": "Aircraft Carrier",
-		"enabled": true,
-		"liveries": {},
-		"acquisitionRange": 30000,
-		"engagementRange": 15000,
-		"description": "",
-		"abilities": "",
-		"canTargetPoint": false,
-		"canRearm": false
-	},
 	"PERRY": {
-		"name": "perry",
+		"name": "PERRY",
 		"coalition": "blue",
-		"type": "Frigate",
+		"type": "Combatants",
 		"era": "Mid Cold War",
 		"label": "Oliver H. Perry",
 		"shortLabel": "Oliver H. Perry",
@@ -1289,13 +1285,18 @@
 			}
 		},
 		"acquisitionRange": 150000,
-		"engagementRange": 100000
+		"engagementRange": 100000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"ALBATROS": {
-		"name": "albatros",
+		"name": "ALBATROS",
 		"coalition": "red",
-		"type": "Frigade",
-		"era": "Early Cold War",
+		"type": "Combatants",
+		"era": "Modern",
 		"label": "Albatros (Grisha-5)",
 		"shortLabel": "Albatros",
 		"range": "",
@@ -1340,25 +1341,35 @@
 			}
 		},
 		"acquisitionRange": 30000,
-		"engagementRange": 16000
+		"engagementRange": 16000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"KUZNECOW": {
-		"name": "kuznecow",
+		"name": "KUZNECOW",
 		"coalition": "red",
 		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "Admiral Kuznetsov",
-		"shortLabel": "Admiral Kuznetsov",
+		"shortLabel": "AK",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 25000,
-		"engagementRange": 12000
+		"engagementRange": 12000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"MOLNIYA": {
-		"name": "molniya",
+		"name": "MOLNIYA",
 		"coalition": "",
-		"type": "Corvette",
+		"type": "Combatants",
 		"era": "Late Cold War",
 		"label": "Molniya (Tarantul-3)",
 		"shortLabel": "Molniya",
@@ -1380,12 +1391,17 @@
 			}
 		},
 		"acquisitionRange": 21000,
-		"engagementRange": 2000
+		"engagementRange": 2000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"MOSCOW": {
-		"name": "moscow",
+		"name": "MOSCOW",
 		"coalition": "red",
-		"type": "Cruiser",
+		"type": "Combatants",
 		"era": "Late Cold War",
 		"label": "Moscow",
 		"shortLabel": "Moscow",
@@ -1411,54 +1427,70 @@
 			}
 		},
 		"acquisitionRange": 160000,
-		"engagementRange": 75000
+		"engagementRange": 75000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"NEUSTRASH": {
-		"name": "neustrash",
+		"name": "NEUSTRASH",
 		"coalition": "red",
-		"type": "Frigate",
+		"type": "Combatants",
 		"era": "Late Cold War",
 		"label": "Neustrashimy",
 		"shortLabel": "Neustrashimy",
-		"range": "Short",
+		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 27000,
-		"engagementRange": 12000
+		"engagementRange": 12000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"PIOTR": {
 		"name": "PIOTR",
-		"coalition": "",
-		"era": "",
-		"label": "Battlecruiser 1144.2 Pyotr Velikiy",
-		"shortLabel": "Battlecruiser 1144.2 Pyotr Velikiy",
-		"type": "Cruiser",
+		"coalition": "red",
+		"era": "Late Cold War",
+		"label": "Pyotr Velikiy (Battlecruiser)",
+		"shortLabel": "Pyotr Velikiy",
+		"type": "Combatants",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 250000,
 		"engagementRange": 190000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
 	},
 	"REZKY": {
-		"name": "Rezky (Krivak-2)",
+		"name": "REZKY",
 		"coalition": "red",
-		"type": "Frigate",
-		"era": "Early Cold War",
+		"type": "Combatants",
+		"era": "WW2",
 		"label": "Rezky (Krivak-2)",
 		"shortLabel": "Rezky",
-		"range": "Short",
+		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 30000,
-		"engagementRange": 16000
+		"engagementRange": 16000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"ELNYA": {
-		"name": "elnya",
+		"name": "ELNYA",
 		"coalition": "red",
-		"type": "Tanker",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
 		"label": "Elnya tanker",
 		"shortLabel": "Elnya tanker",
@@ -1480,7 +1512,12 @@
 			}
 		},
 		"acquisitionRange": 0,
-		"engagementRange": 0
+		"engagementRange": 0,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"Dry-cargo ship-2": {
 		"name": "Dry-cargo ship-2",
@@ -1488,11 +1525,12 @@
 		"era": "",
 		"label": "Cargo Ivanov",
 		"shortLabel": "Cargo Ivanov",
-		"type": "Cargoship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1504,20 +1542,21 @@
 		"era": "",
 		"label": "Bulker Yakushev",
 		"shortLabel": "Bulker Yakushev",
-		"type": "Cargoship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
 	},
 	"ZWEZDNY": {
-		"name": "zwezdny",
+		"name": "ZWEZDNY",
 		"coalition": "",
-		"type": "Civilian Boat",
+		"type": "Cargo/Transport",
 		"era": "Modern",
 		"label": "Zwezdny",
 		"shortLabel": "Zwezdny",
@@ -1525,32 +1564,43 @@
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 0,
-		"engagementRange": 0
+		"engagementRange": 0,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"KILO": {
-		"name": "kilo",
+		"name": "KILO",
 		"coalition": "red",
 		"type": "Submarine",
-		"era": "Late Cold War",
+		"era": "Mid Cold War",
 		"label": "Project 636 Varshavyanka Basic",
 		"shortLabel": "Varshavyanka Basic",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 0,
-		"engagementRange": 0
+		"engagementRange": 0,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"IMPROVED_KILO": {
 		"name": "IMPROVED_KILO",
-		"coalition": "",
+		"coalition": "red",
 		"era": "",
 		"label": "SSK 636 Improved Kilo",
-		"shortLabel": "SSK 636 Improved Kilo",
+		"shortLabel": "Kilo",
 		"type": "Submarine",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1561,12 +1611,13 @@
 		"coalition": "",
 		"era": "",
 		"label": "SSK 641B Tango",
-		"shortLabel": "SSK 641B Tango",
+		"shortLabel": "Tango",
 		"type": "Submarine",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1574,8 +1625,8 @@
 	},
 	"Forrestal": {
 		"name": "Forrestal",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "Early Cold War",
 		"label": "CV-59 Forrestal",
 		"shortLabel": "CV-59 Forrestal",
 		"type": "Aircraft Carrier",
@@ -1583,6 +1634,7 @@
 		"liveries": {},
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1590,15 +1642,16 @@
 	},
 	"LST_Mk2": {
 		"name": "LST_Mk2",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "WW2",
 		"label": "LST Mk.II",
 		"shortLabel": "LST Mk.II",
-		"type": "Landing Ship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1606,15 +1659,16 @@
 	},
 	"USS_Samuel_Chase": {
 		"name": "USS_Samuel_Chase",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "WW2",
 		"label": "LS Samuel Chase",
 		"shortLabel": "LS Samuel Chase",
-		"type": "Landing SHip",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 7000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1622,15 +1676,16 @@
 	},
 	"Higgins_boat": {
 		"name": "Higgins_boat",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "WW2",
 		"label": "Boat LCVP Higgins",
 		"shortLabel": "Boat LCVP Higgins",
-		"type": "Landing Ship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 3000,
 		"engagementRange": 1000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1638,15 +1693,16 @@
 	},
 	"Uboat_VIIC": {
 		"name": "Uboat_VIIC",
-		"coalition": "",
-		"era": "",
-		"label": "U-boat VIIC U-flak",
-		"shortLabel": "U-boat VIIC U-flak",
+		"coalition": "red",
+		"era": "WW2",
+		"label": "U-boat VIIC",
+		"shortLabel": "U-boat",
 		"type": "Submarine",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 20000,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1654,15 +1710,16 @@
 	},
 	"Schnellboot_type_S130": {
 		"name": "Schnellboot_type_S130",
-		"coalition": "",
-		"era": "",
+		"coalition": "red",
+		"era": "WW2",
 		"label": "Boat Schnellboot type S130",
 		"shortLabel": "Boat Schnellboot type S130",
-		"type": "Torpedo Boat",
+		"type": "Fast Attack Craft",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 10000,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,

client/public/databases/units/navyunitdatabase.json

@@ -1,25 +1,8 @@
 {
-	"BDK-775": {
-		"name": "BDK-775",
-		"coalition": "blue",
-		"type": "Landing Ship",
-		"era": "Mid Cold War",
-		"label": "LS Ropucha",
-		"shortLabel": "LS Ropucha",
-		"range": "",
-		"filename": "",
-		"enabled": true,
-		"acquisitionRange": 25000,
-		"engagementRange": 6000,
-		"description": "Landing ship Ropucha",
-		"abilities": "",
-		"canTargetPoint": true,
-		"canRearm": false
-	},
 	"CVN_71": {
 		"name": "CVN_71",
 		"coalition": "blue",
-		"type": "Super Aircraft Carrier",
+		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "CVN-71 Theodore Roosevelt",
 		"shortLabel": "CVN-71",
@@ -28,7 +11,8 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -36,7 +20,7 @@
 	"CVN_72": {
 		"name": "CVN_72",
 		"coalition": "blue",
-		"type": "Super Aircraft Carrier",
+		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "CVN-72 Abraham Lincoln",
 		"shortLabel": "CVN-72",
@@ -45,7 +29,8 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -53,7 +38,7 @@
 	"CVN_73": {
 		"name": "CVN_73",
 		"coalition": "blue",
-		"type": "Super Aircraft Carrier",
+		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "CVN-73 George Washington",
 		"shortLabel": "CVN-73",
@@ -62,7 +47,8 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -101,7 +87,8 @@
 		},
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
@@ -111,13 +98,14 @@
 		"coalition": "red",
 		"type": "Aircraft Carrier",
 		"era": "Modern",
-		"label": "CV Admiral Kuznetsov(2017)",
-		"shortLabel": "Admiral Kuznetsov(2017)",
+		"label": "Admiral Kuznetsov (2017)",
+		"shortLabel": "Admiral Kuznetsov",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 25000,
 		"engagementRange": 12000,
+		"tags": "",
 		"description": "Admiral Kuznetsov. Conventional STOBAR carrier",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -126,8 +114,8 @@
 	"CastleClass_01": {
 		"name": "CastleClass_01",
 		"coalition": "blue",
-		"type": "Patrol",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Leeds Castle (P-258)",
 		"shortLabel": "HMS Leeds Castle (P-258)",
 		"range": "",
@@ -141,7 +129,8 @@
 		},
 		"acquisitionRange": 25000,
 		"engagementRange": 3000,
-		"description": "HMS Leeds Castle. Smaller. Patrol craft",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -149,7 +138,7 @@
 	"HandyWind": {
 		"name": "HandyWind",
 		"coalition": "blue",
-		"type": "Cargoship",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
 		"label": "Bulker Handy Wind",
 		"shortLabel": "Bulker Handy Wind",
@@ -176,6 +165,7 @@
 		},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -184,7 +174,7 @@
 	"HarborTug": {
 		"name": "HarborTug",
 		"coalition": "",
-		"type": "Tug",
+		"type": "Cargo/Transport",
 		"era": "Mid Cold War",
 		"label": "Harbor Tug",
 		"shortLabel": "Harbor Tug",
@@ -211,6 +201,7 @@
 		},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -228,7 +219,8 @@
 		"enabled": true,
 		"acquisitionRange": 150000,
 		"engagementRange": 20000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -481,6 +473,7 @@
 		},
 		"acquisitionRange": 19000,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -489,15 +482,16 @@
 	"Seawise_Giant": {
 		"name": "Seawise_Giant",
 		"coalition": "blue",
-		"type": "Tanker",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
-		"label": "Tanker Seawise Giant",
+		"label": "Seawise Giant (Tanker)",
 		"shortLabel": "Seawise Giant",
 		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -506,7 +500,7 @@
 	"Ship_Tilde_Supply": {
 		"name": "Ship_Tilde_Supply",
 		"coalition": "blue",
-		"type": "Transport",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
 		"label": "Supply Ship MV Tilde",
 		"shortLabel": "Supply Ship Tilde",
@@ -515,6 +509,7 @@
 		"enabled": true,
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -532,6 +527,7 @@
 		"enabled": true,
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -540,9 +536,9 @@
 	"TICONDEROG": {
 		"name": "TICONDEROG",
 		"coalition": "blue",
-		"type": "Cruiser",
+		"type": "Combatants",
 		"era": "Late Cold War",
-		"label": "Ticonderoga",
+		"label": "Ticonderoga Class (Cruiser)",
 		"shortLabel": "Ticonderoga",
 		"range": "Medium",
 		"filename": "",
@@ -611,7 +607,8 @@
 		},
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -619,9 +616,9 @@
 	"Type_052B": {
 		"name": "Type_052B",
 		"coalition": "red",
-		"type": "Destroyer",
+		"type": "Combatants",
 		"era": "Modern",
-		"label": "052B DDG-168 Guangzhou",
+		"label": "Type 52B Guangzhou",
 		"shortLabel": "Type 52B",
 		"range": "Short",
 		"filename": "",
@@ -646,7 +643,8 @@
 		},
 		"acquisitionRange": 100000,
 		"engagementRange": 30000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -654,9 +652,9 @@
 	"Type_052C": {
 		"name": "Type_052C",
 		"coalition": "red",
-		"type": "Destroyer",
+		"type": "Combatants",
 		"era": "Modern",
-		"label": "052C DDG-171 Haikou",
+		"label": "Type 52C Haikou (Destroyer)",
 		"shortLabel": "Type 52C",
 		"range": "Short",
 		"filename": "",
@@ -705,17 +703,18 @@
 		},
 		"acquisitionRange": 260000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
 	},
 	"Type_054A": {
-		"name": "",
+		"name": "Type_054A",
 		"coalition": "red",
-		"type": "Frigate",
+		"type": "Combatants",
 		"era": "Modern",
-		"label": "054A FFG-538 Yantai",
+		"label": "Type 54A Yantai (Frigate)",
 		"shortLabel": "Type 54A",
 		"range": "Medium",
 		"filename": "",
@@ -872,15 +871,16 @@
 		},
 		"acquisitionRange": 160000,
 		"engagementRange": 45000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "35nm >50,000ft range"
 	},
 	"Type_071": {
 		"name": "Type_071",
 		"coalition": "red",
-		"type": "Transport",
+		"type": "Cargo/Transport",
 		"era": "Modern",
-		"label": "Type 071",
+		"label": "Type 071 (Transport dock)",
 		"shortLabel": "Type 071",
 		"range": "",
 		"filename": "",
@@ -925,7 +925,8 @@
 		},
 		"acquisitionRange": 300000,
 		"engagementRange": 150000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -935,7 +936,7 @@
 		"coalition": "red",
 		"type": "Submarine",
 		"era": "Modern",
-		"label": "Type 093",
+		"label": "Type 093 (Shang)",
 		"shortLabel": "Type 093",
 		"range": "",
 		"filename": "",
@@ -948,6 +949,7 @@
 		},
 		"acquisitionRange": 40000,
 		"engagementRange": 40000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -956,10 +958,10 @@
 	"USS_Arleigh_Burke_IIa": {
 		"name": "USS_Arleigh_Burke_IIa",
 		"coalition": "blue",
-		"type": "Destroyer",
+		"type": "Combatants",
 		"era": "Late Cold War",
-		"label": "DDG Arleigh Burke lla",
-		"shortLabel": "DDG Arleigh Burke",
+		"label": "Arleigh Burke Class (Destroyer)",
+		"shortLabel": "Arleigh Burke Class (Destroyer)",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
@@ -1064,6 +1066,7 @@
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
 		"abilities": "",
+		"tags": "",
 		"description": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1080,7 +1083,8 @@
 		"enabled": true,
 		"acquisitionRange": 18000,
 		"engagementRange": 5000,
-		"description": "ARA Vienticinco de Mayo. Conventional CATOBAR carrier",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1089,15 +1093,16 @@
 		"name": "hms_invincible",
 		"coalition": "blue",
 		"type": "Aircraft Carrier",
-		"era": "Mid Cold War",
-		"label": "HMS Invincible (R05)",
+		"era": "Late Cold War",
+		"label": "HMS Invincible",
 		"shortLabel": "HMS Invincible",
 		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 100000,
 		"engagementRange": 74000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1105,8 +1110,8 @@
 	"leander-gun-achilles": {
 		"name": "leander-gun-achilles",
 		"coalition": "blue",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Achilles (F12)",
 		"shortLabel": "HMS Achilles",
 		"range": "",
@@ -1114,7 +1119,8 @@
 		"enabled": true,
 		"acquisitionRange": 180000,
 		"engagementRange": 8000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1122,8 +1128,8 @@
 	"leander-gun-andromeda": {
 		"name": "leander-gun-andromeda",
 		"coalition": "blue",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Andromeda (F57)",
 		"shortLabel": "HMS Andromeda",
 		"range": "",
@@ -1131,7 +1137,8 @@
 		"enabled": true,
 		"acquisitionRange": 180000,
 		"engagementRange": 140000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1139,8 +1146,8 @@
 	"leander-gun-ariadne": {
 		"name": "leander-gun-ariadne",
 		"coalition": "blue",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "HMS Ariadne (F72)",
 		"shortLabel": "HMS Ariadne",
 		"range": "",
@@ -1148,7 +1155,8 @@
 		"enabled": true,
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1156,8 +1164,8 @@
 	"leander-gun-condell": {
 		"name": "leander-gun-condell",
 		"coalition": "",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "Almirante Condell PFG-06",
 		"shortLabel": "Almirante Condell",
 		"range": "",
@@ -1165,7 +1173,8 @@
 		"enabled": true,
 		"acquisitionRange": 150000,
 		"engagementRange": 100000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1173,8 +1182,8 @@
 	"leander-gun-lynch": {
 		"name": "leander-gun-lynch",
 		"coalition": "",
-		"type": "Frigate",
-		"era": "Mid Cold War",
+		"type": "Combatants",
+		"era": "Late Cold War",
 		"label": "CNS Almirante Lynch (PFG-07)",
 		"shortLabel": "CNS Almirante Lynch",
 		"range": "",
@@ -1182,7 +1191,8 @@
 		"enabled": true,
 		"acquisitionRange": 180000,
 		"engagementRange": 140000,
-		"description": "Ship",
+		"tags": "",
+		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
@@ -1191,7 +1201,7 @@
 		"name": "santafe",
 		"coalition": "",
 		"type": "Submarine",
-		"era": "Early Cold War",
+		"era": "WW2",
 		"label": "ARA Santa Fe S-21",
 		"shortLabel": "ARA Santa",
 		"range": "",
@@ -1199,6 +1209,7 @@
 		"enabled": true,
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1210,36 +1221,21 @@
 		"era": "",
 		"label": "Boat Armed Hi-speed",
 		"shortLabel": "Boat Armed Hi-speed",
-		"type": "Speedboat",
+		"type": "Fast Attack Craft",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 5000,
 		"engagementRange": 1000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
 	},
-	"VINSON": {
-		"name": "VINSON",
-		"coalition": "",
-		"era": "",
-		"label": "CVN-70 Carl Vinson",
-		"shortLabel": "CVN-70 Carl Vinson",
-		"type": "Aircraft Carrier",
-		"enabled": true,
-		"liveries": {},
-		"acquisitionRange": 30000,
-		"engagementRange": 15000,
-		"description": "",
-		"abilities": "",
-		"canTargetPoint": false,
-		"canRearm": false
-	},
 	"PERRY": {
-		"name": "perry",
+		"name": "PERRY",
 		"coalition": "blue",
-		"type": "Frigate",
+		"type": "Combatants",
 		"era": "Mid Cold War",
 		"label": "Oliver H. Perry",
 		"shortLabel": "Oliver H. Perry",
@@ -1289,13 +1285,18 @@
 			}
 		},
 		"acquisitionRange": 150000,
-		"engagementRange": 100000
+		"engagementRange": 100000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"ALBATROS": {
-		"name": "albatros",
+		"name": "ALBATROS",
 		"coalition": "red",
-		"type": "Frigade",
-		"era": "Early Cold War",
+		"type": "Combatants",
+		"era": "Modern",
 		"label": "Albatros (Grisha-5)",
 		"shortLabel": "Albatros",
 		"range": "",
@@ -1340,25 +1341,35 @@
 			}
 		},
 		"acquisitionRange": 30000,
-		"engagementRange": 16000
+		"engagementRange": 16000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"KUZNECOW": {
-		"name": "kuznecow",
+		"name": "KUZNECOW",
 		"coalition": "red",
 		"type": "Aircraft Carrier",
 		"era": "Late Cold War",
 		"label": "Admiral Kuznetsov",
-		"shortLabel": "Admiral Kuznetsov",
+		"shortLabel": "AK",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 25000,
-		"engagementRange": 12000
+		"engagementRange": 12000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"MOLNIYA": {
-		"name": "molniya",
+		"name": "MOLNIYA",
 		"coalition": "",
-		"type": "Corvette",
+		"type": "Combatants",
 		"era": "Late Cold War",
 		"label": "Molniya (Tarantul-3)",
 		"shortLabel": "Molniya",
@@ -1380,12 +1391,17 @@
 			}
 		},
 		"acquisitionRange": 21000,
-		"engagementRange": 2000
+		"engagementRange": 2000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"MOSCOW": {
-		"name": "moscow",
+		"name": "MOSCOW",
 		"coalition": "red",
-		"type": "Cruiser",
+		"type": "Combatants",
 		"era": "Late Cold War",
 		"label": "Moscow",
 		"shortLabel": "Moscow",
@@ -1411,54 +1427,70 @@
 			}
 		},
 		"acquisitionRange": 160000,
-		"engagementRange": 75000
+		"engagementRange": 75000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"NEUSTRASH": {
-		"name": "neustrash",
+		"name": "NEUSTRASH",
 		"coalition": "red",
-		"type": "Frigate",
+		"type": "Combatants",
 		"era": "Late Cold War",
 		"label": "Neustrashimy",
 		"shortLabel": "Neustrashimy",
-		"range": "Short",
+		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 27000,
-		"engagementRange": 12000
+		"engagementRange": 12000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"PIOTR": {
 		"name": "PIOTR",
-		"coalition": "",
-		"era": "",
-		"label": "Battlecruiser 1144.2 Pyotr Velikiy",
-		"shortLabel": "Battlecruiser 1144.2 Pyotr Velikiy",
-		"type": "Cruiser",
+		"coalition": "red",
+		"era": "Late Cold War",
+		"label": "Pyotr Velikiy (Battlecruiser)",
+		"shortLabel": "Pyotr Velikiy",
+		"type": "Combatants",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 250000,
 		"engagementRange": 190000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
 		"canRearm": false
 	},
 	"REZKY": {
-		"name": "Rezky (Krivak-2)",
+		"name": "REZKY",
 		"coalition": "red",
-		"type": "Frigate",
-		"era": "Early Cold War",
+		"type": "Combatants",
+		"era": "WW2",
 		"label": "Rezky (Krivak-2)",
 		"shortLabel": "Rezky",
-		"range": "Short",
+		"range": "",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 30000,
-		"engagementRange": 16000
+		"engagementRange": 16000,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"ELNYA": {
-		"name": "elnya",
+		"name": "ELNYA",
 		"coalition": "red",
-		"type": "Tanker",
+		"type": "Cargo/Transport",
 		"era": "Late Cold War",
 		"label": "Elnya tanker",
 		"shortLabel": "Elnya tanker",
@@ -1480,7 +1512,12 @@
 			}
 		},
 		"acquisitionRange": 0,
-		"engagementRange": 0
+		"engagementRange": 0,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"Dry-cargo ship-2": {
 		"name": "Dry-cargo ship-2",
@@ -1488,11 +1525,12 @@
 		"era": "",
 		"label": "Cargo Ivanov",
 		"shortLabel": "Cargo Ivanov",
-		"type": "Cargoship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1504,20 +1542,21 @@
 		"era": "",
 		"label": "Bulker Yakushev",
 		"shortLabel": "Bulker Yakushev",
-		"type": "Cargoship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
 		"canRearm": false
 	},
 	"ZWEZDNY": {
-		"name": "zwezdny",
+		"name": "ZWEZDNY",
 		"coalition": "",
-		"type": "Civilian Boat",
+		"type": "Cargo/Transport",
 		"era": "Modern",
 		"label": "Zwezdny",
 		"shortLabel": "Zwezdny",
@@ -1525,32 +1564,43 @@
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 0,
-		"engagementRange": 0
+		"engagementRange": 0,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"KILO": {
-		"name": "kilo",
+		"name": "KILO",
 		"coalition": "red",
 		"type": "Submarine",
-		"era": "Late Cold War",
+		"era": "Mid Cold War",
 		"label": "Project 636 Varshavyanka Basic",
 		"shortLabel": "Varshavyanka Basic",
 		"range": "Medium",
 		"filename": "",
 		"enabled": true,
 		"acquisitionRange": 0,
-		"engagementRange": 0
+		"engagementRange": 0,
+		"tags": "",
+		"description": "",
+		"abilities": "",
+		"canTargetPoint": false,
+		"canRearm": false
 	},
 	"IMPROVED_KILO": {
 		"name": "IMPROVED_KILO",
-		"coalition": "",
+		"coalition": "red",
 		"era": "",
 		"label": "SSK 636 Improved Kilo",
-		"shortLabel": "SSK 636 Improved Kilo",
+		"shortLabel": "Kilo",
 		"type": "Submarine",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1561,12 +1611,13 @@
 		"coalition": "",
 		"era": "",
 		"label": "SSK 641B Tango",
-		"shortLabel": "SSK 641B Tango",
+		"shortLabel": "Tango",
 		"type": "Submarine",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 0,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1574,8 +1625,8 @@
 	},
 	"Forrestal": {
 		"name": "Forrestal",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "Early Cold War",
 		"label": "CV-59 Forrestal",
 		"shortLabel": "CV-59 Forrestal",
 		"type": "Aircraft Carrier",
@@ -1583,6 +1634,7 @@
 		"liveries": {},
 		"acquisitionRange": 50000,
 		"engagementRange": 25000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": false,
@@ -1590,15 +1642,16 @@
 	},
 	"LST_Mk2": {
 		"name": "LST_Mk2",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "WW2",
 		"label": "LST Mk.II",
 		"shortLabel": "LST Mk.II",
-		"type": "Landing Ship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1606,15 +1659,16 @@
 	},
 	"USS_Samuel_Chase": {
 		"name": "USS_Samuel_Chase",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "WW2",
 		"label": "LS Samuel Chase",
 		"shortLabel": "LS Samuel Chase",
-		"type": "Landing SHip",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 0,
 		"engagementRange": 7000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1622,15 +1676,16 @@
 	},
 	"Higgins_boat": {
 		"name": "Higgins_boat",
-		"coalition": "",
-		"era": "",
+		"coalition": "blue",
+		"era": "WW2",
 		"label": "Boat LCVP Higgins",
 		"shortLabel": "Boat LCVP Higgins",
-		"type": "Landing Ship",
+		"type": "Cargo/Transport",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 3000,
 		"engagementRange": 1000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1638,15 +1693,16 @@
 	},
 	"Uboat_VIIC": {
 		"name": "Uboat_VIIC",
-		"coalition": "",
-		"era": "",
-		"label": "U-boat VIIC U-flak",
-		"shortLabel": "U-boat VIIC U-flak",
+		"coalition": "red",
+		"era": "WW2",
+		"label": "U-boat VIIC",
+		"shortLabel": "U-boat",
 		"type": "Submarine",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 20000,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,
@@ -1654,15 +1710,16 @@
 	},
 	"Schnellboot_type_S130": {
 		"name": "Schnellboot_type_S130",
-		"coalition": "",
-		"era": "",
+		"coalition": "red",
+		"era": "WW2",
 		"label": "Boat Schnellboot type S130",
 		"shortLabel": "Boat Schnellboot type S130",
-		"type": "Torpedo Boat",
+		"type": "Fast Attack Craft",
 		"enabled": true,
 		"liveries": {},
 		"acquisitionRange": 10000,
 		"engagementRange": 4000,
+		"tags": "",
 		"description": "",
 		"abilities": "",
 		"canTargetPoint": true,

client/public/images/favicons/site.webmanifest

@@ -0,0 +1,16 @@
+{
+    "name": "DCS Olympus",
+    "short_name": "DCS Olympus",
+    "icons": [{
+        "src": "/images/favicons/android-chrome-192x192.png",
+        "sizes": "192x192",
+        "type": "image/png"
+    }, {
+        "src": "/images/favicons/android-chrome-512x512.png",
+        "sizes": "512x512",
+        "type": "image/png"
+    }],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}

client/public/stylesheets/layout/layout.css

@@ -1,7 +1,3 @@
-:root {
-	--right-panel-width:190px;
-}
-
 /* Page style */
 #map-container {
 	height: 100%;
@@ -17,54 +13,10 @@
 	top: 10px;
 	z-index: 99999;
 	column-gap: 10px;
+	row-gap: 10px;
 	margin-right: 320px;
 	height: fit-content;
-}
-
-@media (max-width: 1820px) {
-    #toolbar-container {
-        flex-direction: column;
-		align-items: start;
-		row-gap: 10px;
-    }
-}
-
-#primary-toolbar {
-	align-items: center;
-	display: flex;
-	height: fit-content;
-	min-width: 650px;
-}
-
-@media (max-width: 1820px) {
-    #primary-toolbar {
-        row-gap: 10px;
-		flex-wrap: wrap;
-    }
-}
-
-#command-mode-toolbar {
-	align-items: center;
-	display: flex;
-}
-
-#app-icon>.ol-select-options {
-	width: fit-content;
-}
-
-#toolbar-summary {
-	background-image: url("/images/icon-round.png");
-	background-position: 20px 22px;
-	background-repeat: no-repeat;
-	background-size: 45px 45px;
-	display: flex;
-	flex-direction: column;
-	padding: 20px;
-	text-indent: 60px;
-}
-
-#toolbar-summary {
-	white-space: nowrap;
+	flex-wrap: wrap;
 }
 
 #connection-status-panel {
@@ -72,7 +24,7 @@
 	font-size: 12px;
 	position: absolute;
 	right: 10px;
-	width: var( --right-panel-width );
+	width: 190px;
 	z-index: 9999;
 }
 
@@ -84,35 +36,21 @@
 	position: absolute;
 	right: 10px;
 	row-gap: 10px;
-	width: var( --right-panel-width );
+	width: 190px;
 	z-index: 9999;
 }
 
 #unit-control-panel {
 	height: fit-content;
+	width: fit-content;
 	left: 10px;
 	position: absolute;
-	top: 80px;
-	width: 320px;
 	z-index: 9999;
 }
 
-@media (max-width: 1820px) {
-    #unit-control-panel {
-        top: 150px;
-    }
-}
-
-@media (max-width: 1350px) {
-    #unit-control-panel {
-        top: 190px;
-    }
-}
-
 #unit-info-panel {
 	bottom: 20px;
 	font-size: 12px;
-	left: 10px;
 	position: absolute;
 	width: fit-content;
 	z-index: 9999;
@@ -120,12 +58,18 @@
 	display: flex;
     flex-direction: row;
     justify-content: space-evenly;
+	right: 210px;
+	height: 180px;
 }
 
-@media (max-width: 1525px) {
-    #unit-info-panel {
-		flex-direction: column;
-    }
+#hotgroup-panel {
+    bottom: 40px;
+    column-gap: 10px;
+    display: flex;
+    left: 50%;
+    position: absolute;
+    translate: -50%;
+    z-index: 9998;
 }
 
 #info-popup {
@@ -140,6 +84,16 @@
 	align-items: center;
 }
 
+#slow-delete-popup {
+	align-self: center;
+	display:flex;
+	justify-self: center;
+    position: absolute;
+    width: fit-content;
+    height: fit-content;
+    z-index: 9999999999;
+}
+
 #log-panel {
 	position: absolute;
 	right: 0px;

client/public/stylesheets/markers/airbase.css

@@ -4,6 +4,8 @@
     display: flex;
     justify-content: center;
     position: relative;
+    width: 100%;
+    height: 100%;
 }
 
 .airbase-icon[data-coalition="red"] svg * {

client/public/stylesheets/markers/bullseye.css

@@ -4,6 +4,8 @@
     display: flex;
     justify-content: center;
     position: relative;
+    width: 100%;
+    height: 100%;
 }
 
 .bullseye-icon[data-coalition="red"] svg * {

client/public/stylesheets/markers/units.css

@@ -50,6 +50,11 @@
     width: var(--unit-width);
 }
 
+.unit-icon svg {
+    height: 100%;
+    width: 100%;
+}
+
 [data-is-selected] .unit-icon::before {
     background-color: var(--unit-spotlight-fill);
     border-radius: 50%;
@@ -97,6 +102,22 @@
     position: absolute;
 }
 
+[data-object|="unit-groundunit"] .unit-short-label {
+    transform: translateY(7px);
+}
+
+/*** Health indicator ***/
+[data-object|="unit"] .unit-health {
+    background: white;
+    border: var(--unit-health-border-width) solid var(--secondary-dark-steel);
+    border-radius: var(--border-radius-sm);
+    display: none;
+    height: var(--unit-health-height);
+    position: absolute;
+    translate: var(--unit-health-x) var(--unit-health-y);
+    width: var(--unit-health-width);
+}
+
 /*** Fuel indicator ***/
 [data-object|="unit"] .unit-fuel {
     background: white;
@@ -109,7 +130,8 @@
     width: var(--unit-fuel-width);
 }
 
-[data-object|="unit"] .unit-fuel-level {
+[data-object|="unit"] .unit-fuel-level,
+[data-object|="unit"] .unit-health-level {
     background-color: var(--secondary-light-grey);
     height: 100%;
     width: 100%;
@@ -178,23 +200,19 @@
 
 /*** Common ***/
 [data-object|="unit"]:hover .unit-ammo,
+[data-object|="unit"]:hover .unit-health ,
 [data-object|="unit"]:hover .unit-fuel {
     display: flex;
 }
 
-@keyframes pulse {
-    50% {
-        opacity: 0;
-    }
-}
-
-[data-object|="unit"][data-has-low-fuel] .unit-fuel {
+[data-object|="unit"][data-has-low-fuel] .unit-fuel, [data-object|="unit"][data-has-low-health] .unit-health {
     animation: pulse 1.5s linear infinite;
 }
 
 [data-object|="unit"][data-is-in-hotgroup] .unit-hotgroup,
 [data-object|="unit"][data-is-selected] .unit-ammo,
 [data-object|="unit"][data-is-selected] .unit-fuel,
+[data-object|="unit"][data-is-selected] .unit-health,
 [data-object|="unit"][data-is-selected] .unit-selected-spotlight {
     display: flex;
 }
@@ -211,6 +229,7 @@
 }
 
 [data-object|="unit"][data-coalition="blue"] .unit-fuel-level,
+[data-object|="unit"][data-coalition="blue"] .unit-health-level,
 [data-object|="unit"][data-coalition="blue"][data-has-fox-1] .unit-ammo>div:nth-child(1),
 [data-object|="unit"][data-coalition="blue"][data-has-fox-2] .unit-ammo>div:nth-child(2),
 [data-object|="unit"][data-coalition="blue"][data-has-fox-3] .unit-ammo>div:nth-child(3),
@@ -227,6 +246,7 @@
 }
 
 [data-object|="unit"][data-coalition="red"] .unit-fuel-level,
+[data-object|="unit"][data-coalition="red"] .unit-health-level,
 [data-object|="unit"][data-coalition="red"][data-has-fox-1] .unit-ammo>div:nth-child(1),
 [data-object|="unit"][data-coalition="red"][data-has-fox-2] .unit-ammo>div:nth-child(2),
 [data-object|="unit"][data-coalition="red"][data-has-fox-3] .unit-ammo>div:nth-child(3),
@@ -260,7 +280,8 @@
     background-image: url("/resources/theme/images/states/idle.svg");
 }
 
-[data-object*="groundunit"][data-state="idle"] .unit-state {
+[data-object*="groundunit"][data-state="idle"] .unit-state,
+[data-object*="navyunit"][data-state="idle"] .unit-state {
     background-image: url("");  /* To avoid clutter, dont show the idle state for non flying units */
 }
 
@@ -307,6 +328,32 @@
     background-image: url("/resources/theme/images/states/awacs.svg");
 }
 
+[data-object|="unit"][data-state="miss-on-purpose"] .unit-state {
+    background-image: url("/resources/theme/images/states/miss-on-purpose.svg");
+}
+
+[data-object|="unit"][data-state="scenic-aaa"] .unit-state {
+    background-image: url("/resources/theme/images/states/scenic-aaa.svg");
+}
+
+[data-object|="unit"][data-state="simulate-fire-fight"] .unit-state {
+    background-image: url("/resources/theme/images/states/simulate-fire-fight.svg");
+}
+
+
+[data-object|="unit"] .unit-health::before {
+    background-image: url("/resources/theme/images/icons/health.svg");
+    background-repeat: no-repeat;
+    background-size: contain;
+    content: " ";
+    height: 6px;
+    left: 0;
+    position: absolute;
+    top: 0;
+    translate: -10px -2px;
+    width: 6px;
+}
+
 
 /*** Dead unit ***/
 [data-object|="unit"][data-is-dead] .unit-selected-spotlight,
@@ -316,6 +363,7 @@
 [data-object|="unit"][data-is-dead] .unit-hotgroup-id,
 [data-object|="unit"][data-is-dead] .unit-state,
 [data-object|="unit"][data-is-dead] .unit-fuel,
+[data-object|="unit"][data-is-dead] .unit-health,
 [data-object|="unit"][data-is-dead] .unit-ammo,
 [data-object|="unit"][data-is-dead]:hover .unit-fuel,
 [data-object|="unit"][data-is-dead]:hover .unit-ammo {

client/public/stylesheets/olympus.css

@@ -11,6 +11,8 @@
 
 @import url("other/contextmenus.css");
 @import url("other/popup.css");
+@import url("other/toolbar.css");
+
 
 @import url("markers/airbase.css");
 @import url("markers/bullseye.css");

client/public/stylesheets/other/contextmenus.css

@@ -45,6 +45,7 @@
     justify-content: space-between;
     row-gap: 5px;
     width: 100%;
+    padding: 5px;
 }
 
 .contextmenu-advanced-options-toggle,
@@ -60,8 +61,18 @@
 
 .contextmenu-advanced-options-toggle:after,
 .contextmenu-metadata-toggle:after {
-    content: url(/resources/theme/images/icons/chevron-down.svg);
-    margin: auto;
+    content: "";
+    margin-left: auto;
+    margin-top: auto;
+    background-image: url(/resources/theme/images/icons/chevron-down.svg);
+    background-size: 100% 100%;
+    width: 15px;
+    height: 15px;
+}
+
+.contextmenu-advanced-options-toggle.is-open:after,
+.contextmenu-metadata-toggle.is-open:after {
+    transform: rotate(180deg);
 }
 
 .contextmenu-advanced-options-toggle div:first-child,
@@ -124,6 +135,28 @@
     max-height: 300px;
 }
 
+.ol-tag {
+    background-color: #FFFFFF11;
+    color: #FFFFFFDD;
+    border: 1px solid #FFFFFF55;
+    font-weight: normal;
+    padding: 2px 5px;
+}
+
+/*
+.ol-tag-CA {
+    background-color: #FF000022;
+}
+
+.ol-tag-Radar {
+    background-color: #00FF0022;
+}
+
+.ol-tag-IR {
+    background-color: #0000FF22;
+} 
+*/
+
 .unit-loadout-list {
     min-width: 0;
 }
@@ -219,19 +252,24 @@
 }
 
 .unit-label-count-container {
-    display: flex;
-    flex-direction: row;
+    display: grid;
+    grid-template-columns: 187px 1fr 1fr;
     align-items: center;
     column-gap: 5px;
 }
 
-.unit-label-count-container>div:nth-child(1) {
+.unit-label-count-container>*:first-child {
     width: 100%;
-    min-width: 0;
 }
 
-.unit-label-count-container>div:nth-child(2) {
-    font-size: large;
+.unit-label-count-container button {
+    display: flex !important;
+    flex-direction: row;
+    align-items: center;
+}
+
+.unit-label-count-container button>*:nth-child(1) {
+    margin-left: auto;
 }
 
 .unit-loadout-preview {
@@ -373,84 +411,124 @@
 
 /*  Buttons  */
 #center-map::before {
-    content: url("/resources/theme/images/icons/arrows-to-eye-solid.svg");
+    background-image: url("/resources/theme/images/icons/arrows-to-eye-solid.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #refuel::before {
-    content: url("/resources/theme/images/icons/fuel.svg");
+    background-image: url("/resources/theme/images/icons/fuel.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #attack::before {
-    content: url("/resources/theme/images/icons/sword.svg");
+    background-image: url("/resources/theme/images/icons/sword.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #bomb::before {
-    content: url("/resources/theme/images/icons/crosshairs-solid.svg");
+    background-image: url("/resources/theme/images/icons/crosshairs-solid.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #carpet-bomb::before {
-    content: url("/resources/theme/images/icons/explosion-solid.svg");
+    background-image: url("/resources/theme/images/icons/explosion-solid.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #fire-at-area::before {
-    content: url("/resources/theme/images/icons/crosshairs-solid.svg");
+    background-image: url("/resources/theme/images/icons/crosshairs-solid.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #simulate-fire-fight::before {
-    content: url("/resources/theme/images/icons/crosshairs-solid.svg");
+    background-image: url("/resources/theme/images/icons/crosshairs-solid.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #follow::before {
-    content: url("/resources/theme/images/icons/follow.svg");
+    background-image: url("/resources/theme/images/icons/follow.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #scenic-aaa::before {
-    content: url("/resources/theme/images/icons/scenic.svg");
+    background-image: url("/resources/theme/images/icons/scenic.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #miss-aaa::before {
-    content: url("/resources/theme/images/icons/miss.svg");
+    background-image: url("/resources/theme/images/icons/miss.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #group-ground::before {
-    content: url("/resources/theme/images/icons/group-ground.svg");
+    background-image: url("/resources/theme/images/icons/group-ground.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #group-navy::before {
-    content: url("/resources/theme/images/icons/group-navy.svg");
+    background-image: url("/resources/theme/images/icons/group-navy.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #land-at-point::before {
-    content: url("/resources/theme/images/icons/land-at-point.svg");
+    background-image: url("/resources/theme/images/icons/land-at-point.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #trail::before {
-    content: url("/resources/theme/images/icons/trail.svg");
+    background-image: url("/resources/theme/images/icons/trail.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #echelon-lh::before {
-    content: url("/resources/theme/images/icons/echelon-lh.svg");
+    background-image: url("/resources/theme/images/icons/echelon-lh.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #echelon-rh::before {
-    content: url("/resources/theme/images/icons/echelon-rh.svg");
+    background-image: url("/resources/theme/images/icons/echelon-rh.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #line-abreast-rh::before,
 #line-abreast-lh::before {
-    content: url("/resources/theme/images/icons/line-abreast.svg");
+    background-image: url("/resources/theme/images/icons/line-abreast.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #front::before {
-    content: url("/resources/theme/images/icons/front.svg");
+    background-image: url("/resources/theme/images/icons/front.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #diamond::before {
-    content: url("/resources/theme/images/icons/diamond.svg");
+    background-image: url("/resources/theme/images/icons/diamond.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #custom::before {
-    content: url("/resources/theme/images/icons/custom.svg");
+    background-image: url("/resources/theme/images/icons/custom.svg");
+    content: "";
+	background-size: 20px 20px;
 }
 
 #custom-formation-dialog {
@@ -553,6 +631,7 @@
 
 #iads-menu {
     row-gap: 10px;
+    padding: 10px;
 }
 
 #coalition-area-contextmenu>div:nth-child(2) {
@@ -569,6 +648,7 @@
     flex-direction: column;
     justify-content: space-between;
     row-gap: 5px;
+    padding: 20px;
 }
 
 .create-iads-button {

client/public/stylesheets/other/toolbar.css

@@ -0,0 +1,125 @@
+
+#primary-toolbar {
+	align-items: center;
+	display: flex;
+	height: fit-content;
+}
+
+#command-mode-toolbar {
+	align-items: center;
+	display: flex;
+}
+
+#app-icon>.ol-select-options {
+	width: fit-content;
+}
+
+#app-icon>.ol-select-value {
+	box-shadow: none;
+}
+
+#toolbar-summary {
+	background-image: url("/images/icon-round.png");
+	background-position: 20px 22px;
+	background-repeat: no-repeat;
+	background-size: 45px 45px;
+	display: flex;
+	flex-direction: column;
+	padding: 20px;
+	text-indent: 60px;
+}
+
+#toolbar-summary {
+	white-space: nowrap;
+}
+
+.ol-panel-tab {
+	align-items: center;
+    display:flex;
+	flex-direction: row;
+	margin-right:6px;
+}
+
+.ol-panel-tab svg {
+	height:24;
+	width:24px;
+}
+
+.ol-panel-tab svg * {
+	fill:white;
+}
+
+.ol-panel-tab span {
+	font-size:13px;
+	font-weight:400;
+	padding:0 6px;
+}
+
+#view-label {
+	margin-left: 5px;
+}
+
+#view-label svg {
+	height: 20px;
+	width: 20px;
+}
+
+#toolbar-container>*:nth-child(3)>svg {
+    display: none;
+}
+
+#unit-visibility-control > div:nth-child(4) {
+	border-left: 2px solid white;
+	padding-left: 12px;
+}
+
+#unit-visibility-control > div:last-child {
+	border-right: 2px solid white;
+	padding-right: 12px;
+}
+
+@media (max-width: 1145px) {
+	#toolbar-container {
+		flex-direction: column;
+		align-items: start;
+	}
+
+	#toolbar-container .ol-panel .ol-panel-tab {
+		margin-right:0;
+	}
+
+	#toolbar-container .ol-panel:hover .ol-panel-tab {
+		display:none;
+	}
+
+	#toolbar-container .ol-panel-tab span {
+		display:none;
+	}
+
+	#toolbar-container>*:nth-child(1):not(:hover) {
+		width: fit-content;
+		height: fit-content;
+	}
+
+	#toolbar-container>*:nth-child(1):not(:hover)>*:not(:first-child) {
+		display: none;
+	}
+
+    #toolbar-container>*:not(:first-child):not(:hover) {
+		height: 52px;
+        align-items: center;
+        justify-content: center;
+        aspect-ratio: 1/1;
+    }
+
+	#toolbar-container>*:not(:first-child):not(:hover)>svg {
+		display: block;
+        filter: invert();
+		height: 24px;
+		width: 24px;
+	}
+
+	#toolbar-container>*:not(:first-child):not(:hover)>*:not(:first-child) {
+		display: none;
+	}
+}

client/public/stylesheets/panels/connectionstatus.css

@@ -50,15 +50,6 @@
 	animation: pulse 1s infinite;
 }
 
-@keyframes pulse {
-	0% {
-		opacity: 0;
-	}
-	100% {
-		opacity: 1;
-	}
-}
-
 #connection-status-panel[data-is-paused] #connection-status-light {
 	background: var(--accent-amber);
 }

client/public/stylesheets/panels/logpanel.css

@@ -27,7 +27,6 @@
 	display: block;
 }
 
-
 #log-panel-header-right {
     align-items: center;
     column-gap: 16px;
@@ -35,6 +34,11 @@
     flex-flow: row nowrap;
 }
 
+#log-panel-header-right svg {
+    width: 15px;
+    height: 15px;
+}
+
 #server-status-panel abbr {
 	text-decoration: none;
 }

client/public/stylesheets/panels/mouseinfo.css

@@ -107,147 +107,4 @@
 #coordinates-tool[data-location-system="MGRS"] [data-location-system="MGRS"],
 #coordinates-tool[data-location-system="UTM"] [data-location-system="UTM"] {
 	display:flex;
-}
-
-
-/* 
-#mouse-info-panel dl {
-	margin-bottom: 4px;
-	row-gap: 5px;
-}
-
-#mouse-info-panel dt {
-	height: fit-content;
-	width: 30%;
-}
-
-#mouse-info-panel dt::after, #coordinates-tool [data-label] {
-	align-items: center;
-	background-color: white;
-	border-radius: var(--border-radius-sm);
-	color: var(--background-steel);
-	display: flex;
-	font-size: 15.6px;
-	font-weight: bolder;
-	height: 16px;
-	justify-content: center;
-	line-height: 16px;
-	padding: 4px;
-	text-transform: uppercase;
-	width: 16px;
-}
-
-#coordinates-tool [data-label] {
-	height:24px;
-	width:24px;
-}
-
-#mouse-info-panel #measuring-tool dt {
-	height: 24px;
-	width: 24px;
-	background-color: var(--background-offwhite);
-	border-radius: var(--border-radius-sm);
-}
-
-#mouse-info-panel #measuring-tool svg {
-	padding: 3px;
-	height: 100%;
-	width: 100%;
-}
-
-#mouse-info-panel #measuring-tool dt svg>* {
-	fill: black;
-	stroke: black;
-}
-
-#mouse-info-panel [data-label]::after {
-	content: attr(data-label);
-}
-
-#mouse-info-panel dt[data-coalition="blue"]::after {
-	background-color: var(--primary-blue);
-}
-
-#mouse-info-panel dt[data-coalition="red"]::after {
-	background-color: var(--primary-red);
-}
-
-#mouse-info-panel [data-tooltip]:hover::before {
-	background-color: var(--background-grey);
-	border-radius: 5px;
-	content: attr(data-tooltip);
-	display: flex;
-	flex-wrap: nowrap;
-	padding: 5px;
-	position: absolute;
-	translate: calc(-100% - 15px) 0;
-	white-space: nowrap;
-}
-
-#coordinates-tool[data-location-system] [data-location-system] {
-	display:none;
-	flex-direction: column;
-}
-
-#coordinates-tool[data-location-system="LatLng"] [data-location-system="LatLng"],
-#coordinates-tool[data-location-system="MGRS"] [data-location-system="MGRS"] {
-	display:flex;
-}
-
-#coordinates-tool > * > * {
-	align-items: center;
-	display:flex;
-	flex-flow: row nowrap;
-}
-
-#coordinates-tool > * > * > * {
-	display:table-cell;
-	width:fit-content;
-}
-
-#coordinates-tool > * > * > :last-child {
-	text-align: right;
-	width:100%;
-}
-
-.br-info::after {
-    content: attr(data-bearing) '\00B0  / ' attr(data-distance) " " attr(data-distance-units);
-	font-weight: bold;
-	font-size: 13px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	color: var(--background-offwhite);
-}
-
-.br-info[data-coalition="blue"]::after {
-    color: var(--primary-blue)
-}
-
-.br-info[data-coalition="red"]::after {
-    color: var(--primary-red)
-}
-
-.br-info[data-message]::after {
-    content: attr(data-message);
-}
-
-.coordinates::after {
-    content: attr(data-value);
-	font-weight: bold;
-	font-size: 13px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	color: var(--background-offwhite);
-}
-
-.elevation::after {
-    content: attr(data-value);
-	font-weight: bold;
-	font-size: 13px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	color: var(--background-offwhite);
-} */
+}

client/public/stylesheets/panels/unitcontrol.css

@@ -2,14 +2,126 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 	display: block !important;
 }
 
+
+#roe-buttons-container button,
+#reaction-to-threat-buttons-container button,
+#emissions-countermeasures-buttons-container button,
+#shots-scatter-buttons-container button #shots-intensity-buttons-container button {
+	align-items: center;
+	background-color: transparent;
+	border: 1px solid var(--accent-light-blue);
+	display: flex;
+	height: 30px;
+	justify-content: center;
+	width: 30px;
+}
+
+#reaction-to-threat-buttons-container button:not(:first-child) svg {
+	width: 150%;
+	margin: -5px;
+}
+
+#unit-control-panel .ol-option-button button {
+	width: 30px;
+	height: 30px;
+}
+
+#unit-control-panel .ol-option-button svg {
+	width: 100%;
+	height: 100%;
+}
+
+#unit-control-panel .ol-option-button button.selected {
+	background-color: white;
+	border-color: white;
+}
+
+#unit-control-panel .ol-option-button button.selected svg * {
+	fill: var(--background-steel);
+	stroke: var(--background-steel);
+}
+
+#rapid-controls {
+	display: flex;
+	flex-direction: column;
+	row-gap: 5px;
+	height: fit-content;
+	width: fit-content;
+}
+
+#rapid-controls button {
+	padding: 4px;
+}
+
+#rapid-controls button.pulse {
+	animation: pulse 1.5s linear infinite;
+}
+
+#rapid-controls svg {
+	height: 20px;
+	width: 20px;
+	fill: white;
+	stroke: white;
+}
+
+#rapid-controls button:before {
+	display: inline-block;
+	filter: invert(100%);
+	height: 20px;
+	width: 20px;
+}
+
 #unit-control-panel {
+	display: flex;
+	flex-direction: row;
+	column-gap: 10px;
+	row-gap: 10px;
+}
+
+#unit-control-panel>div:nth-child(2),
+#unit-controls {
 	display: flex;
 	flex-direction: column;
 	row-gap: 10px;
 }
 
-#unit-control-panel h3 {
-	margin-bottom: 8px;
+#unit-controls {
+	padding-right: 10px;
+}
+
+#unit-control-panel>div:nth-child(2) {
+	width: 330px;
+}
+
+#unit-control-panel>*:nth-child(1) {
+	display: none;
+	padding: 14px;
+}
+
+@media (max-width: 1145px) {
+	#unit-control-panel>*:nth-child(1) {
+		display: flex;
+	}
+
+	#unit-control-panel>*:nth-child(1) svg {
+		display: flex;
+		width: 24px;
+		height: 24px;
+		filter: invert(100%);
+	}
+
+	#unit-control-panel:hover>*:nth-child(1) {
+		display: none;
+	}
+
+	#unit-control-panel:not(:hover) {
+		width: fit-content;
+	}
+
+	#unit-control-panel:not(:hover)>*:nth-child(2),
+	#unit-control-panel:not(:hover)>*:nth-child(3) {
+		display: none;
+	}
 }
 
 #unit-control-panel #selected-units-container {
@@ -25,9 +137,9 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 
 #unit-control-panel #selected-units-container button {
 	align-items: center;
-	border-radius: var(--border-radius-md);
+	border-radius: 20px;
 	display: flex;
-	font-size: 11px;
+	font-size: 13px;
 	height: 32px;
 	justify-content: space-between;
 	margin-right: 5px;
@@ -41,6 +153,7 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 	content: attr(data-label);
 	font-size: 10px;
 	padding: 4px 6px;
+	padding-right: 7px;
 	white-space: nowrap;
 	width: fit-content;
 }
@@ -56,7 +169,7 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 	display: block;
 	overflow: hidden;
 	padding: 4px;
-	padding-left: 0;
+	padding-left: 7px;
 	text-align: left;
 	text-overflow: ellipsis;
 	white-space: nowrap;
@@ -92,7 +205,7 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 }
 
 #advanced-settings-dialog>.ol-dialog-content>div input[type="number"] {
-    width: 60px;
+	width: 60px;
 }
 
 #advanced-settings-dialog hr {
@@ -157,79 +270,112 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 	content: "GS";
 }
 
-#unit-control-panel .ol-slider-value {
+.switch-control .ol-switch {
+	height: 23px;
+	width: 40px;
+}
+
+.ol-slider-value {
 	color: var(--accent-light-blue);
 	cursor: pointer;
 	font-size: 14px;
 	font-weight: bold;
 }
 
-#unit-control-panel .switch-control {
+.switch-control {
 	align-items: center;
-	display: grid;
-	grid-template-columns: 1.35fr 0.65fr;
+	align-content: center;
+	display: flex;
+	width: 100%;
+	justify-content: space-between;
 }
 
-#unit-control-panel .switch-control>*:nth-child(2) {
-	justify-self: end;
+.switch-control h4 {
+	margin: 0px !important;
+	padding: 0px;
+	display: flex;
+	align-items: center;
 }
 
-#unit-control-panel .switch-control>*:nth-child(3) {
-	color: var(--secondary-semitransparent-white);
-}
-
-#unit-control-panel .switch-control h4 {
-	margin: 0px;
-}
-
-#unit-control-panel .switch-control .ol-switch {
-	height: 25px;
-	width: 60px;
-}
-
-#unit-control-panel .switch-control .ol-switch-fill {
-	background-color: var(--accent-light-blue);
-}
-
-#unit-control-panel .switch-control .ol-switch-fill::after {
-	background-color: white;
-}
-
-#unit-control-panel .switch-control .ol-switch[data-value="true"]>.ol-switch-fill::before {
-	content: "YES";
-}
-
-#unit-control-panel .switch-control .ol-switch[data-value="false"]>.ol-switch-fill::before {
-	content: "NO";
-}
-
-#operate-as-switch[data-value="true"] .ol-switch-fill {
-	background-color: var(--accent-light-blue);
-}
-
-#operate-as-switch[data-value="false"] .ol-switch-fill {
-	background-color: var(--primary-red);
-}
-
-#operate-as-switch[data-value="true"]>.ol-switch-fill::before {
-	content: "BLUE" !important;
-}
-
-#operate-as-switch[data-value="false"]>.ol-switch-fill::before {
-	content: "RED" !important;
+.switch-control h4 img {
+	height: 15px;
+	margin-left: 10px;
+	cursor: pointer;
+	filter: invert(100%);
+	opacity: 80%;
 }
 
 #advanced-settings-div {
-	column-gap: 5px;
+	align-items: center;
+	column-gap: 8px;
 	display: flex;
+	height: fit-content;
+	position: relative;
 }
 
-#advanced-settings-div>*:nth-child(2) {
-	margin-left: auto;
-}
-
-#advanced-settings-div button {
+#advanced-settings-div>button {
+	background-color: var(--background-grey);
+	box-shadow: 0px 2px 5px #000A;
+	font-size: 13px;
 	height: 40px;
+	padding: 0 20px;
+}
+
+#delete-options {
+	font-size: 13px;
+}
+
+#delete-options.ol-select>.ol-select-value:after {
+	content: "";
+}
+
+#delete-options.ol-select>.ol-select-value svg {
+	background-color: transparent;
+	position: absolute;
+	right: 2px;
+	translate: 0 1px;
+}
+
+#delete-options.ol-select>.ol-select-value svg * {
+	fill: var(--primary-red);
+}
+
+#delete-options * {
+	background-color: var(--background-steel);
+}
+
+#delete-options.ol-select>.ol-select-value:hover,
+#delete-options .ol-select-options>div:not(.hr):hover,
+#delete-options .ol-select-options>div:not(.hr):hover button,
+#delete-options .ol-select-options>div hr {
+	background-color: var(--background-grey);
+}
+
+#delete-options .ol-select-options>div:first-of-type {
+	margin-top: 12px;
+	padding-top: 0;
+}
+
+#delete-options .ol-select-options>div:last-of-type {
+	margin-bottom: 12px;
+	padding-bottom: 0;
+}
+
+#delete-options button {
+	display: flex;
+	flex-direction: row;
+	align-content: center;
+}
+
+#delete-options button svg {
+	background-color: transparent;
+	margin-right: 10px;
+	width: 18px;
+	max-height: 18px;
+}
+
+#delete-options button svg * {
+	stroke: red;
 }
 
 /* Element visibility control */
@@ -239,6 +385,8 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 #unit-control-panel:not([data-show-roe]) #roe,
 #unit-control-panel:not([data-show-threat]) #threat,
 #unit-control-panel:not([data-show-emissions-countermeasures]) #emissions-countermeasures,
+#unit-control-panel:not([data-show-shots-scatter]) #shots-scatter,
+#unit-control-panel:not([data-show-shots-intensity]) #shots-intensity,
 #unit-control-panel:not([data-show-tanker-button]) #tanker-on,
 #unit-control-panel:not([data-show-AWACS-button]) #AWACS-on,
 #unit-control-panel:not([data-show-on-off]) #ai-on-off,
@@ -251,4 +399,4 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 #advanced-settings-dialog:not([data-show-radio]) #radio-options,
 #advanced-settings-dialog:not([data-show-air-unit-checkboxes]) .air-unit-checkbox {
 	display: none;
-}
+}

client/public/stylesheets/panels/unitinfo.css

@@ -1,47 +1,47 @@
 #unit-info-panel>* {
 	position: relative;
-	min-height: 100px;
 	bottom: 0px;
 }
 
-@media (min-width: 1525px) {  
-	#unit-info-panel>.panel-section {
-		border-right: 1px solid #555;
-		padding: 0 30px;
-	}
-
-	#unit-info-panel>.panel-section:first-child {
-		padding-left: 0px;
-	}
-
-	#unit-info-panel>.panel-section:last-child {
-		padding-right: 0px;
-	}
-
-	#unit-info-panel>.panel-section:last-of-type {
-		border-right-width: 0;
-	}
+#unit-info-panel>*:nth-child(1) {
+	display: flex;
+	width: 24px;
+	height: 24px;
+	margin: 6px;
+	filter: invert(100%);
 }
 
-@media (max-width: 1525px) {
-	#unit-info-panel>.panel-section {
-		border-bottom: 1px solid #555;
-		padding: 30px 0px;
-	}
-
-	#unit-info-panel>.panel-section:first-child {
-		padding-top: 0px;
-	}
-
-	#unit-info-panel>.panel-section:last-child {
-		padding-bottom: 0px;
-	}
-
-	#unit-info-panel>.panel-section:last-of-type {
-		border-bottom-width: 0;
-	}
+#unit-info-panel:hover>*:nth-child(1) {
+	display: none;
 }
 
+#unit-info-panel:not(:hover) {
+	width: fit-content;
+	height: fit-content;
+	padding: 10px;
+	margin: 0px;
+}
+
+#unit-info-panel:not(:hover)>*:not(:first-child) {
+	display: none;
+}
+ 
+#unit-info-panel>.panel-section {
+	border-right: 1px solid #555;
+	padding: 0 30px;
+}
+
+#unit-info-panel>.panel-section:first-of-type {
+	padding-left: 0px;
+}
+
+#unit-info-panel>.panel-section:last-of-type{
+	padding-right: 0px;
+}
+
+#unit-info-panel>.panel-section:last-of-type {
+	border-right-width: 0;
+}
 
 #general {
 	display: flex;
@@ -49,6 +49,7 @@
 	justify-content: space-between;
 	row-gap: 4px;
 	position: relative;
+	width: 300px;
 }
 
 #unit-label {
@@ -63,6 +64,10 @@
 #unit-name {
 	margin-bottom: 4px;
 	padding: 0px 0;
+	width: 100%;
+	text-overflow: ellipsis;
+	text-wrap: nowrap;
+	overflow: hidden;
 }
 
 #current-task {
@@ -87,24 +92,24 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: space-between;
+	width: 300px;
 }
 
 #loadout-silhouette {
 	filter: invert(100%);
-	height: 100px;
+	height: 75px;
 	margin-right: 25px;
-	width: 100px;
+	width: 75px;
 }
 
 #loadout-items {
-	margin-right: 20px;
 	align-self: center;
-	display: flex;
-	flex-flow: column;
-	row-gap: 8px;
 	column-gap: 8px;
-	max-height: 90px;
-	flex-wrap: wrap;
+	display: flex;
+	flex-flow: column nowrap;
+	height: 100px;
+	row-gap: 6px;
+	padding-right: 10px;
 }
 
 #loadout-items>* {
@@ -122,7 +127,7 @@
 	display: flex;
 	font-size: 11px;
 	font-weight: bold;
-	padding: 4px 6px;
+	padding: 3px 4px;
 }
 
 #loadout-items>*::after {
@@ -137,16 +142,16 @@
 #fuel-percentage {
 	align-items: center;
 	display: flex;
-	margin-top: auto;
+	margin-top: 8px;
 }
 
 #fuel-percentage::before {
-	content: url("/resources/theme/images/icons/fuel.svg");
+	content: "";
+	background-image: url("/resources/theme/images/icons/fuel.svg");
+	background-size: 16px 16px;
 	display: inline-block;
 	filter: invert(100%);
-	height: 16px;
 	margin-right: 6px;
-	width: 16px;
 }
 
 #fuel-percentage::after {

client/public/stylesheets/style/style.css

@@ -23,7 +23,7 @@ body {
 }
 
 .hidden-cursor {
-    cursor: none !important;
+    /*cursor: none !important;*/
 }
 
 .hidden-cursor * {
@@ -72,8 +72,16 @@ form {
     padding: 0;
 }
 
-form>div {
-    margin: 20px 0;
+button svg.fill-coalition * {
+    fill: var(--primary-neutral) !important;
+}
+
+button svg.fill-coalition[data-coalition="blue"] * {
+    fill: var(--primary-blue) !important;
+}
+
+button svg.fill-coalition[data-coalition="red"] * {
+    fill: var(--primary-red) !important;
 }
 
 .pill {
@@ -92,7 +100,7 @@ form>div {
 }
 
 .ol-scrollable {
-    overflow-y: scroll;
+    overflow-y: auto;
     scrollbar-color: white transparent;
     scrollbar-width: thin;
 }
@@ -198,9 +206,21 @@ form>div {
 }
 
 .ol-select:not(.ol-select-image)>.ol-select-value:after {
-    content: url("/resources/theme/images/icons/chevron-down.svg");
+    background-image: url("/resources/theme/images/icons/chevron-down.svg");
+    content: "";
     position: absolute;
     right: 10px;
+    width: 15px;
+    height: 15px;
+    background-size: 100% 100%;
+}
+
+.ol-select:not(.ol-select-image)>.ol-select-value.ol-select-warning:after {
+    background-image: url("/resources/theme/images/icons/chevron-down-warning.svg") !important;
+}
+
+.ol-select.is-open:not(.ol-select-image)>.ol-select-value:after {
+    transform: rotate(180deg);
 }
 
 .ol-select>.ol-select-options {
@@ -236,7 +256,6 @@ form>div {
 
 .ol-select>.ol-select-options>div {
     background-color: var(--background-grey);
-    box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25);
     display: flex;
     justify-content: left;
     padding: 2px 15px;
@@ -343,10 +362,32 @@ h4 {
     font-weight: normal;
 }
 
+button.ol-button-white {
+    border: 1px solid white;
+    color: white;
+    font-weight: bold;
+}
+
+button.ol-button-white>svg:first-child {
+    stroke: white;
+    fill: white;
+}
+
+.ol-select-warning {
+    border: 1px solid var(--primary-red);
+    color: var(--primary-red) !important;
+    font-weight: bold !important;
+}
+
+.ol-select-warning::after {
+    stroke: var(--primary-red);
+    fill: var(--primary-red);
+}
+
 button.ol-button-warning {
     border: 1px solid var(--primary-red);
-    color: var(--primary-red);
-    font-weight: bold;
+    color: var(--primary-red) !important;
+    font-weight: bold !important;
 }
 
 button.ol-button-warning>svg:first-child {
@@ -355,7 +396,7 @@ button.ol-button-warning>svg:first-child {
 }
 
 nav.ol-panel {
-    column-gap: 20px;
+    column-gap: 10px;
     display: flex;
     flex-direction: row;
     height: 58px;
@@ -367,8 +408,7 @@ nav.ol-panel> :last-child {
 
 .ol-panel .ol-group {
     align-items: center;
-    border-radius: var(--border-radius-sm);
-    column-gap: 10px;
+    column-gap: 12px;
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
@@ -409,6 +449,7 @@ nav.ol-panel> :last-child {
     -webkit-filter: invert(100%);
     height: 16px;
     width: 16px;
+    background-size: 100% 100%;
 }
 
 .ol-panel .ol-group-button-toggle button.off::before {
@@ -605,6 +646,12 @@ nav.ol-panel> :last-child {
     align-items: center;
 }
 
+.ol-navbar-buttons-group > div {
+    align-items: center;
+    display:flex;
+    flex-direction: row;
+}
+
 .ol-navbar-buttons-group button {
     border: none;
     height: 32px;
@@ -629,18 +676,74 @@ nav.ol-panel> :last-child {
 }
 
 .ol-navbar-buttons-group button.off svg * {
-    fill: white !important;
-    stroke: white !important;
+    fill: white !important;     /*  Higher price than the Soul Stone but inline styling is causing issues.  */
+    stroke: white !important;   /*  I'm sorry, daughter.  */
 }
 
 .ol-navbar-buttons-group button svg * {
-    fill: var(--background-steel) !important;
-    stroke: var(--background-steel) !important;
+    fill: var(--background-steel);
+    stroke: var(--background-steel);
 }
 
+.ol-navbar-buttons-group .protectable button:first-of-type {
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    width:28px;
+}
+
+.ol-navbar-buttons-group > .protectable > button.lock {
+    align-items: center;
+    background-color: var(--primary-red);
+    border-bottom-left-radius: 0;
+    border-top-left-radius: 0;
+    display:flex;
+    justify-content: center;
+    width:18px;
+}
+
+.ol-navbar-buttons-group > .protectable > button[data-protected].lock {
+    background-color: var(--background-grey);
+}
+
+.ol-navbar-buttons-group > .protectable > button.lock svg {
+    height:10px;
+    width:10px;
+}
+
+@keyframes lock-prompt {
+    100% {
+        opacity: 1;
+    }
+    0% {
+        opacity: 0;
+    }
+}
+
+.ol-navbar-buttons-group > .protectable > button[data-protected].lock.prompt svg {
+    animation: lock-prompt .25s alternate infinite;
+}
+
+.ol-navbar-buttons-group > .protectable > button.lock svg.locked * {
+    fill:white !important;
+}
+
+.ol-navbar-buttons-group > .protectable > button:not([data-protected]).lock svg.unlocked,
+.ol-navbar-buttons-group > .protectable > button[data-protected].lock svg.locked {
+    display:flex;
+}
+
+.ol-navbar-buttons-group > .protectable > button[data-protected].lock svg.unlocked,
+.ol-navbar-buttons-group > .protectable > button:not([data-protected]).lock svg.locked {
+    display:none;
+}
+
+
+
 #roe-buttons-container button,
 #reaction-to-threat-buttons-container button,
-#emissions-countermeasures-buttons-container button {
+#emissions-countermeasures-buttons-container button,
+#shots-scatter-buttons-container button
+#shots-intensity-buttons-container button {
     align-items: center;
     background-color: transparent;
     border: 1px solid var(--accent-light-blue);
@@ -662,17 +765,15 @@ nav.ol-panel> :last-child {
 
 #unit-control-panel .ol-option-button button.selected svg * {
     fill: var(--background-steel);
+    stroke: var(--background-steel);
 }
 
 #rapid-controls {
     display: flex;
     flex-direction: column;
     row-gap: 5px;
-    position: absolute;
     height: fit-content;
     width: fit-content;
-    left: calc(100% + 10px);
-    top: 0px;
 }
 
 #rapid-controls button {
@@ -699,12 +800,12 @@ nav.ol-panel> :last-child {
     overflow: hidden;
     width: 70%;
     max-width: 1200px;
-    z-index: 99999;
+    z-index: 999999;
+    min-width: 500px;
 }
 
 @media (min-width: 1700px) {
     #splash-screen {
-        background-image: url("/resources/theme/images/splash/1.png");
         background-position: 100% 50%;
         background-size: contain;
     }
@@ -736,7 +837,7 @@ nav.ol-panel> :last-child {
     top: 0;
     transform: rotate(-23deg);
     transform-origin: top right;
-    width: 200px;
+    width: 300px;
     z-index: -1;
 }
 
@@ -751,11 +852,11 @@ nav.ol-panel> :last-child {
     justify-content: space-between;
     min-height: 75px;
     text-indent: 85px;
+    row-gap: 5px;
 }
 
 #splash-content #app-summary>* {
     height: fit-content;
-    line-height: 25px;
     padding: 2px;
     white-space: nowrap;
     width: fit-content;
@@ -763,10 +864,23 @@ nav.ol-panel> :last-child {
 
 #splash-content .app-version {
     font-size: 11px;
+    padding: 0px;
+}
+
+#splash-content .new-version {
+    animation: pulse 1.5s linear infinite;
+}
+
+#splash-content .app-version:first-of-type {
+    margin-top: auto;
 }
 
 #splash-content #legal-stuff {
-    width: 100%;
+    width: 120%;
+    text-wrap: wrap;
+    max-height: 250px;
+    overflow-x: hidden;
+    padding-right: 10px;
 }
 
 #splash-content #legal-stuff h5 {
@@ -776,11 +890,11 @@ nav.ol-panel> :last-child {
 #splash-content #legal-stuff p {
     color: #FFF7;
     font-size: 10px;
-    width: 120%;
+    width: 100%;
 }
 
 @media (max-width: 1700px) {
-    #splash-content #legal-stuff p {
+    #splash-content #legal-stuff {
         width: 100%;
     }
 }
@@ -796,7 +910,38 @@ nav.ol-panel> :last-child {
     position: fixed;
     top: 0px;
     width: 100%;
-    z-index: 9999;
+    z-index: 99999;
+}
+
+#loading-screen {
+    display: flex;
+    background-image: linear-gradient(var(--background-steel), var(--background-grey));
+    height: 100%;
+    left: 0px;
+    position: fixed;
+    top: 0px;
+    width: 100%;
+    z-index: 999999;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    row-gap: 20px;
+}
+
+#loading-screen img {
+    height: 300px;
+    width: 300px;
+}
+
+#loading-screen div {
+    color: white;
+    font-size: 18px;
+    animation: pulse 3s linear infinite;
+}
+
+.fade-out {
+    opacity: 0%;
+    transition: opacity 1s;
 }
 
 #authentication-form {
@@ -804,7 +949,7 @@ nav.ol-panel> :last-child {
     column-gap: 10px;
     display: flex;
     flex-direction: row;
-    margin: 10px 0px;
+    margin: 20px 0px;
     flex-wrap: wrap;
     width: 100%;
     row-gap: 10px;
@@ -849,16 +994,6 @@ nav.ol-panel> :last-child {
     }
 }
 
-#hotgroup-panel {
-    bottom: 40px;
-    column-gap: 10px;
-    display: flex;
-    left: 50%;
-    position: absolute;
-    translate: -50%;
-    z-index: 9999;
-}
-
 #hotgroup-panel>div {
     align-items: center;
     background-color: var(--background-steel);
@@ -1148,7 +1283,7 @@ dl.ol-data-grid dd {
     background-color: var(--background-slate-blue);
     color: white;
     position: absolute;
-    z-index: 9999;
+    z-index: 999999;
 }
 
 .ol-panel.ol-dialog {
@@ -1177,9 +1312,22 @@ dl.ol-data-grid dd {
     margin: 4px 0;
 }
 
+.ol-dialog-content table th {
+    background-color: var(--background-grey);
+    color:white;
+    font-size:14px;
+    font-weight: normal;
+}
+
+.ol-dialog-content table tbody th {
+    text-align: left;
+}
+
 .ol-dialog-footer {
+    align-content: center;
     border-top: 1px solid var(--background-grey);
     display: flex;
+    justify-content: flex-end;
     padding-top: 15px;
     row-gap: 10px;
 }
@@ -1213,6 +1361,11 @@ dl.ol-data-grid dd {
     height: 16px;
     margin-right: 10px;
     width: 16px;
+    background-size: 100% 100%;
+}
+
+.ol-checkbox input[type="checkbox"]:disabled:before {
+    opacity: 10%;
 }
 
 .ol-checkbox input[type="checkbox"]:checked::before {
@@ -1345,20 +1498,54 @@ input[type=number]::-webkit-outer-spin-button {
     transform: translateX(calc((var(--width) - var(--height)) * 0.5));
 }
 
-.ol-contexmenu-panel {
-    padding: 20px;
+.switch-control.yes-no .ol-switch[data-value="true"] .ol-switch-fill {
+    background-color: var(--accent-light-blue);
 }
 
-.ol-coalition-switch[data-value="false"]>.ol-switch-fill {
-    background-color: var(--primary-blue);
+.switch-control.yes-no .ol-switch[data-value="false"] .ol-switch-fill {
+	background-color: var(--ol-switch-off);
 }
 
-.ol-coalition-switch[data-value="true"]>.ol-switch-fill {
-    background-color: var(--primary-red);
+.switch-control.yes-no .ol-switch[data-value="undefined"] .ol-switch-fill {
+	background-color: var(--ol-switch-undefined);
 }
 
-.ol-coalition-switch[data-value="undefined"]>.ol-switch-fill {
-    background-color: var(--primary-neutral);
+.switch-control.coalition .ol-switch>.ol-switch-fill::before,
+.switch-control.yes-no .ol-switch>.ol-switch-fill::before {
+    translate:-100% 0;
+    transform: none;
+}
+
+.switch-control.yes-no .ol-switch[data-value="true"]>.ol-switch-fill::before {
+	content: "YES";
+}
+
+.switch-control.yes-no .ol-switch[data-value="false"]>.ol-switch-fill::before {
+	content: "NO";
+}
+
+.switch-control.coalition [data-value="true"] .ol-switch-fill {
+	background-color: var(--primary-blue);
+}
+
+.switch-control.coalition [data-value="false"] .ol-switch-fill {
+	background-color: var(--primary-red);
+}
+
+.switch-control.coalition [data-value="undefined"] .ol-switch-fill {
+	background-color: var(--primary-neutral);
+}
+
+.switch-control.coalition [data-value="true"] .ol-switch-fill::before {
+	content: "BLUE";
+}
+
+.switch-control.coalition [data-value="false"] .ol-switch-fill::before {
+	content: "RED";
+}
+
+.switch-control.no-label [data-value] .ol-switch-fill::before {
+    content:"";
 }
 
 .ol-context-menu>ul {
@@ -1382,7 +1569,7 @@ input[type=number]::-webkit-outer-spin-button {
     width: 100%;
 }
 
-.ol-contexmenu-button {
+.ol-context-menu-button {
     border: none;
     border-radius: 0px;
     height: 48px;
@@ -1391,23 +1578,23 @@ input[type=number]::-webkit-outer-spin-button {
     width: 48px;
 }
 
-.ol-contexmenu-button:last-of-type {
+.ol-context-menu-button:last-of-type {
     border-bottom-right-radius: var(--border-radius-sm);
     border-top-right-radius: var(--border-radius-sm);
 }
 
-[data-coalition="blue"].ol-contexmenu-button:hover,
-[data-coalition="blue"].ol-contexmenu-button.is-open {
+[data-coalition="blue"].ol-context-menu-button:hover,
+[data-coalition="blue"].ol-context-menu-button.is-open {
     background-color: var(--primary-blue)
 }
 
-[data-coalition="red"].ol-contexmenu-button:hover,
-[data-coalition="red"].ol-contexmenu-button.is-open {
+[data-coalition="red"].ol-context-menu-button:hover,
+[data-coalition="red"].ol-context-menu-button.is-open {
     background-color: var(--primary-red)
 }
 
-[data-coalition="neutral"].ol-contexmenu-button:hover,
-[data-coalition="neutral"].ol-contexmenu-button.is-open {
+[data-coalition="neutral"].ol-context-menu-button:hover,
+[data-coalition="neutral"].ol-context-menu-button.is-open {
     background-color: var(--primary-neutral)
 }
 
@@ -1418,6 +1605,24 @@ input[type=number]::-webkit-outer-spin-button {
     fill: lightgray;
 }
 
+#map-visibility-options .ol-select-options .ol-checkbox {
+    font-size:13px;
+    font-weight:400;
+    padding:6px 15px;
+}
+
+#map-visibility-options .ol-select-options .ol-checkbox:first-of-type {
+    padding-top:12px;
+}
+
+#map-visibility-options .ol-select-options .ol-checkbox:last-of-type {
+    padding-bottom:12px;
+}
+
+#map-visibility-options .ol-select-options .ol-checkbox label:hover span {
+    text-decoration: underline;
+}
+
 .ol-log-entry:first-of-type {
     border-top: 1px solid #FFFFFF44;
 }
@@ -1425,3 +1630,93 @@ input[type=number]::-webkit-outer-spin-button {
 .ol-log-entry {
     border-bottom: 1px solid #FFFFFF44;
 }
+
+.file-import-export {
+    max-width: 500px;
+}
+
+.file-import-export .ol-dialog-content {
+    display:flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.file-import-export p {
+    background-color: var(--background-grey);
+    border-left:6px solid var(--secondary-blue-text);
+    padding:12px;
+}
+
+.file-import-export th {
+    padding:4px 6px;
+}
+
+.file-import-export tr td:first-child {
+    text-align: left;
+}
+
+.file-import-export td {
+    color:white;
+    text-align: center;
+}
+
+.file-import-export .ol-checkbox {
+    display:flex;
+    justify-content: center;
+}
+
+.file-import-export .ol-checkbox input::before {
+    margin-right: 0;
+}
+
+.file-import-export .ol-checkbox span {
+    display:none;
+}
+
+.file-import-export button.start-transfer {
+    background-color: var(--secondary-blue-text);
+    border-color: var(--secondary-blue-text);
+}
+
+.file-import-export .export-filename-container {
+    display: flex;
+    column-gap: 15px;
+    width: 100%;
+    align-items: center;
+    padding: 10px 0px;
+    color: white;
+    font-size: 14px;
+}
+
+.file-import-export .export-filename-container input {
+    width: 100%;
+    background-color: var(--background-grey);
+    appearance: none;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    border-style: solid;
+    border: 1px solid var(--background-steel);
+    color: white;
+    font-size: 14px;
+    padding: 4px;
+}
+
+.file-import-export .export-filename-container img {
+    height: 16px;
+    width: 16px;
+    filter: invert(100%);
+    margin-left: -31px;
+    transform: translateX(-15px);
+    pointer-events: none;
+}
+
+.file-import-export .ol-dialog-footer button:first-of-type{
+    margin-left: auto;
+}
+
+@keyframes pulse {
+    50% {
+        opacity: 0;
+    }
+}
+

client/public/themes/olympus/images/buttons/emissions/attack.svg

@@ -38,6 +38,7 @@
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4" />
   <path 
+	 style="stroke: none"
      d="m 7.5000002,0 c 0.498,0 0.9375,0.4395 0.9375,0.9375 V 1.2598 C 11.1621,1.6699 13.3301,3.8379002 13.7402,6.5625002 h 0.3223 c 0.498,0 0.9375,0.4395 0.9375,0.9375 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 H 13.7402 C 13.3301,11.1914 11.1621,13.3594 8.4375002,13.7695 v 0.293 c 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 v -0.293 C 3.8086002,13.3594 1.6406,11.1914 1.2305,8.4375002 h -0.293 c -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 h 0.293 C 1.6406,3.8379002 3.8086002,1.6699 6.5625002,1.2598 V 0.9375 c 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 z m -4.3652,8.4375002 c 0.3515,1.7284998 1.6992,3.0761998 3.4277,3.4276998 V 11.25 c 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 0.498,0 0.9375,0.4395 0.9375,0.9375 v 0.6152 C 10.1367,11.5137 11.4844,10.166 11.8359,8.4375002 H 11.25 c -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 h 0.5859 c -0.3515,-1.6992 -1.6992,-3.0469 -3.3983998,-3.3984 v 0.5859 c 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 v -0.5859 c -1.7285,0.3515 -3.0762,1.6992 -3.4277,3.3984 h 0.6152 c 0.498,0 0.9375,0.4395 0.9375,0.9375 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 z m 4.3652,0 c -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 0.498,0 0.9375,0.4395 0.9375,0.9375 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 z"
      fill="#5ca7ff"
      id="path2" />

client/public/themes/olympus/images/buttons/emissions/defend.svg

@@ -39,5 +39,6 @@
   <path 
      d="m 7.0324294,0 c 0.1172,0 0.2637,0.0293 0.3809,0.0879 l 5.5077996,2.3437 c 0.6445,0.293 1.1425,0.9082 1.1425,1.67 -0.0292,2.9296 -1.2304,8.2324 -6.2694996,10.664 -0.498,0.2344 -1.0547,0.2344 -1.5527,0 -5.0391,-2.4316 -6.24020004,-7.7344 -6.24020004,-10.664 -0.0293,-0.7618 0.4687,-1.377 1.11320004,-1.67 l 5.5078,-2.3437 C 6.7394294,0.0293 6.8859294,0 7.0324294,0 Z m 0,1.9629 V 13.0371 C 11.075429,11.0742 12.159429,6.7676 12.188629,4.1602 Z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/emissions/free.svg

@@ -39,5 +39,6 @@
   <path 
      d="m 10.796771,3.75 c 0,1.31836 -0.7618,2.46094 -1.8750496,3.13476 v 0.61525 c 0,0.5273 -0.43945,0.9375 -0.9375,0.9375 h -2.8125 c -0.52734,0 -0.9375,-0.4102 -0.9375,-0.9375 V 6.88476 c -1.14258,-0.67382 -1.875,-1.8164 -1.875,-3.13476 0,-2.05078 1.875,-3.75 4.21875,-3.75 2.31445,0 4.2187996,1.69922 4.2187996,3.75 z M 4.9373514,5.15625 c 0.49804,0 0.9375,-0.41016 0.9375,-0.9375 0,-0.49805 -0.43946,-0.9375 -0.9375,-0.9375 -0.52735,0 -0.9375,0.43945 -0.9375,0.9375 0,0.52734 0.41015,0.9375 0.9375,0.9375 z m 4.21872,-0.9375 c 0,-0.49805 -0.43943,-0.9375 -0.93748,-0.9375 -0.52734,0 -0.9375,0.43945 -0.9375,0.9375 0,0.52734 0.41016,0.9375 0.9375,0.9375 0.49805,0 0.93748,-0.41016 0.93748,-0.9375 z M 0.10336144,8.02731 c 0.23438,-0.4687 0.79102,-0.6445 1.25976996,-0.4101 l 5.21484,2.6074 5.1854996,-2.6074 c 0.4688,-0.2344 1.0254,-0.0586 1.2598,0.4101 0.2344,0.4688 0.0586,1.0254 -0.4101,1.2598 l -3.9551196,1.9629 3.9551196,1.9922 c 0.4687,0.2344 0.6445,0.791 0.4101,1.2597 -0.2344,0.4688 -0.791,0.6446 -1.2598,0.4102 l -5.1854996,-2.6074 -5.21484,2.6074 c -0.46874996,0.2344 -1.02538996,0.0586 -1.25976996,-0.4102 -0.234374,-0.4687 -0.058593,-1.0253 0.41016,-1.2597 L 4.4685914,11.25001 0.51352144,9.28711 c -0.468753,-0.2344 -0.644534,-0.791 -0.41016,-1.2598 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/emissions/silent.svg

@@ -39,5 +39,6 @@
   <path 
      d="m 9.103975,1.603975 c 0.3809,-0.3515 0.3809,-0.9668 0,-1.3183 -0.3515,-0.3809 -0.9668,-0.3809 -1.3183,0 l -3.0762,3.0761 -3.1055,-3.0761 c -0.3515,-0.3809 -0.9668,-0.3809 -1.3183,0 -0.3809,0.3515 -0.3809,0.9668 0,1.3183 l 3.0761,3.0762 -3.0761,3.1055 c -0.3809,0.3515 -0.3809,0.9668 0,1.3183 0.3515,0.3809 0.9668,0.3809 1.3183,0 l 3.1055,-3.0761 3.0762,3.0761 c 0.3515,0.3809 0.9668,0.3809 1.3183,0 0.3809,-0.3515 0.3809,-0.9668 0,-1.3183 l -3.0761,-3.1055 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/intensity/1.svg

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="1.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="30px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="16.808938"
+     inkscape:cx="4.2536893"
+     inkscape:cy="-1.2195892"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <rect
+     style="stroke-width:0.659;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers;fill-opacity:1"
+     fill="#5ca7ff"
+	 stroke="#5ca7ff"
+	 id="rect1107"
+     width="2.8299551"
+     height="3.9513376"
+     x="1.7056587"
+     y="9.5718069" />
+  <rect
+     style="fill:none;stroke-width:0.659001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     fill="#5ca7ff"
+	 stroke="#5ca7ff"
+	 id="rect1107-7"
+     width="2.8299551"
+     height="7.6993432"
+     x="6.0053182"
+     y="5.817802" />
+  <rect
+     style="fill:none;stroke-width:0.659001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     fill="#5ca7ff"
+	 stroke="#5ca7ff"
+	 id="rect1107-9"
+     width="2.8299551"
+     height="11.89354"
+     x="10.304977"
+     y="1.7128451" />
+</svg>

client/public/themes/olympus/images/buttons/intensity/2.svg

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="2.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="30px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="16.808938"
+     inkscape:cx="4.2536893"
+     inkscape:cy="-1.2195892"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <rect
+     style="stroke-width:0.659;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers;fill-opacity:1"
+     fill="#5ca7ff"
+	 stroke="#5ca7ff"
+	 id="rect1107"
+     width="2.8299551"
+     height="3.9513376"
+     x="1.7056587"
+     y="9.5718069" />
+  <rect
+     style="stroke-width:0.659001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers;fill-opacity:1"
+     fill="#5ca7ff"
+	 stroke="#5ca7ff"
+	 id="rect1107-7"
+     width="2.8299551"
+     height="7.6993432"
+     x="6.0053182"
+     y="5.817802" />
+  <rect
+     style="fill:none;stroke-width:0.659001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     fill="#5ca7ff"
+	 stroke="#5ca7ff"
+	 id="rect1107-9"
+     width="2.8299551"
+     height="11.89354"
+     x="10.304977"
+     y="1.7128451" />
+</svg>

client/public/themes/olympus/images/buttons/intensity/3.svg

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="15"
+   height="15"
+   fill="none"
+   version="1.1"
+   viewBox="0 0 15 15"
+   id="svg8"
+   sodipodi:docname="3.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="55.466667"
+     inkscape:cx="7.4909856"
+     inkscape:cy="7.4909856"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <rect
+     x="1.7057"
+     y="9.5718"
+     width="2.83"
+     height="3.9513"
+     style="paint-order:stroke fill markers;stroke-dashoffset:5.6;stroke-linecap:round;stroke-linejoin:bevel;stroke-width:.659;"
+     id="rect2"
+	 fill="#5ca7ff"
+	 stroke="#5ca7ff" />
+  <rect
+     x="6.0053"
+     y="5.8178"
+     width="2.83"
+     height="7.6993"
+     style="paint-order:stroke fill markers;stroke-dashoffset:5.6;stroke-linecap:round;stroke-linejoin:bevel;stroke-width:.659;"
+     id="rect4"
+	 fill="#5ca7ff"
+	 stroke="#5ca7ff"	 />
+  <rect
+     x="10.305"
+     y="1.7128"
+     width="2.83"
+     height="11.894"
+     style="paint-order:stroke fill markers;stroke-dashoffset:5.6;stroke-linecap:round;stroke-linejoin:bevel;stroke-width:.659;"
+     id="rect6"
+	 fill="#5ca7ff"
+	 stroke="#5ca7ff"	 />
+</svg>

client/public/themes/olympus/images/buttons/other/lock-open-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M352 144c0-44.2 35.8-80 80-80s80 35.8 80 80v48c0 17.7 14.3 32 32 32s32-14.3 32-32V144C576 64.5 511.5 0 432 0S288 64.5 288 144v48H64c-35.3 0-64 28.7-64 64V448c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V256c0-35.3-28.7-64-64-64H352V144z"/></svg>

client/public/themes/olympus/images/buttons/other/lock-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M144 144v48H304V144c0-44.2-35.8-80-80-80s-80 35.8-80 80zM80 192V144C80 64.5 144.5 0 224 0s144 64.5 144 144v48h16c35.3 0 64 28.7 64 64V448c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V256c0-35.3 28.7-64 64-64H80z"/></svg>

client/public/themes/olympus/images/buttons/roe/designated.svg

@@ -40,5 +40,6 @@
   <path 
      d="m 7.5000002,0 c 0.498,0 0.9375,0.4395 0.9375,0.9375 V 1.2598 C 11.1621,1.6699 13.3301,3.8379002 13.7402,6.5625002 h 0.3223 c 0.498,0 0.9375,0.4395 0.9375,0.9375 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 H 13.7402 C 13.3301,11.1914 11.1621,13.3594 8.4375002,13.7695 v 0.293 c 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 v -0.293 C 3.8086002,13.3594 1.6406,11.1914 1.2305,8.4375002 h -0.293 c -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 h 0.293 C 1.6406,3.8379002 3.8086002,1.6699 6.5625002,1.2598 V 0.9375 c 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 z m -4.3652,8.4375002 c 0.3515,1.7284998 1.6992,3.0761998 3.4277,3.4276998 V 11.25 c 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 0.498,0 0.9375,0.4395 0.9375,0.9375 v 0.6152 C 10.1367,11.5137 11.4844,10.166 11.8359,8.4375002 H 11.25 c -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 h 0.5859 c -0.3515,-1.6992 -1.6992,-3.0469 -3.3983998,-3.3984 v 0.5859 c 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 v -0.5859 c -1.7285,0.3515 -3.0762,1.6992 -3.4277,3.3984 h 0.6152 c 0.498,0 0.9375,0.4395 0.9375,0.9375 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 z m 4.3652,0 c -0.5273,0 -0.9375,-0.4102 -0.9375,-0.9375 0,-0.498 0.4102,-0.9375 0.9375,-0.9375 0.498,0 0.9375,0.4395 0.9375,0.9375 0,0.5273 -0.4395,0.9375 -0.9375,0.9375 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/roe/free.svg

@@ -39,5 +39,6 @@
   <path 
      d="m 10.796771,3.75 c 0,1.31836 -0.7618,2.46094 -1.8750496,3.13476 v 0.61525 c 0,0.5273 -0.43945,0.9375 -0.9375,0.9375 h -2.8125 c -0.52734,0 -0.9375,-0.4102 -0.9375,-0.9375 V 6.88476 c -1.14258,-0.67382 -1.875,-1.8164 -1.875,-3.13476 0,-2.05078 1.875,-3.75 4.21875,-3.75 2.31445,0 4.2187996,1.69922 4.2187996,3.75 z M 4.9373514,5.15625 c 0.49804,0 0.9375,-0.41016 0.9375,-0.9375 0,-0.49805 -0.43946,-0.9375 -0.9375,-0.9375 -0.52735,0 -0.9375,0.43945 -0.9375,0.9375 0,0.52734 0.41015,0.9375 0.9375,0.9375 z m 4.21872,-0.9375 c 0,-0.49805 -0.43943,-0.9375 -0.93748,-0.9375 -0.52734,0 -0.9375,0.43945 -0.9375,0.9375 0,0.52734 0.41016,0.9375 0.9375,0.9375 0.49805,0 0.93748,-0.41016 0.93748,-0.9375 z M 0.10336144,8.02731 c 0.23438,-0.4687 0.79102,-0.6445 1.25976996,-0.4101 l 5.21484,2.6074 5.1854996,-2.6074 c 0.4688,-0.2344 1.0254,-0.0586 1.2598,0.4101 0.2344,0.4688 0.0586,1.0254 -0.4101,1.2598 l -3.9551196,1.9629 3.9551196,1.9922 c 0.4687,0.2344 0.6445,0.791 0.4101,1.2597 -0.2344,0.4688 -0.791,0.6446 -1.2598,0.4102 l -5.1854996,-2.6074 -5.21484,2.6074 c -0.46874996,0.2344 -1.02538996,0.0586 -1.25976996,-0.4102 -0.234374,-0.4687 -0.058593,-1.0253 0.41016,-1.2597 L 4.4685914,11.25001 0.51352144,9.28711 c -0.468753,-0.2344 -0.644534,-0.791 -0.41016,-1.2598 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/roe/hold.svg

@@ -39,5 +39,6 @@
   <path 
      d="m 9.103975,1.603975 c 0.3809,-0.3515 0.3809,-0.9668 0,-1.3183 -0.3515,-0.3809 -0.9668,-0.3809 -1.3183,0 l -3.0762,3.0761 -3.1055,-3.0761 c -0.3515,-0.3809 -0.9668,-0.3809 -1.3183,0 -0.3809,0.3515 -0.3809,0.9668 0,1.3183 l 3.0761,3.0762 -3.0761,3.1055 c -0.3809,0.3515 -0.3809,0.9668 0,1.3183 0.3515,0.3809 0.9668,0.3809 1.3183,0 l 3.1055,-3.0761 3.0762,3.0761 c 0.3515,0.3809 0.9668,0.3809 1.3183,0 0.3809,-0.3515 0.3809,-0.9668 0,-1.3183 l -3.0761,-3.1055 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/roe/return.svg

@@ -39,5 +39,6 @@
   <path 
      d="m 7.0324294,0 c 0.1172,0 0.2637,0.0293 0.3809,0.0879 l 5.5077996,2.3437 c 0.6445,0.293 1.1425,0.9082 1.1425,1.67 -0.0292,2.9296 -1.2304,8.2324 -6.2694996,10.664 -0.498,0.2344 -1.0547,0.2344 -1.5527,0 -5.0391,-2.4316 -6.24020004,-7.7344 -6.24020004,-10.664 -0.0293,-0.7618 0.4687,-1.377 1.11320004,-1.67 l 5.5078,-2.3437 C 6.7394294,0.0293 6.8859294,0 7.0324294,0 Z m 0,1.9629 V 13.0371 C 11.075429,11.0742 12.159429,6.7676 12.188629,4.1602 Z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/scatter/1.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="1.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="30px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="23.771428"
+     inkscape:cx="2.6712741"
+     inkscape:cy="12.283654"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <path
+     style="opacity:1;fill:none;stroke-width:2.13035;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;stroke-dashoffset:0"
+     id="path940"
+     sodipodi:type="arc"
+     sodipodi:cx="7.614182"
+     sodipodi:cy="12.730443"
+     sodipodi:rx="11.467682"
+     sodipodi:ry="10.686775"
+     sodipodi:start="4.1887902"
+     sodipodi:end="5.2359878"
+     sodipodi:arc-type="slice"
+     d="m 1.880341,3.4754242 a 11.467682,10.686775 0 0 1 11.467682,2e-7 L 7.614182,12.730443 Z"
+	 fill="#5ca7ff"
+	 stroke="#5ca7ff"	 />
+</svg>

client/public/themes/olympus/images/buttons/scatter/2.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="2.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="30px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="23.771428"
+     inkscape:cx="2.6712741"
+     inkscape:cy="12.283654"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <path
+     style="opacity:1;fill:none;stroke-width:2.13035;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path940"
+     sodipodi:type="arc"
+     sodipodi:cx="7.614182"
+     sodipodi:cy="12.730443"
+     sodipodi:rx="11.467682"
+     sodipodi:ry="10.686775"
+     sodipodi:start="4.3633231"
+     sodipodi:end="5.0614548"
+     sodipodi:arc-type="slice"
+     d="m 3.6920035,2.6881593 a 11.467682,10.686775 0 0 1 7.8443565,-2e-7 L 7.614182,12.730443 Z"
+	 fill="#5ca7ff"
+	 stroke="#5ca7ff"	 />
+</svg>

client/public/themes/olympus/images/buttons/scatter/3.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="3.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="30px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="23.771428"
+     inkscape:cx="2.6712741"
+     inkscape:cy="12.283654"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <path
+     style="opacity:1;fill:none;stroke-width:2.13035;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path940"
+     sodipodi:type="arc"
+     sodipodi:cx="7.614182"
+     sodipodi:cy="12.730443"
+     sodipodi:rx="11.467682"
+     sodipodi:ry="10.686775"
+     sodipodi:start="4.5378561"
+     sodipodi:end="4.8869219"
+     sodipodi:arc-type="slice"
+     d="m 5.6228404,2.2060238 a 11.467682,10.686775 0 0 1 3.9826836,10e-8 L 7.614182,12.730443 Z"
+	 fill="#5ca7ff"
+	 stroke="#5ca7ff"	 />
+</svg>

client/public/themes/olympus/images/buttons/threat/evade.svg

@@ -39,7 +39,8 @@
   <path 
      d="m 0.02182384,14.515426 c -0.0453,0.1119 -0.01864,0.2398 0.06662,0.325 0.08526,0.0853 0.21314,0.1119 0.32505,0.0666 l 1.95830996,-0.7833 c 0.15188,-0.0613 0.2891,-0.1505 0.405,-0.2664 l 1.02578,-1.0258 3.03735,0.7993 -0.2504,0.2504 c -0.1772,0.1772 -0.1772,0.4623 0,0.6395 0.1772,0.1772 0.4623,0.1772 0.6394,0 l 0.7461,-0.746 0.4263,-0.4263 0.3197,-0.3198 c 0.1772,-0.1771 0.1772,-0.4622 0,-0.6394 -0.1772,-0.1772 -0.4623,-0.1772 -0.6395,0 l -0.1065,0.1066 -1.9184,-1.9184 0.4356,-0.4356 1.4628,0.0959 c 0.0866,0.0066 0.1718,-0.0253 0.2331,-0.0866 l 0.2132,-0.2130999 c 0.1172,-0.1173 0.1172,-0.3091 0,-0.4263 l -1.2789,-1.2789 -0.8526,0.8526 c -0.1173,0.1172 -0.3091,0.1172 -0.4263,0 -0.1173,-0.1173 -0.1173,-0.3091 0,-0.4263 l 0.8526,-0.8526 -1.2789,-1.2789 c -0.1173,-0.1173 -0.3091,-0.1173 -0.4263,0 l -0.2132,0.2131 c -0.0613,0.0613 -0.0933,0.1465 -0.0866,0.2331 l 0.0959,1.4628 -0.4356,0.4356 -1.91834,-1.9183 0.10657,-0.1066 c 0.17717,-0.1772 0.17717,-0.4623 0,-0.6395 -0.17717,-0.1771 -0.46228,-0.1771 -0.63945,0 l -0.31972,0.3198 -0.4263,0.4263 -0.74602996,0.746 c -0.17717,0.1772 -0.17717,0.4623 0,0.6394 0.17717,0.1772 0.46228,0.1772 0.63944996,0 l 0.25041,-0.2504 0.79936,3.0373999 -1.02578,1.0258 c -0.11590996,0.1159 -0.20516996,0.2531 -0.26644996,0.405 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
   <path 
      d="m 9.0916338,5.3111261 c 2.5638002,-2.3307 8.3905002,-6.43275 11.1873002,-4.19528 3.4961,2.79688 4.1953,9.0895799 -2.7968,16.7808799"
      stroke="#5ca7ff"
@@ -50,13 +51,16 @@
   <path 
      d="m 14.783034,12.805026 -0.1001,0.8985 0.9106,-0.2539 0.0806,0.6152 -0.8301,0.0586 0.5444,0.7251 -0.5542,0.2954 -0.3808,-0.7642 -0.3345,0.7593 -0.5762,-0.2905 0.5396,-0.7251 -0.8252,-0.0635 0.0952,-0.6103 0.8911,0.2539 -0.1001,-0.8985 z"
      fill="#5ca7ff"
-     id="path6" />
+     id="path6" 
+	 style="stroke: none"/>
   <path 
      d="m 13.384534,7.2113261 -0.1001,0.8984 0.9107,-0.2539 0.0805,0.6152 -0.83,0.0586 0.5444,0.7251 -0.5542,0.2954 -0.3809,-0.7641 -0.3344,0.7593 -0.5762,-0.2906 0.5395,-0.7251 -0.8252,-0.0634 0.0953,-0.6104 0.8911,0.2539 -0.1001,-0.8984 z"
      fill="#5ca7ff"
-     id="path8" />
+     id="path8" 
+	 style="stroke: none"/>
   <path 
      d="m 18.977834,7.2113261 -0.1001,0.8984 0.9106,-0.2539 0.0806,0.6152 -0.8301,0.0586 0.5445,0.7251 -0.5542,0.2954 -0.3809,-0.7641 -0.3345,0.7593 -0.5761,-0.2906 0.5395,-0.7251 -0.8252,-0.0634 0.0952,-0.6104 0.8911,0.2539 -0.1001,-0.8984 z"
      fill="#5ca7ff"
-     id="path10" />
+     id="path10" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/threat/manoeuvre.svg

@@ -39,7 +39,8 @@
   <path 
      d="m 0.02182384,14.515426 c -0.0453,0.1119 -0.01864,0.2398 0.06662,0.325 0.08526,0.0853 0.21314,0.1119 0.32505,0.0666 l 1.95830996,-0.7833 c 0.15188,-0.0613 0.2891,-0.1505 0.405,-0.2664 l 1.02578,-1.0258 3.03735,0.7993 -0.2504,0.2504 c -0.1772,0.1772 -0.1772,0.4623 0,0.6395 0.1772,0.1772 0.4623,0.1772 0.6394,0 l 0.7461,-0.746 0.4263,-0.4263 0.3197,-0.3198 c 0.1772,-0.1771 0.1772,-0.4622 0,-0.6394 -0.1772,-0.1772 -0.4623,-0.1772 -0.6395,0 l -0.1065,0.1066 -1.9184,-1.9184 0.4356,-0.4356 1.4628,0.0959 c 0.0866,0.0066 0.1718,-0.0253 0.2331,-0.0866 l 0.2132,-0.2130999 c 0.1172,-0.1173 0.1172,-0.3091 0,-0.4263 l -1.2789,-1.2789 -0.8526,0.8526 c -0.1173,0.1172 -0.3091,0.1172 -0.4263,0 -0.1173,-0.1173 -0.1173,-0.3091 0,-0.4263 l 0.8526,-0.8526 -1.2789,-1.2789 c -0.1173,-0.1173 -0.3091,-0.1173 -0.4263,0 l -0.2132,0.2131 c -0.0613,0.0613 -0.0933,0.1465 -0.0866,0.2331 l 0.0959,1.4628 -0.4356,0.4356 -1.91834,-1.9183 0.10657,-0.1066 c 0.17717,-0.1772 0.17717,-0.4623 0,-0.6395 -0.17717,-0.1771 -0.46228,-0.1771 -0.63945,0 l -0.31972,0.3198 -0.4263,0.4263 -0.74602996,0.746 c -0.17717,0.1772 -0.17717,0.4623 0,0.6394 0.17717,0.1772 0.46228,0.1772 0.63944996,0 l 0.25041,-0.2504 0.79936,3.0373999 -1.02578,1.0258 c -0.11590996,0.1159 -0.20516996,0.2531 -0.26644996,0.405 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
   <path
      d="m 9.0916338,5.3111261 c 2.5638002,-2.3307 8.3905002,-6.43275 11.1873002,-4.19528 3.4961,2.79688 4.1953,9.0895799 -2.7968,16.7808799"
      stroke="#5ca7ff"

client/public/themes/olympus/images/buttons/threat/none.svg

@@ -39,5 +39,6 @@
   <path 
      d="m 9.103975,1.603975 c 0.3809,-0.3515 0.3809,-0.9668 0,-1.3183 -0.3515,-0.3809 -0.9668,-0.3809 -1.3183,0 l -3.0762,3.0761 -3.1055,-3.0761 c -0.3515,-0.3809 -0.9668,-0.3809 -1.3183,0 -0.3809,0.3515 -0.3809,0.9668 0,1.3183 l 3.0761,3.0762 -3.0761,3.1055 c -0.3809,0.3515 -0.3809,0.9668 0,1.3183 0.3515,0.3809 0.9668,0.3809 1.3183,0 l 3.1055,-3.0761 3.0762,3.0761 c 0.3515,0.3809 0.9668,0.3809 1.3183,0 0.3809,-0.3515 0.3809,-0.9668 0,-1.3183 l -3.0761,-3.1055 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/threat/passive.svg

@@ -39,7 +39,8 @@
   <path 
      d="M 0.1977,6.4546 C 0.07745,6.5055 0,6.6237 0,6.7542 0,6.8846 0.07745,7.0028 0.1977,7.0538 l 2.09719,0.8987 c 0.16304,0.0694 0.33629,0.106 0.51361,0.106 h 1.5693 l 1.712,2.9349 H 5.7067 c -0.2711,0 -0.4892,0.2181 -0.4892,0.4891 0,0.2711 0.2181,0.4892 0.4892,0.4892 H 6.848 7.5002 7.9893 c 0.2711,0 0.4892,-0.2181 0.4892,-0.4892 0,-0.271 -0.2181,-0.4891 -0.4892,-0.4891 H 7.8263 V 8.0585 h 0.6664 l 1.0456,1.1923 c 0.0611,0.0713 0.1508,0.1121 0.2445,0.1121 h 0.3261 c 0.1794,0 0.3261,-0.1467 0.3261,-0.3261 V 7.0802 H 9.1306 c -0.1793,0 -0.326,-0.1467 -0.326,-0.326 0,-0.1794 0.1467,-0.3261 0.326,-0.3261 H 10.435 V 4.4715 c 0,-0.1794 -0.1467,-0.3261 -0.3261,-0.3261 H 9.7828 c -0.0937,0 -0.1834,0.0407 -0.2445,0.112 L 8.4927,5.4498 H 7.8263 V 2.5149 h 0.163 c 0.2711,0 0.4892,-0.2181 0.4892,-0.4891 0,-0.2711 -0.2181,-0.4892 -0.4892,-0.4892 H 7.5002 6.848 5.7067 c -0.2711,0 -0.4892,0.2181 -0.4892,0.4892 0,0.271 0.2181,0.4891 0.4892,0.4891 H 6.0898 L 4.3778,5.4498 H 2.8085 c -0.17732,0 -0.35057,0.0367 -0.51361,0.106 z"
      fill="#5ca7ff"
-     id="path2" />
+     id="path2" 
+	 style="stroke: none"/>
   <path 
      d="M 12.8398,6.5498 H 23.2749"
      stroke="#5ca7ff"
@@ -48,17 +49,21 @@
   <path 
      d="m 16.4116,9 -0.1,0.8984 0.9106,-0.2539 0.0806,0.6152 -0.8301,0.0586 0.5444,0.7251 -0.5542,0.2955 L 16.0821,10.5747 15.7476,11.334 15.1714,11.0434 15.711,10.3183 14.8858,10.2549 14.981,9.6445 15.8721,9.8984 15.772,9 Z"
      fill="#5ca7ff"
-     id="path6" />
+     id="path6" 
+	 style="stroke: none"/>
   <path 
      d="m 21.4116,10.6582 -0.1,0.8984 0.9106,-0.2539 0.0806,0.6153 -0.8301,0.0585 0.5444,0.7251 -0.5542,0.2955 -0.3808,-0.7642 -0.3345,0.7593 -0.5762,-0.2906 0.5396,-0.7251 -0.8252,-0.0634 0.0952,-0.6104 0.8911,0.2539 -0.1001,-0.8984 z"
      fill="#5ca7ff"
-     id="path8" />
+     id="path8" 
+	 style="stroke: none"/>
   <path 
      d="m 21.4116,0 -0.1,0.8984 0.9106,-0.2539 0.0806,0.6152 -0.8301,0.0586 0.5444,0.7251 L 21.4629,2.3389 21.0821,1.5747 20.7476,2.334 20.1714,2.0434 20.711,1.3183 19.8858,1.2549 19.981,0.6445 20.8721,0.8984 20.772,0 Z"
      fill="#5ca7ff"
-     id="path10" />
+     id="path10" 
+	 style="stroke: none"/>
   <path 
      d="m 16.4116,1.6582 -0.1,0.8984 0.9106,-0.2539 0.0806,0.6153 -0.8301,0.0585 0.5444,0.7251 L 16.4629,3.9971 16.0821,3.2329 15.7476,3.9922 15.1714,3.7016 15.711,2.9765 14.8858,2.9131 14.981,2.3027 15.8721,2.5566 15.772,1.6582 Z"
      fill="#5ca7ff"
-     id="path12" />
+     id="path12" 
+	 style="stroke: none"/>
 </svg>

client/public/themes/olympus/images/buttons/visibility/circle-dot.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zm0-352a96 96 0 1 1 0 192 96 96 0 1 1 0-192z"/></svg>

client/public/themes/olympus/images/buttons/visibility/flag.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="14" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path d="M64 32C64 14.3 49.7 0 32 0S0 14.3 0 32V64 368 480c0 17.7 14.3 32 32 32s32-14.3 32-32V352l64.3-16.1c41.1-10.3 84.6-5.5 122.5 13.4c44.2 22.1 95.5 24.8 141.7 7.4l34.7-13c12.5-4.7 20.8-16.6 20.8-30V66.1c0-23-24.2-38-44.8-27.7l-9.6 4.8c-46.3 23.2-100.8 23.2-147.1 0c-35.1-17.6-75.4-22-113.5-12.5L64 48V32z"/></svg>

client/public/themes/olympus/images/buttons/visibility/head-side-virus-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path d="M0 224.2C0 100.6 100.2 0 224 0h24c95.2 0 181.2 69.3 197.3 160.2c2.3 13 6.8 25.7 15.1 36l42 52.6c6.2 7.8 9.6 17.4 9.6 27.4c0 24.2-19.6 43.8-43.8 43.8H448v64c0 35.3-28.7 64-64 64H320v32c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32V407.3c0-16.7-6.9-32.5-17.1-45.8C16.6 322.4 0 274.1 0 224.2zM224 64c-8.8 0-16 7.2-16 16c0 33-39.9 49.5-63.2 26.2c-6.2-6.2-16.4-6.2-22.6 0s-6.2 16.4 0 22.6C145.5 152.1 129 192 96 192c-8.8 0-16 7.2-16 16s7.2 16 16 16c33 0 49.5 39.9 26.2 63.2c-6.2 6.2-6.2 16.4 0 22.6s16.4 6.2 22.6 0C168.1 286.5 208 303 208 336c0 8.8 7.2 16 16 16s16-7.2 16-16c0-33 39.9-49.5 63.2-26.2c6.2 6.2 16.4 6.2 22.6 0s6.2-16.4 0-22.6C302.5 263.9 319 224 352 224c8.8 0 16-7.2 16-16s-7.2-16-16-16c-33 0-49.5-39.9-26.2-63.2c6.2-6.2 6.2-16.4 0-22.6s-16.4-6.2-22.6 0C279.9 129.5 240 113 240 80c0-8.8-7.2-16-16-16zm-24 96a24 24 0 1 1 0 48 24 24 0 1 1 0-48zm40 80a16 16 0 1 1 32 0 16 16 0 1 1 -32 0z"/></svg>

client/public/themes/olympus/images/buttons/visibility/shield.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path d="M256 0c4.6 0 9.2 1 13.4 2.9L457.7 82.8c22 9.3 38.4 31 38.3 57.2c-.5 99.2-41.3 280.7-213.6 363.2c-16.7 8-36.1 8-52.8 0C57.3 420.7 16.5 239.2 16 140c-.1-26.2 16.3-47.9 38.3-57.2L242.7 2.9C246.8 1 251.4 0 256 0zm0 66.8V444.8C394 378 431.1 230.1 432 141.4L256 66.8l0 0z"/></svg>

client/public/themes/olympus/images/icons/chevron-down-warning.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="8" viewBox="0 0 14 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.37109 7.37891C6.69922 7.73438 7.27344 7.73438 7.60156 7.37891L12.8516 2.12891C13.207 1.80078 13.207 1.22656 12.8516 0.898438C12.5234 0.542969 11.9492 0.542969 11.6211 0.898438L7 5.51953L2.35156 0.898438C2.02344 0.542969 1.44922 0.542969 1.12109 0.898438C0.765625 1.22656 0.765625 1.80078 1.12109 2.12891L6.37109 7.37891Z" fill="#ff5858"/>
+</svg>

client/public/themes/olympus/images/icons/circle-info-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336h24V272H216c-13.3 0-24-10.7-24-24s10.7-24 24-24h48c13.3 0 24 10.7 24 24v88h8c13.3 0 24 10.7 24 24s-10.7 24-24 24H216c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>

client/public/themes/olympus/images/icons/circle-question-regular.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M464 256A208 208 0 1 0 48 256a208 208 0 1 0 416 0zM0 256a256 256 0 1 1 512 0A256 256 0 1 1 0 256zm169.8-90.7c7.9-22.3 29.1-37.3 52.8-37.3h58.3c34.9 0 63.1 28.3 63.1 63.1c0 22.6-12.1 43.5-31.7 54.8L280 264.4c-.2 13-10.9 23.6-24 23.6c-13.3 0-24-10.7-24-24V250.5c0-8.6 4.6-16.5 12.1-20.8l44.3-25.4c4.7-2.7 7.6-7.7 7.6-13.1c0-8.4-6.8-15.1-15.1-15.1H222.6c-3.4 0-6.4 2.1-7.5 5.3l-.4 1.2c-4.4 12.5-18.2 19-30.6 14.6s-19-18.2-14.6-30.6l.4-1.2zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"/></svg>

client/public/themes/olympus/images/icons/eye-solid.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M288 32c-80.8 0-145.5 36.8-192.6 80.6C48.6 156 17.3 208 2.5 243.7c-3.3 7.9-3.3 16.7 0 24.6C17.3 304 48.6 356 95.4 399.4C142.5 443.2 207.2 480 288 480s145.5-36.8 192.6-80.6c46.8-43.5 78.1-95.4 93-131.1c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C433.5 68.8 368.8 32 288 32zM144 256a144 144 0 1 1 288 0 144 144 0 1 1 -288 0zm144-64c0 35.3-28.7 64-64 64c-7.1 0-13.9-1.2-20.3-3.3c-5.5-1.8-11.9 1.6-11.7 7.4c.3 6.9 1.3 13.8 3.2 20.7c13.7 51.2 66.4 81.6 117.6 67.9s81.6-66.4 67.9-117.6c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="18" viewBox="0 0 576 512"><!--!Font Awesome Free 6.5.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path d="M288 32c-80.8 0-145.5 36.8-192.6 80.6C48.6 156 17.3 208 2.5 243.7c-3.3 7.9-3.3 16.7 0 24.6C17.3 304 48.6 356 95.4 399.4C142.5 443.2 207.2 480 288 480s145.5-36.8 192.6-80.6c46.8-43.5 78.1-95.4 93-131.1c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C433.5 68.8 368.8 32 288 32zM144 256a144 144 0 1 1 288 0 144 144 0 1 1 -288 0zm144-64c0 35.3-28.7 64-64 64c-7.1 0-13.9-1.2-20.3-3.3c-5.5-1.8-11.9 1.6-11.7 7.4c.3 6.9 1.3 13.8 3.2 20.7c13.7 51.2 66.4 81.6 117.6 67.9s81.6-66.4 67.9-117.6c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3z"/></svg>

client/public/themes/olympus/images/icons/fire-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M159.3 5.4c7.8-7.3 19.9-7.2 27.7 .1c27.6 25.9 53.5 53.8 77.7 84c11-14.4 23.5-30.1 37-42.9c7.9-7.4 20.1-7.4 28 .1c34.6 33 63.9 76.6 84.5 118c20.3 40.8 33.8 82.5 33.8 111.9C448 404.2 348.2 512 224 512C98.4 512 0 404.1 0 276.5c0-38.4 17.8-85.3 45.4-131.7C73.3 97.7 112.7 48.6 159.3 5.4zM225.7 416c25.3 0 47.7-7 68.8-21c42.1-29.4 53.4-88.2 28.1-134.4c-4.5-9-16-9.6-22.5-2l-25.2 29.3c-6.6 7.6-18.5 7.4-24.7-.5c-16.5-21-46-58.5-62.8-79.8c-6.3-8-18.3-8.1-24.7-.1c-33.8 42.5-50.8 69.3-50.8 99.4C112 375.4 162.6 416 225.7 416z"/></svg>

client/public/themes/olympus/images/icons/gamepad-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M192 64C86 64 0 150 0 256S86 448 192 448H448c106 0 192-86 192-192s-86-192-192-192H192zM496 168a40 40 0 1 1 0 80 40 40 0 1 1 0-80zM392 304a40 40 0 1 1 80 0 40 40 0 1 1 -80 0zM168 200c0-13.3 10.7-24 24-24s24 10.7 24 24v32h32c13.3 0 24 10.7 24 24s-10.7 24-24 24H216v32c0 13.3-10.7 24-24 24s-24-10.7-24-24V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h32V200z"/></svg>

client/public/themes/olympus/images/icons/health.svg

@@ -0,0 +1,4 @@
+<svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="3" y1="4.37115e-08" x2="3" y2="6.00083" stroke="white" stroke-width="2"/>
+<line x1="6" y1="3" y2="3" stroke="white" stroke-width="2"/>
+</svg>

client/public/themes/olympus/images/icons/keyboard-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M64 64C28.7 64 0 92.7 0 128V384c0 35.3 28.7 64 64 64H512c35.3 0 64-28.7 64-64V128c0-35.3-28.7-64-64-64H64zm16 64h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V144c0-8.8 7.2-16 16-16zM64 240c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V240zm16 80h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V336c0-8.8 7.2-16 16-16zm80-176c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H176c-8.8 0-16-7.2-16-16V144zm16 80h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H176c-8.8 0-16-7.2-16-16V240c0-8.8 7.2-16 16-16zM160 336c0-8.8 7.2-16 16-16H400c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H176c-8.8 0-16-7.2-16-16V336zM272 128h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H272c-8.8 0-16-7.2-16-16V144c0-8.8 7.2-16 16-16zM256 240c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H272c-8.8 0-16-7.2-16-16V240zM368 128h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H368c-8.8 0-16-7.2-16-16V144c0-8.8 7.2-16 16-16zM352 240c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H368c-8.8 0-16-7.2-16-16V240zM464 128h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H464c-8.8 0-16-7.2-16-16V144c0-8.8 7.2-16 16-16zM448 240c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H464c-8.8 0-16-7.2-16-16V240zm16 80h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H464c-8.8 0-16-7.2-16-16V336c0-8.8 7.2-16 16-16z"/></svg>

client/public/themes/olympus/images/icons/napalm.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 576 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="napalm.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.1490485"
+     inkscape:cx="251.94759"
+     inkscape:cy="244.11502"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+  <path
+     d="m 64,448 v 0 h 448 v 0 h 32 c 17.7,0 32,14.3 32,32 0,17.7 -14.3,32 -32,32 H 32 C 14.3,512 0,497.7 0,480 0,462.3 14.3,448 32,448 Z"
+     id="path2"
+     sodipodi:nodetypes="ccccssssssc" />
+  <path
+     d="m 233.26314,56.434762 c 5.55746,-5.201213 14.17865,-5.129964 19.73611,0.07125 19.66487,18.453622 38.11849,38.332232 55.36087,59.849578 7.83744,-10.25993 16.74363,-21.446096 26.36232,-30.566036 5.62871,-5.27246 14.32115,-5.27246 19.94986,0.0713 24.65233,23.512336 45.52843,54.577126 60.20583,84.074416 14.46365,29.0698 24.08233,58.78084 24.08233,79.7282 0,90.91437 -71.107,167.72133 -159.59889,167.72133 -89.48938,0 -159.59889,-76.87821 -159.59889,-167.79258 0,-27.35981 12.68241,-60.77583 32.34727,-93.8356 19.87862,-33.55852 47.95092,-68.542026 81.15319,-99.321808 z m 47.30967,292.550468 c 18.02613,0 33.98602,-4.98747 49.01966,-14.9624 29.99604,-20.94735 38.04724,-62.84206 20.02111,-95.75933 -3.20623,-6.41246 -11.39992,-6.83996 -16.03114,-1.42499 l -17.95487,20.8761 c -4.70247,5.41496 -13.18116,5.27247 -17.59863,-0.35625 -11.75617,-14.96239 -32.77477,-41.68096 -44.74469,-56.8571 -4.48872,-5.69996 -13.03866,-5.77121 -17.59863,-0.0713 -24.08233,30.28104 -36.19474,49.37591 -36.19474,70.82201 0.0712,48.80591 36.1235,77.73321 81.08193,77.73321 z"
+     id="path1209"
+     style="stroke-width:1" />
+</svg>

client/public/themes/olympus/images/icons/person-military-pointing-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M246.9 14.1C234 15.2 224 26 224 39c0 13.8 11.2 25 25 25H400c8.8 0 16-7.2 16-16V17.4C416 8 408 .7 398.7 1.4L246.9 14.1zM240 112c0 44.2 35.8 80 80 80s80-35.8 80-80c0-5.5-.6-10.8-1.6-16H241.6c-1 5.2-1.6 10.5-1.6 16zM72 224c-22.1 0-40 17.9-40 40s17.9 40 40 40H224v89.4L386.8 230.5c-13.3-4.3-27.3-6.5-41.6-6.5H240 72zm345.7 20.9L246.6 416H416V369.7l53.6 90.6c11.2 19 35.8 25.3 54.8 14.1s25.3-35.8 14.1-54.8L462.3 290.8c-11.2-18.9-26.6-34.5-44.6-45.9zM224 448v32c0 17.7 14.3 32 32 32H384c17.7 0 32-14.3 32-32V448H224z"/></svg>

client/public/themes/olympus/images/icons/secondaries.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 576 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="secondaries.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.1490485"
+     inkscape:cx="228.44988"
+     inkscape:cy="281.53728"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+  <path
+     d="m 64,448 v 0 h 448 v 0 h 32 c 17.7,0 32,14.3 32,32 0,17.7 -14.3,32 -32,32 H 32 C 14.3,512 0,497.7 0,480 0,462.3 14.3,448 32,448 Z"
+     id="path2"
+     sodipodi:nodetypes="ccccssssssc" />
+  <path
+     d="m 278.72676,199.54168 c 3.72808,-5.9538 11.40681,-8.06823 17.63883,-4.72965 6.23202,3.33858 8.79159,10.85038 5.89816,17.24933 l -76.28657,169.59989 c 1.22415,1.27979 2.39265,2.61522 3.50551,3.95065 l 54.08501,-30.43672 c 5.84251,-3.28294 13.13175,-1.72494 17.19369,3.56115 4.06194,5.28608 3.50551,12.79789 -1.22415,17.52755 l -48.40942,48.40941 h -39.78475 c -7.34487,-20.75484 -27.09814,-35.61152 -50.35692,-35.61152 -23.25878,0 -43.06769,14.85668 -50.35692,35.61152 H 66.281757 l -42.01048,-29.04565 c -5.39737,-3.72808 -7.28923,-10.90603 -4.39579,-16.85983 2.89343,-5.9538 9.68188,-8.84724 15.96954,-6.89973 l 54.085,16.91547 c 1.66929,-2.17007 3.39422,-4.28451 5.23044,-6.28766 l -34.66559,-57.75744 c -3.39422,-5.61994 -2.17008,-12.85353 2.8378,-17.0824 5.00787,-4.22887 12.35274,-4.17323 17.30497,0.0556 l 56.978443,48.9102 c 0.83464,-0.22257 1.66929,-0.44514 2.50393,-0.61207 l 7.56745,-79.40257 c 0.66772,-6.84409 6.39895,-12.07453 13.29868,-12.07453 6.89973,0 12.63096,5.23044 13.29868,12.07453 l 7.51181,78.95743 z m -117.74061,-6.28766 c 7.40052,0 13.35432,5.9538 13.35432,13.35432 v 26.70865 c 0,7.40052 -5.9538,13.35432 -13.35432,13.35432 -7.40052,0 -13.35432,-5.9538 -13.35432,-13.35432 v -26.70865 c 0,-7.40052 5.9538,-13.35432 13.35432,-13.35432 z"
+     id="path850"
+     style="stroke-width:0.999999" />
+  <path
+     d="m 505.67595,141.18773 c 2.83997,-4.53547 8.68946,-6.1462 13.43688,-3.60294 4.74742,2.54326 6.69725,8.26558 4.49309,13.14017 L 465.49246,279.9225 c 0.93253,0.97491 1.82267,1.99221 2.67042,3.00952 l 41.20079,-23.18604 c 4.4507,-2.50087 10.00349,-1.31402 13.09779,2.71281 3.0943,4.02682 2.67042,9.74915 -0.93253,13.35211 l -36.87726,36.87724 h -30.30716 c -5.59516,-15.81059 -20.64278,-27.12809 -38.36082,-27.12809 -17.71803,0 -32.80803,11.3175 -38.36081,27.12809 h -33.78295 l -32.00268,-22.12635 c -4.1116,-2.83997 -5.55278,-8.30798 -3.34862,-12.84345 2.20416,-4.53548 7.37545,-6.73964 12.16526,-5.25607 l 41.20078,12.88584 c 1.27163,-1.65311 2.58565,-3.26385 3.98444,-4.7898 l -26.4075,-43.99838 c -2.58564,-4.28115 -1.65312,-9.79154 2.16177,-13.013 3.81489,-3.22146 9.41006,-3.17908 13.18256,0.0423 l 43.40494,37.25874 c 0.63582,-0.16955 1.27163,-0.3391 1.90744,-0.46626 l 5.76473,-60.48717 c 0.50865,-5.21368 4.87458,-9.19811 10.13064,-9.19811 5.25607,0 9.622,3.98443 10.13065,9.19811 l 5.72234,60.14807 z m -89.69226,-4.7898 c 5.63756,0 10.17304,4.53548 10.17304,10.17303 v 20.34608 c 0,5.63755 -4.53548,10.17303 -10.17304,10.17303 -5.63755,0 -10.17303,-4.53548 -10.17303,-10.17303 v -20.34608 c 0,-5.63755 4.53548,-10.17303 10.17303,-10.17303 z"
+     id="path850-7"
+     style="stroke-width:1" />
+  <path
+     d="m 265.48894,18.393218 c 2.4073,-3.844498 7.36562,-5.209832 11.38977,-3.054038 4.02416,2.155794 5.67693,7.006327 3.80858,11.138268 l -49.2599,109.514342 c 0.79046,0.82639 1.54498,1.6887 2.26358,2.55102 l 34.92387,-19.65365 c 3.77263,-2.11987 8.47946,-1.11384 11.10234,2.29951 2.62288,3.41333 2.26358,8.26387 -0.79046,11.31792 L 247.6677,163.7656 h -25.68988 c -4.74274,-13.40185 -17.49786,-22.99514 -32.51656,-22.99514 -15.0187,0 -27.80974,9.59329 -32.51656,22.99514 h -28.63613 l -27.12708,-18.75541 c -3.485195,-2.4073 -4.70681,-7.04226 -2.838453,-10.88676 1.868353,-3.8445 6.251803,-5.71285 10.311883,-4.45531 l 34.92386,10.92269 c 1.07789,-1.40126 2.19172,-2.7666 3.37741,-4.06008 L 124.57186,99.235499 c -2.19172,-3.628918 -1.40127,-8.299804 1.83243,-11.030478 3.23369,-2.730673 7.97643,-2.694745 11.1742,0.0359 l 36.79222,31.582379 c 0.53894,-0.14372 1.07789,-0.28743 1.61684,-0.39522 l 4.88646,-51.271971 c 0.43117,-4.419378 4.13195,-7.796787 8.58725,-7.796787 4.45531,0 8.15609,3.377409 8.58725,7.796787 l 4.85054,50.984531 z m -76.02768,-4.060079 c 4.77868,0 8.62318,3.844499 8.62318,8.623175 v 17.246357 c 0,4.778677 -3.8445,8.623176 -8.62318,8.623176 -4.77868,0 -8.62317,-3.844499 -8.62317,-8.623176 V 22.956314 c 0,-4.778676 3.84449,-8.623175 8.62317,-8.623175 z"
+     id="path850-6"
+     style="stroke-width:0.999997" />
+</svg>