Skip to content
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

Jump to bottom

Remove cruft from unit_buildmenu_config.lua. #3935

Merged
merged 5 commits into from
Nov 21, 2024
Merged

Remove cruft from unit_buildmenu_config.lua. #3935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a4d2d8
Remove unused local variables
rhys-vdw Nov 3, 2024
3e06428
Remove unused showWaterUnits boolean
rhys-vdw Nov 3, 2024
4d924cf
Whitespace
rhys-vdw Nov 3, 2024
173cece
Remove unused unitName
rhys-vdw Nov 8, 2024
4801b4c
Remove unnecessary assignment
rhys-vdw Nov 14, 2024
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
1 change: 0 additions & 1 deletion luaui/configs/buildmenu_sorting.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,6 @@ for id, value in pairs(unitOrderTable) do
end
end
unitOrderTable = newUnitOrder
newUnitOrder = nil

for unitDefID, unitDef in pairs(UnitDefs) do
if unitDef.customParams.isscavenger then
Expand Down
29 changes: 8 additions & 21 deletions luaui/configs/unit_buildmenu_config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
---


local unitName = {}
local unitEnergyCost = {}
local unitMetalCost = {}
local unitGroup = {}
Expand All @@ -18,8 +17,6 @@ local isWaterUnit = {}
local isGeothermal = {}
local unitMaxWeaponRange = {}

local showWaterUnits = false

for unitDefID, unitDef in pairs(UnitDefs) do

unitGroup[unitDefID] = unitDef.customParams.unitgroup
Expand Down Expand Up @@ -138,20 +135,14 @@ maxOrder = maxOrder + 1
-- For units who have the same order value we compare the unit's IDs.
-- This sort is always stable, as no two units should have the same ID.
table.sort(unitOrder, function(aID, bID)
local aOrder = unitOrderManualOverrideTable[aID] or maxOrder
local bOrder = unitOrderManualOverrideTable[bID] or maxOrder

if (aOrder == bOrder) then
return aID < bID
end
return aOrder < bOrder
end)

local voidWater = false
local success, mapinfo = pcall(VFS.Include,"mapinfo.lua") -- load mapinfo.lua confs
if success and mapinfo then
voidWater = mapinfo.voidwater
end
local aOrder = unitOrderManualOverrideTable[aID] or maxOrder
local bOrder = unitOrderManualOverrideTable[bID] or maxOrder

if (aOrder == bOrder) then
return aID < bID
end
return aOrder < bOrder
end)

local minWaterUnitDepth = -11

Expand All @@ -161,8 +152,6 @@ local minWaterUnitDepth = -11
------------------------------------

return {

unitName = unitName,
unitEnergyCost = unitEnergyCost,
unitMetalCost = unitMetalCost,
unitGroup = unitGroup,
Expand All @@ -179,8 +168,6 @@ return {
minWaterUnitDepth = minWaterUnitDepth,
unitOrder = unitOrder,

showWaterUnits = showWaterUnits,

checkGeothermalFeatures = checkGeothermalFeatures,
restrictGeothermalUnits = restrictGeothermalUnits,
restrictWindUnits = restrictWindUnits,
Expand Down