Simplify tileset-specific sequence definitions.

All magic behaviour for constructing sprite filenames
has been removed in favour of an explicit Filename
(and TilesetFilenames for tileset-specific sequences)
property.

mods/cnc/sequences/structures.yaml

@@ -1,4 +1,6 @@
 fact:
+	Defaults:
+		Filename: fact.shp
 	build:
 		Start: 4
 		Length: 20
@@ -17,15 +19,24 @@ fact:
 	dead:
 		Start: 48
 		Tick: 800
-	make: factmake
+	make:
+		Filename: factmake.shp
 		Length: *
 		Tick: 80
-	bib: bib2
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib2.des
+			WINTER: bib2.win
+			SNOW: bib2.sno
+			TEMPERAT: bib2.tem
+			JUNGLE: bib2.jun
 		Length: *
-	icon: facticnh
+	icon:
+		Filename: facticnh.shp
 
 nuke:
+	Defaults:
+		Filename: nuke.shp
 	idle:
 		Length: 4
 		Tick: 1000
@@ -36,16 +47,24 @@ nuke:
 	dead:
 		Start: 8
 		Tick: 800
-	make: nukemake
+	make:
+		Filename: nukemake.shp
 		Length: *
 		Tick: 80
-	bib: bib3
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib3.des
+			WINTER: bib3.win
+			SNOW: bib3.sno
+			TEMPERAT: bib3.tem
+			JUNGLE: bib3.jun
 		Length: *
-	icon: nukeicnh.tem
-		AddExtension: False
+	icon:
+		Filename: nukeicnh.tem
 
 proc:
+	Defaults:
+		Filename: proc.shp
 	idle:
 		Length: 6
 		Tick: 120
@@ -59,24 +78,34 @@ proc:
 		Start: 60
 		Tick: 800
 		Offset: 2,4
-	make: procmake
+	make:
+		Filename: procmake.shp
 		Length: *
 		Tick: 80
 		Offset: 2,4
-	resources: proctwr
+	resources:
+		Filename: proctwr.shp
 		Length: 6
 		Offset: -30,-17
-	damaged-resources: proctwr
+	damaged-resources:
+		Filename: proctwr.shp
 		Start: 6
 		Length: 6
 		Offset: -30,-17
-	bib: bib2
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib2.des
+			WINTER: bib2.win
+			SNOW: bib2.sno
+			TEMPERAT: bib2.tem
+			JUNGLE: bib2.jun
 		Length: *
-	icon: procicnh.tem
-		AddExtension: False
+	icon:
+		Filename: procicnh.tem
 
 silo:
+	Defaults:
+		Filename: silo.shp
 	idle:
 		Offset: 0,-1
 	damaged-idle:
@@ -93,23 +122,23 @@ silo:
 		Start: 5
 		Length: 5
 		Offset: 0,-1
-	make: silomake
+	make:
+		Filename: silomake.shp
 		Length: *
 		Tick: 80
 		Offset: 0,-1
-	bib: mbSILO
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbSILO.tem
+		TilesetFilenames:
+			DESERT: mbSILO.des
 		Length: *
 		Offset: 0,1
-	icon: siloicnh.tem
-		AddExtension: False
+	icon:
+		Filename: siloicnh.tem
 
 hand:
 	Defaults:
+		Filename: hand.shp
 		Offset: 0,-8
 	idle:
 	damaged-idle:
@@ -117,18 +146,26 @@ hand:
 	dead:
 		Start: 2
 		Tick: 800
-	make: handmake
+	make:
+		Filename: handmake.shp
 		Length: *
 		Tick: 80
-	bib: bib3
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib3.des
+			WINTER: bib3.win
+			SNOW: bib3.sno
+			TEMPERAT: bib3.tem
+			JUNGLE: bib3.jun
 		Length: *
 		Offset: 0,0
-	icon: handicnh.tem
-		AddExtension: False
+	icon:
+		Filename: handicnh.tem
 		Offset: 0,0
 
 pyle:
+	Defaults:
+		Filename: pyle.shp
 	idle:
 		Length: 10
 		Tick: 100
@@ -141,17 +178,24 @@ pyle:
 	dead:
 		Start: 20
 		Tick: 800
-	make: pylemake
+	make:
+		Filename: pylemake.shp
 		Length: *
 		Tick: 80
-	bib: bib3
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib3.des
+			WINTER: bib3.win
+			SNOW: bib3.sno
+			TEMPERAT: bib3.tem
+			JUNGLE: bib3.jun
 		Length: *
-	icon: pyleicnh.tem
-		AddExtension: False
+	icon:
+		Filename: pyleicnh.tem
 
 weap:
 	Defaults:
