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

#PLAYERTASK

Browse Source 
* added group/unit check for UseTypeNames
This commit is contained in:
Applevangelist
2023-02-15 10:32:30 +01:00
parent 77a39364f4
commit ef0ddddb46
1 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/PlayerTask.lua
+53 -49
View File
@@ -1460,7 +1460,7 @@ PLAYERTASKCONTROLLER.Messages = {
--- PLAYERTASK class version. --- PLAYERTASK class version.
-- @field #string version -- @field #string version
PLAYERTASKCONTROLLER.version="0.1.57" PLAYERTASKCONTROLLER.version="0.1.58"
--- Create and run a new TASKCONTROLLER instance. --- Create and run a new TASKCONTROLLER instance.
-- @param #PLAYERTASKCONTROLLER self -- @param #PLAYERTASKCONTROLLER self
@@ -2245,56 +2245,60 @@ function PLAYERTASKCONTROLLER:_CheckTargetQueue()
end end
end end
if self.UseTypeNames and object:IsGround() then if object:IsInstanceOf("UNIT") or object:IsInstanceOf("GROUP") then
-- * Threat level 0: Unit is unarmed.
-- * Threat level 1: Unit is infantry.
-- * Threat level 2: Unit is an infantry vehicle.
-- * Threat level 3: Unit is ground artillery.
-- * Threat level 4: Unit is a tank.
-- * Threat level 5: Unit is a modern tank or ifv with ATGM.
-- * Threat level 6: Unit is a AAA.
-- * Threat level 7: Unit is a SAM or manpad, IR guided.
-- * Threat level 8: Unit is a Short Range SAM, radar guided.
-- * Threat level 9: Unit is a Medium Range SAM, radar guided.
-- * Threat level 10: Unit is a Long Range SAM, radar guided.
local threat = object:GetThreatLevel()
local typekey = "INFANTRY"
if threat == 0 or threat == 2 then
typekey = "TECHNICAL"
elseif threat == 3 then
typekey = "ARTILLERY"
elseif threat == 4 or threat == 5 then
typekey = "TANKS"
elseif threat == 6 or threat == 7 then
typekey = "AIRDEFENSE"
elseif threat >= 8 then
typekey = "SAM"
end
local typename = self.gettext:GetEntry(typekey,self.locale)
local gname = self.gettext:GetEntry("GROUP",self.locale)
target.TypeName = string.format("%s %s",typename,gname)
--self:T(self.lid.."Target TypeName = "..target.TypeName)
end
if self.UseTypeNames and object:IsShip() then if self.UseTypeNames and object:IsGround() then
local threat = object:GetThreatLevel() -- * Threat level 0: Unit is unarmed.
local typekey = "UNARMEDSHIP" -- * Threat level 1: Unit is infantry.
if threat == 1 then -- * Threat level 2: Unit is an infantry vehicle.
typekey = "LIGHTARMEDSHIP" -- * Threat level 3: Unit is ground artillery.
elseif threat == 2 then -- * Threat level 4: Unit is a tank.
typekey = "CORVETTE" -- * Threat level 5: Unit is a modern tank or ifv with ATGM.
elseif threat == 3 or threat == 4 then -- * Threat level 6: Unit is a AAA.
typekey = "FRIGATE" -- * Threat level 7: Unit is a SAM or manpad, IR guided.
elseif threat == 5 or threat == 6 then -- * Threat level 8: Unit is a Short Range SAM, radar guided.
typekey = "CRUISER" -- * Threat level 9: Unit is a Medium Range SAM, radar guided.
elseif threat == 7 or threat == 8 then -- * Threat level 10: Unit is a Long Range SAM, radar guided.
typekey = "DESTROYER" local threat = object:GetThreatLevel()
elseif threat >= 9 then local typekey = "INFANTRY"
typekey = "CARRIER" if threat == 0 or threat == 2 then
typekey = "TECHNICAL"
elseif threat == 3 then
typekey = "ARTILLERY"
elseif threat == 4 or threat == 5 then
typekey = "TANKS"
elseif threat == 6 or threat == 7 then
typekey = "AIRDEFENSE"
elseif threat >= 8 then
typekey = "SAM"
end
local typename = self.gettext:GetEntry(typekey,self.locale)
local gname = self.gettext:GetEntry("GROUP",self.locale)
target.TypeName = string.format("%s %s",typename,gname)
--self:T(self.lid.."Target TypeName = "..target.TypeName)
end end
local typename = self.gettext:GetEntry(typekey,self.locale)
target.TypeName = typename if self.UseTypeNames and object:IsShip() then
--self:T(self.lid.."Target TypeName = "..target.TypeName) local threat = object:GetThreatLevel()
local typekey = "UNARMEDSHIP"
if threat == 1 then
typekey = "LIGHTARMEDSHIP"
elseif threat == 2 then
typekey = "CORVETTE"
elseif threat == 3 or threat == 4 then
typekey = "FRIGATE"
elseif threat == 5 or threat == 6 then
typekey = "CRUISER"
elseif threat == 7 or threat == 8 then
typekey = "DESTROYER"
elseif threat >= 9 then
typekey = "CARRIER"
end
local typename = self.gettext:GetEntry(typekey,self.locale)
target.TypeName = typename
--self:T(self.lid.."Target TypeName = "..target.TypeName)
end
end end
self:_AddTask(target) self:_AddTask(target)