From dcff462b3234b3dca6f6b7fbcd3c97c297cf9a22 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Wed, 6 Dec 2023 09:15:44 +0100 Subject: [PATCH] v0.4.11-alpha-rc3 --- client/@types/olympus/index.d.ts | 13 ++++++++ client/bin/www | 2 +- client/package-lock.json | 4 +-- client/package.json | 2 +- client/src/olympusapp.ts | 6 ++-- client/views/other/dialogs/splash.ejs | 2 +- client/views/toolbars/primary.ejs | 2 +- installer/olympus.iss | 44 +++++++++++++------------- mod/entry.lua | 2 +- scripts/OlympusCommand.lua | 2 +- scripts/OlympusHook.lua | 2 +- src/olympus/olympus.aps | Bin 0 -> 1356 bytes src/shared/include/defines.h | 2 +- version.json | 2 +- 14 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 src/olympus/olympus.aps diff --git a/client/@types/olympus/index.d.ts b/client/@types/olympus/index.d.ts index 37fb00a0..c8c74be3 100644 --- a/client/@types/olympus/index.d.ts +++ b/client/@types/olympus/index.d.ts @@ -2031,6 +2031,19 @@ declare module "unit/unitsmanager" { * @param category Either "Aircraft", "Helicopter", "GroundUnit", or "NavyUnit". Determines what class will be used to create the new unit accordingly. */ addUnit(ID: number, category: string): void; + /** Sort units segregated groups based on controlling type and protection, if DCS-controlled + * + * @param units + * @returns Object + */ + segregateUnits(units: Unit[]): { + [key: string]: []; + }; + /** + * + * @param numOfProtectedUnits number + */ + showProtectedUnitsPopup(numOfProtectedUnits: number): void; /** 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. * * @param buffer The arraybuffer, encoded according to the ICD defined in: TODO Add reference to ICD diff --git a/client/bin/www b/client/bin/www index d7fb36d8..39d7da3b 100644 --- a/client/bin/www +++ b/client/bin/www @@ -112,5 +112,5 @@ function onListening() { debug('Listening on ' + bind); } -console.log("DCS Olympus server v0.4.10-alpha-rc2 started correctly!") +console.log("DCS Olympus server v0.4.11-alpha-rc3 started correctly!") console.log("Waiting for connections...") diff --git a/client/package-lock.json b/client/package-lock.json index 4b2a9705..4b6ddb18 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "DCSOlympus", - "version": "v0.4.10-alpha-rc2", + "version": "v0.4.11-alpha-rc3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "DCSOlympus", - "version": "v0.4.10-alpha-rc2", + "version": "v0.4.11-alpha-rc3", "dependencies": { "@turf/turf": "^6.5.0", "body-parser": "^1.20.2", diff --git a/client/package.json b/client/package.json index b8b286f3..37f957da 100644 --- a/client/package.json +++ b/client/package.json @@ -2,7 +2,7 @@ "name": "DCSOlympus", "node-main": "./bin/www", "main": "http://localhost:3000", - "version": "v0.4.10-alpha-rc2", + "version": "v0.4.11-alpha-rc3", "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", diff --git a/client/src/olympusapp.ts b/client/src/olympusapp.ts index a9bebd90..817f28fc 100644 --- a/client/src/olympusapp.ts +++ b/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.10-alpha-rc2"; +var VERSION = "v0.4.11-alpha-rc3"; var DEBUG = false; export class OlympusApp { @@ -262,9 +262,7 @@ export class OlympusApp { const latestVersionSpan = document.getElementById("latest-version") as HTMLElement; if (latestVersionSpan) { latestVersionSpan.innerHTML = this.#latestVersion ?? "Unknown"; - if (this.#latestVersion !== VERSION) { - latestVersionSpan.classList.add("new-version"); - } + latestVersionSpan.classList.toggle("new-version", this.#latestVersion !== VERSION); } }) } diff --git a/client/views/other/dialogs/splash.ejs b/client/views/other/dialogs/splash.ejs index 76669c64..a571f427 100644 --- a/client/views/other/dialogs/splash.ejs +++ b/client/views/other/dialogs/splash.ejs @@ -3,7 +3,7 @@

DCS Olympus

Dynamic Unit Command

-
Version v0.4.10-alpha-rc2
+
Version v0.4.11-alpha-rc3
Latest version
diff --git a/client/views/toolbars/primary.ejs b/client/views/toolbars/primary.ejs index 36a26b38..ee9ddd06 100644 --- a/client/views/toolbars/primary.ejs +++ b/client/views/toolbars/primary.ejs @@ -6,7 +6,7 @@

DCS Olympus

-
version v0.4.10-alpha-rc2
+
version v0.4.11-alpha-rc3
Discord diff --git a/installer/olympus.iss b/installer/olympus.iss index 6bd70a02..b7908211 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -1,6 +1,6 @@ #define nwjsFolder "..\..\nwjs\" #define nodejsFolder "..\..\node\" -#define version "v0.4.10-alpha-rc2" +#define version "v0.4.11-alpha-rc3" [Setup] AppName=DCS Olympus @@ -51,35 +51,35 @@ Source: "..\scripts\python\configurator\dist\configurator.exe"; DestDir: "{app}\ [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 -[Registry] -Root: HKCU; Subkey: "Environment"; ValueType: string; ValueName: "DCSOLYMPUS_PATH"; ValueData: "{app}\Mods\Services\Olympus"; Flags: preservestringtype -Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};%DCSOLYMPUS_PATH%\bin"; Check: NeedsAddPath('%DCSOLYMPUS_PATH%\bin'); +;[Registry] +;Root: HKCU; Subkey: "Environment"; ValueType: string; ValueName: "DCSOLYMPUS_PATH"; ValueData: "{app}\Mods\Services\Olympus"; Flags: preservestringtype +;Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};%DCSOLYMPUS_PATH%\bin"; Check: NeedsAddPath('%DCSOLYMPUS_PATH%\bin'); -[Setup] +;[Setup] ; Tell Windows Explorer to reload the environment -ChangesEnvironment=yes +;ChangesEnvironment=yes [Icons] Name: "{userdesktop}\DCS Olympus Client"; Filename: "{app}\Mods\Services\Olympus\client\nw.exe"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus.ico"; Check: CheckLocalInstall Name: "{userdesktop}\DCS Olympus Server"; Filename: "{app}\Mods\Services\Olympus\client\node.exe"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_server.ico"; Parameters: ".\bin\www"; Check: CheckServerInstall Name: "{userdesktop}\DCS Olympus Configurator"; Filename: "{app}\Mods\Services\Olympus\configurator.exe"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus_configurator.ico"; Check: CheckServerInstall -[Code] -function NeedsAddPath(Param: string): boolean; -var - OrigPath: string; -begin - if not RegQueryStringValue(HKCU, - 'Environment', - 'Path', OrigPath) - then begin - Result := True; - exit; - end; - { look for the path with leading and trailing semicolon } - { Pos() returns 0 if not found } - Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0; -end; +;[Code] +;function NeedsAddPath(Param: string): boolean; +;var +; OrigPath: string; +;begin +; if not RegQueryStringValue(HKCU, +; 'Environment', +; 'Path', OrigPath) +; then begin +; Result := True; +; exit; +; end; +; { look for the path with leading and trailing semicolon } +; { Pos() returns 0 if not found } +; Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0; +;end; [Code] var diff --git a/mod/entry.lua b/mod/entry.lua index 063cdf17..357cb099 100644 --- a/mod/entry.lua +++ b/mod/entry.lua @@ -15,7 +15,7 @@ declare_plugin(self_ID, shortName = "Olympus", fileMenuName = "Olympus", - version = "v0.4.10-alpha-rc2", + version = "v0.4.11-alpha-rc3", 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."), diff --git a/scripts/OlympusCommand.lua b/scripts/OlympusCommand.lua index 73731659..29100d4e 100644 --- a/scripts/OlympusCommand.lua +++ b/scripts/OlympusCommand.lua @@ -1,4 +1,4 @@ -local version = "v0.4.10-alpha-rc2" +local version = "v0.4.11-alpha-rc3" local debug = false -- True enables debug printing using DCS messages diff --git a/scripts/OlympusHook.lua b/scripts/OlympusHook.lua index a4830d66..2e60f60c 100644 --- a/scripts/OlympusHook.lua +++ b/scripts/OlympusHook.lua @@ -1,4 +1,4 @@ -local version = 'v0.4.10-alpha-rc2' +local version = 'v0.4.11-alpha-rc3' Olympus = {} Olympus.OlympusDLL = nil diff --git a/src/olympus/olympus.aps b/src/olympus/olympus.aps new file mode 100644 index 0000000000000000000000000000000000000000..4a3b1ffe47c46166204edba9382d84c8c3c631d2 GIT binary patch literal 1356 zcmb7D&2G~`5dH$WgdYiU;J_&@J+u;yY={u_f`aV|i^Q&CCoPgCD{?FvDX}9vR_S|j z;1PhgsCWquNa0)mWRnJ3vC{0$&NqKMI|Bes(sEf4*^Tv{E(oZ=nN<+4`dje5!8 z_gz3c@&;*`q~3TwN>fjdgKQQ?3v!xcPcLWlEcMbP@Zyp$&sGuu_vxrja$(?%y9o;# zx)?yGM8;I`XcaRF(>P0luyqbRxz+v-HGp;dXOk$HX5+BAdohXVtaZNo@E&#elv{EU z8k@d^;T2_@b^2E7HR?rlU?-RCU@dnR)9;)(zGa-be&2BHL0>ccVW&GVpeiaF>$qn3 zdL2tI;kKesfuW@X&9>aW-CfxeXKf|!eC!#Ox$yo#=2TSyHPnWVKQ#J|XLO7!&#tmQC#AGhX8r4(R=q@`xG6xX7^&ycb!i>@AOd8!?M1qm60pv2F?@3R3Zg zXPc+Ed-X-pk@;71DgBC`T`-)~ Tsd`rGh=2J)_fn_&7pe0H2{-i- literal 0 HcmV?d00001 diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h index 1c01192c..bc2b6291 100644 --- a/src/shared/include/defines.h +++ b/src/shared/include/defines.h @@ -1,6 +1,6 @@ #pragma once -#define VERSION "v0.4.10-alpha-rc2" +#define VERSION "v0.4.11-alpha-rc3" #define LOG_NAME "Olympus_log.txt" #define REST_ADDRESS "http://localhost:30000" #define REST_URI "olympus" diff --git a/version.json b/version.json index 0f98bc51..99bbbf2f 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "v0.4.10-alpha-rc2" + "version": "v0.4.11-alpha-rc3" }