weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-20 07:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into branch

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/Point.lua
#	Moose Development/Moose/Ops/OpsGroup.lua
This commit is contained in:
Applevangelist
2025-11-27 08:58:39 +01:00
parent 8406fd86d5 945efc0516
commit 01425dac70
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Navigation/Beacons.lua
+1
View File
@@ -43,6 +43,7 @@
-- --
-- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `beacons.lua` that can be -- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `beacons.lua` that can be
-- found in the installation directory of DCS for each map or a table that the user needs to provide. -- found in the installation directory of DCS for each map or a table that the user needs to provide.
-- **Note** your `MissionScripting` environment needs to be desanitized to read this data. `Package` als needs to be available.
-- --
-- # Basic Setup -- # Basic Setup
-- --
Moose Development/Moose/Navigation/Radios.lua
+1
View File
@@ -43,6 +43,7 @@
-- --
-- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `radio.lua` that can be -- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `radio.lua` that can be
-- found in the installation directory of DCS for each map or a table that the user needs to provide. -- found in the installation directory of DCS for each map or a table that the user needs to provide.
-- **Note** your `MissionScripting` environment needs to be desanitized to read this data.
-- --
-- # Basic Setup -- # Basic Setup
-- --
Moose Development/Moose/Navigation/Towns.lua
+1
View File
@@ -43,6 +43,7 @@
-- --
-- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `towns.lua` that can be -- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `towns.lua` that can be
-- found in the installation directory of DCS for each map or a table that the user needs to provide. -- found in the installation directory of DCS for each map or a table that the user needs to provide.
-- **Note** your `MissionScripting` environment needs to be desanitized to read this data.
-- --
-- # Basic Setup -- # Basic Setup
-- --
Moose Development/Moose/Ops/OpsGroup.lua
+9 -9
View File
@@ -4304,9 +4304,9 @@ function OPSGROUP:_UpdateTask(Task, Mission)
if Task.dcstask.id==AUFTRAG.SpecialTask.FORMATION then if Task.dcstask.id==AUFTRAG.SpecialTask.FORMATION then
if Mission.type == AUFTRAG.Type.RESCUEHELO then if Mission.type == AUFTRAG.Type.RESCUEHELO then
self:I("**********") self:T("**********")
self:I("** RESCUEHELO USED") self:T("** RESCUEHELO USED")
self:I("**********") self:T("**********")
local param=Task.dcstask.params local param=Task.dcstask.params
local followUnit=UNIT:FindByName(param.unitname) local followUnit=UNIT:FindByName(param.unitname)
local helogroupname = self:GetGroup():GetName() local helogroupname = self:GetGroup():GetName()
@@ -13503,8 +13503,8 @@ function OPSGROUP:GetAmmoUnit(unit, display)
if ammotable then if ammotable then
local weapons=#ammotable local weapons=#ammotable
--self:I(ammotable) --self:I(ammotable)
--UTILS.PrintTableToLog(ammotable) --UTILS.PrintTableToLog(ammotable)
-- Loop over all weapons. -- Loop over all weapons.
for w=1,weapons do for w=1,weapons do
@@ -13512,9 +13512,9 @@ function OPSGROUP:GetAmmoUnit(unit, display)
-- Number of current weapon. -- Number of current weapon.
local Nammo=ammotable[w]["count"] local Nammo=ammotable[w]["count"]
-- Range in meters. Seems only to exist for missiles (not shells). -- Range in meters. Seems only to exist for missiles (not shells).
local rmin=ammotable[w]["desc"]["rangeMin"] or 0 local rmin=ammotable[w]["desc"]["rangeMin"] or 0
local rmax=ammotable[w]["desc"]["rangeMaxAltMin"] or 0 local rmax=ammotable[w]["desc"]["rangeMaxAltMin"] or 0
-- Type name of current weapon. -- Type name of current weapon.
local Tammo=ammotable[w]["desc"]["typeName"] local Tammo=ammotable[w]["desc"]["typeName"]
@@ -13536,7 +13536,7 @@ function OPSGROUP:GetAmmoUnit(unit, display)
-- Add up all shells. -- Add up all shells.
nshells=nshells+Nammo nshells=nshells+Nammo
-- Add small and large caliber shells for guns and cannons -- Add small and large caliber shells for guns and cannons
if ammotable[w]["desc"]["warhead"] and ammotable[w]["desc"]["warhead"]["caliber"] then if ammotable[w]["desc"]["warhead"] and ammotable[w]["desc"]["warhead"]["caliber"] then
local caliber=ammotable[w]["desc"]["warhead"]["caliber"] local caliber=ammotable[w]["desc"]["warhead"]["caliber"]