Merge pull request #995 from Pax1601/features/v1/unit-coordinates-copy

feat(map): unit coordinates are now copied entirely. Added info poup.

.github/workflows/build_package.yml

@@ -0,0 +1,45 @@
+name: Build & package
+
+on:
+  push:
+    branches: [ "main", "release-candidate" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Setup vcpkg
+      run: |
+        bootstrap-vcpkg
+        vcpkg integrate install
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v2
+        
+    - name: Build
+      working-directory: .
+      run: "./build_package.bat"
+      shell: cmd
+
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v3.1.3
+      with:
+        name: development_build_not_a_release
+        path: ./package
+
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v3.1.3
+      with:
+        name: zip_only_package
+        path: ./zip
+      
+      

.github/workflows/ci.yml

@@ -1,33 +0,0 @@
-# ci.yml file for GitHub Actions
-name: CI
-
-on: [push]
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: write
-  pages: write
-  id-token: write
-
-jobs:
-  build_docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v2
-        
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-
-      - name: Install dependencies
-        run: npm ci
-        working-directory: ./client
-
-      - name: Create the docs directory locally in CI
-        run: npx typedoc --out ../docs/client @types/*.d.ts src/**/*.ts
-        working-directory: ./client
-        
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          folder: docs 

.gitignore

@@ -1,16 +1,42 @@
 bin
-/scripts/old
 .vs
 x64
-core.user
-core.vcxproj.user
-*.user
 Output
 node_modules
-/client/TODO.txt
-/client/public/javascripts/bundle.js
-!client/bin
-/client/public/plugins
-/client/plugins/controltips/index.js
 hgt
-/client/public/databases/units/old
+
+/backend/vcpkg_installed
+
+/frontend/server/TODO.txt
+/frontend/server/public/javascripts/bundle.js
+/frontend/server/public/plugins
+/frontend/server/plugins/controltips/index.js
+/frontend/server/public/databases/units/old
+/frontend/server/plugins/databasemanager/index.js
+
+/src/html
+/src/latex
+
+/package
+/build
+/DCS Olympus backups
+/zip
+
+*.user
+*.aps
+
+L.Path.Drag.js
+leaflet-gesture-handling.css
+leaflet.nauticscale.js
+leaflet.css
+package-lock.json
+
+!frontend/server/bin
+/mock-dcs
+/frontend/setup
+frontend/server/public/plugins/controltipsplugin/index.js
+frontend/website/plugins/controltips/index.js
+/frontend/server/public/maps
+*.pyc
+/scripts/**/*.jpg
+manager/manager.log

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 package into it.
+	NOTE:
+    	a) Do not extract the contents of the package 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 packaged 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>:<frontend port>" (frontend 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 frontend 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 package from the GitHub releases page, delete the old unpacked package 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.

LEGAL.txt

@@ -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
+1. Governing Law
-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.
 
-  To do so, attach the following notices to the program.  It is safest
+  Save where specifically provided for otherwise, the provisions of the 
-to attach them to the start of each source file to most effectively
+GNU General Public Licence Version 3 above shall be governed by and 
-state the exclusion of warranty; and each file should have at least
+interpreted in accordance with English Law and the parties submit to the 
-the "copyright" line and a pointer to where the full notice is found.
+exclusive jurisdiction of the English Courts.
 
-    <one line to give the program's name and a brief idea of what it does.>
+2. Entire Agreement
-    Copyright (C) <year>  <name of author>
 
-    This program is free software: you can redistribute it and/or modify
+  The text of this document contains the entire understanding between
-    it under the terms of the GNU General Public License as published by
+you, the licensee, and the authors and/or copyright holders of the
-    the Free Software Foundation, either version 3 of the License, or
+Software with respect to the subject matter to which it pertains. 
-    (at your option) any later version.
+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,
+3. Unilateral Modification
-    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.
 
-    You should have received a copy of the GNU General Public License
+  The parties agree that the DCS Olympus Team shall have the right to
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+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
-Also add information on how to contact you by electronic and paper mail.
+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 
-  If the program does terminal interaction, make it output a short
+such changes will be published on the DCS Olympus Github Repository located at
-notice like this when it starts in an interactive mode:
+https://github.com/Pax1601/DCSOlympus.
-
-    <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>.

README.md

@@ -1,40 +1,85 @@
-# Important note: DCS Olympus is in alpha state. No official release has been produced yet. The first public version is planned for Q4 2023.
+<img align="left" width="30" src="https://github.com/Pax1601/DCSOlympus/assets/103559271/0ecff279-a87c-4e2d-a4c7-da98c74adf38">
+
+[**Join our Discord**](https://discord.gg/kNAQkhUHnQ)
+
+<img align="left" width="30" src="https://github.com/Pax1601/DCSOlympus/assets/103559271/1c0dd3fd-339c-4b03-94da-3e5215b0358a">
+
+[**YouTube**](https://www.youtube.com/@DCSOlympus)
+
 
 # DCS Olympus
-*A real-time web interface to spawn and control units in DCS World*
-
-![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
+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.
-- 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;
+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. 
-- 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;
+Even better it requires no client mods be installed if used on a server
-- 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.
+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
 
-### Building DCS Olympus
+# Frequently Asked Questions
-DCS Olympus is comprised of two modules:
 
-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):
+### I need troubleshooting guidance, please help? ###
-- cpprestsdk: `vcpkg install cpprestsdk:x64-windows`
+Read through the [Installation Guide](https://github.com/Pax1601/DCSOlympus/wiki) to ensure you have setup Olympus correctly.
-- geographiclib: `vcpkg install geographiclib:x64-windows`
+
-    
+Read through [Setup Troubleshooting](https://github.com/Pax1601/DCSOlympus/wiki/Setup-Troubleshooting) for common issues and solutions.
-    
+
-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:
+Read through the [Olympus User Guide](https://github.com/Pax1601/DCSOlympus/wiki/2.-User-Guide) to learn how to use Olympus.
-- `npm install`
+
-- `npm -g install`
+If you're still having issues after trying the steps above, please post in the ⁠community-support channel with the following:
- 
+
- 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.
+A detailed description of your issue
- 
+Your Olympus log file \user home folder\AppData\Local\Temp\Olympus_log.txt for some it might be in \DCS Saved Games folder\Logs\Olympus_log.txt
-    
+Your DCS log file \DCS Saved Games folder\Logs\dcs.log
-    
+
-    
+Screenshots of any relevant screens or issues and any other pertinent information.
+
+### Can I join up and help out with the project? ###
+Absolutely, join the discord and ping any of the developers to get briefed.
+
+### Can I be a beta/alpha-tester? ###
+Same as above!
+
+### 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
 
     

backend/DCSOlympus.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgAutoLink>true</VcpkgAutoLink>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>

backend/core/core.rc

@@ -0,0 +1,110 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,3,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "DCS Olympus"
+            VALUE "FileDescription", "DCS Olympus"
+            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.4.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United Kingdom) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

backend/core/core.vcxproj

@@ -37,7 +37,6 @@
     <ClInclude Include="include\airunit.h" />
     <ClInclude Include="include\commands.h" />
     <ClInclude Include="include\datatypes.h" />
-    <ClInclude Include="include\measure.h" />
     <ClInclude Include="include\groundunit.h" />
     <ClInclude Include="include\helicopter.h" />
     <ClInclude Include="include\navyunit.h" />
@@ -48,6 +47,7 @@
     <ClInclude Include="include\unitsmanager.h" />
     <ClInclude Include="include\weapon.h" />
     <ClInclude Include="include\weaponsmanager.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\aircraft.cpp" />
@@ -55,7 +55,6 @@
     <ClCompile Include="src\commands.cpp" />
     <ClCompile Include="src\core.cpp" />
     <ClCompile Include="src\datatypes.cpp" />
-    <ClCompile Include="src\measure.cpp" />
     <ClCompile Include="src\groundunit.cpp" />
     <ClCompile Include="src\helicopter.cpp" />
     <ClCompile Include="src\navyunit.cpp" />
@@ -67,6 +66,9 @@
     <ClCompile Include="src\weapon.cpp" />
     <ClCompile Include="src\weaponsmanager.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="core.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -108,22 +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" />
   </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" />
   </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" />
   </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" />
   </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>
@@ -176,6 +182,7 @@
       <EnableUAC>false</EnableUAC>
       <AdditionalDependencies>lua.lib; GeographicLib-i.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\third-party\lua</AdditionalLibraryDirectories>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

backend/core/core.vcxproj.filters

@@ -45,15 +45,13 @@
     <ClInclude Include="include\weapon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\measure.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\datatypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\weaponsmanager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\aircraft.cpp">
@@ -95,9 +93,6 @@
     <ClCompile Include="src\weapon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\measure.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\datatypes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -105,4 +100,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="core.rc" />
+  </ItemGroup>
 </Project>

backend/core/include/aircraft.h

@@ -1,6 +1,8 @@
 #pragma once
 #include "airunit.h"
 
+#define AIRCRAFT_DEST_DIST_THR 2000	// Meters
+
 class Aircraft : public AirUnit
 {
 public:
@@ -11,6 +13,8 @@ public:
 	virtual void changeSpeed(string change);
 	virtual void changeAltitude(string change);
 
+	virtual double getDestinationReachedThreshold() { return AIRCRAFT_DEST_DIST_THR; }
+
 protected:
 	static json::value database;
 };

backend/core/include/airunit.h

@@ -17,6 +17,7 @@ public:
 
 	virtual void changeSpeed(string change) = 0;
 	virtual void changeAltitude(string change) = 0;
+	virtual double getDestinationReachedThreshold() { return AIR_DEST_DIST_THR;  }
 	
 protected:
 	virtual void AIloop();

backend/core/include/commands.h

@@ -113,7 +113,7 @@ class Move : public Command
 {
 public:
 	Move(string groupName, Coords destination, double speed, string speedType, double altitude, 
-		string altitudeType, string taskOptions, string category, function<void(void)> callback = []() {}) :
+		string altitudeType, string taskOptions, string category, bool onRoad, function<void(void)> callback = []() {}) :
 		Command(callback),
 		groupName(groupName),
 		destination(destination),
@@ -122,12 +122,13 @@ public:
 		altitude(altitude),
 		altitudeType(altitudeType),
 		taskOptions(taskOptions),
-		category(category)
+		category(category),
+		onRoad(onRoad)
 	{ 
-		priority = CommandPriority::HIGH; 
+		priority = CommandPriority::MEDIUM; 
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 2; }
+	virtual unsigned int getLoad() { return onRoad? 45: 5; }
 
 private:
 	const string groupName;
@@ -138,6 +139,7 @@ private:
 	const string altitudeType;
 	const string taskOptions;
 	const string category;
+	const bool onRoad;
 };
 
 /* Smoke command */
@@ -173,7 +175,7 @@ public:
 		priority = immediate? CommandPriority::IMMEDIATE: CommandPriority::LOW;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return immediate? 1: 30; }
+	virtual unsigned int getLoad() { return immediate? 5: 30; }
 
 private:
 	const string coalition;
@@ -196,7 +198,7 @@ public:
 		priority = immediate ? CommandPriority::IMMEDIATE : CommandPriority::LOW;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return immediate ? 1 : 30; }
+	virtual unsigned int getLoad() { return immediate ? 5 : 60; }
 
 private:
 	const string coalition;
@@ -220,7 +222,7 @@ public:
 		priority = immediate ? CommandPriority::IMMEDIATE : CommandPriority::LOW;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return immediate ? 1 : 30; }
+	virtual unsigned int getLoad() { return immediate ? 5 : 45; }
 
 private:
 	const string coalition;
@@ -245,7 +247,7 @@ public:
 		priority = immediate ? CommandPriority::IMMEDIATE : CommandPriority::LOW;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return immediate ? 1 : 30; }
+	virtual unsigned int getLoad() { return immediate ? 5 : 45; }
 
 private:
 	const string coalition;
@@ -278,21 +280,23 @@ private:
 class Delete : public Command
 {
 public:
-	Delete(unsigned int ID, bool explosion, bool immediate, function<void(void)> callback = [](){}) :
+	Delete(unsigned int ID, bool explosion, string explosionType, bool immediate, function<void(void)> callback = [](){}) :
 		Command(callback),
 		ID(ID), 
 		explosion(explosion),
+		explosionType(explosionType),
 		immediate(immediate)
 	{
 		priority = CommandPriority::HIGH;
 		immediate = immediate;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return immediate? 1: 5; }
+	virtual unsigned int getLoad() { return immediate? 1: 30; }
 
 private:
 	const unsigned int ID;
 	const bool explosion;
+	const string explosionType;
 	const bool immediate;
 };
 
@@ -308,7 +312,7 @@ public:
 		priority = CommandPriority::MEDIUM;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -326,7 +330,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -344,7 +348,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -377,7 +381,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -399,7 +403,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -410,17 +414,19 @@ private:
 class Explosion : public Command
 {
 public:
-	Explosion(unsigned int intensity, Coords location, function<void(void)> callback = [](){}) :
+	Explosion(unsigned int intensity, string explosionType, Coords location, function<void(void)> callback = [](){}) :
 		Command(callback),
 		location(location),
-		intensity(intensity)
+		intensity(intensity),
+		explosionType(explosionType)
 	{
 		priority = CommandPriority::MEDIUM;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 4; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const Coords location;
 	const unsigned int intensity;
+	const string explosionType;
 };

backend/core/include/datatypes.h

@@ -13,13 +13,17 @@ namespace DataIndex {
 		country,
 		name,
 		unitName,
+		callsign,
 		groupName,
 		state,
 		task,
 		hasTask,
 		position,
 		speed,
+		horizontalVelocity,
+		verticalVelocity,
 		heading,
+		track,
 		isActiveTanker,
 		isActiveAWACS,
 		onOff,
@@ -44,6 +48,9 @@ namespace DataIndex {
 		activePath,
 		isLeader,
 		operateAs,
+		shotsScatter,
+		shotsIntensity,
+		health,
 		lastIndex,
 		endOfData = 255
 	};
@@ -73,6 +80,28 @@ namespace State
 	};
 };
 
