Merge pull request #142 from cortex-command-community/browncoat-mission

Browncoat Mission Progress

Author: Causeless

CHANGELOG.md

@@ -31,6 +31,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - New `SoundContainer` features.  
 	Lua property `Paused` (R/W) to pause or unpause all sounds of a SoundContainer. Newly played sounds will not begin playback until unpaused.  
 	Lua function `GetAudibleVolume` to get the real audible volume of a SoundContainer's sounds as a float from 0 to 1. This accounts for literally everything, including game volume.
+	
+- New `AEmitter` and `PEmitter` INI and Lua (R/W) property `PlayBurstSound` which denotes whether the BurstSound should play when appropriate. This should not be confused for a trigger - it's just a enable/disable toggle to avoid having to remove and add BurstSound altogether.
 
 - Allow lua scripts to use LuaJIT's BitOp module (see https://bitop.luajit.org/api.html)
 
@@ -54,6 +56,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `MovableMan:OpenAllDoors()`, when passed `NOTEAM`, will now open/close doors specifically for `NOTEAM` (instead of all doors).
 
+- MOs now only play the BurstSound of the first Wound they receive in a frame, which not only solves audio spam during e.g. explosions but also preserves intended audio when firing guns with a high ParticleCount at them.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>

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

@@ -278,6 +278,38 @@ function DeliveryCreationHandler:OnSave(saveLoadHandler)
 
 end
 
+function DeliveryCreationHandler:GetHandlerAsSerialized(saveLoadHandler)
+	return saveLoadHandler:SerializeTable(self.saveTable);
+end
+
+function DeliveryCreationHandler:ReplaceHandlerWithSerialized(saveLoadHandler, saveTable)
+	self.saveTable = saveLoadHandler:DeserializeTable(saveTable);
+	
+	-- re-add virtual teams
+	
+	for team, techName in pairs(self.saveTable.virtualTeams) do
+		self:AddVirtualTeam(team, techName);
+	end
+	
+	-- redo adding and removing presets
+	
+	for team, presetsTable in pairs(self.saveTable.teamRemovedPresets) do
+		for i, presetName in pairs(self.saveTable.teamRemovedPresets[team]) do
+			self:RemoveAvailablePreset(team, presetName, true);
+		end
+	end
+	
+	for team, presetsTable in pairs(self.saveTable.teamAddedPresets) do
+		for i, presetTable in pairs(self.saveTable.teamAddedPresets[team]) do
+			self:AddAvailablePreset(team, presetTable.PresetName, presetTable.ClassName, presetTable.TechName, true);
+		end
+	end
+	
+	if self.verboseLogging then
+		print("INFO: DeliveryCreationHandler just replaced itself with a serialized saveTable!");
+	end
+end
+
 function DeliveryCreationHandler:AddVirtualTeam(team, techName)
 
 	if team and techName then
