Merge stuff

Author: MissakGhostComodo

.gitignore

@@ -101,3 +101,5 @@ LogLoadingWarning.txt
 LogConsole.txt
 Console.dump.log
 Console.input.log
+Data/Base.rte/GUIs/Skins/Menus/SkinGreen.png
+Data/Base.rte/GUIs/Skins/SkinGreen.png

CHANGELOG.md

@@ -44,8 +44,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - The Signal Hunt activity no longer has a preview image, as it was not formatted correctly and spoiled the interior structure of the cave.
 
-- `MovableObject`'s `UniqueID` and `Age` fields are now persisted through game save/load.
-
 </details>
 
 <details><summary><b>Fixed</b></summary>

Data/Base.rte/AI/HumanBehaviors.lua

@@ -1852,7 +1852,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 											local Trace = SceneMan:ShortestDistance(Owner.Head.Pos, FallPos, false);
 											SceneMan:CastObstacleRay(Owner.Head.Pos, Trace, FallPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
 
-											local deltaToJump = 25;
+											local deltaToJump = 15;
 											if Owner.Jetpack.JetpackType == AEJetpack.JumpPack then
 												deltaToJump = deltaToJump * 1.4;
 											end

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

@@ -0,0 +1,108 @@
+--------------------------------------- Instructions ---------------------------------------
+
+------- Require this in your script like so: 
+
+-- self.GameIntensityCalculator = require("Activities/Utility/GameIntensityCalculator");
+-- self.GameIntensityCalculator:Initialize(Activity, bool newGame, bool verboseLogging, number intensityValuePerHPBarLost, number intensityDegradationRatePerSecond);
+
+-- Call self.GameIntensityCalculator:UpdateGameIntensityCalculator() every frame.
+
+-- The main update function will return an intensity number between 0 and 1.
+-- This corresponds to how much damage has been dealt directly within all the player's views.
+-- Use the two number arguments to control how the intensity value rises and falls.
+-- One "HP Bar" is considered a standard 100 HP.
+
+------- Saving/Loading
+
+-- Saving and loading requires you to also have the SaveLoadHandler ready.
+-- Simply run OnSave(instancedSaveLoadHandler) and OnLoad(instancedSaveLoadHandler) when appropriate.
+
+--------------------------------------- Misc. Information ---------------------------------------
+
+--
+
+
+
+
+local GameIntensityCalculator = {};
+
+function GameIntensityCalculator:Create()
+	local Members = {};
+
+	setmetatable(Members, self);
+	self.__index = self;
+
+	return Members;
+end
+
+function GameIntensityCalculator:Initialize(activity, newGame, intensityValuePerHPBarLost, intensityDegradationRatePerSecond, verboseLogging)
+	self.verboseLogging = verboseLogging
+	
+	self.Activity = activity;
+	
+	if not intensityValuePerHPBarLost then
+		intensityValuePerHPBarLost = 0.2;
+	end
+	if not intensityDegradationRatePerSecond then
+		intensityDegradationRatePerSecond = 0.01;
+	end
+	
+	-- One "HP Bar" is considered 100 HP
+	self.intensityValuePerHPBarLost = intensityValuePerHPBarLost;
+	
+	self.intensityDegradationRatePerSecond = intensityDegradationRatePerSecond;
+	
+	if newGame then
+		self.saveTable = {};
+		self.saveTable.CurrentIntensity = -0.5;
+	end
+	
+	print("INFO: GameIntensityCalculator initialized!")
+end
+
+function GameIntensityCalculator:OnLoad(saveLoadHandler)
+	print("INFO: GameIntensityCalculator loading...");
+	self.saveTable = saveLoadHandler:ReadSavedStringAsTable("GameIntensityCalculatorMainTable");
+	print("INFO: GameIntensityCalculator loaded!");
+end
+
+function GameIntensityCalculator:OnSave(saveLoadHandler)
+	print("INFO: GameIntensityCalculator saving...");
+	saveLoadHandler:SaveTableAsString("GameIntensityCalculatorMainTable", self.saveTable);	
+	print("INFO: GameIntensityCalculator saved!");
+end
+
+function GameIntensityCalculator:GetCurrentIntensity()
+	return math.min(1, self.saveTable.CurrentIntensity, math.max(0, self.saveTable.CurrentIntensity));
+end
+
+function GameIntensityCalculator:UpdateGameIntensityCalculator()
+	self.saveTable.CurrentIntensity = math.max(-0.5, self.saveTable.CurrentIntensity - (self.intensityDegradationRatePerSecond * TimerMan.DeltaTimeSecs));
+
+	local healthLostThisFrame = 0;
+
+	for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
+		if self.Activity:PlayerActive(player) and self.Activity:PlayerHuman(player) then
+			local screenBox = Box(CameraMan:GetOffset(player), CameraMan:GetOffset(player) + Vector(FrameMan.PlayerScreenWidth, FrameMan.PlayerScreenHeight));
+			for mo in MovableMan:GetMOsInBox(screenBox, -1, true) do
+				if IsActor(mo) then
+					mo = ToActor(mo);
+					healthLostThisFrame = math.max(0, healthLostThisFrame + mo.PrevHealth - mo.Health);
+				end
+			end
+		end
+	end
+	
+	if healthLostThisFrame > 0 then
+		--print("health lost this frame: " .. healthLostThisFrame);
+	end
+	
+	self.saveTable.CurrentIntensity = math.min(1.25, self.saveTable.CurrentIntensity + self.intensityValuePerHPBarLost * (healthLostThisFrame/100))
+	
+	--print("intensity: " .. self.saveTable.CurrentIntensity);
+	
+	return math.min(1, self.saveTable.CurrentIntensity, math.max(0, self.saveTable.CurrentIntensity));
+end
+
+
+return GameIntensityCalculator:Create();

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

@@ -31,8 +31,10 @@
 -- a UniqueID is just a number, so SaveLoadHandler will save it as such instead of using its special MO method. UniqueIDs reset on game load too,
 -- so they are no longer the same anyway.
 
--- Note that still-valid entities that nonetheless only exist in the lua state and not in the simulation can't really be saved and loaded. Those are wiped
--- as soon as the lua state is deleted (i.e. you save and quit a game).
+-- Also, SaveLoadHandler's MO parsing method relies on trawling through entities owned by MovableMan, which means entities that actually exist in the simulation,
+-- including those in the inventory of Actors that exist in the simulation.
+-- Yes, this means that valid entities that only exist in the lua state and not in the simulation can't really be saved and loaded. Those are wiped
+-- as soon a the lua state is deleted (i.e. you save and quit a game).
 
 local SaveLoadHandler = {}
 
@@ -91,6 +93,7 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 	elseif val.Magnitude then -- ghetto vector check
 		tmp = tmp .. string.format("%q", "Vector(" .. val.X .. "," .. val.Y .. ")")
 	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))
