Merge branch 'pre5-patch' into secrets-and-speedruns

# Conflicts:
#	Data/Missions.rte/Activities/SignalHunt.lua - Not a real conflict

Author: garethyr

.gitignore

@@ -59,7 +59,7 @@ Mods/
 Userdata/
 
 allegro.log
-AbortScreen.bmp
+AbortScreen.*
 AbortLog.txt
 MemCleanupInfo.txt
 LogPublish.txt

Data/Base.rte/Activities.ini

@@ -47,11 +47,11 @@ AddActivity = GAScripted
 	Description = Build a bunker and defend it against increasingly longer waves of AI-controlled enemies, with time to repair in between! Adjust the Difficulty to change wave difficulty.
 	SceneName = Ketanot Hills
 	ScriptPath = Base.rte/Activities/WaveDefense.lua
-	TeamOfPlayer1 = 0
-	TeamOfPlayer2 = 0
-	TeamOfPlayer3 = 0
-	TeamOfPlayer4 = 0
-	CPUTeam = 1
+	TeamOfPlayer1 = 1
+	TeamOfPlayer2 = 1
+	TeamOfPlayer3 = 1
+	TeamOfPlayer4 = 1
+	CPUTeam = 0
 	MinTeamsRequired = 2
 	DefaultGoldCakeDifficulty = 6000
 	DefaultGoldEasyDifficulty = 5000
@@ -60,9 +60,11 @@ AddActivity = GAScripted
 	DefaultGoldNutsDifficulty = 2000
 	DefaultGoldMaxDifficulty = 1000
 	LuaClassName = WaveDefense
+	Team1Name = Attackers
+	Team2Name = Defenders
 	DefaultRequireClearPathToOrbit = 1
 	DeployUnitsSwitchEnabled = 1
-	DefaultDeployUnits = 0
+	DefaultDeployUnits = 1
 
 
 AddActivity = GAScripted

Data/Base.rte/Activities/BunkerBreach.lua

@@ -77,8 +77,8 @@ function BunkerBreach:SetupDefenderBrains()
 
 	-- Add defender brains, either using the Brain area or picking randomly from those created by deployments.
 	if SceneMan.Scene:HasArea("Brain") then
-		for actor in MovableMan.Actors do
-			if actor.Team == self.defenderTeam and actor:IsInGroup("Brains") then
+		for actor in MovableMan.AddedActors do
+			if actor:IsInGroup("Brains") then
 				actor.ToDelete = true;
 			end
 		end
@@ -141,35 +141,52 @@ function BunkerBreach:SetupDefenderActors()
 	local techID = PresetMan:GetModuleID(self:GetTeamTech(self.defenderTeam));
 	local crabToHumanSpawnRatio = self:GetCrabToHumanSpawnRatio(techID);
 
-	for _, loadoutName in pairs({"Light", "Heavy", "Sniper", "Engineer", "Mecha", "Turret"}) do
+	local loadoutNames = {"Light", "Heavy", "Sniper", "Engineer", "Mecha", "Turret"};
+	
+	local hasSpawnAreas = false;
+	for _, loadoutName in pairs(loadoutNames) do
 		if SceneMan.Scene:HasArea(loadoutName .. " Defenders") then
-			local defenderArea = SceneMan.Scene:GetOptionalArea(loadoutName .. " Defenders");
-			if defenderArea ~= nil then
-				for defenderBox in defenderArea.Boxes do
-					local guard;
-					if loadoutName == "Mecha" or loadoutName == "Turret" then
-						guard = crabToHumanSpawnRatio > 0 and self:CreateCrab(techID, loadoutName == "Turret") or self:CreateInfantry(techID, "Heavy");
-					else
-						guard = self:CreateInfantry(techID, loadoutName);
-					end
-					if guard then
-						guard.Pos = defenderBox.Center;
-						guard.Team = self.defenderTeam;
-						guard.AIMode = Actor.AIMODE_SENTRY;
-						if loadoutName == "Engineer" then
-							guard.AIMode = Actor.AIMODE_GOLDDIG;
+			hasSpawnAreas = true;
+		end
+	end
+	
+	for actor in MovableMan.AddedActors do
+		if not actor:IsInGroup("Brains") and not actor:IsInGroup("Bunker Systems - Automovers") then
+			if hasSpawnAreas then
+				actor.ToDelete = true;
+			elseif actor.Team ~= self.defenderTeam then
+				MovableMan:ChangeActorTeam(actor, self.defenderTeam);
+			end
+		end
+	end
+	
+	if hasSpawnAreas then
+		for _, loadoutName in pairs({"Light", "Heavy", "Sniper", "Engineer", "Mecha", "Turret"}) do
+			if SceneMan.Scene:HasArea(loadoutName .. " Defenders") then
+				hasSpawnAreas = true;
+				local defenderArea = SceneMan.Scene:GetOptionalArea(loadoutName .. " Defenders");
+				if defenderArea ~= nil then
+					for defenderBox in defenderArea.Boxes do
+						local guard;
+						if loadoutName == "Mecha" or loadoutName == "Turret" then
+							guard = crabToHumanSpawnRatio > 0 and self:CreateCrab(techID, loadoutName == "Turret") or self:CreateInfantry(techID, "Heavy");
+						else
+							guard = self:CreateInfantry(techID, loadoutName);
+						end
+						if guard then
+							guard.Pos = defenderBox.Center;
+							guard.Team = self.defenderTeam;
+							guard.AIMode = Actor.AIMODE_SENTRY;
+							if loadoutName == "Engineer" then
+								guard.AIMode = Actor.AIMODE_GOLDDIG;
+							end
+							MovableMan:AddActor(guard);
 						end
