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

#3959 Refactored stockpile limits into unit custom params #3994

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

#3959 Refactored stockpile limits into unit custom params #3994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
614b93d
#3959 Refactored stockpile limits into unit custom params
Dec 4, 2024
dbae945
#3959 Refactored evodecom stockpile limits
Dec 4, 2024
ac31e13
3959 Remove code populating scavengers stockpile limits
Dec 5, 2024
2d31d02
Merge branch 'master' of https://github.com/beyond-all-reason/Beyond-…
Dec 7, 2024
edc1d8a
Merge branch 'master' of https://github.com/beyond-all-reason/Beyond-…
Dec 18, 2024
b1fe0f7
#3959 Refactor stockpile limits into weapon defs
Dec 18, 2024
9a2f361
3959 Removing unused stockpilelimits and removed logging
Dec 19, 2024
caf3ee1
Merge branch 'master' of https://github.com/beyond-all-reason/Beyond-…
Dec 19, 2024
ea1db64
3959 Rename variable
Dec 19, 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
4 changes: 2 additions & 2 deletions gamedata/scavengers/unitdef_changes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ customDefs.armjuno = {
commandfire = true,
customparams = {
scavforcecommandfire = true,
stockpileLimit = 1,
stockpilelimit = 1,
},
},
},
Expand All @@ -112,7 +112,7 @@ customDefs.corjuno = {
commandfire = true,
customparams = {
scavforcecommandfire = true,
stockpileLimit = 1,
stockpilelimit = 1,
},
},
},
Expand Down
101 changes: 12 additions & 89 deletions luarules/gadgets/unit_stockpile_limit.lua
View file
Open in desktop
WatchTheFort marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -19,87 +19,7 @@ if gadgetHandler:IsSyncedCode() then
local StockpileDesiredTarget = {}

local defaultStockpileLimit = 99
local isStockpilingUnitNames = { -- number represents maximum stockpile. You can also use stockpileLimit customParam which overwrites whatever is set in this table
['armmercury'] = 5,
['corscreamer'] = 5,

['armthor'] = 2,

['legmos'] = 8,
['legmost3'] = 8,
['legmineb'] = 1,
['legsrailt4'] = 3,

['armsilo'] = 10,
['corsilo'] = 10,
['legsilo'] = 10,
['cordesolator'] = 10,
['armseadragon'] = 10,


['armamd'] = 20,
['legabm'] = 20,
['corfmd'] = 20,
['raptor_turret_antinuke_t2_v1'] = 5,
['raptor_turret_antinuke_t3_v1'] = 10,

['armjuno'] = 20,
['corjuno'] = 20,

['armcarry'] = 20,
['corcarry'] = 20,

['armantiship'] = 20,
['corantiship'] = 20,

['armscab'] = 20,
['cormabm'] = 20,

['armemp'] = 10,
['cortron'] = 10,
['legperdition'] = 10,

['armbotrail'] = 50,
['armcomlvl2'] = 3,
['armcomlvl3'] = 3,
['armdecomlvl3'] = 1,
['armcomlvl4'] = 3,
['armcomlvl5'] = 4,
['armcomlvl6'] = 4,
['armdecomlvl6'] = 2,
['armcomlvl7'] = 4,
['armcomlvl8'] = 5,
['armcomlvl9'] = 5,
['armcomlvl10'] = 5,
['armdecomlvl10'] = 2,
['legcom'] = 2,
['legcomlvl2'] = 3,
['legcomlvl3'] = 3,
['legdecomlvl3'] = 1,
['legcomlvl4'] = 3,
['legcomlvl5'] = 4,
['legcomlvl6'] = 4,
['legdecomlvl6'] = 2,
['legcomlvl7'] = 4,
['legcomlvl8'] = 5,
['legcomlvl9'] = 5,
['legcomlvl10'] = 5,
['legdecomlvl10'] = 3,

['legstarfall'] = 1,
['legrampart'] = 20,
}
-- convert unitname -> unitDefID + add scavengers
local isStockpilingUnit = {}
for name, params in pairs(isStockpilingUnitNames) do
if UnitDefNames[name] then
isStockpilingUnit[UnitDefNames[name].id] = params
if UnitDefNames[name..'_scav'] then
isStockpilingUnit[UnitDefNames[name..'_scav'].id] = params
end
end
end
isStockpilingUnitNames = nil
local unitStockpileLimit = {}

