Merge pull request #56 from cortex-command-community/pre6-the-third-tweak-branch

Teleporter fix

Author: Causeless

CHANGELOG.md

@@ -63,7 +63,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	New `SoundContainer` INI and Lua (R/W) property `CustomPanValue`, which hard-overrides the panning of a sound. Clamped between -1 and 1 for left and right panning. 0 disables the override and will re-enable default behavior. This should probably only be used on Immobile sounds, but it can be used on any sound.
 
 - Many new sounds added to the game.
-	Browncoats have gotten a full sound revamp for everything except their actors. Every item now has its own custom sounds.
+	Browncoats have gotten a full sound revamp for everything except their actors. Every Browncoat item now has its own custom sounds.
 	Most base explosions and Riot Shield sounds have been redone.
 
 - New delivery system, Buy Doors:

Data/Base.rte/Actors/Mecha/AADrone/AADrone.lua

@@ -105,7 +105,7 @@ function Create(self)
 					+ self.SAM_Target:RotateOffset(self.SAM_Offset)
 					+ self.SAM_Target.Vel * math.min(range / 50, 20)
 				)
-				* 0.4 -- Filter the AimPos to reduce noise
+				* 0.4; -- Filter the AimPos to reduce noise
 	end
 end
 

Data/Base.rte/Craft/Shared/AttachableTurret.lua

@@ -36,16 +36,19 @@ function Update(self)
 				self.verticalFactor = self.verticalFactor - self.turnSpeed;
 			end
 		end
+
 		if math.abs(self.rotation) > 0.001 then
 			self.rotation = self.rotation/(1 + self.turnSpeed * 2);
 		else
 			self.rotation = 0;
 		end
+
 		if math.abs(self.verticalFactor) > 0.001 then
 			self.verticalFactor = self.verticalFactor/(1 + self.turnSpeed * 4);
 		else
 			self.verticalFactor = 0;
 		end
+
 		if self.areaMode then	--Area Mode
 			local aimPos = self.Pos + Vector((self.searchRange * 0.5), 0):RadRotate(self.RotAngle);
 			--Debug: visualize aim area
@@ -84,6 +87,7 @@ function Update(self)
 					target = MovableMan:GetMOFromID(MovableMan:GetMOFromID(moCheck2).RootID);
 				end
 			end
+
 			local color = 13;	--Debug trace color: red
 			if target and IsActor(target) and ToActor(target).Status < Actor.INACTIVE then
 				self:EnableEmission(true);
@@ -94,13 +98,15 @@ function Update(self)
 					color = 254;	--Debug trace color: white
 				end
 			end
+
 			--Debug: visualize aim traces
 			if self.showAim then
 				PrimitiveMan:DrawLinePrimitive(self.Team, self.Pos, self.Pos + aimTrace:RadRotate(1/math.sqrt(self.searchRange)), color);
 				PrimitiveMan:DrawLinePrimitive(self.Team, self.Pos, self.Pos + aimTrace:RadRotate(-1/math.sqrt(self.searchRange)), color);
 			end
 		end
 	end
+	
 	if self.fireTimer:IsPastSimTimeLimit() then
 		self:EnableEmission(false);
 	end

Data/Base.rte/Devices/Explosives/AntiPersonnelMine/MineDeploy.lua

@@ -7,7 +7,6 @@ function Update(self)
 	if IsActor(parent) then
 		self.alliedTeam = ToActor(parent).Team;
 	elseif self:IsActivated() then
-
 		local mine = CreateMOSRotating("Anti Personnel Mine Active");
 		mine.Pos = self.Pos;
 		mine.Vel = self.Vel;

Data/Base.rte/Devices/Explosives/AntiPersonnelMine/MineSet.lua

@@ -40,18 +40,17 @@ function Update(self)
 		AntiPersonnelMineTable = {};
 		AntiPersonnelMineTable[self.tableNum] = self;
 	end
+
 	if self.Sharpness ~= 0 then
 		self.ToDelete = true;
 	end
 
 	if self.actionPhase == 0 then
