weyne/DCS_MissionDev
1
0
Fork 0
mirror of https://github.com/iTracerFacer/DCS_MissionDev.git synced 2025-12-03 04:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the syntax error in ZONE_CONFIG.BLUE (missing comma).

Browse Source 
Added centralized color config ZONE_COLORS and helper GetZoneColor.
Replaced all hard-coded color draws with ZONE_COLORS/GetZoneColor:
OnEnterGuarded, OnEnterEmpty, OnEnterAttacked, OnEnterCaptured.
ZoneColorVerification (periodic).
RefreshAllZoneColors (manual).
Hardened scanners with nil/pcall guards:
GetZoneForceStrengths now checks ZoneCapture and safely gets the zone.
CreateTacticalInfoMarker now pcall-guards zone access and avoids nils.
Made tactical text coalition-specific:
BLUE sees RED TGTS (<=10 units).
RED sees BLUE TGTS (<=10 units).
Both markers include the same force summary, but TGTS is tailored per viewer coalition.
This commit is contained in:
iTracerFacer 2025-10-27 20:22:30 -05:00
parent b17b414484
commit 853a3114ee
2 changed files with 103 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
Moose_DualCoalitionZoneCapture/Moose_DualCoalitionZoneCapture.lua
View File

@ -270,8 +270,14 @@ local function InitializeCachedUnitSet()
end end
local function GetZoneForceStrengths(ZoneCapture) local function GetZoneForceStrengths(ZoneCapture)
local zone = ZoneCapture:GetZone() if not ZoneCapture then
if not zone then return {red = 0, blue = 0, neutral = 0} end return {red = 0, blue = 0, neutral = 0}
end
local success, zone = pcall(function() return ZoneCapture:GetZone() end)
if not success or not zone then
return {red = 0, blue = 0, neutral = 0}
end
local redCount = 0 local redCount = 0
local blueCount = 0 local blueCount = 0
@ -394,135 +400,107 @@ local function GetEnemyUnitMGRSCoords(ZoneCapture, enemyCoalition)
end end
local function CreateTacticalInfoMarker(ZoneCapture) local function CreateTacticalInfoMarker(ZoneCapture)
local zone = ZoneCapture:GetZone() -- Validate ZoneCapture
if not zone then return end if not ZoneCapture then
log("[TACTICAL ERROR] ZoneCapture object is nil")
return
end
-- Safely get the zone with error handling
local ok, zone = pcall(function() return ZoneCapture:GetZone() end)
if not ok or not zone then
log("[TACTICAL ERROR] Failed to get zone from ZoneCapture object")
return
end
local forces = GetZoneForceStrengths(ZoneCapture) local forces = GetZoneForceStrengths(ZoneCapture)
local zoneName = ZoneCapture:GetZoneName() local zoneName = ZoneCapture:GetZoneName()
local zoneCoalition = ZoneCapture:GetCoalition()
-- Build coalition-specific tactical info text
-- Build tactical info text local function buildTacticalText(viewerCoalition)
local tacticalText = string.format("TACTICAL: %s\nForces: R:%d B:%d", local text = string.format("TACTICAL: %s\nForces: R:%d B:%d", zoneName, forces.red, forces.blue)
zoneName, forces.red, forces.blue) if forces.neutral and forces.neutral > 0 then
text = text .. string.format(" C:%d", forces.neutral)
if forces.neutral > 0 then end
tacticalText = tacticalText .. string.format(" C:%d", forces.neutral)
end -- Append TGTS for the enemy of the viewer, capped at 10 units
local enemyCoalition = (viewerCoalition == coalition.side.BLUE) and coalition.side.RED or coalition.side.BLUE
-- Determine enemy coalition based on zone ownership local enemyCount = (enemyCoalition == coalition.side.RED) and (forces.red or 0) or (forces.blue or 0)
local enemyCoalition = nil
if zoneCoalition == coalition.side.BLUE then
enemyCoalition = coalition.side.RED
elseif zoneCoalition == coalition.side.RED then
enemyCoalition = coalition.side.BLUE
end
-- Add MGRS coordinates if enemy forces <= 10
if enemyCoalition then
local enemyCount = (enemyCoalition == coalition.side.RED) and forces.red or forces.blue
if enemyCount > 0 and enemyCount <= 10 then if enemyCount > 0 and enemyCount <= 10 then
local enemyCoords = GetEnemyUnitMGRSCoords(ZoneCapture, enemyCoalition) local enemyCoords = GetEnemyUnitMGRSCoords(ZoneCapture, enemyCoalition)
log(string.format("[TACTICAL DEBUG] Building marker text for %d enemy units", #enemyCoords)) log(string.format("[TACTICAL DEBUG] Building marker text for %s viewer: %d enemy units", (viewerCoalition==coalition.side.BLUE and "BLUE" or "RED"), #enemyCoords))
if #enemyCoords > 0 then if #enemyCoords > 0 then
tacticalText = tacticalText .. "\nTGTS:" text = text .. "\nTGTS:"
for i, unit in ipairs(enemyCoords) do for i, unit in ipairs(enemyCoords) do
if i <= 10 then -- Show up to 10 units (the threshold) if i <= 10 then
-- Shorten unit type names to fit better local shortType = (unit.type or "Unknown"):gsub("^%w+%-", ""):gsub("%s.*", "")
local shortType = unit.type:gsub("^%w+%-", ""):gsub("%s.*", "") local cleanMgrs = (unit.mgrs or ""):gsub("^MGRS%s+", ""):gsub("%s+", " ")
-- Clean up MGRS string - remove "MGRS " prefix and compress spacing
local cleanMgrs = unit.mgrs:gsub("^MGRS%s+", ""):gsub("%s+", " ")
-- Ultra-compact: comma-separated on same line
if i == 1 then if i == 1 then
tacticalText = tacticalText .. string.format(" %s@%s", shortType, cleanMgrs) text = text .. string.format(" %s@%s", shortType, cleanMgrs)
else else
tacticalText = tacticalText .. string.format(", %s@%s", shortType, cleanMgrs) text = text .. string.format(", %s@%s", shortType, cleanMgrs)
end end
log(string.format("[TACTICAL DEBUG] Added unit %d: %s at %s", i, shortType, cleanMgrs))
end end
end end
if #enemyCoords > 10 then if #enemyCoords > 10 then
tacticalText = tacticalText .. string.format(" (+%d)", #enemyCoords - 10) text = text .. string.format(" (+%d)", #enemyCoords - 10)
end end
end end
end end
return text
end end
-- Debug: Log the complete marker text that will be displayed local tacticalTextBLUE = buildTacticalText(coalition.side.BLUE)
log(string.format("[TACTICAL DEBUG] Complete marker text for %s:\n%s", zoneName, tacticalText)) local tacticalTextRED = buildTacticalText(coalition.side.RED)
log(string.format("[TACTICAL DEBUG] Marker text length: %d characters", string.len(tacticalText)))
-- Debug: Log what will be displayed
log(string.format("[TACTICAL DEBUG] Marker text (BLUE) for %s:\n%s", zoneName, tacticalTextBLUE))
log(string.format("[TACTICAL DEBUG] Marker text (RED) for %s:\n%s", zoneName, tacticalTextRED))
-- Create tactical marker offset from zone center -- Create tactical marker offset from zone center
local coord = zone:GetCoordinate() local coord = zone:GetCoordinate()
if coord then if coord then
-- Offset the tactical marker slightly northeast of the main zone marker local offsetCoord = coord:Translate(200, 45) -- 200m NE
local offsetCoord = coord:Translate(200, 45) -- 200m northeast
-- Remove legacy single marker if present
-- Remove any existing tactical marker first
if ZoneCapture.TacticalMarkerID then if ZoneCapture.TacticalMarkerID then
log(string.format("[TACTICAL] Removing old marker ID %d for %s", ZoneCapture.TacticalMarkerID, zoneName)) log(string.format("[TACTICAL] Removing old marker ID %d for %s", ZoneCapture.TacticalMarkerID, zoneName))
-- Try multiple removal methods pcall(function() offsetCoord:RemoveMark(ZoneCapture.TacticalMarkerID) end)
local success1 = pcall(function() pcall(function() trigger.action.removeMark(ZoneCapture.TacticalMarkerID) end)
offsetCoord:RemoveMark(ZoneCapture.TacticalMarkerID) pcall(function() coord:RemoveMark(ZoneCapture.TacticalMarkerID) end)
end)
if not success1 then
local success2 = pcall(function()
trigger.action.removeMark(ZoneCapture.TacticalMarkerID)
end)
if not success2 then
-- Try using coordinate removal
pcall(function()
coord:RemoveMark(ZoneCapture.TacticalMarkerID)
end)
end
end
ZoneCapture.TacticalMarkerID = nil ZoneCapture.TacticalMarkerID = nil
end end
-- Create tactical markers for BOTH coalitions
-- Each coalition sees their enemies marked
-- BLUE Coalition Marker -- BLUE Coalition Marker
if ZoneCapture.TacticalMarkerID_BLUE then if ZoneCapture.TacticalMarkerID_BLUE then
log(string.format("[TACTICAL] Removing old BLUE marker ID %d for %s", ZoneCapture.TacticalMarkerID_BLUE, zoneName)) log(string.format("[TACTICAL] Removing old BLUE marker ID %d for %s", ZoneCapture.TacticalMarkerID_BLUE, zoneName))
pcall(function() pcall(function() offsetCoord:RemoveMark(ZoneCapture.TacticalMarkerID_BLUE) end)
offsetCoord:RemoveMark(ZoneCapture.TacticalMarkerID_BLUE)
end)
ZoneCapture.TacticalMarkerID_BLUE = nil ZoneCapture.TacticalMarkerID_BLUE = nil
end end
local successBlue, markerIDBlue = pcall(function() local successBlue, markerIDBlue = pcall(function()
return offsetCoord:MarkToCoalition(tacticalText, coalition.side.BLUE) return offsetCoord:MarkToCoalition(tacticalTextBLUE, coalition.side.BLUE)
end) end)
if successBlue and markerIDBlue then if successBlue and markerIDBlue then
ZoneCapture.TacticalMarkerID_BLUE = markerIDBlue ZoneCapture.TacticalMarkerID_BLUE = markerIDBlue
pcall(function() pcall(function() offsetCoord:SetMarkReadOnly(markerIDBlue, true) end)
offsetCoord:SetMarkReadOnly(markerIDBlue, true)
end)
log(string.format("[TACTICAL] Created BLUE marker for %s", zoneName)) log(string.format("[TACTICAL] Created BLUE marker for %s", zoneName))
else else
log(string.format("[TACTICAL] Failed to create BLUE marker for %s", zoneName)) log(string.format("[TACTICAL] Failed to create BLUE marker for %s", zoneName))
end end
-- RED Coalition Marker -- RED Coalition Marker
if ZoneCapture.TacticalMarkerID_RED then if ZoneCapture.TacticalMarkerID_RED then
log(string.format("[TACTICAL] Removing old RED marker ID %d for %s", ZoneCapture.TacticalMarkerID_RED, zoneName)) log(string.format("[TACTICAL] Removing old RED marker ID %d for %s", ZoneCapture.TacticalMarkerID_RED, zoneName))
pcall(function() pcall(function() offsetCoord:RemoveMark(ZoneCapture.TacticalMarkerID_RED) end)
offsetCoord:RemoveMark(ZoneCapture.TacticalMarkerID_RED)
end)
ZoneCapture.TacticalMarkerID_RED = nil ZoneCapture.TacticalMarkerID_RED = nil
end end
local successRed, markerIDRed = pcall(function() local successRed, markerIDRed = pcall(function()
return offsetCoord:MarkToCoalition(tacticalText, coalition.side.RED) return offsetCoord:MarkToCoalition(tacticalTextRED, coalition.side.RED)
end) end)
if successRed and markerIDRed then if successRed and markerIDRed then
ZoneCapture.TacticalMarkerID_RED = markerIDRed ZoneCapture.TacticalMarkerID_RED = markerIDRed
pcall(function() pcall(function() offsetCoord:SetMarkReadOnly(markerIDRed, true) end)
offsetCoord:SetMarkReadOnly(markerIDRed, true)
end)
log(string.format("[TACTICAL] Created RED marker for %s", zoneName)) log(string.format("[TACTICAL] Created RED marker for %s", zoneName))
else else
log(string.format("[TACTICAL] Failed to create RED marker for %s", zoneName)) log(string.format("[TACTICAL] Failed to create RED marker for %s", zoneName))
@ -538,14 +516,14 @@ local function OnEnterGuarded(ZoneCapture, From, Event, To)
ZoneCapture:Smoke( SMOKECOLOR.Blue ) ZoneCapture:Smoke( SMOKECOLOR.Blue )
-- Update zone visual markers to BLUE -- Update zone visual markers to BLUE
ZoneCapture:UndrawZone() ZoneCapture:UndrawZone()
ZoneCapture:DrawZone(-1, {0, 0, 1}, 0.5, {0, 0, 1}, 0.2, 2, true) -- Blue zone boundary ZoneCapture:DrawZone(-1, ZONE_COLORS.BLUE_CAPTURED, 0.5, ZONE_COLORS.BLUE_CAPTURED, 0.2, 2, true)
US_CC:MessageTypeToCoalition( string.format( "%s is under protection of the USA", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) US_CC:MessageTypeToCoalition( string.format( "%s is under protection of the USA", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
RU_CC:MessageTypeToCoalition( string.format( "%s is under protection of the USA", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) RU_CC:MessageTypeToCoalition( string.format( "%s is under protection of the USA", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
else else
ZoneCapture:Smoke( SMOKECOLOR.Red ) ZoneCapture:Smoke( SMOKECOLOR.Red )
-- Update zone visual markers to RED -- Update zone visual markers to RED
ZoneCapture:UndrawZone() ZoneCapture:UndrawZone()
ZoneCapture:DrawZone(-1, {1, 0, 0}, 0.5, {1, 0, 0}, 0.2, 2, true) -- Red zone boundary ZoneCapture:DrawZone(-1, ZONE_COLORS.RED_CAPTURED, 0.5, ZONE_COLORS.RED_CAPTURED, 0.2, 2, true)
RU_CC:MessageTypeToCoalition( string.format( "%s is under protection of Russia", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) RU_CC:MessageTypeToCoalition( string.format( "%s is under protection of Russia", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
US_CC:MessageTypeToCoalition( string.format( "%s is under protection of Russia", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) US_CC:MessageTypeToCoalition( string.format( "%s is under protection of Russia", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
end end
@ -558,7 +536,7 @@ local function OnEnterEmpty(ZoneCapture)
ZoneCapture:Smoke( SMOKECOLOR.Green ) ZoneCapture:Smoke( SMOKECOLOR.Green )
-- Update zone visual markers to GREEN (neutral) -- Update zone visual markers to GREEN (neutral)
ZoneCapture:UndrawZone() ZoneCapture:UndrawZone()
ZoneCapture:DrawZone(-1, {0, 1, 0}, 0.5, {0, 1, 0}, 0.2, 2, true) -- Green zone boundary ZoneCapture:DrawZone(-1, ZONE_COLORS.EMPTY, 0.5, ZONE_COLORS.EMPTY, 0.2, 2, true)
US_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) US_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
RU_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) RU_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
-- Create/update tactical information marker -- Create/update tactical information marker
@ -567,17 +545,20 @@ end
local function OnEnterAttacked(ZoneCapture) local function OnEnterAttacked(ZoneCapture)
ZoneCapture:Smoke( SMOKECOLOR.White ) ZoneCapture:Smoke( SMOKECOLOR.White )
-- Update zone visual markers to ORANGE (contested) -- Update zone visual markers based on owner (attacked state)
ZoneCapture:UndrawZone() ZoneCapture:UndrawZone()
ZoneCapture:DrawZone(-1, {1, 0.5, 0}, 0.5, {1, 0.5, 0}, 0.2, 2, true) -- Orange zone boundary for contested
local Coalition = ZoneCapture:GetCoalition() local Coalition = ZoneCapture:GetCoalition()
local color
if Coalition == coalition.side.BLUE then if Coalition == coalition.side.BLUE then
color = ZONE_COLORS.BLUE_ATTACKED
US_CC:MessageTypeToCoalition( string.format( "%s is under attack by Russia", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) US_CC:MessageTypeToCoalition( string.format( "%s is under attack by Russia", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
RU_CC:MessageTypeToCoalition( string.format( "We are attacking %s", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) RU_CC:MessageTypeToCoalition( string.format( "We are attacking %s", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
else else
color = ZONE_COLORS.RED_ATTACKED
RU_CC:MessageTypeToCoalition( string.format( "%s is under attack by the USA", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) RU_CC:MessageTypeToCoalition( string.format( "%s is under attack by the USA", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
US_CC:MessageTypeToCoalition( string.format( "We are attacking %s", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) US_CC:MessageTypeToCoalition( string.format( "We are attacking %s", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
end end
ZoneCapture:DrawZone(-1, color, 0.5, color, 0.2, 2, true)
-- Create/update tactical information marker -- Create/update tactical information marker
CreateTacticalInfoMarker(ZoneCapture) CreateTacticalInfoMarker(ZoneCapture)
end end
@ -692,13 +673,13 @@ local function OnEnterCaptured(ZoneCapture)
if Coalition == coalition.side.BLUE then if Coalition == coalition.side.BLUE then
-- Update zone visual markers to BLUE for captured -- Update zone visual markers to BLUE for captured
ZoneCapture:UndrawZone() ZoneCapture:UndrawZone()
ZoneCapture:DrawZone(-1, {0, 0, 1}, 0.5, {0, 0, 1}, 0.2, 2, true) -- Blue zone boundary ZoneCapture:DrawZone(-1, ZONE_COLORS.BLUE_CAPTURED, 0.5, ZONE_COLORS.BLUE_CAPTURED, 0.2, 2, true)
RU_CC:MessageTypeToCoalition( string.format( "%s is captured by the USA, we lost it!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) RU_CC:MessageTypeToCoalition( string.format( "%s is captured by the USA, we lost it!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
US_CC:MessageTypeToCoalition( string.format( "We captured %s, Excellent job!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) US_CC:MessageTypeToCoalition( string.format( "We captured %s, Excellent job!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
else else
-- Update zone visual markers to RED for captured -- Update zone visual markers to RED for captured
ZoneCapture:UndrawZone() ZoneCapture:UndrawZone()
ZoneCapture:DrawZone(-1, {1, 0, 0}, 0.5, {1, 0, 0}, 0.2, 2, true) -- Red zone boundary ZoneCapture:DrawZone(-1, ZONE_COLORS.RED_CAPTURED, 0.5, ZONE_COLORS.RED_CAPTURED, 0.2, 2, true)
US_CC:MessageTypeToCoalition( string.format( "%s is captured by Russia, we lost it!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) US_CC:MessageTypeToCoalition( string.format( "%s is captured by Russia, we lost it!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
RU_CC:MessageTypeToCoalition( string.format( "We captured %s, Excellent job!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information ) RU_CC:MessageTypeToCoalition( string.format( "We captured %s, Excellent job!", ZoneCapture:GetZoneName() ), MESSAGE.Type.Information )
end end
@ -912,32 +893,27 @@ local ZoneColorVerificationScheduler = SCHEDULER:New( nil, function()
local zoneCoalition = zoneCapture:GetCoalition() local zoneCoalition = zoneCapture:GetCoalition()
local zoneName = zoneNames[i] or ("Zone " .. i) local zoneName = zoneNames[i] or ("Zone " .. i)
local currentState = zoneCapture:GetCurrentState() local currentState = zoneCapture:GetCurrentState()
local zoneColor = GetZoneColor(zoneCapture)
-- Force redraw the zone with correct color based on CURRENT STATE -- Force redraw the zone with correct color based on CURRENT STATE
zoneCapture:UndrawZone() zoneCapture:UndrawZone()
zoneCapture:DrawZone(-1, zoneColor, 0.5, zoneColor, 0.2, 2, true)
-- Color priority: State (Attacked/Empty) overrides coalition ownership
-- Log the color assignment for debugging
local colorName = "UNKNOWN"
if currentState == "Attacked" then if currentState == "Attacked" then
-- Orange for contested zones (highest priority) colorName = (zoneCoalition == coalition.side.BLUE) and "LIGHT BLUE (Blue Attacked)" or "ORANGE (Red Attacked)"
zoneCapture:DrawZone(-1, {1, 0.5, 0}, 0.5, {1, 0.5, 0}, 0.2, 2, true)
log(string.format("[ZONE COLORS] %s: Set to ORANGE (Attacked)", zoneName))
elseif currentState == "Empty" then elseif currentState == "Empty" then
-- Green for neutral/empty zones colorName = "GREEN (Empty)"
zoneCapture:DrawZone(-1, {0, 1, 0}, 0.5, {0, 1, 0}, 0.2, 2, true)
log(string.format("[ZONE COLORS] %s: Set to GREEN (Empty)", zoneName))
elseif zoneCoalition == coalition.side.BLUE then elseif zoneCoalition == coalition.side.BLUE then
-- Blue for BLUE-owned zones (Guarded or Captured state) colorName = "BLUE (Owned)"
zoneCapture:DrawZone(-1, {0, 0, 1}, 0.5, {0, 0, 1}, 0.2, 2, true)
log(string.format("[ZONE COLORS] %s: Set to BLUE (Owned)", zoneName))
elseif zoneCoalition == coalition.side.RED then elseif zoneCoalition == coalition.side.RED then
-- Red for RED-owned zones (Guarded or Captured state) colorName = "RED (Owned)"
zoneCapture:DrawZone(-1, {1, 0, 0}, 0.5, {1, 0, 0}, 0.2, 2, true)
log(string.format("[ZONE COLORS] %s: Set to RED (Owned)", zoneName))
else else
-- Fallback to green for any other state colorName = "GREEN (Fallback)"
zoneCapture:DrawZone(-1, {0, 1, 0}, 0.5, {0, 1, 0}, 0.2, 2, true)
log(string.format("[ZONE COLORS] %s: Set to GREEN (Fallback)", zoneName))
end end
log(string.format("[ZONE COLORS] %s: Set to %s", zoneName, colorName))
end end
end end
@ -965,27 +941,30 @@ local function RefreshAllZoneColors()
local zoneCoalition = zoneCapture:GetCoalition() local zoneCoalition = zoneCapture:GetCoalition()
local zoneName = zoneNames[i] or ("Zone " .. i) local zoneName = zoneNames[i] or ("Zone " .. i)
local currentState = zoneCapture:GetCurrentState() local currentState = zoneCapture:GetCurrentState()
-- Get color for current state/ownership
local zoneColor = GetZoneColor(zoneCapture)
-- Clear existing drawings -- Clear existing drawings
zoneCapture:UndrawZone() zoneCapture:UndrawZone()
-- Redraw with correct color based on CURRENT STATE (priority over coalition) -- Redraw with correct color
zoneCapture:DrawZone(-1, zoneColor, 0.5, zoneColor, 0.2, 2, true)
-- Log the color assignment for debugging
local colorName = "UNKNOWN"
if currentState == "Attacked" then if currentState == "Attacked" then
zoneCapture:DrawZone(-1, {1, 0.5, 0}, 0.5, {1, 0.5, 0}, 0.2, 2, true) -- Orange colorName = (zoneCoalition == coalition.side.BLUE) and "LIGHT BLUE (Blue Attacked)" or "ORANGE (Red Attacked)"
log(string.format("[ZONE COLORS] %s: Set to ORANGE (Attacked)", zoneName))
elseif currentState == "Empty" then elseif currentState == "Empty" then
zoneCapture:DrawZone(-1, {0, 1, 0}, 0.5, {0, 1, 0}, 0.2, 2, true) -- Green colorName = "GREEN (Empty)"
log(string.format("[ZONE COLORS] %s: Set to GREEN (Empty)", zoneName))
elseif zoneCoalition == coalition.side.BLUE then elseif zoneCoalition == coalition.side.BLUE then
zoneCapture:DrawZone(-1, {0, 0, 1}, 0.5, {0, 0, 1}, 0.2, 2, true) -- Blue colorName = "BLUE (Owned)"
log(string.format("[ZONE COLORS] %s: Set to BLUE (Owned)", zoneName))
elseif zoneCoalition == coalition.side.RED then elseif zoneCoalition == coalition.side.RED then
zoneCapture:DrawZone(-1, {1, 0, 0}, 0.5, {1, 0, 0}, 0.2, 2, true) -- Red colorName = "RED (Owned)"
log(string.format("[ZONE COLORS] %s: Set to RED (Owned)", zoneName))
else else
zoneCapture:DrawZone(-1, {0, 1, 0}, 0.5, {0, 1, 0}, 0.2, 2, true) -- Green (neutral) colorName = "GREEN (Fallback)"
log(string.format("[ZONE COLORS] %s: Set to NEUTRAL/GREEN (Fallback)", zoneName))
end end
log(string.format("[ZONE COLORS] %s: Set to %s", zoneName, colorName))
end end
end end

BIN
Moose_DualCoalitionZoneCapture/Moose_DualCoalitionZoneCapture.miz
View File

Binary file not shown.