v0.4.13-alpha-rc5

Fixed incorrect colour

README.md

@@ -19,6 +19,55 @@ The full feature list is simply too long to enumerate in a short summary but nee
 ### Installing DCS Olympus
 A prebuilt installer will soon be released and available here
 
+# Frequently Asked Questions
+### Can I join up and help out with the project? ###
+We are currently running towards first release in the very near future so we are not looking to add more people to the core team for the moment. However that does not mean we are not open to collaborations and help going forward, if you want to help for now we are committed to the free and open source model so feel free to check out the github, familiarize yourself with the project and maybe even start submitting pull requests for open issues.
+
+Post-release we will be more interested in developing partnerships/collaborations with other teams/projects and potentially bringing in more team members, we will update this after release on how that will be managed!
+
+### Can I be a beta/alpha-tester? ###
+With first public release planned for the very-near future we are fully committed to the final sprint, as such we will not be formally recruiting more people to test pre-release. 
+
+Post-release we will be eager to hear feedback of all forms and take in bug-reports, at this time after release we will begin considering bringing in more team members to test in development versions as we go.
+
+### Do you have a roadmap? ###
+We do not have a roadmap no, we have a laundry list of things we are hoping to do. 
+
+These include but are not limited to:
+1) Enhancements to helicopter play
+2) More features around use of ground units
+3) More unique effects and behaviours
+4) ATC/AIC features
+5) Usability features like unit painters etc
+
+However we cannot commit to specific features, feature release order, or timelines, please remember this isn't our job and we work on it in our free time because we love DCS
+
+### Does Olympus support mods? ###
+Generally OIympus will not have any issues with other mods, however you may need to tell olympus about modded units in order to be able to dynamically spawn them etc
+
+Keep in mind that any mods you do choose to spawn your players will need to have, some mod unit just appear as a su27 or leo2 etc. when a player is missing them, others can cause client crashes. So be smart about how you use them
+
+### Is Olympus compatible with mission scripts? ###
+We have tried hard to keep Olympus from interfering with other scripts, we have tested with a variety of new and old mission scripts and generally expect it will not be an issue.
+
+However we cannot foresee everything people come up with so we suggest testing with what you have in mind once olympus releases
+
+### How does it work? ###
+The quick answer is magic. 
+
+The long answer is well all the code is there for you to read. 
+
+The middle answer is a bit like SRS does. Olympus consists of two parts. 
+
+(A) Olympus back end: A dll, run by DCS, that sends data out and gets commands in via a REST API;
+(B) Webserver exe: The one you start when starting the server via the desktop shortcut. 
+
+A and B never communicate when you connect the client you download the web page and some other minor stuff from B, and you get the DCS data from and send commands to A.
+
+### How much does Olympus impact performance? ###
+Olympus by itself should not have a noticeable impact on server performance, however the ability for the user to spawn arbitrary units and command engagements means Olympus can be used in such a way that brings the game to it's knees.
+
+Be cognizant of how you play, whether it's done through Olympus or the mission editor 500 MLRS units firing at once is not going to go over well with most servers
  
     
     

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