-						MovableMan:AddActor(guard);
 					end
 				end
 			end
 		end
 	end
-	for actor in MovableMan.AddedActors do
-		if actor.Team ~= self.defenderTeam and not actor:IsInGroup("Brains") and not actor:IsInGroup("Bunker Systems - Automovers") then
-			MovableMan:ChangeActorTeam(actor, self.defenderTeam);
-		end
-	end
 end
 
 function BunkerBreach:SetupFogOfWar()
@@ -241,12 +258,12 @@ function BunkerBreach:StartActivity(isNewGame)
 
 		self:SetupAIVariables();
 
-		self:SetupHumanAttackerBrains();
-
 		self:SetupDefenderBrains();
 
 		self:SetupDefenderActors();
 
+		self:SetupHumanAttackerBrains();
+
 		self:SetupFogOfWar();
 	else
 		self:ResumeLoadedGame();

Data/Base.rte/Activities/SkirmishDefense.lua

@@ -110,10 +110,10 @@ function SkirmishDefense:StartNewGame(aiTeams)
 			soleHumanTeam = soleHumanTeam == -1 and team or false;
 		end
 	end
-	-- If there's only one Human team, set all existing doors to that team
+	-- If there's only one Human team, set all existing doors and actors to that team
 	if soleHumanTeam ~= false and soleHumanTeam >= 0 then
 		for actor in MovableMan.AddedActors do
-			if actor.Team ~= soleHumanTeam and actor.ClassName == "ADoor" then
+			if actor.Team ~= soleHumanTeam then
 				MovableMan:ChangeActorTeam(actor, soleHumanTeam);
 			end
 		end

Data/Base.rte/Activities/WaveDefense.lua

@@ -25,7 +25,7 @@ end
 
 function WaveDefense:StartActivity(isNewGame)
 	-- Get player team
-	self.playerTeam = Activity.TEAM_1;
+	self.playerTeam = Activity.TEAM_2;
 	for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 		if self:PlayerActive(player) and self:PlayerHuman(player) then
 			self.playerTeam = self:GetTeamOfPlayer(player);
@@ -94,7 +94,6 @@ end
 
 function WaveDefense:StartNewGame()
 	self:SetTeamFunds(self:GetStartingGold(), self.playerTeam);
-	self:CheckBrains();
 
 	self.triggerWaveInit = true;
 	self.wave = 1;
@@ -105,7 +104,17 @@ function WaveDefense:StartNewGame()
 		if actor.ClassName == "AHuman" or actor.ClassName == "ACrab" then
 			actor.AIMode = Actor.AIMODE_SENTRY;
 		end
-		actor.Team = self.playerTeam;
+		MovableMan:ChangeActorTeam(actor, self.playerTeam);
+	end
+	
+	self:CheckBrains();
+	
+	for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
+		if self:PlayerActive(player) and self:PlayerHuman(player) then
+			if self:GetPlayerBrain(player) then
+				self:SwitchToActor(self:GetPlayerBrain(player), player, self:GetTeamOfPlayer(player));
+			end
+		end
 	end
 end
 
@@ -258,6 +267,14 @@ function WaveDefense:UpdateActivity()
 					end
 				end
 
+				-- Reveal the main bunker area for the defender.
+				local mainBunkerArea = SceneMan.Scene:GetOptionalArea("Main Bunker");
+				if mainBunkerArea ~= nil then
+					for mainBunkerBox in mainBunkerArea.Boxes do
+						SceneMan:RevealUnseenBox(mainBunkerBox.Corner.X, mainBunkerBox.Corner.Y, mainBunkerBox.Width, mainBunkerBox.Height, self.playerTeam);
+					end
+				end
+
 				for Act in MovableMan.AddedActors do
 					if Act.ClassName ~= "ADoor" then
 						for ang = 0, math.pi*2, 0.15 do

Data/Base.rte/Actors/Shared/Scripts/SelfHeal.lua

@@ -11,7 +11,11 @@ function Update(self)
 		if self.healing.wound then
 			if self.healing.timer:IsPastSimMS(self.healing.delay) then
 				self.healing.timer:Reset();
