More flame tweaks;

- Elementary step towards fire reacting to flammable terrain materials

Author: fourZK

Data/Base.rte/Devices/Explosives/NapalmBomb/NapalmBomb.ini

@@ -241,6 +241,7 @@ AddDevice = TDExplosive
 		MaxVelocity = 25
 		InheritsVel = 0
 		LifeVariation = 0.20
+		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = PEmitter
 			CopyOf = Flame Hurt Short
@@ -249,7 +250,6 @@ AddDevice = TDExplosive
 		MaxVelocity = 40
 		InheritsVel = 0
 		LifeVariation = 0.20
-		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = PEmitter
 			CopyOf = Ground Flame

Data/Base.rte/Effects.ini

@@ -42,6 +42,41 @@ AddEffect = MOPixel
 		TrailLength = 1
 
 
+AddEffect = MOPixel
+	PresetName = Ash Particle 1
+	Mass = 0.001
+	GlobalAccScalar = 0.1
+	AirResistance = 0.01
+	AirThreshold = 1
+	RestThreshold = 10000
+	Sharpness = 0
+	Color = Color
+		R = 62
+		G = 62
+		B = 62
+	Atom = Atom
+		Material = Material
+			CopyOf = Ashes
+
+
+AddEffect = MOPixel
+	CopyOf = Ash Particle 1
+	PresetName = Ash Particle 2
+	Color = Color
+		R = 32
+		G = 32
+		B = 32
+
+
+AddEffect = MOPixel
+	CopyOf = Ash Particle 1
+	PresetName = Ash Particle 3
+	Color = Color
+		R = 96
+		G = 96
+		B = 96
+
+
 AddEffect = MOPixel
 	PresetName = Drop Oil
 	Mass = 0.03
@@ -394,11 +429,11 @@ AddEffect = MOPixel
 AddEffect = MOPixel
 	PresetName = Ground Fire Burn Particle
 	Mass = 0.01
-	GlobalAccScalar = -0.4
-	AirResistance = 0.01
+	GlobalAccScalar = -0.5
+	AirResistance = 0.05
 	RestThreshold = -1
 	LifeTime = 75
-	Sharpness = 200
+	Sharpness = 175
 	HitsMOs = 1
 	GetsHitByMOs = 0
 	Color = Color
@@ -419,6 +454,7 @@ AddEffect = MOPixel
 	CopyOf = Ground Fire Burn Particle
 	PresetName = Fire Burn Particle
 	GlobalAccScalar = -0.3
+	AirResistance = 0.03
 	LifeTime = 150
 	ScreenEffect = ContentFile
 		FilePath = Base.rte/Effects/Glows/FireGlowTiny.png

Data/Base.rte/Effects/Pyro.ini

@@ -1301,13 +1301,12 @@ AddEffect = PEmitter
 		AngleDegrees = 90
 	EmissionOffset = Vector
 		X = 0
-		Y = -2
+		Y = -1
 	EmissionEnabled = 1
 	EmissionsIgnoreThis = 0
 	NegativeThrottleMultiplier = 0.75
 	PositiveThrottleMultiplier = 1.5
-	BurstSize = 5
-	BurstScale = 2
+	BurstSize = 3
 	BurstTriggered = 1
 
 

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

@@ -9,13 +9,13 @@ function Create(self)
 end
 
 function Update(self)
-	self.ageRatio = 1 - self.Age/self.Lifetime;
+	self.ageRatio = 1 - self.Age/self.deleteDelay;
 	self:NotResting();
 	--TODO: Use Throttle to combine multiple flames into one
 	self.Throttle = self.Throttle - TimerMan.DeltaTimeMS/self.Lifetime;
 
-	if self.target and MovableMan:ValidMO(self.target) and self.target.ID ~= rte.NoMOID and not self.target.ToDelete then
-		self.Vel = self.target.Vel;
+	if self.target and IsMOSRotating(self.target) and self.target.ID ~= rte.NoMOID and not self.target.ToDelete then
+		self.Vel = Vector();
 		self.Pos = self.target.Pos + Vector(self.stickOffset.X, self.stickOffset.Y):RadRotate(self.target.RotAngle - self.targetStickAngle);
 		local actor = self.target:GetRootParent();
 		if MovableMan:IsActor(actor) then
