Merge branch 'Fix-Semicolumn-Skill' of https://github.com/WoodyXP/DCSOlympus into Fix-Semicolumn-Skill

.github/workflows/build.yml

@@ -1,44 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  client:
-    name: Client (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        node-version:
-          - 20.x
-        os:
-          - ubuntu-20.04
-          - windows-2019
-        include:
-          - os: ubuntu-20.04
-            script: build-release-linux
-          - os: windows-2019
-            script: build-release
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install dependencies
-        working-directory: client
-        run: npm ci
-
-      - name: Build
-        working-directory: client
-        run: npm run ${{ matrix.script }}

.github/workflows/build_package.yml

@@ -2,7 +2,7 @@ name: Build & package
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-candidate" ]
 
 permissions:
   contents: read
@@ -33,6 +33,6 @@ jobs:
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v3.1.3
       with:
-        name: latest
-        path: installer/Output/*.exe
+        name: development_build_not_a_release
+        path: ./package
       

.github/workflows/documentation.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-node@v2
         
       - name: Install dependencies
-        run: npm ci
+        run: npm install
         working-directory: ./client
 
       - name: Create the docs directory locally in CI

.gitignore

@@ -1,29 +1,33 @@
 bin
 .vs
 x64
-/src/vcpkg_installed
-*.user
 Output
-*.aps
 node_modules
+hgt
+
+/backend/vcpkg_installed
+
 /client/TODO.txt
 /client/public/javascripts/bundle.js
-!client/bin
 /client/public/plugins
 /client/plugins/controltips/index.js
-hgt
 /client/public/databases/units/old
 /client/plugins/databasemanager/index.js
 
 /src/html
 /src/latex
-client/public/stylesheets/leaflet/leaflet-gesture-handling.css
-client/public/javascripts/leaflet.nauticscale.js
-client/public/javascripts/L.Path.Drag.js
-/installer/archive/Scripts
-/installer/archive/Mods
-/installer/installer/DCSOlympus*.exe
+
+/package
+/build
+/DCS Olympus backups
+
+*.user
+*.aps
 
 L.Path.Drag.js
 leaflet-gesture-handling.css
+leaflet.nauticscale.js
+leaflet.css
 package-lock.json
+
+!client/bin

INSTRUCTIONS.txt

@@ -0,0 +1,59 @@
+  _____   _____  _____    ____  _                                 
+ |  __ \ / ____|/ ____|  / __ \| |                                
+ | |  | | |    | (___   | |  | | |_   _ _ __ ___  _ __  _   _ ___ 
+ | |  | | |     \___ \  | |  | | | | | | '_ ` _ \| '_ \| | | / __|
+ | |__| | |____ ____) | | |__| | | |_| | | | | | | |_) | |_| \__ \
+ |_____/ \_____|_____/   \____/|_|\__, |_| |_| |_| .__/ \__,_|___/
+                                   __/ |         | |              
+                                  |___/          |_|              
+
+{{OLYMPUS_VERSION_NUMBER}}
+
+==========================================
+INSTALLATION INSTRUCTIONS
+
+1) Close any applications which may interfere with installation, including Digital Combat Simulator (DCS) and previous versions of Olympus.
+
+2) If you DO NOT have Olympus already installed, SKIP THIS STEP. If you have already installed Olympus, do the following:
+    	NOTE: If you made any changes to your unit databases or mods.lua file (e.g. to support a third party mod) make a backup of the edited files before proceeding or changes will be lost;
+    	a) If you installed DCS Olympus v1.0.3 using the installer, simply remove it using Windows's "Add or remove programs" application. 
+    	b) If you installed DCS Olympus v1.0.3 using the archived version, remove it by deleting the "...<DCS Saved Games folder>\Mods\Services\Olympus" folder. Do this for every DCS instance you installed Olympus in. 
+       	   Remember to delete any shortcuts you created. Don't worry, they will be created automatically again by the installation script provided in this package.
+
+3) Create a folder named "DCS Olympus" in your "Saved Games" directory and extract all the contents of the downloaded archive into it.
+	NOTE:
+    	a) Do not extract the contents of the archive directly in your Saved Games folder or in your DCS Saved Games folder. 
+        b) Unlike previous version of Olympus, it is no longer necessary to copy the archived files into each DCS instance folder.
+
+4) Execute the "installer.bat" script by double-clicking on it. It is located in the folder you created in step 3. Wait for the installation script to complete. Installation may take a couple of minutes, after which the Manager will start automatically.
+	NOTE: depending on your Windows configuration, the script may be called "installer" (without .bat at the end).
+
+5) The Olympus Manager will open. This will allow you to add/remove Olympus to individual DCS instances.
+	Use the Olympus Manager and follow the instructions to install and setup Olympus.
+
+6) Start DCS and run a mission. Make sure it is UNPAUSED.
+
+7) Open Olympus via the shortcut and login using any username and the Game Master password set using the Manager. (NOTE: not your DCS server password).
+	Local installation: run the client from the provided desktop shortcut or start it using the "View and manage instances" page of the Manager. 
+	Dedicated server: users must first start the Olympus server from the provided desktop shortcut or using the "View and manage instances" page of the Manager. 
+			  Then log in using any browser and visiting "http:\\<server IP>:<client port>" (client port is 3000 by default, but can be edited using the Manager)
+
+8) You can use the manager at any time to change the ports and/or passwords. If you do, REMEMBER TO RESTART OLYMPUS AND DCS.
+
+
+NOTES:
+a) when launching the Manager you will be prompted to allow Electron to create a firewall rule. This is optional and can be denied without effect on the operation of the Manager;
+b) if you are using Olympus on a dedicated server with a router, you must enable port forwarding on the client port (3000 by default);
+c) unlike Olympus v1.0.3, running the netsh command is no longer required. It is also no longer required to create firewall rules or port forwarding for the backend port. (Optional) If you already performed this steps in the past you can delete the firewall and netsh rules.
+
+
+==========================================
+UPDATING INSTRUCTIONS
+
+IF YOU ARE UPDATING FROM DCS OLYMPUS v1.0.3, FOLLOW THE "INSTALLATION INSTRUCTIONS".
+
+To update your Olympus installation you have two options:
+a) download the new archive from the GitHub releases page, delete the old unpacked archive folder, then follow the INSTALLATION INSTRUCTIONS;
+b) run the Olympus Manager. If an update is available you will be given the option to automatically update Olympus from there.
+
+For either options a) or b), remember to close any applications which may interfere with installation, including Digital Combat Simulator (DCS) and previous versions of Olympus.

README.md

@@ -23,7 +23,7 @@ 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
+Check the [Wiki](https://github.com/Pax1601/DCSOlympus/wiki) for installation instructions
 
 # Frequently Asked Questions
 ### Can I join up and help out with the project? ###

backend/core/core.rc

@@ -61,7 +61,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
  PRODUCTVERSION 1,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "DCS Olympus"
             VALUE "FileDescription", "DCS Olympus"
-            VALUE "FileVersion", "1.0.3.0"
+            VALUE "FileVersion", "1.0.4.0"
             VALUE "InternalName", "core.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "core.dll"
             VALUE "ProductName", "DCS Olympus"
-            VALUE "ProductVersion", "1.0.3.0"
+            VALUE "ProductVersion", "1.0.4.0"
         END
     END
     BLOCK "VarFileInfo"

backend/core/core.vcxproj

@@ -110,26 +110,26 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>.\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\..\..\bin\</OutDir>
+    <OutDir>.\..\..\build\backend\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -212,4 +212,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

backend/core/include/datatypes.h

@@ -152,6 +152,7 @@ struct SpawnOptions {
 	string unitType;
 	Coords location;
 	string loadout;
+	string skill;
 	string liveryID;
 };
 

backend/core/src/commands.cpp

@@ -46,7 +46,9 @@ string SpawnGroundUnits::getString()
             << "unitType = " << "\"" << spawnOptions[i].unitType << "\"" << ", "
             << "lat = " << spawnOptions[i].location.lat << ", "
             << "lng = " << spawnOptions[i].location.lng << ", "
-            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << " }, ";
+            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
+            << "skill =  \"" << spawnOptions[i].skill << "\"" << "}, ";
+
     }
 
     std::ostringstream commandSS;
@@ -70,7 +72,8 @@ string SpawnNavyUnits::getString()
             << "unitType = " << "\"" << spawnOptions[i].unitType << "\"" << ", "
             << "lat = " << spawnOptions[i].location.lat << ", "
             << "lng = " << spawnOptions[i].location.lng << ", "
-            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << " }, ";
+            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
+            << "skill =  \"" << spawnOptions[i].skill << "\"" << "}, ";
     }
 
     std::ostringstream commandSS;
@@ -95,7 +98,8 @@ string SpawnAircrafts::getString()
             << "lng = " << spawnOptions[i].location.lng << ", "
             << "alt = " << spawnOptions[i].location.alt << ", "
             << "loadout = \"" << spawnOptions[i].loadout << "\"" << ", "
-            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << " }, ";
+            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
+            << "skill =  \"" << spawnOptions[i].skill << "\"" << "}, ";
     }
 
     std::ostringstream commandSS;
@@ -122,7 +126,8 @@ string SpawnHelicopters::getString()
             << "lng = " << spawnOptions[i].location.lng << ", "
             << "alt = " << spawnOptions[i].location.alt << ", "
             << "loadout = \"" << spawnOptions[i].loadout << "\"" << ", "
-            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << " }, ";
+            << "liveryID = " << "\"" << spawnOptions[i].liveryID << "\"" << ", "
+            << "skill =  \"" << spawnOptions[i].skill << "\"" << "}, ";
     }
 
     std::ostringstream commandSS;

backend/core/src/scheduler.cpp

@@ -192,6 +192,7 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		string airbaseName = to_string(value[L"airbaseName"]);
 		string country = to_string(value[L"country"]);
 
+
 		int spawnPoints = value[L"spawnPoints"].as_number().to_int32();
 		if (!checkSpawnPoints(spawnPoints, coalition)) return;
 
@@ -204,9 +205,10 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 			Coords location; location.lat = lat; location.lng = lng; location.alt = alt;
 			string loadout = to_string(unit[L"loadout"]);
 			string liveryID = to_string(unit[L"liveryID"]);
+			string skill = to_string(unit[L"skill"]);
 
-			spawnOptions.push_back({unitType, location, loadout, liveryID});
-			log(username + " spawned a " + coalition + " " + unitType, true);
+			spawnOptions.push_back({unitType, location, loadout, skill, liveryID});
+			log(username + " spawned a " + coalition + " " + unitType , true);
 		}
 
 		if (key.compare("spawnAircrafts") == 0)
@@ -231,8 +233,9 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 			double lng = unit[L"location"][L"lng"].as_double();
 			Coords location; location.lat = lat; location.lng = lng;
 			string liveryID = to_string(unit[L"liveryID"]);
+			string skill = to_string(unit[L"skill"]);
 			
-			spawnOptions.push_back({ unitType, location, "", liveryID });
+			spawnOptions.push_back({ unitType, location, "", skill, liveryID});
 			log(username + " spawned a " + coalition + " " + unitType, true);
 		}
 

backend/dcstools/dcstools.rc

@@ -61,7 +61,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
  PRODUCTVERSION 1,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "DCS Olympus"
             VALUE "FileDescription", "DCS Olympus"
-            VALUE "FileVersion", "1.0.3.0"
+            VALUE "FileVersion", "1.0.4.0"
             VALUE "InternalName", "dcstools.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "dcstools.dll"
             VALUE "ProductName", "DCS Olympus"
-            VALUE "ProductVersion", "1.0.3.0"
+            VALUE "ProductVersion", "1.0.4.0"
         END
     END
     BLOCK "VarFileInfo"

backend/dcstools/dcstools.vcxproj

@@ -77,23 +77,23 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\..\..\bin\</OutDir>
+    <OutDir>.\..\..\build\backend\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -172,4 +172,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

backend/logger/logger.rc

@@ -61,7 +61,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
  PRODUCTVERSION 1,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "DCS Olympus"
             VALUE "FileDescription", "DCS Olympus"
-            VALUE "FileVersion", "1.0.3.0"
+            VALUE "FileVersion", "1.0.4.0"
             VALUE "InternalName", "logger.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "logger.dll"
             VALUE "ProductName", "DCS Olympus"
-            VALUE "ProductVersion", "1.0.3.0"
+            VALUE "ProductVersion", "1.0.4.0"
         END
     END
     BLOCK "VarFileInfo"

backend/logger/logger.vcxproj

@@ -76,23 +76,23 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\..\..\bin\</OutDir>
+    <OutDir>.\..\..\build\backend\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -169,4 +169,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

backend/luatools/luatools.rc

@@ -61,7 +61,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
  PRODUCTVERSION 1,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "DCS Olympus"
             VALUE "FileDescription", "DCS Olympus"
-            VALUE "FileVersion", "1.0.3.0"
+            VALUE "FileVersion", "1.0.4.0"
             VALUE "InternalName", "luatools.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "luatools.dll"
             VALUE "ProductName", "DCS Olympus"
-            VALUE "ProductVersion", "1.0.3.0"
+            VALUE "ProductVersion", "1.0.4.0"
         END
     END
     BLOCK "VarFileInfo"

backend/luatools/luatools.vcxproj

@@ -60,23 +60,23 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\..\..\bin\</OutDir>
+    <OutDir>.\..\..\build\backend\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -173,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

backend/olympus/olympus.rc

@@ -61,7 +61,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
  PRODUCTVERSION 1,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "DCS Olympus"
             VALUE "FileDescription", "DCS Olympus"
-            VALUE "FileVersion", "1.0.3.0"
+            VALUE "FileVersion", "1.0.4.0"
             VALUE "InternalName", "olympus.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "olympus.dll"
             VALUE "ProductName", "DCS Olympus"
-            VALUE "ProductVersion", "1.0.3.0"
+            VALUE "ProductVersion", "1.0.4.0"
         END
     END
     BLOCK "VarFileInfo"

backend/olympus/olympus.vcxproj

@@ -62,11 +62,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\DCSOlympus.props" />
+    <Import Project="..\DCSOlympus.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -75,7 +75,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\..\..\bin\</OutDir>
+    <OutDir>.\..\..\build\backend\bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -127,4 +127,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

backend/utils/utils.rc

@@ -61,7 +61,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
  PRODUCTVERSION 1,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "DCS Olympus"
             VALUE "FileDescription", "DCS Olympus"
-            VALUE "FileVersion", "1.0.3.0"
+            VALUE "FileVersion", "1.0.4.0"
             VALUE "InternalName", "utils.dll"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "utils.dll"
             VALUE "ProductName", "TODO: <Product name>"
-            VALUE "ProductVersion", "1.0.3.0"
+            VALUE "ProductVersion", "1.0.4.0"
         END
     END
     BLOCK "VarFileInfo"

backend/utils/utils.vcxproj

@@ -85,7 +85,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\..\..\bin\</OutDir>
+    <OutDir>.\..\..\build\backend\bin\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>.\..\..\bin\$(Platform)\$(Configuration)\</OutDir>

build.bat

@@ -1,23 +0,0 @@
-call node increase_version.js
-
-cd src
-msbuild olympus.sln /t:Build /p:Configuration=Release
-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 "..\.."
-
-cd..

build_package.bat

@@ -1,2 +1,2 @@
-call build.bat
-call package.bat
+call .\scripts\batch\build.bat
+call .\scripts\batch\package.bat

client/.vscode/launch.json

@@ -7,7 +7,7 @@
         {
             "type": "chrome",
             "request": "launch",
-            "name": "Launch Chrome against localhost",
+            "name": "Launch Chrome",
             "url": "http://localhost:3000",
             "webRoot": "${workspaceFolder}/public/",
             "sourceMapPathOverrides": {
@@ -15,6 +15,18 @@
             },
             "preLaunchTask": "server",
             "port": 9222
+        }, 
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome (No DCS)",
+            "url": "http://localhost:3000",
+            "webRoot": "${workspaceFolder}/public/",
+            "sourceMapPathOverrides": {
+                "src/*": "${workspaceFolder}/src/*"
+            },
+            "preLaunchTask": "server-nodcs",
+            "port": 9222
         }
     ]
 }

client/.vscode/tasks.json

@@ -8,6 +8,12 @@
             "type": "shell",
             "command": "npm run debug",
             "isBackground": true
+        }, 
+        {
+            "label": "server-nodcs",
+            "type": "shell",
+            "command": "npm run debug-nodcs",
+            "isBackground": true
         }
     ]
 }

client/@types/olympus/index.d.ts

@@ -105,6 +105,10 @@ declare module "constants/constants" {
     export const ROEs: string[];
     export const reactionsToThreat: string[];
     export const emissionsCountermeasures: string[];
+    export const ERAS: {
+        name: string;
+        chronologicalOrder: number;
+    }[];
     export const ROEDescriptions: string[];
     export const reactionsToThreatDescriptions: string[];
     export const emissionsCountermeasuresDescriptions: string[];
@@ -416,10 +420,6 @@ declare module "interfaces" {
     global {
         function getOlympusPlugin(): OlympusPlugin;
     }
-    export interface ConfigurationOptions {
-        port: number;
-        address: string;
-    }
     export interface ContextMenuOption {
         tooltip: string;
         src: string;
@@ -653,6 +653,7 @@ declare module "interfaces" {
         coalition: string;
         count: number;
         country: string;
+        skill: string;
         loadout: LoadoutBlueprint | undefined;
         airbase: Airbase | undefined;
         liveryID: string | undefined;
@@ -787,6 +788,14 @@ declare module "other/utils" {
     export function generateUUIDv4(): string;
     export function keyEventWasInInput(event: KeyboardEvent): boolean;
     export function reciprocalHeading(heading: number): number;
+    /**
+     * Prepend numbers to the start of a string
+     *
+     * @param num <number> subject number
+     * @param places <number> places to pad
+     * @param decimal <boolean> whether this is a decimal number or not
+     *
+     * */
     export const zeroAppend: (num: number, places: number, decimal?: boolean) => string;
     export const zeroPad: (num: number, places: number) => string;
     export function similarity(s1: string, s2: string): number;
@@ -832,6 +841,7 @@ declare module "other/utils" {
     }): UnitBlueprint | null;
     export function getMarkerCategoryByName(name: string): "aircraft" | "helicopter" | "groundunit-sam" | "navyunit" | "groundunit-other";
     export function getUnitDatabaseByCategory(category: string): import("unit/databases/aircraftdatabase").AircraftDatabase | import("unit/databases/helicopterdatabase").HelicopterDatabase | import("unit/databases/groundunitdatabase").GroundUnitDatabase | import("unit/databases/navyunitdatabase").NavyUnitDatabase | null;
