Fix some sequence errors.

OpenRA · Dec 30, 2022 · 4143fc9 · 4143fc9
1 parent 37cc26b
commit 4143fc9
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 28 deletions.
diff --git a/mods/cnc/bits/blank.png b/mods/cnc/bits/blank.png
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
@@ -258,7 +258,7 @@ SupportsMapsFrom: cnc
 
 SoundFormats: Aud, Wav
 
-SpriteFormats: Tga, ShpTD, TmpTD, ShpTS, TmpRA, ShpRemastered, Dds
+SpriteFormats: Tga, ShpTD, TmpTD, ShpTS, TmpRA, ShpRemastered, Dds, PngSheet
 
 VideoFormats: Vqa
 

diff --git a/mods/cnc/sequences/infantry-overrides.yaml b/mods/cnc/sequences/infantry-overrides.yaml
@@ -38,24 +38,30 @@ pvice:
 e1:
 	Defaults:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\UNITS\E1.ZIP
-	die-crushed:
+	die-crushed: # FIXME
 		Start: 389
+		Length: 1
+		Tick: 6400
 	icon:
 		RemasteredFilename:
 
 e2:
 	Defaults:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\UNITS\E2.ZIP
-	die-crushed:
-		Start: 389
+	die-crushed: # FIXME
+		Start: 532
+		Length: 1
+		Tick: 6400
 	icon:
 		RemasteredFilename:
 
 e3:
 	Defaults:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\UNITS\E3.ZIP
-	die-crushed:
-		Start: 389
+	die-crushed: # FIXME
+		Start: 404
+		Length: 1
+		Tick: 6400
 	icon:
 		RemasteredFilename:
 
@@ -88,8 +94,10 @@ e4:
 			flame-ne:
 				RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\VFX\FLAME-NE.ZIP
 				Offset: -37, 43
-	die-crushed:
-		Start: 389
+	die-crushed: # FIXME
+		Start: 515
+		Length: 1
+		Tick: 6400
 	icon:
 		RemasteredFilename:
 
@@ -122,28 +130,31 @@ e5:
 			chem-ne:
 				RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\VFX\CHEM-NE.ZIP
 				Offset: -16, 11
-	die-crushed:
-		Start: 389
+	die-crushed: # FIXME
+		Start: 515
+		Length: 1
+		Tick: 6400
 	icon:
 		RemasteredFilename:
 
 e6:
 	Defaults:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\UNITS\E6.ZIP
-	die6:
-		Start: 130
-		Length: 4
 	die-crushed:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\UNITS\E1.ZIP
-		Start: 389
+		Start: 389 # FIXME
+		Length: 1
+		Tick: 6400
 	icon:
 		RemasteredFilename:
 
 rmbo:
 	Defaults:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\UNITS\RMBO.ZIP
-	die-crushed:
+	die-crushed: # FIXME
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\UNITS\E1.ZIP
 		Start: 389
+		Length: 1
+		Tick: 6400
 	icon:
 		RemasteredFilename:
diff --git a/mods/cnc/sequences/misc-overrides.yaml b/mods/cnc/sequences/misc-overrides.yaml
@@ -182,6 +182,10 @@ editor-overlay:
 		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\COMMON\MISC\PLACEMENT_BAD.TGA
 			Count: 3
 
+moveflsh:
+	idle:
+		RemasteredFilename: moveflsh.shp
+
 resources:
 	Defaults:
 		Length: *

diff --git a/mods/cnc/sequences/structures-overrides.yaml b/mods/cnc/sequences/structures-overrides.yaml
@@ -37,10 +37,10 @@ proc:
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\PROCMAKE.ZIP
 	resources:
-		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilenamePattern: blank.png
 			Count: 12
 	damaged-resources:
-		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilenamePattern: blank.png
 			Count: 12
 	bib:
 		RemasteredOffset: 0, 0
@@ -61,7 +61,7 @@ silo:
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\SILOMAKE.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 	icon:
 		RemasteredFilename:
 
@@ -127,7 +127,7 @@ afld:
 	Defaults:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\AFLD.ZIP
 	idle-dish:
-		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilenamePattern: blank.png
 			Count: 16
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\AFLDMAKE.ZIP
@@ -188,7 +188,7 @@ fix:
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\FIXMAKE.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 	icon:
 		RemasteredFilename:
 
@@ -236,7 +236,7 @@ obli:
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\OBLIMAKE.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 	icon:
 		RemasteredFilename:
 
@@ -274,7 +274,7 @@ gun:
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 	muzzle:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\VFX\GUNFIRE.ZIP
 	icon:
@@ -298,7 +298,7 @@ gtwr:
 	muzzle:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\COMMON\VFX\MINIGUN.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 	icon:
 		RemasteredFilename:
 
@@ -311,7 +311,7 @@ atwr:
 	muzzle:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\VFX\GUNFIRE.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 	icon:
 		RemasteredFilename:
 
@@ -322,14 +322,14 @@ hosp:
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\HOSPMAKE.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 
 hosp.husk:
 	idle:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\HOSP.ZIP
 		RemasteredOffset: 0, -11
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 
 bio:
 	Defaults:
@@ -348,12 +348,12 @@ miss:
 	make:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\MISS.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png
 	icon:
 		RemasteredFilename:
 
 miss.husk:
 	idle:
 		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\MISS.ZIP
 	bib:
-		RemasteredFilename: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\STRUCTURES\GUNMAKE.ZIP # empty frame
+		RemasteredFilename: blank.png