Big cleanup. This definitely hasn't caught everything, but is a step in the right direction.

* No empty lines at the start/end of functions. Instead use a space between functions, which makes far more sense and is actually useful for quickly visually differentiating between functions
* No empty spaces at the start/end of if/while/for blocks etc either
* Empty space after an end block unless it's immediately followed by another end
* Lines should end in ;

These make the rules for where to put spaces consistent with the K&R style which the C++ codebase follows, just with any block beginning (i.e function def, "then", "while" etc) and "end" instead of "{" and "}".

Going forward I will be more restrictive about the formatting of scripts to be merged. Code should follow this style for integration into vanilla unless it's an extreme case (i.e third-party lua libraries).

Author: Causeless

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

@@ -1,11 +1,9 @@
 function Create(self)
-	
 	self.shieldWalkSound = CreateSoundContainer("Metal Shield Walk", "Base.rte");
 	self.shieldWalkTimer = Timer();
-
 end
-function ThreadedUpdate(self)
 
+function ThreadedUpdate(self)
 	self.shieldWalkSound.Pos = self.Pos;
 	self.parent = self:GetRootParent();
 
@@ -15,5 +13,4 @@ function ThreadedUpdate(self)
 			self.shieldWalkSound:Play(self.Pos);
 		end
 	end
-
 end

Data/Base.rte/Devices/Tools/Constructor/Constructor.lua

@@ -6,6 +6,7 @@ function ConstructorWrapPos(checkPos)
 			checkPos = Vector(SceneMan.SceneWidth + checkPos.X, checkPos.Y);
 		end
 	end
+
 	return checkPos;
 end
 