+    export function getCategoryBlueprintIconSVG(category: string, unitName: string): string | false;
     export function base64ToBytes(base64: string): ArrayBufferLike;
     export function enumToState(state: number): string;
     export function enumToROE(ROE: number): string;
@@ -891,6 +901,7 @@ declare module "controls/unitspawnmenu" {
         getLabelDropdown(): Dropdown;
         getCountDropdown(): Dropdown;
         getLoadoutDropdown(): Dropdown;
+        getSkillDropdown(): Dropdown;
         getCountryDropdown(): Dropdown;
         getLiveryDropdown(): Dropdown;
         getLoadoutPreview(): HTMLDivElement;
@@ -1596,6 +1607,7 @@ declare module "map/map" {
     import { CoalitionAreaContextMenu } from "contextmenus/coalitionareacontextmenu";
     import { AirbaseSpawnContextMenu } from "contextmenus/airbasespawnmenu";
     export type MapMarkerVisibilityControl = {
+        "category"?: string;
         "image": string;
         "isProtected"?: boolean;
         "name": string;
@@ -1993,6 +2005,25 @@ declare module "unit/importexport/unitdatafileexport" {
         showForm(units: Unit[]): void;
     }
 }
+declare module "schemas/schema" {
+    import Ajv from "ajv";
+    import { AnySchemaObject } from "ajv/dist/core";
+    abstract class JSONSchemaValidator {
+        #private;
+        constructor(schema: AnySchemaObject);
+        getAjv(): Ajv;
+        getCompiledValidator(): any;
+        getErrors(): any;
+        getSchema(): AnySchemaObject;
+        validate(data: any): any;
+    }
+    export class AirbasesJSONSchemaValidator extends JSONSchemaValidator {
+        constructor();
+    }
+    export class ImportFileJSONSchemaValidator extends JSONSchemaValidator {
+        constructor();
+    }
+}
 declare module "unit/importexport/unitdatafileimport" {
     import { Dialog } from "dialog/dialog";
     import { UnitDataFile } from "unit/importexport/unitdatafile";
@@ -2421,12 +2452,11 @@ declare module "server/servermanager" {
     export class ServerManager {
         #private;
         constructor();
-        toggleDemoEnabled(): void;
         setCredentials(newUsername: string, newPassword: string): void;
         GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType?: string, force?: boolean): void;
         PUT(request: object, callback: CallableFunction): void;
         getConfig(callback: CallableFunction): void;
-        setAddress(address: string, port: number): void;
+        setAddress(address: string): void;
         getAirbases(callback: CallableFunction): void;
         getBullseye(callback: CallableFunction): void;
         getLogs(callback: CallableFunction, refresh?: boolean): void;

client/bin/demo

@@ -1,3 +1,10 @@
+const yargs = require('yargs');
+var fs = require('fs');
+
+/* Define configuration parameter */
+yargs.alias('c', 'config').describe('c', 'olympus.json config location').string('rp');
+args = yargs.argv;
+
 console.log('\x1b[36m%s\x1b[0m', "*********************************************************************");
 console.log('\x1b[36m%s\x1b[0m', "*  _____   _____  _____    ____  _                                  *");
 console.log('\x1b[36m%s\x1b[0m', "* |  __ \\ / ____|/ ____|  / __ \\| |                                 *");
@@ -10,16 +17,17 @@ 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 DEMO Backend Server starts up...");
+console.log(`Config location: ${args["config"]}`)
 
 var fs = require('fs');
-let rawdata = fs.readFileSync('../olympus.json');
+let rawdata = fs.readFileSync(args["config"]);
 let config = JSON.parse(rawdata);
 
 /**
  * Module dependencies.
  */
 
-var app = require('../demo');
+var app = require('../demo')(args["config"]);
 var debug = require('debug')('client:server');
 var http = require('http');
 

client/bin/www

@@ -26,9 +26,6 @@ if (fs.existsSync(args["config"])) {
 	clientPort = json["client"]["port"];
 } else {
 	console.log("Failed to read config, aborting!");
-
-	/* Wait a bit before closing the window */
-	await new Promise(resolve => setTimeout(resolve, 3000));
 	return;
 }
 

client/configurator.js

@@ -70,16 +70,43 @@ async function run() {
             backendPort = newValue? result: backendPort;
 
             /* Get the new Game Master password */
-            newValue = prompt(`Insert a new Game Master password or press Enter to keep current value: `, {echo: "*"});
-            gameMasterPassword = newValue !== ""? sha256(newValue): gameMasterPassword;
+            while (true) {
+              newValue = prompt(`Insert a new Game Master password or press Enter to keep current value: `, {echo: "*"});
+              gameMasterPassword = newValue !== ""? sha256(newValue): gameMasterPassword;
+
+              // Check if Game Master password is unique
+              if (gameMasterPassword === blueCommanderPassword || gameMasterPassword === redCommanderPassword) {
+                  console.log("Game Master password must be different from other passwords. Please try again.");
+                  continue;
+              }
+              break;
+            }
 
             /* Get the new Blue Commander password */
-            newValue = prompt(`Insert a new Blue Commander password or press Enter to keep current value: `, {echo: "*"});
-            blueCommanderPassword = newValue !== ""? sha256(newValue): blueCommanderPassword;
-            
+            while (true) {
+              newValue = prompt(`Insert a new Blue Commander password or press Enter to keep current value: `, {echo: "*"});
+              blueCommanderPassword = newValue !== ""? sha256(newValue): blueCommanderPassword;
+
+              // Check if Blue Commander password is unique
+              if (blueCommanderPassword === gameMasterPassword || blueCommanderPassword === redCommanderPassword) {
+                  console.log("Blue Commander password must be different from other passwords. Please try again.");
+                  continue;
+              }
+              break;
+            }
+
             /* Get the new Red Commander password */
-            newValue = prompt(`Insert a new Red Commander password or press Enter to keep current value: `, {echo: "*"});
-            redCommanderPassword = newValue !== ""? sha256(newValue): redCommanderPassword;
+            while (true) {
+              newValue = prompt(`Insert a new Red Commander password or press Enter to keep current value: `, {echo: "*"});
+              redCommanderPassword = newValue !== ""? sha256(newValue): redCommanderPassword;
+
+              // Check if Red Commander password is unique
+              if (redCommanderPassword === gameMasterPassword || redCommanderPassword === blueCommanderPassword) {
+                  console.log("Red Commander password must be different from other passwords. Please try again.");
+                  continue;
+              }
+              break;
+            }
         }
 
         /* Apply the inputs */

client/copy.bat

@@ -1,4 +0,0 @@
-xcopy /S /Q /Y /F .\\node_modules\\leaflet\\dist\\leaflet.css .\\public\\stylesheets\\leaflet\\leaflet.css 
-xcopy /S /Q /Y /F .\\node_modules\\leaflet-gesture-handling\\dist\\leaflet-gesture-handling.css .\\public\\stylesheets\\leaflet\\leaflet-gesture-handling.css
-xcopy /S /Q /Y /F .\\node_modules\\leaflet.nauticscale\\dist\\leaflet.nauticscale.js .\\public\\javascripts\\leaflet.nauticscale.js
-xcopy /S /Q /Y /F .\\node_modules\\leaflet-path-drag\\dist\\L.Path.Drag.js .\\public\\javascripts\\L.Path.Drag.js

client/demo.bat

@@ -1 +0,0 @@
-node .\bin\demo

client/install.bat

@@ -1 +0,0 @@
-npm install --omit=dev

client/package.json

@@ -1,18 +1,16 @@
 {
   "name": "DCSOlympus",
-  "node-main": "./bin/www",
   "main": "client.js",
   "version": "{{OLYMPUS_VERSION_NUMBER}}",
   "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-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",
-    "build-release-linux": "browserify ./src/index.ts -o ./public/javascripts/bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && ./copy.sh",
-    "emit-declarations": "tsc --project tsconfig.json --declaration --emitDeclarationOnly --outfile ./@types/olympus/index.d.ts",
-    "copy": "copy.bat",
-    "start": "node ./bin/www",
-    "debug": "npm run copy & concurrently --kill-others \"npm run watch\" \"nodemon --ignore ./public/databases/ ./bin/www -- --config ../moc_dcs/Config/olympus.json\"",
-    "watch": "watchify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]",
+    "build-debug": "call ./scripts/build-debug.bat",
+    "build-release": "call ./scripts/build-release.bat",
+    "emit-declarations": "call ./scripts/emit-declarations.bat",
+    "server": "node ./bin/www",
+    "debug": "call ./scripts/debug.bat",
+    "debug-nodcs": "call ./scripts/debug-nodcs.bat",
+    "watch": "call ./scripts/watch.bat",
     "client": "electron ."
   },
   "dependencies": {
@@ -27,9 +25,7 @@
     "http-proxy-middleware": "^2.0.6",
     "js-sha256": "^0.10.1",
     "morgan": "~1.9.1",
-    "node-hide-console-window": "^2.2.0",
     "open": "^10.0.0",
-    "prompt-sync": "^4.2.0",
     "regedit": "^5.1.2",
     "save": "^2.9.0",
     "sha256": "^0.2.0",
@@ -48,6 +44,7 @@
     "@types/node": "^18.16.1",
     "@types/sortablejs": "^1.15.0",
     "@types/svg-injector": "^0.0.29",
+    "ajv": "^8.12.0",
     "babelify": "^10.0.0",
     "browserify": "^17.0.0",
     "concurrently": "^7.6.0",

client/public/databases/airbases/sinaimap.json

@@ -1037,7 +1037,7 @@
               "01R": {
                 "magHeading": "11",
                 "Heading": "16",
-                "ILS": "109.7"
+                "ILS": "109.70"
               }
             },
             {

client/public/stylesheets/other/contextmenus.css

@@ -8,24 +8,20 @@
     z-index: 9999;
 }
 
-#map-contextmenu>div:nth-child(2) {
-    align-items: center;
+
+
+/* #map-contextmenu>div:nth-child(n+4)>div {
+    width: 100%;
+} */
+
+#map-contextmenu .spawn-mode {
     display: flex;
-    flex-direction: row;
+    flex-direction: column;
     justify-content: space-between;
-    padding-right: 0px;
+    row-gap: 5px;
 }
 
-#map-contextmenu>div:nth-child(3) {
-    align-items: center;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    padding-right: 0px;
-}
-
-#map-contextmenu>div:nth-child(n+4) {
-    align-items: center;
+.ol-context-menu-panel {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -33,10 +29,6 @@
     padding: 20px;
 }
 
-#map-contextmenu>div:nth-child(n+4)>div {
-    width: 100%;
-}
-
 .contextmenu-advanced-options,
 .contextmenu-metadata {
     align-items: center;
@@ -143,20 +135,6 @@
     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;
 }
@@ -187,7 +165,65 @@
     content: " (" attr(data-points) " points)";
 }
 
