ModuleMan Refactoring and Improvements

CHANGELOG.md

@@ -71,14 +71,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `GameActivity` INI properties `TeamNTechSwitchEnabled` which determine whether activity team factions are configurable by the user. This is most useful for communicating what the player is not intended to change, or what inputs would be ignored otherwise.
 
-- Allow lua scripts to use LuaJIT's BitOp module (see https://bitop.luajit.org/api.html)
-
 - New `Emission` INI and Lua (R/W) property `ParticleCount` which sets how many particles the Emission spawns per emission. Defaults to 1.
 
 - New `Gib` and `Emission` INI and Lua (R/W) property `InheritsAngularVel`, which determines how much of the parent MO's angular velocity they inherit. Defaults to 1 for gibs, 0 for emissions.
 
 - New `Attachable` INI and Lua (R/W) properties `InheritsVelWhenDetached` and `InheritsAngularVelWhenDetached`, which determine how much of these velocities an attachable inherits from its parent when detached. Defaults to 1.
 
+- New `ModuleMan` to handle module management, and allow global scripts and mod modules can now be dynamically enabled or disabled mid-game.
+	Moved the `PresetMan` lua parameters/functions `Modules`, `GetDataModule`, `GetModuleID`, `GetModuleIDFromPath`, `GetTotalModuleCount`, `IsModuleOfficial`, `IsModuleUserdata` and `GetFullModulePath` into `ModuleMan`
+
+- Allow lua scripts to use LuaJIT's BitOp module (see https://bitop.luajit.org/api.html)
+
 </details>
 
 <details><summary><b>Changed</b></summary>

Data/Base.rte/Activities/BrainVsBrain.lua

@@ -40,7 +40,7 @@ function BrainvsBrain:StartActivity(isNewGame)
 	self.TechName[Activity.TEAM_2] = self:GetTeamTech(Activity.TEAM_2);
 
 	if self.CPUTeam ~= Activity.NOTEAM then
-		self.CPUTechID = PresetMan:GetModuleID(self.TechName[self.CPUTeam]);
+		self.CPUTechID = ModuleMan:GetModuleID(self.TechName[self.CPUTeam]);
 	end
 
 	MusicMan:PlayDynamicSong("Generic Battle Music");
@@ -577,7 +577,7 @@ function BrainvsBrain:CreateHeavyDrop(xPosLZ)
 		Craft.Pos = Vector(xPosLZ, -30);	-- Set the spawn point of the craft
 
 		for i = 1, Craft.MaxPassengers do
-			if math.random() < self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.TechName[self.CPUTeam])) then
+			if math.random() < self:GetCrabToHumanSpawnRatio(ModuleMan:GetModuleID(self.TechName[self.CPUTeam])) then
 				Passenger = self:CreateCrab(self.CPUTeam);
 			elseif RangeRand(0, 105) < self.Difficulty then
 				Passenger = self:CreateHeavyInfantry(self.CPUTeam);
@@ -862,7 +862,7 @@ end
 
 function BrainvsBrain:CreateLightInfantry(team, mode)
 	local Passenger = RandomAHuman("Actors - Light", self.TechName[team]);
-	if Passenger.ModuleID ~= PresetMan:GetModuleID(self.TechName[team]) then
+	if Passenger.ModuleID ~= ModuleMan:GetModuleID(self.TechName[team]) then
 		Passenger = RandomAHuman("Actors", self.TechName[team]);
 	end
 
@@ -887,7 +887,7 @@ end
 
 function BrainvsBrain:CreateDefender(team)
 	local Passenger = RandomAHuman("Actors - Light", self.TechName[team]);
-	if Passenger.ModuleID ~= PresetMan:GetModuleID(self.TechName[team]) then
+	if Passenger.ModuleID ~= ModuleMan:GetModuleID(self.TechName[team]) then
 		Passenger = RandomAHuman("Actors", self.TechName[team]);
 	end
 
@@ -907,7 +907,7 @@ end
 
 function BrainvsBrain:CreateHeavyInfantry(team, mode)
 	local Passenger = RandomAHuman("Actors - Heavy", self.TechName[team]);
-	if Passenger.ModuleID ~= PresetMan:GetModuleID(self.TechName[team]) then
+	if Passenger.ModuleID ~= ModuleMan:GetModuleID(self.TechName[team]) then
 		Passenger = RandomAHuman("Actors", self.TechName[team]);
 	end
 
@@ -939,7 +939,7 @@ end
 
 function BrainvsBrain:CreateMediumInfantry(team, mode)
 	local Passenger = RandomAHuman("Actors - Heavy", self.TechName[team]);
