Miscellaneous script changes as requested by Gacyr

Author: fourZK

Base.rte/Devices/Shared/Scripts/BurstFire.lua

@@ -6,7 +6,7 @@ function Update(self)
 	if self.Magazine then
 		if self.coolDownTimer then
 			local parent = self:GetRootParent();
-			if self.coolDownTimer:IsPastSimMS(self.coolDownDelay) and (parent and IsActor(parent)) and (not self:IsActivated() or not ToActor(parent):IsPlayerControlled()) then
+			if self.coolDownTimer:IsPastSimMS(self.coolDownDelay) and parent and IsActor(parent) and not (self:IsActivated() and ToActor(parent):IsPlayerControlled()) then
 				self.coolDownTimer, self.shotCounter = nil;
 			else
 				self:Deactivate();

Base.rte/Devices/Tools/GrappleGun/Grapple.lua

@@ -73,14 +73,13 @@ function Update(self)
 		self.lineVec = SceneMan:ShortestDistance(self.parent.Pos, self.Pos, self.mapWrapsX);
 		self.lineLength = self.lineVec.Magnitude;
 
-		if self.parentGun and self.parentGun.ID ~= 255 then
+		if self.parentGun and self.parentGun.ID ~= rte.NoMOID then
 			self.parent = ToMOSRotating(MovableMan:GetMOFromID(self.parentGun.RootID));
 
 			if self.parentGun.Magazine then
 				self.parentGun.Magazine.Scale = 0;
 			end
 			startPos = self.parentGun.Pos;
-			-- Rotate the gun towards the hook
 			local flipAng = self.parent.HFlipped and 3.14 or 0;
 			self.parentGun.RotAngle = self.lineVec.AbsRadAngle + flipAng;
 			if self.parentGun.Sharpness ~= 0 then
@@ -103,7 +102,7 @@ function Update(self)
 			-- We now have a user that controls this grapple
 			controller = self.parent:GetController();
 			-- Point the gun towards the hook if our user is holding it
-			if (self.parentGun and self.parentGun.ID ~= 255) and (self.parentGun:GetRootParent().ID == self.parent.ID) then
+			if (self.parentGun and self.parentGun.ID ~= rte.NoMOID) and (self.parentGun:GetRootParent().ID == self.parent.ID) then
 				local offset = Vector(ToMOSprite(self.parentGun:GetParent()):GetSpriteWidth(), 0):RadRotate(self.parent.FlipFactor * (self.lineVec.AbsRadAngle - self.parent:GetAimAngle(true)))
 				self.parentGun.StanceOffset = offset;
 				if self.parent.EquippedItem and self.parent.EquippedItem.ID == self.parentGun.ID and (self.parent.Vel.Magnitude < 5 and controller:IsState(Controller.AIM_SHARP)) then

Base.rte/Devices/Tools/GrappleGun/GrappleGun.lua

@@ -27,8 +27,7 @@ function Update(self)
 			local mouse = controller:IsMouseControlled();
 			-- Deactivate when equipped in BG arm to allow FG arm shooting
 			if parent.EquippedBGItem and parent.EquippedItem then
-				local itemBG = parent.EquippedBGItem;
-				if itemBG.ID == self.ID then
+				if parent.EquippedBGItem.ID == self.ID then
 					self:Deactivate();
 				end
 			end

Base.rte/Effects/Pyro/Flame/Flame.lua

@@ -1,5 +1,5 @@
 function Create(self)
-	self.strength = 80;	-- Damage frequency factor
+	self.strength = 80;
 	self.checkTimer = Timer();
 	self.checkDelay = math.random(20);
 end
@@ -8,8 +8,8 @@ function Update(self)
 	self.ToSettle = false;
 	if self.target and IsMOSRotating(self.target) then
 		self.Vel = self.target.Vel;
-		self.Pos = self.target.Pos - Vector(self.stickPos.X, self.stickPos.Y):RadRotate(self.target.RotAngle - self.tsAngle);
-		local actor = MovableMan:GetMOFromID(self.target.RootID);	-- Inflict damage on the root actor
+		self.Pos = self.target.Pos - Vector(self.stickPos.X, self.stickPos.Y):RadRotate(self.target.RotAngle - self.targetStickAngle);
+		local actor = MovableMan:GetMOFromID(self.target.RootID);
 		if MovableMan:IsActor(actor) then
 			actor = ToActor(actor);
 			if math.random() < (self.strength * self.target.DamageMultiplier) / actor.Mass / (self.target.Material.StructuralIntegrity) then
@@ -22,19 +22,19 @@ function Update(self)
 			self.checkTimer:Reset();
 			self.checkDelay = self.checkDelay + 1;	-- Gradually extend the delay for optimization reasons
 			local checkPos = self.Pos + Vector(self.Vel.X, self.Vel.Y):SetMagnitude(math.sqrt(self.Vel.Magnitude));
-			local mocheck = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
-			if mocheck ~= 255 then
-				local mo = MovableMan:GetMOFromID(mocheck);
+			local moCheck = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
+			if moCheck ~= rte.NoMOID then
+				local mo = MovableMan:GetMOFromID(moCheck);
 				if mo then
 					self.target = ToMOSRotating(mo);
-					self.tsAngle = mo.RotAngle;	-- Target angle when sticking	
+					self.targetStickAngle = mo.RotAngle;	
 					self.stickPos = SceneMan:ShortestDistance(mo.Pos, self.Pos, SceneMan.SceneWrapsX) * 0.8;
 					self.Pos = mo.Pos - Vector(self.stickPos.X, self.stickPos.Y);
 				end
 			end
 		end
 	end
-	local age = self.Age * 0.0001 + 1;
+	local age = self.Age * 0.0001 + 1;	-- Have age slightly affect particle settings relative to 10 seconds
 	local chance = math.random();
 	local particle;
 	if chance < (0.1 / age) then

Base.rte/Scenes/Objects/Bunkers/BunkerSystems/LadderNode.lua

@@ -23,4 +23,9 @@ function Update(self)
 						actor.Vel = actor.Vel + Vector(speed / 2, 0):RadRotate(actor:GetAimAngle(true)) - Vector(0, speed);
 					elseif controller:IsState(Controller.BODY_CROUCH) then
 						actor.Vel = actor.Vel / 2;
-end	end	end	end	end	end
+					end	
+				end	
+			end	
+		end	
+	end	
+end