+		Filename: weap.shp
 		Offset: 0,-12
 	idle:
 		ZOffset: -511
@@ -161,27 +205,38 @@ weap:
 	dead:
 		Start: 2
 		Tick: 800
-	build-top: weap2
+	build-top:
+		Filename: weap2.shp
 		Length: 10
 		ZOffset: -1024
-	damaged-build-top: weap2
+	damaged-build-top:
+		Filename: weap2.shp
 		Start: 10
 		Length: 10
 		ZOffset: -1024
-	place: weapmake
+	place:
+		Filename: weapmake.shp
 		Start: 19
-	make: weapmake
+	make:
+		Filename: weapmake.shp
 		Length: *
 		Tick: 80
-	bib: bib2
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib2.des
+			WINTER: bib2.win
+			SNOW: bib2.sno
+			TEMPERAT: bib2.tem
+			JUNGLE: bib2.jun
 		Length: *
 		Offset: 0,0
-	icon: weapicnh.tem
-		AddExtension: False
+	icon:
+		Filename: weapicnh.tem
 		Offset: 0,0
 
 afld:
+	Defaults:
+		Filename: afld.shp
 	idle:
 		Tick: 120
 		ZOffset: -1023
@@ -198,10 +253,12 @@ afld:
 		Length: 16
 		Tick: 120
 		ZOffset: -1023
-	idle-dish: afld_d
+	idle-dish:
+		Filename: afld_d.shp
 		Length: 16
 		Tick: 160
-	damaged-idle-dish: afld_d
+	damaged-idle-dish:
+		Filename: afld_d.shp
 		Start: 16
 		Length: 16
 		Tick: 160
@@ -209,16 +266,24 @@ afld:
 		Start: 32
 		ZOffset: -1023
 		Tick: 800
-	make: afldmake
+	make:
+		Filename: afldmake.shp
 		Length: *
 		Tick: 80
-	bib: bib1
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib1.des
+			WINTER: bib1.win
+			SNOW: bib1.sno
+			TEMPERAT: bib1.tem
+			JUNGLE: bib1.jun
 		Length: *
-	icon: afldicnh.tem
-		AddExtension: False
+	icon:
+		Filename: afldicnh.tem
 
 hq:
+	Defaults:
+		Filename: hq.shp
 	idle:
 		Length: 16
 		Tick: 100
@@ -229,16 +294,24 @@ hq:
 	dead:
 		Start: 32
 		Tick: 800
-	make: hqmake
+	make:
+		Filename: hqmake.shp
 		Length: *
 		Tick: 80
-	bib: bib3
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib3.des
+			WINTER: bib3.win
+			SNOW: bib3.sno
+			TEMPERAT: bib3.tem
+			JUNGLE: bib3.jun
 		Length: *
-	icon: hqicnh.tem
-		AddExtension: False
+	icon:
+		Filename: hqicnh.tem
 
 nuk2:
+	Defaults:
+		Filename: nuk2.shp
 	idle:
 		Length: 4
 		Tick: 1000
@@ -249,16 +322,24 @@ nuk2:
 	dead:
 		Start: 8
 		Tick: 800
-	make: nuk2make
+	make:
+		Filename: nuk2make.shp
 		Length: *
 		Tick: 80
-	bib: bib3
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib3.des
+			WINTER: bib3.win
+			SNOW: bib3.sno
+			TEMPERAT: bib3.tem
+			JUNGLE: bib3.jun
 		Length: *
-	icon: nuk2icnh.tem
-		AddExtension: False
+	icon:
+		Filename: nuk2icnh.tem
 
 hpad:
+	Defaults:
+		Filename: hpad.shp
 	idle:
 		ZOffset: -1023
 	damaged-idle:
@@ -278,13 +359,16 @@ hpad:
 		Start: 14
 		ZOffset: -1023
 		Tick: 800
-	make: hpadmake
+	make:
+		Filename: hpadmake.shp
 		Length: *
 		Tick: 80
-	icon: hpadicnh.tem
-		AddExtension: False
+	icon:
+		Filename: hpadicnh.tem
 
 fix:
+	Defaults:
+		Filename: fix.shp
 	idle:
 		ZOffset: -1c511
 	damaged-idle:
@@ -301,21 +385,22 @@ fix:
 		Start: 14
 		ZOffset: -1c511
 		Tick: 800
-	make: fixmake
+	make:
+		Filename: fixmake.shp
 		Length: 14
 		Tick: 60
-	bib: mbFIX
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbFIX.tem
+		TilesetFilenames:
+			DESERT: mbFIX.des
 		Length: *
 		Offset: 0,-9
-	icon: fixicnh.tem
-		AddExtension: False
+	icon:
+		Filename: fixicnh.tem
 
 eye:
