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

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Functional/Tiresias.lua
This commit is contained in:
Applevangelist 2025-02-02 12:56:35 +01:00
commit a5a0d8ab8a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Moose Development/Moose/Functional/Tiresias.lua
View File

@ -310,8 +310,8 @@ function TIRESIAS:_InitGroups()
AIOff = SwitchAAA, AIOff = SwitchAAA,
} }
end end
if grp.Tiresias and (grp.Tiresias.exception == false) then if grp.Tiresias and (not grp.Tiresias.exception == true) then
if grp.Tiresias.invisible and grp.Tiresias.invisible == false then if grp.Tiresias.invisible == false then
grp:SetCommandInvisible(true) grp:SetCommandInvisible(true)
grp.Tiresias.invisible = true grp.Tiresias.invisible = true
if SwitchAAA then if SwitchAAA then
@ -338,10 +338,11 @@ function TIRESIAS:_InitGroups()
} }
end end
if grp.Tiresias and (not grp.Tiresias.exception == true) then if grp.Tiresias and (not grp.Tiresias.exception == true) then
if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then if grp.Tiresias and grp.Tiresias.invisible == false then
grp:SetCommandInvisible(true) grp:SetCommandInvisible(true)
grp:SetAIOff() grp:SetAIOff()
grp.Tiresias.invisible = true grp.Tiresias.invisible = true
grp.Tiresias.AIOff = true
end end
end end
--BASE:I(string.format("Init/Switch off Vehicle %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception))) --BASE:I(string.format("Init/Switch off Vehicle %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
@ -359,8 +360,8 @@ function TIRESIAS:_InitGroups()
AIOff = SwitchSAM, AIOff = SwitchSAM,
} }
end end
if grp.Tiresias and (grp.Tiresias.exception == false) then if grp.Tiresias and (not grp.Tiresias.exception == true) then
if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then if grp.Tiresias and grp.Tiresias.invisible == false then
grp:SetCommandInvisible(true) grp:SetCommandInvisible(true)
grp.Tiresias.invisible = true grp.Tiresias.invisible = true
grp:SetAIOnOff(SwitchSAM) grp:SetAIOnOff(SwitchSAM)
@ -421,7 +422,8 @@ function TIRESIAS:_SwitchOnGroups(group,radius)
ground:ForEachGroupAlive( ground:ForEachGroupAlive(
function(grp) function(grp)
local name = grp:GetName() local name = grp:GetName()
if grp.Tiresias and grp.Tiresias.exception and (grp.Tiresias.exception == false ) then if grp:GetCoalition() ~= group:GetCoalition()
and grp.Tiresias and grp.Tiresias.type and (not grp.Tiresias.exception == true ) then
if grp.Tiresias.invisible == true then if grp.Tiresias.invisible == true then
grp:SetCommandInvisible(false) grp:SetCommandInvisible(false)
grp.Tiresias.invisible = false grp.Tiresias.invisible = false

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

@ -1773,7 +1773,7 @@ function AWACS:_EventHandler(EventData)
end end
end end
if Event.id == EVENTS.PlayerLeaveUnit then --player left unit if Event.id == EVENTS.PlayerLeaveUnit and Event.IniGroupName then --player left unit
-- check known player? -- check known player?
self:T("Player group left unit: " .. Event.IniGroupName) self:T("Player group left unit: " .. Event.IniGroupName)
self:T("Player name left: " .. Event.IniPlayerName) self:T("Player name left: " .. Event.IniPlayerName)