From 0c50141be69e038f0fa931e3358df461568e76d9 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Wed, 15 Nov 2023 16:42:24 +0100 Subject: [PATCH] v0.4.6 --- client/package-lock.json | 4 ++-- client/package.json | 2 +- client/views/other/dialogs.ejs | 2 +- client/views/toolbars/primary.ejs | 2 +- installer/olympus.iss | 2 +- mod/entry.lua | 2 +- scripts/OlympusCommand.lua | 19 ++++++++++++------- scripts/OlympusHook.lua | 2 +- src/shared/include/defines.h | 2 +- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 47627bdf..446de9f4 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "DCSOlympus", - "version": "v0.4.5-alpha", + "version": "v0.4.6-alpha", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "DCSOlympus", - "version": "v0.4.5-alpha", + "version": "v0.4.6-alpha", "dependencies": { "@turf/turf": "^6.5.0", "body-parser": "^1.20.2", diff --git a/client/package.json b/client/package.json index 77c3c874..8a6e718a 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.5-alpha", + "version": "v0.4.6-alpha", "private": true, "scripts": { "build": "browserify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat", diff --git a/client/views/other/dialogs.ejs b/client/views/other/dialogs.ejs index 9b4c52ae..ca8c9765 100644 --- a/client/views/other/dialogs.ejs +++ b/client/views/other/dialogs.ejs @@ -3,7 +3,7 @@

DCS Olympus

Dynamic Unit Command

-
Version v0.4.5-alpha
+
Version v0.4.6-alpha
diff --git a/client/views/toolbars/primary.ejs b/client/views/toolbars/primary.ejs index 6d7570fe..439b35ad 100644 --- a/client/views/toolbars/primary.ejs +++ b/client/views/toolbars/primary.ejs @@ -6,7 +6,7 @@

DCS Olympus

-
version v0.4.5-alpha
+
version v0.4.6-alpha
Discord diff --git a/installer/olympus.iss b/installer/olympus.iss index 27486c63..fc4e6f82 100644 --- a/installer/olympus.iss +++ b/installer/olympus.iss @@ -1,5 +1,5 @@ #define nwjsFolder "C:\Users\dpass\Documents\nwjs\" -#define version "v0.4.5-alpha" +#define version "v0.4.6-alpha" [Setup] AppName=DCS Olympus diff --git a/mod/entry.lua b/mod/entry.lua index 9c4b86dc..6dea1156 100644 --- a/mod/entry.lua +++ b/mod/entry.lua @@ -15,7 +15,7 @@ declare_plugin(self_ID, shortName = "Olympus", fileMenuName = "Olympus", - version = "v0.4.5-alpha", + version = "v0.4.6-alpha", 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 1392e904..f05d7cf3 100644 --- a/scripts/OlympusCommand.lua +++ b/scripts/OlympusCommand.lua @@ -1,6 +1,6 @@ -local version = "v0.4.5-alpha" +local version = "v0.4.6-alpha" -local debug = true -- True enables debug printing using DCS messages +local debug = false -- True enables debug printing using DCS messages -- .dll related variables Olympus.OlympusDLL = nil @@ -435,10 +435,15 @@ function Olympus.smoke(color, lat, lng) end -- Creates an explosion on the ground -function Olympus.explosion(intensity, explosionType, lat, lng) - Olympus.debug("Olympus.explosion " .. explosionType .. " " .. intensity .. " (" .. lat .. ", " .. lng ..")", 2) - local pos = coord.LLtoLO(lat, lng, 0) - local vec3 = mist.utils.makeVec3GL(pos) +function Olympus.explosion(intensity, explosionType, lat, lng, alt) + Olympus.debug("Olympus.explosion " .. explosionType .. " " .. intensity .. " (" .. lat .. ", " .. lng .. ")", 2) + + local vec3 = nil + if alt ~= nil then + vec3 = coord.LLtoLO(lat, lng, alt) + else + vec3 = mist.utils.makeVec3GL(coord.LLtoLO(lat, lng)) + end if explosionType == "normal" then trigger.action.explosion(vec3, intensity) @@ -885,7 +890,7 @@ function Olympus.delete(ID, explosion, explosionType) explosionType = "normal" end local lat, lng, alt = coord.LOtoLL(unit:getPoint()) - Olympus.explosion(250, explosionType, lat, lng) + Olympus.explosion(250, explosionType, lat, lng, alt) Olympus.debug("Olympus.delete completed successfully", 2) else unit:destroy(); --works for AI units not players diff --git a/scripts/OlympusHook.lua b/scripts/OlympusHook.lua index b0c9de59..a34af85c 100644 --- a/scripts/OlympusHook.lua +++ b/scripts/OlympusHook.lua @@ -1,4 +1,4 @@ -local version = 'v0.4.5-alpha' +local version = 'v0.4.6-alpha' Olympus = {} Olympus.OlympusDLL = nil diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h index 886f9ddd..d695109e 100644 --- a/src/shared/include/defines.h +++ b/src/shared/include/defines.h @@ -1,6 +1,6 @@ #pragma once -#define VERSION "v0.4.5-alpha" +#define VERSION "v0.4.6-alpha" #define LOG_NAME "Olympus_log.txt" #define REST_ADDRESS "http://localhost:30000" #define REST_URI "olympus"