+	Defaults:
+		Filename: eye.shp
 	idle:
 		Length: 16
 		Tick: 100
@@ -326,17 +411,24 @@ eye:
 	dead:
 		Start: 32
 		Tick: 800
-	make: eyemake
+	make:
+		Filename: eyemake.shp
 		Length: *
 		Tick: 80
-	bib: bib3
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib3.des
+			WINTER: bib3.win
+			SNOW: bib3.sno
+			TEMPERAT: bib3.tem
+			JUNGLE: bib3.jun
 		Length: *
-	icon: eyeicnh.tem
-		AddExtension: False
+	icon:
+		Filename: eyeicnh.tem
 
 tmpl:
 	Defaults:
+		Filename: tmpl.shp
 		Offset: 0,-12
 	idle:
 	damaged-idle:
@@ -344,7 +436,8 @@ tmpl:
 	active:
 		Length: 5
 		Tick: 200
-	smoke: atomdoor
+	smoke:
+		Filename: atomdoor.shp
 		Length: *
 		Offset: -1,-47
 	damaged-active:
@@ -353,19 +446,26 @@ tmpl:
 	dead:
 		Start: 10
 		Tick: 800
-	make: tmplmake
+	make:
+		Filename: tmplmake.shp
 		Length: *
 		Tick: 60
-	bib: bib2
-		UseTilesetExtension: true
+	bib:
+		TilesetFilenames:
+			DESERT: bib2.des
+			WINTER: bib2.win
+			SNOW: bib2.sno
+			TEMPERAT: bib2.tem
+			JUNGLE: bib2.jun
 		Length: *
 		Offset: 0,0
-	icon: tmplicnh.tem
-		AddExtension: False
+	icon:
+		Filename: tmplicnh.tem
 		Offset: 0,0
 
 obli:
 	Defaults:
+		Filename: obli.shp
 		Offset: 0,-12
 	idle:
 	damaged-idle:
@@ -380,22 +480,23 @@ obli:
 	dead:
 		Start: 8
 		Tick: 800
-	make: oblimake
+	make:
+		Filename: oblimake.shp
 		Length: 13
 		Tick: 80
-	bib: mbOBLI
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbOBLI.tem
+		TilesetFilenames:
+			DESERT: mbOBLI.des
 		Length: *
 		Offset: -1,-3
-	icon: obliicnh.tem
-		AddExtension: False
+	icon:
+		Filename: obliicnh.tem
 		Offset: 0,0
 
 brik:
+	Defaults:
+		Filename: brik.shp
 	idle:
 		Length: 16
 	scratched-idle:
@@ -404,25 +505,30 @@ brik:
 	damaged-idle:
 		Start: 32
 		Length: 16
-	icon: brikicnh.tem
-		AddExtension: False
+	icon:
+		Filename: brikicnh.tem
 
 sbag:
 	idle:
+		Filename: sbag.shp
 		Length: 16
-	icon: sbagicnh.tem
-		AddExtension: False
+	icon:
+		Filename: sbagicnh.tem
 
 cycl:
+	Defaults:
+		Filename: cycl.shp
 	idle:
 		Length: 16
 	damaged-idle:
 		Start: 16
 		Length: 16
-	icon: cyclicnh.tem
-		AddExtension: False
+	icon:
+		Filename: cyclicnh.tem
 
 barb:
+	Defaults:
+		Filename: barb.shp
 	idle:
 		Length: 16
 	damaged-idle:
@@ -430,6 +536,8 @@ barb:
 		Length: 16
 
 wood:
+	Defaults:
+		Filename: wood.shp
 	idle:
 		Length: 16
 	damaged-idle:
@@ -437,7 +545,10 @@ wood:
 		Length: 16
 
 gun:
-	idle: gunmake # Empty first frame. We need WithSpriteBody for the make anim, and WSB needs at least a placeholder default sequence to work
+	Defaults:
+		Filename: gun.shp
+	idle: # Empty first frame. We need WithSpriteBody for the make anim, and WSB needs at least a placeholder default sequence to work
+		Filename: gunmake.shp
 	turret:
 		Facings: 32
 		UseClassicFacings: True
@@ -453,23 +564,25 @@ gun:
 		Start: 96
 		Facings: 32
 		UseClassicFacings: True
-	make: gunmake
+	make:
+		Filename: gunmake.shp
 		Length: *
 		Tick: 80
-	muzzle: gunfire2
+	muzzle:
+		Filename: gunfire2.shp
 		Length: *
-	bib: mbGUN
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbGUN.tem
+		TilesetFilenames:
+			DESERT: mbGUN.des
 		Length: *
 		Offset: -1,-1