-	if Passenger.ModuleID ~= PresetMan:GetModuleID(self.TechName[team]) then
+	if Passenger.ModuleID ~= ModuleMan:GetModuleID(self.TechName[team]) then
 		Passenger = RandomAHuman("Actors", self.TechName[team]);
 	end
 
@@ -964,7 +964,7 @@ end
 
 function BrainvsBrain:CreateScoutInfantry(team, mode)
 	local Passenger = RandomAHuman("Actors - Light", self.TechName[team]);
-	if Passenger.ModuleID ~= PresetMan:GetModuleID(self.TechName[team]) then
+	if Passenger.ModuleID ~= ModuleMan:GetModuleID(self.TechName[team]) then
 		Passenger = RandomAHuman("Actors", self.TechName[team]);
 	end
 
@@ -989,7 +989,7 @@ end
 
 function BrainvsBrain:CreateEngineer(team, mode)
 	local Passenger = RandomAHuman("Actors - Light", self.TechName[team]);
-	if Passenger.ModuleID ~= PresetMan:GetModuleID(self.TechName[team]) then
+	if Passenger.ModuleID ~= ModuleMan:GetModuleID(self.TechName[team]) then
 		Passenger = RandomAHuman("Actors", self.TechName[team]);
 	end
 

Data/Base.rte/Activities/BunkerBreach.lua

@@ -138,7 +138,7 @@ function BunkerBreach:SetupDefenderBrains()
 end
 
 function BunkerBreach:SetupDefenderActors()
-	local techID = PresetMan:GetModuleID(self:GetTeamTech(self.defenderTeam));
+	local techID = ModuleMan:GetModuleID(self:GetTeamTech(self.defenderTeam));
 	local crabToHumanSpawnRatio = self:GetCrabToHumanSpawnRatio(techID);
 
 	local loadoutNames = {"Light", "Heavy", "Sniper", "Engineer", "Mecha", "Turret"};
