FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
#	Moose Development/Moose/Ops/Awacs.lua
This commit is contained in:
Applevangelist
2022-11-16 11:16:25 +01:00
parent 502a8a0186 f86db5f134
commit aab22ef402
6 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
View File

@@ -1,4 +1,4 @@
--- **AI** - Create an automated A2G defense system based on a detection network of reconnaissance vehicles and air units, coordinating SEAD, BAI and CAS operations. --- **AI** - Create an automated A2G defense system with reconnaissance units, coordinating SEAD, BAI and CAS operations.
-- --
-- === -- ===
-- --

6
Moose Development/Moose/Functional/AICSAR.lua
View File

@@ -1,6 +1,8 @@
--- **Functional** - AI CSAR system --- **Functional** - AI CSAR system.
--
-- ===
-- --
-- ## Main Features: -- ## Features:
-- --
-- * Send out helicopters to downed pilots -- * Send out helicopters to downed pilots
-- * Rescues players and AI alike -- * Rescues players and AI alike

2
Moose Development/Moose/Functional/AmmoTruck.lua
View File

@@ -14,7 +14,7 @@
-- --
-- === -- ===
-- --
-- ### Author : **applevangelist ** -- ### Author : **applevangelist**
-- --
-- @module Functional.AmmoTruck -- @module Functional.AmmoTruck
-- @image Artillery.JPG -- @image Artillery.JPG

2
Moose Development/Moose/Functional/ZoneGoalCoalition.lua
View File

@@ -1,4 +1,4 @@
--- **Functional** - Base class that models processes to achieve goals involving a Zone for a Coalition. --- **Functional (WIP)** - Base class modeling processes to achieve goals involving coalition zones.
-- --
-- === -- ===
-- --

8
Moose Development/Moose/Ops/Awacs.lua
View File

@@ -1,4 +1,4 @@
--- **Ops** - AWACS --- **Ops** - MOOSE AI AWACS Operations using text-to-speech.
-- --
-- === -- ===
-- --
@@ -3348,15 +3348,15 @@ function AWACS:_Showtask(Group)
local targetpos = currenttask.Target:GetCoordinate() local targetpos = currenttask.Target:GetCoordinate()
local direction, direcTTS = self:_ToStringBR(pposition,targetpos) local direction, direcTTS = self:_ToStringBR(pposition,targetpos)
description = description .. "\nBR "..direction description = description .. "\nBR "..direction
descTTS = descTTS .. ";BR "..direcTTS descTTS = descTTS .. ";BR "..direcTTS
end end
local statustxt = self.gettext:GetEntry("STATUS",self.locale) local statustxt = self.gettext:GetEntry("STATUS",self.locale)
--MESSAGE:New(string.format("%s\n%s %s",description,statustxt,status),30,"AWACS",true):ToGroup(Group) --MESSAGE:New(string.format("%s\n%s %s",description,statustxt,status),30,"AWACS",true):ToGroup(Group)
local text = string.format("%s\n%s %s",description,statustxt,status) local text = string.format("%s\n%s %s",description,statustxt,status)
local ttstext = string.format("%s. %s. %s",managedgroup.CallSign,self.callsigntxt,descTTS) local ttstext = string.format("%s. %s. %s",managedgroup.CallSign,self.callsigntxt,descTTS)
ttstext = string.gsub(ttstext,"\\n",";") ttstext = string.gsub(ttstext,"\\n",";")
ttstext = string.gsub(ttstext,"VID","V I D") ttstext = string.gsub(ttstext,"VID","V I D")
self:_NewRadioEntry(ttstext,text,GID,true,true,false,false,true) self:_NewRadioEntry(ttstext,text,GID,true,true,false,false,true)
end end
end end
end end

18
Moose Development/Moose/Ops/Intelligence.lua
View File

@@ -159,7 +159,7 @@ INTEL.Ctype={
--- INTEL class version. --- INTEL class version.
-- @field #string version -- @field #string version
INTEL.version="0.3.4" INTEL.version="0.3.5"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- ToDo list -- ToDo list
@@ -815,8 +815,8 @@ function INTEL:UpdateIntel()
end end
end end
-- Filter unit categories. -- Filter unit categories. Added check that we have a UNIT and not a STATIC object because :GetUnitCategory() is only available for units.
if #self.filterCategory>0 then if #self.filterCategory>0 and unit:IsInstanceOf("UNIT") then
local unitcategory=unit:GetUnitCategory() local unitcategory=unit:GetUnitCategory()
local keepit=false local keepit=false
for _,filtercategory in pairs(self.filterCategory) do for _,filtercategory in pairs(self.filterCategory) do
@@ -1077,11 +1077,13 @@ function INTEL:GetDetectedUnits(Unit, DetectedUnits, RecceDetecting, DetectVisua
RecceDetecting[name]=reccename RecceDetecting[name]=reccename
self:T(string.format("Unit %s detect by %s", name, reccename)) self:T(string.format("Unit %s detect by %s", name, reccename))
else else
local static=STATIC:FindByName(name, false) if self.detectStatics then
if static then local static=STATIC:FindByName(name, false)
--env.info("FF found static "..name) if static then
DetectedUnits[name]=static --env.info("FF found static "..name)
RecceDetecting[name]=reccename DetectedUnits[name]=static
RecceDetecting[name]=reccename
end
end end
end end