-	icon: gunicnh.tem
-		AddExtension: False
+	icon:
+		Filename: gunicnh.tem
 
 sam:
+	Defaults:
+		Filename: sam.shp
 	closed-idle:
 		Start: 0
 	opening:
@@ -503,16 +616,20 @@ sam:
 		Tick: 800
 	place:
 		Start: 0
-	make: sammake
+	make:
+		Filename: sammake.shp
 		Length: 20
 		Tick: 50
-	muzzle: samfire
+	muzzle:
+		Filename: samfire.shp
 		Length: 18
 		Facings: 8
-	icon: samicnh.tem
-		AddExtension: False
+	icon:
+		Filename: samicnh.tem
 
 gtwr:
+	Defaults:
+		Filename: gtwr.shp
 	idle:
 	damaged-idle:
 		Start: 1
@@ -520,29 +637,32 @@ gtwr:
 		Start: 2
 		Tick: 800
 	make:
+		Filename:
 		Combine:
-			gtwrmake:
+			0:
+				Filename: gtwrmake.shp
 				Length: 17
-			gtwrmake:
+			1:
+				Filename: gtwrmake.shp
 				Start: 19
 		Length: 18
 		Tick: 80
-	muzzle: minigun
+	muzzle:
+		Filename: minigun.shp
 		Length: 6
 		Facings: 8
-	bib: mbGTWR
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbGTWR.tem
+		TilesetFilenames:
+			DESERT: mbGTWR.des
 		Length: *
 		Offset: 0,-2
-	icon: gtwricnh.tem
-		AddExtension: False
+	icon:
+		Filename: gtwricnh.tem
 
 atwr:
 	Defaults:
+		Filename: atwr.shp
 		Offset: 0,-13
 	idle:
 	damaged-idle:
@@ -550,24 +670,26 @@ atwr:
 	dead:
 		Start: 2
 		Tick: 800
-	make: atwrmake
+	make:
+		Filename: atwrmake.shp
 		Length: *
 		Tick: 80
-	muzzle: gunfire2
+	muzzle:
+		Filename: gunfire2.shp
 		Length: *
-	bib: mbGTWR
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbGTWR.tem
+		TilesetFilenames:
+			DESERT: mbGTWR.des
 		Length: *
 		Offset: -3,0
-	icon: atwricnh.tem
-		AddExtension: False
+	icon:
+		Filename: atwricnh.tem
 		Offset: 0,0
 
 hosp:
+	Defaults:
+		Filename: hosp.shp
 	idle:
 		Length: 4
 		Tick: 100
@@ -576,71 +698,74 @@ hosp:
 		Start: 4
 		Length: 4
 		Offset: 0,-2
-	make: hospmake
+	make:
+		Filename: hospmake.shp
 		Length: *
 		Tick: 80
 		Offset: 0,-2
-	bib: mbHOSP
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbHOSP.tem
+		TilesetFilenames:
+			DESERT: mbHOSP.des
 		Length: *
 		Offset: 0,1
 
 hosp.husk:
-	idle: hosp
+	idle:
+		Filename: hosp.shp
 		Start: 8
-	bib: mbHOSP
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbHOSP.tem
+		TilesetFilenames:
+			DESERT: mbHOSP.des
 		Length: *
 		Offset: 0,1
 
 bio:
+	Defaults:
+		Filename: bio.shp
 	idle:
 	damaged-idle:
 		Start: 1
-	make: biomake
+	make:
+		Filename: biomake.shp
 		Length: *
 		Tick: 80
 
 bio.husk:
-	idle: bio
+	idle:
+		Filename: bio.shp
 		Start: 2
 
 miss:
+	Defaults:
+		Filename: miss.shp
 	idle:
 		Offset: 0,-1
 	damaged-idle:
 		Start: 1
 		Offset: 0,-1
-	make: missmake
+	make:
+		Filename: missmake.shp
 		Length: *
 		Tick: 80
 		Offset: 0,-1
-	bib: mbMISS
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbMISS.tem
+		TilesetFilenames:
+			DESERT: mbMISS.des
 		Length: *
 		Offset: 0,1
-	icon: missicnh
+	icon:
+		Filename: missicnh.shp
 
 miss.husk:
-	idle: miss
+	idle:
+		Filename: miss.shp
 		Start: 2
-	bib: mbMISS
-		UseTilesetExtension: true
-		TilesetOverrides:
-			WINTER: TEMPERAT
-			JUNGLE: TEMPERAT
-			SNOW: TEMPERAT
+	bib:
+		Filename: mbMISS.tem
+		TilesetFilenames:
+			DESERT: mbMISS.des
 		Length: *
 		Offset: 0,1