+namespace ShotsScatter
+{
+	enum ShotsScatters
+	{
+		NONE = 0,
+		HIGH,
+		MEDIUM,
+		LOW
+	};
+};
+
+namespace ShotsIntensity
+{
+	enum ShotsIntensities
+	{
+		NONE = 0,
+		LOW,
+		MEDIUM,
+		HIGH
+	};
+};
+
 #pragma pack(push, 1)
 namespace DataTypes {
 	struct TACAN
@@ -124,6 +153,7 @@ struct SpawnOptions {
 	string unitType;
 	Coords location;
 	string loadout;
+	string skill;
 	string liveryID;
 };
 

backend/core/include/groundunit.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "unit.h"
 
-#define GROUND_DEST_DIST_THR 100
+#define GROUND_DEST_DIST_THR 10
 
 class GroundUnit : public Unit
 {
@@ -17,6 +17,8 @@ public:
 	virtual void setOnOff(bool newOnOff, bool force = false);
 	virtual void setFollowRoads(bool newFollowRoads, bool force = false);
 
+	void aimAtPoint(Coords aimTarget);
+
 protected:
 	virtual void AIloop();
 	static json::value database;

backend/core/include/helicopter.h

@@ -1,6 +1,8 @@
 #pragma once
 #include "airunit.h"
 
+#define HELICOPTER_DEST_DIST_THR 500	// Meters
+
 class Helicopter : public AirUnit
 {
 public:
@@ -11,6 +13,8 @@ public:
 	virtual void changeSpeed(string change);
 	virtual void changeAltitude(string change);
 
+	virtual double getDestinationReachedThreshold() { return HELICOPTER_DEST_DIST_THR; }
+
 protected:
 	static json::value database;
 };

backend/core/include/scheduler.h

@@ -24,7 +24,7 @@ public:
 	void setEras(vector<string> newEras) { eras = newEras; }
 	void setCommandModeOptions(json::value newOptions);
 
-	int getFrameRate() { return frameRate; };
+	int getFrameRate() { return static_cast<int>(round(frameRate)); };
 	int getLoad();
 	bool getRestrictSpawns() { return restrictSpawns; }
 	bool getRestrictToCoalition() { return restrictToCoalition; }
@@ -37,8 +37,8 @@ public:
 private:
 	list<Command*> commands;
 	list<string> executedCommandsHashes;
-	unsigned int load;
+	unsigned int load = 0;
-	double frameRate;
+	double frameRate = 0;
 	
 	bool restrictSpawns = false;
 	bool restrictToCoalition = false;

backend/core/include/scriptloader.h

@@ -5,7 +5,11 @@
                         function Olympus.protectedCall(...)\n\n \
                             local status, retval = pcall(...)\n \
                             if not status then\n \
-                                trigger.action.outText(\"ERROR: \" ..retval, 20)\n \
+                                if Olympus.log ~= nil then\n \
+                                    Olympus.log:error(retval)\n \
+                                else\n \
+                                    trigger.action.outText(\"Olympus critical error: \" ..retval, 20)\n \
+                                end\n \
                             end\n \
                         end\n \
                         trigger.action.outText(\"Olympus.protectedCall registered successfully\", 10)\n"

backend/core/include/unit.h

@@ -3,7 +3,6 @@
 #include "utils.h"
 #include "dcstools.h"
 #include "luatools.h"
-#include "measure.h"
 #include "logger.h"
 #include "commands.h"
 #include "datatypes.h"
@@ -20,12 +19,12 @@ public:
 	~Unit();
 
 	/********** Methods **********/
-	void initialize(json::value json);
+	virtual void initialize(json::value json) final;
 	virtual void setDefaults(bool force = false);
 
 	void runAILoop();
 
-	void update(json::value json, double dt);
+	virtual void update(json::value json, double dt) final;
 	void refreshLeaderData(unsigned long long time);
 
 	unsigned int getID() { return ID; }
@@ -55,6 +54,8 @@ public:
 	bool checkTaskFailed();
 	void resetTaskFailedCounter();
 	void setHasTaskAssigned(bool newHasTaskAssigned);
+	void setEnableTaskCheckFailed(bool newEnableTaskCheckFailed) { enableTaskFailedCheck = newEnableTaskCheckFailed; }
+	bool getEnableTaskCheckFailed() { return enableTaskFailedCheck; }
 
 	void triggerUpdate(unsigned char datumIndex);
 
@@ -70,13 +71,17 @@ public:
 	virtual void setCountry(unsigned char newValue) { updateValue(country, newValue, DataIndex::country); }
 	virtual void setName(string newValue) { updateValue(name, newValue, DataIndex::name); }
 	virtual void setUnitName(string newValue) { updateValue(unitName, newValue, DataIndex::unitName); }
+	virtual void setCallsign(string newValue) { updateValue(callsign, newValue, DataIndex::callsign); }
 	virtual void setGroupName(string newValue) { updateValue(groupName, newValue, DataIndex::groupName); }
 	virtual void setState(unsigned char newValue) { updateValue(state, newValue, DataIndex::state); };
 	virtual void setTask(string newValue) { updateValue(task, newValue, DataIndex::task); }
-	virtual void setHasTask(bool newValue) { updateValue(hasTask, newValue, DataIndex::hasTask); }
+	virtual void setHasTask(bool newValue);
 	virtual void setPosition(Coords newValue) { updateValue(position, newValue, DataIndex::position); }
 	virtual void setSpeed(double newValue) { updateValue(speed, newValue, DataIndex::speed); }
+	virtual void setHorizontalVelocity(double newValue) { updateValue(horizontalVelocity, newValue, DataIndex::horizontalVelocity); }
+	virtual void setVerticalVelocity(double newValue) { updateValue(verticalVelocity, newValue, DataIndex::verticalVelocity); }
 	virtual void setHeading(double newValue) { updateValue(heading, newValue, DataIndex::heading); }
+	virtual void setTrack(double newValue) { updateValue(track, newValue, DataIndex::track); }
 	virtual void setIsActiveTanker(bool newValue);
 	virtual void setIsActiveAWACS(bool newValue);
 	virtual void setOnOff(bool newValue, bool force = false) { updateValue(onOff, newValue, DataIndex::onOff); };
@@ -101,6 +106,9 @@ public:
 	virtual void setActivePath(list<Coords> newValue);
 	virtual void setIsLeader(bool newValue) { updateValue(isLeader, newValue, DataIndex::isLeader); }
 	virtual void setOperateAs(unsigned char newValue) { updateValue(operateAs, newValue, DataIndex::operateAs); }
+	virtual void setShotsScatter(unsigned char newValue) { updateValue(shotsScatter, newValue, DataIndex::shotsScatter); }
+	virtual void setShotsIntensity(unsigned char newValue) { updateValue(shotsIntensity, newValue, DataIndex::shotsIntensity); }
+	virtual void setHealth(unsigned char newValue) { updateValue(health, newValue, DataIndex::health); }
 
 	/********** Getters **********/
 	virtual string getCategory() { return category; };
@@ -110,6 +118,7 @@ public:
 	virtual unsigned char getCoalition() { return coalition; }
 	virtual unsigned char getCountry() { return country; }
 	virtual string getName() { return name; }
+	virtual string getCallsign() { return callsign; }
 	virtual string getUnitName() { return unitName; }
 	virtual string getGroupName() { return groupName; }
 	virtual unsigned char getState() { return state; }
@@ -117,7 +126,10 @@ public:
 	virtual bool getHasTask() { return hasTask; }
 	virtual Coords getPosition() { return position; }
 	virtual double getSpeed() { return speed; }
+	virtual double getHorizontalVelocity() { return horizontalVelocity; }
+	virtual double getVerticalVelocity() { return verticalVelocity; }
 	virtual double getHeading() { return heading; }
+	virtual double getTrack() { return track; }
 	virtual bool getIsActiveTanker() { return isActiveTanker; }
 	virtual bool getIsActiveAWACS() { return isActiveAWACS; }
 	virtual bool getOnOff() { return onOff; };
@@ -138,10 +150,13 @@ public:
 	virtual DataTypes::Radio getRadio() { return radio; }
 	virtual DataTypes::GeneralSettings getGeneralSettings() { return generalSettings; }
 	virtual vector<DataTypes::Ammo> getAmmo() { return ammo; }
-	virtual vector<DataTypes::Contact> getTargets() { return contacts; }
+	virtual vector<DataTypes::Contact> getContacts() { return contacts; }
 	virtual list<Coords> getActivePath() { return activePath; }
 	virtual bool getIsLeader() { return isLeader; }
 	virtual unsigned char getOperateAs() { return operateAs;  }
+	virtual unsigned char getShotsScatter() { return shotsScatter; }
+	virtual unsigned char getShotsIntensity() { return shotsIntensity; }
+	virtual unsigned char getHealth() { return health; }
 
 protected:
 	unsigned int ID;
@@ -154,13 +169,17 @@ protected:
 	unsigned char country = NULL;
 	string name = "";
 	string unitName = "";
+	string callsign = "";
 	string groupName = "";
 	unsigned char state = State::NONE;
 	string task = "";
 	bool hasTask = false;
 	Coords position = Coords(NULL);
 	double speed = NULL;
+	double horizontalVelocity = NULL;
+	double verticalVelocity = NULL;
 	double heading = NULL;
+	double track = NULL;
 	bool isActiveTanker = false;
 	bool isActiveAWACS = false;
 	bool onOff = true;
@@ -186,20 +205,25 @@ protected:
 	bool isLeader = false;
 	unsigned char operateAs = 2;
 	Coords activeDestination = Coords(NULL);
+	unsigned char shotsScatter = 2;
+	unsigned char shotsIntensity = 2;
+	unsigned char health = 100;
 
 	/********** Other **********/
 	unsigned int taskCheckCounter = 0;
 	unsigned int internalCounter = 0;
+	Unit* missOnPurposeTarget = nullptr;
 	bool hasTaskAssigned = false;
 	double initialFuel = 0;
 	map<unsigned char, unsigned long long> updateTimeMap;
 	unsigned long long lastLoopTime = 0;
+	bool enableTaskFailedCheck = false;
 
 	/********** Private methods **********/
 	virtual void AIloop() = 0;
 
 	void appendString(stringstream& ss, const unsigned char& datumIndex, const string& datumValue) {
-		const unsigned short size = datumValue.size();
+		const unsigned short size = static_cast<unsigned short>(datumValue.size());
 		ss.write((const char*)&datumIndex, sizeof(unsigned char));
 		ss.write((const char*)&size, sizeof(unsigned short));
 		ss << datumValue;
@@ -224,7 +248,7 @@ protected:
 
 	template <typename T>
 	void appendVector(stringstream& ss, const unsigned char& datumIndex, vector<T>& datumValue) {
-		const unsigned short size = datumValue.size();
+		const unsigned short size = static_cast<unsigned short>(datumValue.size());
 		ss.write((const char*)&datumIndex, sizeof(unsigned char));
 		ss.write((const char*)&size, sizeof(unsigned short));
 
@@ -234,7 +258,7 @@ protected:
 
 	template <typename T>
 	void appendList(stringstream& ss, const unsigned char& datumIndex, list<T>& datumValue) {
-		const unsigned short size = datumValue.size();
+		const unsigned short size = static_cast<unsigned short>(datumValue.size());;
 		ss.write((const char*)&datumIndex, sizeof(unsigned char));
 		ss.write((const char*)&size, sizeof(unsigned short));
 

backend/core/include/unitsmanager.h

@@ -20,10 +20,11 @@ public:
 	void update(json::value& missionData, double dt);
 	void runAILoop();
 	void getUnitData(stringstream &ss, unsigned long long time);
-	void deleteUnit(unsigned int ID, bool explosion, bool immediate);
+	void deleteUnit(unsigned int ID, bool explosion, string explosionType, bool immediate);
 	void acquireControl(unsigned int ID);
 	void loadDatabases();
 	Unit* getClosestUnit(Unit* unit, unsigned char coalition, vector<string> categories, double &distance);
+	map<Unit*, double> getUnitsInRange(Unit* unit, unsigned char coalition, vector<string> categories, double range);
 
 private:
 	map<unsigned int, Unit*> units;

backend/core/include/weapon.h

@@ -3,7 +3,6 @@
 #include "utils.h"
 #include "dcstools.h"
 #include "luatools.h"
-#include "measure.h"
 #include "logger.h"
 #include "commands.h"
 #include "datatypes.h"
@@ -60,7 +59,7 @@ protected:
 
 	/********** Private methods **********/
 	void appendString(stringstream& ss, const unsigned char& datumIndex, const string& datumValue) {
-		const unsigned short size = datumValue.size();
+		const unsigned short size = static_cast<unsigned short>(datumValue.size());
 		ss.write((const char*)&datumIndex, sizeof(unsigned char));
 		ss.write((const char*)&size, sizeof(unsigned short));
 		ss << datumValue;

backend/core/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by core.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

backend/core/src/aircraft.cpp

@@ -12,24 +12,18 @@ using namespace GeographicLib;
 extern Scheduler* scheduler;
 extern UnitsManager* unitsManager;
 json::value Aircraft::database = json::value();
+extern string instancePath;
 
 void Aircraft::loadDatabase(string path) {
-	char* buf = nullptr;
+	std::ifstream ifstream(instancePath + path);
-	size_t sz = 0;
+	std::stringstream ss;
-	if (_dupenv_s(&buf, &sz, "DCSOLYMPUS_PATH") == 0 && buf != nullptr)
+	ss << ifstream.rdbuf();
-	{
+	std::error_code errorCode;
-		std::ifstream ifstream(string(buf) + path);
+	database = json::value::parse(ss.str(), errorCode);
-		std::stringstream ss;
+	if (database.is_object())
-		ss << ifstream.rdbuf();
+		log("Aircrafts database loaded correctly from " + instancePath + path);
-		std::error_code errorCode;
+	else
-		database = json::value::parse(ss.str(), errorCode);
+		log("Error reading Aircrafts database file");
-		if (database.is_object())
-			log("Aircrafts database loaded correctly");
-		else
-			log("Error reading Aircrafts database file");
-
-		free(buf);
-	}
 }
 
 /* Aircraft */
@@ -40,7 +34,6 @@ Aircraft::Aircraft(json::value json, unsigned int ID) : AirUnit(json, ID)
 	setCategory("Aircraft");
 	setDesiredSpeed(knotsToMs(300));
 	setDesiredAltitude(ftToM(20000));
-	
 };
 
 void Aircraft::changeSpeed(string change)
@@ -54,11 +47,6 @@ void Aircraft::changeSpeed(string change)
 
 	if (getDesiredSpeed() < knotsToMs(50))
 		setDesiredSpeed(knotsToMs(50));
-
-	if (state == State::IDLE)
-		resetTask();
-	else
-		goToDestination();		/* Send the command to reach the destination */
 }
 
 void Aircraft::changeAltitude(string change)
@@ -75,14 +63,9 @@ void Aircraft::changeAltitude(string change)
 		if (getDesiredAltitude() > 5000)
 			setDesiredAltitude(getDesiredAltitude() + ftToM(2500));
 		else if (getDesiredAltitude() >= 0)
-				setDesiredAltitude(getDesiredAltitude() + ftToM(500));
+			setDesiredAltitude(getDesiredAltitude() + ftToM(500));
 	}
 
 	if (getDesiredAltitude() < 0)
 		setDesiredAltitude(0);
-
-	if (state == State::IDLE)
-		resetTask();
-	else 
-		goToDestination();		/* Send the command to reach the destination */
 }

backend/core/src/airunit.cpp

@@ -40,6 +40,8 @@ void AirUnit::setDefaults(bool force)
 
 void AirUnit::setState(unsigned char newState)
 {
+	Coords currentTargetPosition = getTargetPosition();
+
 	/************ Perform any action required when LEAVING a state ************/
 	if (newState != state) {
 		switch (state) {
@@ -80,15 +82,18 @@ void AirUnit::setState(unsigned char newState)
 	/************ Perform any action required when ENTERING a state ************/
 	switch (newState) {
 	case State::IDLE: {
+		setEnableTaskCheckFailed(false);
 		clearActivePath();
 		resetActiveDestination();
 		break;
 	}
 	case State::REACH_DESTINATION: {
+		setEnableTaskCheckFailed(true);
 		resetActiveDestination();
 		break;
 	}
 	case State::ATTACK: {
+		setEnableTaskCheckFailed(true);
 		if (isTargetAlive()) {
 			Unit* target = unitsManager->getUnit(targetID);
 			Coords targetPosition = Coords(target->getPosition().lat, target->getPosition().lng, 0);
@@ -99,36 +104,34 @@ void AirUnit::setState(unsigned char newState)
 		break;
 	}
 	case State::FOLLOW: {
+		setEnableTaskCheckFailed(true);
 		clearActivePath();
 		resetActiveDestination();
 		break;
 	}
 	case State::LAND: {
+		setEnableTaskCheckFailed(false);
 		resetActiveDestination();
 		break;
 	}
 	case State::REFUEL: {
+		setEnableTaskCheckFailed(true);
 		initialFuel = fuel;
 		clearActivePath();
 		resetActiveDestination();
 		break;
 	}
-	case State::BOMB_POINT: {
+	case State::BOMB_POINT:
-		clearActivePath();
+	case State::CARPET_BOMB:
-		resetActiveDestination();
-		break;
-	}
-	case State::CARPET_BOMB: {
-		clearActivePath();
-		resetActiveDestination();
-		break;
-	}
 	case State::BOMB_BUILDING: {
+		setTargetPosition(currentTargetPosition);
+		setEnableTaskCheckFailed(true);
 		clearActivePath();
 		resetActiveDestination();
 		break;
 	}
 	case State::LAND_AT_POINT:  {
+		setEnableTaskCheckFailed(true);
 		resetActiveDestination();
 		break;
 	}
@@ -136,16 +139,21 @@ void AirUnit::setState(unsigned char newState)
 		break;
 	}
 
-	resetTask();
+	setHasTask(false);
+	resetTaskFailedCounter();
 
 	log(unitName + " setting state from " + to_string(state) + " to " + to_string(newState));
 	state = newState;
 
 	triggerUpdate(DataIndex::state);
+
+	AIloop();
 }
 
 void AirUnit::AIloop()
 {
+	srand(static_cast<unsigned int>(time(NULL)) + ID);
+
 	/* State machine */
 	switch (state) {
 		case State::IDLE: {
@@ -208,7 +216,7 @@ void AirUnit::AIloop()
 					goToDestination(enrouteTask);
 			}
 			else {
-				if (isDestinationReached(AIR_DEST_DIST_THR)) {
+				if (isDestinationReached(getDestinationReachedThreshold())) {
 					if (updateActivePath(looping) && setActiveDestination())
 						goToDestination(enrouteTask);
 					else 

backend/core/src/commands.cpp

@@ -9,7 +9,6 @@ extern UnitsManager* unitsManager;
 /* Move command */
 string Move::getString()
 {
-
     std::ostringstream commandSS;
     commandSS.precision(10);
     commandSS << "Olympus.move, "
@@ -47,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;
@@ -71,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;
@@ -96,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;
@@ -123,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;
@@ -165,7 +169,8 @@ string Delete::getString()
     commandSS.precision(10);
     commandSS << "Olympus.delete, "
         << ID << ", "
-        << (explosion ? "true" : "false");
+        << (explosion ? "true" : "false") << ", "
+        << "\"" << explosionType << "\"";
     return commandSS.str();
 }
 
@@ -244,6 +249,7 @@ string Explosion::getString()
     commandSS.precision(10);
     commandSS << "Olympus.explosion, "
         << intensity << ", "
+        << "\"" << explosionType << "\"" << ", "
         << location.lat << ", "
         << location.lng;
     return commandSS.str();

backend/core/src/core.cpp

@@ -25,6 +25,7 @@ json::value missionData = json::value::object();
 
 mutex mutexLock;
 string sessionHash;
+string instancePath;
 
 bool initialized = false;
 
@@ -51,9 +52,16 @@ extern "C" DllExport int coreDeinit(lua_State* L)
 }
 
 /* Called when DCS simulation starts. All singletons are instantiated, and the custom Lua functions are registered in the Lua state. */
-extern "C" DllExport int coreInit(lua_State* L)
+extern "C" DllExport int coreInit(lua_State* L, const char* path)
 {
+    instancePath = path;
+
+    log("Initializing core.dll with instance path " + instancePath);
+
     sessionHash = random_string(16);
+
+    log("Random session hash " + sessionHash);
+
     unitsManager = new UnitsManager(L);
     weaponsManager = new WeaponsManager(L);
     server = new Server(L);
@@ -80,7 +88,7 @@ extern "C" DllExport int coreFrame(lua_State* L)
     frameCounter++;
 
     const std::chrono::duration<double> executionDuration = std::chrono::system_clock::now() - lastExecution;
-    if (executionDuration.count() > FRAMERATE_TIME_INTERVAL) {
+    if (executionDuration.count() > (20 * FRAMERATE_TIME_INTERVAL)) {
         if (executionDuration.count() > 0) {
             scheduler->setFrameRate(frameCounter / executionDuration.count());
             frameCounter = 0;

backend/core/src/groundunit.cpp

@@ -0,0 +1,566 @@
+#include "groundunit.h"
+#include "utils.h"
+#include "logger.h"
+#include "commands.h"
+#include "scheduler.h"
+#include "defines.h"
+#include "unitsmanager.h"
+
+#include <GeographicLib/Geodesic.hpp>
+using namespace GeographicLib;
+
+extern Scheduler* scheduler;
+extern UnitsManager* unitsManager;
+json::value GroundUnit::database = json::value();
+extern string instancePath;
+
+#define RANDOM_ZERO_TO_ONE (double)(rand()) / (double)(RAND_MAX)
+#define RANDOM_MINUS_ONE_TO_ONE (((double)(rand()) / (double)(RAND_MAX) - 0.5) * 2)
+
+void GroundUnit::loadDatabase(string path) {
+	std::ifstream ifstream(instancePath + path);
+	std::stringstream ss;
+	ss << ifstream.rdbuf();
+	std::error_code errorCode;
+	database = json::value::parse(ss.str(), errorCode);
+	if (database.is_object())
+		log("GroundUnits database loaded correctly from " + instancePath + path);
+	else
+		log("Error reading GroundUnits database file");
+}
+
+/* Ground unit */
+GroundUnit::GroundUnit(json::value json, unsigned int ID) : Unit(json, ID)
+{
+	log("New Ground Unit created with ID: " + to_string(ID));
+
+	setCategory("GroundUnit");
+	setDesiredSpeed(10);
+};
+
+void GroundUnit::setDefaults(bool force)
+{
+	if (!getAlive() || !getControlled() || getHuman() || !getIsLeader()) return;
+
+	/* Set the default IDLE state */
+	setState(State::IDLE);
+
+	/* Set the default options */
+	setROE(ROE::WEAPON_FREE, force);
+	setOnOff(onOff, force);
+	setFollowRoads(followRoads, force);
+}
+
+void GroundUnit::setState(unsigned char newState)
+{
+	Coords currentTargetPosition = getTargetPosition();
+
+	/************ Perform any action required when LEAVING a state ************/
+	if (newState != state) {
+		switch (state) {
+		case State::IDLE: {
+			break;
+		}
+		case State::REACH_DESTINATION: {
+			break;
+		}
+		case State::ATTACK: {
+			setTargetID(NULL);
+			break;
+		}
+		case State::FIRE_AT_AREA: 
+		case State::SIMULATE_FIRE_FIGHT: 
+		case State::SCENIC_AAA:
+		case State::MISS_ON_PURPOSE: {
+			setTargetPosition(Coords(NULL));
+			break;
+		}
+		default:
+			break;
+		}
+	}
+
+	/************ Perform any action required when ENTERING a state ************/
+	switch (newState) {
+	case State::IDLE: {
+		setEnableTaskCheckFailed(false);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	case State::REACH_DESTINATION: {
+		setEnableTaskCheckFailed(true);
+		resetActiveDestination();
+		break;
+	}
+	case State::ATTACK: {
+		setEnableTaskCheckFailed(true);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	case State::FIRE_AT_AREA: {
+		setTargetPosition(currentTargetPosition);
+		setEnableTaskCheckFailed(true);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	case State::SIMULATE_FIRE_FIGHT: {
+		setTargetPosition(currentTargetPosition);
+		setEnableTaskCheckFailed(false);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	case State::SCENIC_AAA: {
+		setEnableTaskCheckFailed(false);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	case State::MISS_ON_PURPOSE: {
+		setEnableTaskCheckFailed(false);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	default:
+		break;
+	}
+
+	setHasTask(false);
+	resetTaskFailedCounter();
+
+	log(unitName + " setting state from " + to_string(state) + " to " + to_string(newState));
+	state = newState;
+
+	triggerUpdate(DataIndex::state);
+
+	AIloop();
+}
+
+void GroundUnit::AIloop()
+{
+	srand(static_cast<unsigned int>(time(NULL)) + ID);
+
+	switch (state) {
+	case State::IDLE: {
+		setTask("Idle");
+		if (getHasTask())
+			resetTask();
+		break;
+	}
+	case State::REACH_DESTINATION: {
+		setTask("Reaching destination");
+
+		string enrouteTask = "";
+		bool looping = false;
+
+		std::ostringstream taskSS;
+		taskSS << "{ id = 'FollowRoads', value = " << (getFollowRoads() ? "true" : "false") << " }";
+		enrouteTask = taskSS.str();
+
+		if (activeDestination == NULL || !getHasTask())
+		{
+			if (!setActiveDestination())
+				setState(State::IDLE);
+			else
+				goToDestination(enrouteTask);
+		}
+		else {
+			if (isDestinationReached(GROUND_DEST_DIST_THR)) {
+				if (updateActivePath(looping) && setActiveDestination())
+					goToDestination(enrouteTask);
+				else
+					setState(State::IDLE);
+			}
+		}
+		break;
+	}
+	case State::ATTACK: {
+		Unit* target = unitsManager->getUnit(getTargetID());
+		if (target != nullptr) {
+			setTask("Attacking " + target->getUnitName());
+
+			if (!getHasTask()) {
+				/* Send the command */
+				std::ostringstream taskSS;
+				taskSS.precision(10);
+				taskSS << "{id = 'AttackUnit', unitID = " << target->getID() << " }";
+				Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+				scheduler->appendCommand(command);
+				setHasTask(true);
+			}
+		}
+		else {
+			setState(State::IDLE);
+		}
+
+		break;
+	}
+	case State::FIRE_AT_AREA: {
+		setTask("Firing at area");
+
+		if (!getHasTask()) {
+			std::ostringstream taskSS;
+			taskSS.precision(10);
+			taskSS << "{id = 'FireAtPoint', lat = " << targetPosition.lat << ", lng = " << targetPosition.lng << ", radius = 100}";
+			Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+			scheduler->appendCommand(command);
+			setHasTask(true);
+		}
+
+		break;
+	}
+	case State::SIMULATE_FIRE_FIGHT: {
+		setTask("Simulating fire fight");
+
+		if (internalCounter == 0 && targetPosition != Coords(NULL) && scheduler->getLoad() < 30) {
+			/* Get the distance and bearing to the target */
+			Coords scatteredTargetPosition = targetPosition;
+			double distance;
+			double bearing1;
+			double bearing2;
+			Geodesic::WGS84().Inverse(getPosition().lat, getPosition().lng, scatteredTargetPosition.lat, scatteredTargetPosition.lng, distance, bearing1, bearing2);
+
+			/* Compute the scattered position applying a random scatter to the shot */
+			double scatterDistance = distance * tan(10 /* degs */ * (ShotsScatter::LOW - shotsScatter) / 57.29577 + 2 / 57.29577 /* degs */) * RANDOM_MINUS_ONE_TO_ONE;
+			Geodesic::WGS84().Direct(scatteredTargetPosition.lat, scatteredTargetPosition.lng, bearing1 + 90, scatterDistance, scatteredTargetPosition.lat, scatteredTargetPosition.lng);
+			
+			/* Recover the data from the database */
+			double aimTime = 2; /* s */
+			bool indirectFire = false;
+			double shotsBaseInterval = 15; /* s */
+			if (database.has_object_field(to_wstring(name))) {
+				json::value databaseEntry = database[to_wstring(name)];
+				if (databaseEntry.has_number_field(L"aimTime"))
+					aimTime = databaseEntry[L"aimTime"].as_number().to_double();
+				if (databaseEntry.has_boolean_field(L"indirectFire"))
+					indirectFire = databaseEntry[L"indirectFire"].as_bool();
+				if (databaseEntry.has_number_field(L"shotsBaseInterval"))
+					shotsBaseInterval = databaseEntry[L"shotsBaseInterval"].as_number().to_double();
+			}
+
+			/* If the unit is of the indirect fire type, like a mortar, simply shoot at the target */
+			if (indirectFire) {
+				log(unitName + "(" + name + ")" + " simulating fire fight with indirect fire");
+				std::ostringstream taskSS;
+				taskSS.precision(10);
+				taskSS << "{id = 'FireAtPoint', lat = " << scatteredTargetPosition.lat << ", lng = " << scatteredTargetPosition.lng << ", radius = 100}";
+				Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+				scheduler->appendCommand(command);
+				setHasTask(true);
+			}
+			/* Otherwise use the aim method */
+			else {
+				log(unitName + "(" + name + ")" + " simulating fire fight with aim at point method");
+				aimAtPoint(scatteredTargetPosition);
+			}
+
+			/* Wait an amout of time depending on the shots intensity */
+			internalCounter = static_cast<unsigned int>(((ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + aimTime) / FRAMERATE_TIME_INTERVAL);
+		}
+
+		if (targetPosition == Coords(NULL))
+			setState(State::IDLE);
+
+		/* Fallback if something went wrong */
+		if (internalCounter == 0)
+			internalCounter = static_cast<unsigned int>(3 / FRAMERATE_TIME_INTERVAL);
+		internalCounter--;
+
+		break;
+	}
+	case State::SCENIC_AAA: {
+		setTask("Scenic AAA");
+
+		/* Only perform scenic functions when the scheduler is "free" */
+		if (((!getHasTask() && scheduler->getLoad() < 30) || internalCounter == 0)) {
+			double distance = 0;
+			unsigned char unitCoalition = coalition == 0 ? getOperateAs() : coalition;
+			unsigned char targetCoalition = unitCoalition == 2 ? 1 : 2;
+			Unit* target = unitsManager->getClosestUnit(this, targetCoalition, { "Aircraft", "Helicopter" }, distance);
+
+			/* Recover the data from the database */
+			double aimTime = 2; /* s */
+			double shotsBaseInterval = 15; /* s */
+			if (database.has_object_field(to_wstring(name))) {
+				json::value databaseEntry = database[to_wstring(name)];
+				if (databaseEntry.has_number_field(L"aimTime"))
+					aimTime = databaseEntry[L"aimTime"].as_number().to_double();
+				if (databaseEntry.has_number_field(L"shotsBaseInterval"))
+					shotsBaseInterval = databaseEntry[L"shotsBaseInterval"].as_number().to_double();
+			}
+
+			/* Only run if an enemy air unit is closer than 20km to avoid useless load */
+			if (target != nullptr && distance < 20000 /* m */) {
+				double r = 15; /* m */
+				double barrelElevation = r * tan(acos(((double)(rand()) / (double)(RAND_MAX))));
+
+				double lat = 0;
+				double lng = 0;
+				double randomBearing = ((double)(rand()) / (double)(RAND_MAX)) * 360;
+				Geodesic::WGS84().Direct(position.lat, position.lng, randomBearing, r, lat, lng);
+
+				std::ostringstream taskSS;
+				taskSS.precision(10);
+				taskSS << "{id = 'FireAtPoint', lat = " << lat << ", lng = " << lng << ", alt = " << position.alt + barrelElevation << ", radius = 0.001}";
+				Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+				scheduler->appendCommand(command);
+				setHasTask(true);
+
+				/* Wait an amout of time depending on the shots intensity */
+				internalCounter = static_cast<unsigned int>(((ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + aimTime) / FRAMERATE_TIME_INTERVAL);
+			}
+		}
+
+		if (internalCounter == 0)
+			internalCounter = static_cast<unsigned int>(3 / FRAMERATE_TIME_INTERVAL);
+		internalCounter--;
+
+		break;
+	}
+	case State::MISS_ON_PURPOSE: {
+		setTask("Missing on purpose");
+
+		/* Check that the unit can perform AAA duties */
+		bool canAAA = false;
+		if (database.has_object_field(to_wstring(name))) {
+			json::value databaseEntry = database[to_wstring(name)];
+			if (databaseEntry.has_boolean_field(L"canAAA"))
+				canAAA = databaseEntry[L"canAAA"].as_bool();
+		}
+
+		if (canAAA) {
+			/* Only perform scenic functions when the scheduler is "free" */
+			/* Only run this when the internal counter reaches 0 to avoid excessive computations when no nearby target */
+			if (scheduler->getLoad() < 30 && internalCounter == 0) {
+				double distance = 0;
+				unsigned char unitCoalition = coalition == 0 ? getOperateAs() : coalition;
+				unsigned char targetCoalition = unitCoalition == 2 ? 1 : 2;
+				
+				/* Default gun values */
+				double barrelHeight = 1.0; /* m */
+				double muzzleVelocity = 860; /* m/s */
+				double aimTime = 10; /* s */
+				unsigned int shotsToFire = 10;
+				double shotsBaseInterval = 15; /* s */
+				double shotsBaseScatter = 2; /* degs */
+				double engagementRange = 10000; /* m */
+				double targetingRange = 0; /* m */
+				double aimMethodRange = 0; /* m */
+				double acquisitionRange = 0; /* m */
+
+				/* Load gun values from database */
+				if (database.has_object_field(to_wstring(name))) {
+					json::value databaseEntry = database[to_wstring(name)];
+					if (databaseEntry.has_number_field(L"barrelHeight"))
+						barrelHeight = databaseEntry[L"barrelHeight"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"muzzleVelocity"))
+						muzzleVelocity = databaseEntry[L"muzzleVelocity"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"aimTime"))
+						aimTime = databaseEntry[L"aimTime"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"shotsToFire"))
+						shotsToFire = databaseEntry[L"shotsToFire"].as_number().to_uint32();
+					if (databaseEntry.has_number_field(L"engagementRange"))
+						engagementRange = databaseEntry[L"engagementRange"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"shotsBaseInterval"))
+						shotsBaseInterval = databaseEntry[L"shotsBaseInterval"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"shotsBaseScatter"))
+						shotsBaseScatter = databaseEntry[L"shotsBaseScatter"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"targetingRange"))
+						targetingRange = databaseEntry[L"targetingRange"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"aimMethodRange"))
+						aimMethodRange = databaseEntry[L"aimMethodRange"].as_number().to_double();
+					if (databaseEntry.has_number_field(L"acquisitionRange"))
+						acquisitionRange = databaseEntry[L"acquisitionRange"].as_number().to_double();
+				}
+
+				/* Get all the units in range and select one at random */
+				double range = max(max(engagementRange, aimMethodRange), acquisitionRange);
+				map<Unit*, double> targets = unitsManager->getUnitsInRange(this, targetCoalition, { "Aircraft", "Helicopter" }, range);
+
+				Unit* target = nullptr;
+				unsigned int index = static_cast<unsigned int>((RANDOM_ZERO_TO_ONE * (targets.size() - 1)));
+				for (auto const& p : targets) {
+					if (index-- == 0) {
+						target = p.first;
+						distance = p.second;
+					}
+				}
+
+				/* Only do if we have a valid target close enough for AAA */
+				if (target != nullptr) {
+					/* Approximate the flight time */
+					if (muzzleVelocity != 0)
+						aimTime += distance / muzzleVelocity;
+
+					/* If the target is in targeting range and we are in highest precision mode, target it */
+					if (distance < targetingRange && shotsScatter == ShotsScatter::LOW) {
+						/* Send the command */
+						std::ostringstream taskSS;
+						taskSS.precision(10);
+						taskSS << "{id = 'AttackUnit', unitID = " << target->getID() << " }";
+						Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+						scheduler->appendCommand(command);
+						setHasTask(true);
+
+						internalCounter = static_cast<unsigned int>((aimTime + (ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL);
+					}
+					/* Else, do miss on purpose */
+					else {
+						/* Compute where the target will be in aimTime seconds, plus the effect of scatter. */
+						double scatterDistance = distance * tan(shotsBaseScatter * (ShotsScatter::LOW - shotsScatter) / 57.29577) * (RANDOM_ZERO_TO_ONE - 0.1);
+						double aimDistance = target->getHorizontalVelocity() * aimTime + scatterDistance;
+						double aimLat = 0;
+						double aimLng = 0;
+						Geodesic::WGS84().Direct(target->getPosition().lat, target->getPosition().lng, target->getTrack() * 57.29577, aimDistance, aimLat, aimLng); /* TODO make util to convert degrees and radians function */
+						double aimAlt = target->getPosition().alt + target->getVerticalVelocity() * aimTime + distance * tan(shotsBaseScatter * (ShotsScatter::LOW - shotsScatter) / 57.29577) * RANDOM_ZERO_TO_ONE; // Force to always miss high never low
+
+						/* Send the command */
+						if (distance < engagementRange) {
+							/* If the unit is closer than the engagement range, use the fire at point method */
+							std::ostringstream taskSS;
+							taskSS.precision(10);
+							taskSS << "{id = 'FireAtPoint', lat = " << aimLat << ", lng = " << aimLng << ", alt = " << aimAlt << ", radius = 0.001, expendQty = " << shotsToFire << " }";
+							Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+							scheduler->appendCommand(command);
+							setHasTask(true);
+							setTargetPosition(Coords(aimLat, aimLng, target->getPosition().alt));
+							internalCounter = static_cast<unsigned int>((aimTime + (ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL);
+						}
+						else if (distance < aimMethodRange) {
+							/* If the unit is closer than the aim method range, use the aim method range */
+							aimAtPoint(Coords(aimLat, aimLng, aimAlt));
+							setTargetPosition(Coords(aimLat, aimLng, target->getPosition().alt));
+							internalCounter = static_cast<unsigned int>((aimTime + (ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL);
+						}
+						else {
+							/* Else just wake the unit up with an impossible command */
+							std::ostringstream taskSS;
+							taskSS.precision(10);
+							taskSS << "{id = 'FireAtPoint', lat = " << 0 << ", lng = " << 0 << ", alt = " << 0 << ", radius = 0.001, expendQty = " << 0 << " }";
+							Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+							scheduler->appendCommand(command);
+							setHasTask(true);
+							setTargetPosition(Coords(NULL));
+
+							/* Don't wait too long before checking again */
+							internalCounter = static_cast<unsigned int>(5 / FRAMERATE_TIME_INTERVAL);
+						}
+					}
+					missOnPurposeTarget = target;
+				}
+				else {
+					if (getHasTask())
+						resetTask();
+				}
+			}
+
+			/* If no valid target was detected */
+			if (internalCounter == 0) {
+				double alertnessTimeConstant = 10; /* s */
+				if (database.has_object_field(to_wstring(name))) {
+					json::value databaseEntry = database[to_wstring(name)];
+					if (databaseEntry.has_number_field(L"alertnessTimeConstant"))
+						alertnessTimeConstant = databaseEntry[L"alertnessTimeConstant"].as_number().to_double();
+				}
+				internalCounter = static_cast<unsigned int>((5 + RANDOM_ZERO_TO_ONE * alertnessTimeConstant * 0 /* TODO: remove to enable alertness again */) / FRAMERATE_TIME_INTERVAL);
+				missOnPurposeTarget = nullptr;
+				setTargetPosition(Coords(NULL));
+			}
+			internalCounter--;
+		}
+		else {
+			setState(State::IDLE);
+		}
+
+		break;
+	}
+	default:
+		break;
+	}
+}
+
+
+void GroundUnit::aimAtPoint(Coords aimTarget) {
+	double dist;
+	double bearing1;
+	double bearing2;
+	Geodesic::WGS84().Inverse(position.lat, position.lng, aimTarget.lat, aimTarget.lng, dist, bearing1, bearing2);
+
+	/* Aim point distance */
+	double r = 15; /* m */
+
+	/* Default gun values */
+	double barrelHeight = 1.0; /* m */
+	double muzzleVelocity = 860; /* m/s */
+	double shotsBaseScatter = 5; /* degs */
+	if (database.has_object_field(to_wstring(name))) {
+		json::value databaseEntry = database[to_wstring(name)];
+		if (databaseEntry.has_number_field(L"barrelHeight") && databaseEntry.has_number_field(L"muzzleVelocity")) {
+			barrelHeight = databaseEntry[L"barrelHeight"].as_number().to_double();
+			muzzleVelocity = databaseEntry[L"muzzleVelocity"].as_number().to_double();
+		}
+		if (databaseEntry.has_number_field(L"shotsBaseScatter"))
+			shotsBaseScatter = databaseEntry[L"shotsBaseScatter"].as_number().to_double();
+	}
+
+	/* Compute the elevation angle of the gun*/
+	double deltaHeight = (aimTarget.alt - (position.alt + barrelHeight));
+	double alpha = 9.81 / 2 * dist * dist / (muzzleVelocity * muzzleVelocity);
+	double inner = dist * dist - 4 * alpha * (alpha + deltaHeight);
+
+	/* Check we can reach the target*/
+	if (inner > 0) {
+		/* Compute elevation and bearing */
+		double barrelElevation = r * (dist - sqrt(inner)) / (2 * alpha);
+
+		double lat = 0;
+		double lng = 0;
+		Geodesic::WGS84().Direct(position.lat, position.lng, bearing1, r, lat, lng);
+
+		log(unitName + "(" + name + ")" + " shooting with aim at point method. Barrel elevation: " + to_string(barrelElevation * 57.29577) + "°, bearing: " + to_string(bearing1) + "°");
+
+		std::ostringstream taskSS;
+		taskSS.precision(10);
+		taskSS << "{id = 'FireAtPoint', lat = " << lat << ", lng = " << lng << ", alt = " << position.alt + barrelElevation + barrelHeight << ", radius = 0.001}";
+		Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+		scheduler->appendCommand(command);
+		setHasTask(true);
+	}
+	else {
+		log("Target out of range for " + unitName + "(" + name + ")");
+	}
+}
+
+void GroundUnit::changeSpeed(string change)
+{
+	if (change.compare("stop") == 0)
+		setState(State::IDLE);
+	else if (change.compare("slow") == 0)
+		setDesiredSpeed(getDesiredSpeed() - knotsToMs(5));
+	else if (change.compare("fast") == 0)
+		setDesiredSpeed(getDesiredSpeed() + knotsToMs(5));
+
+	if (getDesiredSpeed() < 0)
+		setDesiredSpeed(0);
+}
+
+void GroundUnit::setOnOff(bool newOnOff, bool force) 
+{
+	if (newOnOff != onOff || force) {
+		Unit::setOnOff(newOnOff, force);
+		Command* command = dynamic_cast<Command*>(new SetOnOff(groupName, onOff));
+		scheduler->appendCommand(command);
+	}
+}
+
+void GroundUnit::setFollowRoads(bool newFollowRoads, bool force)
+{
+	if (newFollowRoads != followRoads || force) {
+		Unit::setFollowRoads(newFollowRoads, force);
+		resetActiveDestination(); /* Reset active destination to apply option*/
+	}
+}

backend/core/src/helicopter.cpp

@@ -0,0 +1,71 @@
+#include "helicopter.h"
+#include "utils.h"
+#include "logger.h"
+#include "commands.h"
+#include "scheduler.h"
+#include "defines.h"
+#include "unitsManager.h"
+
+#include <GeographicLib/Geodesic.hpp>
+using namespace GeographicLib;
+
+extern Scheduler* scheduler;
+extern UnitsManager* unitsManager;
+json::value Helicopter::database = json::value();
+extern string instancePath;
+
+void Helicopter::loadDatabase(string path) {
+	std::ifstream ifstream(instancePath + path);
+	std::stringstream ss;
+	ss << ifstream.rdbuf();
+	std::error_code errorCode;
+	database = json::value::parse(ss.str(), errorCode);
+	if (database.is_object())
+		log("Helicopters database loaded correctly from " + instancePath + path);
+	else
+		log("Error reading Helicopters database file");
+}
+
+/* Helicopter */
+Helicopter::Helicopter(json::value json, unsigned int ID) : AirUnit(json, ID)
+{
+	log("New Helicopter created with ID: " + to_string(ID));
+
+	setCategory("Helicopter");
+	setDesiredSpeed(knotsToMs(100));
+	setDesiredAltitude(ftToM(5000));
+};
+
+void Helicopter::changeSpeed(string change)
+{
+	if (change.compare("stop") == 0)
+		setState(State::IDLE);
+	else if (change.compare("slow") == 0)
+		setDesiredSpeed(getDesiredSpeed() - knotsToMs(10));
+	else if (change.compare("fast") == 0)
+		setDesiredSpeed(getDesiredSpeed() + knotsToMs(10));
+
+	if (getDesiredSpeed() < knotsToMs(0))
+		setDesiredSpeed(knotsToMs(0));
+}
+
+void Helicopter::changeAltitude(string change)
+{
+	if (change.compare("descend") == 0)
+	{
+		if (getDesiredAltitude() > 100)
+			setDesiredAltitude(getDesiredAltitude() - ftToM(100));
+		else if (getDesiredAltitude() > 0)
+			setDesiredAltitude(getDesiredAltitude() - ftToM(10));
+	}
+	else if (change.compare("climb") == 0)
+	{
+		if (getDesiredAltitude() > 100)
+			setDesiredAltitude(getDesiredAltitude() + ftToM(100));
+		else if (getDesiredAltitude() >= 0)
+			setDesiredAltitude(getDesiredAltitude() + ftToM(10));
+	}
+
+	if (getDesiredAltitude() < 0)
+		setDesiredAltitude(0);
+}

backend/core/src/navyunit.cpp

@@ -12,24 +12,18 @@ using namespace GeographicLib;
 extern Scheduler* scheduler;
 extern UnitsManager* unitsManager;
 json::value NavyUnit::database = json::value();
+extern string instancePath;
 
 void NavyUnit::loadDatabase(string path) {
-	char* buf = nullptr;
+	std::ifstream ifstream(instancePath + path);
-	size_t sz = 0;
+	std::stringstream ss;
-	if (_dupenv_s(&buf, &sz, "DCSOLYMPUS_PATH") == 0 && buf != nullptr)
+	ss << ifstream.rdbuf();
-	{
+	std::error_code errorCode;
-		std::ifstream ifstream(string(buf) + path);
+	database = json::value::parse(ss.str(), errorCode);
-		std::stringstream ss;
+	if (database.is_object())
-		ss << ifstream.rdbuf();
+		log("NavyUnits database loaded correctly from " + instancePath + path);
-		std::error_code errorCode;
+	else
-		database = json::value::parse(ss.str(), errorCode);
+		log("Error reading NavyUnits database file");
-		if (database.is_object())
-			log("Navy Units database loaded correctly");
-		else
-			log("Error reading Navy Units database file");
-
-		free(buf);
-	}
 }
 
 /* Navy Unit */
@@ -49,13 +43,15 @@ void NavyUnit::setDefaults(bool force)
 	setState(State::IDLE);
 
 	/* Set the default options */
-	setROE(ROE::OPEN_FIRE_WEAPON_FREE, force);
+	setROE(ROE::WEAPON_FREE, force);
 	setOnOff(onOff, force);
 	setFollowRoads(followRoads, force);
 }
 
 void NavyUnit::setState(unsigned char newState)
 {
+	Coords currentTargetPosition = getTargetPosition();
+
 	/************ Perform any action required when LEAVING a state ************/
 	if (newState != state) {
 		switch (state) {
@@ -65,11 +61,14 @@ void NavyUnit::setState(unsigned char newState)
 		case State::REACH_DESTINATION: {
 			break;
 		}
-		case State::FIRE_AT_AREA: {
+		case State::ATTACK: {
-			setTargetPosition(Coords(NULL));
+			setTargetID(NULL);
 			break;
 		}
-		case State::SIMULATE_FIRE_FIGHT: {
+		case State::FIRE_AT_AREA:
+		case State::SIMULATE_FIRE_FIGHT:
+		case State::SCENIC_AAA:
+		case State::MISS_ON_PURPOSE: {
 			setTargetPosition(Coords(NULL));
 			break;
 		}
@@ -81,41 +80,67 @@ void NavyUnit::setState(unsigned char newState)
 	/************ Perform any action required when ENTERING a state ************/
 	switch (newState) {
 	case State::IDLE: {
+		setEnableTaskCheckFailed(false);
 		clearActivePath();
 		resetActiveDestination();
 		break;
 	}
 	case State::REACH_DESTINATION: {
+		setEnableTaskCheckFailed(true);
+		resetActiveDestination();
+		break;
+	}
+	case State::ATTACK: {
+		setEnableTaskCheckFailed(true);
+		clearActivePath();
 		resetActiveDestination();
 		break;
 	}
 	case State::FIRE_AT_AREA: {
+		setTargetPosition(currentTargetPosition);
+		setEnableTaskCheckFailed(true);
 		clearActivePath();
 		resetActiveDestination();
-		resetTask();
 		break;
 	}
 	case State::SIMULATE_FIRE_FIGHT: {
+		setTargetPosition(currentTargetPosition);
+		setEnableTaskCheckFailed(false);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	case State::SCENIC_AAA: {
+		setEnableTaskCheckFailed(false);
+		clearActivePath();
+		resetActiveDestination();
+		break;
+	}
+	case State::MISS_ON_PURPOSE: {
+		setEnableTaskCheckFailed(false);
 		clearActivePath();
 		resetActiveDestination();
-		resetTask();
 		break;
 	}
 	default:
 		break;
 	}
 
-	if (newState != state)
+	setHasTask(false);
-		resetTask();
+	resetTaskFailedCounter();
 
 	log(unitName + " setting state from " + to_string(state) + " to " + to_string(newState));
 	state = newState;
 
 	triggerUpdate(DataIndex::state);
+
+	AIloop();
 }
 
 void NavyUnit::AIloop()
 {
+	srand(static_cast<unsigned int>(time(NULL)) + ID);
+
 	switch (state) {
 	case State::IDLE: {
 		setTask("Idle");
@@ -142,6 +167,28 @@ void NavyUnit::AIloop()
 					setState(State::IDLE);
 			}
 		}
+
+		break;
+	}
+	case State::ATTACK: {
+		Unit* target = unitsManager->getUnit(getTargetID());
+		if (target != nullptr) {
+			setTask("Attacking " + target->getUnitName());
+
+			if (!getHasTask()) {
+				/* Send the command */
+				std::ostringstream taskSS;
+				taskSS.precision(10);
+				taskSS << "{id = 'AttackUnit', unitID = " << target->getID() << " }";
+				Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+				scheduler->appendCommand(command);
+				setHasTask(true);
+			}
+		}
+		else {
+			setState(State::IDLE);
+		}
+
 		break;
 	}
 	case State::FIRE_AT_AREA: {
@@ -156,19 +203,16 @@ void NavyUnit::AIloop()
 			scheduler->appendCommand(command);
 			setHasTask(true);
 		}
+
+		break;
 	}
 	case State::SIMULATE_FIRE_FIGHT: {
 		setTask("Simulating fire fight");
 
-		if (!getHasTask()) {
+		// TODO 
-			std::ostringstream taskSS;
-			taskSS.precision(10);
 
-			taskSS << "{id = 'FireAtPoint', lat = " << targetPosition.lat << ", lng = " << targetPosition.lng << ", radius = 1}";
+		setState(State::IDLE);
-			Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
+		break;
-			scheduler->appendCommand(command);
-			setHasTask(true);
-		}
 	}
 	default:
 		break;

backend/core/src/scheduler.cpp

@@ -7,12 +7,9 @@
 
 extern UnitsManager* unitsManager;
 
-Scheduler::Scheduler(lua_State* L) :
+Scheduler::Scheduler(lua_State* L)
-	load(0)
 {
 	LogInfo(L, "Scheduler constructor called successfully");
-
-	
 }
 
 Scheduler::~Scheduler()
@@ -20,6 +17,7 @@ Scheduler::~Scheduler()
 
 }
 
+/* Appends a */
 void Scheduler::appendCommand(Command* newCommand)
 {
 	for (auto command : commands) {
@@ -58,7 +56,13 @@ void Scheduler::execute(lua_State* L)
 					log("Error executing command " + commandString);
 				else
 					log("Command '" + commandString + "' executed correctly, current load " + to_string(getLoad()));
-				load = command->getLoad();
+			
+				/* Adjust the load depending on the fps */
+				double fpsMultiplier = 20;
+				if (getFrameRate() + 3 > 0)
+					fpsMultiplier = static_cast<unsigned int>(max(1, 60 / (getFrameRate() + 3))); /* Multiplier between 1 and 20 */
+
+				load = static_cast<unsigned int>(command->getLoad() * fpsMultiplier);
 				commands.remove(command);
 				executedCommandsHashes.push_back(command->getHash());
 				command->executeCallback(); /* Execute the command callback (this is a lambda function that can be used to execute a function when the command is run) */
@@ -84,7 +88,7 @@ void Scheduler::setCommandModeOptions(json::value value) {
 			setRedSpawnPoints(value[L"spawnPoints"][L"red"].as_number().to_int32());
 	}
 	if (value.has_array_field(L"eras")) {
-		int length = value[L"eras"].as_array().size();
+		int length = static_cast<int>(value[L"eras"].as_array().size());
 		vector<string> newEras;
 		for (int idx = 0; idx < length; idx++)
 			newEras.push_back(to_string(value[L"eras"].as_array().at(idx)));
@@ -134,6 +138,8 @@ bool Scheduler::checkSpawnPoints(int spawnPoints, string coalition)
 			return false;
 		}
 	}
+
+	return false;
 }
 
 void Scheduler::handleRequest(string key, json::value value, string username, json::value& answer)
@@ -143,6 +149,7 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 	log("Received request with ID: " + key);
 	log(L"Incoming command raw value: " + value.serialize());
 
+	/************************/
 	if (key.compare("setPath") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -150,7 +157,6 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		if (unit != nullptr)
 		{
-			string unitName = unit->getUnitName();
 			json::value path = value[L"path"];
 			list<Coords> newPath;
 			for (unsigned int i = 0; i < path.as_array().size(); i++)
@@ -164,25 +170,29 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 
 			unit->setActivePath(newPath);
 			unit->setState(State::REACH_DESTINATION);
-			log(username + " updated destination path for unit " + unitName, true);
+			log(username + " updated destination path for unit " + unit->getUnitName() + "(" + unit->getName() + ")", true);
 		}
 	}
+	/************************/
 	else if (key.compare("smoke") == 0)
 	{
 		string color = to_string(value[L"color"]);
 		double lat = value[L"location"][L"lat"].as_double();
 		double lng = value[L"location"][L"lng"].as_double();
-		log(username + " added a " + color + " smoke at (" + to_string(lat) + ", " + to_string(lng) + ")", true);
+		
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		command = dynamic_cast<Command*>(new Smoke(color, loc));
+		log(username + " added a " + color + " smoke at (" + to_string(lat) + ", " + to_string(lng) + ")", true);
 	}
-	else if (key.compare("spawnAircrafts") == 0)
+	/************************/
+	else if (key.compare("spawnAircrafts") == 0 || key.compare("spawnHelicopters") == 0)
 	{
 		bool immediate = value[L"immediate"].as_bool();
 		string coalition = to_string(value[L"coalition"]);
 		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;
 
@@ -195,40 +205,19 @@ 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});
+			spawnOptions.push_back({unitType, location, loadout, skill, liveryID});
-			log(username + " spawned a " + coalition + " " + unitType, true);
+			log(username + " spawned a " + coalition + " " + unitType , true);
 		}
 
-		command = dynamic_cast<Command*>(new SpawnAircrafts(coalition, spawnOptions, airbaseName, country, immediate));
+		if (key.compare("spawnAircrafts") == 0)
+			command = dynamic_cast<Command*>(new SpawnAircrafts(coalition, spawnOptions, airbaseName, country, immediate));
+		else
+			command = dynamic_cast<Command*>(new SpawnHelicopters(coalition, spawnOptions, airbaseName, country, immediate));
 	}
-	else if (key.compare("spawnHelicopters") == 0)
+	/************************/
-	{
+	else if (key.compare("spawnGroundUnits") == 0 || key.compare("spawnNavyUnits") == 0)
-		bool immediate = value[L"immediate"].as_bool();
-		string coalition = to_string(value[L"coalition"]);
-		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;
-
-		vector<SpawnOptions> spawnOptions;
-		for (auto unit : value[L"units"].as_array()) {
-			string unitType = to_string(unit[L"unitType"]);
-			double lat = unit[L"location"][L"lat"].as_double();
-			double lng = unit[L"location"][L"lng"].as_double();
-			double alt = unit[L"altitude"].as_double();
-			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"]);
-
-			spawnOptions.push_back({ unitType, location, loadout, liveryID });
-			log(username + " spawned a " + coalition + " " + unitType, true);
-		}
-
-		command = dynamic_cast<Command*>(new SpawnHelicopters(coalition, spawnOptions, airbaseName, country, immediate));
-	}
-	else if (key.compare("spawnGroundUnits") == 0)
 	{
 		bool immediate = value[L"immediate"].as_bool();
 		string coalition = to_string(value[L"coalition"]);
@@ -244,36 +233,18 @@ 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);
 		}
 
-		command = dynamic_cast<Command*>(new SpawnGroundUnits(coalition, spawnOptions, country, immediate));
+		if (key.compare("spawnGroundUnits") == 0)
-	}
+			command = dynamic_cast<Command*>(new SpawnGroundUnits(coalition, spawnOptions, country, immediate));
-	else if (key.compare("spawnNavyUnits") == 0)
+		else
-	{
+			command = dynamic_cast<Command*>(new SpawnNavyUnits(coalition, spawnOptions, country, immediate));
-		bool immediate = value[L"immediate"].as_bool();
-		string coalition = to_string(value[L"coalition"]);
-		string country = to_string(value[L"country"]);
-
-		int spawnPoints = value[L"spawnPoints"].as_number().to_int32();
-		if (!checkSpawnPoints(spawnPoints, coalition)) return;
-
-		vector<SpawnOptions> spawnOptions;
-		for (auto unit : value[L"units"].as_array()) {
-			string unitType = to_string(unit[L"unitType"]);
-			double lat = unit[L"location"][L"lat"].as_double();
-			double lng = unit[L"location"][L"lng"].as_double();
-			Coords location; location.lat = lat; location.lng = lng;
-			string liveryID = to_string(unit[L"liveryID"]);
-
-			spawnOptions.push_back({ unitType, location, "", liveryID});
-			log(username + " spawned a " + coalition + " " + unitType, true);
-		}
-
-		command = dynamic_cast<Command*>(new SpawnNavyUnits(coalition, spawnOptions, country, immediate));
 	}
+	/************************/
 	else if (key.compare("attackUnit") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -283,28 +254,18 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		Unit* target = unitsManager->getUnit(targetID);
 
-		string unitName;
+		if (unit != nullptr && target != nullptr) {
-		string targetName;
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to attack unit " + target->getUnitName() + "(" + target->getName() + ")", true);
-
+			unit->setTargetID(targetID);
-		if (unit != nullptr)
+			unit->setState(State::ATTACK);
-			unitName = unit->getUnitName();
+		}
-		else
-			return;
-
-		if (target != nullptr)
-			targetName = target->getUnitName();
-		else
-			return;
-
-		log(username + " tasked unit " + unitName + " to attack unit " + targetName, true);
-		unit->setTargetID(targetID);
-		unit->setState(State::ATTACK);
 	}
+	/************************/
 	else if (key.compare("followUnit") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
-		unsigned int leaderID = value[L"targetID"].as_double();
+		unsigned int leaderID = value[L"targetID"].as_integer();
 		double offsetX = value[L"offsetX"].as_double();
 		double offsetY = value[L"offsetY"].as_double();
 		double offsetZ = value[L"offsetZ"].as_double();
@@ -312,72 +273,80 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		Unit* leader = unitsManager->getUnit(leaderID);
 
-		string unitName;
+		if (unit != nullptr && leader != nullptr) {
-		string leaderName;
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to follow unit " + leader->getUnitName() + "(" + leader->getName() + ")", true);
-
+			unit->setFormationOffset(Offset(offsetX, offsetY, offsetZ));
-		if (unit != nullptr)
+			unit->setLeaderID(leaderID);
-			unitName = unit->getUnitName();
+			unit->setState(State::FOLLOW);
-		else
+		}
-			return;
-
-		if (leader != nullptr)
-			leaderName = leader->getUnitName();
-		else
-			return;
-
-		log(username + " tasked unit " + unitName + " to follow unit " + leaderName, true);
-		unit->setFormationOffset(Offset(offsetX, offsetY, offsetZ));
-		unit->setLeaderID(leaderID);
-		unit->setState(State::FOLLOW);
 	}
+	/************************/
 	else if (key.compare("changeSpeed") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		if (unit != nullptr)
+		if (unit != nullptr) {
 			unit->changeSpeed(to_string(value[L"change"]));
+			log(username + " changed " + unit->getUnitName() + "(" + unit->getName() + ") speed: " + to_string(value[L"change"]), true);
+		}
 	}
+	/************************/
 	else if (key.compare("changeAltitude") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		if (unit != nullptr)
+		if (unit != nullptr) {
 			unit->changeAltitude(to_string(value[L"change"]));
+			log(username + " changed " + unit->getUnitName() + "(" + unit->getName() + ") altitude: " + to_string(value[L"change"]), true);
+		}
 	}
+	/************************/
 	else if (key.compare("setSpeed") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		if (unit != nullptr)
+		if (unit != nullptr) {
 			unit->setDesiredSpeed(value[L"speed"].as_double());
+			log(username + " set " + unit->getUnitName() + "(" + unit->getName() + ") speed: " + to_string(value[L"speed"].as_double()), true);
+		}
 	}
+	/************************/
 	else if (key.compare("setSpeedType") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		if (unit != nullptr)
+		if (unit != nullptr) {
 			unit->setDesiredSpeedType(to_string(value[L"speedType"]));
+			log(username + " set " + unit->getUnitName() + "(" + unit->getName() + ") speed type: " + to_string(value[L"speedType"]), true);
+		}
 	}
+	/************************/
 	else if (key.compare("setAltitude") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		if (unit != nullptr)
+		if (unit != nullptr) {
 			unit->setDesiredAltitude(value[L"altitude"].as_double());
+			log(username + " set " + unit->getUnitName() + "(" + unit->getName() + ")  altitude: " + to_string(value[L"altitude"].as_double()), true);
+		}
 	}
+	/************************/
 	else if (key.compare("setAltitudeType") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		if (unit != nullptr)
+		if (unit != nullptr) {
 			unit->setDesiredAltitudeType(to_string(value[L"altitudeType"]));
+			log(username + " set " + unit->getUnitName() + "(" + unit->getName() + ") altitude type: " + to_string(value[L"altitudeType"]), true);
+		}
 	}
+	/************************/
 	else if (key.compare("cloneUnits") == 0)
 	{
 		vector<CloneOptions> cloneOptions;
@@ -395,61 +364,81 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 
 		command = dynamic_cast<Command*>(new Clone(cloneOptions, deleteOriginal));
 	}
+	/************************/
 	else if (key.compare("setROE") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unsigned char ROE = value[L"ROE"].as_number().to_uint32();
+		if (unit != nullptr) {
-		unit->setROE(ROE);
+			unsigned char ROE = value[L"ROE"].as_number().to_uint32();
-		log(username + " set unit " + unit->getName() + " ROE to " + to_string(ROE), true);
+			unit->setROE(ROE);
+			log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") ROE to " + to_string(ROE), true);
+		}
 	}
+	/************************/
 	else if (key.compare("setReactionToThreat") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unsigned char reactionToThreat = value[L"reactionToThreat"].as_number().to_uint32();
+		if (unit != nullptr) {
-		unit->setReactionToThreat(reactionToThreat);
+			unsigned char reactionToThreat = value[L"reactionToThreat"].as_number().to_uint32();
-		log(username + " set unit " + unit->getName() + " reaction to threat to " + to_string(reactionToThreat), true);
+			unit->setReactionToThreat(reactionToThreat);
+			log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") reaction to threat to " + to_string(reactionToThreat), true);
+		}
 	}
+	/************************/
 	else if (key.compare("setEmissionsCountermeasures") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unsigned char emissionsCountermeasures = value[L"emissionsCountermeasures"].as_number().to_uint32();
+		if (unit != nullptr) {
-		unit->setEmissionsCountermeasures(emissionsCountermeasures);
+			unsigned char emissionsCountermeasures = value[L"emissionsCountermeasures"].as_number().to_uint32();
-		log(username + " set unit " + unit->getName() + " emissions and countermeasures to " + to_string(emissionsCountermeasures), true);
+			unit->setEmissionsCountermeasures(emissionsCountermeasures);
+			log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") emissions and countermeasures to " + to_string(emissionsCountermeasures), true);
+		}
 	}
+	/************************/
 	else if (key.compare("landAt") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		double lat = value[L"location"][L"lat"].as_double();
+		if (unit != nullptr) {
-		double lng = value[L"location"][L"lng"].as_double();
+			double lat = value[L"location"][L"lat"].as_double();
-		Coords loc; loc.lat = lat; loc.lng = lng;
+			double lng = value[L"location"][L"lng"].as_double();
-		unit->landAt(loc);
+			Coords loc; loc.lat = lat; loc.lng = lng;
-		log(username + " tasked unit " + unit->getName() + " to land", true);
+			unit->landAt(loc);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to land", true);
+		}
 	}
+	/************************/
 	else if (key.compare("deleteUnit") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		bool explosion = value[L"explosion"].as_bool();
+		string explosionType = to_string(value[L"explosionType"]);
 		bool immediate = value[L"immediate"].as_bool();
-		unitsManager->deleteUnit(ID, explosion, immediate);
 		Unit* unit = unitsManager->getUnit(ID);
-		log(username + " deleted unit " + unit->getName(), true);
+		if (unit != nullptr) {
+			unitsManager->deleteUnit(ID, explosion, explosionType, immediate);
+			log(username + " deleted unit " + unit->getUnitName() + "(" + unit->getName() + ")", true);
+		}
 	}
+	/************************/
 	else if (key.compare("refuel") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::REFUEL);
+		if (unit != nullptr) {
-		log(username + " tasked unit " + unit->getName() + " to refuel", true);
+			unit->setState(State::REFUEL);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ")  to refuel", true);
+		}
 	}
+	/************************/
 	else if (key.compare("setAdvancedOptions") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -489,33 +478,46 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 				});
 
 			unit->resetActiveDestination();
+
+			log(username + " updated unit " + unit->getUnitName() + "(" + unit->getName() + ") advancedOptions", true);
 		}
 	}
+	/************************/
 	else if (key.compare("setFollowRoads") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		bool followRoads = value[L"followRoads"].as_bool();
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setFollowRoads(followRoads);
+		if (unit != nullptr) {
+			unit->setFollowRoads(followRoads);
+			log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") followRoads to: " + (followRoads ? "true" : "false"), true);
+		}
 	}
+	/************************/
 	else if (key.compare("setOnOff") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		bool onOff = value[L"onOff"].as_bool();
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setOnOff(onOff);
+		if (unit != nullptr) {
+			unit->setOnOff(onOff);
+			log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") onOff to: " + (onOff? "true": "false"), true);
+		}
 	}
+	/************************/
 	else if (key.compare("explosion") == 0)
 	{
 		unsigned int intensity = value[L"intensity"].as_integer();
+		string explosionType = to_string(value[L"explosionType"]);
 		double lat = value[L"location"][L"lat"].as_double();
 		double lng = value[L"location"][L"lng"].as_double();
-		log("Adding " + to_string(intensity) + " explosion at (" + to_string(lat) + ", " + to_string(lng) + ")");
+		log("Adding explosion of type " + explosionType + " at (" + to_string(lat) + ", " + to_string(lng) + ")");
 		Coords loc; loc.lat = lat; loc.lng = lng;
-		command = dynamic_cast<Command*>(new Explosion(intensity, loc));
+		command = dynamic_cast<Command*>(new Explosion(intensity, explosionType, loc));
 	}
+	/************************/
 	else if (key.compare("bombPoint") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -524,10 +526,13 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		double lng = value[L"location"][L"lng"].as_double();
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::BOMB_POINT);
+		if (unit != nullptr) {
-		unit->setTargetPosition(loc);
+			unit->setTargetPosition(loc);
-		log(username + " tasked unit " + unit->getName() + " to bomb a point", true);
+			unit->setState(State::BOMB_POINT);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to bomb a point", true);
+		}
 	}
+	/************************/
 	else if (key.compare("carpetBomb") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -536,10 +541,14 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		double lng = value[L"location"][L"lng"].as_double();
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::CARPET_BOMB);
+		if (unit != nullptr) {
-		unit->setTargetPosition(loc);
+			unit->setTargetPosition(loc);
-		log(username + " tasked unit " + unit->getName() + " to perform carpet bombing", true);
+			unit->setState(State::CARPET_BOMB);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to perform carpet bombing", true);
+		}
 	}
+	/************************/
+	/* TODO: this command does not appear to be working in DCS and has been disabled */
 	else if (key.compare("bombBuilding") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -548,9 +557,12 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		double lng = value[L"location"][L"lng"].as_double();
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::BOMB_BUILDING);
+		if (unit != nullptr) {
-		unit->setTargetPosition(loc);
+			unit->setTargetPosition(loc);
+			unit->setState(State::BOMB_BUILDING);
+		}
 	}
+	/************************/
 	else if (key.compare("fireAtArea") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -559,10 +571,13 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		double lng = value[L"location"][L"lng"].as_double();
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::FIRE_AT_AREA);
+		if (unit != nullptr) {
-		unit->setTargetPosition(loc);
+			unit->setTargetPosition(loc);
-		log(username + " tasked unit " + unit->getName() + " to fire at area", true);
+			unit->setState(State::FIRE_AT_AREA);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to fire at area", true);
+		}
 	}
+	/************************/
 	else if (key.compare("simulateFireFight") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -572,34 +587,45 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		double alt = value[L"altitude"].as_double();
 		Coords loc; loc.lat = lat; loc.lng = lng; loc.alt = alt;
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::SIMULATE_FIRE_FIGHT);
+		if (unit != nullptr) {
-		unit->setTargetPosition(loc);
+			unit->setTargetPosition(loc);
-		log(username + " tasked unit " + unit->getName() + " to simulate a fire fight", true);
+			unit->setState(State::SIMULATE_FIRE_FIGHT);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to simulate a fire fight", true);
+		}
 	}
+	/************************/
 	else if (key.compare("scenicAAA") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::SCENIC_AAA);
+		if (unit != nullptr) {
-		log(username + " tasked unit " + unit->getName() + " to enter scenic AAA state", true);
+			unit->setState(State::SCENIC_AAA);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to enter scenic AAA state", true);
+		}
 	}
+	/************************/
 	else if (key.compare("missOnPurpose") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setState(State::MISS_ON_PURPOSE);
+		if (unit != nullptr) {
-		log(username + " tasked unit " + unit->getName() + " to enter Miss On Purpose state", true);
+			unit->setState(State::MISS_ON_PURPOSE);
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to enter Miss On Purpose state", true);
+		}
 	}
+	/************************/
 	else if (key.compare("setOperateAs") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
 		unitsManager->acquireControl(ID);
 		unsigned char operateAs = value[L"operateAs"].as_number().to_uint32();
 		Unit* unit = unitsManager->getGroupLeader(ID);
-		unit->setOperateAs(operateAs);
+		if (unit != nullptr) 
+			unit->setOperateAs(operateAs);
 	}
+	/************************/
 	else if (key.compare("landAtPoint") == 0)
 	{
 		unsigned int ID = value[L"ID"].as_integer();
@@ -609,21 +635,50 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
 
-		list<Coords> newPath;
+		if (unit != nullptr) {
-		newPath.push_back(loc);
+			list<Coords> newPath;
-		unit->setActivePath(newPath);
+			newPath.push_back(loc);
-		unit->setState(State::LAND_AT_POINT);
+			unit->setActivePath(newPath);
-		
+			unit->setState(State::LAND_AT_POINT);
-		log(username + " tasked unit " + unit->getName() + " to land at point", true);
+
+			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to land at point", true);
+		}
 	}
+	/************************/
+	else if (key.compare("setShotsScatter") == 0)
+	{
+		unsigned int ID = value[L"ID"].as_integer();
+		unitsManager->acquireControl(ID);
+		Unit* unit = unitsManager->getGroupLeader(ID);
+		if (unit != nullptr) {
+			unsigned char shotsScatter = value[L"shotsScatter"].as_number().to_uint32();
+			unit->setShotsScatter(shotsScatter);
+			log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") shots scatter to " + to_string(shotsScatter), true);
+		}
+	}
+	/************************/
+	else if (key.compare("setShotsIntensity") == 0)
+	{
+		unsigned int ID = value[L"ID"].as_integer();
+		unitsManager->acquireControl(ID);
+		Unit* unit = unitsManager->getGroupLeader(ID);
+		if (unit != nullptr) {
+			unsigned char shotsIntensity = value[L"shotsIntensity"].as_number().to_uint32();
+			unit->setShotsIntensity(shotsIntensity);
+			log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") shots intensity to " + to_string(shotsIntensity), true);
+		}
+	}
+	/************************/
 	else if (key.compare("setCommandModeOptions") == 0) 
 	{
 		setCommandModeOptions(value);
 		log(username + " updated the Command Mode Options", true);
 	}
