Extensive Flame particle rework

Author: fourZK

Base.rte/Effects.ini

@@ -301,7 +301,7 @@ AddEffect = MOPixel
 	GlobalAccScalar = -0.4
 	RestThreshold = 500 
 	LifeTime = 75
-	Sharpness = 125
+	Sharpness = 180
 	HitsMOs = 1
 	GetsHitByMOs = 0
 	Color = Color

Base.rte/Effects/Pyro.ini

@@ -942,8 +942,8 @@ AddEffect = MOSParticle
 		FilePath = Base.rte/Effects/Pyro/SmallBlast01.bmp
 	FrameCount = 19
 	SpriteOffset = Vector
-		X = -4.5
-		Y = -4.5
+		X = -4
+		Y = -4
 	AngularVel = 0
 	Atom = Atom
 		Material = Material
@@ -955,14 +955,14 @@ AddEffect = MOSParticle
 AddEffect = MOSParticle
 	CopyOf = Flame Smoke 1
 	PresetName = Flame Smoke 2
-	GlobalAccScalar = -0.2
-	AirResistance = 0.2
-	AirThreshold = 6
-	LifeTime = 1200
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Effects/Pyro/SmallSmoke01.bmp
-	FrameCount = 12
-	
+		FilePath = Base.rte/Effects/Pyro/SmallBlast02.bmp
+	Mass = 0.49
+	LifeTime = 600
+	GlobalAccScalar = -0.6
+	AirResistance = 0.05
+	AirThreshold = 3
+
 
 AddEffect = MOSParticle
 	PresetName = Flame 1
@@ -973,7 +973,7 @@ AddEffect = MOSParticle
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Effects/Pyro/Flame/Flame00.bmp
+		FilePath = Base.rte/Effects/Pyro/Flame/Flame.bmp
 	FrameCount = 56
 	SpriteOffset = Vector
 		X = -10
@@ -1002,7 +1002,7 @@ AddEffect = MOSParticle
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Effects/Pyro/Flame/Flame00.bmp
+		FilePath = Base.rte/Effects/Pyro/Flame/Flame.bmp
 	FrameCount = 56
 	SpriteOffset = Vector
 		X = -10
@@ -1111,17 +1111,19 @@ AddAmmo = MOSRotating
 
 AddEffect = MOSParticle
 	PresetName = Flame 1 Hurt
-	AirResistance = 0.01
+	GlobalAccScalar = 0.9
+	AirResistance = 0.05
+	AirThreshold = 1
 	RestThreshold = -1
 	Mass = 0.98
-	LifeTime = 8000
+	LifeTime = 6000
 	Sharpness = 0.1
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	ScriptPath = Base.rte/Effects/Pyro/Flame/Flame.lua
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Effects/Pyro/Flame/Flame00.bmp
-	FrameCount = 84
+		FilePath = Base.rte/Effects/Pyro/Flame/Flame.bmp
+	FrameCount = 86
 	SpriteOffset = Vector
 		X = -10
 		Y = -19
@@ -1133,10 +1135,10 @@ AddEffect = MOSParticle
 		FilePath = Base.rte/Effects/Glows/FireGlow1.bmp
 	EffectAlwaysShows = 0
 	EffectStartTime = -1
-	EffectStopTime = 8000
+	EffectStopTime = 6000
 	EffectStartStrength = 0.5
 	EffectStopStrength = 0.1
-	RandomizeEffectRotAngleEveryFrame = 1
+	RandomizeEffectRotAngle = 1
 	Framerate = 0
 
 
@@ -1151,17 +1153,39 @@ AddEffect = MOSParticle
 	Framerate = 0
 
 
+AddEffect = MOSParticle
+	CopyOf = Flame 2 Hurt
+	PresetName = Flame Hurt Short
+	GlobalAccScalar = 0.5
+	LifeTime = 4500
+	EffectStartTime = 10
+
+
+AddEffect = MOSParticle
+	CopyOf = Flame Hurt Short
+	PresetName = Flame Hurt Short Float
+	GlobalAccScalar = -0.1
+
+
+AddEffect = MOSParticle
+	CopyOf = Flame 1 Hurt
+	PresetName = Ground Flame
+	LifeTime = 7500
+	EffectStopStrength = 0
+
+
 AddEffect = PEmitter
 	PresetName = Flame 1 Hurt Emitter
+	AirResistance = 0.01
 	RestThreshold = -1
 	Mass = 0.98
 	LifeTime = 8000
 	Sharpness = 0.1
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Effects/Pyro/Flame/Flame00.bmp
-	FrameCount = 56
+		FilePath = Base.rte/Effects/Pyro/Flame/Flame.bmp
+	FrameCount = 84
 	SpriteOffset = Vector
 		X = -10
 		Y = -19
@@ -1170,64 +1194,44 @@ AddEffect = PEmitter
 			CopyOf = Rubber
 		TrailLength = 0
 	ScreenEffect = ContentFile
-		FilePath = Base.rte/Effects/Glows/YellowSmall.bmp
-	EffectAlwaysShows = 1
-	EffectStartTime = 0
+		FilePath = Base.rte/Effects/Glows/FireGlow1.bmp
+	EffectAlwaysShows = 0
+	EffectStartTime = -1
 	EffectStopTime = 8000
-	EffectStartStrength = 0.50
-	EffectStopStrength = 0.0
+	EffectStartStrength = 0.5
+	EffectStopStrength = 0.1
+	RandomizeEffectRotAngleEveryFrame = 1
 	Framerate = 0
 	AddEmission = Emission
 		EmittedParticle = MOPixel