-				self.Health = math.min(self.Health + self.healing.wound.BurstDamage * math.sqrt(self.healing.part.DamageMultiplier), self.MaxHealth);
+				if self.healing.part.DamageMultiplier > 1 then
+					self.Health = math.min(self.Health + self.healing.wound.BurstDamage * math.sqrt(self.healing.part.DamageMultiplier), self.MaxHealth);
+				else
+					self.Health = math.min(self.Health + self.healing.wound.BurstDamage * self.healing.part.DamageMultiplier, self.MaxHealth);
+				end
 				self.healing.wound.ToDelete = true;
 				self.healing.wound = nil;
 				for wound in self.healing.part.Wounds do

Data/Base.rte/Constants.lua

@@ -14,5 +14,5 @@ rte.PxTravelledPerFrame = GetPPM() * TimerMan.DeltaTimeSecs;
 --Materials
 rte.airID = 0;
 rte.goldID = 2;
-rte.doorID = 4;	--Xenocronium
-rte.grassID = 128;
+rte.grassID = 128;
+rte.doorID = 181;

Data/Base.rte/Devices/Explosives/NapalmBomb/NapalmBomb.ini

@@ -241,6 +241,7 @@ AddDevice = TDExplosive
 		MaxVelocity = 25
 		InheritsVel = 0
 		LifeVariation = 0.20
+		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = PEmitter
 			CopyOf = Flame Hurt Short
@@ -249,7 +250,6 @@ AddDevice = TDExplosive
 		MaxVelocity = 40
 		InheritsVel = 0
 		LifeVariation = 0.20
-		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = PEmitter
 			CopyOf = Ground Flame

Data/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini

@@ -65,10 +65,10 @@ AddDevice = HDFirearm
 		X = -2
 		Y = -5
 	EntryWound = AEmitter
-		CopyOf = Dent Metal
+		CopyOf = Dent Metal No Spark
 	ExitWound = AEmitter
-		CopyOf = Dent Metal
-	GoldValue = 10
+		CopyOf = Dent Metal No Spark
+	GoldValue = 5
 	AtomGroup = AtomGroup
 		AutoGenerate = 1
 		Material = Material
@@ -105,14 +105,30 @@ AddDevice = HDFirearm
 			Y = 1
 	RateOfFire = 60
 	ReloadTime = 400
+	AddGib = Gib
+		GibParticle = MOPixel
+			CopyOf = Spark Yellow 1
+		MinVelocity = 10
+		MaxVelocity = 15
+	AddGib = Gib
+		GibParticle = MOPixel
+			CopyOf = Spark Yellow 2
+		MinVelocity = 10
+		MaxVelocity = 15
 	AddGib = Gib
 		GibParticle = MOSParticle
 			CopyOf = Gib Metal Dark Micro A
+		MinVelocity = 0
+		MaxVelocity = 5
 	AddGib = Gib
 		GibParticle = MOSParticle
 			CopyOf = Gib Metal Dark Tiny A
-	GibWoundLimit = 3
-	GibImpulseLimit = 30
+		MinVelocity = 0
+		MaxVelocity = 5
+	GibWoundLimit = 1
+	GibImpulseLimit = 10
+	GibSound = SoundContainer
+		CopyOf = Device Impact
 
 
 ///////////////////////////////////////////////////////////////////////

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

@@ -18,27 +18,24 @@ function Update(self)
 	end
 	if self.Magazine then
 		if self:IsActivated() then
-			if self.fireOn == false then
-				if self.delayTimer:IsPastSimMS(self.detonateDelay) then
-					self.delayTimer:Reset();
-					self.actionPhase = self.actionPhase + 1;
-					self.blink = false;
-				else
-					self.Magazine.RoundCount = math.ceil(100 * (1 - 1 * self.delayTimer.ElapsedSimTimeMS/self.detonateDelay));
-				end
-				if self.actionPhase >= 1 then
+			if self.delayTimer:IsPastSimMS(self.detonateDelay) then
+				self.delayTimer:Reset();
+				self.actionPhase = self.actionPhase + 1;
+				self.blink = false;
+			else
+				self.Magazine.RoundCount = math.ceil(100 * (1 - 1 * self.delayTimer.ElapsedSimTimeMS/self.detonateDelay));
+			end
+			if self.actionPhase >= 1 then
 
-					if RemoteExplosiveTableA and RemoteExplosiveTableB then
-						for i = 1, #RemoteExplosiveTableA do
-							if MovableMan:IsParticle(RemoteExplosiveTableA[i]) and RemoteExplosiveTableB[i] == self.alliedTeam then
-								RemoteExplosiveTableA[i].Sharpness = 2;
-							end
+				if RemoteExplosiveTableA and RemoteExplosiveTableB then
+					for i = 1, #RemoteExplosiveTableA do
+						if MovableMan:IsParticle(RemoteExplosiveTableA[i]) and RemoteExplosiveTableB[i] == self.alliedTeam then
+							RemoteExplosiveTableA[i].Sharpness = 2;
 						end
 					end
-					self.detonateSound:Play(self.Pos);
-					self.fireOn = true;
-					self:Reload();
 				end
+				self.detonateSound:Play(self.Pos);
+				self:Reload();
 			end
 		else
 			self.delayTimer:Reset();