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

Author: MissakGhostComodo

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

@@ -106,7 +106,11 @@ function DeliveryCreationHandler:Initialize(activity)
 
 	for i = 0, self.Activity.TeamCount - 1 do
 		local moduleID = PresetMan:GetModuleID(self.Activity:GetTeamTech(i));
-		self.teamTechTable[i] = PresetMan:GetDataModule(moduleID);
+		if moduleID ~= -1 then
+			self.teamTechTable[i] = PresetMan:GetDataModule(moduleID);
+		else
+			self.teamTechTable[i] = {["FileName"] = "All"}; -- master of ghetto
+		end
 		self.teamTechIDTable[i] = moduleID;
 
 		self.saveTable.teamRemovedPresets[i] = {};
@@ -149,6 +153,12 @@ function DeliveryCreationHandler:Initialize(activity)
 	end
 
 	for team, module in pairs(self.teamTechTable) do
+		
+		local iterator = module.Presets;
+		-- handle -All-
+		if not iterator then
+			iterator = PresetMan:GetAllEntities();
+		end
 
 		self.teamPresetTables[team] = {};
 
@@ -179,7 +189,7 @@ function DeliveryCreationHandler:Initialize(activity)
 		self.teamPresetTables[team]["Actors - Mecha"] = {};
 		self.teamPresetTables[team]["Actors - Turrets"] = {};
 
-		for entity in module.Presets do
+		for entity in iterator do
 			if IsMOSRotating(entity) and ToMOSRotating(entity).IsBuyable and ToMOSRotating(entity).BuyableMode ~= 2 then
 
 				local entityInfoTable = {};
@@ -447,7 +457,7 @@ function DeliveryCreationHandler:SelectPresetByGroupPair(team, primaryGroup, sec
 	local presetName = presetTable.PresetName;
 	local className = presetTable.ClassName;
 	local createFunc = "Create" .. className;	
-	local techName = actingTech.FileName;
+	local techName = actingTech.FileName or "All";
 
 
 	--print(presetName)

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BlastDoors/BlastDoorHousing.lua

@@ -0,0 +1,27 @@
+function Create(self)
+
+	self.doorParent = ToADoor(self:GetRootParent());
+	self.lastFrame = 0;
+	
+end
+
+function ThreadedUpdate(self)
+
+	if IsADoor(self.doorParent) then
+	
+		-- handle frame wrapping
+		if self.doorParent:GetDoorState() == ADoor.OPENING then
+			if self.lastFrame == self.doorParent.FrameCount - 1 and self.doorParent.Frame == 0 then
+				self.lastFrame = -1;
+			end
+		else
+			if self.lastFrame == 0 and self.doorParent.Frame == self.doorParent.FrameCount - 1 then
+				self.lastFrame = self.doorParent.FrameCount;
+			end			
+		end	
+	
+		-- if our parent increased a frame, increase a frame, if our parent decreased, etc etc...
+		self.Frame = (self.doorParent.Frame - self.lastFrame < 0 and self.Frame - 1 or self.doorParent.Frame - self.lastFrame > 0 and self.Frame + 1 or self.Frame) % self.FrameCount;
+		self.lastFrame = self.doorParent.Frame ~= self.lastFrame and self.doorParent.Frame or self.lastFrame;
+	end
+end

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BlastDoors/BlastDoors.ini

@@ -160,6 +160,7 @@ AddEffect = Attachable
 	Mass = 999
 	HitsMOs = 1
 	GetsHitByMOs = 1
+	ScriptPath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BlastDoors/BlastDoorHousing.lua
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BlastDoors/BlastDoorHousing.png
 	FrameCount = 11
@@ -222,13 +223,13 @@ AddEffect = ADoor
 	DrawMaterialLayerWhenOpen = 1
 	DrawMaterialLayerWhenClosed = 1
 	DoorMoveStartSound = SoundContainer
-		CopyOf = Door Movement Start
+		CopyOf = Blast Door Movement Start
 	DoorMoveSound = SoundContainer
-		CopyOf = Door Movement Loop
+		CopyOf = Blast Door Movement Loop
 	DoorDirectionChangeSound = SoundContainer
 		CopyOf = Door Movement Change Direction
 	DoorMoveEndSound = SoundContainer
-		CopyOf = Door Movement End
+		CopyOf = Blast Door Movement End
 	GibImpulseLimit = 5000
 	GibWoundLimit = 30
 	GibBlastStrength = 50
@@ -337,7 +338,7 @@ AddActor = ADoor
 		Y = 0
 	OpenClosedAngle = Matrix
 		AngleDegrees = 180
-	DoorMoveTime = 60000
+	DoorMoveTime = 20000
 	ClosedByDefault = 1
 	ResetDefaultDelay = 1500
 	SensorInterval = 100

Data/Base.rte/Sounds.ini

@@ -500,6 +500,7 @@ AddSoundContainer = SoundContainer
 AddSoundContainer = SoundContainer
 	PresetName = Door Movement Loop
 	AttenuationStartDistance = 90
+	LoopSetting = -1
 	AddSound = ContentFile
 		FilePath = Base.rte/Sounds/Mechanisms/Doors/MovementLoop.flac
 
@@ -516,6 +517,33 @@ AddSoundContainer = SoundContainer
 	AttenuationStartDistance = 90
 	AddSound = ContentFile
 		FilePath = Base.rte/Sounds/Mechanisms/Doors/MovementEnd.flac
+		
+AddSoundContainer = SoundContainer
+	PresetName = Blast Door Movement Start
+	AttenuationStartDistance = 200
+	AddSound = ContentFile
+		FilePath = Base.rte/Sounds/Mechanisms/Doors/BlastDoorMovementStart1.flac
+	AddSound = ContentFile
+		FilePath = Base.rte/Sounds/Mechanisms/Doors/BlastDoorMovementStart2.flac
+
+
+AddSoundContainer = SoundContainer
+	PresetName = Blast Door Movement Loop
+	AttenuationStartDistance = 150
+	LoopSetting = -1
+	AddSound = ContentFile
+		FilePath = Base.rte/Sounds/Mechanisms/Doors/BlastDoorMovementLoop1.flac
+	AddSound = ContentFile
+		FilePath = Base.rte/Sounds/Mechanisms/Doors/BlastDoorMovementLoop2.flac
+
+
+AddSoundContainer = SoundContainer
+	PresetName = Blast Door Movement End
+	AttenuationStartDistance = 200
+	AddSound = ContentFile
+		FilePath = Base.rte/Sounds/Mechanisms/Doors/BlastDoorMovementEnd1.flac
+	AddSound = ContentFile
+		FilePath = Base.rte/Sounds/Mechanisms/Doors/BlastDoorMovementEnd2.flac
 
 
 AddSoundContainer = SoundContainer