----------------------------------------------------------------------------
----------------------------------------------------------------------------
Expand All @@ -112,15 +32,18 @@ if gadgetHandler:IsSyncedCode() then
if ud.canStockpile then
canStockpile[udid] = true
end
if ud.customParams and ud.customParams.stockpileLimit then
isStockpilingUnit[udid] = tonumber(ud.customParams.stockpileLimit)
elseif ud.customParams and ud.customParams.stockpilelimit then
isStockpilingUnit[udid] = tonumber(ud.customParams.stockpilelimit)
if ud.weapons then
for i = 1, #ud.weapons do
local weaponDef = WeaponDefs[ud.weapons[i].weaponDef]
WatchTheFort marked this conversation as resolved.
Show resolved Hide resolved
if weaponDef.stockpile and weaponDef.customParams and weaponDef.customParams.stockpilelimit then
unitStockpileLimit[udid] = tonumber(weaponDef.customParams.stockpilelimit)
end
end
end
end

function UpdateStockpile(unitID, unitDefID)
local MaxStockpile = math.max(math.min(isStockpilingUnit[unitDefID] or defaultStockpileLimit, StockpileDesiredTarget[unitID]), 0)
local MaxStockpile = math.max(math.min(unitStockpileLimit[unitDefID] or defaultStockpileLimit, StockpileDesiredTarget[unitID]), 0)

local stock,queued = GetUnitStockpile(unitID)
if queued and stock then
Expand Down Expand Up @@ -181,7 +104,7 @@ if gadgetHandler:IsSyncedCode() then
if fromLua == true and fromSynced == true then -- fromLua is *true* if command is sent from a gadget and *false* if it's sent by a player.
return true
else
StockpileDesiredTarget[unitID] = math.max(math.min(StockpileDesiredTarget[unitID] + addQ, isStockpilingUnit[unitDefID] or defaultStockpileLimit), 0) -- let's make sure desired target doesn't go above maximum of this unit, and doesn't go below 0
StockpileDesiredTarget[unitID] = math.max(math.min(StockpileDesiredTarget[unitID] + addQ, unitStockpileLimit[unitDefID] or defaultStockpileLimit), 0) -- let's make sure desired target doesn't go above maximum of this unit, and doesn't go below 0
UpdateStockpile(unitID, unitDefID)
return false
end
Expand All @@ -192,14 +115,14 @@ if gadgetHandler:IsSyncedCode() then

function gadget:UnitCreated(unitID, unitDefID, unitTeam)
if canStockpile[unitDefID] then
StockpileDesiredTarget[unitID] = isStockpilingUnit[unitDefID] or defaultStockpileLimit
StockpileDesiredTarget[unitID] = unitStockpileLimit[unitDefID] or defaultStockpileLimit
UpdateStockpile(unitID, unitDefID)
end
end

