weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Applevangelist
2022-10-06 08:07:37 +02:00
parent 005d6d2b06
commit 4d2a58e428
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,7 +574,7 @@ function PLAYERRECCE:_GetTargetSet(unit,camera)
function(_unit)
local _unit = _unit -- Wrapper.Unit#UNIT
local _unitpos = _unit:GetCoordinate()
if startpos:IsLOS(_unitpos) and _unit:IsAlive and _unit:GetLife()>1 then
if startpos:IsLOS(_unitpos) and _unit:IsAlive() and _unit:GetLife()>1 then
self:T("Adding to final targets: ".._unit:GetName())
finaltargets:Add(_unit:GetName(),_unit)
end
@@ -659,11 +659,11 @@ function PLAYERRECCE:_LaseTarget(client,targetset)
-- lost LOS or dead
--local targettype = oldtarget:GetTypeName()
laser:LaseOff()
if (not oldtarget:IsAlive()) or (oldtarget:GetLife() < 2) then
self:__Shack(-1,client,oldtarget)
else
self:__TargetLOSLost(-1,client,oldtarget)
end
if (not oldtarget:IsAlive()) or (oldtarget:GetLife() < 2) then
self:__Shack(-1,client,oldtarget)
else
self:__TargetLOSLost(-1,client,oldtarget)
end
end
end
return self
@@ -1233,7 +1233,7 @@ function PLAYERRECCE:onafterRecceOnStation(From, Event, To, Client, Playername)
local text2tts = string.format("All stations, FACA %s on station at %s!",callsign, coordtext)
text2tts = self:_GetTextForSpeech(text2tts)
if self.debug then
self:I(text2.."\n"..text2tts)
self:I(text2.."\n"..text2tts)
end
if self.UseSRS then
local grp = Client:GetGroup()
@@ -1507,7 +1507,7 @@ function PLAYERRECCE:onafterShack(From, Event, To, Client, Target)
coordtext = coord:ToStringFromRPShort(self.ReferencePoint,self.RPName,client,Settings)
end
local coordtext = coord:ToStringA2G(client,Settings)
local text = string.format("All stations, %s lost sight of %s\nat %s!",callsign, targettype, coordtext))
local text = string.format("All stations, %s lost sight of %s\nat %s!",callsign, targettype, coordtext)
MESSAGE:New(text,15,self.Name or "FACA"):ToClient(client)
end
end
@@ -1550,7 +1550,7 @@ function PLAYERRECCE:onafterTargetLOSLost(From, Event, To, Client, Target)
coordtext = coord:ToStringFromRPShort(self.ReferencePoint,self.RPName,client,Settings)
end
local coordtext = coord:ToStringA2G(client,Settings)
local text = string.format("All stations, %s lost sight of %s\nat %s!",callsign, targettype, coordtext))
local text = string.format("All stations, %s lost sight of %s\nat %s!",callsign, targettype, coordtext)
MESSAGE:New(text,15,self.Name or "FACA"):ToClient(client)
end
end