-.upper-bar svg>* {
+#spawn-mode-tabs {
+    align-items: center;
+    column-gap: 6px;
+    display: flex;
+    position: absolute;
+    right: 0;
+    top:0;
+    translate: -6px -100%;
+    z-index: 9998;
+}
+
+#spawn-mode-tabs button {
+    align-items: center;
+    border-bottom:2px solid transparent;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+    border-top-left-radius: var(--border-radius-sm);
+    border-top-right-radius: var(--border-radius-sm);
+    display: flex;
+    height:32px;
+    justify-content: center;
+    margin:0;
+    width:38px;
+}
+
+#spawn-mode-tabs button:hover {
+    background-color: var(--background-steel);
+}
+
+[data-coalition="blue"] + #spawn-mode-tabs button {
+    border-bottom-color: var(--primary-blue);
+}
+
+
+[data-coalition="red"] + #spawn-mode-tabs button {
+    border-bottom-color: var(--primary-red);
+}
+
+
+[data-coalition="neutral"] + #spawn-mode-tabs button {
+    border-bottom-color: var(--primary-neutral);
+}
+
+#spawn-mode-tabs button svg {
+    height:24px;
+    margin:6px;
+    width:24px;
+}
+
+.upper-bar {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    padding-right: 0px;
+}
+
+.upper-bar svg>*,
+#spawn-mode-tabs button svg * {
     fill: white;
 }
 