-			CopyOf = Flame Hurt Particle
+			CopyOf = Ground Fire Burn Particle
+		ParticlesPerMinute = 1200
+		LifeVariation = 0.25
 		Spread = 1.5
-		MaxVelocity = 15
-		MinVelocity = 10
+		MaxVelocity = 20
+		MinVelocity = -10
+		PushesEmitter = 0
+	AddEmission = Emission
+		EmittedParticle = MOSParticle
+			CopyOf = Flame Smoke 2
+		ParticlesPerMinute = 1600
+		LifeVariation = 0.50
+		Spread = 1.5
+		MaxVelocity = 8
+		MinVelocity = -4
 		PushesEmitter = 0
-	EmissionEnabled = 1
 	EmissionAngle = Matrix
-		AngleDegrees = 240
+		AngleDegrees = 90
+	EmissionEnabled = 1
 	EmissionsIgnoreThis = 0
-	ParticlesPerMinute = 150
-	BurstSize = 0
-	BurstScale = 0
+	BurstSize = 5
+	BurstScale = 2
 	BurstTriggered = 0
 
 
 AddEffect = PEmitter
+	CopyOf = Flame 1 Hurt Emitter
 	PresetName = Flame 2 Hurt Emitter
-	RestThreshold = -1
-	Mass = 0.98
-	LifeTime = 8000
-	Sharpness = 0.1
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	SpriteFile = ContentFile
-		FilePath = Base.rte/Effects/Pyro/Flame/Flame00.bmp
-	FrameCount = 56
-	SpriteOffset = Vector
-		X = -10
-		Y = -19
-	Atom = Atom
-		Material = Material
-			CopyOf = Rubber
-		TrailLength = 0
-	Framerate = 0
-	AddEmission = Emission
-		EmittedParticle = MOPixel
-			CopyOf = Flame Hurt Particle
-		Spread = 1.5
-		MaxVelocity = 15
-		MinVelocity = 10
-		PushesEmitter = 0
-	EmissionEnabled = 1
-	EmissionAngle = Matrix
-		AngleDegrees = 180
-	EmissionsIgnoreThis = 0
-	ParticlesPerMinute = 150
-	BurstSize = 0
-	BurstScale = 0
-	BurstTriggered = 0
 
 
 ///////////////////////////////////////////////////////////////////////

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

@@ -1,52 +1,77 @@
 function Create(self)
-	self.strength = 80;
+	self.strength = 1;
 	self.checkTimer = Timer();
-	self.checkDelay = math.random(20);
+	self.checkDelay = math.random(30);
+	if string.find(self.PresetName, "Short") then
+		self.isShort = true;
+		self.deleteDelay = self.Lifetime * RangeRand(0.05, 0.15);
+	end
+	if string.find(self.PresetName, "Ground") then
+		self.notSticky = true;
+	end
 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.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
-				actor.Health = actor.Health - 1;
+	if not self.notSticky then
+		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.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
+					actor.Health = actor.Health - 1;
+				end
 			end
-		end
-	else
-		self.target = nil;
-		if self.checkTimer:IsPastSimMS(self.checkDelay) then
-			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 ~= rte.NoMOID then
-				local mo = MovableMan:GetMOFromID(moCheck);
-				if mo then
-					self.target = ToMOSRotating(mo);
-					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);
+		else
+			self.target = nil;
+			if self.checkTimer:IsPastSimMS(self.checkDelay) then
+				self.checkTimer:Reset();
+				self.checkDelay = self.checkDelay + 3;	-- Gradually extend the delay for optimization reasons
+				local checkPos = self.Pos + self.Vel * rte.PxTravelledPerFrame * math.random();
+				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.isShort = true;
+						self.deleteDelay = math.random(self.Lifetime);
+						self.GlobalAccScalar = 0.9;
+						
+						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
+				if self.deleteDelay and self.Age > self.deleteDelay then
+					self.ToDelete = true;
 				end
 			end
 		end
 	end
-	local age = self.Age * 0.0001 + 1;	-- Have age slightly affect particle settings relative to 10 seconds
+	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
 		particle = CreateMOPixel("Ground Fire Burn Particle");
-		particle.Vel = self.Vel + Vector(RangeRand(-10, 10), -math.random(5, 20));
-	elseif chance < (1 / age) then
-		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));
+		particle.Vel = self.Vel + Vector(RangeRand(-15, 15), -math.random(-10, 20));
+		particle.Sharpness = particle.Sharpness * RangeRand(0.5, 1.0);
+	elseif chance < (0.5 / age) then
+		-- Spawn another, shorter flame particle occasionally
+		if not self.isShort and math.random() < 0.05 then
+			particle = CreateMOSParticle("Flame Hurt Short Float");
+			particle.Lifetime = 4000 / age;
+			particle.Vel = self.Vel + Vector(0, -3);
+		else
+			particle = CreateMOSParticle("Flame Smoke 2");
+			particle.Lifetime = math.random(250, 1000) / age;
+			particle.Vel = self.Vel + Vector(0, -1);
+		end
+		particle.Vel = particle.Vel + Vector(math.random(), 0):RadRotate(math.random() * 6.28);
 	end
 	if particle then
-		particle.Pos = Vector(self.Pos.X + math.random(-1, 1), self.Pos.Y - math.random(0, 2));
+		particle.Pos = Vector(self.Pos.X + math.random(-2, 2), self.Pos.Y - math.random(0, 4));
 		MovableMan:AddParticle(particle);
 	end
 end