Merge branch 'main' of https://github.com/Pax1601/DCSOlympus

Rc1 fixes

build.bat

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

build_package.bat

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

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

@@ -158,6 +158,10 @@ declare module "constants/constants" {
             bounds: LatLngBounds;
             zoom: number;
         };
+        SinaiMap: {
+            bounds: LatLngBounds;
+            zoom: number;
+        };
     };
     export const mapLayers: {
         "ArcGIS Satellite": {
@@ -2396,7 +2400,7 @@ declare module "server/servermanager" {
         constructor();
         toggleDemoEnabled(): void;
         setCredentials(newUsername: string, newPassword: string): void;
-        GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType?: string): void;
+        GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType?: string, force?: boolean): void;
         PUT(request: object, callback: CallableFunction): void;
         getConfig(callback: CallableFunction): void;
         setAddress(address: string, port: number): void;
@@ -2464,6 +2468,9 @@ declare module "server/servermanager" {
         setPaused(newPaused: boolean): void;
         getPaused(): boolean;
         getServerIsPaused(): boolean;
+        getRequests(): {
+            [key: string]: XMLHttpRequest;
+        };
     }
 }
 declare module "panels/unitlistpanel" {

client/public/stylesheets/layout/layout.css

@@ -62,6 +62,16 @@
 	height: 180px;
 }
 
+#hotgroup-panel {
+    bottom: 40px;
+    column-gap: 10px;
+    display: flex;
+    left: 50%;
+    position: absolute;
+    translate: -50%;
+    z-index: 9998;
+}
+
 #info-popup {
     position: absolute;
     width: fit-content;

client/public/stylesheets/style/style.css

@@ -994,16 +994,6 @@ nav.ol-panel> :last-child {
     }
 }
 
-#hotgroup-panel {
-    bottom: 40px;
-    column-gap: 10px;
-    display: flex;
-    left: 50%;
-    position: absolute;
-    translate: -50%;
-    z-index: 9999;
-}
-
 #hotgroup-panel>div {
     align-items: center;
     background-color: var(--background-steel);

client/src/constants/constants.ts

@@ -116,6 +116,13 @@ export const minimapBoundaries = [
         new LatLng(48.12, 3.70),
         new LatLng(50.44, 3.70),
         new LatLng(50.44, -3.29)
+    ], 
+    [   // Sinai
+        new LatLng(34.312222, 28.523333),
+        new LatLng(25.946944, 28.523333),
+        new LatLng(25.946944, 36.897778),
+        new LatLng(34.312222, 36.897778),
+        new LatLng(34.312222, 28.523333)
     ]
 ];
 
@@ -127,6 +134,7 @@ export const mapBounds = {
     "Caucasus": { bounds: new LatLngBounds([39.6170191, 27.634935], [47.3907982, 49.3101946]), zoom: 4 },
     "Falklands": { bounds: new LatLngBounds([-49.097217, -79.418267], [-56.874517, -43.316433]), zoom: 3 },
     "Normandy": { bounds: new LatLngBounds([50.44, -3.29], [48.12, 3.70]), zoom: 5 },
+    "SinaiMap": { bounds: new LatLngBounds([34.312222, 28.523333], [25.946944, 36.897778]), zoom: 4 },
 }
 
 export const mapLayers = {
@@ -134,7 +142,7 @@ export const mapLayers = {
         urlTemplate: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
         minZoom: 1,
         maxZoom: 19,
-        attribution: "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, GetApp().getMap()ping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
+        attribution: "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Mapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
     },
     "USGS Topo": {
         urlTemplate: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}',

client/src/contextmenus/coalitionareacontextmenu.ts

@@ -68,7 +68,8 @@ export class CoalitionAreaContextMenu extends ContextMenu {
             const area = this.getCoalitionArea();
             if (area)
                 getApp().getUnitsManager().createIADS(area, getCheckboxOptions(this.#iadsTypesDropdown), getCheckboxOptions(this.#iadsErasDropdown), getCheckboxOptions(this.#iadsRangesDropdown), this.#iadsDensitySlider.getValue(), this.#iadsDistributionSlider.getValue());
-        })
+            this.hide();
+        });
         this.hide();
     }
 
@@ -110,7 +111,7 @@ export class CoalitionAreaContextMenu extends ContextMenu {
         this.getContainer()?.querySelectorAll('[data-coalition]').forEach((element: any) => {
             element.setAttribute("data-coalition", this.getCoalitionArea()?.getCoalition())
         });
-        this.#coalitionSwitch.setValue(this.getCoalitionArea()?.getCoalition() === "red");
+        this.#coalitionSwitch.setValue(this.getCoalitionArea()?.getCoalition() === "blue");
     }
 
     /** Get the CoalitionArea object the contextmenu is editing

client/src/controls/dropdown.ts

@@ -26,7 +26,7 @@ export class Dropdown {
 
         if (options != null) this.setOptions(options);
 
-        this.#value.addEventListener("click", (ev) => { this.#toggle(); });
+        (this.#container.querySelector(".ol-select-value") as HTMLElement)?.addEventListener("click", (ev) => { this.#toggle(); });
 
         document.addEventListener("click", (ev) => {
             if (!(this.#value.contains(ev.target as Node) || this.#options.contains(ev.target as Node) || this.#container.contains(ev.target as Node))) {

client/src/olympusapp.ts

@@ -30,6 +30,7 @@ import { ContextManager } from "./context/contextmanager";
 import { Context } from "./context/context";
 
 var VERSION = "v0.4.9-alpha-rc1";
+var DEBUG = false;
 
 export class OlympusApp {
     /* Global data */