@@ -200,24 +236,78 @@
     margin-left: auto;
 }
 
+#spawn-history-menu {
+    align-items: center;
+    flex-direction: column;
+    max-height: 300px;
+    row-gap: 6px;
+}
+
+#spawn-history-menu button {
+    align-items: center;
+    column-gap: 6px;
+    display:flex;
+    height:32px;
+    text-align: left;
+    padding:0;
+    width:100%;
+}
+
+#spawn-history-menu button span {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+#spawn-history-menu button svg {
+    border-radius: var(--border-radius-sm);
+    height:24px;
+    padding:4px;
+    width:24px;
+}
+
+#spawn-history-menu button:hover {
+    background-color: transparent;
+    text-decoration: underline;
+}
+
+#spawn-history-menu button:hover svg * {
+    fill:white !important;
+}
+
+#spawn-history-menu button[data-spawned-coalition="blue"] svg {
+    background-color: var(--primary-blue);
+}
+
+#spawn-history-menu button[data-spawned-coalition="red"] svg {
+    background-color: var(--primary-red);
+}
+
+#spawn-history-menu button[data-spawned-coalition="neutral"] svg {
+    background-color: var(--primary-neutral);
+}
+
 [data-coalition="blue"]#active-coalition-label,
 [data-coalition="blue"].deploy-unit-button,
 [data-coalition="blue"]#spawn-airbase-aircraft-button,