+	/************************/
 	else if (key.compare("reloadDatabases") == 0) {
 		unitsManager->loadDatabases();
 	}
+	/************************/
 	else
 	{
 		log("Unknown command: " + key);

backend/core/src/scriptloader.cpp

@@ -2,9 +2,12 @@
 #include "logger.h"
 #include "luatools.h"
 #include "dcstools.h"
+#include "defines.h"
 
 #include <algorithm>
 
+extern string instancePath;
+
 bool executeLuaScript(lua_State* L, string path)
 {
     replace(path.begin(), path.end(), '\\', '/');
@@ -36,21 +39,9 @@ void registerLuaFunctions(lua_State* L)
         log("protectedCall registered successfully");
     }
 
-    char* buf = nullptr;
+    executeLuaScript(L, instancePath + MIST_SCRIPT);
-    size_t sz = 0;
+    executeLuaScript(L, instancePath + OLYMPUS_COMMAND_SCRIPT);
-    if (_dupenv_s(&buf, &sz, "DCSOLYMPUS_PATH") == 0 && buf != nullptr)
+    executeLuaScript(L, instancePath + UNIT_PAYLOADS_SCRIPT);
-    {
+    executeLuaScript(L, instancePath + TEMPLATES_SCRIPT);
-        modLocation = buf;
+    executeLuaScript(L, instancePath + MODS_SCRIPT);
-        free(buf);
-    }
-    else
-    {
-        log("DCSOLYMPUS_PATH environment variable is missing");
-        return;
-    }
-
-    executeLuaScript(L, modLocation + "\\Scripts\\mist.lua");
-    executeLuaScript(L, modLocation + "\\Scripts\\OlympusCommand.lua");
-    executeLuaScript(L, modLocation + "\\Scripts\\unitPayloads.lua");
-    executeLuaScript(L, modLocation + "\\Scripts\\templates.lua");
 }

