Preliminary formatting tweaks

Removed old negNum dependencies
Removed unused files

Author: fourZK

Base.rte/Devices/Tools/Constructor/Constructor.ini

@@ -510,17 +510,6 @@ AddActor = Actor
 	GibWoundLimit = 10000
 
 
-AddAmmo = Round
-	PresetName = Round Constructor
-	ParticleCount = 1
-	Particle = MOPixel
-		CopyOf = Null Bullet
-	Shell = None
-	FireVelocity = 100
-	ShellVelocity = 10
-	Separation = 10
-
-
 AddAmmo = Magazine
 	PresetName = Magazine Constructor
 	Mass = 1
@@ -562,7 +551,11 @@ AddAmmo = Magazine
 	RoundCount = -1
 	RTTRatio = 0
 	RegularRound = Round
-		CopyOf = Round Constructor
+		CopyOf = Null Round
+
+
+////////////////////////////////////////////////////////////////////////
+// Constructor
 
 
 AddDevice = HDFirearm
@@ -649,7 +642,10 @@ AddDevice = HDFirearm
 		Description = Cancel Construction
 		Direction = 1
 		Icon = Icon
-			CopyOf = Grapple Gun Stop
+			PresetName = Cancel
+			FrameCount = 2
+			BitmapFile = ContentFile
+				FilePath = Base.rte/GUIs/PieIcons/Cancel.bmp
 		ScriptPath = Base.rte/Devices/Tools/Constructor/ConstructorPie.lua
 		FunctionName = ConstructorModeCancel
 	AddPieSlice = Slice

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

@@ -99,17 +99,16 @@ function Create(self)
 
 	self.buildTimer = Timer();
 	self.buildlist = {};
-	self.resperbit = 80;	-- how much resource is required per one build bit
-							-- concrete collect/build ratio is 1:1
-							-- one block requires 65 bits of resource
-	self.fullBlock = 65 * self.resperbit;
+	self.buildcost = 80;	-- how much resource is required per one build 2 x 2 px piece
+							
+	self.fullBlock = 65 * self.buildcost;	-- one full block of concrete requires 65 units of resource
 	self.resource = 1 + self.startresource * self.fullBlock;
 	self.tunnelFillTimer = Timer();
 
 	self.clearer = CreateMOSRotating("Constructor Terrain Clearer");
 
-	self.digstrength = 100;	-- is now the LIMIT of StructualIntegrity it can dig
-							-- Stone = 80	Concrete = 90	Metal = 110
+	self.digstrength = 100;	-- the StructualIntegrity limit the device can harvest
+	
 	self.diglength = 50;
 	self.digspersecond = 100;
 	self.buildspersecond = 100;
@@ -303,7 +302,7 @@ function Update(self)
 
 					if self:GetNumberValue("Constructor Mode") == 1 then
 
-						if self.resource > self.resperbit / 5 then
+						if self.resource > self.buildcost / 5 then
 							for i = 1, 4 do
 								local hue = "Light";
 								if math.random() < 0.5 then
@@ -316,7 +315,7 @@ function Update(self)
 								spray.IgnoresTeamHits = true;
 								MovableMan:AddParticle(spray);
 							end
-							self.resource = self.resource - self.resperbit / 5;
+							self.resource = self.resource - self.buildcost / 5;
 						else
 							self:Deactivate();
 						end
@@ -459,12 +458,12 @@ function Update(self)
 			local buildamount = (self.buildTimer.ElapsedSimTimeMS/1000)*self.buildspersecond;
 			self.buildTimer:Reset();
 			for i = 1, buildamount do
-				if self.resource > self.resperbit then
+				if self.resource > self.buildcost then
 					if self.buildlist[1] ~= nil then
 
 						if SceneMan:ShortestDistance(actor.Pos, Vector(self.buildlist[1][1],self.buildlist[1][2]), SceneMan.SceneWrapsX).Magnitude < self.builddistance then
 
-							self.resource = self.resource - self.resperbit;
+							self.resource = self.resource - self.buildcost;
 							if self.buildlist[1][3] < 64 then
 								local by = math.floor(self.buildlist[1][3]/8);
 								local bx = self.buildlist[1][3]-(by*8);

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

@@ -8,14 +8,13 @@ function Update(self)
 	self.Mass = 1 + self.RoundCount / (self.maxresource / 100);	-- full mag is 101kg
 	self.Scale = 0.5 + (self.RoundCount / self.maxresource) * 0.5;
 
-	local negNum = self.HFlipped and -1 or 1;
 	local fixNum = self.HFlipped and -1 or 0;
 
 	local parent = MovableMan:GetMOFromID(self:GetParent().RootID);
 	if parent and IsActor(parent) then
 		local parentWidth = ToMOSprite(parent):GetSpriteWidth();
 		local parentHeight = ToMOSprite(parent):GetSpriteHeight();
-		self.Pos = parent.Pos + Vector(-(self.Radius * 0.3 + parentWidth * 0.2 + fixNum) * negNum, -(self.Radius * 0.15 + parentHeight * 0.2)):RadRotate(parent.RotAngle);
+		self.Pos = parent.Pos + Vector(-(self.Radius * 0.3 + parentWidth * 0.2 + fixNum) * self.FlipFactor, -(self.Radius * 0.15 + parentHeight * 0.2)):RadRotate(parent.RotAngle);
 		self.RotAngle = parent.RotAngle;
 	end
 end