@@ -128,7 +128,16 @@ declare module "constants/constants" {
     export const altitudeIncrements: {
         [key: string]: number;
     };
-    export const minimapBoundaries: LatLng[][];
+    export const minimapBoundaries: {
+        Nevada: LatLng[];
+        Syria: LatLng[];
+        Caucasus: LatLng[];
+        PersianGulf: LatLng[];
+        MarianaIslands: LatLng[];
+        Falklands: LatLng[];
+        Normandy: LatLng[];
+        SinaiMap: LatLng[];
+    };
     export const mapBounds: {
         Syria: {
             bounds: LatLngBounds;

client/bin/www

@@ -112,5 +112,5 @@ function onListening() {
   debug('Listening on ' + bind);
 }
 
-console.log("DCS Olympus server v0.4.11-alpha-rc3 started correctly!")
+console.log("DCS Olympus server v0.4.13-alpha-rc5 started correctly!")
 console.log("Waiting for connections...")

client/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "DCSOlympus",
-  "version": "v0.4.11-alpha-rc3",
+  "version": "v0.4.13-alpha-rc5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "DCSOlympus",
-      "version": "v0.4.11-alpha-rc3",
+      "version": "v0.4.13-alpha-rc5",
       "dependencies": {
         "@turf/turf": "^6.5.0",
         "body-parser": "^1.20.2",

client/package.json

@@ -2,7 +2,7 @@
   "name": "DCSOlympus",
   "node-main": "./bin/www",
   "main": "http://localhost:3000",
-  "version": "v0.4.11-alpha-rc3",
+  "version": "v0.4.13-alpha-rc5",
   "private": true,
   "scripts": {
     "build": "browserify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat",

client/public/stylesheets/panels/mouseinfo.css

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

client/public/stylesheets/style/style.css

@@ -676,8 +676,8 @@ nav.ol-panel> :last-child {
 }
 
 .ol-navbar-buttons-group button.off svg * {
-    fill: white;
-    stroke: white;
+    fill: white !important;     /*  Higher price than the Soul Stone but inline styling is causing issues.  */
+    stroke: white !important;   /*  I'm sorry, daughter.  */
 }
 
 .ol-navbar-buttons-group button svg * {

client/src/constants/constants.ts

@@ -67,70 +67,70 @@ export const minAltitudeValues: { [key: string]: number } = { Aircraft: 0, Helic
 export const maxAltitudeValues: { [key: string]: number } = { Aircraft: 50000, Helicopter: 10000 };
 export const altitudeIncrements: { [key: string]: number } = { Aircraft: 500, Helicopter: 100 };
 
-export const minimapBoundaries = [
-    [    // NTTR
+export const minimapBoundaries = {
+    "Nevada": [    // NTTR
         new LatLng(39.7982463, -119.985425),
         new LatLng(34.4037128, -119.7806729),
         new LatLng(34.3483316, -112.4529351),
         new LatLng(39.7372411, -112.1130805),
         new LatLng(39.7982463, -119.985425)
     ],
-    [   // Syria
+    "Syria": [   // Syria
         new LatLng(37.3630556, 29.2686111),
         new LatLng(31.8472222, 29.8975),
         new LatLng(32.1358333, 42.1502778),
         new LatLng(37.7177778, 42.3716667),
         new LatLng(37.3630556, 29.2686111)
     ],
-    [   // Caucasus
+    "Caucasus": [   // Caucasus
         new LatLng(39.6170191, 27.634935),
         new LatLng(38.8735863, 47.1423108),
         new LatLng(47.3907982, 49.3101946),
         new LatLng(48.3955879, 26.7753625),
         new LatLng(39.6170191, 27.634935)
     ],
-    [   // Persian Gulf
+    "PersianGulf": [   // Persian Gulf
         new LatLng(32.9355285, 46.5623682),
         new LatLng(21.729393, 47.572675),
         new LatLng(21.8501348, 63.9734737),
         new LatLng(33.131584, 64.7313594),
         new LatLng(32.9355285, 46.5623682)
     ],
-    [   // Marianas
+    "MarianaIslands": [   // Marianas
         new LatLng(22.09, 135.0572222),
         new LatLng(10.5777778, 135.7477778),
         new LatLng(10.7725, 149.3918333),
         new LatLng(22.5127778, 149.5427778),
         new LatLng(22.09, 135.0572222)
     ],
-    [   // South Atlantic
+    "Falklands": [   // South Atlantic
         new LatLng(-49.097217, -79.418267),
         new LatLng(-56.874517,-79.418267),
         new LatLng(-56.874517, -43.316433),
         new LatLng(-49.097217, -43.316433),
         new LatLng(-49.097217, -79.418267)
     ], 
-    [   // Normandy
+    "Normandy": [   // Normandy
         new LatLng(50.44, -3.29),
         new LatLng(48.12,-3.29),
         new LatLng(48.12, 3.70),
         new LatLng(50.44, 3.70),
         new LatLng(50.44, -3.29)
     ], 
-    [   // Sinai
+    "SinaiMap": [   // 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)
     ]
-];
+};
 
 export const mapBounds = {
     "Syria": { bounds: new LatLngBounds([31.8472222, 29.8975], [37.7177778, 42.3716667]), zoom: 5 },
     "MarianaIslands": { bounds: new LatLngBounds([10.5777778, 135.7477778], [22.5127778, 149.5427778]), zoom: 5 },
     "Nevada": { bounds: new LatLngBounds([34.4037128, -119.7806729], [39.7372411, -112.1130805]), zoom: 5 },
-    "PersianGulf": { bounds: new LatLngBounds([21.729393, 47.572675], [33.131584, 64.7313594]), zoom: 5 },
+    "PersianGulf": { bounds: new LatLngBounds([21.729393, 47.572675], [33.131584, 64.7313594]), zoom: 4 },
     "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 },

client/src/map/map.ts

@@ -64,6 +64,7 @@ export class Map extends L.Map {
     #centerUnit: Unit | null = null;
     #miniMap: ClickableMiniMap | null = null;
     #miniMapLayerGroup: L.LayerGroup;
+    #miniMapPolyline: L.Polyline;
     #temporaryMarkers: TemporaryUnitMarker[] = [];
     #selecting: boolean = false;
     #isZooming: boolean = false;
@@ -123,8 +124,8 @@ export class Map extends L.Map {
         /* Minimap */
         var minimapLayer = new L.TileLayer(mapLayers[Object.keys(mapLayers)[0] as keyof typeof mapLayers].urlTemplate, { minZoom: 0, maxZoom: 13 });
         this.#miniMapLayerGroup = new L.LayerGroup([minimapLayer]);
-        var miniMapPolyline = new L.Polyline(this.#getMinimapBoundaries(), { color: '#202831' });
-        miniMapPolyline.addTo(this.#miniMapLayerGroup);
+        this.#miniMapPolyline = new L.Polyline([], { color: '#202831' });
+        this.#miniMapPolyline.addTo(this.#miniMapLayerGroup);
 
         /* Scale */
         //@ts-ignore TODO more hacking because the module is provided as a pure javascript module only
@@ -418,6 +419,9 @@ export class Map extends L.Map {
             if (this.#miniMap)
                 this.setView(e.latlng);
         })
+
+        const boundaries = this.#getMinimapBoundaries();
+        this.#miniMapPolyline.setLatLngs(boundaries[theatre as keyof typeof boundaries]);
     }
 
     getMiniMapLayerGroup() {
@@ -791,7 +795,7 @@ export class Map extends L.Map {
 
     #showDestinationCursors() {
         const singleCursor = !this.#shiftKey;
-        const selectedUnitsCount = getApp().getUnitsManager().getSelectedUnits({ excludeHumans: true, onlyOnePerGroup: true }).length;
+        const selectedUnitsCount = getApp().getUnitsManager().getSelectedUnits({ excludeHumans: true, excludeProtected: true, onlyOnePerGroup: true }).length;
         if (singleCursor) {
             this.#hideDestinationCursors();
         }
@@ -817,7 +821,7 @@ export class Map extends L.Map {
     }
 
     #updateDestinationCursors() {
-        const selectedUnitsCount = getApp().getUnitsManager().getSelectedUnits({ excludeHumans: true, onlyOnePerGroup: true }).length;
+        const selectedUnitsCount = getApp().getUnitsManager().getSelectedUnits({ excludeHumans: true, excludeProtected: true, onlyOnePerGroup: true }).length;
         if (selectedUnitsCount > 1) {
             const groupLatLng = this.#computeDestinationRotation && this.#destinationRotationCenter != null ? this.#destinationRotationCenter : this.getMouseCoordinates();
             if (this.#destinationPreviewCursors.length == 1)

client/src/olympusapp.ts

@@ -29,7 +29,7 @@ import { UnitListPanel } from "./panels/unitlistpanel";
 import { ContextManager } from "./context/contextmanager";
 import { Context } from "./context/context";
 
-var VERSION = "v0.4.11-alpha-rc3";
+var VERSION = "v0.4.13-alpha-rc5";
 var DEBUG = false;
 
 export class OlympusApp {

client/src/panels/unitcontrolpanel.ts

@@ -9,6 +9,7 @@ import { ROEDescriptions, ROEs, altitudeIncrements, emissionsCountermeasures, em
 import { ftToM, knotsToMs, mToFt, msToKnots } from "../other/utils";
 import { GeneralSettings, Radio, TACAN } from "../interfaces";
 import { ContextActionSet } from "../unit/contextactionset";
+import { Popup } from "../popups/popup";
 
 export class UnitControlPanel extends Panel {
     #altitudeSlider: Slider;
@@ -97,6 +98,8 @@ export class UnitControlPanel extends Panel {
         /* Follow roads switch */
         this.#followRoadsSwitch = new Switch("follow-roads-switch", (value: boolean) => {
             getApp().getUnitsManager().setFollowRoads(value);
+            if (value) 
+                (getApp().getPopupsManager().get("infoPopup") as Popup).setText("Warning: follow roads movements can cause lag");
         });
 
         /* Operate as */

client/src/unit/unitsmanager.ts

@@ -138,6 +138,10 @@ export class UnitsManager {
             return;
         const messageText = (numOfProtectedUnits === 1) ? `Unit is protected` : `All selected units are protected`;
         (getApp().getPopupsManager().get("infoPopup") as Popup).setText(messageText);
+        //  Cheap way for now until we use more locks
+        let lock = <HTMLElement>document.querySelector("#unit-visibility-control button.lock");
+        lock.classList.add("prompt");
+        setTimeout(() => lock.classList.remove("prompt"), 4000);
     }
 
     /** Update the data of all the units. The data is directly decoded from the binary buffer received from the REST Server. This is necessary for performance and bandwidth reasons.
@@ -301,13 +305,8 @@ export class UnitsManager {
             }
         }
         if (options) {
-            if (options.showProtectionReminder === true && numProtectedUnits > selectedUnits.length && selectedUnits.length === 0) {
+            if (options.showProtectionReminder === true && numProtectedUnits > selectedUnits.length && selectedUnits.length === 0)
                 this.showProtectedUnitsPopup(numProtectedUnits);
-                //  Cheap way for now until we use more locks
-                let lock = <HTMLElement>document.querySelector("#unit-visibility-control button.lock");
-                lock.classList.add("prompt");
-                setTimeout(() => lock.classList.remove("prompt"), 4000);
-            }
 
             if (options.onlyOnePerGroup) {
                 var temp: Unit[] = [];
@@ -1148,6 +1147,14 @@ export class UnitsManager {
         if (units === null)
             units = this.getSelectedUnits({ excludeHumans: true, excludeProtected: true, onlyOnePerGroup: true });
 
+        const segregatedUnits = this.segregateUnits(units);
+        if (segregatedUnits.controllable.length === 0) {
+            this.showProtectedUnitsPopup(segregatedUnits.dcsProtected.length);
+            return {};
+        }
+
+        units = segregatedUnits.controllable;
+
         if (units.length === 0)
             return {};
 

client/views/other/dialogs/splash.ejs

@@ -3,7 +3,7 @@
         <div id="app-summary">
             <h2>DCS Olympus</h2>
             <h4>Dynamic Unit Command</h4>
-            <div class="app-version">Version <span class="app-version-number">v0.4.11-alpha-rc3</span></div>
+            <div class="app-version">Version <span class="app-version-number">v0.4.13-alpha-rc5</span></div>
             <div class="app-version">Latest version <span id="latest-version" class="app-version-number"></span></div>
         </div>
 

client/views/panels/unitcontrol.ejs

@@ -100,7 +100,7 @@
             </div>
 
             <div id="follow-roads" class="switch-control yes-no">
-                <h4>Follow roads <img src="/resources/theme/images/icons/circle-question-regular.svg" title=""></h4>
+                <h4>Follow roads <img src="/resources/theme/images/icons/circle-question-regular.svg" title="WARNING: follow roads movements can cause lag"></h4>
                 <div id="follow-roads-switch" class="ol-switch"></div>
             </div>
         </div>

client/views/toolbars/primary.ejs

@@ -6,7 +6,7 @@
         <div class="ol-select-options">
             <div id="toolbar-summary">
                 <h3>DCS Olympus</h3>
-                <div class="accent-green app-version-number">version v0.4.11-alpha-rc3</div>
+                <div class="accent-green app-version-number">version v0.4.13-alpha-rc5</div>
             </div>
             <div>
                 <a href="https://discord.gg/wWXyVVBZT7" target="_blank">Discord</a>
@@ -57,17 +57,17 @@
     <div id="coalition-visibility-control" class="ol-group ol-navbar-buttons-group">
         <div>
             <button id="coalition-visibility-control-blue" data-on-click="toggleCoalitionVisibility"
-                data-on-click-params='{ "coalition": "blue" }'><img src="/resources/theme/images/buttons/visibility/shield.svg" class="fill-coalition" data-coalition="blue" inject-svg /></button>
+                data-on-click-params='{ "coalition": "blue" }' title="Toggle Blue coalition visibility"><img src="/resources/theme/images/buttons/visibility/shield.svg" class="fill-coalition" data-coalition="blue" inject-svg /></button>
         </div>
 
         <div>
             <button id="coalition-visibility-control-red" data-on-click="toggleCoalitionVisibility"
-                data-on-click-params='{ "coalition": "red" }'><img src="/resources/theme/images/buttons/visibility/shield.svg" class="fill-coalition" data-coalition="red" inject-svg /></button>
+                data-on-click-params='{ "coalition": "red" }' title="Toggle Red coalition visibility"><img src="/resources/theme/images/buttons/visibility/shield.svg" class="fill-coalition" data-coalition="red" inject-svg /></button>
         </div>
 
         <div>
             <button id="coalition-visibility-control-neutral" data-on-click="toggleCoalitionVisibility"
-                data-on-click-params='{ "coalition": "neutral" }'><img src="/resources/theme/images/buttons/visibility/shield.svg" class="fill-coalition" data-coalition="neutral" inject-svg /></button>
+                data-on-click-params='{ "coalition": "neutral" }' title="Toggle Neutral coalition visibility"><img src="/resources/theme/images/buttons/visibility/shield.svg" class="fill-coalition" data-coalition="neutral" inject-svg /></button>
         </div>
     </div>
 </nav>

installer/olympus.iss

@@ -1,6 +1,6 @@
 #define nwjsFolder "..\..\nwjs\"
 #define nodejsFolder "..\..\node\"
-#define version "v0.4.11-alpha-rc3"
+#define version "v0.4.13-alpha-rc5"
 
 [Setup] 
 AppName=DCS Olympus 
@@ -47,6 +47,7 @@ Source: "..\img\configurator_logo.png"; DestDir: "{app}\Mods\Services\Olympus\im
 Source: "{#nwjsFolder}\*.*"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion recursesubdirs; Check: CheckLocalInstall
 Source: "{#nodejsFolder}\*.*"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion recursesubdirs; Check: CheckServerInstall
 Source: "..\scripts\python\configurator\dist\configurator.exe"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion;
+Source: "..\LEGAL"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion;
 
 [Run]
 Filename: "{app}\Mods\Services\Olympus\configurator.exe"; Parameters: -a {code:GetAddress} -c {code:GetClientPort} -b {code:GetBackendPort} -p {code:GetPassword} -bp {code:GetBluePassword} -rp {code:GetRedPassword}; Check: CheckCallConfigurator

mod/entry.lua

@@ -15,7 +15,7 @@ declare_plugin(self_ID,
 	shortName	 = "Olympus",
 	fileMenuName = "Olympus",
 
-	version		 = "v0.4.11-alpha-rc3",
+	version		 = "v0.4.13-alpha-rc5",
 	state		 = "installed",
 	developerName= "DCS Refugees 767 squadron",
 	info		 = _("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."),

scripts/OlympusCommand.lua

@@ -1,4 +1,4 @@
-local version = "v0.4.11-alpha-rc3"
+local version = "v0.4.13-alpha-rc5"
 
 local debug = false				-- True enables debug printing using DCS messages
 
@@ -31,7 +31,7 @@ Olympus.missionStartTime = DCS.getRealTime()
 Olympus.napalmCounter = 1
 Olympus.fireCounter = 1
 
--- Load the current instance folder
+-- Load the lua file system
 local lfs = require('lfs')
 
 ------------------------------------------------------------------------------------------------------
@@ -40,12 +40,14 @@ local lfs = require('lfs')
 -- Print a debug message if the debug option is true
 function Olympus.debug(message, displayFor)
 	if debug == true then
+		Olympus.log:info(message)
     	trigger.action.outText(message, displayFor)
 	end
 end
 
 -- Print a notify message
 function Olympus.notify(message, displayFor)
+	Olympus.log:info(message)
     trigger.action.outText(message, displayFor)
 end
 
@@ -513,7 +515,7 @@ function Olympus.removeFire (smokeName)
 end
 
 function Olympus.secondaries(vec3) 
-	Olympus.randomDebrie(vec3)
+	Olympus.randomDebries(vec3)
 	--trigger.action.explosion(vec3, 1)
 	--for i =	1, 10 do 
 	--	timer.scheduleFunction(Olympus.randomDebries, vec3, timer.getTime() + math.random(0, 180))
@@ -984,10 +986,16 @@ function Olympus.setUnitsData(arg, time)
 						table["category"] = "GroundUnit"
 					elseif unit:getDesc().category == Unit.Category.SHIP then
 						table["category"] = "NavyUnit"
+					elseif Olympus.modsList ~= nil and Olympus.modsList[unit:getDesc().typeName] ~= nil then
+						table["category"] = Olympus.modsList[unit:getDesc().typeName]
 					end
 				else
-					units[ID] = {isAlive = false}
-					Olympus.units[ID] = nil
+					if Olympus.modsList ~= nil and Olympus.modsList[unit:getDesc().typeName] ~= nil then
+						table["category"] = Olympus.modsList[unit:getDesc().typeName]
+					else
+						units[ID] = {isAlive = false}
+						Olympus.units[ID] = nil
+					end
 				end
 
 				-- If the category is handled by Olympus, get the data
@@ -1367,7 +1375,6 @@ end
 Olympus.instancePath = lfs.writedir().."Mods\\Services\\Olympus\\bin\\"
 Olympus.notify("Starting DCS Olympus backend session in "..Olympus.instancePath, 2)
 
-
 local OlympusName = 'Olympus ' .. version .. ' C++ module';
 Olympus.DLLsloaded = Olympus.loadDLLs()
 if Olympus.DLLsloaded then

scripts/OlympusHook.lua

@@ -1,4 +1,4 @@
-local version = 'v0.4.11-alpha-rc3'
+local version = 'v0.4.13-alpha-rc5'
 local lfs = require("lfs")
 
 Olympus = {}
@@ -14,8 +14,8 @@ function Olympus.loadDLLs()
 	
 	local status
 	log.write('Olympus.HOOKS.LUA', log.INFO, 'Loading olympus.dll from ['..Olympus.OlympusModPath..']')
-	status, Olympus.OlympusDLL = require("olympus")
-		if status then
+	status, Olympus.OlympusDLL = pcall(require, 'olympus')
+	if status then
 		log.write('Olympus.HOOKS.LUA', log.INFO, 'olympus.dll loaded successfully')
 		return true
 	else

scripts/mods.lua

@@ -0,0 +1,11 @@
+-- Enter here any mods required by your mission as in the example below.
+-- Possible categories are:
+-- Aircraft
+-- Helicopter
+-- GroundUnit
+-- NavyUnit
+
+Olympus.modsList = {
+	["A-4E-C"] = "Aircraft",
+	["Bronco-OV-10A"] = "Aircraft"
+}

src/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::MEDIUM; 
 	};
 	virtual string getString();
-	virtual unsigned int getLoad() { return 5; }
+	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 */

src/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
 {

src/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"

src/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, "

src/core/src/core.cpp

@@ -59,6 +59,9 @@ extern "C" DllExport int coreInit(lua_State* L, const char* 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);

src/core/src/groundunit.cpp

@@ -228,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 + 2 /* degs */) * RANDOM_MINUS_ONE_TO_ONE;
+			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 */

src/core/src/scheduler.cpp

@@ -524,8 +524,8 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		if (unit != nullptr) {
-			unit->setState(State::BOMB_POINT);
 			unit->setTargetPosition(loc);
+			unit->setState(State::BOMB_POINT);
 			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to bomb a point", true);
 		}
 	}
@@ -539,8 +539,8 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		if (unit != nullptr) {
-			unit->setState(State::CARPET_BOMB);
 			unit->setTargetPosition(loc);
+			unit->setState(State::CARPET_BOMB);
 			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to perform carpet bombing", true);
 		}
 	}
@@ -555,8 +555,8 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		if (unit != nullptr) {
-			unit->setState(State::BOMB_BUILDING);
 			unit->setTargetPosition(loc);
+			unit->setState(State::BOMB_BUILDING);
 		}
 	}
 	/************************/
@@ -569,8 +569,8 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Coords loc; loc.lat = lat; loc.lng = lng;
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		if (unit != nullptr) {
-			unit->setState(State::FIRE_AT_AREA);
 			unit->setTargetPosition(loc);
+			unit->setState(State::FIRE_AT_AREA);
 			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to fire at area", true);
 		}
 	}
@@ -585,8 +585,8 @@ void Scheduler::handleRequest(string key, json::value value, string username, js
 		Coords loc; loc.lat = lat; loc.lng = lng; loc.alt = alt;
 		Unit* unit = unitsManager->getGroupLeader(ID);
 		if (unit != nullptr) {
-			unit->setState(State::SIMULATE_FIRE_FIGHT);
 			unit->setTargetPosition(loc);
+			unit->setState(State::SIMULATE_FIRE_FIGHT);
 			log(username + " tasked unit " + unit->getUnitName() + "(" + unit->getName() + ") to simulate a fire fight", true);
 		}
 	}

src/core/src/scriptloader.cpp

@@ -42,4 +42,5 @@ void registerLuaFunctions(lua_State* L)
     executeLuaScript(L, instancePath + "..\\Scripts\\OlympusCommand.lua");
     executeLuaScript(L, instancePath + "..\\Scripts\\unitPayloads.lua");
     executeLuaScript(L, instancePath + "..\\Scripts\\templates.lua");
+    executeLuaScript(L, instancePath + "..\\Scripts\\mods.lua");
 }

src/core/src/unit.cpp

@@ -712,7 +712,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);
 	}

src/shared/include/defines.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#define VERSION "v0.4.11-alpha-rc3"
+#define VERSION "v0.4.13-alpha-rc5"
 #define LOG_NAME "Olympus_log.txt"
 #define REST_ADDRESS "http://localhost:30000"
 #define REST_URI "olympus"

src/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[] =

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "v0.4.11-alpha-rc3"
+  "version": "v0.4.13-alpha-rc5"
 }