backend/core/src/server.cpp

@@ -19,6 +19,7 @@ extern Scheduler* scheduler;
 extern json::value missionData;
 extern mutex mutexLock;
 extern string sessionHash;
+extern string instancePath;
 
 void handle_eptr(std::exception_ptr eptr)
 {
@@ -88,7 +89,7 @@ void Server::handle_get(http_request request)
                 try {
                     time = stoull((*(query.find(L"time"))).second);
                 }
-                catch (const std::exception& e) {
+                catch (...) {
                     time = 0;
                 }
             }
@@ -286,39 +287,32 @@ string Server::extractPassword(http_request& request) {
 void Server::task()
 {
     string address = REST_ADDRESS;
-    string modLocation;
+    string jsonLocation = instancePath + OLYMPUS_JSON_PATH;
-    char* buf = nullptr;
-    size_t sz = 0;
-    if (_dupenv_s(&buf, &sz, "DCSOLYMPUS_PATH") == 0 && buf != nullptr)
-    {
-        std::ifstream ifstream(string(buf) + OLYMPUS_JSON_PATH);
-        std::stringstream ss;
-        ss << ifstream.rdbuf();
-        std::error_code errorCode;
-        json::value config = json::value::parse(ss.str(), errorCode);
-        if (config.is_object() && config.has_object_field(L"server") &&
-            config[L"server"].has_string_field(L"address") && config[L"server"].has_number_field(L"port"))
-        {
-            address = "http://" + to_string(config[L"server"][L"address"]) + ":" + to_string(config[L"server"][L"port"].as_number().to_int32());
-            log("Starting server on " + address);
-        }
-        else
-            log("Error reading configuration file. Starting server on " + address);
 
-        if (config.is_object() && config.has_object_field(L"authentication"))
+    log("Reading configuration from " + jsonLocation);
-        {
+
-            if (config[L"authentication"].has_string_field(L"gameMasterPassword")) gameMasterPassword = to_string(config[L"authentication"][L"gameMasterPassword"]);
+    std::ifstream ifstream(jsonLocation);
-            if (config[L"authentication"].has_string_field(L"blueCommanderPassword")) blueCommanderPassword = to_string(config[L"authentication"][L"blueCommanderPassword"]);
+    std::stringstream ss;
-            if (config[L"authentication"].has_string_field(L"redCommanderPassword")) redCommanderPassword = to_string(config[L"authentication"][L"redCommanderPassword"]);
+    ss << ifstream.rdbuf();
-        }
+    std::error_code errorCode;
-        else
+    json::value config = json::value::parse(ss.str(), errorCode);
-            log("Error reading configuration file. No password set.");
+    if (config.is_object() && config.has_object_field(L"backend") &&
-        free(buf);
+        config[L"backend"].has_string_field(L"address") && config[L"backend"].has_number_field(L"port"))
+    {
+        address = "http://" + to_string(config[L"backend"][L"address"]) + ":" + to_string(config[L"backend"][L"port"].as_number().to_int32());
+        log("Starting backend on " + address);
     }
     else
+        log("Error reading configuration file. Starting backend on " + address);
+
+    if (config.is_object() && config.has_object_field(L"authentication"))
     {
-        log("DCSOLYMPUS_PATH environment variable is missing, starting server on " + address);
+        if (config[L"authentication"].has_string_field(L"gameMasterPassword")) gameMasterPassword = to_string(config[L"authentication"][L"gameMasterPassword"]);
+        if (config[L"authentication"].has_string_field(L"blueCommanderPassword")) blueCommanderPassword = to_string(config[L"authentication"][L"blueCommanderPassword"]);
+        if (config[L"authentication"].has_string_field(L"redCommanderPassword")) redCommanderPassword = to_string(config[L"authentication"][L"redCommanderPassword"]);
     }
+    else
+        log("Error reading configuration file. No password set.");
 
     http_listener listener(to_wstring(address + "/" + REST_URI));
 
@@ -336,7 +330,7 @@ void Server::task()
                 .then([&listener]() {log("RESTServer starting to listen"); })
                 .wait();
             
-        while (runListener);
+        while (runListener) { Sleep(1000); };
 
         listener.close()
                 .then([&listener]() {log("RESTServer stopping connections"); })

backend/core/src/unit.cpp

@@ -27,6 +27,13 @@ Unit::~Unit()
 }
 
 void Unit::initialize(json::value json)
+{
+	update(json, 0);
+	setDefaults();
+}
+
+
+void Unit::update(json::value json, double dt)
 {
 	if (json.has_string_field(L"name"))
 		setName(to_string(json[L"name"]));
@@ -37,23 +44,18 @@ void Unit::initialize(json::value json)
 	if (json.has_string_field(L"groupName"))
 		setGroupName(to_string(json[L"groupName"]));
 
+	if (json.has_string_field(L"callsign"))
+		setCallsign(to_string(json[L"callsign"]));
+
 	if (json.has_number_field(L"coalitionID"))
 		setCoalition(json[L"coalitionID"].as_number().to_int32());
-
 	//if (json.has_number_field(L"Country"))
 	//	setCountry(json[L"Country"].as_number().to_int32());
-
+	
 	/* All units which contain the name "Olympus" are automatically under AI control */
 	if (getUnitName().find("Olympus") != string::npos)
 		setControlled(true);
 
-	update(json, 0);
-	setDefaults();
-}
-
-
-void Unit::update(json::value json, double dt)
-{
 	if (json.has_object_field(L"position"))
 	{
 		setPosition({
@@ -66,9 +68,18 @@ void Unit::update(json::value json, double dt)
 	if (json.has_number_field(L"heading"))
 		setHeading(json[L"heading"].as_number().to_double());
 
+	if (json.has_number_field(L"track"))
+		setTrack(json[L"track"].as_number().to_double());
+
 	if (json.has_number_field(L"speed"))
 		setSpeed(json[L"speed"].as_number().to_double());
 
+	if (json.has_number_field(L"horizontalVelocity"))
+		setHorizontalVelocity(json[L"horizontalVelocity"].as_number().to_double());
+
+	if (json.has_number_field(L"verticalVelocity"))
+		setVerticalVelocity(json[L"verticalVelocity"].as_number().to_double());
+
 	if (json.has_boolean_field(L"isAlive"))
 		setAlive(json[L"isAlive"].as_bool());
 
@@ -131,6 +142,9 @@ void Unit::update(json::value json, double dt)
 	if (json.has_boolean_field(L"hasTask"))
 		setHasTask(json[L"hasTask"].as_bool());
 
+	if (json.has_number_field(L"health"))
+		setHealth(static_cast<unsigned char>(json[L"health"].as_number().to_uint32()));
+
 	runAILoop();
 }
 
@@ -146,7 +160,7 @@ void Unit::runAILoop() {
 
 	/* If the unit is alive, controlled, is the leader of the group and it is not a human, run the AI Loop that performs the requested commands and instructions (moving, attacking, etc) */
 	if (getAlive() && getControlled() && !getHuman() && getIsLeader()) {
-		if (checkTaskFailed() && state != State::IDLE && state != State::LAND) {
+		if (getEnableTaskCheckFailed() && checkTaskFailed()) {
 			log(unitName + " has no task, switching to IDLE state");
 			setState(State::IDLE);
 		}
@@ -192,6 +206,8 @@ void Unit::refreshLeaderData(unsigned long long time) {
 					case DataIndex::generalSettings:			updateValue(generalSettings, leader->generalSettings, datumIndex); break;
 					case DataIndex::activePath:					updateValue(activePath, leader->activePath, datumIndex); break;
 					case DataIndex::operateAs:					updateValue(operateAs, leader->operateAs, datumIndex); break;
+					case DataIndex::shotsScatter:				updateValue(shotsScatter, leader->shotsScatter, datumIndex); break;
+					case DataIndex::shotsIntensity:				updateValue(shotsIntensity, leader->shotsIntensity, datumIndex); break;
 					}
 				}
 			}
@@ -233,45 +249,52 @@ void Unit::getData(stringstream& ss, unsigned long long time)
 		{
 			if (checkFreshness(datumIndex, time)) {
 				switch (datumIndex) {
-				case DataIndex::category:					appendString(ss, datumIndex, category); break;
+					case DataIndex::category:					appendString(ss, datumIndex, category); break;
-				case DataIndex::alive:						appendNumeric(ss, datumIndex, alive); break;
+					case DataIndex::alive:						appendNumeric(ss, datumIndex, alive); break;
-				case DataIndex::human:						appendNumeric(ss, datumIndex, human); break;
+					case DataIndex::human:						appendNumeric(ss, datumIndex, human); break;
-				case DataIndex::controlled:					appendNumeric(ss, datumIndex, controlled); break;
+					case DataIndex::controlled:					appendNumeric(ss, datumIndex, controlled); break;
-				case DataIndex::coalition:					appendNumeric(ss, datumIndex, coalition); break;
+					case DataIndex::coalition:					appendNumeric(ss, datumIndex, coalition); break;
-				case DataIndex::country:					appendNumeric(ss, datumIndex, country); break;
+					case DataIndex::country:					appendNumeric(ss, datumIndex, country); break;
-				case DataIndex::name:						appendString(ss, datumIndex, name); break;
+					case DataIndex::name:						appendString(ss, datumIndex, name); break;
-				case DataIndex::unitName:					appendString(ss, datumIndex, unitName); break;
+					case DataIndex::unitName:					appendString(ss, datumIndex, unitName); break;
-				case DataIndex::groupName:					appendString(ss, datumIndex, groupName); break;
+					case DataIndex::callsign:					appendString(ss, datumIndex, callsign); break;
-				case DataIndex::state:						appendNumeric(ss, datumIndex, state); break;
+					case DataIndex::groupName:					appendString(ss, datumIndex, groupName); break;
-				case DataIndex::task:						appendString(ss, datumIndex, task); break;
+					case DataIndex::state:						appendNumeric(ss, datumIndex, state); break;
-				case DataIndex::hasTask:					appendNumeric(ss, datumIndex, hasTask); break;
+					case DataIndex::task:						appendString(ss, datumIndex, task); break;
-				case DataIndex::position:					appendNumeric(ss, datumIndex, position); break;
+					case DataIndex::hasTask:					appendNumeric(ss, datumIndex, hasTask); break;
-				case DataIndex::speed:						appendNumeric(ss, datumIndex, speed); break;
+					case DataIndex::position:					appendNumeric(ss, datumIndex, position); break;
-				case DataIndex::heading:					appendNumeric(ss, datumIndex, heading); break;
+					case DataIndex::speed:						appendNumeric(ss, datumIndex, speed); break;
-				case DataIndex::isActiveTanker:					appendNumeric(ss, datumIndex, isActiveTanker); break;
+					case DataIndex::horizontalVelocity:			appendNumeric(ss, datumIndex, horizontalVelocity); break;
-				case DataIndex::isActiveAWACS:					appendNumeric(ss, datumIndex, isActiveAWACS); break;
+					case DataIndex::verticalVelocity:			appendNumeric(ss, datumIndex, verticalVelocity); break;
-				case DataIndex::onOff:						appendNumeric(ss, datumIndex, onOff); break;
+					case DataIndex::heading:					appendNumeric(ss, datumIndex, heading); break;
-				case DataIndex::followRoads:				appendNumeric(ss, datumIndex, followRoads); break;
+					case DataIndex::track:						appendNumeric(ss, datumIndex, track); break;
-				case DataIndex::fuel:						appendNumeric(ss, datumIndex, fuel); break;
+					case DataIndex::isActiveTanker:				appendNumeric(ss, datumIndex, isActiveTanker); break;
-				case DataIndex::desiredSpeed:				appendNumeric(ss, datumIndex, desiredSpeed); break;
+					case DataIndex::isActiveAWACS:				appendNumeric(ss, datumIndex, isActiveAWACS); break;
-				case DataIndex::desiredSpeedType:			appendNumeric(ss, datumIndex, desiredSpeedType); break;
+					case DataIndex::onOff:						appendNumeric(ss, datumIndex, onOff); break;
-				case DataIndex::desiredAltitude:			appendNumeric(ss, datumIndex, desiredAltitude); break;
+					case DataIndex::followRoads:				appendNumeric(ss, datumIndex, followRoads); break;
-				case DataIndex::desiredAltitudeType:		appendNumeric(ss, datumIndex, desiredAltitudeType); break;
+					case DataIndex::fuel:						appendNumeric(ss, datumIndex, fuel); break;
-				case DataIndex::leaderID:					appendNumeric(ss, datumIndex, leaderID); break;
+					case DataIndex::desiredSpeed:				appendNumeric(ss, datumIndex, desiredSpeed); break;
-				case DataIndex::formationOffset:			appendNumeric(ss, datumIndex, formationOffset); break;
+					case DataIndex::desiredSpeedType:			appendNumeric(ss, datumIndex, desiredSpeedType); break;
-				case DataIndex::targetID:					appendNumeric(ss, datumIndex, targetID); break;
+					case DataIndex::desiredAltitude:			appendNumeric(ss, datumIndex, desiredAltitude); break;
-				case DataIndex::targetPosition:				appendNumeric(ss, datumIndex, targetPosition); break;
+					case DataIndex::desiredAltitudeType:		appendNumeric(ss, datumIndex, desiredAltitudeType); break;
-				case DataIndex::ROE:						appendNumeric(ss, datumIndex, ROE); break;
+					case DataIndex::leaderID:					appendNumeric(ss, datumIndex, leaderID); break;
-				case DataIndex::reactionToThreat:			appendNumeric(ss, datumIndex, reactionToThreat); break;
+					case DataIndex::formationOffset:			appendNumeric(ss, datumIndex, formationOffset); break;
-				case DataIndex::emissionsCountermeasures:	appendNumeric(ss, datumIndex, emissionsCountermeasures); break;
+					case DataIndex::targetID:					appendNumeric(ss, datumIndex, targetID); break;
-				case DataIndex::TACAN:						appendNumeric(ss, datumIndex, TACAN); break;
+					case DataIndex::targetPosition:				appendNumeric(ss, datumIndex, targetPosition); break;
-				case DataIndex::radio:						appendNumeric(ss, datumIndex, radio); break;
+					case DataIndex::ROE:						appendNumeric(ss, datumIndex, ROE); break;
-				case DataIndex::generalSettings:			appendNumeric(ss, datumIndex, generalSettings); break;
+					case DataIndex::reactionToThreat:			appendNumeric(ss, datumIndex, reactionToThreat); break;
-				case DataIndex::ammo:						appendVector(ss, datumIndex, ammo); break;
+					case DataIndex::emissionsCountermeasures:	appendNumeric(ss, datumIndex, emissionsCountermeasures); break;
-				case DataIndex::contacts:					appendVector(ss, datumIndex, contacts); break;
+					case DataIndex::TACAN:						appendNumeric(ss, datumIndex, TACAN); break;
-				case DataIndex::activePath:					appendList(ss, datumIndex, activePath); break;
+					case DataIndex::radio:						appendNumeric(ss, datumIndex, radio); break;
-				case DataIndex::isLeader:					appendNumeric(ss, datumIndex, isLeader); break;
+					case DataIndex::generalSettings:			appendNumeric(ss, datumIndex, generalSettings); break;
-				case DataIndex::operateAs:					appendNumeric(ss, datumIndex, operateAs); break;
+					case DataIndex::ammo:						appendVector(ss, datumIndex, ammo); break;
+					case DataIndex::contacts:					appendVector(ss, datumIndex, contacts); break;
+					case DataIndex::activePath:					appendList(ss, datumIndex, activePath); break;
+					case DataIndex::isLeader:					appendNumeric(ss, datumIndex, isLeader); break;
+					case DataIndex::operateAs:					appendNumeric(ss, datumIndex, operateAs); break;
+					case DataIndex::shotsScatter:				appendNumeric(ss, datumIndex, shotsScatter); break;
+					case DataIndex::shotsIntensity:				appendNumeric(ss, datumIndex, shotsIntensity); break;
+					case DataIndex::health:						appendNumeric(ss, datumIndex, health); break;
 				}
 			}
 		}
@@ -410,7 +433,11 @@ void Unit::resetTask()
 void Unit::setFormationOffset(Offset newFormationOffset)
 {
 	formationOffset = newFormationOffset;
-	resetTask();
+	
+	/* Apply the change */
+	setHasTask(false);
+	resetTaskFailedCounter();
+	AIloop();
 
 	triggerUpdate(DataIndex::formationOffset);
 }
@@ -499,7 +526,11 @@ void Unit::setIsActiveTanker(bool newIsActiveTanker)
 {
 	if (isActiveTanker != newIsActiveTanker) {
 		isActiveTanker = newIsActiveTanker;
-		resetTask();
+		
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::isActiveTanker);
 	}
@@ -509,7 +540,11 @@ void Unit::setIsActiveAWACS(bool newIsActiveAWACS)
 {
 	if (isActiveAWACS != newIsActiveAWACS) {
 		isActiveAWACS = newIsActiveAWACS;
-		resetTask();
+		
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::isActiveAWACS);
 	}
@@ -522,6 +557,12 @@ void Unit::setTACAN(DataTypes::TACAN newTACAN, bool force)
 		TACAN = newTACAN;
 		if (TACAN.isOn) {
 			std::ostringstream commandSS;
+
+			if (TACAN.channel < 0)
+				TACAN.channel = 0;
+			if (TACAN.channel > 126)
+				TACAN.channel = 126;
+
 			commandSS << "{"
 				<< "id = 'ActivateBeacon',"
 				<< "params = {"
@@ -559,6 +600,12 @@ void Unit::setRadio(DataTypes::Radio newRadio, bool force)
 		std::ostringstream commandSS;
 		Command* command;
 
+		if (radio.frequency < 0)
+			radio.frequency = 0;
+		
+		if (radio.frequency > 999000000)
+			radio.frequency = 999000000;
+
 		commandSS << "{"
 			<< "id = 'SetFrequency',"
 			<< "params = {"
@@ -612,10 +659,11 @@ void Unit::setDesiredSpeed(double newDesiredSpeed)
 {
 	if (desiredSpeed != newDesiredSpeed) {
 		desiredSpeed = newDesiredSpeed;
-		if (state == State::IDLE)
+		
-			resetTask();
+		/* Apply the change */
-		else
+		setHasTask(false);
-			goToDestination();		/* Send the command to reach the destination */
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredSpeed);
 	}
@@ -625,10 +673,11 @@ void Unit::setDesiredAltitude(double newDesiredAltitude)
 {
 	if (desiredAltitude != newDesiredAltitude) {
 		desiredAltitude = newDesiredAltitude;
-		if (state == State::IDLE)
+
-			resetTask();
+		/* Apply the change */
-		else
+		setHasTask(false);
-			goToDestination();		/* Send the command to reach the destination */
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredAltitude);
 	}
@@ -638,10 +687,11 @@ void Unit::setDesiredSpeedType(string newDesiredSpeedType)
 {
 	if (desiredSpeedType != (newDesiredSpeedType.compare("GS") == 0)) {
 		desiredSpeedType = newDesiredSpeedType.compare("GS") == 0;
-		if (state == State::IDLE)
+
-			resetTask();
+		/* Apply the change */
-		else
+		setHasTask(false);
-			goToDestination();		/* Send the command to reach the destination */
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredSpeedType);
 	}
@@ -651,10 +701,11 @@ void Unit::setDesiredAltitudeType(string newDesiredAltitudeType)
 {
 	if (desiredAltitudeType != (newDesiredAltitudeType.compare("AGL") == 0)) {
 		desiredAltitudeType = newDesiredAltitudeType.compare("AGL") == 0;
-		if (state == State::IDLE)
+		
-			resetTask();
+		/* Apply the change */
-		else
+		setHasTask(false);
-			goToDestination();		/* Send the command to reach the destination */
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredAltitudeType);
 	}
@@ -664,7 +715,7 @@ void Unit::goToDestination(string enrouteTask)
 {
 	if (activeDestination != NULL)
 	{
-		Command* command = dynamic_cast<Command*>(new Move(groupName, activeDestination, getDesiredSpeed(), getDesiredSpeedType() ? "GS" : "CAS", getDesiredAltitude(), getDesiredAltitudeType() ? "AGL" : "ASL", enrouteTask, getCategory(), [this]() { this->setHasTaskAssigned(true); }));
+		Command* command = dynamic_cast<Command*>(new Move(groupName, activeDestination, getDesiredSpeed(), getDesiredSpeedType() ? "GS" : "CAS", getDesiredAltitude(), getDesiredAltitudeType() ? "AGL" : "ASL", enrouteTask, getCategory(), getFollowRoads(), [this]() { this->setHasTaskAssigned(true); }));
 		scheduler->appendCommand(command);
 		setHasTask(true);
 	}
@@ -730,6 +781,10 @@ bool Unit::updateActivePath(bool looping)
 	}
 }
 
+void Unit::setHasTask(bool newValue) {
+	updateValue(hasTask, newValue, DataIndex::hasTask); 
+}
+
 bool Unit::checkTaskFailed()
 {
 	if (getHasTask())

backend/core/src/unitsmanager.cpp

@@ -142,11 +142,11 @@ void UnitsManager::getUnitData(stringstream &ss, unsigned long long time)
 		p.second->getData(ss, time);
 }
 
-void UnitsManager::deleteUnit(unsigned int ID, bool explosion, bool immediate)
+void UnitsManager::deleteUnit(unsigned int ID, bool explosion, string explosionType, bool immediate)
 {
 	if (getUnit(ID) != nullptr)
 	{
-		Command* command = dynamic_cast<Command*>(new Delete(ID, explosion, immediate));
+		Command* command = dynamic_cast<Command*>(new Delete(ID, explosion, explosionType, immediate));
 		scheduler->appendCommand(command);
 	}
 }
@@ -172,19 +172,20 @@ Unit* UnitsManager::getClosestUnit(Unit* unit, unsigned char coalition, vector<s
 			double bearing1;
 			double bearing2;
 			Geodesic::WGS84().Inverse(unit->getPosition().lat, unit->getPosition().lng, p.second->getPosition().lat, p.second->getPosition().lng, dist, bearing1, bearing2);
+			double altDelta = unit->getPosition().alt - p.second->getPosition().alt;
 
 			/* If the closest unit has not been assigned yet, assign it to this unit */
 			if (closestUnit == nullptr)
 			{
 				closestUnit = p.second;
-				distance = dist;
+				distance = sqrt(dist * dist + altDelta * altDelta);
 			
 			}
 			else {
 				/* Check if the unit is closer than the one already selected */
 				if (dist < distance) {
 					closestUnit = p.second;
-					distance = dist;
+					distance = sqrt(dist * dist + altDelta * altDelta);
 				}
 			}
 		}
@@ -193,6 +194,35 @@ Unit* UnitsManager::getClosestUnit(Unit* unit, unsigned char coalition, vector<s
 	return closestUnit;
 }
 
+map<Unit*, double> UnitsManager::getUnitsInRange(Unit* unit, unsigned char coalition, vector<string> categories, double range) {
+	map<Unit*, double> unitsInRange;
+
+	for (auto const& p : units) {
+		/* Check if the units category is of the correct type */
+		bool requestedCategory = false;
+		for (auto const& category : categories) {
+			if (p.second->getCategory().compare(category) == 0) {
+				requestedCategory = true;
+				break;
+			}
+		}
+
+		/* Check if the unit belongs to the desired coalition, is alive, and is of the category requested */
+		if (requestedCategory && p.second->getCoalition() == coalition && p.second->getAlive()) {
+			/* Compute the distance from the unit to the tested unit */
+			double dist;
+			double bearing1;
+			double bearing2;
+			Geodesic::WGS84().Inverse(unit->getPosition().lat, unit->getPosition().lng, p.second->getPosition().lat, p.second->getPosition().lng, dist, bearing1, bearing2);
+
+			if (dist <= range) 
+				unitsInRange[p.second] = dist;
+		}
+	}
+
+	return unitsInRange;
+}
+
 void UnitsManager::acquireControl(unsigned int ID) {
 	Unit* leader = getGroupLeader(ID);
 	if (leader != nullptr) {

backend/dcstools/dcstools.rc

@@ -0,0 +1,110 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,3,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "DCS Olympus"
+            VALUE "FileDescription", "DCS Olympus"
+            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.4.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United Kingdom) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

backend/dcstools/dcstools.vcxproj

@@ -23,6 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\dcstools.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\luatools\luatools.vcxproj">
@@ -32,6 +33,9 @@
       <Project>{b85009ce-4a5c-4a5a-b85d-001b3a2651b2}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="dcstools.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -73,19 +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" />
   </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" />
   </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" />
   </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" />
   </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>
@@ -134,6 +142,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

backend/dcstools/dcstools.vcxproj.filters

@@ -23,5 +23,13 @@
     <ClInclude Include="include\dcstools.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="dcstools.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

backend/dcstools/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by dcstools.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

backend/dcstools/src/dcstools.cpp

@@ -82,7 +82,7 @@ void getAllUnits(lua_State* L, map<unsigned int, json::value>& unitJSONs)
         lua_pushnil(L);
         while (lua_next(L, 2) != 0)
         {
-            unsigned int ID = lua_tonumber(L, -2);
+            unsigned int ID = static_cast<unsigned int>(lua_tonumber(L, -2));
             if (unitJSONs.find(ID) == unitJSONs.end())
                 unitJSONs[ID] = json::value::object();
             luaTableToJSON(L, -1, unitJSONs[ID]);

backend/logger/include/interface.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "framework.h"
 
+void DllExport setLogDirectory(std::string m_dirPath);
 void DllExport log(const std::string& sMessage, bool addToJSON = false);
 void DllExport log(const std::wstring& sMessage, bool addToJSON = false);
 void DllExport getLogsJSON(json::value& json, unsigned long long time);

backend/logger/include/logger.h

@@ -8,6 +8,7 @@ public:
     void log(const string& sMessage, bool addToJSON);
     void log(const wstring& sMessage, bool addToJSON);
     void toJSON(json::value& json, unsigned long long time);
+    void setDirectory(string newDirPath);
 
     static Logger* GetLogger();
 
@@ -20,9 +21,11 @@ private:
     static Logger* m_pThis;
     static ofstream m_Logfile;
     static std::map<unsigned long long, std::string> m_logs;
+    static string m_dirPath;
 
     mutex mutexLock;
 
+    void Clear();
     void Open();
     void Close();
 };

backend/logger/logger.rc

@@ -0,0 +1,110 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,3,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "DCS Olympus"
+            VALUE "FileDescription", "DCS Olympus"
+            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.4.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United Kingdom) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

backend/logger/logger.vcxproj

@@ -25,12 +25,16 @@
   <ItemGroup>
     <ClInclude Include="include\interface.h" />
     <ClInclude Include="include\logger.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\utils\utils.vcxproj">
       <Project>{b85009ce-4a5c-4a5a-b85d-001b3a2651b2}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="logger.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -72,19 +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" />
   </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" />
   </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" />
   </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" />
   </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>
@@ -133,6 +141,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

backend/logger/logger.vcxproj.filters

@@ -29,5 +29,13 @@
     <ClInclude Include="include\interface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="logger.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

backend/logger/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by logger.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

backend/logger/src/interface.cpp

@@ -4,6 +4,11 @@
 
 #define LOGGER Logger::GetLogger()
 
+void setLogDirectory(string m_dirPath) 
+{
+	LOGGER->setDirectory(m_dirPath);
+}
+
 void log(const string& message, bool addToJSON)
 {
 	LOGGER->log(message, addToJSON);

backend/logger/src/logger.cpp

@@ -8,25 +8,51 @@ const string Logger::m_sFileName = LOG_NAME;
 Logger* Logger::m_pThis = NULL;
 ofstream Logger::m_Logfile;
 std::map<unsigned long long, std::string> Logger::m_logs;
+std::string Logger::m_dirPath;
 
 Logger::Logger()
 {
 
 }
+
 Logger* Logger::GetLogger()
 {
     if (m_pThis == NULL) {
         m_pThis = new Logger();
-        std::filesystem::path dirPath = std::filesystem::temp_directory_path();
+        m_pThis->Clear();
-        m_Logfile.open((dirPath.string() + m_sFileName).c_str(), ios::out);
     }
     return m_pThis;
 }
 
+void Logger::setDirectory(string newDirPath)
+{
+    m_dirPath = newDirPath;
+    Clear();
+}
+
+void Logger::Clear()
+{
+    lock_guard<mutex> guard(mutexLock);
+    try {
+        m_Logfile.open((m_dirPath + m_sFileName).c_str(), ios::out | ios::trunc);
+    }
+    catch (...) {
+        std::filesystem::path m_dirPath = std::filesystem::temp_directory_path();
+        m_Logfile.open((m_dirPath.string() + m_sFileName).c_str(), ios::out | ios::trunc);
+    }
+    m_Logfile << "Creating a new log instance\n";
+    m_pThis->Close();
+}
+
 void Logger::Open()
 {
-    std::filesystem::path dirPath = std::filesystem::temp_directory_path();
+    try {
-    m_Logfile.open((dirPath.string() + m_sFileName).c_str(), ios::out | ios::app);
+        m_Logfile.open((m_dirPath + m_sFileName).c_str(), ios::out | std::ios::app);
+    }
+    catch (...) {
+        std::filesystem::path m_dirPath = std::filesystem::temp_directory_path();
+        m_Logfile.open((m_dirPath.string() + m_sFileName).c_str(), ios::out | std::ios::app);
+    }
 }
 
 void Logger::Close()

backend/luatools/include/luatools.h

@@ -5,6 +5,7 @@ void DllExport stackUpdate(lua_State* L, int& stackDepth, int initialStack = 0);
 void DllExport stackPop(lua_State* L, int popDepth = 1);
 void DllExport stackClean(lua_State* L, int stackDepth);
 void DllExport luaTableToJSON(lua_State* L, int index, json::value& json, bool logKeys = false);
+void DllExport luaLogTableKeys(lua_State* L, int index);
 
 #define STACK_UPDATE stackUpdate(L, stackDepth, initialStack);
 #define STACK_INIT int stackDepth = 0; int initialStack = 0; stackUpdate(L, initialStack);

backend/luatools/luatools.rc

@@ -0,0 +1,110 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,3,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "DCS Olympus"
+            VALUE "FileDescription", "DCS Olympus"
+            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.4.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United Kingdom) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

backend/luatools/luatools.vcxproj

@@ -60,19 +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" />
   </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" />
   </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" />
   </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" />
   </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>
@@ -121,6 +125,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -160,6 +165,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\luatools.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="luatools.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

backend/luatools/luatools.vcxproj.filters

@@ -23,5 +23,13 @@
     <ClInclude Include="include\luatools.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="luatools.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

backend/luatools/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by luatools.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

backend/luatools/src/luatools.cpp

@@ -18,6 +18,29 @@ void stackClean(lua_State* L, int stackDepth)
     lua_pop(L, stackDepth);
 }
 
+
+void luaLogTableKeys(lua_State* L, int index)
+{
+    if (lua_istable(L, index))
+    {
+        STACK_INIT;
+
+        lua_pushvalue(L, index);
+        lua_pushnil(L);
+        while (lua_next(L, -2))
+        {
+            lua_pushvalue(L, -2);
+            const char* key = lua_tostring(L, -1);
+            log(key);
+            lua_pop(L, 2);
+        }
+        lua_pop(L, 1);
+
+        STACK_CLEAN;
+    }
+}
+
+
 void luaTableToJSON(lua_State* L, int index, json::value& json, bool logKeys)
 {
     if (lua_istable(L, index))

backend/olympus/olympus.rc

@@ -0,0 +1,110 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,3,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "DCS Olympus"
+            VALUE "FileDescription", "DCS Olympus"
+            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.4.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United Kingdom) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

backend/olympus/olympus.vcxproj

@@ -20,10 +20,19 @@
     <ProjectReference Include="..\logger\logger.vcxproj">
       <Project>{873ecabe-fcfe-4217-ac15-91959c3cf1c6}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\luatools\luatools.vcxproj">
+      <Project>{de139ec1-4f88-47d5-be73-f41915fe14a3}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\utils\utils.vcxproj">
       <Project>{b85009ce-4a5c-4a5a-b85d-001b3a2651b2}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="olympus.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -53,9 +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" />
   </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" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -64,10 +75,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\..\..\bin\</OutDir>
+    <OutDir>.\..\..\build\backend\bin\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg">
-    <VcpkgAutoLink>true</VcpkgAutoLink>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -87,6 +95,7 @@
       <EnableUAC>false</EnableUAC>
       <AdditionalDependencies>lua.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\third-party\lua</AdditionalLibraryDirectories>
+      <Version>{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -112,6 +121,7 @@
       <EnableUAC>false</EnableUAC>
       <AdditionalDependencies>lua.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\third-party\lua</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>dcstools.dll;logger.dll;utils.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

backend/olympus/olympus.vcxproj.filters

@@ -13,4 +13,10 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="olympus.rc" />
+  </ItemGroup>
 </Project>

backend/olympus/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by olympus.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

backend/olympus/src/olympus.cpp

@@ -5,7 +5,7 @@
 
 /* Run-time linking to core dll allows for "hot swap". This is useful for development but could be removed when stable.*/
 HINSTANCE hGetProcIDDLL = NULL;
-typedef int(__stdcall* f_coreInit)(lua_State* L);
+typedef int(__stdcall* f_coreInit)(lua_State* L, const char* path);
 typedef int(__stdcall* f_coreDeinit)(lua_State* L);
 typedef int(__stdcall* f_coreFrame)(lua_State* L);
 typedef int(__stdcall* f_coreUnitsData)(lua_State* L);
@@ -18,25 +18,43 @@ f_coreUnitsData coreUnitsData = nullptr;
 f_coreWeaponsData coreWeaponsData = nullptr;
 f_coreMissionData coreMissionData = nullptr;
 
+string modPath;
+
+//Returns the last Win32 error, in string format. Returns an empty string if there is no error.
+std::string GetLastErrorAsString()
+{
+    //Get the error message ID, if any.
+    DWORD errorMessageID = ::GetLastError();
+    if (errorMessageID == 0) {
+        return std::string(); //No error message has been recorded
+    }
+
+    LPSTR messageBuffer = nullptr;
+
+    //Ask Win32 to give us the string version of that message ID.
+    //The parameters we pass in, tell Win32 to create the buffer that holds the message for us (because we don't yet know how long the message string will be).
+    size_t size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, NULL);
+
+    //Copy the error message into a std::string.
+    std::string message(messageBuffer, size);
+
+    //Free the Win32's string's buffer.
+    LocalFree(messageBuffer);
+
+    return message;
+}
+
 static int onSimulationStart(lua_State* L)
 {
+    LogInfo(L, "Trying to load core.dll from " + modPath);
+    SetDllDirectoryA(modPath.c_str());
+
+    setLogDirectory(modPath);
+
     log("onSimulationStart callback called successfully");
 
-    string modLocation;
+    string dllLocation = modPath + "\\core.dll";
-    string dllLocation;
-    char* buf = nullptr;
-    size_t sz = 0;
-    if (_dupenv_s(&buf, &sz, "DCSOLYMPUS_PATH") == 0 && buf != nullptr)
-    {
-        modLocation = buf;
-        free(buf);
-    }
-    else
-    {
-        log("DCSOLYMPUS_PATH environment variable is missing");
-        goto error;
-    }
-    dllLocation = modLocation + "\\bin\\core.dll";
     
     log("Loading core.dll");
     hGetProcIDDLL = LoadLibrary(to_wstring(dllLocation).c_str());
@@ -90,14 +108,14 @@ static int onSimulationStart(lua_State* L)
         goto error;
     }
 
-    coreInit(L);
+    coreInit(L, modPath.c_str());
 
     LogInfo(L, "Module loaded and started successfully.");
 
 	return 0;
 
 error:
-    LogError(L, "Error while loading module, see Olympus.log in temporary folder for additional details.");
+    LogError(L, "Error while loading module: " + GetLastErrorAsString());
     return 0;
 }
 
@@ -144,7 +162,7 @@ static int onSimulationStop(lua_State* L)
     return 0;
 
 error:
-    LogError(L, "Error while unloading module, see Olympus.log in temporary folder for additional details.");
+    LogError(L, "Error while unloading module: " + GetLastErrorAsString());
     return 0;
 }
 
@@ -187,6 +205,34 @@ static const luaL_Reg Map[] = {
 
 extern "C" DllExport int luaopen_olympus(lua_State * L)
 {
+    lua_getglobal(L, "require");
+    lua_pushstring(L, "lfs");
+    lua_pcall(L, 1, 1, 0);
+    lua_getfield(L, -1, "writedir");
+    lua_pcall(L, 0, 1, 0);
+    if (lua_isstring(L, -1)) {
+        modPath = string(lua_tostring(L, -1)) + "Mods\\Services\\Olympus\\bin\\";
+        SetDllDirectoryA(modPath.c_str());
+        LogInfo(L, "Instance location retrieved successfully");
+    }
+    else {
+        /* Log without using the helper dlls because we have not loaded them yet here */
+        lua_getglobal(L, "log");
+        lua_getfield(L, -1, "ERROR");
+        int errorLevel = (int)lua_tointeger(L, -1);
+
+        lua_getglobal(L, "log");
+        lua_getfield(L, -1, "write");
+        lua_pushstring(L, "Olympus.dll");
+        lua_pushnumber(L, errorLevel);
+        lua_pushstring(L, "An error has occurred while trying to retrieve Olympus's instance location");
+        lua_pcall(L, 3, 0, 0);
+
+        return 0;
+    }
+
+    LogInfo(L, "Loading .dlls from " + modPath);
+
 	luaL_register(L, "olympus", Map);
 	return 1;
 }

backend/shared/include/defines.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#define VERSION "{{OLYMPUS_VERSION_NUMBER}}.{{OLYMPUS_COMMIT_HASH}}"
+#define LOG_NAME "..\\..\\..\\..\\Logs\\Olympus_log.txt"
+
+#define REST_ADDRESS "http://localhost:3001"
+#define REST_URI "olympus"
+#define UNITS_URI "units"
+#define WEAPONS_URI "weapons"
+#define LOGS_URI "logs"
+#define AIRBASES_URI "airbases"
+#define BULLSEYE_URI "bullseyes"
+#define MISSION_URI "mission"
+#define COMMANDS_URI "commands"
+
+#define FRAMERATE_TIME_INTERVAL 0.05
+
+#define OLYMPUS_JSON_PATH "..\\..\\..\\..\\Config\\olympus.json"
+#define AIRCRAFT_DATABASE_PATH "..\\databases\\units\\aircraftdatabase.json"
+#define HELICOPTER_DATABASE_PATH "..\\databases\\units\\helicopterdatabase.json"
+#define GROUNDUNIT_DATABASE_PATH "..\\databases\\units\\groundunitdatabase.json"
+#define NAVYUNIT_DATABASE_PATH "..\\databases\\units\\navyunitdatabase.json"
+
+#define MIST_SCRIPT "..\\Scripts\\mist.lua"
+#define OLYMPUS_COMMAND_SCRIPT "..\\Scripts\\OlympusCommand.lua"
+#define UNIT_PAYLOADS_SCRIPT "..\\Scripts\\unitPayloads.lua"
+#define TEMPLATES_SCRIPT "..\\Scripts\\templates.lua"
+#define MODS_SCRIPT "..\\Scripts\\mods.lua"

backend/utils/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by utils.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

backend/utils/src/utils.cpp

@@ -44,6 +44,7 @@ std::string to_string(const std::wstring& wstr)
 
 std::string random_string(size_t length)
 {
+    srand(static_cast<unsigned int>(time(NULL)));
     auto randchar = []() -> char
     {
         const char charset[] =

backend/utils/utils.rc

@@ -0,0 +1,110 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,3,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "DCS Olympus"
+            VALUE "FileDescription", "DCS Olympus"
+            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.4.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United Kingdom) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

backend/utils/utils.vcxproj

@@ -20,10 +20,14 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\utils.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="utils.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -65,19 +69,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" />
   </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" />
   </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" />
   </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" />
   </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>

backend/utils/utils.vcxproj.filters

@@ -14,10 +14,16 @@
     <ClInclude Include="include\utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="utils.rc" />
+  </ItemGroup>
 </Project>

backend/vcpkg-configuration.json

@@ -0,0 +1,14 @@
+{
+  "default-registry": {
+    "kind": "git",
+    "baseline": "7f9f0e44db287e8e67c0e888141bfa200ab45121",
+    "repository": "https://github.com/microsoft/vcpkg"
+  },
+  "registries": [
+    {
+      "kind": "artifact",
+      "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip",
+      "name": "microsoft"
+    }
+  ]
+}

backend/vcpkg.json

@@ -0,0 +1,6 @@
+{
+    "dependencies": [
+        "cpprestsdk",
+        "geographiclib"
+    ]
+}

build_package.bat

@@ -1,17 +1,2 @@
-cd src
+call .\scripts\batch\build.bat
-msbuild olympus.sln /t:Rebuild /p:Configuration=Release
+call .\scripts\batch\package.bat
-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 "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss"

client/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

client/app.js

@@ -1,49 +0,0 @@
-var express = require('express');
-var path = require('path');
-var cookieParser = require('cookie-parser');
-var logger = require('morgan');
-var fs = require('fs');
-var bodyParser = require('body-parser');
-
-var atcRouter       = require('./routes/api/atc');
-var airbasesRouter  = require('./routes/api/airbases');
-var elevationRouter = require('./routes/api/elevation');
-var databasesRouter = require('./routes/api/databases');
-var indexRouter     = require('./routes/index');
-var uikitRouter     = require('./routes/uikit');
-var usersRouter     = require('./routes/users');
-var resourcesRouter = require('./routes/resources');
-var pluginsRouter   = require('./routes/plugins');
-
-var app = express();
-
-app.use(logger('dev'));
-app.use(bodyParser.json({limit: '50mb'}));
-app.use(bodyParser.urlencoded({limit: '50mb', extended: true}));
-app.use(cookieParser());
-app.use(express.static(path.join(__dirname, 'public')));
-
-app.use('/', indexRouter);
-app.use('/api/atc', atcRouter);
-app.use('/api/airbases', airbasesRouter);
-app.use('/api/elevation', elevationRouter);
-app.use('/api/databases', databasesRouter);
-app.use('/plugins', pluginsRouter)
-app.use('/users', usersRouter);
-app.use('/uikit', uikitRouter);
-app.use('/resources', resourcesRouter);
-
-app.set('view engine', 'ejs');
-
-let rawdata = fs.readFileSync('../olympus.json');
-let config = JSON.parse(rawdata);
-if (config["server"] != undefined)
-    app.get('/config', (req, res) => res.send(config["server"]));
-
-module.exports = app;
-
-const DemoDataGenerator = require('./demo.js');
-var demoDataGenerator = new DemoDataGenerator(app);
-
-
-

client/bin/www

@@ -1,90 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var app = require('../app');
-var debug = require('debug')('client:server');
-var http = require('http');
-
-/**
- * Get port from environment and store in Express.
- */
-
-var port = normalizePort(process.env.PORT || '3000');
-app.set('port', port);
-
-/**
- * Create HTTP server.
- */
-
-var server = http.createServer(app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
-
-/**
- * Normalize a port into a number, string, or false.
- */
-
-function normalizePort(val) {
-  var port = parseInt(val, 10);
-
-  if (isNaN(port)) {
-    // named pipe
-    return val;
-  }
-
-  if (port >= 0) {
-    // port number
-    return port;
-  }
-
-  return false;
-}
-
-/**
- * Event listener for HTTP server "error" event.
- */
-
-function onError(error) {
-  if (error.syscall !== 'listen') {
-    throw error;
-  }
-
-  var bind = typeof port === 'string'
-    ? 'Pipe ' + port
-    : 'Port ' + port;
-
-  // handle specific listen errors with friendly messages
-  switch (error.code) {
-    case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
-      process.exit(1);
-      break;
-    case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
-      process.exit(1);
-      break;
-    default:
-      throw error;
-  }
-}
-
-/**
- * Event listener for HTTP server "listening" event.
- */
-
-function onListening() {
-  var addr = server.address();
-  var bind = typeof addr === 'string'
-    ? 'pipe ' + addr
-    : 'port ' + addr.port;
-  debug('Listening on ' + bind);
-}

client/copy.bat

@@ -1,4 +0,0 @@
-copy .\\node_modules\\leaflet\\dist\\leaflet.css .\\public\\stylesheets\\leaflet\\leaflet.css 
-copy .\\node_modules\\leaflet-gesture-handling\\dist\\leaflet-gesture-handling.css .\\public\\stylesheets\\leaflet\\leaflet-gesture-handling.css
-copy .\\node_modules\\leaflet.nauticscale\\dist\\leaflet.nauticscale.js .\\public\\javascripts\\leaflet.nauticscale.js
-copy .\\node_modules\\leaflet-path-drag\\dist\\L.Path.Drag.js .\\public\\javascripts\\L.Path.Drag.js

client/debug.bat

@@ -1,2 +0,0 @@
-start cmd /k "npm run start"
-start cmd /k "watchify .\src\index.ts --debug -o .\public\javascripts\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]

client/demo.js

@@ -1,516 +0,0 @@
-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 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 },
-}
-
-class DemoDataGenerator {
-    constructor(app)
-    { 
-        app.get('/demo/units', (req, res) => this.units(req, res));
-        app.get('/demo/weapons', (req, res) => this.weapons(req, res));
-        app.get('/demo/logs', (req, res) => this.logs(req, res));
-        app.get('/demo/bullseyes', (req, res) => this.bullseyes(req, res));
-        app.get('/demo/airbases', (req, res) => this.airbases(req, res));
-        app.get('/demo/mission', (req, res) => this.mission(req, res));
-        app.get('/demo/commands', (req, res) => this.command(req, res));
-        app.put('/demo', (req, res) => this.put(req, res));
-
-        app.use('/demo', basicAuth({
-            users: { 
-                'admin': 'password',
-                'blue': 'bluepassword',
-                'red': 'redpassword'
-            },
-        }))
-
-        //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;
-        //}
-
-
-        this.startTime = Date.now();
-    }
-    
-    units(req, res){
-        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));
-        }
-        res.end(Buffer.from(array, 'binary'));
-    };
-
-    weapons(req, res){
-        var array = new Uint8Array();
-        var time = Date.now();
-        array = this.concat(array, this.uint64ToByteArray(BigInt(time)));
-        for (let idx in DEMO_WEAPONS_DATA) {
-            const weapon = DEMO_WEAPONS_DATA[idx];
-            array = this.concat(array, this.uint32ToByteArray(idx));
-            array = this.appendString(array, weapon.category, 1);
-            array = this.appendUint8(array, weapon.alive, 2);
-            array = this.appendUint16(array, weapon.coalition, 5);
-            array = this.appendString(array, weapon.name, 7);
-            array = this.appendCoordinates(array, weapon.position, 13);
-            array = this.appendDouble(array, weapon.speed, 14);
-            array = this.appendDouble(array, weapon.heading, 15);
-            array = this.concat(array, this.uint8ToByteArray(255));
-        }
-        res.end(Buffer.from(array, 'binary'));
-    };
-
-    concat(array1, array2) {
-        var mergedArray = new Uint8Array(array1.length + array2.length);
-        mergedArray.set(array1);
-        mergedArray.set(array2, array1.length);
-        return mergedArray;
-    }
-    
-    uint8ToByteArray(number) {
-        var buffer = new ArrayBuffer(1);         
-        var longNum = new Uint8Array(buffer);  
-        longNum[0] = number;
-        return Array.from(new Uint8Array(buffer));
-    }
-    
-    uint16ToByteArray(number) {
-        var buffer = new ArrayBuffer(2);         
-        var longNum = new Uint16Array(buffer);  
-        longNum[0] = number;
-        return Array.from(new Uint8Array(buffer));
-    }
-    
-    uint32ToByteArray(number) {
-        var buffer = new ArrayBuffer(4);         
-        var longNum = new Uint32Array(buffer);  
-        longNum[0] = number;
-        return Array.from(new Uint8Array(buffer));
-    }
-    
-    uint64ToByteArray(number) {
-        var buffer = new ArrayBuffer(8);         
-        var longNum = new BigUint64Array(buffer);  
-        longNum[0] = number;
-        return Array.from(new Uint8Array(buffer));
-    }
-    
-    doubleToByteArray(number) {
-        var buffer = new ArrayBuffer(8);         
-        var longNum = new Float64Array(buffer);  
-        longNum[0] = number;
-        return Array.from(new Uint8Array(buffer));
-    }
-    
-    appendUint8(array, number, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint8ToByteArray(number));
-        return array;
-    }
-    
-    appendUint16(array, number, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint16ToByteArray(number));
-        return array;
-    }
-    
-    appendUint32(array, number, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint32ToByteArray(number));
-        return array;
-    }
-    
-    appendDouble(array, number, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.doubleToByteArray(number));
-        return array;
-    }
-    
-    appendCoordinates(array, coordinates, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.doubleToByteArray(coordinates.lat));
-        array = this.concat(array, this.doubleToByteArray(coordinates.lng));
-        array = this.concat(array, this.doubleToByteArray(coordinates.alt));
-        return array;
-    }
-    
-    appendOffset(array, offset, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.doubleToByteArray(offset.x));
-        array = this.concat(array, this.doubleToByteArray(offset.y));
-        array = this.concat(array, this.doubleToByteArray(offset.z));
-        return array;
-    }
-    
-    appendString(array, string, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint16ToByteArray(string.length));
-        array = this.concat(array, enc.encode(string));
-        return array;
-    }
-
-    padString(string, length) {
-        while (string.length < length)
-            string += " ";
-        return string.substring(0, length);
-    }
-    
-    appendTACAN(array, TACAN, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint8ToByteArray(TACAN.isOn));
-        array = this.concat(array, this.uint8ToByteArray(TACAN.channel));
-        array = this.concat(array, enc.encode(TACAN.XY));
-        array = this.concat(array, enc.encode(this.padString(TACAN.callsign, 4)));
-        return array;
-    }
-    
-    appendRadio(array, radio, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint32ToByteArray(radio.frequency));
-        array = this.concat(array, this.uint8ToByteArray(radio.callsign));
-        array = this.concat(array, this.uint8ToByteArray(radio.callsignNumber));
-        return array;
-    }
-    
-    appendGeneralSettings(array, generalSettings, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint8ToByteArray(generalSettings.prohibitAA));
-        array = this.concat(array, this.uint8ToByteArray(generalSettings.prohibitAfterburner));
-        array = this.concat(array, this.uint8ToByteArray(generalSettings.prohibitAG));
-        array = this.concat(array, this.uint8ToByteArray(generalSettings.prohibitAirWpn));
-        array = this.concat(array, this.uint8ToByteArray(generalSettings.prohibitJettison));
-        return array;
-    }
-
-    appendAmmo(array, ammo, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint16ToByteArray(ammo.length));
-        ammo.forEach((element) => {
-            array = this.concat(array, this.uint16ToByteArray(element.quantity));
-            array = this.concat(array, enc.encode(this.padString(element.name, 33)));
-            array = this.concat(array, this.uint8ToByteArray(element.guidance));
-            array = this.concat(array, this.uint8ToByteArray(element.category));
-            array = this.concat(array, this.uint8ToByteArray(element.missileCategory));
-        })
-        return array;
-    }
-
-    appendContacts(array, contacts, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint16ToByteArray(contacts.length));
-        contacts.forEach((element) => {
-            array = this.concat(array, this.uint32ToByteArray(element.ID));
-            array = this.concat(array, this.uint8ToByteArray(element.detectionMethod));
-        })
-        return array;
-    }
-
-    appendActivePath(array, activePath, datumIndex) {
-        array = this.concat(array, this.uint8ToByteArray(datumIndex));
-        array = this.concat(array, this.uint16ToByteArray(activePath.length));
-        activePath.forEach((element) => {
-            array = this.concat(array, this.doubleToByteArray(element.lat));
-            array = this.concat(array, this.doubleToByteArray(element.lng));
-            array = this.concat(array, this.doubleToByteArray(element.alt));
-        })
-        return array;
-    }
-    
-    logs(req, res){
-        var ret = {logs: {"1": "I'm a log!", "2": "I'm a different log!"}};
-        ret.time = Date.now();
-        ret.frameRate = 60;
-        ret.load = 0;
-        res.send(JSON.stringify(ret));
-    };
-    
-    airbases(req, res){
-        var ret = {airbases: {
-            ["0"]: {
-                callsign: "Nellis",
-                latitude: 37.3,
-                longitude: -115.8,
-                coalition: "neutral"
-            },
-            ["1"]: {
-                callsign: "Red",
-                latitude: 37.3,
-                longitude: -115.75,
-                coalition: "red"
-            },
-            ["2"]: {
-                callsign: "Blue",
-                latitude: 37.3,
-                longitude: -115.7,
-                coalition: "blue"
-            }
-        }};
-        ret.time = Date.now();
-        res.send(JSON.stringify(ret));
-    };
-    
-    bullseyes(req, res){
-        var ret = {bullseyes: {
-            "0": {
-                latitude: 37.25,
-                longitude: -115.8,
-                coalition: "neutral"
-            },
-            "1": {
-                latitude: 37.25,
-                longitude: -115.75,
-                coalition: "red"
-            },
-            "2": {
-                latitude: 37.25,
-                longitude: -115.7,
-                coalition: "blue"
-            }
-        }};
-        ret.time = Date.now();
-        res.send(JSON.stringify(ret));
-    };
-
-    mission(req, res){
-        var ret = {mission: {theatre: "Nevada"}};
-        ret.time = Date.now();
-
-        ret.mission.dateAndTime = {
-            time: { h: 10, m: 15, s: 34 },
-            date: "",
-            elapsedTime: (Date.now() - this.startTime) / 1000,
-            startTime: 0
-        }
-
-        ret.mission.coalitions = {
-            red: [ 
-                'RUSSIA',
-                'CHINA'
-            ],
-            blue: [
-                'UK',
-                'USA'
-            ],
-            neutral: [
-                'ITALY'
-            ]
-        }
-
-        ret.mission.commandModeOptions = {
-            restrictSpawns: true,
-            restrictToCoalition: true,
-            setupTime: 0,
-            spawnPoints: {
-                red: 400,
-                blue: 400
-            }, 
-            eras: ["WW2", "Early Cold War", "Late Cold War", "Modern"]
-        }
-
-        var auth = req.get("Authorization");
-        if (auth) {
-            var username = Buffer.from(auth.replace("Basic ", ""), 'base64').toString('binary').split(":")[0];
-            switch (username) {
-                case "admin":
-                    ret.mission.commandModeOptions.commandMode = "Game master";
-                    break
-                case "blue": 
-                    ret.mission.commandModeOptions.commandMode = "Blue commander";
-                    break;
-                case "red": 
-                    ret.mission.commandModeOptions.commandMode = "Red commander";
-                    break;
-            }
-        }
-        res.send(JSON.stringify(ret));
-    }
-
-    command(req, res) {
-        var ret = {commandExecuted: Math.random() > 0.5};
-        res.send(JSON.stringify(ret));
-    }
-    
-    put(req, res) {
-        var ret = {commandHash: Math.random().toString(36).slice(2, 19)}
-        res.send(JSON.stringify(ret));
-    }
-
-}
-
-module.exports = DemoDataGenerator;