function gadget:UnitGiven(unitID, unitDefID, unitTeam)
if canStockpile[unitDefID] then
StockpileDesiredTarget[unitID] = isStockpilingUnit[unitDefID] or defaultStockpileLimit
StockpileDesiredTarget[unitID] = unitStockpileLimit[unitDefID] or defaultStockpileLimit
UpdateStockpile(unitID, unitDefID)
end
end
Expand Down
3 changes: 3 additions & 0 deletions units/ArmBots/T2/armscab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ return {
weapontimer = 2,
weapontype = "StarburstLauncher",
weaponvelocity = 7000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 500,
},
Expand Down
3 changes: 3 additions & 0 deletions units/ArmBuildings/LandDefenceOffence/armamd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ return {
weapontimer = 3,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 1500,
},
Expand Down
3 changes: 3 additions & 0 deletions units/ArmBuildings/LandDefenceOffence/armemp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ return {
weapontimer = 3,
weapontype = "StarburstLauncher",
weaponvelocity = 1200,
customparams = {
stockpilelimit = 10,
},
damage = {
default = 50000,
},
Expand Down
1 change: 1 addition & 0 deletions units/ArmBuildings/LandDefenceOffence/armjuno.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ return {
customparams = {
lups_noshockwave = 1,
nofire = true,
stockpilelimit = 20,
},
damage = {
default = 1,
Expand Down
3 changes: 3 additions & 0 deletions units/ArmBuildings/LandDefenceOffence/armmercury.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ return {
weaponacceleration = 1000,
weapontype = "MissileLauncher",
weaponvelocity = 1850,
customparams = {
stockpilelimit = 5,
},
damage = {
vtol = 750,
},
Expand Down
1 change: 1 addition & 0 deletions units/ArmBuildings/LandDefenceOffence/armsilo.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ return {
weaponvelocity = 1600,
customparams = {
place_target_on_ground = "true",
stockpilelimit = 10,
},
damage = {
commanders = 2500,
Expand Down
3 changes: 3 additions & 0 deletions units/ArmGantry/armthor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ return {
weapontimer = 2.5,
weapontype = "StarburstLauncher",
weaponvelocity = 500,
customparams = {
stockpilelimit = 2,
},
damage = {
default = 80000,
},
Expand Down
3 changes: 3 additions & 0 deletions units/ArmShips/T2/armantiship.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ return {
weapontimer = 2.5,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 1500,
},
Expand Down
3 changes: 3 additions & 0 deletions units/ArmShips/T2/armcarry.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ return {
weapontimer = 2.5,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 1500,
},
Expand Down
1 change: 1 addition & 0 deletions units/ArmShips/T2/armseadragon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ return {
weaponvelocity = 1600,
customparams = {
place_target_on_ground = "true",
stockpilelimit = 10,
},
damage = {
commanders = 2500,
Expand Down
3 changes: 3 additions & 0 deletions units/CorBuildings/LandDefenceOffence/corfmd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ return {
weapontimer = 2.5,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 1500,
},
Expand Down
3 changes: 3 additions & 0 deletions units/CorBuildings/LandDefenceOffence/corjuno.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ return {
weapontimer = 4,
weapontype = "StarburstLauncher",
weaponvelocity = 500,
customparams = {
stockpilelimit = 20,
},
customparams = {
lups_noshockwave = 1,
nofire = true,
Expand Down
3 changes: 3 additions & 0 deletions units/CorBuildings/LandDefenceOffence/corscreamer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ return {
weaponacceleration = 1000,
weapontype = "MissileLauncher",
weaponvelocity = 1850,
customparams = {
stockpilelimit = 5,
},
damage = {
vtol = 750,
},
Expand Down
1 change: 1 addition & 0 deletions units/CorBuildings/LandDefenceOffence/corsilo.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ return {
weaponvelocity = 1600,
customparams = {
place_target_on_ground = "true",
stockpilelimit = 10,
},
damage = {
commanders = 2500,
Expand Down
3 changes: 3 additions & 0 deletions units/CorBuildings/LandDefenceOffence/cortron.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ return {
weapontimer = 3,
weapontype = "StarburstLauncher",
weaponvelocity = 1200,
customparams = {
stockpilelimit = 10,
},
damage = {
commanders = 750,
default = 4000,
Expand Down
3 changes: 3 additions & 0 deletions units/CorShips/T2/corantiship.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ return {
weapontimer = 2.5,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 1500,
},
Expand Down
3 changes: 3 additions & 0 deletions units/CorShips/T2/corcarry.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ return {
weapontimer = 2.5,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 1500,
},
Expand Down
1 change: 1 addition & 0 deletions units/CorShips/T2/cordesolator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ return {
weaponvelocity = 1600,
customparams = {
place_target_on_ground = "true",
stockpilelimit = 10,
},
damage = {
commanders = 2500,
Expand Down
3 changes: 3 additions & 0 deletions units/CorVehicles/T2/cormabm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ return {
weapontimer = 2,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 500,
},
Expand Down
1 change: 1 addition & 0 deletions units/Legion/Air/T2 Air/legmineb.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ return {
bogus = 1,
spawns_name = "cormine1",
spawns_surface = "LAND",
stockpilelimit = 1,
},
damage = {
default = 1,
Expand Down
3 changes: 3 additions & 0 deletions units/Legion/Air/legmos.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ return {
weapontimer = 2,
weapontype = "MissileLauncher",
weaponvelocity = 400,
customparams = {
stockpilelimit = 8,
},
damage = {
default = 44,
},
Expand Down
5 changes: 4 additions & 1 deletion units/Legion/Defenses/legabm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ return {
select = {
[1] = "loadwtr1",
},
},
},
weapondefs = {
fmd_rocket = {
areaofeffect = 420,
Expand Down Expand Up @@ -148,6 +148,9 @@ return {
weapontimer = 2.5,
weapontype = "StarburstLauncher",
weaponvelocity = 6000,
customparams = {
stockpilelimit = 20,
},
damage = {
default = 1500,
},
Expand Down
3 changes: 2 additions & 1 deletion units/Legion/Defenses/legperdition.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,14 @@ return {
area_onhit_damage = 175,
area_onhit_range = 150,
area_onhit_time = 15,
stockpilelimit = 10,
},
damage = {
commanders = 700,
default = 2000,--plus 150*15 within 150 area
},
},

},
weapons = {
[1] = {
Expand Down
1 change: 1 addition & 0 deletions units/Legion/Defenses/legsilo.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ return {
weaponvelocity = 1600,
customparams = {
place_target_on_ground = "true",
stockpilelimit = 10,
},
damage = {
commanders = 2500,
Expand Down
Loading