diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua index 30a84aa53..81c850308 100644 --- a/Moose Development/Moose/Ops/Awacs.lua +++ b/Moose Development/Moose/Ops/Awacs.lua @@ -497,7 +497,7 @@ do -- @field #AWACS AWACS = { ClassName = "AWACS", -- #string - version = "0.2.44", -- #string + version = "0.2.45", -- #string lid = "", -- #string coalition = coalition.side.BLUE, -- #number coalitiontxt = "blue", -- #string @@ -3515,7 +3515,7 @@ function AWACS:_CheckInAI(FlightGroup,Group,AuftragsNr) text = string.format("%s. %s. %s. %s",managedgroup.CallSign,self.callsigntxt,alpha,alphacheckbulls) self:__CheckedIn(1,managedgroup.GID) - local AW = FlightGroup:GetAirWing() + local AW = FlightGroup.legion if AW.HasOwnStation then self:__AssignAnchor(5,managedgroup.GID,AW.HasOwnStation,AW.StationName) else diff --git a/Moose Development/Moose/Ops/PlayerRecce.lua b/Moose Development/Moose/Ops/PlayerRecce.lua index d9f2a7e1a..0568a58e4 100644 --- a/Moose Development/Moose/Ops/PlayerRecce.lua +++ b/Moose Development/Moose/Ops/PlayerRecce.lua @@ -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