Skip to content

do not count cancelling unit as a death #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ewang7421 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

do not count cancelling unit as a death #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78a545d
do not count cancelling unit as a death
Sep 10, 2025
112fe83
change weaponDefID check to membership in an array of blacklisted IDs
Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api_events.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ function widget:UnitGiven(unitID, unitDefID, newTeam, oldTeam)
table.insert(UnitData(unitID, unitDefID).transferred, { newTeam = newTeam, oldTeam = oldTeam, frame = Spring.GetGameFrame() })
end

function widget:UnitDestroyed(unitID, unitDefID, unitTeam, attackerID, attackerDefID, attackerTeam)
UnitData(unitID, unitDefID).destroyed = { unitTeam = unitTeam, attackerTeam = attackerTeam, frame = Spring.GetGameFrame() }
function widget:UnitDestroyed(unitID, unitDefID, unitTeam, attackerID, attackerDefID, attackerTeam, weaponDefID)
UnitData(unitID, unitDefID).destroyed = { unitTeam = unitTeam, attackerTeam = attackerTeam, weaponDefID = weaponDefID, frame = Spring.GetGameFrame() }
end

function widget:GameFrame(n)
Expand Down
42 changes: 29 additions & 13 deletions gui_unit_deaths.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,17 @@ local function Row(unitDefID)
local energyText = MasterFramework:Text("", MasterFramework:Color(1, 1, 0, 1))
local row = MasterFramework:HorizontalStack(
{
MasterFramework:Background(MasterFramework:Rect(MasterFramework:AutoScalingDimension(20), MasterFramework:AutoScalingDimension(20)), { MasterFramework:Image("#"..unitDefID) }, MasterFramework:AutoScalingDimension(3)), -- image rect
MasterFramework:Background(
MasterFramework:Rect(MasterFramework:AutoScalingDimension(20), MasterFramework:AutoScalingDimension(20)),
{ MasterFramework:Image("#" .. unitDefID) }, MasterFramework:AutoScalingDimension(3)), -- image rect
MasterFramework:VerticalStack(
{
MasterFramework:HorizontalStack({ MasterFramework:Text(UnitDefs[unitDefID].translatedHumanName), countText }, MasterFramework:AutoScalingDimension(8), 0),
MasterFramework:HorizontalStack(
{ MasterFramework:Text(UnitDefs[unitDefID].translatedHumanName), countText },
MasterFramework:AutoScalingDimension(8), 0),
MasterFramework:HorizontalStack({ metalText, energyText }, MasterFramework:AutoScalingDimension(8), 0)
},
MasterFramework:AutoScalingDimension(8),
MasterFramework:AutoScalingDimension(8),
0
)
},
Expand Down Expand Up @@ -81,7 +85,7 @@ local function TakeAvailableHeight(body)
return width, cachedAvailableHeight
-- return body:Layout(availableWidth, availableHeight)
end,
Position = function(_, x, y)
Position = function(_, x, y)
-- if not cachedAvailableHeight or not cachedHeight then error() end
body:Position(x, y + cachedAvailableHeight - cachedHeight)
-- return body:Position(x, y)
Expand Down Expand Up @@ -134,14 +138,24 @@ end
------------------------------------------------------------------------------------------------------------
-- Data
------------------------------------------------------------------------------------------------------------
function table.contains(table, element)
for _, value in pairs(table) do
if value == element then
return true
end
end
return false
end

local blacklistedWeaponDefIDs = { Game.envDamageTypes.FactoryCancel }

local function Update(unitIDs)
local currentFrame = Spring.GetGameFrame()
for _, unitID in ipairs(unitIDs) do
local unitData = WG.Master_UnitEvents.data[unitID]
local destroyed = unitData.destroyed
if destroyed and destroyed.frame <= currentFrame then

if destroyed and destroyed.frame <= currentFrame and not table.contains(blacklistedWeaponDefIDs, destroyed.weaponDefID) then
local unitDefID = unitData.unitDefID
local unitTeam = destroyed.unitTeam

Expand Down Expand Up @@ -184,14 +198,14 @@ function widget:Initialize()
if not MasterFramework then
error("MasterFramework " .. requiredFrameworkVersion .. " not found!")
end

table = MasterFramework.table

data = table.imapToTable(Spring.GetTeamList(), function(index, teamID)
return teamID, {}
end)

if WG.Master_UnitEvents then -- units are only around after game start, so it's okay that this only triggers
if WG.Master_UnitEvents then -- units are only around after game start, so it's okay that this only triggers
Update(table.mapToArray(WG.Master_UnitEvents.data, function(key, _) return key end))
end

Expand Down Expand Up @@ -222,7 +236,7 @@ function widget:Initialize()
if not playerList[1] then return end
local name = Spring.GetPlayerInfo(playerList[1])
local r, g, b, a = Spring.GetTeamColor(teamID)

local checkBox = MasterFramework:CheckBox(10, function(_, checked)
configData[teamID] = checked
if checked then
Expand All @@ -231,7 +245,8 @@ function widget:Initialize()
playerColumns[teamID] = nil
end

topRow:SetMembers(table.mapToArray(table.filter(playerColumns, isValueNil), identiyTableToArrayMapFunc))
topRow:SetMembers(table.mapToArray(table.filter(playerColumns, isValueNil),
identiyTableToArrayMapFunc))
end)
checkBox:SetChecked(configData[teamID])
return MasterFramework:HorizontalStack(
Expand Down Expand Up @@ -259,7 +274,7 @@ function widget:Initialize()
MasterFramework:AutoScalingDimension(5)
)
),
MasterFramework.viewportWidth * 0.1, MasterFramework.viewportHeight * 0.1,
MasterFramework.viewportWidth * 0.1, MasterFramework.viewportHeight * 0.1,
MasterFramework.viewportWidth * 0.8, MasterFramework.viewportHeight * 0.8,
true
),
Expand All @@ -279,7 +294,8 @@ function widget:SetConfigData(data)
configData = data
end
end

function widget:GetConfigData()
configData.gameID = Spring.GetGameRulesParam("GameID")
return configData
end
end