-[data-coalition="blue"].create-iads-button {
+[data-coalition="blue"].create-iads-button,
+[data-coalition="blue"] + #spawn-mode-tabs button.selected {
     background-color: var(--primary-blue)
 }
 
 [data-coalition="red"]#active-coalition-label,
 [data-coalition="red"].deploy-unit-button,
 [data-coalition="red"]#spawn-airbase-aircraft-button,
-[data-coalition="red"].create-iads-button {
+[data-coalition="red"].create-iads-button,
+[data-coalition="red"] + #spawn-mode-tabs button.selected {
     background-color: var(--primary-red)
 }
 
 [data-coalition="neutral"]#active-coalition-label,
 [data-coalition="neutral"].deploy-unit-button,
 [data-coalition="neutral"]#spawn-airbase-aircraft-button,
-[data-coalition="neutral"].create-iads-button {
+[data-coalition="neutral"].create-iads-button,
+[data-coalition="neutral"] + #spawn-mode-tabs button.selected {
     background-color: var(--primary-neutral)
 }
 

client/public/stylesheets/style/style.css

@@ -171,6 +171,10 @@ button svg.fill-coalition[data-coalition="red"] * {
     position: relative;
 }
 
+.ol-select[disabled] {
+    color: var(--ol-dialog-disabled-text-color);
+}
+
 .ol-select>.ol-select-value {
     align-content: center;
     box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
@@ -215,6 +219,10 @@ button svg.fill-coalition[data-coalition="red"] * {
     background-size: 100% 100%;
 }
 
+.ol-select[disabled]:not(.ol-select-image)>.ol-select-value:after {
+    opacity: 15%;
+}
+
 .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;
 }