@@ -298,7 +299,7 @@ export class OlympusApp {
         shortcutManager.addKeyboardShortcut("toggleDemo", {
             "altKey": false,
             "callback": () => {
-                this.getServerManager().toggleDemoEnabled();
+                if (DEBUG === true) this.getServerManager().toggleDemoEnabled();
             },
             "code": "KeyT",
             "context": "olympus",

client/src/server/servermanager.ts

@@ -16,11 +16,12 @@ export class ServerManager {
     #username = "";
     #password = "";
     #sessionHash: string | null = null;
-    #lastUpdateTimes: {[key: string]: number} = {}
+    #lastUpdateTimes: { [key: string]: number } = {}
     #demoEnabled = false;
-    #previousMissionElapsedTime:number = 0;  //  Track if mission elapsed time is increasing (i.e. is the server paused)
+    #previousMissionElapsedTime: number = 0;  // Track if mission elapsed time is increasing (i.e. is the server paused)
     #serverIsPaused: boolean = false;
     #intervals: number[] = [];
+    #requests: { [key: string]: XMLHttpRequest } = {};
 
     constructor() {
         this.#lastUpdateTimes[UNITS_URI] = Date.now();
@@ -40,9 +41,20 @@ export class ServerManager {
         this.#password = newPassword;
     }
 
-    GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType?: string) {
+    GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType: string = 'text', force: boolean = false) {
         var xmlHttp = new XMLHttpRequest();
 
+        /* If a request on this uri is still pending (meaning it's not done or did not yet fail), skip the request, to avoid clogging the TCP workers */
+        /* If we are forcing the request we don't care if one already exists, just send it. CAREFUL: this makes sense only for low frequency requests, like refreshes, when we
+            are reasonably confident any previous request will be done before we make a new one on the same URI. */
+        if (uri in this.#requests && this.#requests[uri].readyState !== 4 && !force) {
+            console.warn(`GET request on ${uri} URI still pending, skipping...`);
+            return;
+        }
+
+        if (!force)
+            this.#requests[uri] = xmlHttp;
+
         /* Assemble the request options string */
         var optionsString = '';
         if (options?.time != undefined)
@@ -83,9 +95,11 @@ export class ServerManager {
                 this.setConnected(false);
             }
         };
-        xmlHttp.onerror = (res) => {
-            console.error("An error occurred during the XMLHttpRequest");
-            this.setConnected(false);
+        xmlHttp.onreadystatechange = (res) => {
+            if (xmlHttp.readyState == 4 && xmlHttp.status === 0) {
+                console.error("An error occurred during the XMLHttpRequest");
+                this.setConnected(false);
+            }
         };
         xmlHttp.send(null);
     }
@@ -130,7 +144,7 @@ export class ServerManager {
     }
 
     getLogs(callback: CallableFunction, refresh: boolean = false) {
-        this.GET(callback, LOGS_URI, { time: refresh ? 0 : this.#lastUpdateTimes[LOGS_URI]});
+        this.GET(callback, LOGS_URI, { time: refresh ? 0 : this.#lastUpdateTimes[LOGS_URI] }, 'text', refresh);
     }
 
     getMission(callback: CallableFunction) {
@@ -138,66 +152,66 @@ export class ServerManager {
     }
 
     getUnits(callback: CallableFunction, refresh: boolean = false) {
-        this.GET(callback, UNITS_URI, { time: refresh ? 0 : this.#lastUpdateTimes[UNITS_URI] }, 'arraybuffer');
+        this.GET(callback, UNITS_URI, { time: refresh ? 0 : this.#lastUpdateTimes[UNITS_URI] }, 'arraybuffer', refresh);
     }
 
     getWeapons(callback: CallableFunction, refresh: boolean = false) {
-        this.GET(callback, WEAPONS_URI, { time: refresh ? 0 : this.#lastUpdateTimes[WEAPONS_URI] }, 'arraybuffer');
+        this.GET(callback, WEAPONS_URI, { time: refresh ? 0 : this.#lastUpdateTimes[WEAPONS_URI] }, 'arraybuffer', refresh);
     }
 
     isCommandExecuted(callback: CallableFunction, commandHash: string) {
-        this.GET(callback, COMMANDS_URI, { commandHash: commandHash});
+        this.GET(callback, COMMANDS_URI, { commandHash: commandHash });
     }
 
-    addDestination(ID: number, path: any, callback: CallableFunction = () => {}) {
+    addDestination(ID: number, path: any, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "path": path }
         var data = { "setPath": command }
         this.PUT(data, callback);
     }
 
-    spawnSmoke(color: string, latlng: LatLng, callback: CallableFunction = () => {}) {
+    spawnSmoke(color: string, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "color": color, "location": latlng };
         var data = { "smoke": command }
         this.PUT(data, callback);
     }
 
-    spawnExplosion(intensity: number, explosionType: string, latlng: LatLng, callback: CallableFunction = () => {}) {
+    spawnExplosion(intensity: number, explosionType: string, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "explosionType": explosionType, "intensity": intensity, "location": latlng };
         var data = { "explosion": command }
         this.PUT(data, callback);
     }
 
-    spawnAircrafts(units: any, coalition: string, airbaseName: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => {}) {
+    spawnAircrafts(units: any, coalition: string, airbaseName: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => { }) {
         var command = { "units": units, "coalition": coalition, "airbaseName": airbaseName, "country": country, "immediate": immediate, "spawnPoints": spawnPoints };
         var data = { "spawnAircrafts": command }
         this.PUT(data, callback);
     }
 
-    spawnHelicopters(units: any, coalition: string, airbaseName: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => {}) {
+    spawnHelicopters(units: any, coalition: string, airbaseName: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => { }) {
         var command = { "units": units, "coalition": coalition, "airbaseName": airbaseName, "country": country, "immediate": immediate, "spawnPoints": spawnPoints };
         var data = { "spawnHelicopters": command }
         this.PUT(data, callback);
     }
 
-    spawnGroundUnits(units: any, coalition: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => {}) {
+    spawnGroundUnits(units: any, coalition: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => { }) {
         var command = { "units": units, "coalition": coalition, "country": country, "immediate": immediate, "spawnPoints": spawnPoints };;
         var data = { "spawnGroundUnits": command }
         this.PUT(data, callback);
     }
 
-    spawnNavyUnits(units: any, coalition: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => {}) {
+    spawnNavyUnits(units: any, coalition: string, country: string, immediate: boolean, spawnPoints: number, callback: CallableFunction = () => { }) {
         var command = { "units": units, "coalition": coalition, "country": country, "immediate": immediate, "spawnPoints": spawnPoints };
         var data = { "spawnNavyUnits": command }
         this.PUT(data, callback);
     }
 
-    attackUnit(ID: number, targetID: number, callback: CallableFunction = () => {}) {
+    attackUnit(ID: number, targetID: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "targetID": targetID };
         var data = { "attackUnit": command }
         this.PUT(data, callback);
     }
 
-    followUnit(ID: number, targetID: number, offset: { "x": number, "y": number, "z": number }, callback: CallableFunction = () => {}) {
+    followUnit(ID: number, targetID: number, offset: { "x": number, "y": number, "z": number }, callback: CallableFunction = () => { }) {
         // X: front-rear, positive front
         // Y: top-bottom, positive bottom
         // Z: left-right, positive right
@@ -207,172 +221,172 @@ export class ServerManager {
         this.PUT(data, callback);
     }
 
-    cloneUnits(units: {ID: number, location: LatLng}[], deleteOriginal: boolean, spawnPoints: number, callback: CallableFunction = () => {}) {
+    cloneUnits(units: { ID: number, location: LatLng }[], deleteOriginal: boolean, spawnPoints: number, callback: CallableFunction = () => { }) {
         var command = { "units": units, "deleteOriginal": deleteOriginal, "spawnPoints": spawnPoints };
         var data = { "cloneUnits": command }
         this.PUT(data, callback);
     }
 
-    deleteUnit(ID: number, explosion: boolean, explosionType: string, immediate: boolean, callback: CallableFunction = () => {}) {
+    deleteUnit(ID: number, explosion: boolean, explosionType: string, immediate: boolean, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "explosion": explosion, "explosionType": explosionType, "immediate": immediate };
         var data = { "deleteUnit": command }
         this.PUT(data, callback);
     }
 
-    landAt(ID: number, latlng: LatLng, callback: CallableFunction = () => {}) {
+    landAt(ID: number, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "location": latlng };
         var data = { "landAt": command }
         this.PUT(data, callback);
     }
 
-    changeSpeed(ID: number, speedChange: string, callback: CallableFunction = () => {}) {
+    changeSpeed(ID: number, speedChange: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "change": speedChange }
         var data = { "changeSpeed": command }
         this.PUT(data, callback);
     }
 
-    setSpeed(ID: number, speed: number, callback: CallableFunction = () => {}) {
+    setSpeed(ID: number, speed: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "speed": speed }
         var data = { "setSpeed": command }
         this.PUT(data, callback);
     }
 
-    setSpeedType(ID: number, speedType: string, callback: CallableFunction = () => {}) {
+    setSpeedType(ID: number, speedType: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "speedType": speedType }
         var data = { "setSpeedType": command }
         this.PUT(data, callback);
     }
 
-    changeAltitude(ID: number, altitudeChange: string, callback: CallableFunction = () => {}) {
+    changeAltitude(ID: number, altitudeChange: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "change": altitudeChange }
         var data = { "changeAltitude": command }
         this.PUT(data, callback);
     }
 
-    setAltitudeType(ID: number, altitudeType: string, callback: CallableFunction = () => {}) {
+    setAltitudeType(ID: number, altitudeType: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "altitudeType": altitudeType }
         var data = { "setAltitudeType": command }
         this.PUT(data, callback);
     }
 
-    setAltitude(ID: number, altitude: number, callback: CallableFunction = () => {}) {
+    setAltitude(ID: number, altitude: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "altitude": altitude }
         var data = { "setAltitude": command }
         this.PUT(data, callback);
     }
 
-    createFormation(ID: number, isLeader: boolean, wingmenIDs: number[], callback: CallableFunction = () => {}) {
+    createFormation(ID: number, isLeader: boolean, wingmenIDs: number[], callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "wingmenIDs": wingmenIDs, "isLeader": isLeader }
         var data = { "setLeader": command }
         this.PUT(data, callback);
     }
 
-    setROE(ID: number, ROE: string, callback: CallableFunction = () => {}) {
+    setROE(ID: number, ROE: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "ROE": ROEs.indexOf(ROE) }
         var data = { "setROE": command }
         this.PUT(data, callback);
     }
 
-    setReactionToThreat(ID: number, reactionToThreat: string, callback: CallableFunction = () => {}) {
+    setReactionToThreat(ID: number, reactionToThreat: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "reactionToThreat": reactionsToThreat.indexOf(reactionToThreat) }
         var data = { "setReactionToThreat": command }
         this.PUT(data, callback);
     }
 
-    setEmissionsCountermeasures(ID: number, emissionCountermeasure: string, callback: CallableFunction = () => {}) {
+    setEmissionsCountermeasures(ID: number, emissionCountermeasure: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "emissionsCountermeasures": emissionsCountermeasures.indexOf(emissionCountermeasure) }
         var data = { "setEmissionsCountermeasures": command }
         this.PUT(data, callback);
     }
 
-    setOnOff(ID: number, onOff: boolean, callback: CallableFunction = () => {}) {
+    setOnOff(ID: number, onOff: boolean, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "onOff": onOff }
         var data = { "setOnOff": command }
         this.PUT(data, callback);
     }
 
-    setFollowRoads(ID: number, followRoads: boolean, callback: CallableFunction = () => {}) {
+    setFollowRoads(ID: number, followRoads: boolean, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "followRoads": followRoads }
         var data = { "setFollowRoads": command }
         this.PUT(data, callback);
     }
 
-    setOperateAs(ID: number, operateAs: number, callback: CallableFunction = () => {}) {
+    setOperateAs(ID: number, operateAs: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "operateAs": operateAs }
         var data = { "setOperateAs": command }
         this.PUT(data, callback);
     }
 
 
-    refuel(ID: number, callback: CallableFunction = () => {}) {
+    refuel(ID: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID };
         var data = { "refuel": command }
         this.PUT(data, callback);
     }
 
-    bombPoint(ID: number, latlng: LatLng, callback: CallableFunction = () => {}) {
+    bombPoint(ID: number, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "location": latlng }
         var data = { "bombPoint": command }
         this.PUT(data, callback);
     }
 
-    carpetBomb(ID: number, latlng: LatLng, callback: CallableFunction = () => {}) {
+    carpetBomb(ID: number, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "location": latlng }
         var data = { "carpetBomb": command }
         this.PUT(data, callback);
     }
 
-    bombBuilding(ID: number, latlng: LatLng, callback: CallableFunction = () => {}) {
+    bombBuilding(ID: number, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "location": latlng }
         var data = { "bombBuilding": command }
         this.PUT(data, callback);
     }
 
-    fireAtArea(ID: number, latlng: LatLng, callback: CallableFunction = () => {}) {
+    fireAtArea(ID: number, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "location": latlng }
         var data = { "fireAtArea": command }
         this.PUT(data, callback);
     }
 
-    simulateFireFight(ID: number, latlng: LatLng, altitude: number, callback: CallableFunction = () => {}) {
+    simulateFireFight(ID: number, latlng: LatLng, altitude: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "location": latlng, "altitude": altitude }
         var data = { "simulateFireFight": command }
         this.PUT(data, callback);
     }
 
     // TODO: Remove coalition
-    scenicAAA(ID: number, coalition: string, callback: CallableFunction = () => {}) {
+    scenicAAA(ID: number, coalition: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "coalition": coalition }
         var data = { "scenicAAA": command }
         this.PUT(data, callback);
     }
 
     // TODO: Remove coalition
-    missOnPurpose(ID: number, coalition: string, callback: CallableFunction = () => {}) {
+    missOnPurpose(ID: number, coalition: string, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "coalition": coalition }
         var data = { "missOnPurpose": command }
         this.PUT(data, callback);
     }
 
-    landAtPoint(ID: number, latlng: LatLng, callback: CallableFunction = () => {}) {
+    landAtPoint(ID: number, latlng: LatLng, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "location": latlng }
         var data = { "landAtPoint": command }
         this.PUT(data, callback);
     }
 
-    setShotsScatter(ID: number, shotsScatter: number, callback: CallableFunction = () => {}) {
+    setShotsScatter(ID: number, shotsScatter: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "shotsScatter": shotsScatter }
         var data = { "setShotsScatter": command }
         this.PUT(data, callback);
     }
 
-    setShotsIntensity(ID: number, shotsIntensity: number, callback: CallableFunction = () => {}) {
+    setShotsIntensity(ID: number, shotsIntensity: number, callback: CallableFunction = () => { }) {
         var command = { "ID": ID, "shotsIntensity": shotsIntensity }
         var data = { "setShotsIntensity": command }
         this.PUT(data, callback);
     }
 
-    setAdvacedOptions(ID: number, isActiveTanker: boolean, isActiveAWACS: boolean, TACAN: TACAN, radio: Radio, generalSettings: GeneralSettings, callback: CallableFunction = () => {}) {
+    setAdvacedOptions(ID: number, isActiveTanker: boolean, isActiveAWACS: boolean, TACAN: TACAN, radio: Radio, generalSettings: GeneralSettings, callback: CallableFunction = () => { }) {
         var command = {
             "ID": ID,
             "isActiveTanker": isActiveTanker,
@@ -386,7 +400,7 @@ export class ServerManager {
         this.PUT(data, callback);
     }
 
-    setCommandModeOptions(restrictSpawns: boolean, restrictToCoalition: boolean, spawnPoints: {blue: number, red: number}, eras: string[], setupTime: number, callback: CallableFunction = () => {}) {
+    setCommandModeOptions(restrictSpawns: boolean, restrictToCoalition: boolean, spawnPoints: { blue: number, red: number }, eras: string[], setupTime: number, callback: CallableFunction = () => { }) {
         var command = {
             "restrictSpawns": restrictSpawns,
             "restrictToCoalition": restrictToCoalition,
@@ -399,7 +413,7 @@ export class ServerManager {
         this.PUT(data, callback);
     }
 
-    reloadDatabases(callback: CallableFunction = () => {}) {
+    reloadDatabases(callback: CallableFunction = () => { }) {
         var data = { "reloadDatabases": {} };
         this.PUT(data, callback);
     }
@@ -430,7 +444,7 @@ export class ServerManager {
         }, 10000));
 
         this.#intervals.push(window.setInterval(() => {
-            if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE){
+            if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
                 this.getBullseye((data: BullseyesData) => {
                     this.checkSessionHash(data.sessionHash);
                     getApp().getMissionManager()?.updateBullseyes(data);
@@ -452,7 +466,7 @@ export class ServerManager {
         this.#intervals.push(window.setInterval(() => {
             if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
                 this.getUnits((buffer: ArrayBuffer) => {
-                    var time = getApp().getUnitsManager()?.update(buffer); 
+                    var time = getApp().getUnitsManager()?.update(buffer);
                     return time;
                 }, false);
             }
@@ -461,7 +475,7 @@ export class ServerManager {
         this.#intervals.push(window.setInterval(() => {
             if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
                 this.getWeapons((buffer: ArrayBuffer) => {
-                    var time = getApp().getWeaponsManager()?.update(buffer); 
+                    var time = getApp().getWeaponsManager()?.update(buffer);
                     return time;
                 }, false);
             }
@@ -470,18 +484,18 @@ export class ServerManager {
         this.#intervals.push(window.setInterval(() => {
             if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
                 this.getUnits((buffer: ArrayBuffer) => {
-                    var time = getApp().getUnitsManager()?.update(buffer); 
+                    var time = getApp().getUnitsManager()?.update(buffer);
                     return time;
                 }, true);
 
-                const elapsedMissionTime         = getApp().getMissionManager().getDateAndTime().elapsedTime;
-                this.#serverIsPaused             = ( elapsedMissionTime === this.#previousMissionElapsedTime );
+                const elapsedMissionTime = getApp().getMissionManager().getDateAndTime().elapsedTime;
+                this.#serverIsPaused = (elapsedMissionTime === this.#previousMissionElapsedTime);
                 this.#previousMissionElapsedTime = elapsedMissionTime;
 
                 const csp = (getApp().getPanelsManager().get("connectionStatus") as ConnectionStatusPanel);
 
-                if ( this.getConnected() ) {
-                    if ( this.getServerIsPaused() ) {
+                if (this.getConnected()) {
+                    if (this.getServerIsPaused()) {
                         csp.showServerPaused();
                     } else {
                         csp.showConnected();
@@ -491,29 +505,29 @@ export class ServerManager {
                 }
 
             }
-        }, ( this.getServerIsPaused() ? 500 : 5000 )));
+        }, (this.getServerIsPaused() ? 500 : 5000)));
 
         //  Mission clock and elapsed time
-        this.#intervals.push(window.setInterval( () => {
-            
-            if ( !this.getConnected() || this.#serverIsPaused ) {
+        this.#intervals.push(window.setInterval(() => {
+
+            if (!this.getConnected() || this.#serverIsPaused) {
                 return;
             }
 
             const elapsedMissionTime = getApp().getMissionManager().getDateAndTime().elapsedTime;
 
             const csp = (getApp().getPanelsManager().get("connectionStatus") as ConnectionStatusPanel);
-            const mt  = getApp().getMissionManager().getDateAndTime().time;
+            const mt = getApp().getMissionManager().getDateAndTime().time;
 
-            csp.setMissionTime( [ mt.h, mt.m, mt.s ].map( n => zeroAppend( n, 2 )).join( ":" ) );
-            csp.setElapsedTime( new Date( elapsedMissionTime * 1000 ).toISOString().substring( 11, 19 ) );
+            csp.setMissionTime([mt.h, mt.m, mt.s].map(n => zeroAppend(n, 2)).join(":"));
+            csp.setElapsedTime(new Date(elapsedMissionTime * 1000).toISOString().substring(11, 19));
 
         }, 1000));
 
         this.#intervals.push(window.setInterval(() => {
             if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
                 this.getWeapons((buffer: ArrayBuffer) => {
-                    var time = getApp().getWeaponsManager()?.update(buffer); 
+                    var time = getApp().getWeaponsManager()?.update(buffer);
                     return time;
                 }, true);
             }
@@ -540,12 +554,12 @@ export class ServerManager {
         });
 
         this.getWeapons((buffer: ArrayBuffer) => {
-            var time = getApp().getWeaponsManager()?.update(buffer); 
+            var time = getApp().getWeaponsManager()?.update(buffer);
             return time;
         }, true);
 
         this.getUnits((buffer: ArrayBuffer) => {
-            var time = getApp().getUnitsManager()?.update(buffer); 
+            var time = getApp().getUnitsManager()?.update(buffer);
             return time;
         }, true);
     }
@@ -587,4 +601,8 @@ export class ServerManager {
     getServerIsPaused() {
         return this.#serverIsPaused;
     }
+
+    getRequests() {
+        return this.#requests;
+    }
 }

client/src/unit/importexport/unitdatafileimport.ts

@@ -46,7 +46,7 @@ export class UnitDataFileImport extends UnitDataFile {
                 return { unitType: unitData.name, location: unitData.position, liveryID: "" }
             });
 
-            unitsManager.spawnUnits(category, unitsToSpawn, coalition, true);
+            unitsManager.spawnUnits(category, unitsToSpawn, coalition, false);
         }
 
         /*

client/src/unit/unitsmanager.ts

@@ -1114,7 +1114,7 @@ export class UnitsManager {
             /* Check if the city is inside the coalition area */
             if (polyContains(new LatLng(airbase.getLatLng().lat, airbase.getLatLng().lng), coalitionArea)) {
                 /* Arbitrary formula to obtain a number of units */
-                var pointsNumber = 2 + 40 * density / 100;
+                var pointsNumber = 2 + 10 * density / 100;
                 for (let i = 0; i < pointsNumber; i++) {
                     /* Place the unit nearby the airbase, depending on the distribution parameter */
                     var bearing = Math.random() * 360;
@@ -1127,11 +1127,8 @@ export class UnitsManager {
                         if (Math.random() < IADSDensities[type]) {
                             /* Get a random blueprint depending on the selected parameters and spawn the unit */
                             const unitBlueprint = randomUnitBlueprint(groundUnitDatabase, { type: type, eras: activeEras, ranges: activeRanges });
-                            if (unitBlueprint) {
-                                this.spawnUnits("GroundUnit", [{ unitType: unitBlueprint.name, location: latlng, liveryID: "" }], coalitionArea.getCoalition(), true, "", "", (res: any) =>{
-                                    getApp().getMap().addTemporaryMarker(latlng, unitBlueprint.name, getApp().getActiveCoalition(), res.commandHash);
-                                });
-                            }
+                            if (unitBlueprint) 
+                                this.spawnUnits("GroundUnit", [{ unitType: unitBlueprint.name, location: latlng, liveryID: "" }], coalitionArea.getCoalition(), false, "", "");
                         }
                     }
                 }
@@ -1142,7 +1139,7 @@ export class UnitsManager {
             /* Check if the city is inside the coalition area */
             if (polyContains(new LatLng(city.lat, city.lng), coalitionArea)) {
                 /* Arbitrary formula to obtain a number of units depending on the city population */
-                var pointsNumber = 2 + Math.pow(city.pop, 0.2) * density / 100;
+                var pointsNumber = 2 + Math.pow(city.pop, 0.15) * density / 100;
                 for (let i = 0; i < pointsNumber; i++) {
                     /* Place the unit nearby the city, depending on the distribution parameter */
                     var bearing = Math.random() * 360;
@@ -1155,11 +1152,8 @@ export class UnitsManager {
                         if (Math.random() < IADSDensities[type]) {
                             /* Get a random blueprint depending on the selected parameters and spawn the unit */
                             const unitBlueprint = randomUnitBlueprint(groundUnitDatabase, { type: type, eras: activeEras, ranges: activeRanges });
-                            if (unitBlueprint) {
-                                this.spawnUnits("GroundUnit", [{ unitType: unitBlueprint.name, location: latlng, liveryID: "" }], coalitionArea.getCoalition(), true, "", "", (res: any) =>{
-                                    getApp().getMap().addTemporaryMarker(latlng, unitBlueprint.name, getApp().getActiveCoalition(), res.commandHash);
-                                });
-                            }
+                            if (unitBlueprint) 
+                                this.spawnUnits("GroundUnit", [{ unitType: unitBlueprint.name, location: latlng, liveryID: "" }], coalitionArea.getCoalition(), false, "", "");
                         }
                     }
                 }

client/views/contextmenus/map.ejs

@@ -52,8 +52,7 @@
         <button class="explosion-button" title="" data-on-click="contextMenuExplosion" data-on-click-params='{ "explosionType": "normal", "strength": 10 }'>Big explosion</button>
         <button class="explosion-button" title="" data-on-click="contextMenuExplosion" data-on-click-params='{ "explosionType": "phosphorous"}'>White phosphorous</button>
         <button class="explosion-button" title="" data-on-click="contextMenuExplosion" data-on-click-params='{ "explosionType": "napalm"}'>Napalm</button>
-        <button class="explosion-button" title="" data-on-click="contextMenuExplosion" data-on-click-params='{ "explosionType": "secondary"}'>Explosion with secondaries</button>
+        <button class="explosion-button" title="" data-on-click="contextMenuExplosion" data-on-click-params='{ "explosionType": "secondary"}'>Explosion with debries</button>
         <button class="explosion-button" title="" data-on-click="contextMenuExplosion" data-on-click-params='{ "explosionType": "fire"}'>Static fire</button>
-        <button class="explosion-button" title="" data-on-click="contextMenuExplosion" data-on-click-params='{ "explosionType": "depthCharge"}'>Depth charge</button>
     </div>
 </div>

client/views/other/dialogs/splash.ejs

@@ -8,8 +8,8 @@
         </div>
 
         <form id="authentication-form">
-            <div><h5>Username</h5> <input type="text" id="username" name="username" required autocomplete="username" placeholder="Enter username..."></div>
-            <div><h5>Password</h5> <input type="password" id="password" name="password" minlength="8" required autocomplete="current-password" placeholder="Enter password..."></div>
+            <div><h5>Name</h5> <input type="text" id="username" name="username" required autocomplete="username" placeholder="Enter name..."></div>
+            <div><h5>Server password</h5> <input type="password" id="password" name="password" required autocomplete="current-password" placeholder="Enter server password..."></div>
             <button type="submit" id="connection-button" class="ol-button-apply">Connect</button>
         </form>
 

client/views/panels/unitcontrol.ejs

@@ -117,7 +117,7 @@
                     <div><button class="ol-button-white" data-on-click="deleteSelectedUnits" title="Immediately remove the unit from the simulation"><img src="/resources/theme/images/icons/trash-can-regular.svg" inject-svg>Delete</button></div>
                     <div class="hr"><hr></div>
                     <div><button class="ol-button-warning" data-on-click="explodeSelectedUnits" data-on-click-params='{ "type": "normal" }' title="Normal explosion"><img src="/resources/theme/images/icons/explosion-solid.svg" inject-svg>Blow up</button></div>
-                    <div><button class="ol-button-warning" data-on-click="explodeSelectedUnits" data-on-click-params='{ "type": "secondary" }' title="The unit will keep exploding at random intervals, simulating ammunition cooking"><img src="/resources/theme/images/icons/burst-solid.svg" inject-svg>Cook off</button></div>
+                    <div><button class="ol-button-warning" data-on-click="explodeSelectedUnits" data-on-click-params='{ "type": "secondary" }' title="Small explosion with debries"><img src="/resources/theme/images/icons/burst-solid.svg" inject-svg>Cook off</button></div>
                     <div><button class="ol-button-warning" data-on-click="explodeSelectedUnits" data-on-click-params='{ "type": "phosphorous" }' title="White phosphorous explosion"><img src="/resources/theme/images/icons/smog-solid.svg" inject-svg>Phosp.</button></div>
                     <div><button class="ol-button-warning" data-on-click="explodeSelectedUnits" data-on-click-params='{ "type": "napalm" }' title="Napalm"><img src="/resources/theme/images/icons/fire-solid.svg" inject-svg>Napalm</button></div>
                 </div>

scripts/OlympusCommand.lua

@@ -510,10 +510,11 @@ function Olympus.removeFire (smokeName)
 end
 
 function Olympus.secondaries(vec3) 
-	trigger.action.explosion(vec3, 1)
-	for i =	1, 10 do 
-		timer.scheduleFunction(Olympus.randomDebries, vec3, timer.getTime() + math.random(0, 180))
-	end
+	Olympus.randomDebrie(vec3)
+	--trigger.action.explosion(vec3, 1)
+	--for i =	1, 10 do 
+	--	timer.scheduleFunction(Olympus.randomDebries, vec3, timer.getTime() + math.random(0, 180))
+	--end
 end
 
 function Olympus.randomDebries(vec3) 
@@ -914,7 +915,7 @@ function Olympus.setTask(groupName, taskOptions)
 	end
 end
 
--- Reset the dask of a group
+-- Reset the task of a group
 function Olympus.resetTask(groupName)
 	Olympus.debug("Olympus.resetTask " .. groupName, 2)
 	local group = Group.getByName(groupName)

src/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;
 };

src/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();

src/core/include/commands.h

@@ -124,10 +124,10 @@ public:
 		taskOptions(taskOptions),
 		category(category)
 	{ 
-		priority = CommandPriority::HIGH; 
+		priority = CommandPriority::MEDIUM; 
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 2; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -173,7 +173,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 +196,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 +220,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 +245,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;
@@ -289,7 +289,7 @@ public:
 		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;
@@ -310,7 +310,7 @@ public:
 		priority = CommandPriority::MEDIUM;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -328,7 +328,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -346,7 +346,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -379,7 +379,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -401,7 +401,7 @@ public:
 		priority = CommandPriority::HIGH;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 1; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const string groupName;
@@ -421,7 +421,7 @@ public:
 		priority = CommandPriority::MEDIUM;
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 4; }
+	virtual unsigned int getLoad() { return 5; }
 
 private:
 	const Coords location;

src/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;
 };

src/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; }

src/core/include/unit.h

@@ -220,7 +220,7 @@ protected:
 	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;
@@ -245,7 +245,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));
 
@@ -255,7 +255,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));
 

src/core/include/weapon.h

@@ -59,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;

src/core/src/aircraft.cpp

@@ -34,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)
@@ -48,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)
@@ -69,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 */
 }

src/core/src/airunit.cpp

@@ -146,12 +146,15 @@ 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()
@@ -218,7 +221,7 @@ void AirUnit::AIloop()
 					goToDestination(enrouteTask);
 			}
 			else {
-				if (isDestinationReached(AIR_DEST_DIST_THR)) {
+				if (isDestinationReached(getDestinationReachedThreshold())) {
 					if (updateActivePath(looping) && setActiveDestination())
 						goToDestination(enrouteTask);
 					else 

src/core/src/groundunit.cpp

@@ -104,7 +104,6 @@ void GroundUnit::setState(unsigned char newState)
 		setEnableTaskCheckFailed(true);
 		clearActivePath();
 		resetActiveDestination();
-		resetTask();
 		break;
 	}
 	case State::FIRE_AT_AREA: {
@@ -135,12 +134,15 @@ void GroundUnit::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 GroundUnit::AIloop()
@@ -217,7 +219,7 @@ void GroundUnit::AIloop()
 	case State::SIMULATE_FIRE_FIGHT: {
 		setTask("Simulating fire fight");
 
-		if (internalCounter == 0 && targetPosition != Coords(NULL)) {
+		if (internalCounter == 0 && targetPosition != Coords(NULL) && scheduler->getLoad() == 0) {
 			/* Get the distance and bearing to the target */
 			Coords scatteredTargetPosition = targetPosition;
 			double distance;
@@ -226,7 +228,7 @@ void GroundUnit::AIloop()
 			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) * RANDOM_MINUS_ONE_TO_ONE;
+			double scatterDistance = distance * tan(10 /* degs */ * (ShotsScatter::LOW - shotsScatter) / 57.29577 + 2 /* 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 */
@@ -257,7 +259,7 @@ void GroundUnit::AIloop()
 			}
 
 			/* Wait an amout of time depending on the shots intensity */
-			internalCounter = ((ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL;
+			internalCounter = static_cast<unsigned int>(((ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL);
 		}
 
 		if (targetPosition == Coords(NULL))
@@ -265,7 +267,7 @@ void GroundUnit::AIloop()
 
 		/* Fallback if something went wrong */
 		if (internalCounter == 0)
-			internalCounter = 20 / FRAMERATE_TIME_INTERVAL;
+			internalCounter = static_cast<unsigned int>(20 / FRAMERATE_TIME_INTERVAL);
 		internalCounter--;
 
 		break;
@@ -300,7 +302,7 @@ void GroundUnit::AIloop()
 		}
 
 		if (internalCounter == 0)
-			internalCounter = 20 / FRAMERATE_TIME_INTERVAL;
+			internalCounter = static_cast<unsigned int>(20 / FRAMERATE_TIME_INTERVAL);
 		internalCounter--;
 
 		break;
@@ -390,7 +392,7 @@ void GroundUnit::AIloop()
 						scheduler->appendCommand(command);
 						setHasTask(true);
 
-						internalCounter = (aimTime + (ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL;
+						internalCounter = static_cast<unsigned int>((aimTime + (ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL);
 					}
 					/* Else, do miss on purpose */
 					else {
@@ -412,13 +414,13 @@ void GroundUnit::AIloop()
 							scheduler->appendCommand(command);
 							setHasTask(true);
 							setTargetPosition(Coords(aimLat, aimLng, target->getPosition().alt));
-							internalCounter = (aimTime + (ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL;
+							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 = (aimTime + (ShotsIntensity::HIGH - shotsIntensity) * shotsBaseInterval + 2) / FRAMERATE_TIME_INTERVAL;
+							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 */
@@ -431,7 +433,7 @@ void GroundUnit::AIloop()
 							setTargetPosition(Coords(NULL));
 
 							/* Don't wait too long before checking again */
-							internalCounter = 5 / FRAMERATE_TIME_INTERVAL;
+							internalCounter = static_cast<unsigned int>(5 / FRAMERATE_TIME_INTERVAL);
 						}
 					}
 					missOnPurposeTarget = target;
@@ -450,7 +452,7 @@ void GroundUnit::AIloop()
 					if (databaseEntry.has_number_field(L"alertnessTimeConstant"))
 						alertnessTimeConstant = databaseEntry[L"alertnessTimeConstant"].as_number().to_double();
 				}
-				internalCounter = (5 + RANDOM_ZERO_TO_ONE * alertnessTimeConstant * 0 /* TODO: remove to enable alertness again */) / FRAMERATE_TIME_INTERVAL;
+				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));
 			}

src/core/src/helicopter.cpp

@@ -41,33 +41,31 @@ void Helicopter::changeSpeed(string change)
 	if (change.compare("stop") == 0)
 		setState(State::IDLE);
 	else if (change.compare("slow") == 0)
-		desiredSpeed -= knotsToMs(10);
+		setDesiredSpeed(getDesiredSpeed() - knotsToMs(10));
 	else if (change.compare("fast") == 0)
-		desiredSpeed += knotsToMs(10);
-	if (desiredSpeed < 0)
-		desiredSpeed = 0;
+		setDesiredSpeed(getDesiredSpeed() + knotsToMs(10));
 
-	goToDestination();		/* Send the command to reach the destination */
+	if (getDesiredSpeed() < knotsToMs(0))
+		setDesiredSpeed(knotsToMs(0));
 }
 
 void Helicopter::changeAltitude(string change)
 {
 	if (change.compare("descend") == 0)
 	{
-		if (desiredAltitude > 100)
-			desiredAltitude -= ftToM(100);
-		else if (desiredAltitude > 0)
-			desiredAltitude -= ftToM(10);
+		if (getDesiredAltitude() > 100)
+			setDesiredAltitude(getDesiredAltitude() - ftToM(100));
+		else if (getDesiredAltitude() > 0)
+			setDesiredAltitude(getDesiredAltitude() - ftToM(10));
 	}
 	else if (change.compare("climb") == 0)
 	{
-		if (desiredAltitude > 100)
-			desiredAltitude += ftToM(100);
-		else if (desiredAltitude >= 0)
-			desiredAltitude += ftToM(10);
+		if (getDesiredAltitude() > 100)
+			setDesiredAltitude(getDesiredAltitude() + ftToM(100));
+		else if (getDesiredAltitude() >= 0)
+			setDesiredAltitude(getDesiredAltitude() + ftToM(10));
 	}
-	if (desiredAltitude < 0)
-		desiredAltitude = 0;
 
-	goToDestination();		/* Send the command to reach the destination */
-}
+	if (getDesiredAltitude() < 0)
+		setDesiredAltitude(0);
+}

src/core/src/navyunit.cpp

@@ -93,34 +93,33 @@ void NavyUnit::setState(unsigned char newState)
 		setEnableTaskCheckFailed(true);
 		clearActivePath();
 		resetActiveDestination();
-		resetTask();
 		break;
 	}
 	case State::FIRE_AT_AREA: {
 		setEnableTaskCheckFailed(true);
 		clearActivePath();
 		resetActiveDestination();
-		resetTask();
 		break;
 	}
 	case State::SIMULATE_FIRE_FIGHT: {
 		setEnableTaskCheckFailed(true);
 		clearActivePath();
 		resetActiveDestination();
-		resetTask();
 		break;
 	}
 	default:
 		break;
 	}
 
-	if (newState != state)
-		resetTask();
+	setHasTask(false);
+	resetTaskFailedCounter();
 
 	log(unitName + " setting state from " + to_string(state) + " to " + to_string(newState));
 	state = newState;
 
 	triggerUpdate(DataIndex::state);
+
+	AIloop();
 }
 
 void NavyUnit::AIloop()
@@ -188,15 +187,9 @@ void NavyUnit::AIloop()
 	case State::SIMULATE_FIRE_FIGHT: {
 		setTask("Simulating fire fight");
 
-		if (!getHasTask()) {
-			std::ostringstream taskSS;
-			taskSS.precision(10);
+		// TODO 
 
-			taskSS << "{id = 'FireAtPoint', lat = " << targetPosition.lat << ", lng = " << targetPosition.lng << ", radius = 1}";
-			Command* command = dynamic_cast<Command*>(new SetTask(groupName, taskSS.str(), [this]() { this->setHasTaskAssigned(true); }));
-			scheduler->appendCommand(command);
-			setHasTask(true);
-		}
+		setState(State::IDLE);
 	}
 	default:
 		break;

src/core/src/scheduler.cpp

@@ -56,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) */
@@ -82,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)));
@@ -132,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)
@@ -254,7 +262,7 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 	{
 		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();

src/core/src/server.cpp

@@ -89,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;
                 }
             }

src/core/src/unit.cpp

@@ -430,7 +430,11 @@ void Unit::resetTask()
 void Unit::setFormationOffset(Offset newFormationOffset)
 {
 	formationOffset = newFormationOffset;
-	resetTask();
+	
+	/* Apply the change */
+	setHasTask(false);
+	resetTaskFailedCounter();
+	AIloop();
 
 	triggerUpdate(DataIndex::formationOffset);
 }
@@ -519,7 +523,11 @@ void Unit::setIsActiveTanker(bool newIsActiveTanker)
 {
 	if (isActiveTanker != newIsActiveTanker) {
 		isActiveTanker = newIsActiveTanker;
-		resetTask();
+		
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::isActiveTanker);
 	}
@@ -529,7 +537,11 @@ void Unit::setIsActiveAWACS(bool newIsActiveAWACS)
 {
 	if (isActiveAWACS != newIsActiveAWACS) {
 		isActiveAWACS = newIsActiveAWACS;
-		resetTask();
+		
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::isActiveAWACS);
 	}
@@ -644,10 +656,11 @@ void Unit::setDesiredSpeed(double newDesiredSpeed)
 {
 	if (desiredSpeed != newDesiredSpeed) {
 		desiredSpeed = newDesiredSpeed;
-		if (state == State::IDLE)
-			resetTask();
-		else
-			goToDestination();		/* Send the command to reach the destination */
+		
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredSpeed);
 	}
@@ -657,10 +670,11 @@ void Unit::setDesiredAltitude(double newDesiredAltitude)
 {
 	if (desiredAltitude != newDesiredAltitude) {
 		desiredAltitude = newDesiredAltitude;
-		if (state == State::IDLE)
-			resetTask();
-		else
-			goToDestination();		/* Send the command to reach the destination */
+
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredAltitude);
 	}
@@ -670,10 +684,11 @@ void Unit::setDesiredSpeedType(string newDesiredSpeedType)
 {
 	if (desiredSpeedType != (newDesiredSpeedType.compare("GS") == 0)) {
 		desiredSpeedType = newDesiredSpeedType.compare("GS") == 0;
-		if (state == State::IDLE)
-			resetTask();
-		else
-			goToDestination();		/* Send the command to reach the destination */
+
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredSpeedType);
 	}
@@ -683,10 +698,11 @@ void Unit::setDesiredAltitudeType(string newDesiredAltitudeType)
 {
 	if (desiredAltitudeType != (newDesiredAltitudeType.compare("AGL") == 0)) {
 		desiredAltitudeType = newDesiredAltitudeType.compare("AGL") == 0;
-		if (state == State::IDLE)
-			resetTask();
-		else
-			goToDestination();		/* Send the command to reach the destination */
+		
+		/* Apply the change */
+		setHasTask(false);
+		resetTaskFailedCounter();
+		AIloop();
 
 		triggerUpdate(DataIndex::desiredAltitudeType);
 	}

src/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]);

third-party/base64/include/base64.hpp

@@ -18,7 +18,7 @@ namespace base64 {
 		uint32_t bit_stream = 0;
 		const std::string base64_chars = get_base64_chars();
 		std::string encoded;
-		encoded.reserve(ceil(4.0 / 3.0 * size));
+		encoded.reserve(static_cast<unsigned long>(ceil(4.0 / 3.0 * size)));
 		int offset = 0;
 		for (unsigned int idx = 0; idx < size; idx++) {
 			unsigned char c = data[idx];
@@ -63,7 +63,7 @@ namespace base64 {
 			auto num_val = base64_chars.find(c);
 			if (num_val != std::string::npos) {
 				offset = 18 - counter % 4 * 6;
-				bit_stream += num_val << offset;
+				bit_stream += static_cast<uint32_t>(num_val << offset);
 				if (offset == 12) {
 					decoded += static_cast<char>(bit_stream >> 16 & 0xff);
 				}