@@ -35,7 +35,7 @@ end
 function OnCollideWithMO(self, mo, rootMO)
 	if self.target == nil then
 		--Stick to objects on collision
-		if not mo.ToDelete and IsMOSRotating(mo) and math.random() < self.ageRatio - 0.5 then
+		if not mo.ToDelete and IsMOSRotating(mo) and math.random() < self.ageRatio then
 			self.target = ToMOSRotating(mo);
 			self.targetStickAngle = mo.RotAngle;
 			local velOffset = self.PrevVel * rte.PxTravelledPerFrame * 0.5;
@@ -53,11 +53,17 @@ function OnCollideWithMO(self, mo, rootMO)
 end
 
 function OnCollideWithTerrain(self, terrainID)
-	if self.HitsMOs then
+	if terrainID == rte.grassID then
+		local newFlame = CreatePEmitter("Ground Flame", "Base.rte");
+		newFlame.Pos = self.Pos;
+		newFlame.Vel = self.Vel;
+		MovableMan:AddParticle(newFlame);
+		self.ToDelete = true;
+	elseif self.HitsMOs then
 		--Let the flames linger occasionally
 		if math.random() < 0.5 then
 			self.GlobalAccScalar = 0.9;
-			self.deleteDelay = terrainID == rte.grassID and self.Lifetime or math.random(self.Age, self.Lifetime);
+			self.deleteDelay = math.random(self.Age, self.Lifetime);
 		end
 		self.HitsMOs = false;
 	end

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

@@ -2,26 +2,43 @@ function Create(self)
 	self.shortFlame = CreatePEmitter("Flame Hurt Short Float", "Base.rte");
 
 	self.flameTimer = Timer();
-	self.flameTimer:SetSimTimeLimitMS(math.random(self.Lifetime));
+	self.flameSpawnDelay = math.random(1000);
 	--Define Throttle for non-emitter particles
 	if self.Throttle == nil then
 		self.Throttle = 0;
 	end
 end
 
 function Update(self)
+	self.ageRatio = 1 - self.Age/self.Lifetime;
 	self:NotResting();
 	--TODO: Use Throttle to combine multiple flames into one
 	self.Throttle = self.Throttle - TimerMan.DeltaTimeMS/self.Lifetime;
 	--Spawn another, shorter flame occasionally
-	if self.flameTimer:IsPastSimTimeLimit() then
+	if self.flameTimer:IsPastSimMS(self.flameSpawnDelay) then
 		self.flameTimer:Reset();
-		self.flameTimer:SetSimTimeLimitMS(1000 + self.Age);
+		self.flameSpawnDelay = 1000 + self.Age * 0.25;
 
 		local particle = self.shortFlame:Clone();
-		particle.Lifetime = math.max(particle.Lifetime - self.Age, 100);
-		particle.Vel = self.Vel + Vector(0, -3) + Vector(math.random(), 0):RadRotate(RangeRand(-math.pi, math.pi));
-		particle.Pos = self.Pos - Vector(0, 1);
+		particle.Lifetime = 100 + math.max(particle.Lifetime * self.ageRatio);
+		particle.Vel = self.Vel + Vector(0, -2) + Vector(math.random(), 0):RadRotate(RangeRand(-math.pi, math.pi));
+		particle.Pos = self.Pos + Vector(0, -1);
 		MovableMan:AddParticle(particle);
 	end
+end
+
+function OnCollideWithTerrain(self, terrainID)
+	if (self.Vel + self.PrevVel):MagnitudeIsLessThan(1) then
+		local checkPos = self.Pos + Vector(math.random(-1, 1), math.random(-1, 1));
+		if SceneMan:GetTerrMatter(checkPos.X, checkPos.Y) == rte.grassID then
+			local px = SceneMan:DislodgePixel(checkPos.X, checkPos.Y);
+			if px and (px.Material.PresetName == "Grass" or px.Material.PresetName == "Vegetation") then
+				px.ToDelete = true;
+				px = CreateMOPixel("Ash Particle " .. math.random(3), "Base.rte");
+				px.Pos = checkPos;
+				px.Vel = Vector(0, -2):RadRotate(math.pi * RangeRand(-0.5, 0.5));
+				MovableMan:AddParticle(px);
+			end
+		end
+	end
 end