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

Fix strider hub not inflicting initial states onto units #5154

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix strider hub not inflicting initial states onto units #5154

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afdb95d
Fix strider hub not inflicting initial states onto units
Arch-Shaman Jan 13, 2024
279d7fc
Fix mobile cons inflicting initial states
Arch-Shaman Jan 13, 2024
c176132
Use notreallyafactory instead
Arch-Shaman Jun 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
77 changes: 35 additions & 42 deletions LuaUI/Widgets/unit_start_state.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
--------------------------------------------------------------------------------

function widget:GetInfo()
return {
name = "Unit Start State",
desc = "Configurable starting unit states for units",
author = "GoogleFrog",
date = "13 April 2011", --last update: 29 January 2014
license = "GNU GPL, v2 or later",
handler = false,
layer = 1,
enabled = true, -- loaded by default?
}
return {
name = "Unit Start State",
desc = "Configurable starting unit states for units",
author = "GoogleFrog",
date = "13 April 2011", --last update: 29 January 2014
license = "GNU GPL, v2 or later",
handler = false,
layer = 1,
enabled = true, -- loaded by default?
}
end

--------------------------------------------------------------------------------
Expand Down Expand Up @@ -146,6 +146,14 @@ for i = 1, #UnitDefs do
end
end

local notAFactory = {}
for i = 1, #UnitDefs do
local ud = UnitDefs[i]
if ud.customParams.notreallyafactory then
notAFactory[ud.name] = true
end
end

options_path = 'Settings/Unit Behaviour/Default States'
options_order = {
'inheritcontrol', 'presetlabel',
Expand Down Expand Up @@ -1265,21 +1273,20 @@ function widget:UnitCreated(unitID, unitDefID, unitTeam, builderID)

local name = ud.name
if unitAlreadyAdded[name] then
local builderDefID = builderID and Spring.GetUnitDefID(builderID) -- DO. NOT. CALL. THIS. FOR. EVERY. STATE! CPU cycles do not grow on trees!
local isAFactory = false
if builderDefID then
isAFactory = not notAFactory[builderDefID] and not UnitDefs[builderDefID].isMobileBuilder -- this simplifies the check a bit, probably. note this hits athena only!
end
local value = GetStateValue(name, "firestate0")
if value ~= nil then
if value == -1 then
local trueBuilder = false
if builderID then
local bdid = Spring.GetUnitDefID(builderID)
if UnitDefs[bdid] and UnitDefs[bdid].isFactory then
local firestate = Spring.Utilities.GetUnitFireState(builderID)
if firestate then
orderArray[#orderArray + 1] = {CMD.FIRE_STATE, {firestate}, CMD.OPT_SHIFT}
trueBuilder = true
end
if isAFactory then
local firestate = Spring.Utilities.GetUnitFireState(builderID)
if firestate then
orderArray[#orderArray + 1] = {CMD.FIRE_STATE, {firestate}, CMD.OPT_SHIFT}
end
end
if not trueBuilder then -- inherit from factory def's start state, not the current state of any specific factory unit
else -- inherit from factory def's start state, not the current state of any specific factory unit
local firestate = GetFactoryDefState(name, "firestate0")
if firestate ~= nil then
orderArray[#orderArray + 1] = {CMD.FIRE_STATE, {firestate}, CMD.OPT_SHIFT}
Expand All @@ -1293,18 +1300,12 @@ function widget:UnitCreated(unitID, unitDefID, unitTeam, builderID)
value = GetStateValue(name, "movestate1")
if value ~= nil then
if value == -1 then
local trueBuilder = false
if builderID then
local bdid = Spring.GetUnitDefID(builderID)
if UnitDefs[bdid] and UnitDefs[bdid].isFactory then
local movestate = Spring.Utilities.GetUnitMoveState(builderID)
if movestate then
orderArray[#orderArray + 1] = {CMD.MOVE_STATE, {movestate}, CMD.OPT_SHIFT}
trueBuilder = true
end
if isAFactory then
local movestate = Spring.Utilities.GetUnitMoveState(builderID)
if movestate then
orderArray[#orderArray + 1] = {CMD.MOVE_STATE, {movestate}, CMD.OPT_SHIFT}
end
end
if not trueBuilder then -- inherit from factory def's start state, not the current state of any specific factory unit
else
local movestate = GetFactoryDefState(name, "movestate1")
if movestate ~= nil then
orderArray[#orderArray + 1] = {CMD.MOVE_STATE, {movestate}, CMD.OPT_SHIFT}
Expand All @@ -1316,16 +1317,8 @@ function widget:UnitCreated(unitID, unitDefID, unitTeam, builderID)
end

value = GetStateValue(name, "flylandstate_1")
if value == -1 then
local trueBuilder = false
if builderID then
local bdid = Spring.GetUnitDefID(builderID)
if UnitDefs[bdid] and UnitDefs[bdid].isFactory then
trueBuilder = true
-- inheritance handled in unit_air_plants gadget
end
end
if not trueBuilder then -- inherit from factory def's start state, not the current state of any specific factory unit
if value == -1 then -- inheritance handled in unit_air_plants gadget
if not isAFactory then -- inherit from factory def's start state, not the current state of any specific factory unit
value = GetFactoryDefState(name, "flylandstate_1_factory")
if value ~= nil then
orderArray[#orderArray + 1] = {CMD.IDLEMODE, {value}, CMD.OPT_SHIFT}
Expand Down