@@ -20,18 +21,21 @@ function ConstructorFloodFill(x, y, startnum, maxnum, array, realposition, reals
 				ConstructorFloodFill(x + 1, y, startnum + 1, maxnum, array, checkPos, realspacing);
 			end
 		end
+
 		if array[x - 1][y] == -1 or array[x - 1][y] > startnum then
 			local checkPos = ConstructorWrapPos(realposition + Vector(-realspacing, 0));
 			if SceneMan:GetTerrMatter(checkPos.X + (realspacing * 0.5), checkPos.Y + (realspacing * 0.5)) == rte.airID then
 				ConstructorFloodFill(x - 1, y, startnum + 1, maxnum, array, checkPos, realspacing);
 			end
 		end
+
 		if array[x][y + 1] == -1 or array[x][y + 1] > startnum then
 			local checkPos = ConstructorWrapPos(realposition + Vector(0, realspacing));
 			if SceneMan:GetTerrMatter(checkPos.X + (realspacing * 0.5), checkPos.Y + (realspacing * 0.5)) == rte.airID then
 				ConstructorFloodFill(x, y + 1, startnum + 1, maxnum, array, checkPos, realspacing);
 			end
 		end
+
 		if array[x][y - 1] == -1 or array[x][y - 1] > startnum then
 			local checkPos = ConstructorWrapPos(realposition + Vector(0, -realspacing));
 			if SceneMan:GetTerrMatter(checkPos.X + (realspacing * 0.5), checkPos.Y + (realspacing * 0.5)) == rte.airID then
@@ -272,6 +276,7 @@ function Update(self)
 										break;
 									end
 								end
+
 								if freeSlot then
 									local buildThis = {};
 									buildThis[1] = mapX;
@@ -288,6 +293,7 @@ function Update(self)
 		else
 			self.toAutoBuild = false;
 		end
+
 		local mode = self:GetNumberValue("BuildMode");
 		if mode == 0 and not self.cursor then
 			-- activation
@@ -355,6 +361,7 @@ function Update(self)
 									end
 								end
 							end
+
 							if found > 0 then
 								if digWeightTotal > 0 then
 									digWeightTotal = digWeightTotal/9;
@@ -381,7 +388,6 @@ function Update(self)
 
 			self.buildList = {};
 			self.cursor = nil;
-
 		elseif mode == 2 then	-- build
 			self:RemoveNumberValue("BuildMode");
 
@@ -404,7 +410,6 @@ function Update(self)
 		end
 
 		if self.cursor then
-
 			local cursorMovement = Vector();
 			local mouseControlled = ctrl:IsMouseControlled();
 			local aiming = false;
@@ -416,22 +421,27 @@ function Update(self)
 				if ctrl:IsState(Controller.HOLD_UP) or ctrl:IsState(Controller.BODY_JUMP) then
 					cursorMovement = cursorMovement + Vector(0, -1);
 				end
+
 				if ctrl:IsState(Controller.HOLD_DOWN) or ctrl:IsState(Controller.BODY_CROUCH) then
 					cursorMovement = cursorMovement + Vector(0, 1);
 				end
+
 				if ctrl:IsState(Controller.HOLD_LEFT) then
 					cursorMovement = cursorMovement + Vector(-1, 0);
 				end
+
 				if ctrl:IsState(Controller.HOLD_RIGHT) then
 					cursorMovement = cursorMovement + Vector(1, 0);
 				end
 			end
+
 			if ctrl:IsState(Controller.WEAPON_CHANGE_NEXT) then
 				self.buildSize = self.buildSize * 2;
 				if self.buildSize > self.buildSizeMax then
 					self.buildSize = self.buildSizeMin;
 				end
 			end
+
 			if ctrl:IsState(Controller.WEAPON_CHANGE_PREV) then
 				self.buildSize = self.buildSize/2;
 				if self.buildSize < self.buildSizeMin then
@@ -442,6 +452,7 @@ function Update(self)
 			if cursorMovement:MagnitudeIsGreaterThan(0) then
 				self.cursor = self.cursor + (mouseControlled and cursorMovement or cursorMovement:SetMagnitude(self.cursorMoveSpeed * (aiming and 0.5 or 1)));
 			end
+
 			local precise = not mouseControlled and aiming;
 			local map = Vector();
 			if precise then
@@ -453,12 +464,14 @@ function Update(self)
 				PrimitiveMan:DrawLinePrimitive(screen, self.cursor + Vector(0, 4), self.cursor + Vector(0, -4), displayColorYellow);
 				PrimitiveMan:DrawLinePrimitive(screen, self.cursor + Vector(4, 0), self.cursor + Vector(-4, 0), displayColorYellow);
 			end
+
 			PrimitiveMan:DrawBoxPrimitive(screen, map, map + Vector(self.buildSize - 1, self.buildSize - 1), displayColorYellow);
 
 			local dist = SceneMan:ShortestDistance(actor.ViewPoint, self.cursor, SceneMan.SceneWrapsX);
 			if math.abs(dist.X) > self.maxCursorDist.X then
 				self.cursor.X = actor.ViewPoint.X + self.maxCursorDist.X * (dist.X < 0 and -1 or 1);
 			end
+
 			if math.abs(dist.Y) > self.maxCursorDist.Y then
 				self.cursor.Y = actor.ViewPoint.Y + self.maxCursorDist.Y * (dist.Y < 0 and -1 or 1);
 			end
@@ -491,6 +504,7 @@ function Update(self)
 				self.cursor = nil;
 			end
 		end
+
 		-- clean up the build list of nil slots and draw the squares to show the build layout
 		local tempList = {};
 		for i = 1, #self.buildList do
@@ -505,6 +519,7 @@ function Update(self)
 				end
 			end
 		end
+
 		self.buildList = tempList;
 
 		-- building up the first block in the build queue
@@ -535,6 +550,7 @@ function Update(self)
 								else
 									name = "Base.rte/Constructor Tile " .. math.random(16);
 								end
+								
 								local terrainObject = CreateTerrainObject(name);
 								terrainObject.Pos = pos;
 								SceneMan:AddSceneObject(terrainObject);
@@ -554,6 +570,7 @@ function Update(self)
 								PrimitiveMan:DrawBoxFillPrimitive(otherScreen, Vector(bx + self.buildList[1][1] + 1, by + self.buildList[1][2] + 1), Vector(bx + self.buildList[1][1] + cellSize, by + self.buildList[1][2] + cellSize), displayColorWhite);
 							end
 						end
+
 						if screen ~= -1 then
 							PrimitiveMan:DrawLinePrimitive(screen, self.Pos, buildPos, displayColorBlue);
 						end