Skip to content

Commit 199d717

Browse files
committed
deliverycreationhandler handles -All-
1 parent 7f3fc15 commit 199d717

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

Data/Base.rte/Activities/Utility/DeliveryCreationHandler.lua

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ function DeliveryCreationHandler:Initialize(activity)
106106

107107
for i = 0, self.Activity.TeamCount - 1 do
108108
local moduleID = PresetMan:GetModuleID(self.Activity:GetTeamTech(i));
109-
self.teamTechTable[i] = PresetMan:GetDataModule(moduleID);
109+
if moduleID ~= -1 then
110+
self.teamTechTable[i] = PresetMan:GetDataModule(moduleID);
111+
else
112+
self.teamTechTable[i] = {["FileName"] = "All"}; -- master of ghetto
113+
end
110114
self.teamTechIDTable[i] = moduleID;
111115

112116
self.saveTable.teamRemovedPresets[i] = {};
@@ -149,6 +153,12 @@ function DeliveryCreationHandler:Initialize(activity)
149153
end
150154

151155
for team, module in pairs(self.teamTechTable) do
156+
157+
local iterator = module.Presets;
158+
-- handle -All-
159+
if not iterator then
160+
iterator = PresetMan:GetAllEntities();
161+
end
152162

153163
self.teamPresetTables[team] = {};
154164

@@ -179,7 +189,7 @@ function DeliveryCreationHandler:Initialize(activity)
179189
self.teamPresetTables[team]["Actors - Mecha"] = {};
180190
self.teamPresetTables[team]["Actors - Turrets"] = {};
181191

182-
for entity in module.Presets do
192+
for entity in iterator do
183193
if IsMOSRotating(entity) and ToMOSRotating(entity).IsBuyable and ToMOSRotating(entity).BuyableMode ~= 2 then
184194

185195
local entityInfoTable = {};
@@ -447,7 +457,7 @@ function DeliveryCreationHandler:SelectPresetByGroupPair(team, primaryGroup, sec
447457
local presetName = presetTable.PresetName;
448458
local className = presetTable.ClassName;
449459
local createFunc = "Create" .. className;
450-
local techName = actingTech.FileName;
460+
local techName = actingTech.FileName or "All";
451461

452462

453463
--print(presetName)

0 commit comments

Comments
 (0)