client/package.json

@@ -1,59 +0,0 @@
-{
-  "name": "DCSOlympus",
-  "node-main": "./bin/www",
-  "main": "http://localhost:3000",
-  "version": "v0.4.5-alpha",
-  "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",
-    "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\"",
-    "watch": "watchify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]"
-  },
-  "dependencies": {
-    "@turf/turf": "^6.5.0",
-    "body-parser": "^1.20.2",
-    "cookie-parser": "~1.4.4",
-    "debug": "~2.6.9",
-    "ejs": "^3.1.8",
-    "express": "~4.16.1",
-    "express-basic-auth": "^1.2.1",
-    "leaflet-gesture-handling": "^1.2.2",
-    "morgan": "~1.9.1",
-    "save": "^2.9.0",
-    "srtm-elevation": "^2.1.2"
-  },
-  "devDependencies": {
-    "@babel/preset-env": "^7.21.4",
-    "@tanem/svg-injector": "^10.1.55",
-    "@types/formatcoords": "^1.1.0",
-    "@types/geojson": "^7946.0.10",
-    "@types/leaflet": "^1.9.0",
-    "@types/node": "^18.16.1",
-    "@types/sortablejs": "^1.15.0",
-    "@types/svg-injector": "^0.0.29",
-    "babelify": "^10.0.0",
-    "browserify": "^17.0.0",
-    "concurrently": "^7.6.0",
-    "cp": "^0.2.0",
-    "esmify": "^2.1.1",
-    "formatcoords": "^1.1.3",
-    "geodesy": "^1.1.2",
-    "leaflet": "^1.9.3",
-    "leaflet-control-mini-map": "^0.4.0",
-    "leaflet-path-drag": "*",
-    "leaflet.nauticscale": "^1.1.0",
-    "nodemon": "^2.0.20",
-    "requirejs": "^2.3.6",
-    "sortablejs": "^1.15.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/controltips/copy.bat

@@ -1,5 +0,0 @@
-mkdir .\\..\\..\\public\\plugins\\controltipsplugin
-
-copy .\\index.js .\\..\\..\\public\\plugins\\controltipsplugin\\index.js
-copy .\\plugin.json .\\..\\..\\public\\plugins\\controltipsplugin\\plugin.json
-copy .\\style.css .\\..\\..\\public\\plugins\\controltipsplugin\\style.css

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-lock.json

@@ -1,162 +0,0 @@
-{
-  "name": "ControlTipsPlugin",
-  "version": "v0.0.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
-    },
-    "convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "tsconfig": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz",
-      "integrity": "sha512-Cq65A3kVp6BbsUgg9DRHafaGmbMb9EhAc7fjWvudNWKjkbWrt43FnrtZt6awshH1R0ocfF2Z0uxock3lVqEgOg==",
-      "requires": {
-        "any-promise": "^1.3.0",
-        "parse-json": "^2.2.0",
-        "strip-bom": "^2.0.0",
-        "strip-json-comments": "^2.0.0"
-      }
-    },
-    "tsify": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/tsify/-/tsify-5.0.4.tgz",
-      "integrity": "sha512-XAZtQ5OMPsJFclkZ9xMZWkSNyMhMxEPsz3D2zu79yoKorH9j/DT4xCloJeXk5+cDhosEibu4bseMVjyPOAyLJA==",
-      "requires": {
-        "convert-source-map": "^1.1.0",
-        "fs.realpath": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "semver": "^6.1.0",
-        "through2": "^2.0.0",
-        "tsconfig": "^5.0.3"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-    }
-  }
-}