@@ -654,7 +654,7 @@ function BunkerBreach:CreateInternalReinforcements(loadout, numberOfReinforcemen
 		loadout = nil;
 	end
 	local team = self.CPUTeam;
-	local techID = PresetMan:GetModuleID(self:GetTeamTech(team));
+	local techID = ModuleMan:GetModuleID(self:GetTeamTech(team));
 	local crabToHumanSpawnRatio = self:GetCrabToHumanSpawnRatio(techID);
 
 	local internalReinforcementPositionsToEnemyTargets = self:CalculateInternalReinforcementPositionsToEnemyTargets(numberOfReinforcementsToCreate);
@@ -675,7 +675,7 @@ function BunkerBreach:CreateInternalReinforcements(loadout, numberOfReinforcemen
 					numberOfInternalReinforcementsToCreateAtPosition = 3;
 				end
 			end
-			
+
 			for i = 1, numberOfInternalReinforcementsToCreateAtPosition do
 				local internalReinforcement;
 				if loadout then
@@ -716,7 +716,7 @@ function BunkerBreach:CreateDrop(loadout, aiMode, passengerCount, avoidPreviousC
 		loadout = nil;
 	end
 	local team = self.CPUTeam;
-	local techID = PresetMan:GetModuleID(self:GetTeamTech(team));
+	local techID = ModuleMan:GetModuleID(self:GetTeamTech(team));
 	local crabToHumanSpawnRatio = self:GetCrabToHumanSpawnRatio(techID);
 
 	local craft = RandomACDropShip("Craft", techID);
@@ -881,7 +881,7 @@ function BunkerBreach:CreateCrab(techID, createTurret)
 end
 
 function BunkerBreach:CreateBrainBot(team, techID)
-	local techID = PresetMan:GetModuleID(self:GetTeamTech(team));
+	local techID = ModuleMan:GetModuleID(self:GetTeamTech(team));
 	local actor;
 	if techID ~= -1 and team == self.attackerTeam then
 		actor = PresetMan:GetLoadout("Infantry Brain", techID, false);

Data/Base.rte/Activities/Harvester.lua

@@ -280,7 +280,7 @@ function Harvester:UpdateActivity()
 			for i = 1, actorsInCargo do
 				-- Get any Actor from the CPU's native tech
 				local passenger = nil;
-				if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then
+				if math.random() >= self:GetCrabToHumanSpawnRatio(ModuleMan:GetModuleID(self.CPUTechName)) then
 					passenger = RandomAHuman("Any", self.CPUTechName);
 				else
 					passenger = RandomACrab("Actors - Mecha", self.CPUTechName);

Data/Base.rte/Activities/KeepieUppie.lua

@@ -130,7 +130,7 @@ function KeepieUppie:ResumeLoadedGame()
 			end
 		end
 	end
-	
+
 	if not self.playerRocketSpawned then
 		for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 			if self:PlayerActive(player) and self:PlayerHuman(player) then
@@ -228,7 +228,7 @@ function KeepieUppie:UpdateActivity()
 				for i = 1, actorsInCargo do
 					-- Get any Actor from the CPU's native tech
 					local passenger = nil;
-					if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then
+					if math.random() >= self:GetCrabToHumanSpawnRatio(ModuleMan:GetModuleID(self.CPUTechName)) then
 						passenger = RandomAHuman("Any", self.CPUTechName);
 					else
 						passenger = RandomACrab("Any", self.CPUTechName);

Data/Base.rte/Activities/Massacre.lua

@@ -276,7 +276,7 @@ function Massacre:UpdateActivity()
 			for i = 1, actorsInCargo do
 				-- Get any Actor from the CPU's native tech
 				local passenger = nil;
-				if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then
+				if math.random() >= self:GetCrabToHumanSpawnRatio(ModuleMan:GetModuleID(self.CPUTechName)) then
 					passenger = RandomAHuman("Any", self.CPUTechName);
 				else
 					passenger = RandomACrab("Actors - Mecha", self.CPUTechName);

Data/Base.rte/Activities/OneManArmy.lua

@@ -132,11 +132,11 @@ function OneManArmy:SetupHumanPlayerBrains(actorGroup, primaryGroup, secondaryGr
 
 				--If we can't find an unassigned brain in the scene to give the player, create one
 				if not foundBrain then
-					local tech = PresetMan:GetModuleID(self:GetTeamTech(team));
+					local tech = ModuleMan:GetModuleID(self:GetTeamTech(team));
 					foundBrain = CreateAHuman(defaultActor);
 					--If a faction was chosen, pick the first item from faction listing
 					if tech ~= -1 then
-						local module = PresetMan:GetDataModule(tech);
+						local module = ModuleMan:GetDataModule(tech);
 						local primaryWeapon, secondaryWeapon, throwable, actor;
 						for entity in module.Presets do
 							local picked;	--Prevent duplicates
@@ -357,9 +357,9 @@ function OneManArmy:UpdateActivity()
 			for i = 1, actorsInCargo do
 				--Get any Actor from the CPU's native tech
 				local passenger = nil;
-				if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then
+				if math.random() >= self:GetCrabToHumanSpawnRatio(ModuleMan:GetModuleID(self.CPUTechName)) then
 					passenger = RandomAHuman("Actors - Light", self.CPUTechName);
-					if passenger.ModuleID ~= PresetMan:GetModuleID(self.CPUTechName) then
+					if passenger.ModuleID ~= ModuleMan:GetModuleID(self.CPUTechName) then
 						passenger = RandomAHuman("Actors", self.CPUTechName);
 					end
 				else

Data/Base.rte/Activities/OneManArmyDiggers.lua

@@ -133,11 +133,11 @@ function OneManArmy:SetupHumanPlayerBrains(actorGroup, primaryGroup, secondaryGr
 				local foundBrain = MovableMan:GetUnassignedBrain(team);
 				-- If we can't find an unassigned brain in the scene to give the player, create one
 				if not foundBrain then
-					local tech = PresetMan:GetModuleID(self:GetTeamTech(team));
+					local tech = ModuleMan:GetModuleID(self:GetTeamTech(team));
 					foundBrain = CreateAHuman(defaultActor);
 					-- If a faction was chosen, pick the first item from faction listing
 					if tech ~= -1 then
-						local module = PresetMan:GetDataModule(tech);
+						local module = ModuleMan:GetDataModule(tech);
 						local primaryWeapon, secondaryWeapon, throwable, actor;
 						for entity in module.Presets do
 							local picked;	-- Prevent duplicates
@@ -308,7 +308,7 @@ function OneManArmy:UpdateActivity()
 			-- Set the ship up with a cargo of a few armed and equipped actors
 			for i = 1, actorsInCargo do
 				local passenger = RandomAHuman("Actors - " .. ((self.Difficulty > 75 and math.random() > 0.5) and "Heavy" or "Light"), self.CPUTechName);
-				if passenger.ModuleID ~= PresetMan:GetModuleID(self.CPUTechName) then
+				if passenger.ModuleID ~= ModuleMan:GetModuleID(self.CPUTechName) then
 					passenger = RandomAHuman("Actors", self.CPUTechName);
 				end
 

Data/Base.rte/Activities/OneManArmyZeroG.lua

@@ -8,7 +8,7 @@ function OneManArmyZeroG:StartActivity(isNewGame)
 	self.winTimer = Timer();
 
 	self.CPUTechName = self:GetTeamTech(self.CPUTeam);
-	
+
 	self.isDiggersOnly = self.PresetName:find("Diggers") ~= nil;
 
 	if isNewGame then
@@ -87,7 +87,7 @@ function OneManArmyZeroG:StartNewGame()
 	self.enemySpawnTimeLimit = 500;
 
 	MusicMan:PlayDynamicSong("Generic Battle Music");
-	
+
 	local automoverController = CreateActor("Invisible Automover Controller", "Base.rte");
 	automoverController.Team = -1;
 	automoverController:SetNumberValue("MovementSpeed", 16);
@@ -123,11 +123,11 @@ function OneManArmyZeroG:SetupHumanPlayerBrains(actorGroup, primaryGroup, second
 
 				--If we can't find an unassigned brain in the scene to give the player, create one
 				if not foundBrain then
-					local tech = PresetMan:GetModuleID(self:GetTeamTech(team));
+					local tech = ModuleMan:GetModuleID(self:GetTeamTech(team));
 					foundBrain = CreateAHuman(defaultActor);
 					--If a faction was chosen, pick the first item from faction listing
 					if tech ~= -1 then
-						local dataModule = PresetMan:GetDataModule(tech);
+						local dataModule = ModuleMan:GetDataModule(tech);
 						local primaryWeapon, secondaryWeapon, tertiaryWeapon, actor;
 						for entity in dataModule.Presets do
 							local picked;	--Prevent duplicates
@@ -250,14 +250,14 @@ function OneManArmyZeroG:ResumeLoadedGame()
 			end
 		end
 	end
-	
+
 	for particle in MovableMan.AddedParticles do
 		if particle.PresetName == "Automover Node 1x1" then
 			particle.Scale = 0;
 			break;
 		end
 	end
-	
+
 	for actor in MovableMan.AddedActors do
 		if actor.Team ~= Activity.TEAM_1 then
 			actor.AIMode = Actor.AIMODE_BRAINHUNT;
@@ -342,7 +342,7 @@ function OneManArmyZeroG:UpdateActivity()
 		if self.CPUTeam ~= Activity.NOTEAM and self.enemySpawnTimer:LeftTillSimMS(self.enemySpawnTimeLimit) <= 0 then
 			for i = 1, math.random(1, 3) do
 				local actor = RandomAHuman("Actors - Light", self.CPUTechName);
-				if actor.ModuleID ~= PresetMan:GetModuleID(self.CPUTechName) then
+				if actor.ModuleID ~= ModuleMan:GetModuleID(self.CPUTechName) then
 					actor = RandomAHuman("Actors", self.CPUTechName);
 				end
 

Data/Base.rte/Activities/Siege.lua

@@ -27,7 +27,7 @@ function Siege:StartActivity()
 	self.CPUTechName = self:GetTeamTech(self.CPUTeam);	-- Select a tech for the CPU player
 	self.PlayerTechName = self:GetTeamTech(self.PlayerTeam);
 	gPrevAITech = self.CPUTechName	-- Store the AI tech in a global so we don't pick the same tech again next round
-	self.CPUTechID = PresetMan:GetModuleID(self.CPUTechName);
+	self.CPUTechID = ModuleMan:GetModuleID(self.CPUTechName);
 
 	self:SetTeamFunds(math.ceil((3000 + self.Difficulty * 175) * rte.StartingFundsScale), self.CPUTeam);
 	if self.Difficulty == 100 then
@@ -496,7 +496,7 @@ function Siege:CreateHeavyDrop(xPosLZ, techName)
 		Craft.Pos = Vector(xPosLZ, -30); -- Set the spawn point of the craft
 
 		for i = 1, Craft.MaxPassengers do
-			if math.random() < self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(techName)) then
+			if math.random() < self:GetCrabToHumanSpawnRatio(ModuleMan:GetModuleID(techName)) then
 				Passenger = self:CreateCrab(Actor.AIMODE_GOTO, techName);
 			elseif RangeRand(0, 105) < self.Difficulty then
 				Passenger = self:CreateHeavyInfantry(Actor.AIMODE_GOTO,techName);
@@ -516,7 +516,7 @@ function Siege:CreateHeavyDrop(xPosLZ, techName)
 		end
 
 		-- Subtract the total value of the craft+cargo from the CPU team's funds
-		self:ChangeTeamFunds(-Craft:GetTotalValue(PresetMan:GetModuleID(techName), 2), self.CPUTeam);
+		self:ChangeTeamFunds(-Craft:GetTotalValue(ModuleMan:GetModuleID(techName), 2), self.CPUTeam);
 
 		-- Spawn the Craft onto the scene
 		MovableMan:AddActor(Craft);
@@ -553,7 +553,7 @@ function Siege:CreateSWATDrop(xPosLZ, techName)
 		end
 
 		-- Subtract the total value of the craft+cargo from the CPU team's funds
-		self:ChangeTeamFunds(-Craft:GetTotalValue(PresetMan:GetModuleID(techName), 2), self.CPUTeam);
+		self:ChangeTeamFunds(-Craft:GetTotalValue(ModuleMan:GetModuleID(techName), 2), self.CPUTeam);
 
 		-- Spawn the Craft onto the scene
 		MovableMan:AddActor(Craft);
@@ -590,7 +590,7 @@ function Siege:CreateArtilleryDrop(xPosLZ, techName)
 		end
 
 		-- Subtract the total value of the craft+cargo from the CPU team's funds
-		self:ChangeTeamFunds(-Craft:GetTotalValue(PresetMan:GetModuleID(techName), 2), self.CPUTeam);
+		self:ChangeTeamFunds(-Craft:GetTotalValue(ModuleMan:GetModuleID(techName), 2), self.CPUTeam);
 
 		-- Spawn the Craft onto the scene
 		MovableMan:AddActor(Craft);
@@ -644,7 +644,7 @@ function Siege:CreateMediumDrop(xPosLZ, techName)
 		end
 
 		-- Subtract the total value of the craft+cargo from the CPU team's funds
-		self:ChangeTeamFunds(-Craft:GetTotalValue(PresetMan:GetModuleID(techName), 2), self.CPUTeam);
+		self:ChangeTeamFunds(-Craft:GetTotalValue(ModuleMan:GetModuleID(techName), 2), self.CPUTeam);
 
 		-- Spawn the Craft onto the scene
 		MovableMan:AddActor(Craft);
@@ -696,7 +696,7 @@ function Siege:CreateLightDrop(xPosLZ, techName)
 		end
 
 		-- Subtract the total value of the craft+cargo from the CPU team's funds
-		self:ChangeTeamFunds(-Craft:GetTotalValue(PresetMan:GetModuleID(techName), 2), self.CPUTeam);
+		self:ChangeTeamFunds(-Craft:GetTotalValue(ModuleMan:GetModuleID(techName), 2), self.CPUTeam);
 
 		-- Spawn the Craft onto the scene
 		MovableMan:AddActor(Craft);
@@ -744,7 +744,7 @@ function Siege:CreateEngineerDrop(xPosLZ, techName)
 		end
 
 		-- Subtract the total value of the craft+cargo from the CPU team's funds
-		self:ChangeTeamFunds(-Craft:GetTotalValue(PresetMan:GetModuleID(techName), 2), self.CPUTeam);
+		self:ChangeTeamFunds(-Craft:GetTotalValue(ModuleMan:GetModuleID(techName), 2), self.CPUTeam);
 
 		-- Spawn the Craft onto the scene
 		MovableMan:AddActor(Craft);

Data/Base.rte/Activities/SkirmishDefense.lua

@@ -57,7 +57,7 @@ function SkirmishDefense:StartActivity(isNewGame)
 			end
 		end
 
-		self.AI[team].TechID = PresetMan:GetModuleID(self:GetTeamTech(team));
+		self.AI[team].TechID = ModuleMan:GetModuleID(self:GetTeamTech(team));
 	end
 
 	if isNewGame then

Data/Base.rte/Activities/Survival.lua

@@ -257,7 +257,7 @@ function Survival:UpdateActivity()
 			for i = 1, actorsInCargo do
 				-- Get any Actor from the CPU's native tech
 				local passenger = nil;
-				if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then
+				if math.random() >= self:GetCrabToHumanSpawnRatio(ModuleMan:GetModuleID(self.CPUTechName)) then
 					passenger = RandomAHuman("Any", self.CPUTechName);
 				else
 					passenger = RandomACrab("Actors - Mecha", self.CPUTechName);