Headings
+
+
+
+
+
+
+
+
+
+
`;
+
+ stripBoard.insertAdjacentHTML( "beforeend", template );
+
+
+ strip = {
+ "id": flight.id,
+ "element": ${flight.name}
+
+
+
+
+
+
+ ${flight.status}
+
+ ${this.timeToGo( flight.takeoffTime )}
+
+
+ |
- ${options.name}
- |
-
|
-
-
- ${this.#unitName}
-
-
- ${this.#name}
- |
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+My callsign
+Magic
+
+
+
\ No newline at end of file
diff --git a/client/views/atc/addflight.ejs b/client/views/atc/addflight.ejs
new file mode 100644
index 00000000..97e1ae5b
--- /dev/null
+++ b/client/views/atc/addflight.ejs
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/client/views/atc/atc.ejs b/client/views/atc/atc.ejs
new file mode 100644
index 00000000..65984a3a
--- /dev/null
+++ b/client/views/atc/atc.ejs
@@ -0,0 +1,11 @@
+<%- include('board.ejs', {
+ "boardId": "strip-board-tower",
+ "boardType": "tower",
+ "headers": [ "Flight", "a. Alt", "alt", "a. Speed", "Speed" ]
+}) %>
+
+<%- include('board.ejs', {
+ "boardId": "strip-board-ground",
+ "boardType": "ground",
+ "headers": [ "Flight", "Status", "T/O Time", "TTG" ]
+}) %>
\ No newline at end of file
diff --git a/client/views/atc/board.ejs b/client/views/atc/board.ejs
new file mode 100644
index 00000000..58d3dfcc
--- /dev/null
+++ b/client/views/atc/board.ejs
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/client/views/atc/unitdatatable.ejs b/client/views/atc/unitdatatable.ejs
new file mode 100644
index 00000000..0c090652
--- /dev/null
+++ b/client/views/atc/unitdatatable.ejs
@@ -0,0 +1,13 @@
+
+
+
+ Control
+
+
+
+
+
+
+
+
+
+
+
+
+Formations
+ + + +
+
+
+
+
\ No newline at end of file
diff --git a/client/views/connectionstatuspanel.ejs b/client/views/connectionstatuspanel.ejs
deleted file mode 100644
index 47f4636f..00000000
--- a/client/views/connectionstatuspanel.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-
+
+
+ Unit list
+
+
+
+
+
-
\ No newline at end of file
diff --git a/client/views/index.ejs b/client/views/index.ejs
index dd19f256..558d6b67 100644
--- a/client/views/index.ejs
+++ b/client/views/index.ejs
@@ -2,24 +2,37 @@
Connected
-
+
+
\ No newline at end of file
diff --git a/client/views/mouseinfopanel.ejs b/client/views/mouseinfopanel.ejs
deleted file mode 100644
index 4e6bac2c..00000000
--- a/client/views/mouseinfopanel.ejs
+++ /dev/null
@@ -1,6 +0,0 @@
-
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/client/views/other/contextmenus.ejs b/client/views/other/contextmenus.ejs
new file mode 100644
index 00000000..0940f076
--- /dev/null
+++ b/client/views/other/contextmenus.ejs
@@ -0,0 +1,112 @@
+---° / --- NM
---° / --- NM
---° / --- NM
---° / --- NM
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/views/other/dialogs.ejs b/client/views/other/dialogs.ejs
new file mode 100644
index 00000000..bbf5badb
--- /dev/null
+++ b/client/views/other/dialogs.ejs
@@ -0,0 +1,234 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/views/other/popups.ejs b/client/views/other/popups.ejs
new file mode 100644
index 00000000..2ec87347
--- /dev/null
+++ b/client/views/other/popups.ejs
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/client/views/panels/connectionstatus.ejs b/client/views/panels/connectionstatus.ejs
new file mode 100644
index 00000000..ac92da78
--- /dev/null
+++ b/client/views/panels/connectionstatus.ejs
@@ -0,0 +1,6 @@
+
+
+
+
+
+
+
+ DCS Olympus
+Dynamic Unit Command
+Version v0.3.0
+
+
+
+
+
+
+ Username
Password
+
+ DISCLAIMER
+DCS Olympus (the "MATERIAL" or "Software") is provided completely free to users subject to the terms of the CC BY-NC-SA 4.0 Licence except where such terms conflict with this disclaimer, in which case, the terms of this disclaimer shall prevail. + The authors and/or copyright holders of the Software have not received any financial benefit in connection with the Software. In any event, the Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and non-infringement. In no event shall the authors and/or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the Software. Any party making use of the Software in any manner agrees to be bound by the terms set out in this disclaimer. THIS MATERIAL IS NOT MADE OR SUPPORTED BY EAGLE DYNAMICS SA. +
+
\ No newline at end of file
diff --git a/client/views/panels/hotgroup.ejs b/client/views/panels/hotgroup.ejs
new file mode 100644
index 00000000..0838c635
--- /dev/null
+++ b/client/views/panels/hotgroup.ejs
@@ -0,0 +1,3 @@
+-
+
+
+
+
+
\ No newline at end of file
diff --git a/client/views/panels/mouseinfo.ejs b/client/views/panels/mouseinfo.ejs
new file mode 100644
index 00000000..c4434cc6
--- /dev/null
+++ b/client/views/panels/mouseinfo.ejs
@@ -0,0 +1,34 @@
+
+
+
\ No newline at end of file
diff --git a/client/views/panels/navbar.ejs b/client/views/panels/navbar.ejs
new file mode 100644
index 00000000..922fe414
--- /dev/null
+++ b/client/views/panels/navbar.ejs
@@ -0,0 +1,66 @@
+
\ No newline at end of file
diff --git a/client/views/panels/unitcontrol.ejs b/client/views/panels/unitcontrol.ejs
new file mode 100644
index 00000000..22fffd52
--- /dev/null
+++ b/client/views/panels/unitcontrol.ejs
@@ -0,0 +1,83 @@
+
+
+
+ -
+
-
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+-
+
+
+
+
+
+
+
+ +
+ +
\ No newline at end of file
diff --git a/client/views/panels/unitinfo.ejs b/client/views/panels/unitinfo.ejs
new file mode 100644
index 00000000..3c03ca9c
--- /dev/null
+++ b/client/views/panels/unitinfo.ejs
@@ -0,0 +1,31 @@
+Selected Units
+ +
+
+
+
+
+
+
+
+ + +
+
+
+ Controls
+ + +Multiple categories selected
+
+
+
+ Rules of engagement
+ +
+
+
+ Reaction to threat
+ +
+
+
+ Radar & ECM
+ +
+
+
+ Unit active
+ +Toggling this disables unit AI completely. It will no longer move, react or emit radio waves.
+
+
+
+ Follow roads
+ ++ +
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/views/selectionscroll.ejs b/client/views/selectionscroll.ejs
deleted file mode 100644
index 3a78b420..00000000
--- a/client/views/selectionscroll.ejs
+++ /dev/null
@@ -1,11 +0,0 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/client/views/selectionwheel.ejs b/client/views/selectionwheel.ejs
deleted file mode 100644
index f8a149c6..00000000
--- a/client/views/selectionwheel.ejs
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client/views/uikit/uikit.ejs b/client/views/uikit/uikit.ejs
new file mode 100644
index 00000000..e4c0a2f4
--- /dev/null
+++ b/client/views/uikit/uikit.ejs
@@ -0,0 +1,1313 @@
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs
deleted file mode 100644
index fba42229..00000000
--- a/client/views/unitcontrolpanel.ejs
+++ /dev/null
@@ -1,65 +0,0 @@
-Olympus UI Kit
+ +
+
+
+ Typeography
+ Navbar
+ Context menu
+ Unit control panel
+ Mouse info panel
+ Buttons
+ Ground Units
+ Planes
+ Weapons
+ .ol-panel
+ Icons
+
+
+
+
+
+
+
+
+ Paragraph
+
+
+
+
+
+
+
+ Plain
+ Nullam iaculis nisi sed mi tincidunt pretium blandit tempus urna. Vestibulum non ex vitae massa tristique auctor. Praesent orci justo, porttitor pellentesque convallis non, commodo at augue.
+
+
+
+ In a panel
+
+
+ Donec nibh est, fringilla sed pharetra eu, varius vel sem. Aliquam ac libero leo. Sed consectetur enim aliquam dui pellentesque luctus. Pellentesque vel iaculis quam.
+
+
+
+
+ Primary nav
+
+
+
+
+
+ <%- include('navbar.ejs') %>
+
+
+
+
+
+
+ Context menu
+
+
+
+ <%- include('contextmenus.ejs') %>
+
+
+
+
+
+ Unit Control Panel
+
+
+
+
+
+ <%- include('unitcontrolpanel.ejs') %>
+
+
+
+
+
+
+ Primary nav
+
+
+
+
+
+ <%- include('mouseinfopanel.ejs') %>
+
+
+
+
+
+
+ Buttons
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ground
+
+
+
+
+
+
+
+
+ Neutral
+
+
+
+
+
+
+ Z
+
+
+
+
+ Blue
+
+
+
+
+
+
+ Y
+
+
+
+
+ Red
+
+
+
+
+
+
+ X
+
+
+
+
+ SAM
+
+
+
+
+
+
+
+
+ Neutral
+
+
+
+
+
+
+ Z
+
+
+
+
+ Blue
+
+
+
+
+
+
+ Y
+
+
+
+
+ Red
+
+
+
+
+
+
+ X
+
+
+
+
+ navyunit
+
+
+
+
+
+
+
+
+ Neutral
+
+
+
+
+
+
+ Z
+
+
+
+
+ Blue
+
+
+
+
+
+
+ Y
+
+
+
+
+ Red
+
+
+
+
+
+
+ X
+
+
+
+
+ Buildings
+
+
+
+
+
+
+
+
+ Neutral
+
+
+
+
+
+
+ J
+
+
+
+
+ Blue
+
+
+
+
+
+
+ K
+
+
+
+
+ Red
+
+
+
+
+
+
+ L
+
+
+
+
+ Fuel states (AI only)
+
+
+
+
+
+
+
+
+ 0% (empty)
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10%
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 20%
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 50%
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 75%
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 100%
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Status icons
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+ Dead
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+ 18
+
+
+
+
+
+
+
+
+
+
+
+ Springfield 3-1 | Longname
+ 260
+ 31
+
+
+
+
+ Missile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Plain panel
+
+
+
+
+
+
+
+
+
+
+ Disconnected
+
+
+
+
+
+
+ Panel list
+
+
+
+
+
+
+
+
+
+ Basic list
+
+
+
+
+
+
+ List item 1
+ List item 2
+ List item 3
+
+
+
+
+ List with .highlight-primary
+
+
+
+
+
+
+ List item with highlight-primary
+ List item with highlight-bluefor
+ List item with highlight-redfor
+ List item with highlight-neutral
+
+
+
+
+
+
+ Sortable list
+
+
+
+
+
+
+
+
+ 
+
+ List item 1
+
+
+
+ List item 2
+
+
+
+ List item 3
+
+
+
+
+ Panel board
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unit Callsign
+Airframe
+ Group
+
+
+ Flight data
+
+
+ Loadout
+
+
+
+
+
+ Button group
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ol select
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ The selected value goes here
+
+
+
+
+
+
+
+
+
+ Options go up
+
+
+
+
+
+
+ Airfield menu
+
+
+
+
+
+
+
+
+
+
+ Airfield menu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Olympus 1-1
+
+
+
+ Name
+ AI Controlled
+
+
+
+
+
+
+
+
+
+
+
+ Empty loadout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Olympus 1-1
+
+
+
+ Name
+ AI Controlled
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Icons
+
+
+
+
+
+
+
+ Actions
+
+
+
+ 
+ icons_actions_gas
+
+
+ icons_actions_gas
+
+ 
+ icons_actions_nothing
+
+
+ icons_actions_nothing
+
+ 
+ icons_actions_rtb
+
+
+ icons_actions_rtb
+
+ 
+ icons_actions_search
+
+
+ icons_actions_search
+
+
+
+ RoE
+
+
+
+ 
+ icons_roe_free
+
+
+ icons_roe_free
+
+ 
+ icons_roe_return
+
+
+ icons_roe_return
+
+ 
+ icons_roe_stop
+
+
+ icons_roe_stop
+
+ 
+ icons_roe_target
+
+
+ icons_roe_target
+
+
+
+ Threat
+
+
+
+ 
+ icons_threat_protect
+
+
+ icons_threat_protect
+
+ 
+ icons_threat_retreat
+
+
+ icons_threat_retreat
+
-
\ No newline at end of file
diff --git a/client/views/unitinfopanel.ejs b/client/views/unitinfopanel.ejs
deleted file mode 100644
index 03ffd10f..00000000
--- a/client/views/unitinfopanel.ejs
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
- Selected units
-
-
-
-
-
-
- 
Create formation
- 
Undo formation
-
-
-
- Create formationUndo formationControls
-
-
- Formation
-
-
-
-
- Rules of engagement
-
-
-
-
- Reaction to threat
-
-
-
-
\ No newline at end of file
diff --git a/client/views/visibilitycontrolpanel.ejs b/client/views/visibilitycontrolpanel.ejs
deleted file mode 100644
index e8caf556..00000000
--- a/client/views/visibilitycontrolpanel.ejs
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
-
-
- 
- 
- 
-
-
- Flight data
-
-
-
- Ground Speed
-
-
- Altitude
-
-
- Heading
-
-
- 
-
-Loadout
-
- Fuel
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/img/OlympusLogoFinal_4k.png b/img/OlympusLogoFinal_4k.png
new file mode 100644
index 00000000..b59050a5
Binary files /dev/null and b/img/OlympusLogoFinal_4k.png differ
diff --git a/img/OlympusLogoFinal_Flat_4k.png b/img/OlympusLogoFinal_Flat_4k.png
new file mode 100644
index 00000000..7b5df01e
Binary files /dev/null and b/img/OlympusLogoFinal_Flat_4k.png differ
diff --git a/img/icon.png b/img/icon.png
new file mode 100644
index 00000000..dc5c994e
Binary files /dev/null and b/img/icon.png differ
diff --git a/img/icon_284.png b/img/icon_284.png
new file mode 100644
index 00000000..b11172d3
Binary files /dev/null and b/img/icon_284.png differ
diff --git a/img/icon_active.png b/img/icon_active.png
new file mode 100644
index 00000000..56f59ba4
Binary files /dev/null and b/img/icon_active.png differ
diff --git a/img/icon_select.png b/img/icon_select.png
new file mode 100644
index 00000000..5771d3b5
Binary files /dev/null and b/img/icon_select.png differ
diff --git a/img/olympus.ico b/img/olympus.ico
new file mode 100644
index 00000000..d3567a53
Binary files /dev/null and b/img/olympus.ico differ
diff --git a/installer/DCSOlympus.iss b/installer/olympus.iss
similarity index 69%
rename from installer/DCSOlympus.iss
rename to installer/olympus.iss
index 61c67383..55664142 100644
--- a/installer/DCSOlympus.iss
+++ b/installer/olympus.iss
@@ -1,25 +1,30 @@
#define nwjsFolder "C:\Users\dpass\Documents\nwjs\"
+#define version "v0.3.0-alpha"
[Setup]
AppName=DCS Olympus
-AppVerName=DCS Olympus Alpha v0.0.5
+AppVerName=DCS Olympus {#version}
DefaultDirName={usersavedgames}\DCS.openbeta
DefaultGroupName=DCSOlympus
-OutputBaseFilename=DCSOlympus
+OutputBaseFilename=DCSOlympus_{#version}
+UninstallFilesDir={app}\Mods\Services\Olympus
+;SetupIconFile="..\img\olympus.ico"
[Tasks]
; NOTE: The following entry contains English phrases ("Create a desktop icon" and "Additional icons"). You are free to translate them into another language if required.
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
[Files]
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-Source: "..\scripts\OlympusExport.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion
+;Source: "..\scripts\OlympusExport.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion
+;Source: "..\scripts\OlympusPatcher.exe"; DestDir: "{app}\Scripts"; Flags: ignoreversion
Source: "..\scripts\OlympusHook.lua"; DestDir: "{app}\Scripts\Hooks"; Flags: ignoreversion
+Source: "..\olympus.json"; DestDir: "{app}\Mods\Services\Olympus"; Flags: onlyifdoesntexist
Source: "..\scripts\OlympusCommand.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion
Source: "..\scripts\unitPayloads.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion
-Source: "..\scripts\OlympusMission.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion
-Source: "..\scripts\mist_4_4_90.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion
+Source: "..\scripts\templates.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion
+Source: "..\scripts\mist.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion
+Source: "..\mod\*"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion recursesubdirs;
Source: "..\bin\*.dll"; DestDir: "{app}\Mods\Services\Olympus\bin"; Flags: ignoreversion;
Source: "..\client\bin\*"; DestDir: "{app}\Mods\Services\Olympus\client\bin"; Flags: ignoreversion;
Source: "..\client\node_modules\*"; DestDir: "{app}\Mods\Services\Olympus\client\node_modules"; Flags: ignoreversion recursesubdirs;
@@ -27,6 +32,7 @@ Source: "..\client\public\*"; DestDir: "{app}\Mods\Services\Olympus\client\publi
Source: "..\client\routes\*"; DestDir: "{app}\Mods\Services\Olympus\client\routes"; Flags: ignoreversion recursesubdirs;
Source: "..\client\views\*"; DestDir: "{app}\Mods\Services\Olympus\client\views"; Flags: ignoreversion recursesubdirs;
Source: "..\client\*.*"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion;
+Source: "..\img\olympus.ico"; DestDir: "{app}\Mods\Services\Olympus\img"; Flags: ignoreversion;
Source: "{#nwjsFolder}\*.*"; DestDir: "{app}\Mods\Services\Olympus\client"; Flags: ignoreversion recursesubdirs;
[Code]
@@ -55,4 +61,10 @@ Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; Value
ChangesEnvironment=yes
[Icons]
-Name: "{userdesktop}\DCS Olympus Client"; Filename: "{app}\Mods\Services\Olympus\client\nw.exe"; Tasks: desktopicon
\ No newline at end of file
+Name: "{userdesktop}\DCS Olympus Client"; Filename: "{app}\Mods\Services\Olympus\client\nw.exe"; Tasks: desktopicon; IconFilename: "{app}\Mods\Services\Olympus\img\olympus.ico"
+
+;[Run]
+;Filename: "{app}\Scripts\OlympusPatcher.exe"; Parameters: "-i"
+
+;[UninstallRun]
+;Filename: "{app}\Scripts\OlympusPatcher.exe"; Parameters: "-u"
\ No newline at end of file
diff --git a/missions/Olympus.miz b/missions/olympus.miz
similarity index 100%
rename from missions/Olympus.miz
rename to missions/olympus.miz
diff --git a/mod/Options/options.dlg b/mod/Options/options.dlg
new file mode 100644
index 00000000..db77ba48
--- /dev/null
+++ b/mod/Options/options.dlg
@@ -0,0 +1,163 @@
+
+-- Olympus
+
+-- Layout
+
+local TopMargin = 48
+local LeftMargin = 32
+local CenterMargin = 80
+
+local LeftColumnX = LeftMargin
+local LeftColumnLabelWidth = 232
+local LeftColumnOptionWidth = 272
+local LeftColumnWidth = LeftColumnLabelWidth + LeftColumnOptionWidth
+
+local RightColumnX = LeftColumnX + LeftColumnWidth + CenterMargin
+local RightColumnLabelWidth = 192
+local RightColumnOptionWidth = 128
+local RightColumnWidth = RightColumnLabelWidth + RightColumnOptionWidth
+
+local LineHeight = 24
+local TotalLineHeight = LineHeight + 8
+
+local HelpLineHeight = 16
+
+-- Styles
+
+local TitleSkin = {
+ ["params"] = {
+ ["name"] = "staticOptionsTitleSkin",
+ },
+ ["states"] = {
+ ["released"] = {
+ [1] = {
+ ["text"] = {
+ ["horzAlign"] = {
+ ["type"] = "min"
+ }
+ }
+ }
+ }
+ }
+ }
+
+local OptionLabelSkin = {
+ ["params"] = {
+ ["name"] = "staticOptionsCaptionSkin",
+ }
+ }
+
+local WarningSkin = {
+ ["params"] = {
+ ["name"] = "staticOptionsCaptionSkin",
+ },
+ ["states"] = {
+ ["released"] = {
+ [1] = {
+ ["text"] = {
+ ["horzAlign"] = {
+ ["type"] = "min"
+ },
+ ["color"] = "0xEFB441ff",
+ }
+ }
+ }
+ }
+ }
+
+local CheckBoxSkin = {
+ ["params"] = {
+ ["name"] = "checkBoxSkin_options",
+ }
+ }
+
+local ComboListSkin = {
+ ["params"] = {
+ ["name"] = "comboListSkin_options",
+ }
+ }
+
+local EditBoxSkin = {
+ ["params"] = {
+ ["name"] = "editBoxSkin_login",
+ }
+ }
+
+-- Content
+
+dialog = {
+ ["children"] = {
+ ["containerPlugin"] = {
+ ["children"] = {
+
+ -----------------------------------------------
+ -- [X] Enable Olympus Module
+ -----------------------------------------------
+
+ -- Olympus Module Enabled
+
+ ["olympusModuleEnabledCheckbox"] = {
+ ["params"] = {
+ ["bounds"] = {
+ ["x"] = LeftColumnX,
+ ["y"] = TopMargin,
+ ["w"] = 256,
+ ["h"] = LineHeight,
+ },
+ ["enabled"] = true,
+ ["state"] = false,
+ ["text"] = "$Olympus_MODULE_ENABLED_LABEL",
+ ["tooltip"] = "",
+ ["visible"] = true,
+ ["zindex"] = 0,
+ ["tabOrder"] = 1,
+ },
+ ["skin"] = CheckBoxSkin,
+ ["type"] = "CheckBox",
+ },
+ },
+ ["params"] = {
+ ["bounds"] = {
+ ["h"] = 600,
+ ["w"] = 974,
+ ["x"] = 0,
+ ["y"] = 0,
+ },
+ ["enabled"] = true,
+ ["text"] = "",
+ ["tooltip"] = "",
+ ["visible"] = true,
+ ["zindex"] = 0,
+ },
+ ["skin"] = {
+ ["params"] = {
+ ["name"] = "panelSkin",
+ },
+ },
+ ["type"] = "Panel",
+ },
+ },
+ ["params"] = {
+ ["bounds"] = {
+ ["h"] = 851,
+ ["w"] = 1135,
+ ["x"] = 0,
+ ["y"] = 0,
+ },
+ ["draggable"] = true,
+ ["enabled"] = true,
+ ["hasCursor"] = true,
+ ["lockFlow"] = false,
+ ["modal"] = false,
+ ["offscreen"] = false,
+ ["resizable"] = false,
+ ["text"] = "New dialog",
+ ["zOrder"] = 0,
+ },
+ ["skin"] = {
+ ["params"] = {
+ ["name"] = "windowSkin",
+ },
+ },
+ ["type"] = "Window",
+}
\ No newline at end of file
diff --git a/mod/Options/optionsData.lua b/mod/Options/optionsData.lua
new file mode 100644
index 00000000..68c333d3
--- /dev/null
+++ b/mod/Options/optionsData.lua
@@ -0,0 +1,7 @@
+cdata =
+{
+ -- Module on/off
+
+ Olympus_MODULE_ENABLED_LABEL = _("Olympus Module Enabled"),
+
+}
diff --git a/mod/Options/optionsDb.lua b/mod/Options/optionsDb.lua
new file mode 100644
index 00000000..6379b762
--- /dev/null
+++ b/mod/Options/optionsDb.lua
@@ -0,0 +1,60 @@
+local DbOption = require("Options.DbOption")
+local i18n = require('i18n')
+
+-- Constants
+
+
+-- Local variables
+
+local olympusConfigDialog = nil
+
+-- Update UI
+
+local function UpdateOptions()
+
+ -- Check parameters
+
+ if olympusConfigDialog == nil then
+ return
+ end
+
+ local moduleEnabled = olympusConfigDialog.olympusModuleEnabledCheckbox:getState()
+
+end
+
+-- Callbacks
+
+local function OnShowDialog(dialogBox)
+
+ -- Setup local variables
+
+ if olympusConfigDialog ~= dialogBox then
+ olympusConfigDialog = dialogBox
+ end
+
+ -- Update dialog box state
+
+ UpdateOptions()
+
+end
+
+-- Module on/off
+
+local olympusModuleEnabled = DbOption.new():setValue(true):checkbox()
+:callback(function(value)
+ UpdateOptions()
+end)
+
+-- Returns dialog box controls and callbacks
+
+return
+{
+ -- Events
+
+ callbackOnShowDialog = OnShowDialog,
+
+ -- Module on/off
+
+ olympusModuleEnabled = olympusModuleEnabled,
+
+}
diff --git a/mod/Theme/icon-38x38.png b/mod/Theme/icon-38x38.png
new file mode 100644
index 00000000..9ddcb4b9
Binary files /dev/null and b/mod/Theme/icon-38x38.png differ
diff --git a/mod/Theme/icon.png b/mod/Theme/icon.png
new file mode 100644
index 00000000..dc5c994e
Binary files /dev/null and b/mod/Theme/icon.png differ
diff --git a/mod/Theme/icon_284.png b/mod/Theme/icon_284.png
new file mode 100644
index 00000000..b11172d3
Binary files /dev/null and b/mod/Theme/icon_284.png differ
diff --git a/mod/Theme/icon_active.png b/mod/Theme/icon_active.png
new file mode 100644
index 00000000..56f59ba4
Binary files /dev/null and b/mod/Theme/icon_active.png differ
diff --git a/mod/Theme/icon_select.png b/mod/Theme/icon_select.png
new file mode 100644
index 00000000..5771d3b5
Binary files /dev/null and b/mod/Theme/icon_select.png differ
diff --git a/mod/entry.lua b/mod/entry.lua
new file mode 100644
index 00000000..b2a04abe
--- /dev/null
+++ b/mod/entry.lua
@@ -0,0 +1,42 @@
+local self_ID = "DCS-Olympus"
+
+declare_plugin(self_ID,
+{
+ image = "Olympus.png",
+ installed = true, -- if false that will be place holder , or advertising
+ dirName = current_mod_path,
+ binaries =
+ {
+-- 'Olympus',
+ },
+ load_immediately = true,
+
+ displayName = "Olympus",
+ shortName = "Olympus",
+ fileMenuName = "Olympus",
+
+ version = "0.1.1-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."),
+
+ Skins =
+ {
+ {
+ name = "Olympus",
+ dir = "Theme"
+ },
+ },
+
+ Options =
+ {
+ {
+ name = "Olympus",
+ nameId = "Olympus",
+ dir = "Options",
+ CLSID = "{Olympus-options}"
+ },
+ },
+})
+
+plugin_done()
\ No newline at end of file
diff --git a/olympus.json b/olympus.json
new file mode 100644
index 00000000..3618c236
--- /dev/null
+++ b/olympus.json
@@ -0,0 +1,9 @@
+{
+ "server": {
+ "address": "localhost",
+ "port": 30000
+ },
+ "authentication": {
+ "password": "password"
+ }
+}
diff --git a/scripts/Export.lua b/scripts/Export.lua
deleted file mode 100644
index f60c236d..00000000
--- a/scripts/Export.lua
+++ /dev/null
@@ -1 +0,0 @@
-local Olympuslfs=require('lfs');dofile(Olympuslfs.writedir()..'Scripts/OlympusExport.lua')
diff --git a/scripts/OlympusCommand.lua b/scripts/OlympusCommand.lua
index 0ea22476..81ccd4ff 100644
--- a/scripts/OlympusCommand.lua
+++ b/scripts/OlympusCommand.lua
@@ -1,15 +1,44 @@
+local version = "v0.3.0-alpha"
+
+local debug = false
+
Olympus.unitCounter = 1
Olympus.payloadRegistry = {}
+Olympus.groupIndex = 0
+Olympus.groupStep = 40
+Olympus.OlympusDLL = nil
+Olympus.DLLsloaded = false
+Olympus.OlympusModPath = os.getenv('DCSOLYMPUS_PATH')..'\\bin\\'
+
+function Olympus.debug(message, displayFor)
+ if debug == true then
+ trigger.action.outText(message, displayFor)
+ end
+end
+
function Olympus.notify(message, displayFor)
trigger.action.outText(message, displayFor)
end
+function Olympus.loadDLLs()
+ -- Add the .dll paths
+ package.cpath = package.cpath..';'..Olympus.OlympusModPath..'?.dll;'
+
+ local status
+ status, Olympus.OlympusDLL = pcall(require, 'olympus')
+ if status then
+ return true
+ else
+ return false
+ end
+end
+
-- Gets a unit class reference from a given ObjectID (the ID used by Olympus for unit referencing)
function Olympus.getUnitByID(ID)
for name, table in pairs(mist.DBs.unitsByName) do
local unit = Unit.getByName(name)
- if unit and unit:getObjectID() == ID then
+ if unit and unit["getObjectID"] and unit:getObjectID() == ID then
return unit
end
end
@@ -19,9 +48,11 @@ end
function Olympus.getCountryIDByCoalition(coalition)
local countryID = 0
if coalition == 'red' then
- countryID = country.id.RUSSIA
+ countryID = country.id.CJTF_RED
+ elseif coalition == 'blue' then
+ countryID = country.id.CJTF_BLUE
else
- countryID = country.id.USA
+ countryID = country.id.UN_PEACEKEEPERS
end
return countryID
end
@@ -50,25 +81,123 @@ function Olympus.buildEnrouteTask(options)
}
}
end
+ -- Start being an active tanker
+ elseif options['id'] == 'Tanker' then
+ task = {
+ id = 'Tanker',
+ params = {},
+ }
+ -- Start being an active AWACS
+ elseif options['id'] == 'AWACS' then
+ task = {
+ id = 'AWACS',
+ params = {},
+ }
end
return task
end
-- Builds a valid task depending on the provided options
-function Olympus.buildTask(options)
+function Olympus.buildTask(groupName, options)
local task = nil
- -- Engage specific target by ID. Checks if target exists.
- if options['id'] == 'FollowUnit' and options['leaderID'] and options['offset'] then
- local leader = Olympus.getUnitByID(options['leaderID'])
- if leader and leader:isExist() then
+
+ local group = Group.getByName(groupName)
+ if (Olympus.isArray(options)) then
+ local tasks = {}
+ for idx, subOptions in pairs(options) do
+ tasks[idx] = Olympus.buildTask(groupName, subOptions) or Olympus.buildEnrouteTask(subOptions)
+ end
+ task = {
+ id = 'ComboTask',
+ params = {
+ tasks = tasks
+ }
+ }
+ Olympus.debug(Olympus.serializeTable(task), 30)
+ else
+ if options['id'] == 'FollowUnit' and options['leaderID'] and options['offset'] then
+ local leader = Olympus.getUnitByID(options['leaderID'])
+ if leader and leader:isExist() then
+ task = {
+ id = 'Follow',
+ params = {
+ groupId = leader:getGroup():getID(),
+ pos = options['offset'],
+ lastWptIndexFlag = false,
+ lastWptIndex = 1
+ }
+ }
+ end
+ elseif options['id'] == 'Refuel' then
task = {
- id = 'Follow',
+ id = 'Refueling',
+ params = {}
+ }
+ elseif options['id'] == 'Orbit' then
+ task = {
+ id = 'Orbit',
+ params = {
+ pattern = options['pattern'] or "Circle"
+ }
+ }
+ if options['altitude'] then
+ if options ['altitudeType'] then
+ if options ['altitudeType'] == "AGL" then
+ local groundHeight = 0
+ if group then
+ local groupPos = mist.getLeadPos(group)
+ groundHeight = land.getHeight({x = groupPos.x, y = groupPos.z})
+ end
+ task['params']['altitude'] = groundHeight + options['altitude']
+ else
+ task['params']['altitude'] = options['altitude']
+ end
+ else
+ task['params']['altitude'] = options['altitude']
+ end
+ end
+ if options['speed'] then
+ task['params']['speed'] = options['speed']
+ end
+ elseif options['id'] == 'Bombing' and options['lat'] and options['lng'] then
+ local point = coord.LLtoLO(options['lat'], options['lng'], 0)
+ task = {
+ id = 'Bombing',
params = {
- groupId = leader:getGroup():getID(),
- pos = options['offset'],
- lastWptIndexFlag = false,
- lastWptIndex = 1
- }
+ point = {x = point.x, y = point.z},
+ attackQty = 1
+ }
+ }
+ elseif options['id'] == 'CarpetBombing' and options['lat'] and options['lng'] then
+ local point = coord.LLtoLO(options['lat'], options['lng'], 0)
+ task = {
+ id = 'CarpetBombing',
+ params = {
+ x = point.x,
+ y = point.z,
+ carpetLength = 1000,
+ attackType = 'Carpet',
+ expend = "All",
+ attackQty = 1,
+ attackQtyLimit = true
+ }
+ }
+ elseif options['id'] == 'AttackMapObject' and options['lat'] and options['lng'] then
+ local point = coord.LLtoLO(options['lat'], options['lng'], 0)
+ task = {
+ id = 'AttackMapObject',
+ params = {
+ point = {x = point.x, y = point.z}
+ }
+ }
+ elseif options['id'] == 'FireAtPoint' and options['lat'] and options['lng'] and options['radius'] then
+ local point = coord.LLtoLO(options['lat'], options['lng'], 0)
+ task = {
+ id = 'FireAtPoint',
+ params = {
+ point = {x = point.x, y = point.z},
+ radius = options['radius']
+ }
}
end
end
@@ -76,23 +205,27 @@ function Olympus.buildTask(options)
end
-- Move a unit. Since many tasks in DCS are Enroute tasks, this function is an important way to control the unit AI
-function Olympus.move(ID, lat, lng, altitude, speed, category, taskOptions)
- Olympus.notify("Olympus.move " .. ID .. " (" .. lat .. ", " .. lng ..") " .. altitude .. "m " .. speed .. "m/s " .. category, 2)
- local unit = Olympus.getUnitByID(ID)
- if unit then
+function Olympus.move(groupName, lat, lng, altitude, altitudeType, speed, speedType, category, taskOptions)
+ Olympus.debug("Olympus.move " .. groupName .. " (" .. lat .. ", " .. lng ..") " .. altitude .. "m " .. altitudeType .. " ".. speed .. "m/s " .. category .. " " .. Olympus.serializeTable(taskOptions), 2)
+ local group = Group.getByName(groupName)
+ if group then
if category == "Aircraft" then
- local startPoint = mist.getLeadPos(unit:getGroup())
+ local startPoint = mist.getLeadPos(group)
local endPoint = coord.LLtoLO(lat, lng, 0)
+ if altitudeType == "AGL" then
+ altitude = land.getHeight({x = endPoint.x, y = endPoint.z}) + altitude
+ end
+
local path = {}
if taskOptions and taskOptions['id'] == 'Land' then
path = {
- [1] = mist.fixedWing.buildWP(startPoint, flyOverPoint, speed, altitude, 'BARO'),
+ [1] = mist.fixedWing.buildWP(startPoint, turningPoint, speed, altitude, 'BARO'),
[2] = mist.fixedWing.buildWP(endPoint, landing, speed, 0, 'AGL')
}
else
path = {
- [1] = mist.fixedWing.buildWP(startPoint, flyOverPoint, speed, altitude, 'BARO'),
+ [1] = mist.fixedWing.buildWP(startPoint, turningPoint, speed, altitude, 'BARO'),
[2] = mist.fixedWing.buildWP(endPoint, turningPoint, speed, altitude, 'BARO')
}
end
@@ -115,35 +248,40 @@ function Olympus.move(ID, lat, lng, altitude, speed, category, taskOptions)
},
},
}
- group = unit:getGroup()
local groupCon = group:getController()
if groupCon then
groupCon:setTask(missionTask)
end
- Olympus.notify("Olympus.move executed successfully on a Aircraft", 2)
+ Olympus.debug("Olympus.move executed successfully on a Aircraft", 2)
elseif category == "GroundUnit" then
vars =
{
- group = unit:getGroup(),
+ group = group,
point = coord.LLtoLO(lat, lng, 0),
- form = "Off Road",
heading = 0,
- speed = speed,
- disableRoads = true
+ speed = speed
}
+
+ if taskOptions and taskOptions['id'] == 'FollowRoads' and taskOptions['value'] == true then
+ vars["disableRoads"] = false
+ else
+ vars["form"] = "Off Road"
+ vars["disableRoads"] = true
+ end
+
mist.groupToRandomPoint(vars)
- Olympus.notify("Olympus.move executed succesfully on a ground unit", 2)
+ Olympus.debug("Olympus.move executed succesfully on a ground unit", 2)
else
- Olympus.notify("Olympus.move not implemented yet for " .. category, 2)
+ Olympus.debug("Olympus.move not implemented yet for " .. category, 2)
end
else
- Olympus.notify("Error in Olympus.move " .. unitName, 2)
+ Olympus.debug("Error in Olympus.move " .. groupName, 2)
end
end
-- Creates a simple smoke on the ground
function Olympus.smoke(color, lat, lng)
- Olympus.notify("Olympus.smoke " .. color .. " (" .. lat .. ", " .. lng ..")", 2)
+ Olympus.debug("Olympus.smoke " .. color .. " (" .. lat .. ", " .. lng ..")", 2)
local colorEnum = nil
if color == "green" then
colorEnum = trigger.smokeColor.Green
@@ -159,21 +297,44 @@ function Olympus.smoke(color, lat, lng)
trigger.action.smoke(mist.utils.makeVec3GL(coord.LLtoLO(lat, lng, 0)), colorEnum)
end
+-- Creates an explosion on the ground
+function Olympus.explosion(intensity, lat, lng)
+ Olympus.debug("Olympus.explosion " .. intensity .. " (" .. lat .. ", " .. lng ..")", 2)
+ trigger.action.explosion(mist.utils.makeVec3GL(coord.LLtoLO(lat, lng, 0)), intensity)
+end
+
-- Spawns a single ground unit
function Olympus.spawnGroundUnit(coalition, unitType, lat, lng)
- Olympus.notify("Olympus.spawnGroundUnit " .. coalition .. " " .. unitType .. " (" .. lat .. ", " .. lng ..")", 2)
+ Olympus.debug("Olympus.spawnGroundUnit " .. coalition .. " " .. unitType .. " (" .. lat .. ", " .. lng ..")", 2)
local spawnLocation = mist.utils.makeVec3GL(coord.LLtoLO(lat, lng, 0))
- local unitTable =
- {
- [1] =
+
+ local unitTable = {}
+
+ if Olympus.hasKey(templates, unitType) then
+ for idx, value in pairs(templates[unitType].units) do
+ unitTable[#unitTable + 1] = {
+ ["type"] = value.name,
+ ["x"] = spawnLocation.x + value.dx,
+ ["y"] = spawnLocation.z + value.dy,
+ ["playerCanDrive"] = true,
+ ["heading"] = 0,
+ ["skill"] = "High"
+ }
+ end
+ else
+ unitTable =
{
- ["type"] = unitType,
- ["x"] = spawnLocation.x,
- ["y"] = spawnLocation.z,
- ["playerCanDrive"] = true,
- ["heading"] = 0,
- },
- }
+ [1] =
+ {
+ ["type"] = unitType,
+ ["x"] = spawnLocation.x,
+ ["y"] = spawnLocation.z,
+ ["playerCanDrive"] = true,
+ ["heading"] = 0,
+ ["skill"] = "High"
+ },
+ }
+ end
local countryID = Olympus.getCountryIDByCoalition(coalition)
@@ -186,19 +347,19 @@ function Olympus.spawnGroundUnit(coalition, unitType, lat, lng)
}
mist.dynAdd(vars)
Olympus.unitCounter = Olympus.unitCounter + 1
- Olympus.notify("Olympus.spawnGround completed succesfully", 2)
+ Olympus.debug("Olympus.spawnGround completed succesfully", 2)
end
-- Spawns a single aircraft. Spawn options are:
-- payloadName: a string, one of the names defined in unitPayloads.lua. Must be compatible with the unitType
-- airbaseName: a string, if present the aircraft will spawn on the ground of the selected airbase
-- payload: a table, if present the unit will receive this specific payload. Overrides payloadName
-function Olympus.spawnAircraft(coalition, unitType, lat, lng, spawnOptions)
+function Olympus.spawnAircraft(coalition, unitType, lat, lng, alt, spawnOptions)
local payloadName = spawnOptions["payloadName"]
local airbaseName = spawnOptions["airbaseName"]
local payload = spawnOptions["payload"]
- Olympus.notify("Olympus.spawnAircraft " .. coalition .. " " .. unitType .. " (" .. lat .. ", " .. lng ..")", 2)
+ Olympus.debug("Olympus.spawnAircraft " .. coalition .. " " .. unitType .. " (" .. lat .. ", " .. lng ..", " .. alt .. ")", 2)
local spawnLocation = mist.utils.makeVec3GL(coord.LLtoLO(lat, lng, 0))
if payload == nil then
@@ -218,10 +379,13 @@ function Olympus.spawnAircraft(coalition, unitType, lat, lng, spawnOptions)
["type"] = unitType,
["x"] = spawnLocation.x,
["y"] = spawnLocation.z,
+ ["alt"] = alt,
+ ["alt_type"] = "BARO",
["skill"] = "Excellent",
["payload"] =
{
["pylons"] = payload,
+ ["fuel"] = 999999,
["flare"] = 60,
["ammo_type"] = 1,
["chaff"] = 60,
@@ -251,17 +415,18 @@ function Olympus.spawnAircraft(coalition, unitType, lat, lng, spawnOptions)
{
[1] =
{
- ["action"] = "From Runway",
+ ["action"] = "From Parking Area Hot",
["task"] =
{
["id"] = "ComboTask",
["params"] = {["tasks"] = {},},
},
- ["type"] = "TakeOff",
+ ["type"] = "TakeOffParkingHot",
["ETA"] = 0,
["ETA_locked"] = true,
["x"] = spawnLocation.x,
["y"] = spawnLocation.z,
+ ["alt_type"] = "BARO",
["formation_template"] = "",
["airdromeId"] = airbaseID,
["speed_locked"] = true,
@@ -269,8 +434,61 @@ function Olympus.spawnAircraft(coalition, unitType, lat, lng, spawnOptions)
},
}
end
+ else
+ route = {
+ ["points"] =
+ {
+ [1] =
+ {
+ ["alt"] = alt,
+ ["alt_type"] = "BARO",
+ ["task"] =
+ {
+ ["id"] = "ComboTask",
+ ["params"] =
+ {
+ ["tasks"] =
+ {
+ [1] =
+ {
+ ["number"] = 1,
+ ["auto"] = true,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "EPLRS",
+ ["params"] =
+ {
+ ["value"] = true
+ },
+ },
+ },
+ },
+ [2] =
+ {
+ ["number"] = 2,
+ ["auto"] = false,
+ ["id"] = "Orbit",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["pattern"] = "Circle"
+ },
+ },
+ },
+ },
+ },
+ ["type"] = "Turning Point",
+ ["x"] = spawnLocation.x,
+ ["y"] = spawnLocation.z,
+ }, -- end of [1]
+ }, -- end of ["points"]
+ } -- end of ["route"]
end
-
+
local vars =
{
units = unitTable,
@@ -286,70 +504,88 @@ function Olympus.spawnAircraft(coalition, unitType, lat, lng, spawnOptions)
-- Save the payload to be reused in case the unit is cloned. TODO: save by ID not by name (it works but I like consistency)
Olympus.payloadRegistry[vars.name] = payload
Olympus.unitCounter = Olympus.unitCounter + 1
- Olympus.notify("Olympus.spawnAir completed successfully", 2)
+ Olympus.debug("Olympus.spawnAir completed successfully", 2)
end
-- Clones a unit by ID. Will clone the unit with the same original payload as the source unit. TODO: only works on Olympus unit not ME units.
-function Olympus.clone(ID, lat, lng)
- Olympus.notify("Olympus.clone " .. ID, 2)
+function Olympus.clone(ID, lat, lng, category)
+ Olympus.debug("Olympus.clone " .. ID .. ", " .. category, 2)
local unit = Olympus.getUnitByID(ID)
if unit then
local coalition = Olympus.getCoalitionByCoalitionID(unit:getCoalition())
- -- TODO: only works on Aircraft
- local spawnOptions = {
- payload = Olympus.payloadRegistry[unit:getName()]
- }
- Olympus.spawnAircraft(coalition, unit:getTypeName(), lat, lng, spawnOptions)
+ if category == "Aircraft" then
+ local spawnOptions = {
+ payload = Olympus.payloadRegistry[unit:getName()]
+ }
+ Olympus.spawnAircraft(coalition, unit:getTypeName(), lat, lng, unit:getPoint().y, spawnOptions)
+ elseif category == "GroundUnit" then
+ Olympus.spawnGroundUnit(coalition, unit:getTypeName(), lat, lng)
+ end
end
- Olympus.notify("Olympus.clone completed successfully", 2)
+ Olympus.debug("Olympus.clone completed successfully", 2)
end
-function Olympus.delete(ID, lat, lng)
- Olympus.notify("Olympus.delete " .. ID, 2)
+function Olympus.delete(ID, explosion)
+ Olympus.debug("Olympus.delete " .. ID .. " " .. tostring(explosion), 2)
local unit = Olympus.getUnitByID(ID)
if unit then
- unit:destroy();
- Olympus.notify("Olympus.delete completed successfully", 2)
- end
-end
-
-function Olympus.setTask(ID, taskOptions)
- Olympus.notify("Olympus.setTask " .. ID .. " " .. Olympus.serializeTable(taskOptions), 2)
- local unit = Olympus.getUnitByID(ID)
- if unit then
- local task = Olympus.buildTask(taskOptions);
- if task then
- unit:getGroup():getController():setTask(task)
- Olympus.notify("Olympus.setTask completed successfully", 2)
+ if unit:getPlayerName() or explosion then
+ trigger.action.explosion(unit:getPoint() , 250 ) --consider replacing with forcibly deslotting the player, however this will work for now
+ Olympus.debug("Olympus.delete completed successfully", 2)
+ else
+ unit:destroy(); --works for AI units not players
+ Olympus.debug("Olympus.delete completed successfully", 2)
end
end
end
-function Olympus.resetTask(ID)
- Olympus.notify("Olympus.resetTask " .. ID, 2)
- local unit = Olympus.getUnitByID(ID)
- if unit then
- unit:getGroup():getController():resetTask()
- Olympus.notify("Olympus.resetTask completed successfully", 2)
+function Olympus.setTask(groupName, taskOptions)
+ Olympus.debug("Olympus.setTask " .. groupName .. " " .. Olympus.serializeTable(taskOptions), 2)
+ local group = Group.getByName(groupName)
+ if group then
+ local task = Olympus.buildTask(groupName, taskOptions);
+ Olympus.debug("Olympus.setTask " .. Olympus.serializeTable(task), 20)
+ if task then
+ group:getController():setTask(task)
+ Olympus.debug("Olympus.setTask completed successfully", 2)
+ end
end
end
-function Olympus.setCommand(ID, command)
- Olympus.notify("Olympus.setCommand " .. ID .. " " .. Olympus.serializeTable(command), 2)
- local unit = Olympus.getUnitByID(ID)
- if unit then
- unit:getGroup():getController():setCommand(command)
- Olympus.notify("Olympus.setCommand completed successfully", 2)
+function Olympus.resetTask(groupName)
+ Olympus.debug("Olympus.resetTask " .. groupName, 2)
+ local group = Group.getByName(groupName)
+ if group then
+ group:getController():resetTask()
+ Olympus.debug("Olympus.resetTask completed successfully", 2)
end
end
-function Olympus.setOption(ID, optionID, optionValue)
- Olympus.notify("Olympus.setCommand " .. ID .. " " .. optionID .. " " .. optionValue, 2)
- local unit = Olympus.getUnitByID(ID)
- if unit then
- unit:getGroup():getController():setOption(optionID, optionValue)
- Olympus.notify("Olympus.setOption completed successfully", 2)
+function Olympus.setCommand(groupName, command)
+ Olympus.debug("Olympus.setCommand " .. groupName .. " " .. Olympus.serializeTable(command), 2)
+ local group = Group.getByName(groupName)
+ if group then
+ group:getController():setCommand(command)
+ Olympus.debug("Olympus.setCommand completed successfully", 2)
+ end
+end
+
+function Olympus.setOption(groupName, optionID, optionValue)
+ Olympus.debug("Olympus.setOption " .. groupName .. " " .. optionID .. " " .. tostring(optionValue), 2)
+ local group = Group.getByName(groupName)
+ if group then
+ group:getController():setOption(optionID, optionValue)
+ Olympus.debug("Olympus.setOption completed successfully", 2)
+ end
+end
+
+function Olympus.setOnOff(groupName, onOff)
+ Olympus.debug("Olympus.setOnOff " .. groupName .. " " .. tostring(onOff), 2)
+ local group = Group.getByName(groupName)
+ if group then
+ group:getController():setOnOff(onOff)
+ Olympus.debug("Olympus.setOnOff completed successfully", 2)
end
end
@@ -385,4 +621,148 @@ function Olympus.serializeTable(val, name, skipnewlines, depth)
return tmp
end
-Olympus.notify("OlympusCommand script loaded successfully", 2)
\ No newline at end of file
+function Olympus.isArray(t)
+ local i = 0
+ for _ in pairs(t) do
+ i = i + 1
+ if t[i] == nil then return false end
+ end
+ return true
+end
+
+function Olympus.hasValue(tab, val)
+ for index, value in ipairs(tab) do
+ if value == val then
+ return true
+ end
+ end
+
+ return false
+end
+
+function Olympus.hasKey(tab, key)
+ for k, value in pairs(tab) do
+ if k == key then
+ return true
+ end
+ end
+
+ return false
+end
+
+function Olympus.setMissionData(arg, time)
+ local missionData = {}
+
+ -- Bullseye data
+ local bullseyes = {}
+ for i = 0, 2 do
+ local bullseyeVec3 = coalition.getMainRefPoint(i)
+ local bullseyeLatitude, bullseyeLongitude, bullseyeAltitude = coord.LOtoLL(bullseyeVec3)
+ bullseyes[i] = {}
+ bullseyes[i]["latitude"] = bullseyeLatitude
+ bullseyes[i]["longitude"] = bullseyeLongitude
+ bullseyes[i]["coalition"] = Olympus.getCoalitionByCoalitionID(i)
+ end
+
+ -- Units tactical data
+ local unitsData = {}
+
+ local startIndex = Olympus.groupIndex
+ local endIndex = startIndex + Olympus.groupStep
+ local index = 0
+ if mist ~= nil and mist.DBs ~= nil and mist.DBs.groupsByName ~= nil then
+ for groupName, gp in pairs(mist.DBs.groupsByName) do
+ index = index + 1
+ if index > startIndex then
+ if groupName ~= nil then
+ local group = Group.getByName(groupName)
+ if group ~= nil then
+ -- Get the targets detected by the group controller
+ local controller = group:getController()
+ local controllerTargets = controller:getDetectedTargets()
+
+ for index, unit in pairs(group:getUnits()) do
+ local unitController = unit:getController()
+ local table = {}
+ table["contacts"] = {}
+
+ for i, target in ipairs(controllerTargets) do
+ for det, enum in pairs(Controller.Detection) do
+ if target.object ~= nil then
+ local detected = unitController:isTargetDetected(target.object, enum)
+
+ if detected then
+ target["detectionMethod"] = det
+ table["contacts"][#table["contacts"] + 1] = target
+ end
+ end
+ end
+ end
+
+ table["hasTask"] = controller:hasTask()
+
+ table["ammo"] = unit:getAmmo()
+ table["fuel"] = unit:getFuel()
+ table["life"] = unit:getLife() / unit:getLife0()
+ unitsData[unit:getObjectID()] = table
+ end
+ end
+ end
+ end
+ if index >= endIndex then
+ break
+ end
+ end
+ if index ~= endIndex then
+ Olympus.groupIndex = 0
+ else
+ Olympus.groupIndex = endIndex
+ end
+ end
+
+ -- Airbases data
+ local base = world.getAirbases()
+ local airbases = {}
+ for i = 1, #base do
+ local info = {}
+ local latitude, longitude, altitude = coord.LOtoLL(Airbase.getPoint(base[i]))
+ info["callsign"] = Airbase.getCallsign(base[i])
+ info["coalition"] = Olympus.getCoalitionByCoalitionID(Airbase.getCoalition(base[i]))
+ info["latitude"] = latitude
+ info["longitude"] = longitude
+ if Airbase.getUnit(base[i]) then
+ info["unitId"] = Airbase.getUnit(base[i]):getID()
+ end
+ airbases[i] = info
+ end
+
+ local mission = {}
+ mission.theatre = env.mission.theatre
+ mission.elapsedTime = DCS.getRealTime()
+ mission.time = mist.time.getDHMS(timer.getAbsTime())
+ mission.startTime = env.mission.start_time
+ mission.date = env.mission.date
+
+ -- Assemble missionData table
+ missionData["bullseyes"] = bullseyes
+ missionData["unitsData"] = unitsData
+ missionData["airbases"] = airbases
+ missionData["mission"] = mission
+
+ Olympus.missionData = missionData
+ Olympus.OlympusDLL.setMissionData()
+ return time + 1
+end
+
+local OlympusName = 'Olympus ' .. version .. ' C++ module';
+isOlympusModuleInitialized=true;
+Olympus.DLLsloaded = Olympus.loadDLLs()
+if Olympus.DLLsloaded then
+ Olympus.notify(OlympusName..' successfully loaded.', 20)
+else
+ Olympus.notify('Failed to load '..OlympusName, 20)
+end
+
+timer.scheduleFunction(Olympus.setMissionData, {}, timer.getTime() + 1)
+
+Olympus.notify("OlympusCommand script " .. version .. " loaded successfully", 2, true)
\ No newline at end of file
diff --git a/scripts/OlympusExport.lua b/scripts/OlympusExport.lua
deleted file mode 100644
index 29663e8a..00000000
--- a/scripts/OlympusExport.lua
+++ /dev/null
@@ -1,38 +0,0 @@
-Olympus = {}
-Olympus.OlympusDLL = nil
-Olympus.cppRESTDLL = nil
-Olympus.DLLsloaded = false
-Olympus.OlympusModPath = os.getenv('DCSOLYMPUS_PATH')..'\\bin\\'
-
-log.write('Olympus.EXPORT.LUA', log.INFO, 'Executing OlympusExport.lua')
-
-function Olympus.loadDLLs()
- -- Add the .dll paths
- package.cpath = package.cpath..';'..Olympus.OlympusModPath..'?.dll;'
-
- local status
- log.write('Olympus.HOOKS.LUA', log.INFO, 'Loading olympus.dll from ['..Olympus.OlympusModPath..']')
- status, Olympus.OlympusDLL = pcall(require, 'olympus')
- if status then
- log.write('Olympus.HOOKS.LUA', log.INFO, 'olympus.dll loaded successfully')
- return true
- else
- log.write('Olympus.HOOKS.LUA', log.ERROR, 'Error loading olympus.dll: '..Olympus.OlympusDLL)
- return false
- end
-end
-
-do
- if isOlympusModuleInitialized~=true then
- local OlympusName = 'Olympus 0.0.1 C++ module';
- isOlympusModuleInitialized=true;
- Olympus.DLLsloaded = Olympus.loadDLLs()
- if Olympus.DLLsloaded then
- log.write('Olympus.EXPORT.LUA', log.INFO, OlympusName..' successfully loaded.')
- else
- log.write('Olympus.EXPORT.LUA', log.ERROR, 'Failed to load '..OlympusName)
- end
- else
- log.write('Olympus.EXPORT.LUA', log.INFO, 'olympus.dll already initialized')
- end
-end
\ No newline at end of file
diff --git a/scripts/OlympusHook.lua b/scripts/OlympusHook.lua
index 10c9432a..b87c8926 100644
--- a/scripts/OlympusHook.lua
+++ b/scripts/OlympusHook.lua
@@ -1,3 +1,5 @@
+local version = 'v0.3.0-alpha'
+
Olympus = {}
Olympus.OlympusDLL = nil
Olympus.cppRESTDLL = nil
@@ -24,7 +26,7 @@ end
do
if isOlympusModuleInitialized~=true then
- local OlympusName = 'Olympus 0.0.1 C++ module';
+ local OlympusName = 'Olympus ' .. version .. ' C++ module';
Olympus.loadDLLs();
-- Register callbacks
diff --git a/scripts/OlympusMission.lua b/scripts/OlympusMission.lua
deleted file mode 100644
index 87bd6b90..00000000
--- a/scripts/OlympusMission.lua
+++ /dev/null
@@ -1,106 +0,0 @@
-
-Olympus = {}
-function Olympus.notify(message, displayFor)
- trigger.action.outText(message, displayFor)
-end
-
-function Olympus.setMissionData(arg, time)
- local missionData = {}
-
- -- Bullseye data
- local bullseye = {}
- for i = 0, 2 do
- local bullseyeVec3 = coalition.getMainRefPoint(i)
- local bullseyeLatitude, bullseyeLongitude, bullseyeAltitude = coord.LOtoLL(bullseyeVec3)
- bullseye[i] = {}
- bullseye[i]["lat"] = bullseyeLatitude
- bullseye[i]["lng"] = bullseyeLongitude
- end
-
- -- Units tactical data
- -- TODO find some way to spread the load of getting this data (split)
- local unitsData = {}
- for groupName, gp in pairs(mist.DBs.groupsByName) do
- if groupName ~= nil then
- local group = Group.getByName(groupName)
- if group ~= nil then
- local controller = group:getController()
- for index, unit in pairs(group:getUnits()) do
- local table = {}
- table["targets"] = {}
- table["targets"]["visual"] = controller:getDetectedTargets(1)
- table["targets"]["radar"] = controller:getDetectedTargets(4)
- table["targets"]["rwr"] = controller:getDetectedTargets(16)
- table["targets"]["other"] = controller:getDetectedTargets(2, 8, 32)
-
- table["hasTask"] = controller:hasTask()
-
- table["ammo"] = unit:getAmmo()
- table["fuel"] = unit:getFuel()
- table["life"] = unit:getLife() / unit:getLife0()
- unitsData[unit:getObjectID()] = table
- end
- end
- end
- end
-
- -- Airbases data
- local base = world.getAirbases()
- local basesData = {}
- for i = 1, #base do
- local info = {}
- local latitude, longitude, altitude = coord.LOtoLL(Airbase.getPoint(base[i]))
- info["callsign"] = Airbase.getCallsign(base[i])
- info["coalition"] = Airbase.getCoalition(base[i])
- info["lat"] = latitude
- info["lng"] = longitude
- if Airbase.getUnit(base[i]) then
- info["unitId"] = Airbase.getUnit(base[i]):getID()
- end
- basesData[i] = info
- end
-
- -- Assemble missionData table
- missionData["bullseye"] = bullseye
- missionData["unitsData"] = unitsData
- missionData["airbases"] = basesData
-
- local command = "Olympus.missionData = " .. Olympus.serializeTable(missionData) .. "\n" .. "Olympus.OlympusDLL.setMissionData()"
- net.dostring_in("export", command)
- return time + 5
-end
-
-function Olympus.serializeTable(val, name, skipnewlines, depth)
- skipnewlines = skipnewlines or false
- depth = depth or 0
-
- local tmp = string.rep(" ", depth)
- if name then
- if type(name) == "number" then
- tmp = tmp .. "[" .. name .. "]" .. " = "
- else
- tmp = tmp .. name .. " = "
- end
- end
-
- if type(val) == "table" then
- tmp = tmp .. "{" .. (not skipnewlines and "\n" or "")
- for k, v in pairs(val) do
- tmp = tmp .. Olympus.serializeTable(v, k, skipnewlines, depth + 1) .. "," .. (not skipnewlines and "\n" or "")
- end
- tmp = tmp .. string.rep(" ", depth) .. "}"
- elseif type(val) == "number" then
- tmp = tmp .. tostring(val)
- elseif type(val) == "string" then
- tmp = tmp .. string.format("%q", val)
- elseif type(val) == "boolean" then
- tmp = tmp .. (val and "true" or "false")
- else
- tmp = tmp .. "\"[inserializeable datatype:" .. type(val) .. "]\""
- end
-
- return tmp
-end
-
-timer.scheduleFunction(Olympus.setMissionData, {}, timer.getTime() + 1)
-Olympus.notify("OlympusMission script loaded correctly", 10)
diff --git a/scripts/coals.lua b/scripts/coals.lua
new file mode 100644
index 00000000..445e1473
--- /dev/null
+++ b/scripts/coals.lua
@@ -0,0 +1,47 @@
+coal = {}
+
+function coal.notify(message, displayFor)
+ trigger.action.outText(message, displayFor)
+end
+
+function coal.listRed()
+ coal.coals = env.mission.coalitions.red --solid naming this
+ coal.notify(mist.utils.tableShow(coal.coals),5)
+ pickOne = math.random(#coal.coals)
+ countryIs = country.name[coal.coals[pickOne]]
+ coal.notify(countryIs,10)
+end
+
+function coal.listBlue()
+ coal.coals = env.mission.coalitions.blue --solid naming this
+ coal.notify(mist.utils.tableShow(coal.coals),5)
+ pickOne = math.random(#coal.coals)
+ countryIs = country.name[coal.coals[pickOne]]
+ coal.notify(countryIs,10)
+end
+
+function coal.listNeutrals()
+ coal.coals = env.mission.coalitions.neutrals --solid naming this
+ coal.notify(mist.utils.tableShow(coal.coals),5)
+ pickOne = math.random(#coal.coals)
+ countryIs = country.name[coal.coals[pickOne]]
+ coal.notify(countryIs,10)
+end
+
+
+do
+ longRangeShots = missionCommands.addSubMenu("Coal check")
+ missionCommands.addCommand ("List reds", longRangeShots, coal.listRed)
+ missionCommands.addCommand ("List blue", longRangeShots, coal.listBlue)
+ missionCommands.addCommand ("List neutrals", longRangeShots, coal.listNeutrals)
+
+end
+
+coal.notify("coals.lua loaded", 2)
+
+
+-- env.mission.coalitions.red
+-- env.mission.coalitions.blue
+-- env.mission.coalitions.neutrals
+
+--coalition.getCountryCoalition(countryID)
\ No newline at end of file
diff --git a/scripts/coolEffects.lua b/scripts/coolEffects.lua
new file mode 100644
index 00000000..52efb537
--- /dev/null
+++ b/scripts/coolEffects.lua
@@ -0,0 +1,305 @@
+effects = {}
+effects.shooterName = "TestInfantry"
+effects.napalmCounter = 1
+
+effects.fireCounter = 1
+
+function effects.notify(message, displayFor)
+ trigger.action.outText(message, displayFor, false)
+end
+
+--------------------------------------------
+--------------------------------------------
+--------------------------------------------
+----NAPALM
+
+
+function effects.napalmSingle ()
+ unit = Unit.getByName(effects.shooterName)
+ local unitPos = unit:getPosition().p
+ vec3 = mist.utils.makeVec3GL(unitPos)
+ effects.spawnNapalm (vec3)
+end
+
+
+function effects.spawnNapalm (vec3)
+
+ napeName = "napalmStrike" .. effects.napalmCounter
+ effects.napalmCounter = effects.napalmCounter + 1
+ mist.dynAddStatic(
+ {
+ country = 20,
+ category = 'Fortifications',
+ hidden = true,
+ name = napeName,
+ type ="Fuel tank",
+ x = vec3.x,
+ y = vec3.z,
+ heading = 0,
+ } -- end of function
+ )
+ timer.scheduleFunction(effects.explode,vec3, timer.getTime() + 0.1)
+ timer.scheduleFunction(effects.napalam_death,napeName, timer.getTime() + 0.12)
+end
+
+function effects.explode(vec3)
+ trigger.action.explosion(vec3, 10)
+end
+
+function effects.napalam_death(staticName) --yes i know bad pun, removes the fuel tank after a set time
+ StaticObject.getByName(staticName):destroy()
+end
+
+--------------------------------------------
+--------------------------------------------
+--------------------------------------------
+----Basic smoke or fire that despawns
+function effects.smokeFire ()
+ unit = Unit.getByName(effects.shooterName)
+ local unitPos = unit:getPosition().p
+ vec3 = mist.utils.makeVec3GL(unitPos)
+ effects.createFire (vec3, 2)
+ -- 1 = small smoke and fire
+ -- 2 = medium smoke and fire
+ -- 3 = large smoke and fire
+ -- 4 = huge smoke and fire
+ -- 5 = small smoke
+ -- 6 = medium smoke
+ -- 7 = large smoke
+ -- 8 = huge smoke
+end
+
+function effects.createFire (vec3, size)
+ smokeName = "smokeName" .. effects.fireCounter
+ effects.fireCounter = effects.fireCounter + 1
+ trigger.action.effectSmokeBig(vec3 , size , 1, smokeName)
+ trigger.action.explosion(vec3, 1) -- looks wierd to spawn in on flat land without this
+ timer.scheduleFunction(effects.removeFire,smokeName, timer.getTime() + 20) --you could set a timer, or if selected give option to despawn later
+end
+
+function effects.removeFire (smokeName)
+ trigger.action.effectSmokeStop(smokeName)
+end
+
+--------------------------------------------
+--------------------------------------------
+--------------------------------------------
+----White phosporus secondaries extra effect, like round cooking off
+--if you up the number going pop to somewhere in the 200-400 region with a white phosporus impact it would look mental cool
+function effects.secondaries ()
+ unit = Unit.getByName(effects.shooterName)
+ local unitPos = unit:getPosition().p
+ vec3 = mist.utils.makeVec3GL(unitPos)
+ --trigger.action.smoke(vec3 , 2 )
+ for i = 1,math.random(3,10) do
+ angle = mist.utils.toRadian((math.random(1,360)))
+ local randVec = mist.utils.makeVec3GL((mist.getRandPointInCircle(vec3 ,5 , 1 ,0 ,360)))
+ trigger.action.signalFlare(randVec , 2 , angle )
+ end
+
+end
+
+--------------------------------------------
+--------------------------------------------
+--------------------------------------------
+----Depth Charges
+-- these also make, on land, good dust clouds for a bomb hit in a sandy area?
+-- local surface = land.getSurfaceType(mist.utils.makeVec2(unitPos)) -- optional check for water, value 3 or 2
+
+function effects.depthCharge ()
+ local unit = Unit.getByName(effects.shooterName)
+ local unitPos = unit:getPosition().p
+
+ vec3 = mist.utils.makeVec3GL(unitPos)
+ vec3.y = vec3.y - 1000
+ bang = vec3
+ distance = 20
+ explosionSize = 2
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ trigger.action.explosion(vec3,explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ trigger.action.explosion(vec3,explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ bang = mist.getRandPointInCircle(vec3 , distance ,1,359,0)
+ trigger.action.explosion(mist.utils.makeVec3GL(bang),explosionSize)
+ timer.scheduleFunction(effects.depthChargeMain,vec3, timer.getTime() + 5)
+end
+
+
+
+function effects.depthChargeMain (vec3)
+ explosionSize = 250
+ trigger.action.explosion(vec3,explosionSize)
+ trigger.action.explosion(vec3,explosionSize)
+ vec3.x = vec3.x
+ trigger.action.explosion(vec3,explosionSize)
+ vec3.x = vec3.x - 10
+ trigger.action.explosion(vec3,explosionSize)
+ vec3.z = vec3.z
+ trigger.action.explosion(vec3,explosionSize)
+ vec3.z = vec3.z - 10
+end
+
+--------------------------------------------
+--------------------------------------------
+--------------------------------------------
+----Normal small explosion
+
+function effects.normalSmallExplosion (vec3)
+ unit = Unit.getByName(effects.shooterName)
+ local unitPos = unit:getPosition().p
+ vec3 = mist.utils.makeVec3GL(unitPos)
+ trigger.action.explosion(vec3,10)
+end
+
+
+
+do
+ longRangeShots = missionCommands.addSubMenu("Effects")
+ missionCommands.addCommand ("Napalm", longRangeShots, effects.napalmSingle)
+ missionCommands.addCommand ("Fire or smoke", longRangeShots, effects.smokeFire)
+ missionCommands.addCommand ("Secondary explosions", longRangeShots, effects.secondaries)
+ missionCommands.addCommand ("Depth Charge", longRangeShots, effects.depthCharge)
+ missionCommands.addCommand ("A regular explosion", longRangeShots, effects.normalSmallExplosion)
+end
+
+effects.notify("effects.lua ran", 2)
\ No newline at end of file
diff --git a/scripts/dynamicTanking.lua b/scripts/dynamicTanking.lua
new file mode 100644
index 00000000..daa5761d
--- /dev/null
+++ b/scripts/dynamicTanking.lua
@@ -0,0 +1,681 @@
+tankers = {}
+tankers.tankerName = "TankerClone"
+
+function tankers.notify(message, displayFor)
+ trigger.action.outText(message, displayFor, false)
+end
+
+
+function tankers.setFrequency(freq)
+
+ unit = Unit.getByName(tankers.tankerName)
+ local controller = unit:getController()
+
+ freq = freq or 260 --in MHz, 260 channel 19 is our default tanker thing in refs
+
+ SetFrequency = {
+ id = 'SetFrequency',
+ params = {
+ frequency = freq*1000000 , --in Hz
+ modulation = 0, --AM 0 or FM 1
+ }
+ }
+
+ controller:setCommand(SetFrequency)
+end
+
+function tankers.changeCallsign()
+ ---https://wiki.hoggitworld.com/view/DCS_command_setCallsign
+ unit = Unit.getByName(tankers.tankerName)
+ local controller = unit:getController()
+
+ SetCallsign = {
+ id = 'SetCallsign',
+ params = {
+ callname = 3, --1 texaco, --2 arco -- 3 shell
+ number = 1, --1 through 9 valid for tankers only ever 1?
+ }
+ }
+
+ controller:setCommand(SetCallsign)
+end
+
+--remember to only pick valid tacan channel ranges
+
+
+-- https://wiki.radioreference.com/index.php/Instrument_Landing_System_(ILS)_Frequencies -- what freqs go with which tacans
+-- you want the reply channels on the tankers so the fighter tunes the one you want
+
+function tankers.setTacan(channel, xRay)
+
+ defaultTac = 40
+ defaultXray = true
+ channel = channel or defaultTac -- the channel you want to tell the fighters to enter in, if not provided defaults
+ xRay = xRay or defaultXray -- X or Y are only options so true or false
+
+ unit = Unit.getByName(tankers.tankerName)
+ local controller = unit:getController()
+
+ --tacan maths is easy
+ --for X ray reply it is, channel + 961, Yankee reply is channel + 1087
+
+ if xRay == true then
+ --to not break everyone elses datalink / tacan 37 and above (X)
+ if channel > 36 then
+ freq = channel + 961
+ ActivateBeacon = {
+ id = 'ActivateBeacon',
+ params = {
+ type = 4,
+ system = 3,
+ name = "TKR",
+ callsign = "ABC", --what shows as a listed word / plays as morese code, 3 max no spaces
+ frequency = freq*1000000,
+ }
+ }
+ controller:setCommand(ActivateBeacon)
+ end
+
+ elseif xRay == false then
+ --to not break everyone elses datalink / tacan 30 - 46 (Y) but I don't think the "above" is correct
+ if channel > 29 then
+ freq = channel + 1087
+ ActivateBeacon = {
+ id = 'ActivateBeacon',
+ params = {
+ type = 4,
+ system = 3,
+ name = "TKR",
+ callsign = "ABC", --what shows as a listed word / plays as morese code, 3 max no spaces
+ frequency = freq*1000000,
+ }
+ }
+ controller:setCommand(ActivateBeacon)
+ end
+ end
+end
+
+function tankers.dryPlugTanking () -- for whatever reason this ends up being no fuel transfer?
+ --tankers.setFrequency(260)
+ --tankers.setTacan(41, true)
+ --tankers.changeCallsign()
+
+ unit = Unit.getByName(tankers.tankerName)
+ cvn = Unit.getByName("CVN")
+ local cvnPos = cvn:getPosition().p
+ local tnkrPos = unit:getPosition().p
+ local speed = 250
+ local controller = unit:getController()
+
+ --if you want to try making a tanker do something else
+ --https://www.digitalcombatsimulator.com/en/support/faq/1267/#3307682 maybe? stop conditions etc
+ --personally i think delete the thing if it doesn't work
+ --there is a recovery tanker option, but for me it makes planes stall and hit the floor and we can fake it with this already
+
+ -- this might all seem very over the top compared to the docs, but if you don't do it the tanker instantly RTBs, though you can tank on final which is hillarious
+
+ task1 = {
+ ["number"] = 1,
+ ["auto"] = false,
+ ["id"] = "ControlledTask",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["task"] =
+ {
+ ["id"] = "Tanker",
+ ["params"] =
+ {
+ }, -- end of ["params"]
+ }, -- end of ["task"]
+ ["stopCondition"] =
+ {
+ ["duration"] = 600,
+ ["userFlag"] = "1",
+ }, -- end of ["stopCondition"]
+ }, -- end of ["params"]
+ }
+
+ task2 = {
+ ["number"] = 2,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "ActivateBeacon",
+ ["params"] =
+ {
+ ["type"] = 4,
+ ["AA"] = false,
+ ["callsign"] = "TKR",
+ ["modeChannel"] = "Y",
+ ["channel"] = 71,
+ ["system"] = 5,
+ ["unitId"] = 188,
+ ["bearing"] = true,
+ ["frequency"] = 1032000000,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }
+ task3 =
+ {
+ ["number"] = 3,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "SetFrequency",
+ ["params"] =
+ {
+ ["power"] = 10,
+ ["modulation"] = 0,
+ ["frequency"] = 305000000,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }
+
+ task4 =
+ {
+ ["number"] = 4,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "SetInvisible",
+ ["params"] =
+ {
+ ["value"] = true,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }
+
+ point1 = {
+ ['speed_locked'] = false,
+ ['type'] = 'Turning Point',
+ ['action'] = 'Turning Point',
+ ['alt_type'] = 'BARO',
+ ['y'] = cvnPos.z,
+ ['x'] = cvnPos.x,
+ ['speed'] = 128.611,
+ ['task'] = {
+ ['id'] = 'ComboTask',
+ ['params'] = {
+ ['tasks'] = {
+ [1] = task1, --tanker first
+ [2] = task2, --whatever second
+ [3] = task3,
+ [4] = task4,
+ }
+ }
+ },
+ ['alt'] = tnkrPos.y
+ }
+ point2 = {
+ ['speed_locked'] = true,
+ ['type'] = 'Turning Point',
+ ['action'] = 'Turning Point',
+ ['alt_type'] = 'BARO',
+ ['y'] = 30553,
+ ['x'] = 35881,
+ ['speed'] = 128.611,
+ ['task'] = {
+ ['id'] = 'ComboTask',
+ ['params'] = {
+ ['tasks'] = {
+ }
+ }
+ },
+ ['alt'] = 2133.6
+ }
+
+ missionTask =
+ {
+ ['id'] = 'Mission',
+ ['params'] = {
+ ['route'] = {
+ ['points'] = {
+ [1] = point1,
+ --[2] = point2,
+ }
+ },
+ ['airborne'] = true
+ }
+ }
+ controller:pushTask(missionTask)
+end
+
+function tankers.followInFront ()
+ unit = Unit.getByName(tankers.tankerName)
+ local controller = unit:getController()
+
+ FollowAheadOfGroup = {
+ ["enabled"] = true,
+ ["auto"] = false,
+ ["id"] = "Follow",
+ ["number"] = 1,
+ ["params"] =
+ {
+ ["lastWptIndexFlagChangedManually"] = false,
+ ["groupId"] = 74,
+ ["lastWptIndex"] = 2,
+ ["lastWptIndexFlag"] = false,
+ ["pos"] =
+ {
+ ["y"] = 152.4, --mins for KC 135 to accidentally stern rejoin and overfly
+ ["x"] = 1000.8,
+ ["z"] = 39.9288,
+ }, -- end of ["pos"]
+ }, -- end of ["params"]
+ }
+
+ controller:pushTask(FollowAheadOfGroup)
+end
+
+function tankers.followInFrontClose ()
+ unit = Unit.getByName(tankers.tankerName)
+ local controller = unit:getController()
+
+ FollowAheadOfGroup = {
+ ["enabled"] = true,
+ ["auto"] = false,
+ ["id"] = "Follow",
+ ["number"] = 1,
+ ["params"] =
+ {
+ ["lastWptIndexFlagChangedManually"] = false,
+ ["groupId"] = 74,
+ ["lastWptIndex"] = 2,
+ ["lastWptIndexFlag"] = false,
+ ["pos"] =
+ {
+ ["y"] = 25, --mins for KC 135 to accidentally stern rejoin and overfly
+ ["x"] = 150,
+ ["z"] = 41.45,
+ }, -- end of ["pos"]
+ }, -- end of ["params"]
+ }
+
+ controller:pushTask(FollowAheadOfGroup)
+end
+
+function tankers.cloneTanker()
+
+local groupName = 'TankerClone' -- Name of the group in the ME
+
+group = mist.getGroupData(groupName)
+group.route = { points = mist.getGroupRoute(groupName, true) }
+group.groupName = "Tanker1"
+group.groupId = nil
+group.units[1].unitId = nil
+group.units[1].unitName = newName
+group.country = country
+group.category = 'AIRPLANE'
+
+mist.dynAdd(group)
+
+end
+
+function tankers.newTanker()
+
+local groupName = 'TankerClone' -- Name of the group in the ME
+local cloneGroupPos = Unit.getByName(groupName):getPosition().p
+cvn = Unit.getByName("CVN")
+local cvnPos = cvn:getPosition().p
+
+
+group = mist.getGroupData(groupName)
+group.route = {
+ ["points"] =
+ {
+ [1] =
+ {
+ ["alt"] = 2133.6,
+ ["action"] = "Turning Point",
+ ["alt_type"] = "BARO",
+ ["speed"] = 179.86111111111,
+ ["task"] =
+ {
+ ["id"] = "ComboTask",
+ ["params"] =
+ {
+ ["tasks"] =
+ {
+ [1] =
+ {
+ ["number"] = 1,
+ ["auto"] = false,
+ ["id"] = "ControlledTask",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["task"] =
+ {
+ ["id"] = "Tanker",
+ ["params"] =
+ {
+ }, -- end of ["params"]
+ }, -- end of ["task"]
+ ["stopCondition"] =
+ {
+ ["duration"] = 900,
+ }, -- end of ["stopCondition"]
+ }, -- end of ["params"]
+ }, -- end of [1]
+ [2] =
+ {
+ ["number"] = 2,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "ActivateBeacon",
+ ["params"] =
+ {
+ ["type"] = 4,
+ ["AA"] = false,
+ ["callsign"] = "TKR",
+ ["modeChannel"] = "Y",
+ ["channel"] = 71,
+ ["system"] = 5,
+ ["unitId"] = 188,
+ ["bearing"] = true,
+ ["frequency"] = 1032000000,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }, -- end of [2]
+ [3] =
+ {
+ ["number"] = 3,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "SetFrequency",
+ ["params"] =
+ {
+ ["power"] = 10,
+ ["modulation"] = 0,
+ ["frequency"] = 260000000,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }, -- end of [3]
+ [4] =
+ {
+ ["number"] = 4,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "SetInvisible",
+ ["params"] =
+ {
+ ["value"] = true,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }, -- end of [4]
+ }, -- end of ["tasks"]
+ }, -- end of ["params"]
+ }, -- end of ["task"]
+ ["type"] = "Turning Point",
+ ["ETA"] = 96.50677034026,
+ ["ETA_locked"] = false,
+ ["y"] = cvnPos.z,
+ ["x"] = cvnPos.x,
+ ["formation_template"] = "",
+ ["speed_locked"] = true,
+ }, -- end of [1]
+ }, -- end of ["points"]
+ }
+
+--group.units[1].type = "S-3B Tanker"
+group.groupName = "Tanker1"
+group.groupId = nil
+group.units[1].unitId = nil
+group.units[1].unitName = newName
+group.country = country
+group.category = 'AIRPLANE'
+group.units[1].x = cloneGroupPos.x
+group.units[1].y = cloneGroupPos.z
+group.units[1].z = cloneGroupPos.y
+group.units[1].speed = 999999
+
+
+Group.destroy(Group.getByName(groupName))
+mist.dynAdd(group)
+--timer.scheduleFunction(mist.dynAdd,group, timer.getTime() + 0.00000000001)
+
+end
+
+
+function tankers.startEnrouteTankingTest (vec3) -- this is the one that works well, clone an existing tanker that is currently mission editor tanking
+
+ --tankers.setFrequency(260)
+ --tankers.setTacan(41, true)
+ --tankers.changeCallsign()
+ route = mist.getGroupRoute(tankers.tankerName, true)
+ unit = Unit.getByName(tankers.tankerName)
+ cvn = Unit.getByName("CVN")
+
+ local cvnPos = cvn:getPosition().p
+
+ local vec3 = vec3 or cvnPos
+ route[1].x = unit:getPosition().p.x
+ route[1].y = unit:getPosition().p.z
+ route[2].x = vec3.x
+ route[2].y = vec3.z
+ route[2].z = vec3.y + 100
+
+ mist.goRoute(tankers.tankerName , route )
+end
+
+function tankers.hyperSpace (vec3) -- this is the one that works well, clone an existing tanker that is currently mission editor tanking
+local groupName = 'TankerClone' -- Name of the group in the ME
+local cloneGroupPos = Unit.getByName(groupName):getPosition().p
+cvn = Unit.getByName("CVN")
+local cvnPos = cvn:getPosition().p
+
+
+group = mist.getGroupData(groupName)
+group.route = {
+ ["points"] =
+ {
+ [1] =
+ {
+ ["alt"] = 2133.6,
+ ["action"] = "Turning Point",
+ ["alt_type"] = "BARO",
+ ["speed"] = 179.86111111111,
+ ["task"] =
+ {
+ ["id"] = "ComboTask",
+ ["params"] =
+ {
+ ["tasks"] =
+ {
+ [1] =
+ {
+ ["number"] = 1,
+ ["auto"] = false,
+ ["id"] = "ControlledTask",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["task"] =
+ {
+ ["id"] = "Tanker",
+ ["params"] =
+ {
+ }, -- end of ["params"]
+ }, -- end of ["task"]
+ ["stopCondition"] =
+ {
+ ["duration"] = 900,
+ }, -- end of ["stopCondition"]
+ }, -- end of ["params"]
+ }, -- end of [1]
+ [2] =
+ {
+ ["number"] = 2,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "ActivateBeacon",
+ ["params"] =
+ {
+ ["type"] = 4,
+ ["AA"] = false,
+ ["callsign"] = "TKR",
+ ["modeChannel"] = "Y",
+ ["channel"] = 71,
+ ["system"] = 5,
+ ["unitId"] = 188,
+ ["bearing"] = true,
+ ["frequency"] = 1032000000,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }, -- end of [2]
+ [3] =
+ {
+ ["number"] = 3,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "SetFrequency",
+ ["params"] =
+ {
+ ["power"] = 10,
+ ["modulation"] = 0,
+ ["frequency"] = 260000000,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }, -- end of [3]
+ [4] =
+ {
+ ["number"] = 4,
+ ["auto"] = false,
+ ["id"] = "WrappedAction",
+ ["enabled"] = true,
+ ["params"] =
+ {
+ ["action"] =
+ {
+ ["id"] = "SetInvisible",
+ ["params"] =
+ {
+ ["value"] = true,
+ }, -- end of ["params"]
+ }, -- end of ["action"]
+ }, -- end of ["params"]
+ }, -- end of [4]
+ }, -- end of ["tasks"]
+ }, -- end of ["params"]
+ }, -- end of ["task"]
+ ["type"] = "Turning Point",
+ ["ETA"] = 96.50677034026,
+ ["ETA_locked"] = false,
+ ["y"] = cvnPos.z,
+ ["x"] = cvnPos.x,
+ ["formation_template"] = "",
+ ["speed_locked"] = true,
+ }, -- end of [1]
+ }, -- end of ["points"]
+ }
+
+--group.units[1].type = "S-3B Tanker"
+group.groupName = "Tanker1"
+group.groupId = nil
+group.units[1].unitId = nil
+group.units[1].unitName = newName
+group.country = country
+group.category = 'AIRPLANE'
+group.units[1].x = cvnPos.x-100
+group.units[1].y = cvnPos.z
+group.units[1].z = cloneGroupPos.y
+group.units[1].heading = 0.000000000001
+group.units[1].speed = 300
+
+--Group.destroy(Group.getByName(groupName))
+mist.dynAdd(group)
+group.groupName = "Tanker2"
+group.units[1].x = cvnPos.x+100
+group.units[1].heading = 3.1415926537
+group.units[1].y = cvnPos.z
+mist.dynAdd(group)
+
+end
+
+
+handler = {}
+
+local function protectedCall(...)
+ local status, retval = pcall(...)
+ if not status then
+
+ end
+end
+
+function tankers.eventHandler (event)
+ if (26 == event.id) then --this is when someone types into a mark
+ local vec3 = mist.utils.makeVec3GL(event.pos)
+ tankers.startEnrouteTankingTest (vec3)
+ end
+end
+
+function handler:onEvent(event)
+ protectedCall(tankers.eventHandler, event)
+end
+
+do
+ --world.addEventHandler(handler)
+ world.addEventHandler(handler)
+end
+
+do
+ longRangeShots = missionCommands.addSubMenu("Dynamic Tanking")
+ missionCommands.addCommand ("Hyperspace entry", longRangeShots, tankers.hyperSpace)
+ missionCommands.addCommand ("Start tanking", longRangeShots, tankers.startEnrouteTankingTest)
+ missionCommands.addCommand ("Frequency change approved", longRangeShots, tankers.setFrequency)
+ missionCommands.addCommand ("Callsign change approved", longRangeShots, tankers.changeCallsign)
+ missionCommands.addCommand ("Tacan change approved", longRangeShots, tankers.setTacan)
+ missionCommands.addCommand ("Start a new tanker", longRangeShots, tankers.newTanker)
+ missionCommands.addCommand ("Rejoin on a unit", longRangeShots, tankers.followInFront)
+ missionCommands.addCommand ("Rejoin close", longRangeShots, tankers.followInFrontClose)
+
+
+end
+
+tankers.notify("tankers.lua loaded",2)
\ No newline at end of file
diff --git a/scripts/forceBubble.lua b/scripts/forceBubble.lua
new file mode 100644
index 00000000..803e887b
--- /dev/null
+++ b/scripts/forceBubble.lua
@@ -0,0 +1,112 @@
+--Spawn a SAM integrated with IADS
+--Spawn a normal SAM
+--SAM bubble shields
+
+forceBub = {}
+forceBub.handler = {}
+forceBub.missileList = {}
+forceBub.missilesActive = 0
+forceBub.shieldOn = false
+
+function forceBub.notify(message, displayFor)
+ trigger.action.outText(message, displayFor, true)
+end
+
+function forceBub.setShield()
+ forceBub.notify("Shield on", 2)
+end
+
+function forceBub.stopShield()
+ forceBub.shieldOn = false
+end
+
+
+
+local function protectedCall(...)
+ local status, retval = pcall(...)
+ if not status then
+ --rf.notify("Caught error " .. retval,2)
+ end
+end
+
+function forceBub.handler:onEvent(event)
+ protectedCall(forceBub.eventHandler, event)
+end
+
+function forceBub.checkMissiles ()
+ local currentTime = timer.getTime()
+ if forceBub.missilesActive > 0 then
+ for index, data in pairs(forceBub.missileList) do
+ output = mist.utils.tableShow(forceBub.missileList[index])
+ if forceBub.missileList[index].exists == true then
+ if Object.isExist(forceBub.missileList[index].weapon) == true then
+ forceBub.missileList[index].pos = forceBub.missileList[index].weapon:getPosition()
+
+
+ local missilePosition = forceBub.missileList[index].pos.p
+
+ unit = Unit.getByName("Test")
+ local unitPosition = unit:getPosition().p
+
+ local distance = mist.utils.get3DDist(unitPosition , missilePosition )
+ forceBub.notify(distance,1)
+
+ if forceBub.shieldOn == true and distance < 100 then --this distance is the sweet spot any less and you probably take damage and die, less than 75 death
+
+ trigger.action.explosion(missilePosition , 1) --just blows up the missile
+
+ end
+
+
+ else
+ forceBub.missileList[index] = nil
+ forceBub.missilesActive = forceBub.missilesActive - 1
+ end
+ else
+ end
+
+ end
+ end
+ timer.scheduleFunction(forceBub.checkMisProtectCall,{},currentTime + 0.01)
+end
+
+
+
+function forceBub.eventHandler (event)
+ --forceBub.notify(mist.utils.tableShow(event),10)
+ if (event.id == 1) then
+ --check if weapon is a missile
+ --rf.notify("Missile fired id " .. event.weapon.id_ ,2)
+ forceBub.notify(mist.utils.tableShow(Weapon.getDesc(event.weapon)),10)
+ if Weapon.getDesc(event.weapon).missileCategory == 2 then
+ local newMis = {}
+ newMis.id = event.weapon.id_
+ newMis.pos = event.weapon:getPosition()
+ newMis.weapon = event.weapon
+ newMis.exists = Object.isExist(newMis.weapon)
+ forceBub.missileList[event.weapon.id_] = newMis
+ forceBub.missilesActive = forceBub.missilesActive + 1
+ end
+ end
+end
+
+function forceBub.checkMisProtectCall()
+ protectedCall(forceBub.checkMissiles,{})
+end
+
+function forceBub.setShield()
+ forceBub.shieldOn = true
+end
+
+do
+ forceField = missionCommands.addSubMenu("Force Field")
+ missionCommands.addCommand ("Forcefield on", forceField, forceBub.setShield)
+ missionCommands.addCommand ("Stop Field", forceField, forceBub.stopShield)
+end
+
+do
+ world.addEventHandler(forceBub.handler)
+end
+
+protectedCall(forceBub.checkMissiles,{})
+forceBub.notify("forceBubble.lua loaded", 2)
\ No newline at end of file
diff --git a/scripts/laserDiscoDiscoLaser.lua b/scripts/laserDiscoDiscoLaser.lua
new file mode 100644
index 00000000..f6b2ffde
--- /dev/null
+++ b/scripts/laserDiscoDiscoLaser.lua
@@ -0,0 +1,21 @@
+lddl = {}
+lddl.refreshRate = 1
+
+
+
+
+function lddl.pointer ()
+ origin = Unit.getByName("Laser")
+ originPos = origin:getPosition().p
+ targetPos = Unit.getByName("LaserTGT"):getPosition().p
+ laser = Spot.createInfraRed(origin , originPos, targetPos)
+ timer.scheduleFunction(lddl.removePointer,laser, timer.getTime() + lddl.refreshRate)
+
+end
+
+function lddl.removePointer(laser)
+ Spot.destroy(laser)
+ timer.scheduleFunction(lddl.pointer,{}, timer.getTime() + lddl.refreshRate)
+end
+
+lddl.pointer ()
\ No newline at end of file
diff --git a/scripts/mist_4_4_90.lua b/scripts/mist.lua
similarity index 73%
rename from scripts/mist_4_4_90.lua
rename to scripts/mist.lua
index fbf4f6ac..431848d8 100644
--- a/scripts/mist_4_4_90.lua
+++ b/scripts/mist.lua
@@ -34,17 +34,19 @@ mist = {}
-- don't change these
mist.majorVersion = 4
-mist.minorVersion = 4
-mist.build = 90
+mist.minorVersion = 5
+mist.build = 107
-- forward declaration of log shorthand
local log
-
+local dbLog
+
local mistSettings = {
errorPopup = false, -- errors printed by mist logger will create popup warning you
warnPopup = false,
infoPopup = false,
logLevel = 'warn',
+ dbLog = 'warn',
}
do -- the main scope
@@ -73,11 +75,11 @@ do -- the main scope
mist.nextGroupId = 1
mist.nextUnitId = 1
- local dbLog
+
local function initDBs() -- mist.DBs scope
mist.DBs = {}
-
+ mist.DBs.markList = {}
mist.DBs.missionData = {}
if env.mission then
@@ -106,6 +108,25 @@ do -- the main scope
zone.point.x = zone_data.x
zone.point.y = 0
zone.point.z = zone_data.y
+ zone.properties = {}
+ if zone_data.properties then
+ for propInd, prop in pairs(zone_data.properties) do
+ if prop.value and type(prop.value) == 'string' and prop.value ~= "" then
+ zone.properties[prop.key] = prop.value
+ end
+ end
+ end
+ if zone.verticies then -- trust but verify
+ local r = 0
+ for i = 1, #zone.verticies do
+ local dist = mist.utils.get2DDist(zone.point, zone.verticies[i])
+ if dist > r then
+ r = mist.utils.deepCopy(dist)
+ end
+ end
+ zone.radius = r
+
+ end
mist.DBs.zonesByName[zone_data.name] = zone
mist.DBs.zonesByNum[#mist.DBs.zonesByNum + 1] = mist.utils.deepCopy(zone) --[[deepcopy so that the zone in zones_by_name and the zone in
@@ -113,6 +134,85 @@ do -- the main scope
end
end
end
+
+ mist.DBs.drawingByName = {}
+ mist.DBs.drawingIndexed = {}
+
+ if env.mission.drawings and env.mission.drawings.layers then
+ for i = 1, #env.mission.drawings.layers do
+ local l = env.mission.drawings.layers[i]
+
+ for j = 1, #l.objects do
+ local copy = mist.utils.deepCopy(l.objects[j])
+ --log:warn(copy)
+ local doOffset = false
+ copy.layer = l.name
+
+ local theta = copy.angle or 0
+ theta = math.rad(theta)
+ if copy.primitiveType == "Polygon" then
+
+ if copy.polygonMode == 'rect' then
+ local h, w = copy.height, copy.width
+ copy.points = {}
+ copy.points[1] = {x = h/2, y = w/2}
+ copy.points[2] = {x = -h/2, y = w/2}
+ copy.points[3] = {x = -h/2, y = -w/2}
+ copy.points[4] = {x = h/2, y = -w/2}
+ doOffset = true
+ elseif copy.polygonMode == "circle" then
+ copy.points = {x = copy.mapX, y = copy.mapY}
+ elseif copy.polygonMode == 'oval' then
+ copy.points = {}
+ local numPoints = 24
+ local angleStep = (math.pi*2)/numPoints
+ doOffset = true
+ for v = 1, numPoints do
+ local pointAngle = v * angleStep
+ local x = copy.r1 * math.cos(pointAngle)
+ local y = copy.r2 * math.sin(pointAngle)
+
+ table.insert(copy.points,{x=x,y=y})
+
+ end
+ elseif copy.polygonMode == "arrow" then
+ doOffset = true
+ end
+
+
+ if theta ~= 0 and copy.points and doOffset == true then
+
+ --log:warn('offsetting Values')
+ for p = 1, #copy.points do
+ local offset = mist.vec.rotateVec2(copy.points[p], theta)
+ copy.points[p] = offset
+ end
+ --log:warn(copy.points[1])
+ end
+
+ elseif copy.primitiveType == "Line" and copy.closed == true then
+ table.insert(copy.points, mist.utils.deepCopy(copy.points[1]))
+ end
+ if copy.points and #copy.points > 1 then
+ for u = 1, #copy.points do
+ copy.points[u].x = mist.utils.round(copy.points[u].x + copy.mapX, 2)
+ copy.points[u].y = mist.utils.round(copy.points[u].y + copy.mapY, 2)
+ end
+
+ end
+ if mist.DBs.drawingByName[copy.name] then
+ log:warn("Drawing by the name of [ $1 ] already exists in DB. Failed to add to mist.DBs.drawingByName.", copy.name)
+ else
+
+ mist.DBs.drawingByName[copy.name] = copy
+ end
+ table.insert(mist.DBs.drawingIndexed, copy)
+ end
+
+ end
+
+ end
+
mist.DBs.navPoints = {}
mist.DBs.units = {}
@@ -151,28 +251,31 @@ do -- the main scope
for cntry_id, cntry_data in pairs(coa_data.country) do
local countryName = string.lower(cntry_data.name)
+ if cntry_data.id and country.names[cntry_data.id] then
+ countryName = string.lower(country.names[cntry_data.id])
+ end
mist.DBs.units[coa_name][countryName] = {}
mist.DBs.units[coa_name][countryName].countryId = cntry_data.id
if type(cntry_data) == 'table' then --just making sure
- for obj_type_name, obj_type_data in pairs(cntry_data) do
+ for obj_cat_name, obj_cat_data in pairs(cntry_data) do
- if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then --should be an unncessary check
+ if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then --should be an unncessary check
- local category = obj_type_name
+ local category = obj_cat_name
- if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group!
+ if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group!
mist.DBs.units[coa_name][countryName][category] = {}
- for group_num, group_data in pairs(obj_type_data.group) do
+ for group_num, group_data in pairs(obj_cat_data.group) do
if group_data and group_data.units and type(group_data.units) == 'table' then --making sure again- this is a valid group
mist.DBs.units[coa_name][countryName][category][group_num] = {}
local groupName = group_data.name
- if env.mission.version > 7 then
+ if env.mission.version > 7 and env.mission.version < 19 then
groupName = env.getValueDictByKey(groupName)
end
mist.DBs.units[coa_name][countryName][category][group_num].groupName = groupName
@@ -196,7 +299,7 @@ do -- the main scope
local units_tbl = mist.DBs.units[coa_name][countryName][category][group_num].units --pointer to the units table for this group
units_tbl[unit_num] = {}
- if env.mission.version > 7 then
+ if env.mission.version > 7 and env.mission.version < 19 then
units_tbl[unit_num].unitName = env.getValueDictByKey(unit_data.name)
else
units_tbl[unit_num].unitName = unit_data.name
@@ -240,6 +343,7 @@ do -- the main scope
if category == 'static' then
units_tbl[unit_num].categoryStatic = unit_data.category
units_tbl[unit_num].shape_name = unit_data.shape_name
+ units_tbl[unit_num].linkUnit = unit_data.linkUnit
if unit_data.mass then
units_tbl[unit_num].mass = unit_data.mass
end
@@ -251,10 +355,10 @@ do -- the main scope
end --for unit_num, unit_data in pairs(group_data.units) do
end --if group_data and group_data.units then
- end --for group_num, group_data in pairs(obj_type_data.group) do
- end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then
- end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then
- end --for obj_type_name, obj_type_data in pairs(cntry_data) do
+ end --for group_num, group_data in pairs(obj_cat_data.group) do
+ end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then
+ end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then
+ end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do
end --if type(cntry_data) == 'table' then
end --for cntry_id, cntry_data in pairs(coa_data.country) do
end --if coa_data.country then --there is a country table
@@ -305,6 +409,11 @@ do -- the main scope
['Arco'] = 2,
['Shell'] = 3,
},
+ ['TRANSPORT'] = {
+ ['Heavy'] = 9,
+ ['Trash'] = 10,
+ ['Cargo'] = 11,
+ ['Ascot'] = 12,
['JTAC'] = {
['Axeman'] = 1,
['Darknight'] = 2,
@@ -346,14 +455,105 @@ do -- the main scope
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
- 'A-10C',
+ 'A-10C_2',
+ 'A-10C',
'A-10A',
},
},
- },
- },
- },
- }
+ },
+ ['f16'] = {
+ Viper = 9,
+ Venom = 10,
+ Lobo = 11,
+ Cowboy = 12,
+ Python = 13,
+ Rattler =14,
+ Panther = 15,
+ Wolf = 16,
+ Weasel = 17,
+ Wild = 18,
+ Ninja = 19,
+ Jedi = 20,
+ rules = {
+ ['canUseAircraft'] = true,
+ ['appliesTo'] = {
+ 'F-16C_50',
+ 'F-16C bl.52d',
+ 'F-16C bl.50',
+ 'F-16A MLU',
+ 'F-16A',
+ },
+ },
+
+ },
+ ['f18'] = {
+ ['Hornet'] = 9,
+ ['Squid'] = 10,
+ ['Ragin'] = 11,
+ ['Roman'] = 12,
+ Sting = 13,
+ Jury =14,
+ Jokey = 15,
+ Ram = 16,
+ Hawk = 17,
+ Devil = 18,
+ Check = 19,
+ Snake = 20,
+ ['rules'] = {
+ ['canUseAircraft'] = true,
+ ['appliesTo'] = {
+
+ "FA-18C_hornet",
+ 'F/A-18C',
+ },
+ },
+ },
+ ['b1'] = {
+ ['Bone'] = 9,
+ ['Dark'] = 10,
+ ['Vader'] = 11,
+ ['rules'] = {
+ ['canUseAircraft'] = true,
+ ['appliesTo'] = {
+ 'B-1B',
+ },
+ },
+ },
+ ['b52'] = {
+ ['Buff'] = 9,
+ ['Dump'] = 10,
+ ['Kenworth'] = 11,
+ ['rules'] = {
+ ['canUseAircraft'] = true,
+ ['appliesTo'] = {
+ 'B-52H',
+ },
+ },
+ },
+ ['f15e'] = {
+ ['Dude'] = 9,
+ ['Thud'] = 10,
+ ['Gunny'] = 11,
+ ['Trek'] = 12,
+ Sniper = 13,
+ Sled =14,
+ Best = 15,
+ Jazz = 16,
+ Rage = 17,
+ Tahoe = 18,
+ ['rules'] = {
+ ['canUseAircraft'] = true,
+ ['appliesTo'] = {
+ 'F-15E',
+ --'F-15ERAZBAM',
+ },
+ },
+ },
+
+ },
+ },
+ },
+ }
mist.DBs.const.shapeNames = {
["Landmine"] = "landmine",
["FARP CP Blindage"] = "kp_ug",
@@ -443,6 +643,42 @@ do -- the main scope
["Small house 1A area"] = "domik1a-all",
["White_Flag"] = "H-Flag_W",
["Airshow_Cone"] = "Comp_cone",
+ ["Bulk Cargo Ship Ivanov"] = "barge-1",
+ ["Bulk Cargo Ship Yakushev"] = "barge-2",
+ ["Outpost"]="block",
+ ["Road outpost"]="block-onroad",
+ ["Container camo"] = "bw_container_cargo",
+ ["Tech Hangar A"] = "ceh_ang_a",
+ ["Bunker 1"] = "dot",
+ ["Bunker 2"] = "dot2",
+ ["Tanker Elnya 160"] = "elnya",
+ ["F-shape barrier"] = "f_bar_cargo",
+ ["Helipad Single"] = "farp",
+ ["FARP"] = "farps",
+ ["Fueltank"] = "fueltank_cargo",
+ ["Gate"] = "gate",
+ ["FARP Fuel Depot"] = "gsm rus",
+ ["Armed house"] = "home1_a",
+ ["FARP Command Post"] = "kp-ug",
+ ["Watch Tower Armed"] = "ohr-vyshka",
+ ["Oiltank"] = "oiltank_cargo",
+ ["Pipes small"] = "pipes_small_cargo",
+ ["Pipes big"] = "pipes_big_cargo",
+ ["Oil platform"] = "plavbaza",
+ ["Tetrapod"] = "tetrapod_cargo",
+ ["Fuel tank"] = "toplivo",
+ ["Trunks long"] = "trunks_long_cargo",
+ ["Trunks small"] = "trunks_small_cargo",
+ ["Passenger liner"] = "yastrebow",
+ ["Passenger boat"] = "zwezdny",
+ ["Oil rig"] = "oil_platform",
+ ["Gas platform"] = "gas_platform",
+ ["Container 20ft"] = "container_20ft",
+ ["Container 40ft"] = "container_40ft",
+ ["Downed pilot"] = "cadaver",
+ ["Parachute"] = "parash",
+ ["Pilot F15 Parachute"] = "pilot_f15_parachute",
+ ["Pilot standing"] = "pilot_parashut",
}
@@ -504,8 +740,8 @@ do -- the main scope
mist.DBs.MEgroupsById = mist.utils.deepCopy(mist.DBs.groupsById)
mist.DBs.deadObjects = {}
-
- do
+
+ do
local mt = {}
function mt.__newindex(t, key, val)
@@ -649,9 +885,14 @@ do -- the main scope
newTable.category = 'static'
else
unitOneRef = newObject:getUnits()
- newTable.countryId = tonumber(unitOneRef[1]:getCountry())
- newTable.coalitionId = tonumber(unitOneRef[1]:getCoalition())
- newTable.category = tonumber(newObject:getCategory())
+ if #unitOneRef > 0 and unitOneRef[1] and type(unitOneRef[1]) == 'table' then
+ newTable.countryId = tonumber(unitOneRef[1]:getCountry())
+ newTable.coalitionId = tonumber(unitOneRef[1]:getCoalition())
+ newTable.category = tonumber(newObject:getCategory())
+ else
+ log:warn('getUnits failed to return on $1 ; Built Data: $2.', event, newTable)
+ return false
+ end
end
for countryData, countryId in pairs(country.id) do
if newTable.country and string.upper(countryData) == string.upper(newTable.country) or countryId == newTable.countryId then
@@ -782,6 +1023,8 @@ do -- the main scope
newTable.units[1].canCargo = data.canCargo
newTable.units[1].categoryStatic = data.categoryStatic
newTable.units[1].type = data.type
+ newTable.units[1].linkUnit = data.linkUnit
+
mistAddedObjects[index] = nil
break
end
@@ -818,6 +1061,7 @@ do -- the main scope
--dbLog:info('iterate')
for name, gData in pairs(tempSpawnedGroups) do
--env.info(name)
+ --dbLog:info(gData)
local updated = false
local stillExists = false
if not gData.checked then
@@ -825,9 +1069,9 @@ do -- the main scope
local _g = gData.gp or Group.getByName(name)
if mist.DBs.groupsByName[name] then
-- first check group level properties, groupId, countryId, coalition
- -- dbLog:info('Found in DBs, check if updated')
+ --dbLog:info('Found in DBs, check if updated')
local dbTable = mist.DBs.groupsByName[name]
- -- dbLog:info(dbTable)
+ --dbLog:info(dbTable)
if gData.type ~= 'static' then
-- dbLog:info('Not static')
@@ -848,11 +1092,11 @@ do -- the main scope
end
--dbLog:info('Updated: $1', updated)
if updated == false and gData.type ~= 'static' then -- time to check units
- --dbLog:info('No Group Mismatch, Check Units')
+ --dbLog:info('No Group Mismatch, Check Units')
if _g and _g:isExist() == true then
stillExists = true
for index, uObject in pairs(_g:getUnits()) do
- --dbLog:info(index)
+ --dbLog:info(index)
if mist.DBs.unitsByName[uObject:getName()] then
--dbLog:info('UnitByName table exists')
local uTable = mist.DBs.unitsByName[uObject:getName()]
@@ -870,8 +1114,10 @@ do -- the main scope
if stillExists == true and (updated == true or not mist.DBs.groupsByName[name]) then
--dbLog:info('Get Table')
- writeGroups[#writeGroups+1] = {data = dbUpdate(name, gData.type), isUpdated = updated}
-
+ local dbData = dbUpdate(name, gData.type)
+ if dbData and type(dbData) == 'table' then
+ writeGroups[#writeGroups+1] = {data = dbData, isUpdated = updated}
+ end
end
-- Work done, so remove
end
@@ -998,19 +1244,20 @@ do -- the main scope
local function groupSpawned(event)
-- dont need to add units spawned in at the start of the mission if mist is loaded in init line
if event.id == world.event.S_EVENT_BIRTH and timer.getTime0() < timer.getAbsTime() then
- --dbLog:info('unitSpawnEvent')
-
+ --log:info('unitSpawnEvent')
+ --log:info(event)
+ --log:info(event.initiator:getTypeName())
--table.insert(tempSpawnedUnits,(event.initiator))
-------
-- New functionality below.
-------
if Object.getCategory(event.initiator) == 1 and not Unit.getPlayerName(event.initiator) then -- simple player check, will need to later check to see if unit was spawned with a player in a flight
- --dbLog:info('Object is a Unit')
+ --log:info('Object is a Unit')
if Unit.getGroup(event.initiator) then
- --dbLog:info(Unit.getGroup(event.initiator):getName())
+ -- log:info(Unit.getGroup(event.initiator):getName())
local g = Unit.getGroup(event.initiator)
if not tempSpawnedGroups[g:getName()] then
- --dbLog:info('added')
+ --log:info('added')
tempSpawnedGroups[g:getName()] = {type = 'group', gp = g}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end
@@ -1018,7 +1265,7 @@ do -- the main scope
log:error('Group not accessible by unit in event handler. This is a DCS bug')
end
elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then
- --dbLog:info('Object is Static')
+ --log:info('Object is Static')
tempSpawnedGroups[StaticObject.getName(event.initiator)] = {type = 'static'}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end
@@ -1169,10 +1416,13 @@ do -- the main scope
for i = 1, #st do
local s = st[i]
if StaticObject.isExist(s) then
- if not mist.DBs.unitsByName[s:getName()] then
- --env.info(StaticObject.getID(s) .. ' Not found in DB yet')
- tempSpawnedGroups[s:getName()] = {type = 'static'}
- tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
+ local name = s:getName()
+ if not mist.DBs.unitsByName[name] then
+ dbLog:warn('$1 Not found in DB yet. ID: $2', name, StaticObject.getID(s))
+ if string.len(name) > 0 then -- because in this mission someone sent the name was returning as an empty string. Gotta be careful.
+ tempSpawnedGroups[s:getName()] = {type = 'static'}
+ tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
+ end
end
end
end
@@ -1180,6 +1430,7 @@ do -- the main scope
end
end
+
--- init function.
-- creates logger, adds default event handler
@@ -1284,8 +1535,9 @@ do -- the main scope
--- Spawns a static object to the game world.
-- @todo write good docs
-- @tparam table staticObj table containing data needed for the object creation
- function mist.dynAddStatic(newObj)
- log:info(newObj)
+ function mist.dynAddStatic(n)
+ --log:info(newObj)
+ local newObj = mist.utils.deepCopy(n)
if newObj.units and newObj.units[1] then -- if its mist format
for entry, val in pairs(newObj.units[1]) do
if newObj[entry] and newObj[entry] ~= val or not newObj[entry] then
@@ -1366,7 +1618,7 @@ do -- the main scope
mistAddedObjects[#mistAddedObjects + 1] = mist.utils.deepCopy(newObj)
if newObj.x and newObj.y and newObj.type and type(newObj.x) == 'number' and type(newObj.y) == 'number' and type(newObj.type) == 'string' then
- log:info(newObj)
+ --log:warn(newObj)
coalition.addStaticObject(country.id[newCountry], newObj)
return newObj
@@ -1379,8 +1631,10 @@ do -- the main scope
-- Same as coalition.add function in SSE. checks the passed data to see if its valid.
-- Will generate groupId, groupName, unitId, and unitName if needed
-- @tparam table newGroup table containting values needed for spawning a group.
- function mist.dynAdd(newGroup)
-
+ function mist.dynAdd(ng)
+
+ local newGroup = mist.utils.deepCopy(ng)
+ --log:warn(newGroup)
--mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupOrig.lua')
local cntry = newGroup.country
if newGroup.countryId then
@@ -1452,7 +1706,11 @@ do -- the main scope
end
if newGroup.clone and mist.DBs.groupsByName[newGroup.name] or not newGroup.name then
- newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName])
+ --if newGroup.baseName then
+ -- idea of later. So custmozed naming can be created
+ -- else
+ newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName])
+ --end
end
if not newGroup.hidden then
@@ -1537,16 +1795,32 @@ do -- the main scope
end
end
else -- if aircraft and no route assigned. make a quick and stupid route so AI doesnt RTB immediately
- if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then
+ --if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then
newGroup.route = {}
newGroup.route.points = {}
newGroup.route.points[1] = {}
- end
+ --end
end
newGroup.country = newCountry
-
- --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroup.lua')
+ -- update and verify any self tasks
+ if newGroup.route and newGroup.route.points then
+ for i, pData in pairs(newGroup.route.points) do
+ if pData.task and pData.task.params and pData.task.params.tasks and #pData.task.params.tasks > 0 then
+ for tIndex, tData in pairs(pData.task.params.tasks) do
+ if tData.params and tData.params.action then
+ if tData.params.action.id == "EPLRS" then
+ tData.params.action.params.groupId = newGroup.groupId
+ elseif tData.params.action.id == "ActivateBeacon" or tData.params.action.id == "ActivateICLS" then
+ tData.params.action.params.unitId = newGroup.units[1].unitId
+ end
+ end
+ end
+ end
+
+ end
+ end
+ --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupPushedToAddGroup.lua')
--log:warn(newGroup)
-- sanitize table
newGroup.groupName = nil
@@ -1559,7 +1833,7 @@ do -- the main scope
for unitIndex, unitData in pairs(newGroup.units) do
newGroup.units[unitIndex].unitName = nil
end
-
+
coalition.addGroup(country.id[newCountry], Unit.Category[newCat], newGroup)
return newGroup
@@ -1816,10 +2090,10 @@ do
if type(coa_data) == 'table' then
if coa_data.country then --there is a country table
for cntry_id, cntry_data in pairs(coa_data.country) do
- for obj_type_name, obj_type_data in pairs(cntry_data) do
- if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points
- if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group!
- for group_num, group_data in pairs(obj_type_data.group) do
+ for obj_cat_name, obj_cat_data in pairs(cntry_data) do
+ if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points
+ if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group!
+ for group_num, group_data in pairs(obj_cat_data.group) do
if group_data and group_data.groupId == gpId then -- this is the group we are looking for
if group_data.route and group_data.route.points and #group_data.route.points > 0 then
local points = {}
@@ -1834,10 +2108,10 @@ do
end
return
end --if group_data and group_data.name and group_data.name == 'groupname'
- end --for group_num, group_data in pairs(obj_type_data.group) do
- end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then
- end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then
- end --for obj_type_name, obj_type_data in pairs(cntry_data) do
+ end --for group_num, group_data in pairs(obj_cat_data.group) do
+ end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then
+ end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then
+ end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do
end --for cntry_id, cntry_data in pairs(coa_data.country) do
end --if coa_data.country then --there is a country table
end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then
@@ -2214,9 +2488,25 @@ do
--- Returns a table containing unit names.
-- @tparam table tbl sequential strings
-- @treturn table @{UnitNameTable}
- function mist.makeUnitTable(tbl)
+ function mist.makeUnitTable(tbl, exclude)
--Assumption: will be passed a table of strings, sequential
--log:info(tbl)
+
+
+ local excludeType = {}
+ if exclude then
+ if type(exclude) == 'table' then
+ for x, y in pairs(exclude) do
+ excludeType[x] = true
+ excludeType[y] = true
+ end
+ else
+ excludeType[exclude] = true
+ end
+
+ end
+
+
local units_by_name = {}
local l_munits = mist.DBs.units --local reference for faster execution
@@ -2277,12 +2567,15 @@ do
elseif unit:sub(4,12) == '[vehicle]' then
category = 'vehicle'
country_start = 13
+ elseif unit:sub(4, 11) == '[static]' then
+ category = 'static'
+ country_start = 12
end
for coa, coa_tbl in pairs(l_munits) do
for country, country_table in pairs(coa_tbl) do
if country == string.lower(unit:sub(country_start)) then -- match
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2310,12 +2603,15 @@ do
elseif unit:sub(5,13) == '[vehicle]' then
category = 'vehicle'
country_start = 14
+ elseif unit:sub(5, 12) == '[static]' then
+ category = 'static'
+ country_start = 13
end
for coa, coa_tbl in pairs(l_munits) do
for country, country_table in pairs(coa_tbl) do
if country == string.lower(unit:sub(country_start)) then -- match
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2340,12 +2636,14 @@ do
category = 'ship'
elseif unit:sub(7) == '[vehicle]' then
category = 'vehicle'
- end
+ elseif unit:sub(7) == '[static]' then
+ category = 'static'
+ end
for coa, coa_tbl in pairs(l_munits) do
if coa == 'blue' then
for country, country_table in pairs(coa_tbl) do
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2368,12 +2666,14 @@ do
category = 'ship'
elseif unit:sub(8) == '[vehicle]' then
category = 'vehicle'
+ elseif unit:sub(8) == '[static]' then
+ category = 'static'
end
for coa, coa_tbl in pairs(l_munits) do
if coa == 'blue' then
for country, country_table in pairs(coa_tbl) do
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2398,12 +2698,14 @@ do
category = 'ship'
elseif unit:sub(6) == '[vehicle]' then
category = 'vehicle'
+ elseif unit:sub(6) == '[static]' then
+ category = 'static'
end
for coa, coa_tbl in pairs(l_munits) do
if coa == 'red' then
for country, country_table in pairs(coa_tbl) do
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2426,12 +2728,14 @@ do
category = 'ship'
elseif unit:sub(7) == '[vehicle]' then
category = 'vehicle'
+ elseif unit:sub(7) == '[static]' then
+ category = 'static'
end
for coa, coa_tbl in pairs(l_munits) do
if coa == 'red' then
for country, country_table in pairs(coa_tbl) do
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2456,11 +2760,13 @@ do
category = 'ship'
elseif unit:sub(6) == '[vehicle]' then
category = 'vehicle'
+ elseif unit:sub(6) == '[static]' then
+ category = 'static'
end
for coa, coa_tbl in pairs(l_munits) do
for country, country_table in pairs(coa_tbl) do
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2482,11 +2788,13 @@ do
category = 'ship'
elseif unit:sub(7) == '[vehicle]' then
category = 'vehicle'
+ elseif unit:sub(7) == '[static]' then
+ category = 'static'
end
for coa, coa_tbl in pairs(l_munits) do
for country, country_table in pairs(coa_tbl) do
for unit_type, unit_type_tbl in pairs(country_table) do
- if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then
+ if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then
for group_ind, group_tbl in pairs(unit_type_tbl) do
if type(group_tbl) == 'table' then
for unit_ind, unit in pairs(group_tbl.units) do
@@ -2517,6 +2825,126 @@ do
return units_tbl
end
+function mist.getUnitsByAttribute(att, rnum, id)
+ local cEntry = {}
+ cEntry.typeName = att.type or att.typeName or att.typename
+ cEntry.country = att.country
+ cEntry.coalition = att.coalition
+ cEntry.skill = att.skill
+ cEntry.categry = att.category
+
+ local num = rnum or 1
+
+ if cEntry.skill == 'human' then
+ cEntry.skill = {'Client', 'Player'}
+ end
+
+
+ local checkedVal = {}
+ local units = {}
+ for uName, uData in pairs(mist.DBs.unitsByName) do
+ local matched = 0
+ for cName, cVal in pairs(cEntry) do
+ if type(cVal) == 'table' then
+ for sName, sVal in pairs(cVal) do
+ if (uData[cName] and uData[cName] == sVal) or (uData[cName] and uData[cName] == sName) then
+ matched = matched + 1
+ end
+ end
+ else
+ if uData[cName] and uData[cName] == cVal then
+ matched = matched + 1
+ end
+ end
+ end
+ if matched >= num then
+ if id then
+ units[uData.unitId] = true
+ else
+
+ units[uName] = true
+ end
+ end
+ end
+
+ local rtn = {}
+ for name, _ in pairs(units) do
+ table.insert(rtn, name)
+ end
+ return rtn
+
+end
+
+function mist.getGroupsByAttribute(att, rnum, id)
+ local cEntry = {}
+ cEntry.typeName = att.type or att.typeName or att.typename
+ cEntry.country = att.country
+ cEntry.coalition = att.coalition
+ cEntry.skill = att.skill
+ cEntry.categry = att.category
+
+ local num = rnum or 1
+
+ if cEntry.skill == 'human' then
+ cEntry.skill = {'Client', 'Player'}
+ end
+ local groups = {}
+ for gName, gData in pairs(mist.DBs.groupsByName) do
+ local matched = 0
+ for cName, cVal in pairs(cEntry) do
+ if type(cVal) == 'table' then
+ for sName, sVal in pairs(cVal) do
+ if cName == 'skill' or cName == 'typeName' then
+ local lMatch = 0
+ for uId, uData in pairs(gData.units) do
+ if (uData[cName] and uData[cName] == sVal) or (gData[cName] and gData[cName] == sName) then
+ lMatch = lMatch + 1
+ break
+ end
+ end
+ if lMatch > 0 then
+ matched = matched + 1
+ end
+ end
+ if (gData[cName] and gData[cName] == sVal) or (gData[cName] and gData[cName] == sName) then
+ matched = matched + 1
+ break
+ end
+ end
+ else
+ if cName == 'skill' or cName == 'typeName' then
+ local lMatch = 0
+ for uId, uData in pairs(gData.units) do
+ if (uData[cName] and uData[cName] == sVal) then
+ lMatch = lMatch + 1
+ break
+ end
+ end
+ if lMatch > 0 then
+ matched = matched + 1
+ end
+ end
+ if gData[cName] and gData[cName] == cVal then
+ matched = matched + 1
+ end
+ end
+ end
+ if matched >= num then
+ if id then
+ groups[gData.groupid] = true
+ else
+ groups[gName] = true
+ end
+ end
+ end
+ local rtn = {}
+ for name, _ in pairs(groups) do
+ table.insert(rtn, name)
+ end
+ return rtn
+
+end
+
function mist.getDeadMapObjsInZones(zone_names)
-- zone_names: table of zone names
-- returns: table of dead map objects (indexed numerically)
@@ -2552,6 +2980,160 @@ function mist.getDeadMapObjsInPolygonZone(zone)
end
return map_objs
end
+mist.shape = {}
+function mist.shape.insideShape(shape1, shape2, full)
+ if shape1.radius then -- probably a circle
+ if shape2.radius then
+ return mist.shape.circleInCircle(shape1, shape2, full)
+ elseif shape2[1] then
+ return mist.shape.circleInPoly(shape1, shape2, full)
+ end
+
+ elseif shape1[1] then -- shape1 is probably a polygon
+ if shape2.radius then
+ return mist.shape.polyInCircle(shape1, shape2, full)
+ elseif shape2[1] then
+ return mist.shape.polyInPoly(shape1, shape2, full)
+ end
+ end
+ return false
+end
+
+function mist.shape.circleInCircle(c1, c2, full)
+ if not full then -- quick partial check
+ if mist.utils.get2DDist(c1.point, c2.point) <= c2.radius then
+ return true
+ end
+ end
+ local theta = mist.utils.getHeadingPoints(c2.point, c1.point) -- heading from
+ if full then
+ return mist.utils.get2DDist(mist.projectPoint(c1.point, c1.radius, theta), c2.point) <= c2.radius
+ else
+ return mist.utils.get2DDist(mist.projectPoint(c1.point, c1.radius, theta + math.pi), c2.point) <= c2.radius
+ end
+ return false
+end
+
+
+function mist.shape.circleInPoly(circle, poly, full)
+
+ if poly and type(poly) == 'table' and circle and type(circle) == 'table' and circle.radius and circle.point then
+ if not full then
+ for i = 1, #poly do
+ if mist.utils.get2DDist(circle.point, poly[i]) <= circle.radius then
+ return true
+ end
+ end
+ end
+ -- no point is inside of the zone, now check if any part is
+ local count = 0
+ for i = 1, #poly do
+ local theta -- heading of each set of points
+ if i == #poly then
+ theta = mist.utils.getHeadingPoints(poly[i],poly[1])
+ else
+ theta = mist.utils.getHeadingPoints(poly[i],poly[i+1])
+ end
+ -- offset
+ local pPoint = mist.projectPoint(circle.point, circle.radius, theta - (math.pi/180))
+ local oPoint = mist.projectPoint(circle.point, circle.radius, theta + (math.pi/180))
+
+
+ if mist.pointInPolygon(pPoint, poly) == true then
+ if (full and mist.pointInPolygon(oPoint, poly) == true) or not full then
+ return true
+
+ end
+
+ end
+ end
+
+ end
+ return false
+end
+
+
+function mist.shape.polyInPoly(p1, p2, full)
+ local count = 0
+ for i = 1, #p1 do
+
+ if mist.pointInPolygon(p1[i], p2) then
+ count = count + 1
+ end
+ if (not full) and count > 0 then
+ return true
+ end
+ end
+ if count == #p1 then
+ return true
+ end
+
+ return false
+end
+
+function mist.shape.polyInCircle(poly, circle, full)
+ local count = 0
+ for i = 1, #poly do
+ if mist.utils.get2DDist(circle.point, poly[i]) <= circle.radius then
+ if full then
+ count = count + 1
+ else
+ return true
+ end
+ end
+ end
+ if count == #poly then
+ return true
+ end
+
+ return false
+end
+
+function mist.shape.getPointOnSegment(point, seg, isSeg)
+ local p = mist.utils.makeVec2(point)
+ local s1 = mist.utils.makeVec2(seg[1])
+ local s2 = mist.utils.makeVec2(seg[2])
+
+
+ local cx, cy = p.x - s1.x, p.y - s1.y
+ local dx, dy = s2.x - s1.x, s2.x - s1.y
+ local d = (dx*dx + dy*dy)
+
+ if d == 0 then
+ return {x = s1.x, y = s1.y}
+ end
+ local u = (cx*dx + cy*dy)/d
+ if isSeg then
+ if u < 0 then
+ u = 0
+ elseif u > 1 then
+ u = 1
+ end
+ end
+ return {x = s1.x + u*dx, y = s1.y + u*dy}
+end
+
+
+function mist.shape.segmentIntersect(segA, segB)
+ local dx1, dy1 = segA[2].x - segA[1].x, segA[2] - segA[1].y
+ local dx2, dy2 = segB[2].x - segB[1].x, segB[2] - segB[1].y
+ local dx3, dy3 = segA[1].x - segB[1].x, segA[1].y - segB[1].y
+ local d = dx1*dy2 - dy1*dx2
+ if d == 0 then
+ return false
+ end
+ local t1 = (dx2*dy3 - dy2*dx3)/d
+ if t1 < 0 or t1 > 1 then
+ return false
+ end
+ local t2 = (dx1*dy3 - dy1*dx3)/d
+ if t2 < 0 or t2 > 1 then
+ return false
+ end
+ -- point of intersection
+ return true, segA[1].x + t1*dx1, segA[1].y + t1*dy1
+end
+
function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. Code from http://softsurfer.com/Archive/algorithm_0103/algorithm_0103.htm
--[[local type_tbl = {
@@ -2591,17 +3173,23 @@ function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon.
end
end
+function mist.mapValue(val, inMin, inMax, outMin, outMax)
+ return (val - inMin) * (outMax - outMin) / (inMax - inMin) + outMin
+end
+
function mist.getUnitsInPolygon(unit_names, polyZone, max_alt)
local units = {}
for i = 1, #unit_names do
- units[#units + 1] = Unit.getByName(unit_names[i])
+ units[#units + 1] = Unit.getByName(unit_names[i]) or StaticObject.getByName(unit_names[i])
end
local inZoneUnits = {}
for i =1, #units do
- if units[i]:isActive() and mist.pointInPolygon(units[i]:getPosition().p, polyZone, max_alt) then
- inZoneUnits[#inZoneUnits + 1] = units[i]
+ local lUnit = units[i]
+ local lCat = lUnit:getCategory()
+ if ((lCat == 1 and lUnit:isActive()) or lCat ~= 1) and mist.pointInPolygon(lUnit:getPosition().p, polyZone, max_alt) then
+ inZoneUnits[#inZoneUnits + 1] = lUnit
end
end
@@ -2609,8 +3197,7 @@ function mist.getUnitsInPolygon(unit_names, polyZone, max_alt)
end
function mist.getUnitsInZones(unit_names, zone_names, zone_type)
-
- zone_type = zone_type or 'cylinder'
+ zone_type = zone_type or 'cylinder'
if zone_type == 'c' or zone_type == 'cylindrical' or zone_type == 'C' then
zone_type = 'cylinder'
end
@@ -2622,9 +3209,13 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type)
local units = {}
local zones = {}
-
+
+ if zone_names and type(zone_names) == 'string' then
+ zone_names = {zone_names}
+ end
for k = 1, #unit_names do
- local unit = Unit.getByName(unit_names[k])
+
+ local unit = Unit.getByName(unit_names[k]) or StaticObject.getByName(unit_names[k])
if unit then
units[#units + 1] = unit
end
@@ -2632,31 +3223,40 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type)
for k = 1, #zone_names do
- local zone = trigger.misc.getZone(zone_names[k])
+ local zone = mist.DBs.zonesByName[zone_names[k]]
if zone then
- zones[#zones + 1] = {radius = zone.radius, x = zone.point.x, y = zone.point.y, z = zone.point.z}
+ zones[#zones + 1] = {radius = zone.radius, x = zone.point.x, y = zone.point.y, z = zone.point.z, verts = zone.verticies}
end
end
local in_zone_units = {}
-
for units_ind = 1, #units do
- for zones_ind = 1, #zones do
+ local lUnit = units[units_ind]
+ local unit_pos = lUnit:getPosition().p
+ local lCat = lUnit:getCategory()
+ for zones_ind = 1, #zones do
if zone_type == 'sphere' then --add land height value for sphere zone type
local alt = land.getHeight({x = zones[zones_ind].x, y = zones[zones_ind].z})
if alt then
zones[zones_ind].y = alt
end
end
- local unit_pos = units[units_ind]:getPosition().p
- if unit_pos and units[units_ind]:isActive() == true then
- if zone_type == 'cylinder' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then
- in_zone_units[#in_zone_units + 1] = units[units_ind]
- break
- elseif zone_type == 'sphere' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.y - zones[zones_ind].y)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then
- in_zone_units[#in_zone_units + 1] = units[units_ind]
- break
- end
+
+ if unit_pos and ((lCat == 1 and lUnit:isActive() == true) or lCat ~= 1) then -- it is a unit and is active or it is not a unit
+ if zones[zones_ind].verts then
+ if mist.pointInPolygon(unit_pos, zones[zones_ind].verts) then
+ in_zone_units[#in_zone_units + 1] = lUnit
+ end
+
+ else
+ if zone_type == 'cylinder' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then
+ in_zone_units[#in_zone_units + 1] = lUnit
+ break
+ elseif zone_type == 'sphere' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.y - zones[zones_ind].y)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then
+ in_zone_units[#in_zone_units + 1] = lUnit
+ break
+ end
+ end
end
end
end
@@ -2679,14 +3279,14 @@ function mist.getUnitsInMovingZones(unit_names, zone_unit_names, radius, zone_ty
local zone_units = {}
for k = 1, #unit_names do
- local unit = Unit.getByName(unit_names[k])
+ local unit = Unit.getByName(unit_names[k]) or StaticObject.getByName(unit_names[k])
if unit then
units[#units + 1] = unit
end
end
for k = 1, #zone_unit_names do
- local unit = Unit.getByName(zone_unit_names[k])
+ local unit = Unit.getByName(zone_unit_names[k]) or StaticObject.getByName(zone_unit_names[k])
if unit then
zone_units[#zone_units + 1] = unit
end
@@ -2695,15 +3295,18 @@ function mist.getUnitsInMovingZones(unit_names, zone_unit_names, radius, zone_ty
local in_zone_units = {}
for units_ind = 1, #units do
+ local lUnit = units[units_ind]
+ local lCat = lUnit:getCategory()
+ local unit_pos = lUnit:getPosition().p
for zone_units_ind = 1, #zone_units do
- local unit_pos = units[units_ind]:getPosition().p
+
local zone_unit_pos = zone_units[zone_units_ind]:getPosition().p
- if unit_pos and zone_unit_pos and units[units_ind]:isActive() == true then
+ if unit_pos and zone_unit_pos and ((lCat == 1 and lUnit:isActive()) or lCat ~= 1) then
if zone_type == 'cylinder' and (((unit_pos.x - zone_unit_pos.x)^2 + (unit_pos.z - zone_unit_pos.z)^2)^0.5 <= radius) then
- in_zone_units[#in_zone_units + 1] = units[units_ind]
+ in_zone_units[#in_zone_units + 1] = lUnit
break
elseif zone_type == 'sphere' and (((unit_pos.x - zone_unit_pos.x)^2 + (unit_pos.y - zone_unit_pos.y)^2 + (unit_pos.z - zone_unit_pos.z)^2)^0.5 <= radius) then
- in_zone_units[#in_zone_units + 1] = units[units_ind]
+ in_zone_units[#in_zone_units + 1] = lUnit
break
end
end
@@ -2721,7 +3324,8 @@ function mist.getUnitsLOS(unitset1, altoffset1, unitset2, altoffset2, radius)
-- get the positions all in one step, saves execution time.
for unitset1_ind = 1, #unitset1 do
local unit1 = Unit.getByName(unitset1[unitset1_ind])
- if unit1 and unit1:isActive() == true then
+ local lCat = unit1:getCategory()
+ if unit1 and ((lCat == 1 and unit1:isActive()) or lCat ~= 1) then
unit_info1[#unit_info1 + 1] = {}
unit_info1[#unit_info1].unit = unit1
unit_info1[#unit_info1].pos = unit1:getPosition().p
@@ -2730,7 +3334,8 @@ function mist.getUnitsLOS(unitset1, altoffset1, unitset2, altoffset2, radius)
for unitset2_ind = 1, #unitset2 do
local unit2 = Unit.getByName(unitset2[unitset2_ind])
- if unit2 and unit2:isActive() == true then
+ local lCat = unit2:getCategory()
+ if unit2 and ((lCat == 1 and unit2:isActive()) or lCat ~= 1) then
unit_info2[#unit_info2 + 1] = {}
unit_info2[#unit_info2].unit = unit2
unit_info2[#unit_info2].pos = unit2:getPosition().p
@@ -2766,7 +3371,8 @@ end
function mist.getAvgPoint(points)
local avgX, avgY, avgZ, totNum = 0, 0, 0, 0
for i = 1, #points do
- local nPoint = mist.utils.makeVec3(points[i])
+ --log:warn(points[i])
+ local nPoint = mist.utils.makeVec3(points[i])
if nPoint.z then
avgX = avgX + nPoint.x
avgY = avgY + nPoint.y
@@ -2859,13 +3465,13 @@ function mist.getBRString(vars)
local metric = vars.metric
local avgPos = mist.getAvgPos(units)
if avgPos then
- local vec = {x = avgPos.x - ref.x, y = avgPos.y - ref.y, z = avgPos.z - ref.z}
- local dir = mist.utils.getDir(vec, ref)
- local dist = mist.utils.get2DDist(avgPos, ref)
- if alt then
- alt = avgPos.y
- end
- return mist.tostringBR(dir, dist, alt, metric)
+ local vec = {x = avgPos.x - ref.x, y = avgPos.y - ref.y, z = avgPos.z - ref.z}
+ local dir = mist.utils.getDir(vec, ref)
+ local dist = mist.utils.get2DDist(avgPos, ref)
+ if alt then
+ alt = avgPos.y
+ end
+ return mist.tostringBR(dir, dist, alt, metric)
end
end
@@ -2891,10 +3497,11 @@ function mist.getLeadingPos(vars)
unitPosTbl[#unitPosTbl + 1] = unit:getPosition().p
end
end
+
if #unitPosTbl > 0 then -- one more more units found.
-- first, find the unit most in the heading direction
local maxPos = -math.huge
-
+ heading = heading * -1 -- rotated value appears to be opposite of what was expected
local maxPosInd -- maxPos - the furthest in direction defined by heading; maxPosInd =
for i = 1, #unitPosTbl do
local rotatedVec2 = mist.vec.rotateVec2(mist.utils.makeVec2(unitPosTbl[i]), heading)
@@ -2985,8 +3592,147 @@ function mist.getLeadingBRString(vars)
end
end
+--[[getPathLength from GSH
+-- Returns the length between the defined set of points. Can also return the point index before the cutoff was achieved
+p - table of path points, vec2 or vec3
+cutoff - number distance after which to stop at
+topo - boolean for if it should get the topographical distance
+
+]]
+
+function mist.getPathLength(p, cutoff, topo)
+ local l = 0
+ local cut = 0 or cutOff
+ local path = {}
+
+ for i = 1, #p do
+ if topo then
+ table.insert(path, mist.utils.makeVec3GL(p[i]))
+ else
+ table.insert(path, mist.utils.makeVec3(p[i]))
+ end
+ end
+
+ for i = 1, #path do
+ if i + 1 <= #path then
+ if topo then
+ l = mist.utils.get3DDist(path[i], path[i+1]) + l
+ else
+ l = mist.utils.get2DDist(path[i], path[i+1]) + l
+ end
+ end
+ if cut ~= 0 and l > cut then
+ return l, i
+ end
+ end
+ return l
end
+--[[
+Return a series of points to simplify the input table. Best used in conjunction with findPathOnRoads to turn the massive table into a list of X points.
+p - table of path points, can be vec2 or vec3
+num - number of segments.
+exact - boolean for whether or not it returns the exact distance or uses the first WP to that distance.
+
+
+]]
+
+function mist.getPathInSegments(p, num, exact)
+ local tot = mist.getPathLength(p)
+ local checkDist = tot/num
+ local typeUsed = 'vec2'
+
+ local points = {[1] = p[1]}
+ local curDist = 0
+ for i = 1, #p do
+ if i + 1 <= #p then
+ curDist = mist.utils.get2DDist(p[i], p[i+1]) + curDist
+ if curDist > checkDist then
+ curDist = 0
+ if exact then
+ -- get avg point between the two
+ -- insert into point table
+ -- need to be accurate... maybe reassign the point for the value it is checking?
+ -- insert into p table?
+ else
+ table.insert(points, p[i])
+ end
+ end
+
+ end
+
+ end
+ return points
+
+end
+
+
+function mist.getPointAtDistanceOnPath(p, dist, r, rtn)
+ log:info('find distance: $1', dist)
+ local rType = r or 'roads'
+ local point = {x= 0, y = 0, z = 0}
+ local path = {}
+ local ret = rtn or 'vec2'
+ local l = 0
+ if p[1] and #p == 2 then
+ path = land.findPathOnRoads(rType, p[1].x, p[1].y, p[2].x, p[2].y)
+ else
+ path = p
+ end
+ for i = 1, #path do
+ if i + 1 <= #path then
+ nextPoint = path[i+1]
+ if topo then
+ l = mist.utils.get3DDist(path[i], path[i+1]) + l
+ else
+ l = mist.utils.get2DDist(path[i], path[i+1]) + l
+ end
+ end
+ if l > dist then
+ local diff = dist
+ if i ~= 1 then -- get difference
+ diff = l - dist
+ end
+ local dir = mist.utils.getHeadingPoints(mist.utils.makeVec3(path[i]), mist.utils.makeVec3(path[i+1]))
+ local x, y
+ if r then
+ x, y = land.getClosestPointOnRoads(rType, mist.utils.round((math.cos(dir) * diff) + path[i].x,1), mist.utils.round((math.sin(dir) * diff) + path[i].y,1))
+ else
+ x, y = mist.utils.round((math.cos(dir) * diff) + path[i].x,1), mist.utils.round((math.sin(dir) * diff) + path[i].y,1)
+ end
+
+ if ret == 'vec2' then
+ return {x = x, y = y}, dir
+ elseif ret == 'vec3' then
+ return {x = x, y = 0, z = y}, dir
+ end
+
+ return {x = x, y = y}, dir
+ end
+ end
+ log:warn('Find point at distance: $1, path distance $2', dist, l)
+ return false
+end
+
+
+function mist.projectPoint(point, dist, theta)
+ local newPoint = {}
+ if point.z then
+ newPoint.z = mist.utils.round(math.sin(theta) * dist + point.z, 3)
+ newPoint.y = mist.utils.deepCopy(point.y)
+ else
+ newPoint.y = mist.utils.round(math.sin(theta) * dist + point.y, 3)
+ end
+ newPoint.x = mist.utils.round(math.cos(theta) * dist + point.x, 3)
+
+ return newPoint
+end
+
+end
+
+
+
+
--- Group functions.
-- @section groups
do -- group functions scope
@@ -3037,6 +3783,9 @@ do -- group functions scope
newData.units = {}
local newUnits = newGroup:getUnits()
+ if #newUnits == 0 then
+ log:warn('getCurrentGroupData has returned no units for: $1', gpName)
+ end
for unitNum, unitData in pairs(newGroup:getUnits()) do
newData.units[unitNum] = {}
local uName = unitData:getName()
@@ -3074,7 +3823,7 @@ do -- group functions scope
end
- function mist.getGroupData(gpName)
+ function mist.getGroupData(gpName, route)
local found = false
local newData = {}
if mist.DBs.groupsByName[gpName] then
@@ -3115,14 +3864,17 @@ do -- group functions scope
newData.units[unitNum].unitName = unitData.unitName
newData.units[unitNum].heading = unitData.heading -- added to DBs
newData.units[unitNum].playerCanDrive = unitData.playerCanDrive -- added to DBs
-
+ newData.units[unitNum].livery_id = unitData.livery_id
+ newData.units[unitNum].AddPropAircraft = unitData.AddPropAircraft
+ newData.units[unitNum].AddPropVehicle = unitData.AddPropVehicle
+
if newData.category == 'plane' or newData.category == 'helicopter' then
newData.units[unitNum].payload = payloads[unitNum]
- newData.units[unitNum].livery_id = unitData.livery_id
+
newData.units[unitNum].onboard_num = unitData.onboard_num
newData.units[unitNum].callsign = unitData.callsign
- newData.units[unitNum].AddPropAircraft = unitData.AddPropAircraft
+
end
if newData.category == 'static' then
newData.units[unitNum].categoryStatic = unitData.categoryStatic
@@ -3132,6 +3884,10 @@ do -- group functions scope
end
end
--log:info(newData)
+ if route then
+ newData.route = mist.getGroupRoute(gpName, true)
+ end
+
return newData
else
log:error('$1 not found in MIST database', gpName)
@@ -3156,10 +3912,10 @@ do -- group functions scope
if (coa_name == 'red' or coa_name == 'blue') and type(coa_data) == 'table' then
if coa_data.country then --there is a country table
for cntry_id, cntry_data in pairs(coa_data.country) do
- for obj_type_name, obj_type_data in pairs(cntry_data) do
- if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points
- if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group!
- for group_num, group_data in pairs(obj_type_data.group) do
+ for obj_cat_name, obj_cat_data in pairs(cntry_data) do
+ if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points
+ if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group!
+ for group_num, group_data in pairs(obj_cat_data.group) do
if group_data and group_data.groupId == gpId then
for unitIndex, unitData in pairs(group_data.units) do --group index
if unitData.unitId == unitId then
@@ -3198,10 +3954,10 @@ do -- group functions scope
if type(coa_data) == 'table' then
if coa_data.country then --there is a country table
for cntry_id, cntry_data in pairs(coa_data.country) do
- for obj_type_name, obj_type_data in pairs(cntry_data) do
- if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points
- if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group!
- for group_num, group_data in pairs(obj_type_data.group) do
+ for obj_cat_name, obj_cat_data in pairs(cntry_data) do
+ if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points
+ if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group!
+ for group_num, group_data in pairs(obj_cat_data.group) do
if group_data and group_data.groupId == gpId then
local payloads = {}
for unitIndex, unitData in pairs(group_data.units) do --group index
@@ -3223,16 +3979,53 @@ do -- group functions scope
end
log:warn("Couldn't find payload for group: $1", groupIdent)
return
-
end
+ function mist.getGroupTable(groupIdent)
+ local gpId = groupIdent
+ if type(groupIdent) == 'string' and not tonumber(groupIdent) then
+ if mist.DBs.MEgroupsByName[groupIdent] then
+ gpId = mist.DBs.MEgroupsByName[groupIdent].groupId
+ else
+ log:error('$1 not found in mist.DBs.MEgroupsByName', groupIdent)
+ end
+ end
+
+ if gpId then
+ for coa_name, coa_data in pairs(env.mission.coalition) do
+ if type(coa_data) == 'table' then
+ if coa_data.country then --there is a country table
+ for cntry_id, cntry_data in pairs(coa_data.country) do
+ for obj_cat_name, obj_cat_data in pairs(cntry_data) do
+ if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points
+ if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group!
+ for group_num, group_data in pairs(obj_cat_data.group) do
+ if group_data and group_data.groupId == gpId then
+ return group_data
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ else
+ log:error('Need string or number. Got: $1', type(groupIdent))
+ return false
+ end
+ log:warn("Couldn't find table for group: $1", groupIdent)
+
+ end
+
function mist.getValidRandomPoint(vars)
end
function mist.teleportToPoint(vars) -- main teleport function that all of teleport/respawn functions call
- --log:info(vars)
+ --log:warn(vars)
local point = vars.point
local gpName
if vars.gpName then
@@ -3243,6 +4036,14 @@ do -- group functions scope
log:error('Missing field groupName or gpName in variable table')
end
+ --[[New vars to add, mostly for when called via inZone functions
+ anyTerrain
+ offsetWP1
+ offsetRoute
+ initTasks
+
+ ]]
+
local action = vars.action
local disperse = vars.disperse or false
@@ -3250,8 +4051,9 @@ do -- group functions scope
local radius = vars.radius or 0
local innerRadius = vars.innerRadius
- local route = vars.route
local dbData = false
+
+
local newGroupData
if gpName and not vars.groupData then
@@ -3272,18 +4074,33 @@ do -- group functions scope
action = 'tele'
newGroupData = vars.groupData
end
+
+ if vars.newGroupName then
+ newGroupData.groupName = vars.newGroupName
+ end
+ if #newGroupData.units == 0 then
+ log:warn('$1 has no units in group table', gpName)
+ return
+ end
+
--log:info('get Randomized Point')
local diff = {x = 0, y = 0}
local newCoord, origCoord
local validTerrain = {'LAND', 'ROAD', 'SHALLOW_WATER', 'WATER', 'RUNWAY'}
- if string.lower(newGroupData.category) == 'ship' then
- validTerrain = {'SHALLOW_WATER' , 'WATER'}
- elseif string.lower(newGroupData.category) == 'vehicle' then
- validTerrain = {'LAND', 'ROAD'}
+ if vars.anyTerrain then
+ -- do nothing
+ elseif vars.validTerrain then
+ validTerrain = vars.validTerrain
+ else
+ if string.lower(newGroupData.category) == 'ship' then
+ validTerrain = {'SHALLOW_WATER' , 'WATER'}
+ elseif string.lower(newGroupData.category) == 'vehicle' then
+ validTerrain = {'LAND', 'ROAD'}
+ end
end
- local offsets = {}
+
if point and radius >= 0 then
local valid = false
-- new thoughts
@@ -3303,7 +4120,7 @@ do -- group functions scope
---- old
for i = 1, 100 do
newCoord = mist.getRandPointInCircle(point, radius, innerRadius)
- if mist.isTerrainValid(newCoord, validTerrain) then
+ if vars.anyTerrain or mist.isTerrainValid(newCoord, validTerrain) then
origCoord = mist.utils.deepCopy(newCoord)
diff = {x = (newCoord.x - newGroupData.units[1].x), y = (newCoord.y - newGroupData.units[1].y)}
valid = true
@@ -3381,20 +4198,46 @@ do -- group functions scope
end
- if route then
- newGroupData.route = route
- end
- --log:info(newGroupData)
+
+ local tempRoute
+
+ if mist.DBs.MEgroupsByName[gpName] and not vars.route then
+ -- log:warn('getRoute')
+ tempRoute = mist.getGroupRoute(gpName, true)
+ elseif vars.route then
+ -- log:warn('routeExist')
+ tempRoute = mist.utils.deepCopy(vars.route)
+ end
+ -- log:warn(tempRoute)
+ if tempRoute then
+ if (vars.offsetRoute or vars.offsetWP1 or vars.initTasks) then
+ for i = 1, #tempRoute do
+ -- log:warn(i)
+ if (vars.offsetRoute) or (i == 1 and vars.offsetWP1) or (i == 1 and vars.initTasks) then
+ -- log:warn('update offset')
+ tempRoute[i].x = tempRoute[i].x + diff.x
+ tempRoute[i].y = tempRoute[i].y + diff.y
+ elseif vars.initTasks and i > 1 then
+ --log:warn('deleteWP')
+ tempRoute[i] = nil
+ end
+ end
+ end
+ newGroupData.route = tempRoute
+ end
+
+
+ --log:warn(newGroupData)
--mist.debug.writeData(mist.utils.serialize,{'teleportToPoint', newGroupData}, 'newGroupData.lua')
if string.lower(newGroupData.category) == 'static' then
- --log:info(newGroupData)
+ --log:warn(newGroupData)
return mist.dynAddStatic(newGroupData)
end
return mist.dynAdd(newGroupData)
end
- function mist.respawnInZone(gpName, zone, disperse, maxDisp)
+ function mist.respawnInZone(gpName, zone, disperse, maxDisp, v)
if type(gpName) == 'table' and gpName:getName() then
gpName = gpName:getName()
@@ -3405,9 +4248,9 @@ do -- group functions scope
end
if type(zone) == 'string' then
- zone = trigger.misc.getZone(zone)
- elseif type(zone) == 'table' and not zone.radius then
- zone = trigger.misc.getZone(zone[math.random(1, #zone)])
+ zone = mist.DBs.zonesByName[zone]
+ elseif type(zone) == 'table' and not zone.radius then
+ zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]]
end
local vars = {}
vars.gpName = gpName
@@ -3416,10 +4259,17 @@ do -- group functions scope
vars.radius = zone.radius
vars.disperse = disperse
vars.maxDisp = maxDisp
+
+ if v and type(v) == 'table' then
+ for index, val in pairs(v) do
+ vars[index] = val
+ end
+ end
+
return mist.teleportToPoint(vars)
end
- function mist.cloneInZone(gpName, zone, disperse, maxDisp)
+ function mist.cloneInZone(gpName, zone, disperse, maxDisp, v)
--log:info('cloneInZone')
if type(gpName) == 'table' then
gpName = gpName:getName()
@@ -3428,9 +4278,9 @@ do -- group functions scope
end
if type(zone) == 'string' then
- zone = trigger.misc.getZone(zone)
- elseif type(zone) == 'table' and not zone.radius then
- zone = trigger.misc.getZone(zone[math.random(1, #zone)])
+ zone = mist.DBs.zonesByName[zone]
+ elseif type(zone) == 'table' and not zone.radius then
+ zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]]
end
local vars = {}
vars.gpName = gpName
@@ -3440,10 +4290,15 @@ do -- group functions scope
vars.disperse = disperse
vars.maxDisp = maxDisp
--log:info('do teleport')
+ if v and type(v) == 'table' then
+ for index, val in pairs(v) do
+ vars[index] = val
+ end
+ end
return mist.teleportToPoint(vars)
end
- function mist.teleportInZone(gpName, zone, disperse, maxDisp) -- groupName, zoneName or table of Zone Names, keepForm is a boolean
+ function mist.teleportInZone(gpName, zone, disperse, maxDisp, v) -- groupName, zoneName or table of Zone Names, keepForm is a boolean
if type(gpName) == 'table' and gpName:getName() then
gpName = gpName:getName()
else
@@ -3451,9 +4306,9 @@ do -- group functions scope
end
if type(zone) == 'string' then
- zone = trigger.misc.getZone(zone)
- elseif type(zone) == 'table' and not zone.radius then
- zone = trigger.misc.getZone(zone[math.random(1, #zone)])
+ zone = mist.DBs.zonesByName[zone]
+ elseif type(zone) == 'table' and not zone.radius then
+ zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]]
end
local vars = {}
@@ -3463,6 +4318,11 @@ do -- group functions scope
vars.radius = zone.radius
vars.disperse = disperse
vars.maxDisp = maxDisp
+ if v and type(v) == 'table' then
+ for index, val in pairs(v) do
+ vars[index] = val
+ end
+ end
return mist.teleportToPoint(vars)
end
@@ -3688,14 +4548,20 @@ do -- group functions scope
end
return choices[rtnVal]
end
+
+ function mist.stringCondense(s)
+ local exclude = {'%-', '%(', '%)', '%_', '%[', '%]', '%.', '%#', '% ', '%{', '%}', '%$', '%%', '%?', '%+', '%^'}
+ for i , str in pairs(exclude) do
+ s = string.gsub(s, str, '')
+ end
+ return s
+ end
function mist.stringMatch(s1, s2, bool)
- local exclude = {'%-', '%(', '%)', '%_', '%[', '%]', '%.', '%#', '% ', '%{', '%}', '%$', '%%', '%?', '%+', '%^'}
+
if type(s1) == 'string' and type(s2) == 'string' then
- for i , str in pairs(exclude) do
- s1 = string.gsub(s1, str, '')
- s2 = string.gsub(s2, str, '')
- end
+ s1 = mist.stringCondense(s1)
+ s2 = mist.stringCondense(s2)
if not bool then
s1 = string.lower(s1)
s2 = string.lower(s2)
@@ -3823,6 +4689,25 @@ do -- mist.util scope
function mist.utils.celsiusToFahrenheit(c)
return c*(9/5)+32
end
+
+ function mist.utils.hexToRGB(hex, l) -- because for some reason the draw tools use hex when everything is rgba 0 - 1
+ local int = 255
+ if l then
+ int = 1
+ end
+ if hex and type(hex) == 'string' then
+ local val = {}
+ hex = string.gsub(hex, '0x', '')
+ if string.len(hex) == 8 then
+ val[1] = tonumber("0x"..hex:sub(1,2)) / int
+ val[2] = tonumber("0x"..hex:sub(3,4)) / int
+ val[3] = tonumber("0x"..hex:sub(5,6)) / int
+ val[4] = tonumber("0x"..hex:sub(7,8)) / int
+
+ return val
+ end
+ end
+ end
function mist.utils.converter(t1, t2, val)
if type(t1) == 'string' then
@@ -4024,7 +4909,7 @@ do -- mist.util scope
--- Returns the center of a zone as Vec3.
-- @tparam string|table zone trigger zone name or table
-- @treturn Vec3 center of the zone
- function mist.utils.zoneToVec3(zone)
+ function mist.utils.zoneToVec3(zone, gl)
local new = {}
if type(zone) == 'table' then
if zone.point then
@@ -4032,7 +4917,7 @@ do -- mist.util scope
new.y = zone.point.y
new.z = zone.point.z
elseif zone.x and zone.y and zone.z then
- return zone
+ new = mist.utils.deepCopy(zone)
end
return new
elseif type(zone) == 'string' then
@@ -4041,11 +4926,21 @@ do -- mist.util scope
new.x = zone.point.x
new.y = zone.point.y
new.z = zone.point.z
- return new
end
end
+ if new.x and gl then
+ new.y = land.getHeight({x = new.x, y = new.z})
+ end
+ return new
end
+ function mist.utils.getHeadingPoints(point1, point2, north) -- sick of writing this out.
+ if north then
+ return mist.utils.getDir(mist.vec.sub(mist.utils.makeVec3(point2), mist.utils.makeVec3(point1)), (mist.utils.makeVec3(point1)))
+ else
+ return mist.utils.getDir(mist.vec.sub(mist.utils.makeVec3(point2), mist.utils.makeVec3(point1)))
+ end
+ end
--- Returns heading-error corrected direction.
-- True-north corrected direction from point along vector vec.
-- @tparam Vec3 vec
@@ -4067,6 +4962,12 @@ do -- mist.util scope
-- @tparam Vec2|Vec3 point2 second point
-- @treturn number distance between given points.
function mist.utils.get2DDist(point1, point2)
+ if not point1 then
+ log:warn("mist.utils.get2DDist 1st input value is nil")
+ end
+ if not point2 then
+ log:warn("mist.utils.get2DDist 2nd input value is nil")
+ end
point1 = mist.utils.makeVec3(point1)
point2 = mist.utils.makeVec3(point2)
return mist.vec.mag({x = point1.x - point2.x, y = 0, z = point1.z - point2.z})
@@ -4077,6 +4978,12 @@ do -- mist.util scope
-- @tparam Vec3 point2 second point
-- @treturn number distancen between given points in 3D space.
function mist.utils.get3DDist(point1, point2)
+ if not point1 then
+ log:warn("mist.utils.get2DDist 1st input value is nil")
+ end
+ if not point2 then
+ log:warn("mist.utils.get2DDist 2nd input value is nil")
+ end
return mist.vec.mag({x = point1.x - point2.x, y = point1.y - point2.y, z = point1.z - point2.z})
end
@@ -4507,6 +5414,23 @@ end
do -- mist.debug scope
mist.debug = {}
+ function mist.debug.changeSetting(s)
+ if type(s) == 'table' then
+ for sName, sVal in pairs(s) do
+ if type(sVal) == 'string' or type(sVal) == 'number' then
+ if sName == 'log' then
+ mistSettings[sName] = sVal
+ mist.log:setLevel(sVal)
+ elseif sName == 'dbLog' then
+ mistSettings[sName] = sVal
+ dblog:setLevel(sVal)
+ end
+ else
+ mistSettings[sName] = sVal
+ end
+ end
+ end
+ end
--- Dumps the global table _G.
-- This dumps the global table _G to a file in
-- the DCS\Logs directory.
@@ -4514,11 +5438,24 @@ do -- mist.debug scope
-- in $DCS_ROOT\Scripts\MissionScripting.lua to access lfs and io
-- libraries.
-- @param fname
- function mist.debug.dump_G(fname)
+ function mist.debug.dump_G(fname, simp)
if lfs and io then
local fdir = lfs.writedir() .. [[Logs\]] .. fname
local f = io.open(fdir, 'w')
- f:write(mist.utils.tableShow(_G))
+ if simp then
+ local g = mist.utils.deepCopy(_G)
+ g.mist = nil
+ g.slmod = nil
+ g.env.mission = nil
+ g.env.warehouses = nil
+ g.country.by_idx = nil
+ g.country.by_country = nil
+
+ f:write(mist.utils.tableShow(g))
+ else
+
+ f:write(mist.utils.tableShow(_G))
+ end
f:close()
log:info('Wrote debug data to $1', fdir)
--trigger.action.outText(errmsg, 10)
@@ -4562,6 +5499,141 @@ do -- mist.debug scope
end
end
end
+
+ -- write group table
+ function mist.debug.writeGroup(gName, data)
+ if gName and mist.DBs.groupsByName[gName] then
+ local dat
+ if data then
+ dat = mist.getGroupData(gName)
+ else
+ dat = mist.getGroupTable(gName)
+ end
+ if dat then
+ dat.route = {points = mist.getGroupRoute(gName, true)}
+ end
+
+ if io and lfs and dat then
+ mist.debug.writeData(mist.utils.serialize, {gName, dat}, gName .. '_table.lua')
+ else
+ if dat then
+ trigger.action.outText('Error: insufficient libraries to run mist.debug.writeGroup, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua \nGroup table written to DCS.log file instead.', 10)
+ log:warn('$1 dataTable: $2', gName, dat)
+ else
+ trigger.action.outText('Unable to write group table for: ' .. gName .. '\n Error: insufficient libraries to run mist.debug.writeGroup, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua', 10)
+ end
+ end
+ end
+ end
+
+
+
+ -- write all object types in mission.
+ function mist.debug.writeTypes(fName)
+ local wt = 'mistDebugWriteTypes.lua'
+ if fName and type(fName) == 'string' and string.find(fName, '.lua') then
+ wt = fName
+ end
+ local output = {units = {}, countries = {}}
+ for coa_name_miz, coa_data in pairs(env.mission.coalition) do
+ if type(coa_data) == 'table' then
+ if coa_data.country then --there is a country table
+ for cntry_id, cntry_data in pairs(coa_data.country) do
+ local countryName = string.lower(cntry_data.name)
+ if cntry_data.id and country.names[cntry_data.id] then
+ countryName = string.lower(country.names[cntry_data.id])
+ end
+ output.countries[countryName] = {}
+ if type(cntry_data) == 'table' then --just making sure
+ for obj_cat_name, obj_cat_data in pairs(cntry_data) do
+ if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then --should be an unncessary check
+ local category = obj_cat_name
+ if not output.countries[countryName][category] then
+ -- log:warn('Create: $1', category)
+ output.countries[countryName][category] = {}
+ end
+ if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group!
+ for group_num, group_data in pairs(obj_cat_data.group) do
+ if group_data and group_data.units and type(group_data.units) == 'table' then --making sure again- this is a valid group
+ for i = 1, #group_data.units do
+ if group_data.units[i] then
+ local u = group_data.units[i]
+ local liv = u.livery_id or 'default'
+ if not output.units[u.type] then -- create unit table
+ -- log:warn('Create: $1', u.type)
+ output.units[u.type] = {count = 0, livery_id = {}}
+ end
+
+ if not output.countries[countryName][category][u.type] then
+ -- log:warn('Create country, category, unit: $1', u.type)
+ output.countries[countryName][category][u.type] = 0
+ end
+ -- add to count
+ output.countries[countryName][category][u.type] = output.countries[countryName][category][u.type] + 1
+ output.units[u.type].count = output.units[u.type].count + 1
+
+ if liv and not output.units[u.type].livery_id[countryName] then
+ -- log:warn('Create livery country: $1', countryName)
+ output.units[u.type].livery_id[countryName] = {}
+ end
+ if liv and not output.units[u.type].livery_id[countryName][liv] then
+ --log:warn('Create Livery: $1', liv)
+ output.units[u.type].livery_id[countryName][liv] = 0
+ end
+ if liv then
+ output.units[u.type].livery_id[countryName][liv] = output.units[u.type].livery_id[countryName][liv] + 1
+ end
+ if u.payload and u.payload.pylons then
+ if not output.units[u.type].CLSID then
+ output.units[u.type].CLSID = {}
+ output.units[u.type].pylons = {}
+ end
+
+ for pyIndex, pData in pairs(u.payload.pylons) do
+ if not output.units[u.type].CLSID[pData.CLSID] then
+ output.units[u.type].CLSID[pData.CLSID] = 0
+ end
+ output.units[u.type].CLSID[pData.CLSID] = output.units[u.type].CLSID[pData.CLSID] + 1
+
+ if not output.units[u.type].pylons[pyIndex] then
+ output.units[u.type].pylons[pyIndex] = {}
+ end
+ if not output.units[u.type].pylons[pyIndex][pData.CLSID] then
+ output.units[u.type].pylons[pyIndex][pData.CLSID] = 0
+ end
+ output.units[u.type].pylons[pyIndex][pData.CLSID] = output.units[u.type].pylons[pyIndex][pData.CLSID] + 1
+ end
+
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ if io and lfs then
+ mist.debug.writeData(mist.utils.serialize, {'mistDebugWriteTypes', output}, wt)
+ else
+ trigger.action.outText('Error: insufficient libraries to run mist.debug.writeTypes, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua \n writeTypes table written to DCS.log file instead.', 10)
+ log:warn('mist.debug.writeTypes: $1', output)
+ end
+ return output
+ end
+ function mist.debug.writeWeapons(unit)
+
+ end
+
+ function mist.debug.mark(msg, coord)
+
+ mist.marker.add({point = coord, text = msg})
+ log:warn('debug.mark: $1 $2', msg, coord)
+ end
end
--- 3D Vector functions
@@ -4633,6 +5705,13 @@ do -- mist.vec scope
function mist.vec.rotateVec2(vec2, theta)
return { x = vec2.x*math.cos(theta) - vec2.y*math.sin(theta), y = vec2.x*math.sin(theta) + vec2.y*math.cos(theta)}
end
+
+ function mist.vec.normalize(vec3)
+ local mag = mist.vec.mag(vec3)
+ if mag ~= 0 then
+ return mist.vec.scalar_mult(vec3, 1.0 / mag)
+ end
+ end
end
--- Flag functions.
@@ -4826,7 +5905,7 @@ unitTableDef = table or nil
if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == 0) then
local num_in_zone = 0
for i = 1, #units do
- local unit = Unit.getByName(units[i])
+ local unit = Unit.getByName(units[i]) or StaticObject.getByName(units[i])
if unit then
local pos = unit:getPosition().p
if mist.pointInPolygon(pos, zone, maxalt) then
@@ -4913,7 +5992,13 @@ unitTableDef = table or nil
end
end
-
+ --[[
+ function mist.flagFunc.weapon_in_zones(vars)
+ -- borrow from suchoi surprise. While running enabled event handler that checks for weapons in zone.
+ -- Choice is weapon category or weapon strings.
+
+ end
+]]
--- Sets a flag if unit(s) is/are inside a moving zone.
-- @todo document
function mist.flagFunc.units_in_moving_zones(vars)
@@ -5282,13 +6367,15 @@ do -- mist.msg scope
local caSlots = false
local caMSGtoGroup = false
+ local anyUpdate = false
+ local lastMessageTime = nil
if env.mission.groundControl then -- just to be sure?
for index, value in pairs(env.mission.groundControl) do
if type(value) == 'table' then
for roleName, roleVal in pairs(value) do
for rIndex, rVal in pairs(roleVal) do
- if env.mission.groundControl[index][roleName][rIndex] > 0 then
+ if type(rVal) == 'number' and rVal > 0 then
caSlots = true
break
end
@@ -5303,11 +6390,124 @@ do -- mist.msg scope
end
local function mistdisplayV5()
- --[[thoughts to improve upon
- event handler based activeClients table.
- display messages only when there is an update
- possibly co-routine it.
- ]]
+ --log:warn("mistdisplayV5: $1", timer.getTime())
+
+ local clearView = true
+ if #messageList > 0 then
+ --log:warn('Updates: $1', anyUpdate)
+ if anyUpdate == true then
+ local activeClients = {}
+
+ for clientId, clientData in pairs(mist.DBs.humansById) do
+ if Unit.getByName(clientData.unitName) and Unit.getByName(clientData.unitName):isExist() == true then
+ activeClients[clientData.groupId] = clientData.groupName
+ end
+ end
+ anyUpdate = false
+ if displayActive == false then
+ displayActive = true
+ end
+ --mist.debug.writeData(mist.utils.serialize,{'msg', messageList}, 'messageList.lua')
+ local msgTableText = {}
+ local msgTableSound = {}
+ local curTime = timer.getTime()
+ for mInd, messageData in pairs(messageList) do
+ --log:warn(messageData)
+ if messageData.displayTill < curTime then
+ messageData:remove() -- now using the remove/destroy function.
+ else
+ if messageData.displayedFor then
+ messageData.displayedFor = curTime - messageData.addedAt
+ end
+ local nextSound = 1000
+ local soundIndex = 0
+
+ if messageData.multSound and #messageData.multSound > 0 then
+ for index, sData in pairs(messageData.multSound) do
+ if sData.time <= messageData.displayedFor and sData.played == false and sData.time < nextSound then -- find index of the next sound to be played
+ nextSound = sData.time
+ soundIndex = index
+ end
+ end
+ if soundIndex ~= 0 then
+ messageData.multSound[soundIndex].played = true
+ end
+ end
+
+ for recIndex, recData in pairs(messageData.msgFor) do -- iterate recipiants
+ if recData == 'RED' or recData == 'BLUE' or activeClients[recData] then -- rec exists
+ if messageData.text then -- text
+ if not msgTableText[recData] then -- create table entry for text
+ msgTableText[recData] = {}
+ msgTableText[recData].text = {}
+ if recData == 'RED' or recData == 'BLUE' then
+ msgTableText[recData].text[1] = '-------Combined Arms Message-------- \n'
+ end
+ msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text
+ msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
+ else -- add to table entry and adjust display time if needed
+ if recData == 'RED' or recData == 'BLUE' then
+ msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- Combined Arms Message: \n'
+ else
+ msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- \n'
+ end
+ table.insert(msgTableText[recData].text, messageData.text)
+ if msgTableText[recData].displayTime < messageData.displayTime - messageData.displayedFor then
+ msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
+ else
+ --msgTableText[recData].displayTime = 10
+ end
+ end
+ end
+ if soundIndex ~= 0 then
+ msgTableSound[recData] = messageData.multSound[soundIndex].file
+ end
+ end
+
+ end
+ messageData.update = nil
+
+ end
+
+ end
+ ------- new display
+
+ if caSlots == true and caMSGtoGroup == false then
+ if msgTableText.RED then
+ trigger.action.outTextForCoalition(coalition.side.RED, table.concat(msgTableText.RED.text), msgTableText.RED.displayTime, clearView)
+
+ end
+ if msgTableText.BLUE then
+ trigger.action.outTextForCoalition(coalition.side.BLUE, table.concat(msgTableText.BLUE.text), msgTableText.BLUE.displayTime, clearView)
+ end
+ end
+
+ for index, msgData in pairs(msgTableText) do
+ if type(index) == 'number' then -- its a groupNumber
+ trigger.action.outTextForGroup(index, table.concat(msgData.text), msgData.displayTime, clearView)
+ end
+ end
+ --- new audio
+ if msgTableSound.RED then
+ trigger.action.outSoundForCoalition(coalition.side.RED, msgTableSound.RED)
+ end
+ if msgTableSound.BLUE then
+ trigger.action.outSoundForCoalition(coalition.side.BLUE, msgTableSound.BLUE)
+ end
+
+
+ for index, file in pairs(msgTableSound) do
+ if type(index) == 'number' then -- its a groupNumber
+ trigger.action.outSoundForGroup(index, file)
+ end
+ end
+
+ end
+
+ else
+ mist.removeFunction(displayFuncId)
+ displayActive = false
+ end
end
local function mistdisplayV4()
@@ -5468,14 +6668,15 @@ end]]
]]
-
+
local new = {}
new.text = vars.text -- The actual message
new.displayTime = vars.displayTime -- How long will the message appear for
new.displayedFor = 0 -- how long the message has been displayed so far
+ new.displayTill = timer.getTime() + vars.displayTime
new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text.
new.addedAt = timer.getTime()
- new.update = true
+ --log:warn('New Message: $1', new.text)
if vars.multSound and vars.multSound[1] then
new.multSound = vars.multSound
@@ -5560,19 +6761,21 @@ end]]
if messageList[i].name then
if messageList[i].name == vars.name then
--log:info('updateMessage')
+ messageList[i].displayTill = timer.getTime() + messageList[i].displayTime
messageList[i].displayedFor = 0
messageList[i].addedAt = timer.getTime()
messageList[i].sound = new.sound
messageList[i].text = new.text
messageList[i].msgFor = new.msgFor
messageList[i].multSound = new.multSound
- messageList[i].update = true
+ anyUpdate = true
+ --log:warn('Message updated: $1', new.messageID)
return messageList[i].messageID
end
end
end
end
-
+ anyUpdate = true
messageID = messageID + 1
new.messageID = messageID
@@ -5586,7 +6789,7 @@ end]]
if displayActive == false then
displayActive = true
- displayFuncId = mist.scheduleFunction(mistdisplayV4, {}, timer.getTime() + messageDisplayRate, messageDisplayRate)
+ displayFuncId = mist.scheduleFunction(mistdisplayV5, {}, timer.getTime() + messageDisplayRate, messageDisplayRate)
end
return messageID
@@ -5597,6 +6800,7 @@ end]]
for i, msgData in pairs(messageList) do
if messageList[i] == self then
table.remove(messageList, i)
+ anyUpdate = true
return true --removal successful
end
end
@@ -5607,6 +6811,7 @@ end]]
for i, msgData in pairs(messageList) do
if messageList[i].messageID == id then
table.remove(messageList, i)
+ anyUpdate = true
return true --removal successful
end
end
@@ -6007,6 +7212,9 @@ do -- mist.demos scope
end
end
+
+
+
do
--[[ stuff for marker panels
marker.add() add marker. Point of these functions is to simplify process and to store all mark panels added.
@@ -6026,98 +7234,382 @@ do
If mark added to a group before a client joins slot is synced.
Mark made for cliet A in Slot A. Client A leaves, Client B joins in slot A. What do they see?
+
May need to automate process...
+
+
+ Could release this. But things I might need to add/change before doing so.
+ - removing marks and re-adding in same sequence doesn't appear to work. May need to schedule adding mark if updating an entry.
+ - I really dont like the old message style code for which groups get the message. Perhaps change to unitsTable and create function for getting humanUnitsTable.
+ = Event Handler, and check it, for marks added via script or user to deconflict Ids.
+ - Full validation of passed values for a specific shape type.
]]
- --[[
- local typeBase = {
- ['Mi-8MT'] = {'Mi-8MTV2', 'Mi-8MTV', 'Mi-8'},
- ['MiG-21Bis'] = {'Mig-21'},
- ['MiG-15bis'] = {'Mig-15'},
- ['FW-190D9'] = {'FW-190'},
- ['Bf-109K-4'] = {'Bf-109'},
- }
-
-
- local mId = 1337
+
+ local usedMarks = {}
+
+ local mDefs = {
+ coa = {
+ ['red'] = {fillColor = {.8, 0 , 0, .5}, color = {.8, 0 , 0, .5}, lineType = 2, fontSize = 16},
+ ['blue'] = {fillColor = {0, 0 , 0.8, .5}, color = {0, 0 , 0.8, .5}, lineType = 2, fontSize = 16},
+ ['all'] = {fillColor = {.1, .1 , .1, .5}, color = {.9, .9 , .9, .5}, lineType = 2, fontSize = 16},
+ ['neutral'] = {fillColor = {.1, .1 , .1, .5}, color = {.2, .2 , .2, .5}, lineType = 2, fontSize = 16},
+ },
+ }
+
+ local userDefs = {['red'] = {},['blue'] = {},['all'] = {},['neutral'] = {}}
+ local mId = 1000
+
+ local tNames = {'line', 'circle','rect', 'arrow', 'text', 'quad', 'freeform'}
+ local tLines = {[0] = 'no line', [1] = 'solid', [2] = 'dashed',[3] = 'dotted', [4] = 'dot dash' ,[5] = 'long dash', [6] = 'two dash'}
+ local coas = {[-1] = 'all', [0] = 'neutral', [1] = 'red', [2] = 'blue'}
+
+ local altNames = {['poly'] = 7, ['lines'] = 1, ['polygon'] = 7 }
+
+ local function draw(s)
+ --log:warn(s)
+ if type(s) == 'table' then
+ local mType = s.markType
+ if mType == 'panel' then
+ if markScope == 'coa' then
+ trigger.action.markToCoalition(s.markId, s.text, s.pos, s.markFor, s.readOnly)
+ elseif markScope == 'group' then
+ trigger.action.markToGroup(s.markId, s.text, s.pos, s.markFor, s.readOnly)
+ else
+ trigger.action.markToAll(s.markId, s.text, s.pos, s.readOnly)
+ end
+ elseif mType == 'line' then
+ trigger.action.lineToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
+ elseif mType == 'circle' then
+ trigger.action.circleToAll(s.coa, s.markId, s.pos[1], s.radius, s.color, s.fillColor, s.lineType, s.readOnly, s.message)
+ elseif mType == 'rect' then
+ trigger.action.rectToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
+ elseif mType == 'arrow' then
+ trigger.action.arrowToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
+ elseif mType == 'text' then
+ trigger.action.textToAll(s.coa, s.markId, s.pos[1], s.color, s.fillColor, s.fontSize, s.readOnly, s.text)
+ elseif mType == 'quad' then
+ trigger.action.quadToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.pos[3], s.pos[4], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
+ end
+ if s.name and not usedMarks[s.name] then
+ usedMarks[s.name] = s.markId
+ end
+ elseif type(s) == 'string' then
+ --log:warn(s)
+ mist.utils.dostring(s)
+ end
+ end
+
mist.marker = {}
- mist.marker.list = {}
+
local function markSpamFilter(recList, spamBlockOn)
for id, name in pairs(recList) do
if name == spamBlockOn then
- log:info('already on recList')
+ --log:info('already on recList')
return recList
end
end
- log:info('add to recList')
+ --log:info('add to recList')
table.insert(recList, spamBlockOn)
return recList
end
local function iterate()
- mId = mId + 1
- return mId
+ while mId < 10000000 do
+ if usedMarks[mId] then
+ mId = mId + 1
+ else
+ return mist.utils.deepCopy(mId)
+ end
+ end
+ return mist.utils.deepCopy(mId)
end
+
+ local function validateColor(val)
+ if type(val) == 'table' then
+ for i = 1, #val do
+ if type(val[i]) == 'number' and val[i] > 1 then
+ val[i] = val[i]/255 -- convert RGB values from 0-255 to 0-1 equivilent.
+ end
+ end
+ elseif type(val) == 'string' then
+ val = mist.utils.hexToRGB(val)
+
+ end
+ return val
+ end
+
+ local function checkDefs(vName, coa)
+ --log:warn('CheckDefs: $1 $2', vName, coa)
+ local coaName
+ if type(coa) == 'number' then
+ if coas[coa] then
+ coaName = coas[coa]
+ end
+ elseif type(coa) == 'string' then
+ coaName = coa
+ end
+
+ -- log:warn(coaName)
+ if userDefs[coaName] and userDefs[coaName][vName] then
+ return userDefs[coaName][vName]
+ elseif mDefs.coa[coaName] and mDefs.coa[coaName][vName] then
+ return mDefs.coa[coaName][vName]
+ end
+
+ end
+
+ function mist.marker.getNextId()
+ return iterate()
+ end
+
+ local handle = {}
+ function handle:onEvent(e)
+ if world.event.S_EVENT_MARK_ADDED == e.id and e.idx then
+ usedMarks[e.idx] = e.idx
+ if not mist.DBs.markList[e.idx] then
+ --log:info('create maker DB: $1', e.idx)
+ mist.DBs.markList[e.idx] = {time = e.time, pos = e.pos, groupId = e.groupId, mType = 'panel', text = e.text, markId = e.idx, coalition = e.coalition}
+ if e.unit then
+ mist.DBs.markList[e.idx].unit = e.initiaor:getName()
+ end
+ --log:info(mist.marker.list[e.idx])
+ end
+
+ elseif world.event.S_EVENT_MARK_CHANGE == e.id and e.idx then
+ if mist.DBs.markList[e.idx] then
+ mist.DBs.markList[e.idx].text = e.text
+ end
+ elseif world.event.S_EVENT_MARK_REMOVE == e.id and e.idx then
+ if mist.DBs.markList[e.idx] then
+ mist.DBs.markList[e.idx] = nil
+ end
+ end
+
+ end
+
+ local function getMarkId(id)
+ if mist.DBs.markList[id] then
+ return id
+ else
+ for mEntry, mData in pairs(mist.DBs.markList) do
+ if id == mData.name or id == mData.id then
+ return mData.id
+ end
+ end
+ end
+
+
+ end
+
+
+ local function removeMark(id)
+ --log:info("Removing Mark: $1", id
+ local removed = false
+ if type(id) == 'table' then
+ for ind, val in pairs(id) do
+ local r = getMarkId(val)
+ if r then
+ trigger.action.removeMark(r)
+ mist.DBs.markList[r] = nil
+ removed = true
+ end
+ end
+
+ else
+ local r = getMarkId(id)
+ trigger.action.removeMark(r)
+ mist.DBs.markList[r] = nil
+ removed = true
+ end
+ return removed
+ end
+
+ world.addEventHandler(handle)
+ function mist.marker.setDefault(vars)
+ local anyChange = false
+ if vars and type(vars) == 'table' then
+ for l1, l1Data in pairs(vars) do
+ if type(l1Data) == 'table' then
+ if not userDefs[l1] then
+ userDefs[l1] = {}
+ end
+
+ for l2, l2Data in pairs(l1Data) do
+ userDefs[l1][l2] = l2Data
+ anyChange = true
+ end
+ else
+ userDefs[l1] = l1Data
+ anyChange = true
+ end
+ end
+
+ end
+ return anyChange
+ end
- function mist.marker.add(pos, text, markFor, id)
- log:warn('markerFunc')
- log:info('Pos: $1, Text: $2, markFor: $3, id: $4', pos, text, markFor, id)
- if not id then
-
- else
+ function mist.marker.add(vars)
+ --log:warn('markerFunc')
+ --log:warn(vars)
+ local pos = vars.point or vars.points or vars.pos
+ local text = vars.text or ''
+ local markFor = vars.markFor
+ local markForCoa = vars.markForCoa or vars.coa -- optional, can be used if you just want to mark to a specific coa/all
+ local id = vars.id or vars.markId or vars.markid
+ local mType = vars.mType or vars.markType or vars.type or 0
+ local color = vars.color
+ local fillColor = vars.fillColor
+ local lineType = vars.lineType or 2
+ local readOnly = vars.readOnly or true
+ local message = vars.message
+ local fontSize = vars.fontSize
+ local name = vars.name
+ local radius = vars.radius or 500
+
+ local coa = -1
+ local usedId = 0
+
+
+ if id then
+ if type(id) ~= 'number' then
+ name = id
+ usedId = iterate()
+ end
+ --log:info('checkIfIdExist: $1', id)
+ --[[
+ Maybe it should treat id or name as the same thing/single value.
+
+ If passed number it will use that as the first Id used and will delete/update any marks associated with that same value.
+
+
+ ]]
+
+ local lId = id or name
+ if mist.DBs.markList[id] then ---------- NEED A BETTER WAY TO ASSOCIATE THE ID VALUE. CUrrnetly deleting from table and checking if that deleted entry exists which it wont.
+ --log:warn('active mark to be removed: $1', id)
+ name = mist.DBs.markList[id].name or id
+ removeMark(id)
+ elseif usedMarks[id] then
+ --log:info('exists in usedMarks: $1', id)
+ removeMark(usedMarks[id])
+ elseif name and usedMarks[name] then
+ --log:info('exists in usedMarks: $1', name)
+ removeMark(usedMarks[name])
+ end
+ usedId = iterate()
+ usedMarks[id] = usedId -- redefine the value used
end
- local markType = 'all'
+ if name then
+ usedMarks[name] = usedId
+ end
+
+ if usedId == 0 then
+ usedId = iterate()
+ end
+ if mType then
+ if type(mType) == 'string' then
+ for i = 1, #tNames do
+ --log:warn(tNames[i])
+ if mist.stringMatch(mType, tNames[i]) then
+ mType = i
+ break
+ end
+ end
+ elseif type(mType) == 'number' and mType > #tNames then
+ mType = 0
+ end
+ end
+ --log:warn(mType)
+ local markScope = 'all'
local markForTable = {}
- if pos then
- pos = mist.utils.makeVec3(pos)
+
+ if pos then
+ if pos[1] then
+ for i = 1, #pos do
+ pos[i] = mist.utils.makeVec3(pos[i])
+ end
+
+ else
+ pos[1] = mist.utils.makeVec3(pos)
+ end
+
end
if text and type(text) ~= string then
text = tostring(text)
- else
- text = ''
end
-
- if markFor then
+
+ if markForCoa then
+ if type(markForCoa) == 'string' then
+ if tonumber(markForCoa) then
+ coa = coas[tonumber(markForCoa)]
+ markScope = 'coa'
+ else
+ for ind, cName in pairs(coas) do
+ if mist.stringMatch(cName, markForCoa) then
+ coa = ind
+ markScope = 'coa'
+ break
+ end
+ end
+ end
+ elseif type(markForCoa) == 'number' and markForCoa >=-1 and markForCoa <= #coas then
+ coa = markForCoa
+ markScore = 'coa'
+ end
+
+
+
+ elseif markFor then
if type(markFor) == 'number' then -- groupId
if mist.DBs.groupsById[markFor] then
- markType = 'group'
+ markScope = 'group'
end
elseif type(markFor) == 'string' then -- groupName
if mist.DBs.groupsByName[markFor] then
- markType = 'group'
+ markScope = 'group'
markFor = mist.DBs.groupsByName[markFor].groupId
end
elseif type(markFor) == 'table' then -- multiple groupName, country, coalition, all
- markType = 'table'
- log:info(markFor)
+ markScope = 'table'
+ --log:warn(markFor)
for forIndex, forData in pairs(markFor) do -- need to rethink this part and organization. Gotta be a more logical way to send messages to coa, groups, or all.
- log:info(forIndex)
- log:info(forData)
for list, listData in pairs(forData) do
- log:info(listData)
+ --log:warn(listData)
forIndex = string.lower(forIndex)
if type(listData) == 'string' then
listData = string.lower(listData)
end
if listData == 'all' then
- markType = 'all'
+ markScope = 'all'
break
elseif (forIndex == 'coa' or forIndex == 'ca') then -- mark for coa or CA.
- for name, index in pairs (coalition.side) do
+ local matches = 0
+ for name, index in pairs (coalition.side) do
if listData == string.lower(name) then
- markType = 'coalition'
+ markScope = 'coa'
+ markFor = index
+ coa = index
+ matches = matches + 1
end
end
- elseif (forIndex == 'countries' and string.lower(clientData.country) == listData) or (forIndex == 'units' and string.lower(clientData.unitName) == listData) then
- markForTable = markSpamFilter(markForTable, clientData.groupId)
+ if matches > 1 then
+ markScope = 'all'
+ end
+ elseif forIndex == 'countries' then
+ for clienId, clientData in pairs(mist.DBs.humansById) do
+ if (string.lower(clientData.country) == listData) or (forIndex == 'units' and string.lower(clientData.unitName) == listData) then
+ markForTable = markSpamFilter(markForTable, clientData.groupId)
+ end
+ end
elseif forIndex == 'unittypes' then -- mark to group
-- iterate play units
for clientId, clientData in pairs(mist.DBs.humansById) do
for typeId, typeData in pairs(listData) do
- log:info(typeData)
+ --log:warn(typeData)
local found = false
if list == 'all' or clientData.coalition and type(clientData.coalition) == 'string' and mist.stringMatch(clientData.coalition, list) then
if mist.matchString(typeData, clientData.type) then
@@ -6160,61 +7652,268 @@ do
end
end
else
- markType = 'all'
+ markScope = 'all'
end
+ if mType == 0 then
+ local data = {markId = usedId, text = text, pos = pos[1], markScope = markScope, markFor = markFor, markType = 'panel', name = name, time = timer.getTime()}
+ if markScope ~= 'table' then
+ -- create marks
+
+ mist.DBs.markList[usedId] = data-- add to the DB
+
+ else
+ if #markForTable > 0 then
+ --log:info('iterate')
+ local list = {}
+ if id and not name then
+ name = id
+ end
+ for i = 1, #markForTable do
+ local newId = iterate()
+ local data = {markId = newId, text = text, pos = pos[i], markFor = markForTable[i], markType = 'panel', name = name, readOnly = readOnly, time = timer.getTime()}
+ mist.DBs.markList[newId] = data
+ table.insert(list, data)
-
+ draw(data)
+
+ end
+ return list
+ end
+ end
-
-
- if markType ~= 'table' then
- local newId = iterate()
- local data = {markId = newId, text = text, pos = pos, markType = markType, markFor = markFor}
+ draw(data)
+
+ return data
+ elseif mType > 0 then
+ local newId = iterate()
+ local fCal = {}
+ fCal[#fCal+1] = mType
+ fCal[#fCal+1] = coa
+ fCal[#fCal+1] = usedId
+
+ local likeARainCoat = false
+ if mType == 7 then
+ local score = 0
+ for i = 1, #pos do
+ if i < #pos then
+ local val = ((pos[i+1].x - pos[i].x)*(pos[i+1].z + pos[i].z))
+ --log:warn("$1 index score is: $2", i, val)
+ score = score + val
+ else
+ score = score + ((pos[1].x - pos[i].x)*(pos[1].z + pos[i].z))
+ end
+ end
+ --log:warn(score)
+ if score > 0 then -- it is anti-clockwise. Due to DCS bug make it clockwise.
+ likeARainCoat = true
+ --log:warn('flip')
+
+ for i = #pos, 1, -1 do
+ fCal[#fCal+1] = pos[i]
+ end
+ end
+ end
+ if likeARainCoat == false then
+ for i = 1, #pos do
+ fCal[#fCal+1] = pos[i]
+ end
+ end
+ if radius and mType == 2 then
+ fCal[#fCal+1] = radius
+ end
+
+ if not color then
+ color = checkDefs('color', coa)
+ else
+ color = validateColor(color)
+ end
+ fCal[#fCal+1] = color
+
+
+ if not fillColor then
+ fillColor = checkDefs('fillColor', coa)
+ else
+ fillColor = validateColor(fillColor)
+ end
+ fCal[#fCal+1] = fillColor
+
+ if mType == 5 then -- text to all
+ if not fontSize then
+ fontSize = checkDefs('fontSize', coa) or 16
+ end
+ fCal[#fCal+1] = fontSize
+ else
+ if not lineType then
+ lineType = checkDefs('lineType', coa) or 2
+ end
+ end
+ fCal[#fCal+1] = lineType
+ if not readOnly then
+ readOnly = true
+ end
+ fCal[#fCal+1] = readOnly
+ if mType == 5 then
+ fCal[#fCal+1] = text
+ else
+
+ fCal[#fCal+1] = message
+ end
+ local data = {coa = coa, markId = usedId, pos = pos, markFor = markFor, color = color, readOnly = readOnly, message = message, fillColor = fillColor, lineType = lineType, markType = tNames[mType], name = name, radius = radius, text = text, fontSize = fontSize, time = timer.getTime()}
+ mist.DBs.markList[usedId] = data
+
+ if mType == 7 or mType == 1 then
+ local s = "trigger.action.markupToAll("
- -- create marks
- if markType == 'coa' then
- trigger.action.markToCoalition(newId, text, pos, markFor)
- elseif markType == 'group' then
- trigger.action.markToGroup(newId, text, pos, markFor)
- else
- trigger.action.markToAll(iterate(), text, pos)
- end
- table.insert(mist.marker.list, data) -- add to the DB
- else
- if #markForTable > 0 then
- log:info('iterate')
- for i = 1, #markForTable do
- local newId = iterate()
- local data = {markId = newId, text = text, pos = pos, markFor = markFor}
- log:info(data)
- table.insert(mist.marker.list, data)
- trigger.action.markToGroup(newId, text, pos, markForTable[i])
- end
- end
- end
-
+ for i = 1, #fCal do
+ --log:warn(fCal[i])
+ if type(fCal[i]) == 'table' or type(fCal[i]) == 'boolean' then
+ s = s .. mist.utils.oneLineSerialize(fCal[i])
+ else
+ s = s .. fCal[i]
+ end
+ if i < #fCal then
+ s = s .. ','
+ end
+ end
+
+ s = s .. ')'
+ if name then
+ usedMarks[name] = usedId
+ end
+ draw(s)
+
+ else
+
+ draw(data)
+
+ end
+ return data
+ end
end
function mist.marker.remove(id)
- for i, data in pairs(mist.marker.list) do
- if id == data.markId then
- trigger.action.removeMark(id)
- end
- end
+ return removeMark(id)
end
function mist.marker.get(id)
-
+ if mist.DBs.markList[id] then
+ return mist.DBs.markList[id]
+ end
+ local names = {}
+ for markId, data in pairs(mist.DBs.markList) do
+ if data.name and data.name == id then
+ table.insert(names, data)
+ end
+ end
+ if #names >= 1 then
+ return names
+ end
end
- function mist.marker.coords(pos, cType, markFor, id) -- wrapper function to just display coordinates of a specific format at location
-
-
- end
- ]]
+ function mist.marker.drawZone(name, v)
+ if mist.DBs.zonesByName[name] then
+ --log:warn(mist.DBs.zonesByName[name])
+ local vars = v or {}
+ local ref = mist.utils.deepCopy(mist.DBs.zonesByName[name])
+
+ if ref.type == 2 then -- it is a quad, but use freeform cause it isnt as bugged
+ vars.mType = 6
+ vars.point = ref.verticies
+ else
+ vars.mType = 2
+ vars.radius = ref.radius
+ vars.point = ref.point
+ end
+
+
+ if not (vars.ignoreColor and vars.ignoreColor == true) and not vars.fillColor then
+ vars.fillColor = ref.color
+ end
+
+ --log:warn(vars)
+ return mist.marker.add(vars)
+ end
+ end
+
+ function mist.marker.drawShape(name, v)
+ if mist.DBs.drawingByName[name] then
+
+ local d = v or {}
+ local o = mist.utils.deepCopy(mist.DBs.drawingByName[name])
+ --mist.marker.add({point = {x = o.mapX, z = o.mapY}, text = name})
+ --log:warn(o)
+ d.points = o.points or {}
+ if o.primitiveType == "Polygon" then
+ d.mType = 7
+
+ if o.polygonMode == "rect" then
+ d.mType = 6
+ elseif o.polygonMode == "circle" then
+ d.mType = 2
+ d.points = {x = o.mapX, y = o.mapY}
+ d.radius = o.radius
+ end
+ elseif o.primitiveType == "TextBox" then
+ d.mType = 5
+ d.points = {x = o.mapX, y = o.mapY}
+ d.text = o.text or d.text
+ d.fontSize = d.fontSize or o.fontSize
+ end
+ -- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES.
+
+ if o.fillColorString and not d.fillColor then
+ d.fillColor = mist.utils.hexToRGB(o.fillColorString)
+ end
+ if o.colorString then
+ d.color = mist.utils.hexToRGB(o.colorString)
+ end
+
+
+ if o.thickness == 0 then
+ d.lineType = 0
+ elseif o.style == 'solid' then
+ d.lineType = 1
+ elseif o.style == 'dot' then
+ d.lineType = 2
+ elseif o.style == 'dash' then
+ d.lineType = 3
+ else
+ d.lineType = 1
+ end
+
+
+ if o.primitiveType == "Line" and #d.points >= 2 then
+ d.mType = 1
+ local rtn = {}
+ for i = 1, #d.points -1 do
+ local var = mist.utils.deepCopy(d)
+ var.points = {}
+ var.points[1] = d.points[i]
+ var.points[2] = d.points[i+1]
+ table.insert(rtn, mist.marker.add(var))
+ end
+ return rtn
+ else
+ if d.mType then
+ --log:warn(d)
+ return mist.marker.add(d)
+ end
+ end
+ end
+
+
+ end
+
+
+ --[[
+ function mist.marker.circle(v)
+
+
+ end
+]]
end
--- Time conversion functions.
-- @section mist.time
@@ -6430,6 +8129,7 @@ do -- group tasks scope
mist.air = {}
mist.air.fixedWing = {}
mist.air.heli = {}
+ mist.ship = {}
--- Tasks group to follow a route.
-- This sets the mission task for the given group.
@@ -6453,7 +8153,7 @@ do -- group tasks scope
if group then
local groupCon = group:getController()
if groupCon then
- log:warn(misTask)
+ --log:warn(misTask)
groupCon:setTask(misTask)
return true
end
@@ -6475,17 +8175,17 @@ do -- group tasks scope
if type(coa_data) == 'table' then
if coa_data.country then --there is a country table
for cntry_id, cntry_data in pairs(coa_data.country) do
- for obj_type_name, obj_type_data in pairs(cntry_data) do
- if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points
- if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group!
- for group_num, group_data in pairs(obj_type_data.group) do
+ for obj_cat_name, obj_cat_data in pairs(cntry_data) do
+ if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points
+ if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group!
+ for group_num, group_data in pairs(obj_cat_data.group) do
if group_data and group_data.groupId == gpId then -- this is the group we are looking for
if group_data.route and group_data.route.points and #group_data.route.points > 0 then
local points = {}
for point_num, point in pairs(group_data.route.points) do
local routeData = {}
- if env.mission.version > 7 then
+ if env.mission.version > 7 and env.mission.version < 19 then
routeData.name = env.getValueDictByKey(point.name)
else
routeData.name = point.name
@@ -6515,10 +8215,10 @@ do -- group tasks scope
log:error('Group route not defined in mission editor for groupId: $1', gpId)
return
end --if group_data and group_data.name and group_data.name == 'groupname'
- end --for group_num, group_data in pairs(obj_type_data.group) do
- end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then
- end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then
- end --for obj_type_name, obj_type_data in pairs(cntry_data) do
+ end --for group_num, group_data in pairs(obj_cat_data.group) do
+ end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then
+ end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then
+ end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do
end --for cntry_id, cntry_data in pairs(coa_data.country) do
end --if coa_data.country then --there is a country table
end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then
@@ -6822,14 +8522,19 @@ do -- group tasks scope
end
-- need to return a Vec3 or Vec2?
- function mist.getRandPointInCircle(p, radius, innerRadius, maxA, minA)
+ function mist.getRandPointInCircle(p, r, innerRadius, maxA, minA)
local point = mist.utils.makeVec3(p)
local theta = 2*math.pi*math.random()
+ local radius = r or 1000
local minR = innerRadius or 0
if maxA and not minA then
theta = math.rad(math.random(0, maxA - math.random()))
- elseif maxA and minA and minA < maxA then
- theta = math.rad(math.random(minA, maxA) - math.random())
+ elseif maxA and minA then
+ if minA < maxA then
+ theta = math.rad(math.random(minA, maxA) - math.random())
+ else
+ theta = math.rad(math.random(maxA, minA) - math.random())
+ end
end
local rad = math.random() + math.random()
if rad > 1 then
@@ -6854,14 +8559,21 @@ do -- group tasks scope
end
function mist.getRandomPointInZone(zoneName, innerRadius, maxA, minA)
- if type(zoneName) == 'string' and type(trigger.misc.getZone(zoneName)) == 'table' then
- return mist.getRandPointInCircle(trigger.misc.getZone(zoneName).point, trigger.misc.getZone(zoneName).radius, innerRadius, maxA, minA)
- end
+ if type(zoneName) == 'string' then
+ local zone = mist.DBs.zonesByName[zoneName]
+ if zone.type and zone.type == 2 then
+ return mist.getRandomPointInPoly(zone.verticies)
+ else
+ return mist.getRandPointInCircle(zone.point, zone.radius, innerRadius, maxA, minA)
+ end
+ end
return false
end
function mist.getRandomPointInPoly(zone)
- local avg = mist.getAvgPoint(zone)
+ --env.info('Zone Size: '.. #zone)
+ local avg = mist.getAvgPoint(zone)
+ --log:warn(avg)
local radius = 0
local minR = math.huge
local newCoord = {}
@@ -6873,6 +8585,8 @@ do -- group tasks scope
minR = mist.utils.get2DDist(avg, zone[i])
end
end
+ --log:warn('Radius: $1', radius)
+ --log:warn('minR: $1', minR)
local lSpawnPos = {}
for j = 1, 100 do
newCoord = mist.getRandPointInCircle(avg, radius)
@@ -6886,6 +8600,19 @@ do -- group tasks scope
end
return newCoord
end
+
+ function mist.getWindBearingAndVel(p)
+ local point = mist.utils.makeVec3(o)
+ local gLevel = land.getHeight({x = point.x, y = point.z})
+ if point.y <= gLevel then
+ point.y = gLevel + 10
+ end
+ local t = atmosphere.getWind(point)
+ local bearing = math.tan(t.z/t.x)
+ local vel = math.sqrt(t.x^2 + t.z^2)
+ return bearing, vel
+
+ end
function mist.groupToRandomPoint(vars)
local group = vars.group --Required
@@ -6941,25 +8668,25 @@ do -- group tasks scope
return
end
- function mist.groupRandomDistSelf(gpData, dist, form, heading, speed)
+ function mist.groupRandomDistSelf(gpData, dist, form, heading, speed, disableRoads)
local pos = mist.getLeadPos(gpData)
local fakeZone = {}
fakeZone.radius = dist or math.random(300, 1000)
fakeZone.point = {x = pos.x, y = pos.y, z = pos.z}
- mist.groupToRandomZone(gpData, fakeZone, form, heading, speed)
+ mist.groupToRandomZone(gpData, fakeZone, form, heading, speed, disableRoads)
return
end
- function mist.groupToRandomZone(gpData, zone, form, heading, speed)
+ function mist.groupToRandomZone(gpData, zone, form, heading, speed, disableRoads)
if type(gpData) == 'string' then
gpData = Group.getByName(gpData)
end
if type(zone) == 'string' then
- zone = trigger.misc.getZone(zone)
+ zone = mist.DBs.zonesByName[zone]
elseif type(zone) == 'table' and not zone.radius then
- zone = trigger.misc.getZone(zone[math.random(1, #zone)])
+ zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]]
end
if speed then
@@ -6973,7 +8700,7 @@ do -- group tasks scope
vars.headingDegrees = heading
vars.speed = speed
vars.point = mist.utils.zoneToVec3(zone)
-
+ vars.disableRoads = disableRoads
mist.groupToRandomPoint(vars)
return
@@ -7042,7 +8769,7 @@ do -- group tasks scope
function mist.groupToPoint(gpData, point, form, heading, speed, useRoads)
if type(point) == 'string' then
- point = trigger.misc.getZone(point)
+ point = mist.DBs.zonesByName[point]
end
if speed then
speed = mist.utils.kmphToMps(speed)
@@ -7081,6 +8808,16 @@ do -- group tasks scope
return leader:getPosition().p
end
end
+
+ function mist.groupIsDead(groupName) -- copy more or less from on station
+ if Group.getByName(groupName) then
+ local gp = Group.getByName(groupName)
+ if #gp:getUnits() > 0 or gp:isExist() == true then
+ return false
+ end
+ end
+ return true
+ end
end
@@ -7200,7 +8937,7 @@ do -- mist.Logger scope
-- @usage -- log everything
--myLogger:setLevel(3)
function mist.Logger:setLevel(level)
- if not level then
+ if not level then
self.level = 2
else
if type(level) == 'string' then
diff --git a/scripts/parrotSpeak.lua b/scripts/parrotSpeak.lua
new file mode 100644
index 00000000..a24057a4
--- /dev/null
+++ b/scripts/parrotSpeak.lua
@@ -0,0 +1,184 @@
+--------------------------------THIS FIRST BIT IS THE SRS CODE BLOCK-------------------
+-------------------- first 4 things need to be set correctly for the server, they are for ours, we don't do the google creds yet
+
+STTS = {}
+-- FULL Path to the FOLDER containing DCS-SR-ExternalAudio.exe - EDIT TO CORRECT FOLDER
+STTS.DIRECTORY = "C:\\Users\\Administrator\\Desktop\\DCS\\SRS Refugees"
+
+STTS.SRS_PORT = 5002 -- LOCAL SRS PORT - DEFAULT IS 5002
+STTS.GOOGLE_CREDENTIALS = "C:\\Users\\Ciaran\\Downloads\\googletts.json"
+
+-- DONT CHANGE THIS UNLESS YOU KNOW WHAT YOU'RE DOING
+STTS.EXECUTABLE = "DCS-SR-ExternalAudio.exe"
+
+local random = math.random
+function STTS.uuid()
+ local template ='yxxx-xxxxxxxxxxxx'
+ return string.gsub(template, '[xy]', function (c)
+ local v = (c == 'x') and random(0, 0xf) or random(8, 0xb)
+ return string.format('%x', v)
+ end)
+end
+
+function STTS.round(x, n)
+ n = math.pow(10, n or 0)
+ x = x * n
+ if x >= 0 then x = math.floor(x + 0.5) else x = math.ceil(x - 0.5) end
+ return x / n
+end
+
+function STTS.getSpeechTime(length,speed,isGoogle)
+ -- Function returns estimated speech time in seconds
+
+ -- Assumptions for time calc: 100 Words per min, avarage of 5 letters for english word
+ -- so 5 chars * 100wpm = 500 characters per min = 8.3 chars per second
+ -- so lengh of msg / 8.3 = number of seconds needed to read it. rounded down to 8 chars per sec
+ -- map function: (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min
+
+ local maxRateRatio = 3
+
+ speed = speed or 1.0
+ isGoogle = isGoogle or false
+
+ local speedFactor = 1.0
+ if isGoogle then
+ speedFactor = speed
+ else
+ if speed ~= 0 then
+ speedFactor = math.abs(speed) * (maxRateRatio - 1) / 10 + 1
+ end
+ if speed < 0 then
+ speedFactor = 1/speedFactor
+ end
+ end
+
+ local wpm = math.ceil(100 * speedFactor)
+ local cps = math.floor((wpm * 5)/60)
+
+ if type(length) == "string" then
+ length = string.len(length)
+ end
+
+ return math.ceil(length/cps)
+end
+
+function STTS.TextToSpeech(message,freqs,modulations, volume,name, coalition,point, speed,gender,culture,voice, googleTTS )
+ if os == nil or io == nil then
+ env.info("[DCS-STTS] LUA modules os or io are sanitized. skipping. ")
+ return
+ end
+
+ speed = speed or 1
+ gender = gender or "female"
+ culture = culture or ""
+ voice = voice or ""
+
+
+ message = message:gsub("\"","\\\"")
+
+ local cmd = string.format("start /min \"\" /d \"%s\" /b \"%s\" -f %s -m %s -c %s -p %s -n \"%s\" -h", STTS.DIRECTORY, STTS.EXECUTABLE, freqs, modulations, coalition,STTS.SRS_PORT, name )
+
+ if voice ~= "" then
+ cmd = cmd .. string.format(" -V \"%s\"",voice)
+ else
+
+ if culture ~= "" then
+ cmd = cmd .. string.format(" -l %s",culture)
+ end
+
+ if gender ~= "" then
+ cmd = cmd .. string.format(" -g %s",gender)
+ end
+ end
+
+ if googleTTS == true then
+ cmd = cmd .. string.format(" -G \"%s\"",STTS.GOOGLE_CREDENTIALS)
+ end
+
+ if speed ~= 1 then
+ cmd = cmd .. string.format(" -s %s",speed)
+ end
+
+ if volume ~= 1.0 then
+ cmd = cmd .. string.format(" -v %s",volume)
+ end
+
+ if point and type(point) == "table" and point.x then
+ local lat, lon, alt = coord.LOtoLL(point)
+
+ lat = STTS.round(lat,4)
+ lon = STTS.round(lon,4)
+ alt = math.floor(alt)
+
+ cmd = cmd .. string.format(" -L %s -O %s -A %s",lat,lon,alt)
+ end
+
+ cmd = cmd ..string.format(" -t \"%s\"",message)
+
+ if string.len(cmd) > 255 then
+ local filename = os.getenv('TMP') .. "\\DCS_STTS-" .. STTS.uuid() .. ".bat"
+ local script = io.open(filename,"w+")
+ script:write(cmd .. " && exit" )
+ script:close()
+ cmd = string.format("\"%s\"",filename)
+ timer.scheduleFunction(os.remove, filename, timer.getTime() + 1)
+ end
+
+ if string.len(cmd) > 255 then
+ env.info("[DCS-STTS] - cmd string too long")
+ env.info("[DCS-STTS] TextToSpeech Command :\n" .. cmd.."\n")
+ end
+ os.execute(cmd)
+
+ return STTS.getSpeechTime(message,speed,googleTTS)
+
+end
+
+function STTS.PlayMP3(pathToMP3,freqs,modulations, volume,name, coalition,point )
+
+ local cmd = string.format("start \"\" /d \"%s\" /b /min \"%s\" -i \"%s\" -f %s -m %s -c %s -p %s -n \"%s\" -v %s -h", STTS.DIRECTORY, STTS.EXECUTABLE, pathToMP3, freqs, modulations, coalition,STTS.SRS_PORT, name, volume )
+
+ if point and type(point) == "table" and point.x then
+ local lat, lon, alt = coord.LOtoLL(point)
+
+ lat = STTS.round(lat,4)
+ lon = STTS.round(lon,4)
+ alt = math.floor(alt)
+
+ cmd = cmd .. string.format(" -L %s -O %s -A %s",lat,lon,alt)
+ end
+
+ env.info("[DCS-STTS] MP3/OGG Command :\n" .. cmd.."\n")
+ os.execute(cmd)
+
+end
+
+------------------------THIS BIT IS THE CODE YOU'D RUN IN GAME
+
+tts = {}
+tts.words = "All players, all players, AO update in 5 Magic to all players AO update as follows Weather over North ranges is good, recommending full up war. altimeter 3 0 decimal 1 2 , flare restrictions above 5000,in the MOA's and burnout by 100 ft in western ranges. Chaff below 20,000 for all playersAir picture is multiple groups bandits forming a north south CAP 60 miles north west of bullseye, no SAM,manpad or triple A. All units are approved to start moving into tracks for exercise start, exercise commences in 5 minutes"
+
+tts.atis = "All players, all players, AO update in 5 Magic to all players AO update as follows Weather over North ranges is good, recommending full up war. altimeter 3 0 decimal 1 2 , flare restrictions above 5000,in the MOA's and burnout by 100 ft in western ranges. Chaff below 20,000 for all playersAir picture is multiple groups bandits forming a north south CAP 60 miles north west of bullseye, no SAM,manpad or triple A. All units are approved to start moving into tracks for exercise start, exercise commences in 5 minutes"
+
+function tts.notify(message, displayFor)
+ trigger.action.outText(message, displayFor)
+end
+
+function tts.normal ()
+ STTS.TextToSpeech(tts.words,"251","AM","1.0","SRS",2)
+end
+
+function tts.russian ()
+ STTS.TextToSpeech(tts.words,"251","AM","1.0","SRS",2,null,1,"female","ru-RU","Microsoft Irina Desktop")
+end
+
+
+do
+ longRangeShots = missionCommands.addSubMenu("Crash checks")
+ missionCommands.addCommand ("Speak", longRangeShots, tts.normal)
+ missionCommands.addCommand ("Speak russian", longRangeShots, tts.russian)
+
+end
+
+tts.notify("crashTest.lua loaded", 2)
+
diff --git a/scripts/poleGen.lua b/scripts/poleGen.lua
new file mode 100644
index 00000000..16b9e336
--- /dev/null
+++ b/scripts/poleGen.lua
@@ -0,0 +1,628 @@
+--max range, altitude and it fails?
+--shoot right up
+--fix sa10 and sa 11
+
+--different static layouts on a carrier depending on what is going on
+--guns on a static ship at sea?
+
+
+pg = {}
+handler = {}
+pg.name = "Sam"
+pg.cloneName = "Clone"
+pg.fakeTargetName = "Player"
+pg.samCounter = 1
+pg.droneAlt = 20000
+pg.delay = 40
+pg.missileSpeed = 565
+pg.samLoc = {}
+pg.samLoc.x = 1
+pg.samLoc.y = 1
+pg.samLoc.z = 1
+pg.missilesActive = 0
+pg.droneName = nil
+pg.droneSpeed = 300
+pg.hidden = false
+pg.samDB = {[1] = {["missileDelay"] = 40, ["missileSpeed"] = 770},
+ [2] = {["missileDelay"] = 40, ["missileSpeed"] = 770},
+ [3] = {["missileDelay"] = 120, ["missileSpeed"] = 550},
+ [4] = {["missileDelay"] = 40, ["missileSpeed"] = 770},
+ [5] = {["missileDelay"] = 65, ["missileSpeed"] = 770},
+ [6] = {["missileDelay"] = 60, ["missileSpeed"] = 500},
+ [7] = {["missileDelay"] = 40, ["missileSpeed"] = 770},
+ [8] = {["missileDelay"] = 40, ["missileSpeed"] = 770},
+ [9] = {["missileDelay"] = 40, ["missileSpeed"] = 770},
+ [10] = {["missileDelay"] = 60, ["missileSpeed"] = 1400},
+ }
+
+function pg.notify(message, displayFor)
+ trigger.action.outText(message, displayFor, false)
+end
+
+
+function pg.fakeSam(vec3)
+
+ playerTarget = Unit.getByName(pg.fakeTargetName)
+ pointFakeTarget = playerTarget:getPosition().p
+ vec3 = vec3 or pg.samLoc
+
+ vecSub = mist.vec.sub(pointFakeTarget , vec3)
+ planeHeading = mist.utils.getDir(vecSub)
+ missileType = 2
+ pg.spawnDrone (vec3,planeHeading,playerTarget,missileType)
+
+ --pg.notify("FakeSam Ran", 10)
+
+ targetID = Group.getByName("TargetDrone" .. pg.samCounter):getUnit(1):getID()
+ samGroup = Group.getByName("poleGenerator" .. pg.samCounter)
+ vars = {[1] = targetID, [2] = samGroup}
+ timer.scheduleFunction(pg.attack ,vars, timer.getTime() + 1)
+ pg.samCounter = pg.samCounter + 1
+
+end
+
+
+function pg.spawnSamSA2 (vec3,heading)
+ --where
+ --name
+ group = {}
+ group.groupName = "poleGenerator" .. pg.samCounter
+ group.units = {
+ [1] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["hidden"] = pg.hidden,
+ ["type"] = "S_75M_Volhov",
+ --["unitId"] = 35,
+ ["y"] = vec3.z-40,
+ ["x"] = vec3.x-40,
+ --["name"] = "Ground-1-2",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [1]
+ [2] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "SNR_75V",
+ --["unitId"] = 34,
+ ["y"] = vec3.z,
+ ["x"] = vec3.x,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [2]
+ }
+ group.hidden = pg.hidden
+ group.category = "VEHICLE"
+ group.country = 54
+ mist.dynAdd(group)
+ --heading
+end
+
+function pg.spawnSamSA3 (vec3,heading)
+ --where
+ --name
+ group = {}
+ group.groupName = "poleGenerator" .. pg.samCounter
+ group.units = {
+ [1] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["hidden"] = pg.hidden,
+ ["type"] = "snr s-125 tr",
+ --["unitId"] = 35,
+ ["y"] = vec3.z-40,
+ ["x"] = vec3.x-40,
+ --["name"] = "Ground-1-2",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [1]
+ [2] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "5p73 s-125 ln",
+ --["unitId"] = 34,
+ ["y"] = vec3.z,
+ ["x"] = vec3.x,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [2]
+ }
+ group.hidden = pg.hidden
+ group.category = "VEHICLE"
+ group.country = 54
+ mist.dynAdd(group)
+ --heading
+end
+
+function pg.spawnSamSA5 (vec3,heading)
+ --where
+ --name
+ group = {}
+ group.groupName = "poleGenerator" .. pg.samCounter
+ group.units = {
+ [1] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["hidden"] = pg.hidden,
+ ["type"] = "RPC_5N62V",
+ --["unitId"] = 35,
+ ["y"] = vec3.z-40,
+ ["x"] = vec3.x-40,
+ --["name"] = "Ground-1-2",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [1]
+ [2] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "RLS_19J6",
+ --["unitId"] = 34,
+ ["y"] = vec3.z,
+ ["x"] = vec3.x,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [2]
+ [3] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "S-200_Launcher",
+ --["unitId"] = 34,
+ ["y"] = vec3.z-80,
+ ["x"] = vec3.x-80,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [3]
+ }
+ group.hidden = pg.hidden
+ group.category = "VEHICLE"
+ group.country = 54
+ mist.dynAdd(group)
+ --heading
+end
+
+function pg.spawnSamSA6 (vec3,heading)
+ --where
+ --name
+ group = {}
+ group.groupName = "poleGenerator" .. pg.samCounter
+ group.units = {
+ [1] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["hidden"] = pg.hidden,
+ ["type"] = "Kub 1S91 str",
+ --["unitId"] = 35,
+ ["y"] = vec3.z-40,
+ ["x"] = vec3.x-40,
+ --["name"] = "Ground-1-2",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [1]
+ [2] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "Kub 2P25 ln",
+ --["unitId"] = 34,
+ ["y"] = vec3.z,
+ ["x"] = vec3.x,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [2]
+ }
+ group.hidden = pg.hidden
+ group.category = "VEHICLE"
+ group.country = 54
+ mist.dynAdd(group)
+ --heading
+end
+
+function pg.spawnSamSA10 (vec3,heading)
+ --where
+ --name
+ group = {}
+ group.groupName = "poleGenerator" .. pg.samCounter
+ group.units = {
+ [1] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["hidden"] = pg.hidden,
+ ["type"] = "S-300PS 40B6M tr",
+ --["unitId"] = 35,
+ ["y"] = vec3.z,
+ ["x"] = vec3.x,
+ --["name"] = "Ground-1-2",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [1]
+ [2] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "S-300PS 64H6E sr",
+ --["unitId"] = 34,
+ ["y"] = vec3.z-10,
+ ["x"] = vec3.x-10,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [2]
+ [3] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "S-300PS 54K6 cp",
+ --["unitId"] = 34,
+ ["y"] = vec3.z-20,
+ ["x"] = vec3.x-20,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [3]
+ [4] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "S-300PS 5P85C ln",
+ --["unitId"] = 34,
+ ["y"] = vec3.z-40,
+ ["x"] = vec3.x-40,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [4]
+ }
+ group.hidden = pg.hidden
+ group.category = "VEHICLE"
+ group.country = 54
+ mist.dynAdd(group)
+ --heading
+end
+
+function pg.spawnSamSA11 (vec3,heading)
+ --where
+ --name
+ group = {}
+ group.groupName = "poleGenerator" .. pg.samCounter
+ group.units = {
+ [1] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["hidden"] = pg.hidden,
+ ["type"] = "SA-11 Buk SR 9S18M1",
+ --["unitId"] = 35,
+ ["y"] = vec3.z-40,
+ ["x"] = vec3.x-40,
+ --["name"] = "Ground-1-2",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [1]
+ [2] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "SA-11 Buk CC 9S470M1",
+ --["unitId"] = 34,
+ ["y"] = vec3.z,
+ ["x"] = vec3.x,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [2]
+ [2] =
+ {
+ ["skill"] = "High",
+ ["coldAtStart"] = false,
+ ["type"] = "SA-11 Buk LN 9A310M1",
+ --["unitId"] = 34,
+ ["y"] = vec3.z,
+ ["x"] = vec3.x,
+ --["name"] = "Ground-1-1",
+ ["heading"] = heading+math.pi,
+ ["playerCanDrive"] = false,
+ }, -- end of [2]
+ }
+ group.hidden = pg.hidden
+ group.category = "VEHICLE"
+ group.country = 54
+ mist.dynAdd(group)
+ --heading
+end
+
+
+
+function pg.spawnDrone(vec3,planeHeading,playerTarget,missileType)
+ -- where is the plane going to be in x seconds
+ playerTargetPos = playerTarget:getPosition().p
+ futurePlayerTargetPos = playerTargetPos
+ playerMotionVec = Object.getVelocity(playerTarget)
+
+ --work out what type of SAM we are shooting to work out the delay, missile speed etc
+
+ if missileType == 2 then
+ pg.delay = pg.samDB[2].missileDelay
+ pg.missileSpeed = pg.samDB[2].missileSpeed
+ elseif missileType == 3 then
+ pg.delay = pg.samDB[3].missileDelay
+ pg.missileSpeed = pg.samDB[3].missileSpeed
+ elseif missileType == 5 then
+ pg.delay = pg.samDB[5].missileDelay
+ pg.missileSpeed = pg.samDB[5].missileSpeed
+ elseif missileType == 6 then
+ pg.delay = pg.samDB[6].missileDelay
+ pg.missileSpeed = pg.samDB[5].missileSpeed
+ elseif missileType == 10 then
+ pg.delay = pg.samDB[10].missileDelay
+ pg.missileSpeed = pg.samDB[10].missileSpeed
+ elseif missileType == 11 then
+ pg.delay = pg.samDB[11].missileDelay
+ pg.missileSpeed = pg.samDB[11].missileSpeed
+ else --assume SA2
+ pg.delay = pg.samDB[2].missileDelay
+ pg.missileSpeed = pg.samDB[2].missileSpeed
+ end
+
+ futurePlayerTargetPos.x = playerTargetPos.x + playerMotionVec.x*pg.delay
+ futurePlayerTargetPos.y = playerTargetPos.y + playerMotionVec.y*pg.delay
+ futurePlayerTargetPos.z = playerTargetPos.z + playerMotionVec.z*pg.delay
+ droneTurnPoint = mist.projectPoint(futurePlayerTargetPos, 10000 ,planeHeading+math.pi)
+ --this is where the plane will be when the missile is launched
+
+
+
+ --pythago to get hyp
+ --x^2 + y^x = hyp^2
+ x = mist.utils.get2DDist(futurePlayerTargetPos,vec3)
+
+ y = playerTargetPos.y
+ --pg.notify(y,5)
+ hyp = math.sqrt(x^2 + y^2)
+ roughFlightTime = hyp /pg.missileSpeed-- distance / speed
+
+ futurePlayerTargetPos.x = futurePlayerTargetPos.x + playerMotionVec.x*roughFlightTime
+ futurePlayerTargetPos.y = futurePlayerTargetPos.y + playerMotionVec.y*roughFlightTime
+ futurePlayerTargetPos.z = futurePlayerTargetPos.z + playerMotionVec.z*roughFlightTime
+ --this is where the plane will be when the missile arrives at its altitude
+
+ --now we need to work out where the drone is going to go
+ vecSub = mist.vec.sub(vec3,futurePlayerTargetPos)
+ heading = mist.utils.getDir(vecSub) --heading between picked location and future pos
+ extendDistance = x + 10000
+
+ alt = (((futurePlayerTargetPos.y) * extendDistance)/x)
+
+ droneAtTimePos = mist.projectPoint(vec3, extendDistance ,heading +math.pi)
+
+ extendDistance = extendDistance + pg.droneSpeed*roughFlightTime
+ droneAtStartPos = mist.projectPoint(vec3, extendDistance ,heading +math.pi)
+ --we want to curve the missile in the players direction
+ --planeHeading
+
+ pg.makeDrone(droneAtStartPos,heading, droneAtTimePos, futurePlayerTargetPos,alt,droneTurnPoint)
+ if missileType == 2 then
+ pg.spawnSamSA2 (vec3,heading)
+ elseif missileType == 3 then
+ pg.spawnSamSA3 (vec3,heading)
+ elseif missileType == 5 then
+ pg.spawnSamSA5 (vec3,heading)
+ elseif missileType == 6 then
+ pg.spawnSamSA6 (vec3,heading)
+ elseif missileType == 10 then
+ pg.spawnSamSA10 (vec3,heading)
+ else --assume SA2
+ pg.spawnSamSA2 (vec3,heading)
+ end
+
+
+end
+
+function pg.makeDrone(spawnVec,heading, routeVec, nextRouteVec,alt,droneTurnPoint)
+ --this spawns in the drone
+ group = DroneClone
+ group.groupName = "TargetDrone" .. pg.samCounter
+ group.groupId = nil
+ group.units[1].unitId = nil
+ group.units[1].unitName = nil
+ group.units[1].y = spawnVec.z
+ group.units[1].x = spawnVec.x
+ group.units[1].heading = heading
+ group.units[1].alt = alt
+ group.route["points"][2] = group.route["points"][1]
+ group.route["points"][3] = group.route["points"][1]
+ group.route["points"][1]["y"] = routeVec.z
+ group.route["points"][1]["x"] = routeVec.x
+ group.route["points"][1]["alt"] = alt
+ group.route["points"][2]["y"] = nextRouteVec.z
+ group.route["points"][2]["x"] = nextRouteVec.x
+ group.route["points"][2]["alt"] = alt
+ group.route["points"][3]["y"] = droneTurnPoint.z
+ group.route["points"][3]["x"] = droneTurnPoint.x
+ group.route["points"][3]["alt"] = alt
+ group.countryId = 56
+ group.category = 'AIRPLANE'
+ mist.dynAdd(group)
+end
+
+
+function pg.attack (vars)
+ targetID = vars[1]
+ samGroup = vars[2]
+ AttackUnit = {
+ id = 'AttackUnit',
+ params = {
+ unitId = targetID,
+ attackQtyLimit = true,
+ attackQty = 1,
+ }
+ }
+
+ local controller = samGroup:getController()
+ controller:pushTask(AttackUnit)
+end
+
+
+
+function pg.radarOff ()
+ group = Group.getByName(pg.name)
+ local controller = group:getController()
+ controller:setOption(9,1)
+end
+
+function pg.radarOn ()
+ group = Group.getByName(pg.name)
+ local controller = group:getController()
+ controller:setOption(9,0)
+end
+
+ DroneClone=
+ {
+ ["modulation"] = 0,
+ ["tasks"] =
+ {
+ }, -- end of ["tasks"]
+ ["task"] = "Reconnaissance",
+ ["uncontrolled"] = false,
+ ["route"] =
+ {
+ ["points"] =
+ {
+ [1] =
+ {
+ ["alt"] = 2000,
+ ["action"] = "Turning Point",
+ ["alt_type"] = "BARO",
+ ["speed"] = 82.222222222222,
+ ["task"] =
+ {
+ ["id"] = "ComboTask",
+ ["params"] =
+ {
+ ["tasks"] =
+ {}, -- end of ["tasks"]
+ }, -- end of ["params"]
+ }, -- end of ["task"]
+ ["type"] = "Turning Point",
+ ["ETA"] = 0,
+ ["ETA_locked"] = true,
+ ["y"] = 0,
+ ["x"] = 0,
+ ["formation_template"] = "",
+ ["speed_locked"] = true,
+ }, -- end of [1]
+ [2] =
+ {
+ ["alt"] = 2000,
+ ["action"] = "Turning Point",
+ ["alt_type"] = "BARO",
+ ["speed"] = 82.222222222222,
+ ["task"] =
+ {
+ ["id"] = "ComboTask",
+ ["params"] =
+ {
+ ["tasks"] =
+ {
+ }, -- end of ["tasks"]
+ }, -- end of ["params"]
+ }, -- end of ["task"]
+ ["type"] = "Turning Point",
+ ["ETA"] = 157.20107538291,
+ ["ETA_locked"] = false,
+ ["y"] = 0,
+ ["x"] = 0,
+ ["formation_template"] = "",
+ ["speed_locked"] = true,
+ }, -- end of [2]
+ }, -- end of ["points"]
+ }, -- end of ["route"]
+ --["groupId"] = 1,
+ ["hidden"] = pg.hidden,
+ ["units"] =
+ {
+ [1] =
+ {
+ ["alt"] = 2000,
+ ["alt_type"] = "BARO",
+ ["livery_id"] = "'camo' scheme",
+ ["skill"] = "High",
+ ["speed"] = 82.222222222222,
+ ["type"] = "MQ-9 Reaper",
+ --["unitId"] = 1,
+ --["psi"] = -3.129323330636,
+ ["y"] = 0,
+ ["x"] = 0,
+ ["payload"] =
+ {
+ ["pylons"] =
+ {
+ }, -- end of ["pylons"]
+ ["fuel"] = 1300,
+ ["flare"] = 0,
+ ["chaff"] = 0,
+ ["gun"] = 100,
+ }, -- end of ["payload"]
+ ["heading"] = 0.5,
+ ["callsign"] =
+ {
+ [1] = 1,
+ [2] = 1,
+ [3] = 1,
+ ["name"] = "Enfield11",
+ }, -- end of ["callsign"]
+ ["onboard_num"] = "010",
+ }, -- end of [1]
+ }, -- end of ["units"]
+ ["y"] = 0,
+ ["x"] = 0,
+ ["communication"] = true,
+ ["start_time"] = 0,
+ ["frequency"] = 124,
+ }
+
+
+local function protectedCall(...)
+ local status, retval = pcall(...)
+ if not status then
+
+ end
+end
+
+function handler:onEvent(event)
+ protectedCall(pg.eventHandler, event)
+end
+
+function pg.eventHandler (event)
+ if (26 == event.id) then --this is when someone types into a mark
+ local vec3 = mist.utils.makeVec3GL(event.pos)
+ pg.fakeSam (vec3)
+ end
+end
+
+function handler:onEvent(event)
+ protectedCall(pg.eventHandler, event)
+end
+
+
+do
+ longRangeShots = missionCommands.addSubMenu("SAM")
+ missionCommands.addCommand ("Generate pole", longRangeShots, pg.fakeSam)
+ world.addEventHandler(handler)
+end
+
+pg.notify("poleGen.lua",10)
+
diff --git a/scripts/raisedShots.lua b/scripts/raisedShots.lua
new file mode 100644
index 00000000..95fdc8f8
--- /dev/null
+++ b/scripts/raisedShots.lua
@@ -0,0 +1,319 @@
+shots = {} --https://www.youtube.com/watch?v=XNtTEibFvlQ mandatory terrible listening
+shots.shooterName = "TestInfantry"
+shots.targetName = "TestTarget1"
+
+function shots.notify(message, displayFor)
+ trigger.action.outText(message, displayFor, false)
+end
+
+
+
+--infantry
+
+function shots.set556 () --red
+ roundVelocity = 910
+ unitBarrelHeight = 1
+ shotsToFire = 5
+ shotDelay = 4.5
+ shots.notify("5.56 M4 Georgia", 2)
+ shots.fire()
+end
+
+function shots.set556SAW () --red
+ roundVelocity = 915
+ unitBarrelHeight = 0.4
+ shotsToFire = 5
+ shotDelay = 4.5
+ shots.notify("5.56 M249 SAW", 2)
+ shots.fire()
+
+end
+
+function shots.setAk74() --red
+ roundVelocity = 900
+ unitBarrelHeight = 0.9
+ shotsToFire = 5
+ shotDelay = 4.5
+ shots.notify("Ak74", 2)
+ shots.fire()
+end
+
+--technicals
+
+function shots.hmmwv() --red
+ roundVelocity = 928
+ unitBarrelHeight = 2.6
+ shotsToFire = 5
+ shotDelay = 2.5
+ shots.notify("Humm drumm Vee", 2)
+ shots.fire()
+ shots.notify(unitBarrelHeight,2)
+
+end
+
+function shots.technicalDHSKA() --green
+ roundVelocity = 928
+ unitBarrelHeight = 2.2
+ shotsToFire = 5
+ shotDelay = 2.5
+ shots.notify("technicalDHSKA", 2)
+ shots.fire()
+ shots.notify(unitBarrelHeight,2)
+
+end
+
+function shots.cobra() --green
+ roundVelocity = 928
+ unitBarrelHeight = 2.85
+ shotsToFire = 5
+ shotDelay = 2.6
+ shots.notify("Cobra", 2)
+ shots.fire()
+ shots.notify(unitBarrelHeight,2)
+
+end
+--IFVs
+
+function shots.setWarrior() --white
+ roundVelocity = 1070
+ unitBarrelHeight = 2.28
+ shotsToFire = 3
+ shotDelay = 6.3
+ shots.fire()
+end
+
+function shots.setBMP2() --red
+ roundVelocity = 970
+ unitBarrelHeight = 1.95
+ shotsToFire = 3
+ shotDelay = 6
+ shots.fire()
+end
+
+--Tanks
+
+function shots.m1a1() --red
+ roundVelocity = 928
+ unitBarrelHeight = 2.15
+ shotsToFire = 5
+ shotDelay = 3
+ shots.notify("Abrams 50 cal", 2)
+ shots.fire()
+ shots.notify(unitBarrelHeight,2)
+
+end
+
+function shots.t55() --red and green
+ roundVelocity = 928
+ unitBarrelHeight = 1.75
+ shotsToFire = 5
+ shotDelay = 2.6
+ shots.notify("T-72B", 2)
+ shots.fire()
+ shots.notify(unitBarrelHeight,2)
+end
+
+---aaaaaaaaaaaaaaaa
+
+function shots.ZSU57() --red
+ roundVelocity = 1070
+ shotsToFire = 2
+ shotDelay = 10.5
+ shots.notify("ZSU57", 2)
+ unitMaxRange = 6000
+ shots.fireAAA()
+end
+
+function shots.ZSU23() --red
+ roundVelocity = 1050
+ shotsToFire = 2
+ shotDelay = 12
+ shots.notify("ZSU23", 2)
+ unitMaxRange = 2000
+ shots.fireAAA()
+end
+
+function shots.vulcan() --red
+ roundVelocity = 1030
+ shotsToFire = 5
+ shotDelay = 5
+ shots.notify("Vulcan M163", 2)
+ unitMaxRange = 1500
+ shots.fireAAA()
+end
+
+function shots.flak18() --red and green
+ roundVelocity = 870
+ shotsToFire = 1
+ shotDelay = 10.5
+ shots.notify("Flak 18", 2)
+ unitMaxRange = 4000
+ shots.fireAAA()
+end
+
+
+
+
+-- This one is really obvious, however I set towards the end of this file the "parameters" of the shots.
+function shots.fire()
+ unit = Unit.getByName(shots.shooterName)
+ target = Unit.getByName(shots.targetName)
+ local targetMotionVec = Object.getVelocity(target) --if you don't want to do this i.e. shoot a point send a nil or a vec3 of 0's
+ --local targetMotionVec = nil
+ local targetPos = target:getPosition().p
+ shots.calculateAngle(roundVelocity, unit, targetPos, unitBarrelHeight, shotsToFire,shotDelay, targetMotionVec)
+end
+
+--main bit that does the maths for simulating a "roughly level" fire fight, not to be used when aiming AAA at aircraft
+function shots.calculateAngle(v, unit, targetPos, unitBarrelHeight, shotsToFire,shotDelay, targetMotionVector)
+ --v muzzle velocity
+ --unit is unit object you want shooting
+ --targetPos is a position on the ground, doesn't have to be a targets actual location
+ --unitBarrelHeigh is the height the gun is at when it fires
+ --shotsToFire is how many rounds to shoot, 5 is a nice number except for large calibre slow guns
+ --shotDelay how long it on average takes to aim from scratch at something and shoot, mostly used in aiming lead
+ --targetMotionVector a vec3 of the targets motion if nil just shoots at a spot
+
+ g = 9.81 -- gravity, change if on the moon veltro you comment reading prick
+
+ local unitPos = unit:getPosition().p
+ local x = mist.utils.get2DDist(unitPos,targetPos) -- horizontal range
+ local x3d = mist.utils.get3DDist(unitPos,targetPos) -- slant range
+
+ y = targetPos.y - unitPos.y
+ y = y - unitBarrelHeight
+
+ --works out some stuff for trig later, like x,y and hypoteneueussueee
+
+ if targetMotionVector == nil then
+ --no moving? nothing to ammend
+ else --work out where target will be when the bullet arrives
+ shotDelay = shotDelay + x3d/v --time taken to aim and time for bullet to fly to spot
+ newPosition = mist.utils.tableShow(targetMotionVector)
+ targetPos.x = targetPos.x + targetMotionVector.x*shotDelay
+ targetPos.y = targetPos.y + targetMotionVector.y*shotDelay
+ targetPos.z = targetPos.z + targetMotionVector.z*shotDelay
+ end
+
+ x = x - 10 --we actually are aiming 10m in front always so need to remove this
+
+ local inner = v^4 - g * (g * x^2 + 2 * y * v^2) -- this is the inner bit of the quadratic equation for ease of code
+
+ if inner < 0 then
+ -- No solution exists for these parameters, too far away do nothing we can't hit it, saves us crashing if sqrt of negative
+ else
+ local angle2 = math.atan((v^2 - math.sqrt(inner)) / (g * x)) -- do the whole quadratic equation
+ -- we didn't need to do the +- sqrt b^2..... bits as we care about the flat path not the one shot miles up falling down
+
+ local aimUp = 10 * math.tan(angle2)*math.cos(angle2) -- we have to tell dcs to "aim up" at a point 10m ahead of it, this is distance * tan(angle) , so where the fuck has the cos come from? That is because aim correction for shooting up and down is basically modfied by cos(angle) so lazy correction and dcs can't shoot vertically up
+ local xPosDifference = (targetPos.x - unitPos.x)
+ local zPosDifference = (targetPos.z - unitPos.z)
+ local hyp = math.sqrt((xPosDifference*xPosDifference) + (zPosDifference*zPosDifference))
+ xPosDifference = (xPosDifference /hyp) * 10
+ zPosDifference = (zPosDifference / hyp) * 10
+
+ unitPos.x = unitPos.x + xPosDifference
+ unitPos.z = unitPos.z + zPosDifference
+
+ --that was all basic trig maths
+
+ local controller = unit:getController()
+ FireAtPoint = {
+ id = 'FireAtPoint',
+ params = {
+ point = {x = unitPos.x, y = unitPos.z},
+ radius = 0.0001,
+ expendQty = shotsToFire,
+ expendQtyEnabled = true,
+ altitude = unitPos.y+unitBarrelHeight +aimUp, --this is a realtive to sea level shot, so we can shoot down
+ alt_type = 0, --0 = sea level, 1 = ground level
+ }
+ }
+ controller:pushTask(FireAtPoint) --FIREEEEEE
+ end
+end
+
+
+function shots.fireAAA()
+ unit = Unit.getByName(shots.shooterName)
+ target = Unit.getByName(shots.targetName)
+ targetMotionVec = Object.getVelocity(target) --if you don't want to do this i.e. shoot a point send a nil or a vec3 of 0's
+ --local targetMotionVec = nil
+ targetPos = target:getPosition().p
+ shots.aaa(roundVelocity, unit, unitMaxRange, targetPos, shotsToFire,shotDelay, targetMotionVec)
+end
+
+--aaa fires almost straight up, no line of sight fakery needed or working out lobbing bullets onto random points
+--if in range just needs to be told to shoot where the target will be in a few seconds
+--if out of range, we just need to extrapolate back and fire inside max range and randomise the up and down, then let it miss
+
+function shots.aaa(v, unit, unitMaxRange, targetPos, shotsToFire,shotDelay, targetMotionVector)
+ local unitPos = unit:getPosition().p
+ local x = mist.utils.get2DDist(unitPos,targetPos) -- horizontal range
+ local x3d = mist.utils.get3DDist(unitPos,targetPos) -- slant range
+
+ if x3d > unitMaxRange then
+ if targetMotionVector == nil then
+ --no moving? nothing to ammend
+ else --work out where target will be when the bullet arrives
+ shotDelay = shotDelay + x3d/(v/2) --time taken to aim and time for bullet to fly to spot long range roughly 50% slowdown
+ newPosition = mist.utils.tableShow(targetMotionVector)
+ targetPos.x = targetPos.x + targetMotionVector.x*shotDelay
+ targetPos.y = targetPos.y + targetMotionVector.y*shotDelay
+ targetPos.z = targetPos.z + targetMotionVector.z*shotDelay
+ end
+
+ difference = mist.vec.sub(targetPos,unitPos)
+ unitVec = mist.vec.getUnitVec(difference)
+ extendPath = mist.vec.scalar_mult(unitVec ,unitMaxRange)
+ targetPos = mist.vec.add(extendPath,unitPos)
+
+
+ local controller = unit:getController()
+ FireAtPoint = {
+ id = 'FireAtPoint',
+ params = {
+ point = {x = targetPos.x, y = targetPos.z},
+ radius = 0.0001,
+ expendQty = shotsToFire,
+ expendQtyEnabled = true,
+ altitude = targetPos.y+math.random(1,500), --this is a realtive to sea level shot, so we can shoot down
+ alt_type = 0, --0 = sea level, 1 = ground level
+ }
+ }
+ controller:pushTask(FireAtPoint) --FIREEEEEE
+ else
+ if targetMotionVector == nil then
+ --no moving? nothing to ammend
+ else --work out where target will be when the bullet arrives
+ shotDelay = shotDelay + x3d/v --time taken to aim and time for bullet to fly to spot
+ newPosition = mist.utils.tableShow(targetMotionVector)
+ targetPos.x = targetPos.x + targetMotionVector.x*shotDelay
+ targetPos.y = targetPos.y + targetMotionVector.y*shotDelay
+ targetPos.z = targetPos.z + targetMotionVector.z*shotDelay
+ end
+
+ local controller = unit:getController()
+ FireAtPoint = {
+ id = 'FireAtPoint',
+ params = {
+ point = {x = targetPos.x, y = targetPos.z},
+ radius = 0.0001,
+ expendQty = shotsToFire,
+ expendQtyEnabled = true,
+ altitude = targetPos.y, --this is a realtive to sea level shot, so we can shoot down
+ alt_type = 0, --0 = sea level, 1 = ground level
+ }
+ }
+ controller:pushTask(FireAtPoint) --FIREEEEEE
+ end
+end
+
+
+do
+ longRangeShots = missionCommands.addSubMenu("Firefight")
+ missionCommands.addCommand ("Fire", longRangeShots, shots.vulcan)
+
+end
+
+shots.notify("raisedShots.lua ran", 2)
\ No newline at end of file
diff --git a/scripts/samSimulator.lua b/scripts/samSimulator.lua
new file mode 100644
index 00000000..bc17b69a
--- /dev/null
+++ b/scripts/samSimulator.lua
@@ -0,0 +1,540 @@
+--Spawn a SAM integrated with IADS
+--Spawn a normal SAM
+--SAM bubble shields
+
+samSim = {}
+samSim.samSuffix = 1
+
+do -- needs to go early on
+ redIADS = SkynetIADS:create('Red')
+ redIADS:setUpdateInterval(5)
+ redIADS:activate()
+ --redIADS:addRadioMenu()
+end
+
+function samSim.genSAten() --gens an SA 10 as you can imagine,
+ unit = Unit.getByName("Test")
+ local pointVec3Gl = unit:getPosition().p -- this is just to find where my aircraft is and whack an SA10 below it, lazy not relevant
+ local isHiddenCheck = math.random(100)
+ if isHiddenCheck > 10 then
+ isHidden = false
+ else
+ isHidden = true -- fairly obvious hides from F10 and F7 view
+ end
+ mist.dynAdd(
+ {
+ country = 'USSR',
+ category = 'vehicle',
+ name = "SAM " .. samSim.samSuffix,
+ groupName = "SAM " .. samSim.samSuffix,
+ groupId = 10000+samSim.samSuffix,
+ hidden = isHidden,
+ units =
+ { [1] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S-300PS 40B6MD sr", --search radar needs to be first always for avoiding a skynet bug
+ ["y"] = pointVec3Gl.z + 50,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [1]
+ [2] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S-300PS 40B6M tr",
+ ["y"] = pointVec3Gl.z,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 4.7123889803847,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [2]
+
+ [3] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S-300PS 54K6 cp",
+ ["y"] = pointVec3Gl.z + 100,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.1415926535898,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [3]
+ [4] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S-300PS 64H6E sr",
+ ["y"] = pointVec3Gl.z - 50,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.1415926535898,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [4]
+ [5] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S-300PS 5P85C ln",
+ ["y"] = pointVec3Gl.z +200 ,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.1415926535898,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [5]
+ [6] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S-300PS 5P85C ln",
+ ["y"] = pointVec3Gl.z -200,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.3161255787892,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [6]
+ [7] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S-300PS 5P85C ln",
+ ["y"] = pointVec3Gl.z ,
+ ["x"] = pointVec3Gl.x + 200,
+ ["heading"] = 2.9670597283904,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [7]
+ [8] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Excellent",
+ ["type"] = "S-300PS 5P85C ln",
+ ["y"] = pointVec3Gl.z,
+ ["x"] = pointVec3Gl.x -200,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [8]
+ [9] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "generator_5i57",
+ ["y"] = pointVec3Gl.z +200,
+ ["x"] = pointVec3Gl.x + 200,
+ ["heading"] = 6.1086523819802,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [9]
+ [10] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "ATZ-5",
+ ["y"] = pointVec3Gl.z -200,
+ ["x"] = pointVec3Gl.x -200,
+ ["heading"] = 0.17453292519943,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [10]
+ [11] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "ATZ-5",
+ ["y"] = pointVec3Gl.z +550,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [11]
+ [12] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "GAZ-66",
+ ["y"] = pointVec3Gl.z +580,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [12]
+ [13] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "ATZ-60_Maz",
+ ["y"] = pointVec3Gl.z +600,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [13]
+ [14] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "KAMAZ Truck",
+ ["y"] = pointVec3Gl.z +500,
+ ["x"] = pointVec3Gl.x + 20,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [14]
+ }, -- end of units
+ } -- end of function
+ )
+ redIADS:addSAMSite("SAM " .. samSim.samSuffix) --skynet bit
+ local detectChance = math.random(50,90)
+ local goLiveRange = math.random(50,90)
+ local harmStop = math.random(2)
+ if harmStop == 1 then
+ harmStopping = true
+ else
+ harmStopping = false
+ end
+ redIADS:getSAMSiteByGroupName("SAM " .. samSim.samSuffix):setHARMDetectionChance(detectChance) -- doesn't bloody work no idea, don't care want to reinvent this myself
+ redIADS:getSAMSiteByGroupName("SAM " .. samSim.samSuffix):setGoLiveRangeInPercent(goLiveRange) -- doesn't bloody work no idea, don't care want to reinvent this myself
+ redIADS:getSAMSiteByGroupName("SAM " .. samSim.samSuffix):setCanEngageHARM(harmStopping) -- doesn't bloody work no idea, don't care want to reinvent this myself
+
+ samSim.samSuffix = samSim.samSuffix + 1
+end
+
+function samSim.genSAtwo()
+ unit = Unit.getByName("Test")
+ local pointVec3Gl = unit:getPosition().p -- this is just to find where my aircraft is and whack an SA10 below it, lazy not relevant
+
+ local isHiddenCheck = math.random(100)
+ if isHiddenCheck > 50 then
+ isHidden = false
+ else
+ isHidden = true
+ end
+
+ mist.dynAdd(
+ {
+ country = 'USSR',
+ category = 'vehicle',
+ name = "SAM " .. samSim.samSuffix,
+ groupName = "SAM " .. samSim.samSuffix,
+ groupId = 10000+samSim.samSuffix,
+ hidden = isHidden,
+ units =
+ {
+ [1] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "SNR_75V",
+ ["y"] = pointVec3Gl.z,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 4.7123889803847,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [1]
+ [2] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S_75M_Volhov",
+ ["y"] = pointVec3Gl.z + 50,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [2]
+ [3] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S_75M_Volhov",
+ ["y"] = pointVec3Gl.z + 100,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.1415926535898,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [3]
+ [4] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S_75M_Volhov",
+ ["y"] = pointVec3Gl.z - 50,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.1415926535898,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [4]
+ [5] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S_75M_Volhov",
+ ["y"] = pointVec3Gl.z +200 ,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.1415926535898,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [5]
+ [6] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "S_75M_Volhov",
+ ["y"] = pointVec3Gl.z -200,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 3.3161255787892,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [6]
+ [7] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "SKP-11",
+ ["y"] = pointVec3Gl.z ,
+ ["x"] = pointVec3Gl.x + 200,
+ ["heading"] = 2.9670597283904,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [7]
+ [8] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Excellent",
+ ["type"] = "SKP-11",
+ ["y"] = pointVec3Gl.z,
+ ["x"] = pointVec3Gl.x -200,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [8]
+ [9] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "p-19 s-125 sr",
+ ["y"] = pointVec3Gl.z +200,
+ ["x"] = pointVec3Gl.x + 200,
+ ["heading"] = 6.1086523819802,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [9]
+ [10] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "Ural-4320 APA-5D",
+ ["y"] = pointVec3Gl.z -200,
+ ["x"] = pointVec3Gl.x -200,
+ ["heading"] = 0.17453292519943,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [10]
+ [11] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "ATMZ-5",
+ ["y"] = pointVec3Gl.z +550,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [11]
+ [12] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "Ural-4320T",
+ ["y"] = pointVec3Gl.z +580,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [12]
+ [13] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "Ural-4320T",
+ ["y"] = pointVec3Gl.z +600,
+ ["x"] = pointVec3Gl.x,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [13]
+ [14] =
+ {
+ ["transportable"] =
+ {
+ ["randomTransportable"] = false,
+ }, -- end of ["transportable"]
+ ["skill"] = "Random",
+ ["type"] = "ATMZ-5",
+ ["y"] = pointVec3Gl.z +500,
+ ["x"] = pointVec3Gl.x + 20,
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ livery_id = "desert",
+ }, -- end of [14]
+ }, -- end of units
+ } -- end of function
+ )
+ redIADS:addSAMSite("SAM " .. samSim.samSuffix)
+ local detectChance = math.random(75,100)
+ local goLiveRange = math.random(50,90)
+ redIADS:getSAMSiteByGroupName("SAM " .. samSim.samSuffix):setHARMDetectionChance(detectChance)
+ redIADS:getSAMSiteByGroupName("SAM " .. samSim.samSuffix):setGoLiveRangeInPercent(goLiveRange)
+
+ samSim.samSuffix = samSim.samSuffix + 1
+end
+
+function samSim.genCMD()
+ unit = Unit.getByName("Test")
+ local pointVec3Gl = unit:getPosition().p
+ mist.dynAddStatic(
+ {
+ country = 'USSR',
+ category = 'Fortifications',
+ name = "CMD " .. samSim.samSuffix,
+ type = ".Command Center",
+ x = pointVec3Gl.x,
+ y = pointVec3Gl.z,
+ heading = math.pi*3/2,
+ } -- end of function
+ )
+ nameToAdd = "CMD ".. samSim.samSuffix --.. " " .. "unit1"
+ local commandCenter = StaticObject.getByName(nameToAdd)
+ redIADS:addCommandCenter(commandCenter)
+ redIADS = SkynetIADS:create(nameToAdd)
+ redIADS:activate()
+ samSim.samSuffix = samSim.samSuffix + 1
+end
+
+function samSim.genEWR()
+ unit = Unit.getByName("Test")
+ local pointVec3Gl = unit:getPosition().p
+ mist.dynAdd(
+ {
+ country = 'USSR',
+ category = 'vehicle',
+ groupName = "EW " .. samSim.samSuffix,
+ name = "EW " .. samSim.samSuffix,
+ groupId = 20000+samSim.samSuffix,
+ units =
+ {
+ [1] =
+ {
+ ["skill"] = "Random",
+ ["type"] = "55G6 EWR",
+ ["y"] = pointVec3Gl.z,
+ ["x"] = pointVec3Gl.x,
+ livery_id = "",
+ ["heading"] = 0,
+ ["playerCanDrive"] = true,
+ },
+ }, -- end of units
+ } -- end of function
+ )
+ nameToAdd = "EW ".. samSim.samSuffix .. " " .. "unit1" -- oddly this is the unit name not the group, if you don't use this naming convention change it
+ redIADS:addEarlyWarningRadar(nameToAdd)
+ --redIADS:addEarlyWarningRadarsByPrefix("EW")
+ samSim.samSuffix = samSim.samSuffix + 1
+end
+
+
+
+
+do
+ samSims = missionCommands.addSubMenu("Sam stuff")
+ missionCommands.addCommand ("Spawn SA 10", samSims, samSim.genSAten)
+ missionCommands.addCommand ("Spawn EWR", samSims, samSim.genEWR)
+ missionCommands.addCommand ("Spawn SA 2", samSims, samSim.genSAtwo)
+ missionCommands.addCommand ("Spawn Command Centre and activate", samSims, samSim.genCMD)
+end
\ No newline at end of file
diff --git a/scripts/templates.lua b/scripts/templates.lua
new file mode 100644
index 00000000..9c7624b1
--- /dev/null
+++ b/scripts/templates.lua
@@ -0,0 +1,1354 @@
+templates =
+{
+ ["NASAMS Bty CJTF Blue"] =
+ {
+ ["type"] = "vehicle",
+ ["name"] = "NASAMS Bty CJTF Blue",
+ ["country"] = 80,
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "NASAMS_Command_Post",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -14.042657040991,
+ ["dy"] = 54.532318175887,
+ ["name"] = "NASAMS_LN_B",
+ ["skill"] = "High",
+ ["heading"] = 2.3561944901923,
+ }, -- end of [2]
+ [3] =
+ {
+ ["dx"] = 51.255698199675,
+ ["dy"] = -5.1489742484409,
+ ["name"] = "NASAMS_LN_B",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [3]
+ [4] =
+ {
+ ["dx"] = 29.255535502103,
+ ["dy"] = 55.936583879986,
+ ["name"] = "NASAMS_LN_C",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [4]
+ [5] =
+ {
+ ["dx"] = 21.063985561486,
+ ["dy"] = 15.680967029068,
+ ["name"] = "NASAMS_Radar_MPQ64F1",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [5]
+ [6] =
+ {
+ ["dx"] = -18.499094251951,
+ ["dy"] = -14.299637664692,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [6]
+ [7] =
+ {
+ ["dx"] = -7.042956299847,
+ ["dy"] = -18.311686379602,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [7]
+ }, -- end of ["units"]
+ }, -- end of ["NASAMS Bty CJTF Blue"]
+ ["NASAMS Bty CJTF Red"] =
+ {
+ ["type"] = "vehicle",
+ ["name"] = "NASAMS Bty CJTF Red",
+ ["country"] = 81,
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "NASAMS_Command_Post",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -14.042657040991,
+ ["dy"] = 54.532318175887,
+ ["name"] = "NASAMS_LN_B",
+ ["skill"] = "High",
+ ["heading"] = 2.3561944901923,
+ }, -- end of [2]
+ [3] =
+ {
+ ["dx"] = 51.255698199675,
+ ["dy"] = -5.1489742484409,
+ ["name"] = "NASAMS_LN_B",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [3]
+ [4] =
+ {
+ ["dx"] = 29.255535502103,
+ ["dy"] = 55.936583879986,
+ ["name"] = "NASAMS_LN_C",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [4]
+ [5] =
+ {
+ ["dx"] = 21.063985561486,
+ ["dy"] = 15.680967029068,
+ ["name"] = "NASAMS_Radar_MPQ64F1",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [5]
+ [6] =
+ {
+ ["dx"] = -18.499094251951,
+ ["dy"] = -14.299637664692,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [6]
+ [7] =
+ {
+ ["dx"] = -7.042956299847,
+ ["dy"] = -18.311686379602,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [7]
+ }, -- end of ["units"]
+ }, -- end of ["NASAMS Bty CJTF Red"]
+ ["NASAMS Bty USA"] =
+ {
+ ["type"] = "vehicle",
+ ["name"] = "NASAMS Bty USA",
+ ["country"] = 2,
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "NASAMS_Command_Post",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -14.042657040991,
+ ["dy"] = 54.532318175887,
+ ["name"] = "NASAMS_LN_B",
+ ["skill"] = "High",
+ ["heading"] = 2.3561944901923,
+ }, -- end of [2]
+ [3] =
+ {
+ ["dx"] = 51.255698199675,
+ ["dy"] = -5.1489742484409,
+ ["name"] = "NASAMS_LN_B",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [3]
+ [4] =
+ {
+ ["dx"] = 29.255535502103,
+ ["dy"] = 55.936583879986,
+ ["name"] = "NASAMS_LN_C",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [4]
+ [5] =
+ {
+ ["dx"] = 21.063985561486,
+ ["dy"] = 15.680967029068,
+ ["name"] = "NASAMS_Radar_MPQ64F1",
+ ["skill"] = "High",
+ ["heading"] = 6.2765352930821,
+ }, -- end of [5]
+ [6] =
+ {
+ ["dx"] = -18.499094251951,
+ ["dy"] = -14.299637664692,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [6]
+ [7] =
+ {
+ ["dx"] = -10.08824481722,
+ ["dy"] = -14.611150606768,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [7]
+ }, -- end of ["units"]
+ }, -- end of ["NASAMS Bty USA"]
+ ["BRITISH BOFORS AA BATTERY"] =
+ {
+ ["type"] = "vehicle",
+ ["name"] = "BRITISH BOFORS AA BATTERY",
+ ["country"] = 4,
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "bofors40",
+ ["skill"] = "Average",
+ ["heading"] = 5.6374134839417,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = 8.6139882987,
+ ["dy"] = 8.0418525209971,
+ ["name"] = "bofors40",
+ ["skill"] = "Average",
+ ["heading"] = 5.6374134839417,
+ }, -- end of [2]
+ }, -- end of ["units"]
+ }, -- end of ["BRITISH BOFORS AA BATTERY"]
+ ["SA-11 SAM Battery"] =
+ {
+ ["country"] = 0,
+ ["type"] = "vehicle",
+ ["name"] = "SA-11 SAM Battery",
+ ["units"] =
+ {
+ [7] =
+ {
+ ["dx"] = 120.44134814,
+ ["dy"] = -112.000602515,
+ ["name"] = "ATZ-10",
+ ["skill"] = "High",
+ ["heading"] = 2.4958208303519,
+ }, -- end of [7]
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "SA-11 Buk SR 9S18M1",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = 2.6563550499995,
+ ["dy"] = 100.877549925,
+ ["name"] = "SA-11 Buk LN 9A310M1",
+ ["skill"] = "High",
+ ["heading"] = 4.7123889803847,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -105.82160159,
+ ["dy"] = 4.8958284879991,
+ ["name"] = "SA-11 Buk LN 9A310M1",
+ ["skill"] = "High",
+ ["heading"] = 0.034906585039887,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 27.63662248,
+ ["dy"] = 21.425097783998,
+ ["name"] = "ZiL-131 APA-80",
+ ["skill"] = "High",
+ ["heading"] = 1.5882496193148,
+ }, -- end of [8]
+ [9] =
+ {
+ ["dx"] = 42.172491459991,
+ ["dy"] = -20.017069267,
+ ["name"] = "Ural-4320-31",
+ ["skill"] = "High",
+ ["heading"] = 0.05235987755983,
+ }, -- end of [9]
+ [5] =
+ {
+ ["dx"] = 99.169831179999,
+ ["dy"] = -3.3463691979996,
+ ["name"] = "SA-11 Buk LN 9A310M1",
+ ["skill"] = "High",
+ ["heading"] = 3.1415926535898,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = 42.172491459991,
+ ["dy"] = -28.818736966998,
+ ["name"] = "Ural-4320-31",
+ ["skill"] = "High",
+ ["heading"] = 0.034906585039887,
+ }, -- end of [10]
+ [3] =
+ {
+ ["dx"] = -3.9905785699957,
+ ["dy"] = -102.252741427,
+ ["name"] = "SA-11 Buk LN 9A310M1",
+ ["skill"] = "High",
+ ["heading"] = 1.553343034275,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = 129.64229952999,
+ ["dy"] = -104.569064854,
+ ["name"] = "ATZ-10",
+ ["skill"] = "High",
+ ["heading"] = 2.3212879051525,
+ }, -- end of [6]
+ [12] =
+ {
+ ["dx"] = -13.972843719996,
+ ["dy"] = -17.667666831003,
+ ["name"] = "SA-11 Buk CC 9S470M1",
+ ["skill"] = "High",
+ ["heading"] = 1.553343034275,
+ }, -- end of [12]
+ [11] =
+ {
+ ["dx"] = 22.603219309996,
+ ["dy"] = 21.425097783998,
+ ["name"] = "Ural-375 PBU",
+ ["skill"] = "High",
+ ["heading"] = 1.5882496193148,
+ }, -- end of [11]
+ }, -- end of ["units"]
+ }, -- end of ["SA-11 SAM Battery"]
+ ["Patriot site"] =
+ {
+ ["country"] = 2,
+ ["type"] = "vehicle",
+ ["name"] = "Patriot site",
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "Patriot str",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -19.60004352557,
+ ["dy"] = 9.2644465620397,
+ ["name"] = "Patriot EPP",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -52.779034586449,
+ ["dy"] = -20.804649357509,
+ ["name"] = "Patriot AMG",
+ ["skill"] = "High",
+ ["heading"] = 4.7123889803847,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 302.6260036147,
+ ["dy"] = -119.57223135463,
+ ["name"] = "Patriot ln",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [8]
+ [16] =
+ {
+ ["dx"] = -81.188374167279,
+ ["dy"] = -130.70164152705,
+ ["name"] = "Hummer",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [16]
+ [17] =
+ {
+ ["dx"] = -95.083442423507,
+ ["dy"] = -114.72675693111,
+ ["name"] = "M978 HEMTT Tanker",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [17]
+ [9] =
+ {
+ ["dx"] = 173.84730488189,
+ ["dy"] = -29.940192911235,
+ ["name"] = "Patriot ln",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [9]
+ [18] =
+ {
+ ["dx"] = -55.049316178425,
+ ["dy"] = -162.07189504143,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [18]
+ [5] =
+ {
+ ["dx"] = -35.511640445024,
+ ["dy"] = 16.23725082296,
+ ["name"] = "Patriot cp",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = 287.4638047662,
+ ["dy"] = 8.9459295797569,
+ ["name"] = "Patriot ln",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [10]
+ [20] =
+ {
+ ["dx"] = -26.639011004663,
+ ["dy"] = 25.619801495515,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [20]
+ [11] =
+ {
+ ["dx"] = 101.78340133674,
+ ["dy"] = 47.897296695373,
+ ["name"] = "Patriot ln",
+ ["skill"] = "High",
+ ["heading"] = 0.3490658503988,
+ }, -- end of [11]
+ [3] =
+ {
+ ["dx"] = -35.248201985043,
+ ["dy"] = -0.8707412587828,
+ ["name"] = "Patriot ECS",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = 136.71587389408,
+ ["dy"] = -115.36026572896,
+ ["name"] = "Patriot ln",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [6]
+ [12] =
+ {
+ ["dx"] = 187.95200156058,
+ ["dy"] = 104.06103102239,
+ ["name"] = "Patriot ln",
+ ["skill"] = "High",
+ ["heading"] = 0.3490658503988,
+ }, -- end of [12]
+ [13] =
+ {
+ ["dx"] = -31.67915746152,
+ ["dy"] = 171.21775733319,
+ ["name"] = "M1097 Avenger",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [13]
+ [7] =
+ {
+ ["dx"] = 233.22284679177,
+ ["dy"] = -169.50440608741,
+ ["name"] = "Patriot ln",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [7]
+ [14] =
+ {
+ ["dx"] = 46.357670822879,
+ ["dy"] = -267.34404672193,
+ ["name"] = "M1097 Avenger",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [14]
+ [19] =
+ {
+ ["dx"] = 139.89969071567,
+ ["dy"] = -62.41809110227,
+ ["name"] = "M 818",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [19]
+ [15] =
+ {
+ ["dx"] = -68.129344288536,
+ ["dy"] = -146.06991632772,
+ ["name"] = "Hummer",
+ ["skill"] = "High",
+ ["heading"] = 5.9341194567807,
+ }, -- end of [15]
+ }, -- end of ["units"]
+ }, -- end of ["Patriot site"]
+ ["Rapier SAM Battery Oman"] =
+ {
+ ["units"] =
+ {
+ [7] =
+ {
+ ["dx"] = 36.182838894005,
+ ["dy"] = 58.774643101002,
+ ["name"] = "Land_Rover_109_S3",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [7]
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "rapier_fsa_blindfire_radar",
+ ["skill"] = "High",
+ ["heading"] = 0.013157135472537,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -14.178539628003,
+ ["dy"] = 10.201632172,
+ ["name"] = "rapier_fsa_optical_tracker_unit",
+ ["skill"] = "High",
+ ["heading"] = 3.1590459461097,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -50.662342819996,
+ ["dy"] = 58.961975773003,
+ ["name"] = "rapier_fsa_launcher",
+ ["skill"] = "High",
+ ["heading"] = 5.7595865315813,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 32.038867964002,
+ ["dy"] = 61.828095365003,
+ ["name"] = "Land_Rover_109_S3",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [8]
+ [9] =
+ {
+ ["dx"] = 22.442303705,
+ ["dy"] = 69.897933492997,
+ ["name"] = "Land_Rover_109_S3",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [9]
+ [5] =
+ {
+ ["dx"] = -54.812159296009,
+ ["dy"] = -56.368340474997,
+ ["name"] = "rapier_fsa_launcher",
+ ["skill"] = "High",
+ ["heading"] = 0.80285145591739,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = 52.758722615996,
+ ["dy"] = 42.634966846002,
+ ["name"] = "Land_Rover_109_S3",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [10]
+ [3] =
+ {
+ ["dx"] = -66.224154607,
+ ["dy"] = 1.2103631389982,
+ ["name"] = "rapier_fsa_launcher",
+ ["skill"] = "High",
+ ["heading"] = 0.017453292519943,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = 49.050959151995,
+ ["dy"] = 45.906522844001,
+ ["name"] = "Land_Rover_101_FC",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [6]
+ [11] =
+ {
+ ["dx"] = 39.890602357991,
+ ["dy"] = 55.066879637001,
+ ["name"] = "Land_Rover_101_FC",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [11]
+ }, -- end of ["units"]
+ ["type"] = "vehicle",
+ ["name"] = "Rapier SAM Battery Oman",
+ ["country"] = 73,
+ }, -- end of ["Rapier SAM Battery Oman"]
+ ["Insurgents mortar crew with car"] =
+ {
+ ["country"] = 17,
+ ["type"] = "vehicle",
+ ["name"] = "insurgents mortar crew with car",
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "2B11 mortar",
+ ["skill"] = "Average",
+ ["heading"] = 2.3091703583438,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -2.0000000010041,
+ ["dy"] = -3.1428571399883,
+ ["name"] = "Soldier AK",
+ ["skill"] = "Average",
+ ["heading"] = 2.3091703583438,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = 4.2857142849971,
+ ["dy"] = -3.7142857200233,
+ ["name"] = "VAZ Car",
+ ["skill"] = "Average",
+ ["heading"] = 2.3091703583438,
+ }, -- end of [4]
+ [3] =
+ {
+ ["dx"] = 2.2857142851426,
+ ["dy"] = 1.7142857114086,
+ ["name"] = "Soldier AK",
+ ["skill"] = "Average",
+ ["heading"] = 2.3091703583438,
+ }, -- end of [3]
+ }, -- end of ["units"]
+ }, -- end of ["insurgents mortar crew with car"]
+ ["SA-6 SAM Battery"] =
+ {
+ ["country"] = 0,
+ ["type"] = "vehicle",
+ ["name"] = "SA-6 SAM Battery",
+ ["units"] =
+ {
+ [7] =
+ {
+ ["dx"] = 120.44134814,
+ ["dy"] = -112.000602515,
+ ["name"] = "ATZ-10",
+ ["skill"] = "High",
+ ["heading"] = 2.4958208303519,
+ }, -- end of [7]
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "Kub 1S91 str",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = 2.6563550499995,
+ ["dy"] = 100.877549925,
+ ["name"] = "Kub 2P25 ln",
+ ["skill"] = "High",
+ ["heading"] = 4.7123889803847,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -105.82160159,
+ ["dy"] = 4.8958284879991,
+ ["name"] = "Kub 2P25 ln",
+ ["skill"] = "High",
+ ["heading"] = 0.034906585039887,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 25.605996860002,
+ ["dy"] = 20.019633917,
+ ["name"] = "ZiL-131 APA-80",
+ ["skill"] = "High",
+ ["heading"] = 1.5882496193148,
+ }, -- end of [8]
+ [9] =
+ {
+ ["dx"] = 42.172491459991,
+ ["dy"] = -20.017069267,
+ ["name"] = "Ural-4320-31",
+ ["skill"] = "High",
+ ["heading"] = 0.05235987755983,
+ }, -- end of [9]
+ [5] =
+ {
+ ["dx"] = 99.169831179999,
+ ["dy"] = -3.3463691979996,
+ ["name"] = "Kub 2P25 ln",
+ ["skill"] = "High",
+ ["heading"] = 3.1415926535898,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = 42.172491459991,
+ ["dy"] = -28.818736966998,
+ ["name"] = "Ural-4320-31",
+ ["skill"] = "High",
+ ["heading"] = 0.034906585039887,
+ }, -- end of [10]
+ [3] =
+ {
+ ["dx"] = -3.9905785699957,
+ ["dy"] = -102.252741427,
+ ["name"] = "Kub 2P25 ln",
+ ["skill"] = "High",
+ ["heading"] = 1.553343034275,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = 129.64229952999,
+ ["dy"] = -104.569064854,
+ ["name"] = "ATZ-10",
+ ["skill"] = "High",
+ ["heading"] = 2.3212879051525,
+ }, -- end of [6]
+ [11] =
+ {
+ ["dx"] = 22.038305519993,
+ ["dy"] = 20.113878987999,
+ ["name"] = "Ural-375 PBU",
+ ["skill"] = "High",
+ ["heading"] = 1.5882496193148,
+ }, -- end of [11]
+ }, -- end of ["units"]
+ }, -- end of ["SA-6 SAM Battery"]
+ ["FLAK18 BATTERY"] =
+ {
+ ["type"] = "vehicle",
+ ["name"] = "FLAK18 BATTERY",
+ ["country"] = 66,
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "flak18",
+ ["skill"] = "Average",
+ ["heading"] = 6.261241987952,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -3.8613997810025,
+ ["dy"] = 54.05821418362,
+ ["name"] = "flak18",
+ ["skill"] = "Average",
+ ["heading"] = 6.261241987952,
+ }, -- end of [2]
+ [3] =
+ {
+ ["dx"] = -50.700600202996,
+ ["dy"] = -8.27913509211,
+ ["name"] = "flak18",
+ ["skill"] = "Average",
+ ["heading"] = 6.261241987952,
+ }, -- end of [3]
+ [4] =
+ {
+ ["dx"] = -42.560838181002,
+ ["dy"] = 64.09794160531,
+ ["name"] = "flak18",
+ ["skill"] = "Average",
+ ["heading"] = 6.261241987952,
+ }, -- end of [4]
+ }, -- end of ["units"]
+ }, -- end of ["FLAK18 BATTERY"]
+ ["Rapier SAM Battery UAE"] =
+ {
+ ["units"] =
+ {
+ [7] =
+ {
+ ["dx"] = 36.182838894005,
+ ["dy"] = 58.774643101002,
+ ["name"] = "Land_Rover_109_S3",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [7]
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "rapier_fsa_blindfire_radar",
+ ["skill"] = "High",
+ ["heading"] = 0.013157135472537,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -14.178539628003,
+ ["dy"] = 10.201632172,
+ ["name"] = "rapier_fsa_optical_tracker_unit",
+ ["skill"] = "High",
+ ["heading"] = 3.1590459461097,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -50.662342819996,
+ ["dy"] = 58.961975773003,
+ ["name"] = "rapier_fsa_launcher",
+ ["skill"] = "High",
+ ["heading"] = 5.7595865315813,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 32.038867964002,
+ ["dy"] = 61.828095365003,
+ ["name"] = "Land_Rover_101_FC",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [8]
+ [9] =
+ {
+ ["dx"] = 22.442303705,
+ ["dy"] = 69.897933492997,
+ ["name"] = "Land_Rover_101_FC",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [9]
+ [5] =
+ {
+ ["dx"] = -54.812159296009,
+ ["dy"] = -56.368340474997,
+ ["name"] = "rapier_fsa_launcher",
+ ["skill"] = "High",
+ ["heading"] = 0.80285145591739,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = 52.758722615996,
+ ["dy"] = 42.634966846002,
+ ["name"] = "Land_Rover_109_S3",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [10]
+ [3] =
+ {
+ ["dx"] = -66.224154607,
+ ["dy"] = 1.2103631389982,
+ ["name"] = "rapier_fsa_launcher",
+ ["skill"] = "High",
+ ["heading"] = 0.017453292519943,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = 49.050959151995,
+ ["dy"] = 45.906522844001,
+ ["name"] = "Land_Rover_101_FC",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [6]
+ [11] =
+ {
+ ["dx"] = 39.890602357991,
+ ["dy"] = 55.066879637001,
+ ["name"] = "Land_Rover_109_S3",
+ ["skill"] = "High",
+ ["heading"] = 4.1364303272266,
+ }, -- end of [11]
+ }, -- end of ["units"]
+ ["type"] = "vehicle",
+ ["name"] = "Rapier SAM Battery UAE",
+ ["country"] = 74,
+ }, -- end of ["Rapier SAM Battery UAE"]
+ ["SA-2 SAM Battery"] =
+ {
+ ["country"] = 0,
+ ["type"] = "vehicle",
+ ["name"] = "SA-2 SAM Battery",
+ ["units"] =
+ {
+ [13] =
+ {
+ ["dx"] = -137.35942972999,
+ ["dy"] = -151.259040031,
+ ["name"] = "ATMZ-5",
+ ["skill"] = "High",
+ ["heading"] = 1.0297442586767,
+ }, -- end of [13]
+ [7] =
+ {
+ ["dx"] = 80.690318210007,
+ ["dy"] = 54.289070001003,
+ ["name"] = "S_75M_Volhov",
+ ["skill"] = "High",
+ ["heading"] = 0.92502450355699,
+ }, -- end of [7]
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "SNR_75V",
+ ["skill"] = "High",
+ ["heading"] = 0.0038885041518015,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = 79.099061770001,
+ ["dy"] = -47.096697396999,
+ ["name"] = "S_75M_Volhov",
+ ["skill"] = "High",
+ ["heading"] = 5.4803338512622,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -1.8276942699886,
+ ["dy"] = -98.244225791997,
+ ["name"] = "S_75M_Volhov",
+ ["skill"] = "High",
+ ["heading"] = 4.6774823953448,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 29.956672100001,
+ ["dy"] = 44.636165102005,
+ ["name"] = "ZIL-131 KUNG",
+ ["skill"] = "High",
+ ["heading"] = 4.1713369122664,
+ }, -- end of [8]
+ [11] =
+ {
+ ["dx"] = -49.941045745189,
+ ["dy"] = 164.38476072691,
+ ["name"] = "Ural-4320 APA-5D",
+ ["skill"] = "High",
+ ["heading"] = 0.68067840827779,
+ }, -- end of [11]
+ [9] =
+ {
+ ["dx"] = 25.126949860001,
+ ["dy"] = 47.889142120999,
+ ["name"] = "ZIL-131 KUNG",
+ ["skill"] = "High",
+ ["heading"] = 4.1713369122664,
+ }, -- end of [9]
+ [5] =
+ {
+ ["dx"] = -85.254996139993,
+ ["dy"] = -46.869375048002,
+ ["name"] = "S_75M_Volhov",
+ ["skill"] = "High",
+ ["heading"] = 3.8048177693476,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = -61.142498229994,
+ ["dy"] = 165.65584994,
+ ["name"] = "p-19 s-125 sr",
+ ["skill"] = "High",
+ ["heading"] = 2.2165681500328,
+ }, -- end of [10]
+ [14] =
+ {
+ ["dx"] = -168.04336334999,
+ ["dy"] = -84.915399762001,
+ ["name"] = "Ural-4320T",
+ ["skill"] = "High",
+ ["heading"] = 5.4279739737024,
+ }, -- end of [14]
+ [3] =
+ {
+ ["dx"] = 0.21820687000582,
+ ["dy"] = 106.800532487,
+ ["name"] = "S_75M_Volhov",
+ ["skill"] = "High",
+ ["heading"] = 1.535889741755,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = -87.755541969993,
+ ["dy"] = 57.926227576005,
+ ["name"] = "S_75M_Volhov",
+ ["skill"] = "High",
+ ["heading"] = 2.3561944901923,
+ }, -- end of [6]
+ [12] =
+ {
+ ["dx"] = -118.28563314999,
+ ["dy"] = -171.162132111,
+ ["name"] = "ATMZ-5",
+ ["skill"] = "High",
+ ["heading"] = 0.87266462599716,
+ }, -- end of [12]
+ [15] =
+ {
+ ["dx"] = -151.45745328999,
+ ["dy"] = -70.817376204999,
+ ["name"] = "Ural-4320T",
+ ["skill"] = "High",
+ ["heading"] = 5.3407075111026,
+ }, -- end of [15]
+ }, -- end of ["units"]
+ }, -- end of ["SA-2 SAM Battery"]
+ ["SA-3 SAM Battery"] =
+ {
+ ["country"] = 0,
+ ["type"] = "vehicle",
+ ["name"] = "SA-3 SAM Battery",
+ ["units"] =
+ {
+ [7] =
+ {
+ ["dx"] = -0.19719014999282,
+ ["dy"] = 16.417675958997,
+ ["name"] = "ZIL-131 KUNG",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [7]
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "snr s-125 tr",
+ ["skill"] = "High",
+ ["heading"] = 6.2641478001644,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = -54.395544479994,
+ ["dy"] = 20.411364487998,
+ ["name"] = "5p73 s-125 ln",
+ ["skill"] = "High",
+ ["heading"] = 3.1590459461097,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -26.404573919994,
+ ["dy"] = 38.533723629997,
+ ["name"] = "5p73 s-125 ln",
+ ["skill"] = "High",
+ ["heading"] = 3.1590459461097,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 6.6801895600074,
+ ["dy"] = 13.694317328001,
+ ["name"] = "ZiL-131 APA-80",
+ ["skill"] = "High",
+ ["heading"] = 3.1241393610699,
+ }, -- end of [8]
+ [9] =
+ {
+ ["dx"] = 73.148097120007,
+ ["dy"] = 24.177887045,
+ ["name"] = "GAZ-66",
+ ["skill"] = "High",
+ ["heading"] = 1.6057029118348,
+ }, -- end of [9]
+ [5] =
+ {
+ ["dx"] = -28.378296209994,
+ ["dy"] = -36.108864519003,
+ ["name"] = "5p73 s-125 ln",
+ ["skill"] = "High",
+ ["heading"] = 3.1590459461097,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = 67.422903450002,
+ ["dy"] = 24.220744209997,
+ ["name"] = "GAZ-66",
+ ["skill"] = "High",
+ ["heading"] = 1.6406094968747,
+ }, -- end of [10]
+ [3] =
+ {
+ ["dx"] = -55.65154957,
+ ["dy"] = -15.115636602,
+ ["name"] = "5p73 s-125 ln",
+ ["skill"] = "High",
+ ["heading"] = 3.1590459461097,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = 33.753619990006,
+ ["dy"] = -73.286112753005,
+ ["name"] = "p-19 s-125 sr",
+ ["skill"] = "High",
+ ["heading"] = 6.2641478001644,
+ }, -- end of [6]
+ [12] =
+ {
+ ["dx"] = 39.803062310006,
+ ["dy"] = -66.502451588,
+ ["name"] = "ZiL-131 APA-80",
+ ["skill"] = "High",
+ ["heading"] = 1.6406094968747,
+ }, -- end of [12]
+ [11] =
+ {
+ ["dx"] = 62.727714700013,
+ ["dy"] = 24.526952171,
+ ["name"] = "GAZ-66",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [11]
+ }, -- end of ["units"]
+ }, -- end of ["SA-3 SAM Battery"]
+ ["Hawk SAM Battery"] =
+ {
+ ["country"] = 2,
+ ["type"] = "vehicle",
+ ["name"] = "Hawk SAM Battery",
+ ["units"] =
+ {
+ [7] =
+ {
+ ["dx"] = -143.06468370894,
+ ["dy"] = -28.566666166706,
+ ["name"] = "Hawk ln",
+ ["skill"] = "High",
+ ["heading"] = 2.6179938779915,
+ }, -- end of [7]
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "Hawk pcp",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = 32.279602998366,
+ ["dy"] = -40.996889924631,
+ ["name"] = "Hawk sr",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [2]
+ [4] =
+ {
+ ["dx"] = -73.507952767894,
+ ["dy"] = -58.130136438762,
+ ["name"] = "Hawk tr",
+ ["skill"] = "High",
+ ["heading"] = 3.8397243543875,
+ }, -- end of [4]
+ [8] =
+ {
+ ["dx"] = 71.695053443613,
+ ["dy"] = 58.889218891971,
+ ["name"] = "Hawk tr",
+ ["skill"] = "High",
+ ["heading"] = 0.69813170079773,
+ }, -- end of [8]
+ [9] =
+ {
+ ["dx"] = 142.58862828931,
+ ["dy"] = 26.52486901707,
+ ["name"] = "Hawk ln",
+ ["skill"] = "High",
+ ["heading"] = 5.7595865315813,
+ }, -- end of [9]
+ [5] =
+ {
+ ["dx"] = -53.646780668367,
+ ["dy"] = -135.33353399258,
+ ["name"] = "Hawk ln",
+ ["skill"] = "High",
+ ["heading"] = 4.7123889803847,
+ }, -- end of [5]
+ [10] =
+ {
+ ["dx"] = 139.59213643564,
+ ["dy"] = 111.20097058237,
+ ["name"] = "Hawk ln",
+ ["skill"] = "High",
+ ["heading"] = 0.69813170079773,
+ }, -- end of [10]
+ [3] =
+ {
+ ["dx"] = -34.076534003809,
+ ["dy"] = 41.931256096927,
+ ["name"] = "Hawk cwar",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [3]
+ [6] =
+ {
+ ["dx"] = -137.08263885655,
+ ["dy"] = -113.8479052746,
+ ["name"] = "Hawk ln",
+ ["skill"] = "High",
+ ["heading"] = 3.8397243543875,
+ }, -- end of [6]
+ [11] =
+ {
+ ["dx"] = 51.990893861743,
+ ["dy"] = 137.17585691391,
+ ["name"] = "Hawk ln",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [11]
+ }, -- end of ["units"]
+ }, -- end of ["Hawk SAM Battery"]
+ ["SA-10 SAM Battery"] =
+ {
+ ["type"] = "vehicle",
+ ["name"] = "SA-10 SAM Battery",
+ ["country"] = 0,
+ ["units"] =
+ {
+ [1] =
+ {
+ ["dx"] = 0,
+ ["dy"] = 0,
+ ["name"] = "S-300PS 40B6M tr",
+ ["skill"] = "High",
+ ["heading"] = 4.7123889803847,
+ }, -- end of [1]
+ [2] =
+ {
+ ["dx"] = 0.69314285699511,
+ ["dy"] = 127.97571428004,
+ ["name"] = "S-300PS 40B6MD sr",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [2]
+ [3] =
+ {
+ ["dx"] = 23.579234991223,
+ ["dy"] = 246.55467524601,
+ ["name"] = "S-300PS 54K6 cp",
+ ["skill"] = "High",
+ ["heading"] = 3.1415926535898,
+ }, -- end of [3]
+ [4] =
+ {
+ ["dx"] = -22.516027817794,
+ ["dy"] = 246.55467524601,
+ ["name"] = "S-300PS 64H6E sr",
+ ["skill"] = "High",
+ ["heading"] = 3.1415926535898,
+ }, -- end of [4]
+ [5] =
+ {
+ ["dx"] = 83.349983285123,
+ ["dy"] = -1.3806866992963,
+ ["name"] = "S-300PS 5P85C ln",
+ ["skill"] = "High",
+ ["heading"] = 3.1415926535898,
+ }, -- end of [5]
+ [6] =
+ {
+ ["dx"] = 82.498640577192,
+ ["dy"] = 16.104647497996,
+ ["name"] = "S-300PS 5P85D ln",
+ ["skill"] = "High",
+ ["heading"] = 3.3161255787892,
+ }, -- end of [6]
+ [7] =
+ {
+ ["dx"] = 82.547616217693,
+ ["dy"] = -18.227276489837,
+ ["name"] = "S-300PS 5P85D ln",
+ ["skill"] = "High",
+ ["heading"] = 2.9670597283904,
+ }, -- end of [7]
+ [8] =
+ {
+ ["dx"] = -82.640406328603,
+ ["dy"] = -0.41562629467808,
+ ["name"] = "S-300PS 5P85C ln",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [8]
+ [9] =
+ {
+ ["dx"] = -81.939684967569,
+ ["dy"] = 17.115632734494,
+ ["name"] = "S-300PS 5P85D ln",
+ ["skill"] = "High",
+ ["heading"] = 6.1086523819802,
+ }, -- end of [9]
+ [10] =
+ {
+ ["dx"] = -81.939684967569,
+ ["dy"] = -17.99454369233,
+ ["name"] = "S-300PS 5P85D ln",
+ ["skill"] = "High",
+ ["heading"] = 0.17453292519943,
+ }, -- end of [10]
+ [11] =
+ {
+ ["dx"] = -9.0858776818495,
+ ["dy"] = 187.67713509151,
+ ["name"] = "generator_5i57",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [11]
+ [12] =
+ {
+ ["dx"] = 0.83760223048739,
+ ["dy"] = 187.51811292395,
+ ["name"] = "generator_5i57",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [12]
+ [13] =
+ {
+ ["dx"] = -59.823818980018,
+ ["dy"] = 168.63468487991,
+ ["name"] = "ATZ-5",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [13]
+ [14] =
+ {
+ ["dx"] = -59.823818980018,
+ ["dy"] = 179.2654343833,
+ ["name"] = "ATZ-5",
+ ["skill"] = "High",
+ ["heading"] = 0,
+ }, -- end of [14]
+ [15] =
+ {
+ ["dx"] = 20.947679329896,
+ ["dy"] = -62.811427216162,
+ ["name"] = "GAZ-66",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [15]
+ [16] =
+ {
+ ["dx"] = 66.751355714747,
+ ["dy"] = 151.35592090525,
+ ["name"] = "ATZ-60_Maz",
+ ["skill"] = "High",
+ ["heading"] = 3.9269908169872,
+ }, -- end of [16]
+ [17] =
+ {
+ ["dx"] = 59.63926918729,
+ ["dy"] = 158.46800743265,
+ ["name"] = "ATZ-60_Maz",
+ ["skill"] = "High",
+ ["heading"] = 3.9269908169872,
+ }, -- end of [17]
+ [18] =
+ {
+ ["dx"] = -16.327227612433,
+ ["dy"] = -62.472874663305,
+ ["name"] = "KAMAZ Truck",
+ ["skill"] = "High",
+ ["heading"] = 1.5707963267949,
+ }, -- end of [18]
+ }, -- end of ["units"]
+ }, -- end of ["SA-10 SAM Battery"]
+} -- end of templates
diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json
new file mode 100644
index 00000000..e8ff2462
--- /dev/null
+++ b/src/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+ "files.associations": {
+ "*.ejs": "html",
+ "xstring": "cpp",
+ "vector": "cpp",
+ "list": "cpp"
+ }
+}
\ No newline at end of file
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 781d4f5f..4759cb4f 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -36,6 +36,7 @@