@@ -1312,6 +1320,11 @@ dl.ol-data-grid dd {
     margin: 4px 0;
 }
 
+
+.ol-dialog label[disabled] {
+    color: var(--ol-dialog-disabled-text-color)
+}
+
 .ol-dialog-content table th {
     background-color: var(--background-grey);
     color:white;
@@ -1383,6 +1396,10 @@ dl.ol-data-grid dd {
     text-align: center;
 }
 
+.ol-text-input input[disabled] {
+    color:var(--ol-dialog-disabled-text-color);
+}
+
 input[type=number] {
     -moz-appearance: textfield;
     appearance: textfield;
@@ -1422,6 +1439,11 @@ input[type=number]::-webkit-outer-spin-button {
     border: 1px solid white;
 }
 
+.ol-button-apply[disabled] {
+    border-color: var(--ol-dialog-disabled-text-color);
+    color:var(--ol-dialog-disabled-text-color);
+}
+
 .ol-button-apply::before {
     content: "\2713";
 }

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="12" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path d="M169.4 470.6c12.5 12.5 32.8 12.5 45.3 0l160-160c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L224 370.8 224 64c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 306.7L54.6 265.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l160 160z"/></svg>

client/public/themes/olympus/images/buttons/other/clock-rotate-left-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="M75 75L41 41C25.9 25.9 0 36.6 0 57.9V168c0 13.3 10.7 24 24 24H134.1c21.4 0 32.1-25.9 17-41l-30.8-30.8C155 85.5 203 64 256 64c106 0 192 86 192 192s-86 192-192 192c-40.8 0-78.6-12.7-109.7-34.4c-14.5-10.1-34.4-6.6-44.6 7.9s-6.6 34.4 7.9 44.6C151.2 495 201.7 512 256 512c141.4 0 256-114.6 256-256S397.4 0 256 0C185.3 0 121.3 28.7 75 75zm181 53c-13.3 0-24 10.7-24 24V256c0 6.4 2.5 12.5 7 17l72 72c9.4 9.4 24.6 9.4 33.9 0s9.4-24.6 0-33.9l-65-65V152c0-13.3-10.7-24-24-24z"/></svg>