weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-25 06:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into FF/Fox2

Browse Source
This commit is contained in:
Frank
2020-01-08 22:26:05 +01:00
parent 0550ed1566 ff0f62c01b
commit 82c606edc1
5 changed files with 86 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/ZoneCaptureCoalition.lua
+15 -8
View File
@@ -874,16 +874,23 @@ do -- ZONE_CAPTURE_COALITION
self:Capture()
end
-- Get red and blue unit sets.
local unitsetRed=self:GetScannedSetUnit():FilterCoalitions("red"):FilterActive(true):FilterOnce()
local unitsetBlu=self:GetScannedSetUnit():FilterCoalitions("blue"):FilterActive(true):FilterOnce()
-- Count number of units.
local nRed=unitsetRed:Count()
local nBlu=unitsetBlu:Count()
-- Count stuff in zone.
local unitset=self:GetScannedSetUnit()
local nRed=0
local nBlue=0
for _,object in pairs(unitset:GetSet()) do
local coal=object:GetCoalition()
if object:IsAlive() then
if coal==coalition.side.RED then
nRed=nRed+1
elseif coal==coalition.side.BLUE then
nBlue=nBlue+1
end
end
end
-- Status text.
local text=string.format("CAPTURE ZONE %s: Owner=%s (Previous=%s): #blue=%d, #red=%d, Status %s", self:GetZoneName(), self:GetCoalitionName(), UTILS.GetCoalitionName(self:GetPreviousCoalition()), nBlu, nRed, State)
local text=string.format("CAPTURE ZONE %s: Owner=%s (Previous=%s): #blue=%d, #red=%d, Status %s", self:GetZoneName(), self:GetCoalitionName(), UTILS.GetCoalitionName(self:GetPreviousCoalition()), nBlue, nRed, State)
local NewState = self:GetState()
if NewState~=State then
text=text..string.format(" --> %s", NewState)