Merge branch 'browncoat-lmg' of https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data into browncoat-lmg

Author: MissakGhostComodo

Data/Base.rte/AI/CrabAI.lua

@@ -1,12 +1,10 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeCrabAI");
 
 function Create(self)
 	self.AI = NativeCrabAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 

Data/Base.rte/AI/DropShipAI.lua

@@ -1,11 +1,9 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeDropShipAI");
 
 function Create(self)
 	self.AI = NativeDropShipAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end

Data/Base.rte/AI/HumanAI.lua

@@ -1,11 +1,9 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeHumanAI");
 
 function Create(self)
 	self.AI = NativeHumanAI:Create(self);
 end
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 function Destroy(self)

Data/Base.rte/AI/RocketAI.lua

@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 require("AI/PID");
 
 function Create(self)
@@ -59,7 +57,7 @@ function Create(self)
 	---------------- AI variables end ----------------
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.Ctrl = self:GetController();
 
 	if self.PlayerInterferedTimer:IsPastSimTimeLimit() then

Data/Base.rte/AI/TurretAI.lua

@@ -1,12 +1,10 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeTurretAI");
 
 function Create(self)
 	self.AI = NativeTurretAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 

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

@@ -180,7 +180,7 @@ function DeliveryCreationHandler:Initialize(activity)
 		self.teamPresetTables[team]["Actors - Turrets"] = {};
 
 		for entity in module.Presets do
-			if IsMOSRotating(entity) and ToMOSRotating(entity).IsBuyable then
+			if IsMOSRotating(entity) and ToMOSRotating(entity).IsBuyable and ToMOSRotating(entity).BuyableMode ~= 2 then
 
 				local entityInfoTable = {};
 

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

@@ -23,8 +23,8 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 	skipnewlines = skipnewlines or false
 	depth = depth or 0
 
-	print("looking at val: ");
-	print(val)
+	--print("looking at val: ");
+	--print(val)
 	print("with name: ")
 	print(name)
 
@@ -57,9 +57,11 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 		tmp = tmp .. (val and "true" or "false")
 	elseif val.Magnitude then -- ghetto vector check
 		tmp = tmp .. string.format("%q", "Vector(" .. val.X .. "," .. val.Y .. ")")
-	elseif val.PresetName and IsMOSRotating(val) then
+	elseif val.PresetName and IsMOSRotating(val) then -- IsMOSRotating freaks out if we give it something that isn't a preset at all... ghetto here too
 		val:SetNumberValue("saveLoadHandlerUniqueID", val.UniqueID);
 		tmp = tmp .. string.format("%q", "SAVELOADHANDLERUNIQUEID_" .. tostring(val.UniqueID))
+	elseif val.FirstBox then -- ghetto area check
+		tmp = tmp .. string.format("%q", "SAVELOADHANDLERAREA_" .. tostring(val.Name))
 	else
 		tmp = tmp .. '"[inserializeable datatype:' .. type(val) .. ']"'
 	end
@@ -70,18 +72,6 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 	return tmp
 end
 
-function SaveLoadHandler:ParseTableForVectors(tab)
-	for k, v in pairs(tab) do
-		if type(v) == "string" and string.find(v, "Vector%(") then
-			local vector = loadstring("return " .. v)();
-			tab[k] = vector;	
-		elseif type(v) == "table" then
-			self:ParseTableForVectors(v);
-		end
-	end
-		
-end
-
 function SaveLoadHandler:ParseTableForMOs(tab)
 
 	for k, v in pairs(tab) do
@@ -169,16 +159,46 @@ function SaveLoadHandler:ParseTableForMOs(tab)
 	end
 end
 
+function SaveLoadHandler:ParseTableForVectors(tab)
+	for k, v in pairs(tab) do
+		if type(v) == "string" and string.find(v, "Vector%(") then
+			local vector = loadstring("return " .. v)();
+			tab[k] = vector;	
+		elseif type(v) == "table" then
+			self:ParseTableForVectors(v);
+		end
+	end
+		
+end
+
+function SaveLoadHandler:ParseTableForAreas(tab)
+	for k, v in pairs(tab) do
+		if type(v) == "string" and string.find(v, "SAVELOADHANDLERAREA_") then
+			local areaName = string.sub(v, 21, -1);
+			local area = SceneMan.Scene:GetOptionalArea(areaName);
+			tab[k] = area;	
+		elseif type(v) == "table" then
+			self:ParseTableForAreas(v);
+		end
+	end
+		
+end
+
 function SaveLoadHandler:ReadSavedStringAsTable(name)
 	print(ActivityMan:GetActivity())
 	print(ActivityMan:GetActivity():LoadString(name))
 	local savedString = ActivityMan:GetActivity():LoadString(name)
+	if savedString == "" then
+		savedString = "{}";
+	end
+
 	local tab = loadstring("return " .. savedString)()
 	-- Parse for saved MOSRotatings
 	-- Very mildly inefficient in terms of looping even after resolving a value, but it happens once on startup
 	print("Parsing table for MOs: " .. name);
 	self:ParseTableForMOs(tab);
 	self:ParseTableForVectors(tab);
+	self:ParseTableForAreas(tab);
 
 	return tab;
 

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

@@ -1,9 +1,9 @@
 function Create(self)
 
-	if self:StringValueExists("tacticsActorInvalidatorSquadInfo") ~= "" then
+	if self:StringValueExists("tacticsActorInvalidatorSquadInfo") then
 		--print("tried to create load serialized invalidator")
 		--print(self:LoadString("tacticsActorInvalidatorSquadInfo"))
-		self.tacticsHandlerSquadInfo = loadstring("return " .. self:GetStringValue("tacticsActorInvalidatorSquadInfo"))()
+		self.tacticsHandlerSquadInfo = loadstring("return " .. self:GetEncodedStringValue("tacticsActorInvalidatorSquadInfo"))()
 	end
 
 end
@@ -31,7 +31,7 @@ end
 function OnSave(self)
 
 	--print("tried to save...?")
-	self:SetStringValue("tacticsActorInvalidatorSquadInfo", self.saveLoadHandler:SerializeTable(self.tacticsHandlerSquadInfo))		
+	self:SetEncodedStringValue("tacticsActorInvalidatorSquadInfo", self.saveLoadHandler:SerializeTable(self.tacticsHandlerSquadInfo))		
 
 end
 

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

@@ -78,9 +78,7 @@ function TacticsHandler:OnLoad(saveLoadHandler)
 end
 
 function TacticsHandler:OnSave(saveLoadHandler)
-	
 	saveLoadHandler:SaveTableAsString("tacticsHandlerTeamList", self.teamList);
-	
 end
 
 function TacticsHandler:InvalidateActor(infoTable)

Data/Base.rte/Devices/Shared/Scripts/BurstFire.lua

@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.shotsPerBurst = self:NumberValueExists("ShotsPerBurst") and self:GetNumberValue("ShotsPerBurst") or 3;
 	self.coolDownDelay = (60000/self.RateOfFire) + 100;