(Very) minor effect tweaks

Author: fourZK

Base.rte/Effects.ini

@@ -329,6 +329,7 @@ AddEffect = MOPixel
 	Mass = 1.25
 	LifeTime = 50
 	Sharpness = 0.3
+	AirResistance = 0.1
 	HitsMOs = 1
 	GetsHitByMOs = 0
 	Color = Color
@@ -350,6 +351,7 @@ AddEffect = MOPixel
 	Mass = 1.25
 	LifeTime = 75
 	Sharpness = 0.3
+	AirResistance = 0.1
 	HitsMOs = 1
 	GetsHitByMOs = 0
 	Color = Color

Base.rte/Effects/Casings.ini

@@ -116,8 +116,8 @@ AddAmmo = AEmitter
 		FilePath = Base.rte/Effects/Casings/Shell000.bmp
 	FrameCount = 1
 	SpriteOffset = Vector
-		X = -3
-		Y = -1
+		X = -2
+		Y = -2
 	AtomGroup = AtomGroup
 		AutoGenerate = 1
 		Material = Material
@@ -133,14 +133,14 @@ AddAmmo = AEmitter
 	DeepCheck = 0
 	AngularVel = 6
 	EmissionOffset = Vector
-		X = -3
+		X = 0
 		Y = 0
 	AddEmission = Emission
 		EmittedParticle = MOSParticle
 			CopyOf = Tiny Smoke Ball 1
 		ParticlesPerMinute = 2000
+		LifeVariation = 0.30
 		StopTimeMS = 300
-		BurstSize = 1
 		Spread = 3.1
 		MaxVelocity = 1
 		MinVelocity = 0
@@ -149,15 +149,16 @@ AddAmmo = AEmitter
 		EmittedParticle = MOSParticle
 			CopyOf = Tiny Smoke Ball 1
 		ParticlesPerMinute = 500
+		LifeVariation = 0.30
 		StartTimeMS = 300
 		StopTimeMS = 600
-		BurstSize = 1
 		Spread = 3.1
 		MaxVelocity = 1
 		MinVelocity = 0
 		PushesEmitter = 0
 	EmissionEnabled = 1
 	EmissionsIgnoreThis = 1
+	BurstSize = 1
 
 
 AddAmmo = MOSRotating

Base.rte/Effects/Glows/YellowSmaller.bmp

@@ -1118,7 +1118,7 @@ AddEffect = MOSParticle
 	Sharpness = 0.1
 	HitsMOs = 0
 	GetsHitByMOs = 0
-	ScriptPath = Base.rte/Effects/Pyro/Flame/GroundFlameNew.lua
+	ScriptPath = Base.rte/Effects/Pyro/Flame/Flame.lua
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Effects/Pyro/Flame/Flame00.bmp
 	FrameCount = 84

Base.rte/Effects/Pyro.ini

@@ -1,21 +1,15 @@
 function Create(self)
-
-	self.strength = 80;	-- damage output
-	
+	self.strength = 80;	-- Damage frequency factor
 	self.checkTimer = Timer();
 	self.checkDelay = math.random(20);
 end
 
 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
+		local actor = MovableMan:GetMOFromID(self.target.RootID);	-- Inflict damage on the root actor
 		if MovableMan:IsActor(actor) then
 			actor = ToActor(actor);
 			if math.random() < (self.strength * self.target.DamageMultiplier) / actor.Mass / (self.target.Material.StructuralIntegrity) then
@@ -25,42 +19,34 @@ function Update(self)
 	else
 		self.target = nil;
 		if self.checkTimer:IsPastSimMS(self.checkDelay) then
-		
 			self.checkTimer:Reset();
-			self.checkDelay = self.checkDelay + 1;	-- Extend the delay for optimization reasons
-
+			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);
 				if mo then
 					self.target = ToMOSRotating(mo);
-
-					self.tsAngle = mo.RotAngle;	-- target angle when sticking	
-
+					self.tsAngle = mo.RotAngle;	-- Target angle when sticking	
 					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 chance = math.random();
-	local part;
-	
+	local particle;
 	if chance < (0.1 / age) then
-		part = CreateMOPixel("Ground Fire Burn Particle");
-		part.Vel = self.Vel + Vector(RangeRand(-10, 10), -math.random(5, 20));
-
+		particle = CreateMOPixel("Ground Fire Burn Particle");
+		particle.Vel = self.Vel + Vector(RangeRand(-10, 10), -math.random(5, 20));
 	elseif chance < (1 / age) then
-		part = CreateMOSParticle("Flame Smoke 1");
-		part.Vel = self.Vel + Vector(0, -3) + Vector(math.random(0, 3), 0):RadRotate(math.random() * 6.28);
-		part.Lifetime = 100 + math.random(math.ceil(700 / age));
+		particle = CreateMOSParticle("Flame Smoke 1");
+		particle.Vel = self.Vel + Vector(0, -3) + Vector(math.random(0, 3), 0):RadRotate(math.random() * 6.28);
+		particle.Lifetime = 100 + math.random(math.ceil(700 / age));
 	end
-	if part then
-		part.Pos = Vector(self.Pos.X + math.random(-1, 1), self.Pos.Y - math.random(0, 2));
-		MovableMan:AddParticle(part);
+	if particle then
+		particle.Pos = Vector(self.Pos.X + math.random(-1, 1), self.Pos.Y - math.random(0, 2));
+		MovableMan:AddParticle(particle);
 	end
 end

Base.rte/Effects/Pyro/Flame/GroundFlameNew.lua renamed to Base.rte/Effects/Pyro/Flame/Flame.lua

@@ -9,21 +9,17 @@ function Update(self)
 		if mo and mo.PinStrength == 0 then
 			local dist = SceneMan:ShortestDistance(self.Pos, mo.Pos, SceneMan.SceneWrapsX);
 			if dist.Magnitude < self.range then
-				local strength = self.strength;
 				local strSumCheck = SceneMan:CastStrengthSumRay(self.Pos, self.Pos + dist, 3, 0);
-				if strSumCheck < strength then
-					strength = strength - strSumCheck;
+				if strSumCheck < self.strength then
 					local massFactor = math.sqrt(1 + math.abs(mo.Mass));
 					local distFactor = 1 + dist.Magnitude * 0.1;
-					local forceVector =	dist:SetMagnitude(strength / distFactor);
-					mo.Vel = mo.Vel + forceVector / massFactor;
-					mo.AngularVel = mo.AngularVel - forceVector.X / (massFactor + math.abs(mo.AngularVel));
+					local forceVector =	dist:SetMagnitude((self.strength - strSumCheck) /distFactor);
+					mo.Vel = mo.Vel + forceVector /massFactor;
+					mo.AngularVel = mo.AngularVel - forceVector.X /(massFactor + math.abs(mo.AngularVel));
 					mo:AddForce(forceVector * massFactor, Vector());
 				end
 			end
 		end	
 	end
-	-- Debug: visualize effect range
-	-- FrameMan:DrawCirclePrimitive(self.Pos, self.range, 254);
 	self.ToDelete = true;
 end