client/plugins/controltips/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "ControlTipsPlugin",
-  "version": "v0.0.1",
-  "private": true,
-  "scripts": {
-    "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat"
-  },
-  "dependencies": {},
-  "devDependencies": {}
-}

client/plugins/databasemanager/copy.bat

@@ -1,5 +0,0 @@
-mkdir .\\..\\..\\public\\plugins\\databasemanager
-
-copy .\\index.js .\\..\\..\\public\\plugins\\databasemanager\\index.js
-copy .\\plugin.json .\\..\\..\\public\\plugins\\databasemanager\\plugin.json
-copy .\\style.css .\\..\\..\\public\\plugins\\databasemanager\\style.css

client/plugins/databasemanager/package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "DatabaseManagerPlugin",
-  "version": "v0.0.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "DatabaseManagerPlugin",
-      "version": "v0.0.1",
-      "devDependencies": {}
-    }
-  }
-}

client/plugins/databasemanager/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "DatabaseManagerPlugin",
-  "version": "v0.0.1",
-  "private": true,
-  "scripts": {
-    "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > 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 ]"
-  },
-  "dependencies": {},
-  "devDependencies": {}
-}

client/public/javascripts/leaflet.nauticscale.js

@@ -1,38 +0,0 @@
-L.Control.ScaleNautic = L.Control.Scale.extend({
-	options: {
-		nautic: false
-	},
-
-	_addScales: function(options, className, container) {
-		L.Control.Scale.prototype._addScales.call(this, options, className, container);
-		L.setOptions(options);
-		if (this.options.nautic) {
-			this._nScale = L.DomUtil.create('div', className, container);
-		}
-	},
-
-	_updateScales: function (maxMeters) {
-		L.Control.Scale.prototype._updateScales.call(this, maxMeters);
-		if (this.options.nautic && maxMeters) {
-			this._updateNautic(maxMeters);
-		}
-	},
-
-	_updateNautic: function (maxMeters) {
-		var scale = this._nScale,
-			maxNauticalMiles = maxMeters / 1852, nauticalMiles;
-
-		if(maxMeters >= 1852) {
-			nauticalMiles = L.Control.Scale.prototype._getRoundNum.call(this, maxNauticalMiles);
-		} else {
-			nauticalMiles = maxNauticalMiles > 0.1 ? Math.round(maxNauticalMiles * 10) / 10 : Math.round(maxNauticalMiles * 100) / 100;
-		}
-
-		scale.style.width = Math.round(this.options.maxWidth * (nauticalMiles / maxNauticalMiles)) - 10 + 'px';
-		scale.innerHTML = nauticalMiles + ' nm';
-	}
-});
-
-L.control.scalenautic = function (options) {
-	return new L.Control.ScaleNautic(options);
-};