Minor Docks tweaks

To-do: disable collisions properly

Author: fourZK

Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Conveyors/Conveyors.ini

@@ -69,6 +69,8 @@ AddActor = MOSRotating
 		Offset = Vector
 			X = 0
 			Y = -32
+	GibSound = Sound
+		CopyOf = Robot Death
 
 
 ///////////////////////////////////////////////////////////////////////

Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/Docks.ini

@@ -8,7 +8,7 @@ AddEffect = MOSRotating
 	HitsMOs = 1
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/DropshipDockGib.bmp
+		FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/Gibs/DropshipDockGib.bmp
 	FrameCount = 1
 	SpriteOffset = Vector
 		X = -13
@@ -40,7 +40,7 @@ AddEffect = MOSRotating
 	HitsMOs = 1
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/RocketDockGib.bmp
+		FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/Gibs/RocketDockGib.bmp
 	FrameCount = 1
 	SpriteOffset = Vector
 		X = -6

Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/DropshipDock.lua

@@ -1,27 +1,25 @@
 function Create(self)
+	self.updateTimer = Timer();
 	self.healTimer = Timer();
+	self.detectionRange = 50;
 end
 
 function Update(self)
-
 	--Settle into terrain instead of gibbing
 	if self.WoundCount > (self.GibWoundLimit * 0.9) then
 		self.ToSettle = true;
 	end
-
 	if self.craft and IsActor(self.craft) and self.craft.AIMode == Actor.AIMODE_STAY then
 		--Disable collisions with the ship
 		self.craft:SetWhichMOToNotHit(self, 100);
-		
 		--Pin the ship and pull it nicely into the docking unit.
 		local dist = SceneMan:ShortestDistance(self.craft.Pos, self.Pos + Vector(0, self.craft.Radius / 2), SceneMan.SceneWrapsX);
 		self.craft.Vel = self.craft.Vel * 0.9 + dist / (3 + self.craft.Vel.Magnitude);
 		self.craft.AngularVel = self.craft.AngularVel * 0.9 - self.craft.RotAngle * 3;
 
-		if self.craft.Status < 3 then
-			self.craft.Status = 1;	--Deactivated
+		if self.craft.Status < Actor.DYING then
+			self.craft.Status = Actor.UNSTABLE;	--Deactivated
 		end
-
 		--Heal the craft.
 		if self.healTimer:IsPastSimMS(self.craft.Mass) then
 			self.healTimer:Reset();
@@ -31,13 +29,14 @@ function Update(self)
 				self.craft.Health = math.min(self.craft.Health + 1, self.craft.MaxHealth);
 			end
 		end
-	else
+	elseif self.updateTimer:IsPastSimMS(200) then
 		self.craft = nil;
 		for actor in MovableMan.Actors do
 			--See if a live dropship is within 50 pixel range of the docking unit and if it has the AI mode set to "Stay".
-			if (actor.ClassName == "ACDropShip") and (actor.AIMode == Actor.AIMODE_STAY) and actor.Health > 0 and (math.abs(actor.Pos.X - self.Pos.X) < 50) and (math.abs(actor.Pos.Y - self.Pos.Y) < 50) then
-				self.craft = ToActor(actor);
+			if (actor.ClassName == "ACDropShip") and (actor.AIMode == Actor.AIMODE_STAY) and actor.Health > 0 and (math.abs(actor.Pos.X - self.Pos.X) < self.detectionRange) and (math.abs(actor.Pos.Y - self.Pos.Y) < self.detectionRange) then
+				self.craft = ToACDropShip(actor);
 			end
 		end
+		self.updateTimer:Reset();
 	end
 end

Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/DropshipDockGib.bmp renamed to Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/Gibs/DropshipDockGib.bmp

@@ -1,27 +1,25 @@
 function Create(self)
+	self.updateTimer = Timer();
 	self.healTimer = Timer();
+	self.detectionRange = 40;
 end
 
 function Update(self)
-
 	--Settle into terrain instead of gibbing
 	if self.WoundCount > (self.GibWoundLimit * 0.9) then
 		self.ToSettle = true;
 	end
-
 	if self.craft and IsActor(self.craft) and self.craft.AIMode == Actor.AIMODE_STAY then
 		--Disable collisions with the ship
 		self.craft:SetWhichMOToNotHit(self, 100);
-	
 		--Pin the ship and pull it nicely into the docking unit.
 		local dist = SceneMan:ShortestDistance(self.craft.Pos, self.Pos + Vector(0, -self.craft.Radius / 2), SceneMan.SceneWrapsX);
 		self.craft.Vel = self.craft.Vel * 0.9 + dist / (3 + self.craft.Vel.Magnitude);
 		self.craft.AngularVel = self.craft.AngularVel * 0.9 - self.craft.RotAngle * 3;
 
-		if self.craft.Status < 3 then
-			self.craft.Status = 1;	--Deactivated
+		if self.craft.Status < Actor.DYING then
+			self.craft.Status = Actor.UNSTABLE;	--Deactivated
 		end
-
 		--Heal the craft
 		if self.healTimer:IsPastSimMS(self.craft.Mass) then
 			self.healTimer:Reset();
@@ -31,13 +29,14 @@ function Update(self)
 				self.craft.Health = math.min(self.craft.Health + 1, self.craft.MaxHealth);
 			end
 		end
-	else
+	elseif self.updateTimer:IsPastSimMS(200) then
 		self.craft = nil;
 		for actor in MovableMan.Actors do
 			--See if a live rocket is within 40 pixel range of the docking unit and if it has the AI mode set to "Stay".
-			if (actor.ClassName == "ACRocket") and (actor.AIMode == Actor.AIMODE_STAY) and actor.Health > 0  and (math.abs(actor.Pos.X - self.Pos.X) < 40) and (math.abs(actor.Pos.Y - self.Pos.Y) < 40) then
+			if (actor.ClassName == "ACRocket") and (actor.AIMode == Actor.AIMODE_STAY) and actor.Health > 0  and (math.abs(actor.Pos.X - self.Pos.X) < self.detectionRange) and (math.abs(actor.Pos.Y - self.Pos.Y) < self.detectionRange) then
 				self.craft = ToActor(actor);
 			end
 		end
+		self.updateTimer:Reset();
     end
 end