@@ -109,14 +112,109 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 	return tmp
 end
 
+function SaveLoadHandler:FindMOWithId(id)
+	for act in MovableMan.AddedActors do
+		if math.abs(act:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--act:removeNumberValue("saveLoadHandlerUniqueID");
+			return act;
+		end
+		for item in act.Inventory do
+			if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				return item;
+			end
+		end
+		for att in ToMOSRotating(act).Attachables do
+			if math.abs(att:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				return att;
+			end
+		end
+	end
+	for act in MovableMan.Actors do
+		if math.abs(act:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--act:removeNumberValue("saveLoadHandlerUniqueID");
+			return act;
+		end
+		for item in act.Inventory do
+			if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				return item;
+			end
+		end
+		for att in ToMOSRotating(act).Attachables do
+			if math.abs(att:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				return att;
+			end
+		end
+	end
+
+	for item in MovableMan.AddedItems do
+		if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--item:removeNumberValue("saveLoadHandlerUniqueID");
+			return item;
+		end
+		for att in ToMOSRotating(item).Attachables do
+			if math.abs(att:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				return att;
+			end
+		end
+	end
+	for item in MovableMan.Items do
+		if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--item:removeNumberValue("saveLoadHandlerUniqueID");
+			return item;
+		end
+		for att in ToMOSRotating(item).Attachables do
+			if math.abs(att:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				return att;
+			end
+		end
+	end
+
+	for particle in MovableMan.AddedParticles do
+		if math.abs(particle:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--particle:removeNumberValue("saveLoadHandlerUniqueID");
+			return particle;
+		end
+		if IsMOSRotating(particle) then
+			for att in ToMOSRotating(particle).Attachables do
+				if math.abs(att:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+					--item:removeNumberValue("saveLoadHandlerUniqueID");
+					return att;
+				end
+			end
+		end
+	end
+	for particle in MovableMan.Particles do
+		if math.abs(particle:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--particle:removeNumberValue("saveLoadHandlerUniqueID");
+			return particle;
+		end
+		if IsMOSRotating(particle) then
+			for att in ToMOSRotating(particle).Attachables do
+				if math.abs(att:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+					--item:removeNumberValue("saveLoadHandlerUniqueID");
+					return att;
+				end
+			end
+		end
+	end
+
+	return nil;
+end
+
 function SaveLoadHandler:ParseTableForMOs(tab)
 	for k, v in pairs(tab) do
 		if type(v) == "string" and string.find(v, "SAVELOADHANDLERUNIQUEID_") then
 			local id = math.abs(tonumber(string.sub(v, 25, -1)));
 			if SaveLoadHandler.verboseLogging then
-				print("INFO: SaveLoadHandler is looking for this ID: " .. id)
+				print("INFO: SaveLoadHandler is parsing looking for this ID: " .. id)
 			end
-			local mo = MovableMan:FindObjectByUniqueID(id);
+			local mo = self:FindMOWithId(id);
 			if mo then
 				tab[k] = mo;
 				if SaveLoadHandler.verboseLogging then
@@ -125,7 +223,7 @@ function SaveLoadHandler:ParseTableForMOs(tab)
 				end
 			else
 				print("ERROR: SaveLoadHandler could not resolve a saved MO UniqueID! A loaded table is likely broken.");
-				print("The saved ID including SaveLoadHandler prefix was: " .. v)
+				print("The saved ID was: " .. v)
 			end
 		elseif type(v) == "table" then
 			self:ParseTableForMOs(v);
@@ -180,13 +278,6 @@ end
 
 function SaveLoadHandler:DeserializeTable(serializedTable, name)
 
-	-- for mo in MovableMan.AddedParticles do
-		-- print(mo.UniqueID)
-	-- end
-	-- for mo in MovableMan.AddedActors do
-		-- print(mo.UniqueID)
-	-- end
-
 	local tab = loadstring("return " .. serializedTable)()
 	-- Parse for saved MOSRotatings
 	-- Very mildly inefficient in terms of looping even after resolving a value, but it happens once on startup
@@ -227,24 +318,92 @@ function SaveLoadHandler:SaveTableAsString(name, tab)
 end
 
 function SaveLoadHandler:SaveMOLocally(self, name, mo)
-	self:SetNumberValue(name, mo.UniqueID);
+	mo:SetNumberValue("saveLoadHandlerUniqueID", mo.UniqueID);
+	self:SetStringValue(name, "SAVELOADHANDLERUNIQUEID_" .. tostring(mo.UniqueID));
 end
 
 function SaveLoadHandler:LoadLocallySavedMO(self, name)
-	local id = self:GetNumberValue(name);
-	self:RemoveNumberValue(name);
+	local v = self:GetStringValue(name);
+	local didNotFindAnMO = false;
 
+	local notFound = true;
 	if SaveLoadHandler.verboseLogging then
 		print("INFO: SaveLoadHandler is finding this locally saved MO: " .. name);
 	end
-	local mo = MovableMan:FindObjectByUniqueID(id);
+	local id = math.abs(tonumber(string.sub(v, 25, -1)));
+	for particle in MovableMan.AddedParticles do
+		if math.abs(particle:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--particle:removeNumberValue("saveLoadHandlerUniqueID");
+			v = particle;
+			notFound = false;
+			break;
+		end
+	end
+	for act in MovableMan.AddedActors do
+		if math.abs(act:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--act:removeNumberValue("saveLoadHandlerUniqueID");
+			v = act;
+			notFound = false;
+			break;
+		end
+		for item in act.Inventory do
+			if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				v = item;
+				notFound = false;
+				break;
+			end
+		end
+	end
+	for item in MovableMan.AddedItems do
+		if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--item:removeNumberValue("saveLoadHandlerUniqueID");
+			v = item;
+			notFound = false;
+			break;
+		end
+	end
+	for particle in MovableMan.Particles do
+		if math.abs(particle:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--particle:removeNumberValue("saveLoadHandlerUniqueID");
+			v = particle;
+			notFound = false;
+			break;
+		end
+	end
+	for act in MovableMan.Actors do
+		if math.abs(act:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--act:removeNumberValue("saveLoadHandlerUniqueID");
+			v = act;
+			notFound = false;
+			break;
+		end
+		for item in act.Inventory do
+			if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+				--item:removeNumberValue("saveLoadHandlerUniqueID");
+				v = item;
+				notFound = false;
+				break;
+			end
+		end
+	end
+	for item in MovableMan.Items do
+		if math.abs(item:GetNumberValue("saveLoadHandlerUniqueID")) == id then
+			--item:removeNumberValue("saveLoadHandlerUniqueID");
+			v = item;
+			notFound = false;
+			break;
+		end
+	end
 
-	if mo then
-		return mo;
-	else
+	if notFound then
 		print("ERROR: SaveLoadHandler could not resolve a locally saved MO!");
 		return false;
 	end
+	
+	self:RemoveStringValue(name);
+	
+	return v;
 
 end