Infantry burned death use no actor, as it is buggy on block actor pat…

…h when moving
ABrandau · Oct 5, 2023 · 6326065 · 6326065
1 parent 7e2719d
commit 6326065
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 29 deletions.
diff --git a/mods/sp/rules/defaults.yaml b/mods/sp/rules/defaults.yaml
@@ -1713,9 +1713,13 @@
 		CargoCondition: ascargo
 	QuantizeFacingsFromSequence:
 		Sequence: stand
-	SpawnActorOnDeath@FLAMEGUY:
-		Actor: FLAMEGUY
-		DeathType: FireDeath
+	SpawnSmokeParticleOnDeath@FLAMEGUY:
+		Image: flameguy
+		Sequences: run-all
+		EndSequences: die
+		Duration: 19
+		Palette: player
+		DeathTypes: FireDeath
 	GrantRandomCondition@tiberium:
 		Conditions: visc, zombie
 	SpawnActorOnDeath@tiberium1:
@@ -1887,7 +1891,7 @@
 		-PauseOnCondition:
 	-TakeCover:
 	-WithDeathAnimation@tib:
-	-SpawnActorOnDeath@FLAMEGUY:
+	-SpawnSmokeParticleOnDeath@FLAMEGUY:
 	Armor:
 		Type: Heavy
 	Targetable:
@@ -1940,7 +1944,7 @@
 		CrushedSequencePalette: playerscrin
 		CrushedPaletteIsPlayerPalette: true
 	-DamagedByTerrain:
-	-SpawnActorOnDeath@FLAMEGUY:
+	-SpawnSmokeParticleOnDeath@FLAMEGUY:
 	Mobile:
 		Locomotor: TibInmuneInfantry
 	WithDeathAnimation@body:
@@ -2032,7 +2036,7 @@
 	-WithDeathAnimation@explosion:
 	-WithDeathAnimation@energy:
 	-WithDeathAnimation@body:
-	-SpawnActorOnDeath@FLAMEGUY:
+	-SpawnSmokeParticleOnDeath@FLAMEGUY:
 	-GrantRandomCondition@tiberium:
 	-SpawnActorOnDeath@tiberium1:
 	-SpawnActorOnDeath@tiberium2:
@@ -2110,7 +2114,7 @@
 	-WithDeathAnimation@tib:
 	-WithDeathAnimation@explosion:
 	-WithDeathAnimation@energy:
-	-SpawnActorOnDeath@FLAMEGUY:
+	-SpawnSmokeParticleOnDeath@FLAMEGUY:
 	-GrantRandomCondition@tiberium:
 	-SpawnActorOnDeath@tiberium1:
 	-SpawnActorOnDeath@tiberium2:

diff --git a/mods/sp/rules/dummies.yaml b/mods/sp/rules/dummies.yaml
@@ -332,21 +332,3 @@ SCRINESSENCESMALL:
 		EmptyWeapon: EssenceSmall
 		LoadedChance: 100
 		Chance: 100
-
-FLAMEGUY:
-	Inherits@1: ^ExistsInWorld
-	Inherits@2: ^SpriteActor
-	Inherits@3: ^WithDeathEffects
-	Mobile:
-		Speed: 80
-		Locomotor: Infantry
-	HiddenUnderFog:
-	WithFacingSpriteBody:
-		Sequence: run
-	KillsSelf@TimedLife:
-		Delay: 19
-	Wanders:
-	WithDeathAnimation:
-		FallbackSequence: die
-		UseDeathTypeSuffix: false
-
diff --git a/mods/sp/rules/infantry.yaml b/mods/sp/rules/infantry.yaml
@@ -1265,7 +1265,7 @@ MUTFIEND:
 		ScanRadius: 8 #PREF: save trait looks up and scan armaments
 	-TakeCover:
 	-WithDeathAnimation@tib:
-	-SpawnActorOnDeath@FLAMEGUY:
+	-SpawnSmokeParticleOnDeath@FLAMEGUY:
 	SpawnActorOnDeath@conversion:
 		Actor: cybdog
 	SpawnActorOnDeath@conversionUpg:
@@ -2263,7 +2263,7 @@ SWARMLING:
 	-WithDeathAnimation@explosion:
 	-WithDeathAnimation@energy:
 	-WithDeathAnimation@body:
-	-SpawnActorOnDeath@FLAMEGUY:
+	-SpawnSmokeParticleOnDeath@FLAMEGUY:
 	-SpawnActorOnDeath@conversion:
 	-SpawnActorOnDeath@conversionUpg:
 	-WithDeathAnimation@blood1:

diff --git a/mods/sp/rules/unused/zunused assets.yaml b/mods/sp/rules/unused/zunused assets.yaml
@@ -1228,6 +1228,26 @@ WEASAUBLUE2:
 	RenderSprites:
 		Image: weasaublue2
 
+
+FLAMEGUY:
+	Inherits@1: ^ExistsInWorld
+	Inherits@2: ^SpriteActor
+	Inherits@3: ^WithDeathEffects
+	Mobile:
+		Speed: 80
+		Locomotor: Infantry
+	HiddenUnderFog:
+	WithFacingSpriteBody:
+		Sequence: run
+	KillsSelf@TimedLife:
+		Delay: 19
+	Wanders:
+	WithDeathAnimation:
+		FallbackSequence: die
+		UseDeathTypeSuffix: false
+
+
+
 FIREFLY.Husk:
 	Inherits: ^AircraftHusk
 	Inherits@RENDER: ^CabRender

diff --git a/mods/sp/sequences/creepsseq.yaml b/mods/sp/sequences/creepsseq.yaml
@@ -1,19 +1,25 @@
 flameguy:
 	Defaults:
 		Filename: flameguy.shp
-		Facings: 8
-		Tick: 80
+		Tick: 60
 		ShadowStart: 148
 		IgnoreWorldTint: true
 	idle:
+		Facings: 8
 	stand:
+		Facings: 8
 	run:
+		Facings: 8
 		Length: 6
 	die:
 		Start: 44
 		Facings: 1
 		Length: 104
 		ShadowStart: 192
+	run-all:
+		Start: 0
+		ShadowStart: 148
+		Length: 48
 
 tibcloud: ## Notice: this used for pariticle only
 	Defaults: