Skip to content

make selectable as combat override a customparam #6287

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

make selectable as combat override a customparam #6287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0481be0
tiny refactor
SethDGamre Nov 22, 2025
69ef9ed
Update leginfestor.lua
SethDGamre Nov 22, 2025
c1086aa
Revert "Update leginfestor.lua"
SethDGamre Nov 22, 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: 3 additions & 1 deletion luaui/Widgets/unit_smart_select.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,11 @@ for udid, udef in pairs(UnitDefs) do
local building = (isMobile == false)
local combat = (not builder) and isMobile and (#udef.weapons > 0)

if string.find(udef.name, 'armspid') or string.find(udef.name, 'leginfestor') then
local selectableAsCombat = udef.customParams and udef.customParams.selectable_as_combat_unit
if selectableAsCombat then
Comment on lines +93 to +94
Copy link
Collaborator

@sprunk sprunk Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

customParams is never nil

Suggested change
local selectableAsCombat = udef.customParams and udef.customParams.selectable_as_combat_unit
if selectableAsCombat then
if udef.customParams.selectable_as_combat_unit then

builder = false
end

combatFilter[udid] = combat
builderFilter[udid] = builder
buildingFilter[udid] = building
Expand Down
1 change: 1 addition & 0 deletions units/ArmBots/T2/armspid.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ return {
model_author = "Kaiser",
normaltex = "unittextures/Arm_normal.dds",
paralyzemultiplier = 0.2,
selectable_as_combat_unit = true,
subfolder = "ArmBots/T2",
techlevel = 2,
unitgroup = "emp",
Expand Down
1 change: 1 addition & 0 deletions units/Legion/Bots/T2 Bots/leginfestor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ return {
model_author = "Zath (model), Tuerk (animation)",
normaltex = "unittextures/leg_normal.dds",
paralyzemultiplier = 0.2,
selectable_as_combat_unit = true,
subfolder = "CorBots/T2",
techlevel = 2,
selectionscalemult = 1,
Expand Down
Loading