@@ -441,7 +473,7 @@ function DeliveryCreationHandler:ReplaceInfantryTypeWeightsTable(team, newWeight
 
 		return true;
 	else
-		print("DeliveryCreationHandler tried to replace infantry type weights, but wasn't given both a team and a table!");
+		print("ERROR: DeliveryCreationHandler tried to replace infantry type weights, but wasn't given both a team and a table!");
 		return false;
 	end
 
@@ -458,7 +490,7 @@ function DeliveryCreationHandler:AddAvailablePreset(team, presetName, className,
 		for i, groupTable in pairs(self.teamPresetTables[team]) do
 			for presetIndex, presetTable in pairs(groupTable) do
 				if presetTable.PresetName == presetName then
-					print("DeliveryCreationHandler tried to add an available preset that was already there!");
+					print("ERROR: DeliveryCreationHandler tried to add an available preset that was already there!");
 					return false;
 				end
 			end
@@ -491,7 +523,7 @@ function DeliveryCreationHandler:AddAvailablePreset(team, presetName, className,
 		return true;
 
 	else
-		print("DeliveryCreationHandler tried to add an available preset but was not given all of a team, presetName, className, and techName!");
+		print("ERROR: DeliveryCreationHandler tried to add an available preset but was not given all of a team, presetName, className, and techName!");
 		return false;
 	end
 
@@ -500,6 +532,10 @@ end
 function DeliveryCreationHandler:RemoveAvailablePreset(team, presetName, doNotSaveNewEntry)
 
 	-- check through every group and delete the preset with the given presetname from every one
+	
+	if self.verboseLogging then
+		print("INFO: DeliveryCreationHandler is trying to delete preset " .. presetName .. " from team " .. team);
+	end
 
 	local found = false;
 

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/HUDHandler.lua

@@ -102,12 +102,14 @@ function HUDHandler:Initialize(activity, newGame, verboseLogging)
 
 	self.descriptionSpacing = 15;
 
-	-- reinit camera timers always
+	-- reinit timers always
 
 	self.teamCameraTimers = {};
+	self.teamScreenTextTimers = {};
 
 	for team = 0, self.Activity.TeamCount do
 		self.teamCameraTimers[team] = Timer();
+		self.teamScreenTextTimers[team] = Timer();
 	end
 
 	if newGame then
@@ -123,6 +125,7 @@ function HUDHandler:Initialize(activity, newGame, verboseLogging)
 			self.saveTable.teamTables[team].Objectives = {};
 
 			self.saveTable.teamTables[team].cameraQueue = {};
+			self.saveTable.teamTables[team].screenTextQueue = {};
 			self.saveTable.teamTables[team].cinematicBars = false;
 			self.saveTable.teamTables[team].cinematicBarThickness = 50;
 			self.saveTable.teamTables[team].cinematicBarAnimationTimer = Timer();
@@ -176,7 +179,7 @@ function HUDHandler:OnSave(saveLoadHandler)
 	saveLoadHandler:SaveTableAsString("HUDHandlerMainTable", self.saveTable);	
 	print("INFO: HUDHandler saved!");
 
-	-- camera timers deliberately not saved, might as well reset them all
+	-- timers deliberately not saved, might as well reset them all
 
 end
 
@@ -254,6 +257,41 @@ function HUDHandler:DrawCinematicBars(team)
 
 end
 
+function HUDHandler:QueueScreenText(team, text, textTime, blinkInterval, centered)
+	local screenTextTable = {};
+	
+	textTime = textTime and textTime or 5000;
+	blinkInterval = blinkInterval and blinkInterval or -1;
+	centered = centered and centered or false;
+	
+	if team and text then
+		screenTextTable.Text = text;
+		screenTextTable.textTime = textTime;
+		screenTextTable.blinkInterval = blinkInterval;
+		screenTextTable.Centered = centered;
+	else
+		print("ERROR: HUDHandler tried to queue ScreenText with no team or no text!");
+		return false;
+	end
+		
+	if #self.saveTable.teamTables[team].screenTextQueue == 0 then
+		self.teamScreenTextTimers[team]:Reset();
+	end
+
+	table.insert(self.saveTable.teamTables[team].screenTextQueue, screenTextTable);
+	
+	return self.saveTable.teamTables[team].screenTextQueue[#self.saveTable.teamTables[team].screenTextQueue];
+end
+
+function HUDHandler:RemoveAllScreenTexts(team)
+	if team then
+		self.saveTable.teamTables[team].screenTextQueue = {};
+	else
+		print("ERROR: HUDHandlier tried to remove all ScreenTexts but wasn't given a team!");
+		return false;	
+	end
+end	
+
 function HUDHandler:QueueCameraPanEvent(team, name, pos, speed, holdTime, notCancellable, cinematicBars, disableHUDFully, callback)
 	local cameraTable = {};
 
@@ -291,38 +329,43 @@ function HUDHandler:QueueCameraPanEvent(team, name, pos, speed, holdTime, notCan
 end
 
 function HUDHandler:GetCameraPanEventCount(team)
-
 	if team then
 		return #self.saveTable.teamTables[team].cameraQueue;
 	else
 		print("ERROR: HUDHandlier tried to get a camera pan event count but wasn't given a team!");
 		return false;
 	end
-	
 end
 
 function HUDHandler:RemoveCameraPanEvent(team, name)
-
-	for i, cameraTable in ipairs(self.saveTable.teamTables[team].cameraQueue) do
-		if cameraTable.Name == name then
-			table.remove(self.saveTable.teamTables[team].cameraQueue, i);
-			break;
+	if team and name then
+		for i, cameraTable in ipairs(self.saveTable.teamTables[team].cameraQueue) do
+			if cameraTable.Name == name then
+				table.remove(self.saveTable.teamTables[team].cameraQueue, i);
+				break;
+			end
 		end
+	else
+		print("ERROR: HUDHandlier tried to remove a camera pan event but wasn't given a team or a name!");
+		return false;	
 	end
-	
 end
 
 function HUDHandler:RemoveAllCameraPanEvents(team, doNotResetHUD)
-
-	self.saveTable.teamTables[team].cameraQueue = {};
-	
-	if not doNotResetHUD then
-		for team = 0, #self.saveTable.teamTables do
-			FrameMan:SetHudDisabled(false);
+	if team then
+		self.saveTable.teamTables[team].cameraQueue = {};
+		
+		if not doNotResetHUD then
+			for k, player in pairs(self.saveTable.playersInTeamTables[team]) do
+				self.Activity:SetViewState(Activity.ACTORSELECT, player);
+				FrameMan:SetHudDisabled(false, self.Activity:ScreenOfPlayer(player));
+			end
 			self:SetCinematicBars(team, false, false);
 		end
+	else
+		print("ERROR: HUDHandlier tried to remove all camera pan events but wasn't given a team!");
+		return false;	
 	end
-	
 end
 
 function HUDHandler:SetCameraMinimumAndMaximumX(team, minimumX, maximumX)
@@ -498,6 +541,24 @@ function HUDHandler:UpdateHUDHandler()
 				end
 			end
 		end
+		
+		-- screen texts
+		local screenTextTable = self.saveTable.teamTables[team].screenTextQueue[1];
+
+		if screenTextTable then
+			for k, player in pairs(self.saveTable.playersInTeamTables[team]) do
+				FrameMan:SetScreenText(screenTextTable.Text, self.Activity:ScreenOfPlayer(player), screenTextTable.blinkInterval, -1, screenTextTable.Centered);
+			end
+			if self.teamScreenTextTimers[team]:IsPastSimMS(screenTextTable.textTime) then
+				self.teamScreenTextTimers[team]:Reset();
+				table.remove(self.saveTable.teamTables[team].screenTextQueue, 1);
+				if not self.saveTable.teamTables[team].screenTextQueue[1] then
+					for k, player in pairs(self.saveTable.playersInTeamTables[team]) do
+						FrameMan:ClearScreenText(self.Activity:ScreenOfPlayer(player));
+					end
+				end
+			end
+		end
 
 		-- Objectives
 		if not PerformanceMan.ShowPerformanceStats == true and not disableDrawingObjectives then
@@ -535,8 +596,15 @@ function HUDHandler:UpdateHUDHandler()
 
 				-- c++ objectives are per team, not per player, so we can't do it per player yet...
 				if objTable.Position and spectatorView then
-					local pos = not objTable.Position.PresetName and objTable.Position or objTable.Position.Pos; -- severely ghetto mo check
-					self.Activity:AddObjectivePoint(objTable.shortName, pos, team, GameActivity.ARROWDOWN);
+					local pos;
+					if objTable.Position.PresetName then -- severely ghetto mo check
+						pos = objTable.Position.Pos;
+					else
+						pos = objTable.Position;
+					end
+					if not (pos.Magnitude == 0) then -- if it's 0, 0 something probably went wrong, don't display it
+						self.Activity:AddObjectivePoint(objTable.shortName, pos, team, GameActivity.ARROWDOWN);
+					end
 				end
 			end
 		end

Data/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosiveDetonator.lua

@@ -10,11 +10,9 @@ function Create(self)
 end
 
 function ThreadedUpdate(self)
-	if self.ID ~= self.RootID then
-		local actor = MovableMan:GetMOFromID(self.RootID);
-		if MovableMan:IsActor(actor) then
-			self.alliedTeam = ToActor(actor).Team;
-		end
+	local parent = self:GetRootParent();
+	if MovableMan:IsActor(parent) then
+		self.alliedTeam = ToActor(parent).Team;
 	end
 	if self.Magazine then
 		if self:IsActivated() then