-
 		local trace = Vector(self.Vel.X, self.Vel.Y + 1):SetMagnitude(math.max(self.Vel.Magnitude * rte.PxTravelledPerFrame, self.Radius));
 		local rayHitPos = Vector();
 		local terrainRaycast = SceneMan:CastStrengthRay(self.Pos, trace, 5, rayHitPos, 0, rte.airID, SceneMan.SceneWrapsX);
 
 		if terrainRaycast == true then
-
 			trace = Vector(trace.X, trace.Y):SetMagnitude(trace.Magnitude + 5);
 			local rayHitPosA = Vector();
 			local terrainRaycastA = SceneMan:CastStrengthRay(self.Pos + Vector(0, 3):RadRotate(Vector(self.Vel.X, self.Vel.Y).AbsRadAngle), trace, 5, rayHitPosA, 0, rte.airID, SceneMan.SceneWrapsX);
@@ -72,13 +71,10 @@ function Update(self)
 			self.activateSound:Play(self.Pos);
 			self.delayTimer:Reset();
 		end
-
 	elseif self.actionPhase == 1 then
-
 		self.Vel = self.PinStrength == 0 and self.Vel or Vector();
 
 		if self.blinkTimer:IsPastSimMS(500) then
-
 			self.blinkTimer:Reset();
 
 			if self.blink == false then
@@ -120,9 +116,7 @@ function Update(self)
 				MovableMan:AddParticle(effectpar);
 			end
 		end
-
 	elseif self.actionPhase == 2 then
-
 		if self.blink == false then
 			self.blink = true;
 			self.Frame = ((self.alliedTeam + 1) * 2) + 1;

Data/Base.rte/Devices/Shared/Scripts/FlakShell.lua

@@ -17,6 +17,7 @@ function Update(self)
 					checkPos = Vector(SceneMan.SceneWidth + checkPos.X, checkPos.Y);
 				end
 			end
+			
 			local moCheck = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
 			if moCheck ~= rte.NoMOID then
 				local actor = MovableMan:GetMOFromID(MovableMan:GetMOFromID(moCheck).RootID);

Data/Base.rte/Devices/Shared/Scripts/FlamerFlame.lua

@@ -6,5 +6,6 @@ function Update(self)
 	if math.abs(self.lastVel.AbsRadAngle - self.Vel.AbsRadAngle) > 0.25 then
 		self.Vel = Vector(self.lastVel.Magnitude, 0):RadRotate(self.Vel.AbsRadAngle + (math.random() * 0.4) - 0.2);
 	end
+	
 	self.lastVel = Vector(self.Vel.X, self.Vel.Y);
 end

Data/Base.rte/Devices/Shared/Scripts/GrenadeBandolierAttachable.lua

@@ -174,6 +174,7 @@ function Destroy(self)
 				bandolierAngularVel = self.grenadePreviouslyHeldByRootParent.AngularVel;
 			end
 		end
+		
 		if self.currentGrenadeCount > 0 then
 			self.bandolierObjectForDropping:SetNumberValue("GrenadesRemainingInBandolier", self.currentGrenadeCount);
 

Data/Base.rte/Devices/Shared/Scripts/RevolverCylinderReload.lua

@@ -15,6 +15,7 @@ function Update(self)
 			shell.AngularVel = RangeRand(-1, 1);
 			MovableMan:AddParticle(shell);
 		end
+		
 		self.shellsToEject = 0;
 	end
 end

Data/Base.rte/Devices/Shared/Scripts/ShieldWalkSounds.lua

@@ -0,0 +1,16 @@
+function Create(self)
+	self.shieldWalkSound = CreateSoundContainer("Metal Shield Walk", "Base.rte");
+	self.shieldWalkTimer = Timer();
+end
+
+function ThreadedUpdate(self)
+	self.shieldWalkSound.Pos = self.Pos;
+	self.parent = self:GetRootParent();
+	
+	if IsAHuman(self.parent) then
+		if ToAHuman(self.parent).StrideFrame and self.shieldWalkTimer:IsPastSimMS(400) then
+			self.shieldWalkTimer:Reset();
+			self.shieldWalkSound:Play(self.Pos);
+		end
+	end
+end