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.
2023-01-21 14:41:32 +00:00
parent 04c3cd6ec5
commit 5b8f148c50
41 changed files with 8088 additions and 3718 deletions
--- a/mods/ts/maps/sunstroke/sequences.yaml
+++ b/mods/ts/maps/sunstroke/sequences.yaml
@@ -1,5 +1,9 @@
 slav:
-	icon: xxicon
+	Defaults:
+		Filename: slav.shp
+	icon:
+		Filename: xxicon.shp

 4tnk:
-	icon: xxicon
+	icon:
+		Filename: xxicon.shp
--- a/mods/ts/sequences/aircraft.yaml
+++ b/mods/ts/sequences/aircraft.yaml
@@ -1,29 +1,36 @@
 orca:
 	Inherits: ^VehicleOverlays
-	icon: orcaicon
+	icon:
+		Filename: orcaicon.shp

 orcab:
 	Inherits: ^VehicleOverlays
-	icon: obmbicon
+	icon:
+		Filename: obmbicon.shp

 trnsport:
 	Inherits: ^VehicleOverlays
-	icon: otrnicon
+	icon:
+		Filename: otrnicon.shp

 scrin:
 	Inherits: ^VehicleOverlays
-	icon: proicon
+	icon:
+		Filename: proicon.shp

 apache:
 	Inherits: ^VehicleOverlays
-	icon: apchicon
-	rotor: harpyrotor
+	icon:
+		Filename: apchicon.shp
+	rotor:
+		Filename: harpyrotor.shp
 		Start: 32
 		Length: 31
 		Offset: 0, 0, 32
 		ZRamp: 1
 		Tick: 25
-	slow-rotor: harpyrotor
+	slow-rotor:
+		Filename: harpyrotor.shp
 		Length: 31
 		Offset: 0, 0, 32
 		ZRamp: 1
@@ -31,10 +38,12 @@ apache:

 orcatran:
 	Inherits: ^VehicleOverlays
-	icon: crryicon
+	icon:
+		Filename: crryicon.shp

 pod:
 	Inherits: ^VehicleOverlays
 	idle:
+		Filename: pod.shp
 		Facings: 1
 		Length: 1
--- a/mods/ts/sequences/bridges.yaml
+++ b/mods/ts/sequences/bridges.yaml
@@ -1,97 +1,200 @@
 ^bridge:
 	Defaults:
 		ZOffset: -1c511
-		UseTilesetExtension: true
 		Start: 1
 		ZRamp: 1
 		Offset: 0, 0, 1

 lobrdg_a:
 	Inherits: ^bridge
-	idle: lobrdg10
-	idle2: lobrdg11
-	idle3: lobrdg12
-	idle4: lobrdg13
-	adead: lobrdg15
-	bdead: lobrdg14
-	abdead: lobrdg16
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg10.tem
+			SNOW: lobrdg10.sno
+	idle2:
+		TilesetFilenames:
+			TEMPERATE: lobrdg11.tem
+			SNOW: lobrdg11.sno
+	idle3:
+		TilesetFilenames:
+			TEMPERATE: lobrdg12.tem
+			SNOW: lobrdg12.sno
+	idle4:
+		TilesetFilenames:
+			TEMPERATE: lobrdg13.tem
+			SNOW: lobrdg13.sno
+	adead:
+		TilesetFilenames:
+			TEMPERATE: lobrdg15.tem
+			SNOW: lobrdg15.sno
+	bdead:
+		TilesetFilenames:
+			TEMPERATE: lobrdg14.tem
+			SNOW: lobrdg14.sno
+	abdead:
+		TilesetFilenames:
+			TEMPERATE: lobrdg16.tem
+			SNOW: lobrdg16.sno

 lobrdg_a_d:
 	Inherits: ^bridge
-	idle: lobrdg28
-	aramp: lobrdg17
-	bramp: lobrdg18
-	abramp: lobrdg28
-	editor: lobrdg10
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg28.tem
+			SNOW: lobrdg28.sno
+	aramp:
+		TilesetFilenames:
+			TEMPERATE: lobrdg17.tem
+			SNOW: lobrdg17.sno
+	bramp:
+		TilesetFilenames:
+			TEMPERATE: lobrdg18.tem
+			SNOW: lobrdg18.sno
+	abramp:
+		TilesetFilenames:
+			TEMPERATE: lobrdg28.tem
+			SNOW: lobrdg28.sno
+	editor:
+		TilesetFilenames:
+			TEMPERATE: lobrdg10.tem
+			SNOW: lobrdg10.sno

 lobrdg_b:
 	Inherits: ^bridge
-	idle: lobrdg01
-	idle2: lobrdg02
-	idle3: lobrdg03
-	idle4: lobrdg04
-	adead: lobrdg05
-	bdead: lobrdg06
-	abdead: lobrdg07
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg01.tem
+			SNOW: lobrdg01.sno
+	idle2:
+		TilesetFilenames:
+			TEMPERATE: lobrdg02.tem
+			SNOW: lobrdg02.sno
+	idle3:
+		TilesetFilenames:
+			TEMPERATE: lobrdg03.tem
+			SNOW: lobrdg03.sno
+	idle4:
+		TilesetFilenames:
+			TEMPERATE: lobrdg04.tem
+			SNOW: lobrdg04.sno
+	adead:
+		TilesetFilenames:
+			TEMPERATE: lobrdg05.tem
+			SNOW: lobrdg05.sno
+	bdead:
+		TilesetFilenames:
+			TEMPERATE: lobrdg06.tem
+			SNOW: lobrdg06.sno
+	abdead:
+		TilesetFilenames:
+			TEMPERATE: lobrdg07.tem
+			SNOW: lobrdg07.sno

 lobrdg_b_d:
 	Inherits: ^bridge
-	idle: lobrdg27
-	aramp: lobrdg08
-	bramp: lobrdg09
-	abramp: lobrdg27
-	editor: lobrdg01
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg27.tem
+			SNOW: lobrdg27.sno
+	aramp:
+		TilesetFilenames:
+			TEMPERATE: lobrdg08.tem
+			SNOW: lobrdg08.sno
+	bramp:
+		TilesetFilenames:
+			TEMPERATE: lobrdg09.tem
+			SNOW: lobrdg09.sno
+	abramp:
+		TilesetFilenames:
+			TEMPERATE: lobrdg27.tem
+			SNOW: lobrdg27.sno
+	editor:
+		TilesetFilenames:
+			TEMPERATE: lobrdg01.tem
+			SNOW: lobrdg01.sno

 lobrdg_r_se:
 	Inherits: ^bridge
-	idle: lobrdg19
-	damaged-idle: lobrdg20
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg19.tem
+			SNOW: lobrdg19.sno
+	damaged-idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg20.tem
+			SNOW: lobrdg20.sno

 lobrdg_r_nw:
 	Inherits: ^bridge
-	idle: lobrdg21
-	damaged-idle: lobrdg22
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg21.tem
+			SNOW: lobrdg21.sno
+	damaged-idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg22.tem
+			SNOW: lobrdg22.sno

 lobrdg_r_ne:
 	Inherits: ^bridge
-	idle: lobrdg23
-	damaged-idle: lobrdg24
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg23.tem
+			SNOW: lobrdg23.sno
+	damaged-idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg24.tem
+			SNOW: lobrdg24.sno

 lobrdg_r_sw:
 	Inherits: ^bridge
-	idle: lobrdg25
-	damaged-idle: lobrdg26
+	idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg25.tem
+			SNOW: lobrdg25.sno
+	damaged-idle:
+		TilesetFilenames:
+			TEMPERATE: lobrdg26.tem
+			SNOW: lobrdg26.sno

 bridge1:
-	idle: bridge
+	idle:
+		TilesetFilenames:
+			TEMPERATE: bridge.tem
+			SNOW: bridge.sno
 		# Disabled to avoid glitches until shadow rendering is fixed
 		# ShadowStart: 18
-		UseTilesetExtension: true
 		ZRamp: 1
 		Offset: 0, -13, 49

 bridge2:
-	idle: bridge
+	idle:
+		TilesetFilenames:
+			TEMPERATE: bridge.tem
+			SNOW: bridge.sno
 		Start: 9
 		# Disabled to avoid glitches until shadow rendering is fixed
 		# ShadowStart: 27
-		UseTilesetExtension: true
 		ZRamp: 1
 		Offset: 0, -25, 49

 railbrdg1:
-	idle: railbrdg
+	idle:
+		TilesetFilenames:
+			TEMPERATE: railbrdg.tem
+			SNOW: railbrdg.sno
 		# Disabled to avoid glitches until shadow rendering is fixed
 		# ShadowStart: 18
-		UseTilesetExtension: true
 		ZRamp: 1
 		Offset: 0, -13, 49

 railbrdg2:
-	idle: railbrdg
+	idle:
+		TilesetFilenames:
+			TEMPERATE: railbrdg.tem
+			SNOW: railbrdg.sno
 		Start: 9
 		# Disabled to avoid glitches until shadow rendering is fixed
 		# ShadowStart: 27
-		UseTilesetExtension: true
 		ZRamp: 1
 		Offset: 0, -25, 49
--- a/mods/ts/sequences/civilian.yaml
+++ b/mods/ts/sequences/civilian.yaml
@@ -1,5 +1,6 @@
 ammocrat:
-	idle: ammo01
+	idle:
+		Filename: ammo01.shp
 		DepthSprite: isodepth.shp
 		ShadowStart: 2
 		Offset: 0, -12, 12
@@ -54,67 +55,98 @@ ammocrat:
 		DepthSpriteOffset: -24, 0

 aban01:
+	Defaults:
+		Filename: aban01.shp
 	Inherits: ^aban2x6

 aban02:
+	Defaults:
+		Filename: aban02.shp
 	Inherits: ^aban5x3

 aban03:
+	Defaults:
+		Filename: aban03.shp
 	Inherits: ^aban2x5

 aban04:
+	Defaults:
+		Filename: aban04.shp
 	Inherits: ^aban4x2

 aban05:
+	Defaults:
+		Filename: aban05.shp
 	Inherits: ^aban3x2

 aban06:
+	Defaults:
+		Filename: aban06.shp
 	Inherits: ^aban2x2

 aban07:
+	Defaults:
+		Filename: aban07.shp
 	Inherits: ^aban2x2

 aban08:
+	Defaults:
+		Filename: aban08.shp
 	Inherits: ^aban2x2

 aban09:
 	Inherits: ^aban2x2
 	Defaults:
+		Filename: aban09.shp
 		Offset: 2, -20, 24

 aban10:
+	Defaults:
+		Filename: aban10.shp
 	Inherits: ^aban2x2

 aban11:
 	Inherits: ^aban2x2
 	Defaults:
+		Filename: aban11.shp
 		Offset: 0, -20, 24

 aban12:
 	Inherits: ^aban2x2
 	Defaults:
+		Filename: aban12.shp
 		Offset: 2, -22, 24

 aban13:
 	Inherits: ^aban1x1
 	Defaults:
+		Filename: aban13.shp
 		Offset: 0, -10, 12

 aban14:
+	Defaults:
+		Filename: aban14.shp
 	Inherits: ^aban1x1

 aban15:
 	Inherits: ^aban1x1
 	Defaults:
+		Filename: aban15.shp
 		Offset: 0, -10, 12

 aban16:
+	Defaults:
+		Filename: aban16.shp
 	Inherits: ^aban2x2

 aban17:
+	Defaults:
+		Filename: aban17.shp
 	Inherits: ^aban1x1

 aban18:
+	Defaults:
+		Filename: aban18.shp
 	Inherits: ^aban1x1

 ^bboard1x1:
@@ -145,51 +177,83 @@ aban18:
 		ShadowStart: 3

 bboard01:
+	Defaults:
+		Filename: bboard01.shp
 	Inherits: ^bboard1x1

 bboard02:
+	Defaults:
+		Filename: bboard02.shp
 	Inherits: ^bboard1x1

 bboard03:
+	Defaults:
+		Filename: bboard03.shp
 	Inherits: ^bboard1x1

 bboard04:
+	Defaults:
+		Filename: bboard04.shp
 	Inherits: ^bboard1x1

 bboard05:
+	Defaults:
+		Filename: bboard05.shp
 	Inherits: ^bboard1x1

 bboard06:
+	Defaults:
+		Filename: bboard06.shp
 	Inherits: ^bboard1x2

 bboard07:
+	Defaults:
+		Filename: bboard07.shp
 	Inherits: ^bboard1x2

 bboard08:
+	Defaults:
+		Filename: bboard08.shp
 	Inherits: ^bboard1x2

 bboard09:
+	Defaults:
+		Filename: bboard09.shp
 	Inherits: ^bboard1x1

 bboard10:
+	Defaults:
+		Filename: bboard10.shp
 	Inherits: ^bboard1x1

 bboard11:
+	Defaults:
+		Filename: bboard11.shp
 	Inherits: ^bboard1x1

 bboard12:
+	Defaults:
+		Filename: bboard12.shp
 	Inherits: ^bboard1x1

 bboard13:
+	Defaults:
+		Filename: bboard13.shp
 	Inherits: ^bboard1x1

 bboard14:
+	Defaults:
+		Filename: bboard14.shp
 	Inherits: ^bboard2x1

 bboard15:
+	Defaults:
+		Filename: bboard15.shp
 	Inherits: ^bboard2x1

 bboard16:
+	Defaults:
+		Filename: bboard16.shp
 	Inherits: ^bboard2x1

 ^cabase:
@@ -205,114 +269,195 @@ bboard16:
 	Inherits: ^cabase
 	Defaults:
 		Offset: 0, -12, 12
-		UseTilesetCode: true

 ^ca1x2:
 	Inherits: ^cabase
 	Defaults:
 		Offset: 12, -18, 18
 		DepthSpriteOffset: 12, 0
-		UseTilesetCode: true

 ^ca2x1:
 	Inherits: ^cabase
 	Defaults:
 		Offset: -12, -18, 18
 		DepthSpriteOffset: -12, 0
-		UseTilesetCode: true

 ^ca2x3:
 	Inherits: ^cabase
 	Defaults:
 		Offset: 12, -30, 30
 		DepthSpriteOffset: 12, 0
-		UseTilesetCode: true

 ^ca3x3:
 	Inherits: ^cabase
 	Defaults:
 		Offset: 0, -36, 36
-		UseTilesetCode: true

 ^ca2x2:
 	Inherits: ^cabase
 	Defaults:
 		Offset: 0, -24, 24
-		UseTilesetCode: true

 ca0001:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0001.shp
+			SNOW: ca0001.shp
 	Inherits: ^ca3x3

 ca0002:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0002.shp
+			SNOW: ca0002.shp
 	Inherits: ^ca3x3

 ca0003:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0003.shp
+			SNOW: ca0003.shp
 	Inherits: ^ca2x2

 ca0004:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0004.shp
+			SNOW: ca0004.shp
 	Inherits: ^ca2x2

 ca0005:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0005.shp
+			SNOW: ca0005.shp
 	Inherits: ^ca1x2

 ca0006:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0006.shp
+			SNOW: ca0006.shp
 	Inherits: ^ca1x2

 ca0007:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0007.shp
+			SNOW: ca0007.shp
 	Inherits: ^ca1x2

 ca0008:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0008.shp
+			SNOW: ca0008.shp
 	Inherits: ^ca2x3

 ca0009:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0009.shp
+			SNOW: ca0009.shp
 	Inherits: ^ca2x3

 ca0010:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0010.shp
+			SNOW: ca0010.shp
 	Inherits: ^ca2x2

 ca0011:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0011.shp
+			SNOW: ca0011.shp
 	Inherits: ^ca1x2

 ca0012:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0012.shp
+			SNOW: ca0012.shp
 	Inherits: ^ca1x2

 ca0013:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0013.shp
+			SNOW: ca0013.shp
 	Inherits: ^ca2x1

 ca0014:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0014.shp
+			SNOW: ca0014.shp
 	Inherits: ^ca1x1

 ca0015:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0015.shp
+			SNOW: ca0015.shp
 	Inherits: ^ca1x1

 ca0016:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0016.shp
+			SNOW: ca0016.shp
 	Inherits: ^ca1x1

 ca0017:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0017.shp
+			SNOW: ca0017.shp
 	Inherits: ^ca1x1

 ca0018:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0018.shp
+			SNOW: ca0018.shp
 	Inherits: ^ca1x2

 ca0019:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0019.shp
+			SNOW: ca0019.shp
 	Inherits: ^ca1x2

 ca0020:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0020.shp
+			SNOW: ca0020.shp
 	Inherits: ^ca1x2

 ca0021:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ct0021.shp
+			SNOW: ca0021.shp
 	Inherits: ^ca1x2

 caarmr:
 	Defaults:
 		DepthSprite: isodepth.shp
 		Offset: 0, -48, 48
-	idle: ctarmr
+	idle:
+		Filename: ctarmr.shp
 		ShadowStart: 3
-	damaged-idle: ctarmr
+	damaged-idle:
+		Filename: ctarmr.shp
 		Start: 1
 		ShadowStart: 4
-	critical-idle: ctarmr
+	critical-idle:
+		Filename: ctarmr.shp
 		Start: 2
 		ShadowStart: 5

@@ -320,32 +465,41 @@ caaray:
 	Defaults:
 		DepthSprite: isodepth.shp
 		Offset: 0, -24, 24
-	idle: ctaray
+	idle:
+		Filename: ctaray.shp
 		ShadowStart: 3
-	damaged-idle: ctaray
+	damaged-idle:
+		Filename: ctaray.shp
 		Start: 1
 		ShadowStart: 4
-	critical-idle: ctaray
+	critical-idle:
+		Filename: ctaray.shp
 		Start: 2
 		ShadowStart: 5
-	idle-satellite: ctaray_a
+	idle-satellite:
+		Filename: ctaray_a.shp
 		Length: 16
 		Tick: 100
-	idle-radar: ctaray_b
+	idle-radar:
+		Filename: ctaray_b.shp
 		Length: 16
 		Tick: 100
-	idle-scanner: ctaray_c
+	idle-scanner:
+		Filename: ctaray_c.shp
 		Length: 16
 		Tick: 100
-	damaged-idle-scanner: ctaray_c
+	damaged-idle-scanner:
+		Filename: ctaray_c.shp
 		Start: 16
 		Length: 16
 		Tick: 100
-	idle-light-bright: ctaray_d
+	idle-light-bright:
+		Filename: ctaray_d.shp
 		Length: 12
 		Tick: 100
 		IgnoreWorldTint: True
-	damaged-idle-light-bright: ctaray_d
+	damaged-idle-light-bright:
+		Filename: ctaray_d.shp
 		Start: 12
 		Length: 12
 		Tick: 100
@@ -353,36 +507,59 @@ caaray:

 cabhut:
 	idle:
+		TilesetFilenames:
+			TEMPERATE: ctbhut.shp
+			SNOW: cabhut.shp
 		DepthSprite: isodepth.shp
-		UseTilesetCode: true
 		Offset: 0, -12, 12
 		ShadowStart: 1

 ^cacrsh:
 	idle:
-		UseTilesetCode: true
 		Offset: 0, -12, 12

 cacrsh01:
 	Inherits: ^cacrsh
+	idle:
+		TilesetFilenames:
+			TEMPERATE: ctcrsh01.shp
+			SNOW: cacrsh01.shp

 cacrsh02:
 	Inherits: ^cacrsh
+	idle:
+		TilesetFilenames:
+			TEMPERATE: ctcrsh02.shp
+			SNOW: cacrsh02.shp

 cacrsh03:
 	Inherits: ^cacrsh
+	idle:
+		TilesetFilenames:
+			TEMPERATE: ctcrsh03.shp
+			SNOW: cacrsh03.shp

 cacrsh04:
 	Inherits: ^cacrsh
+	idle:
+		TilesetFilenames:
+			TEMPERATE: ctcrsh04.shp
+			SNOW: cacrsh04.shp

 cacrsh05:
 	Inherits: ^cacrsh
+	idle:
+		TilesetFilenames:
+			TEMPERATE: ctcrsh05.shp
+			SNOW: cacrsh05.shp

 cahosp:
 	Defaults:
+		TilesetFilenames:
+			TEMPERATE: cthosp.shp
+			SNOW: cahosp.shp
 		DepthSprite: isodepth.shp
 		DepthSpriteOffset: 15, 0
-		UseTilesetCode: true
 		Offset: 15, -36, 36
 	idle:
 		ShadowStart: 3
@@ -394,19 +571,22 @@ cahosp:
 		ShadowStart: 5

 capyr01:
-	idle: ctpyr01
+	idle:
+		Filename: ctpyr01.shp
 		DepthSprite: isodepth.shp
 		ShadowStart: 1
 		Offset: 0, -24, 24

 capyr02:
-	idle: ctpyr02
+	idle:
+		Filename: ctpyr02.shp
 		DepthSprite: isodepth.shp
 		ShadowStart: 1
 		Offset: 0, -48, 48

 capyr03:
-	idle: ctpyr03
+	idle:
+		Filename: ctpyr03.shp
 		DepthSprite: isodepth.shp
 		ShadowStart: 1
 		Offset: 0, -48, 48
@@ -454,102 +634,150 @@ capyr03:
 city01:
 	Inherits: ^city4x2
 	Defaults:
+		Filename: city01.shp
 		Offset: -12, -30, 36

 city02:
+	Defaults:
+		Filename: city02.shp
 	Inherits: ^city2x3

 city03:
+	Defaults:
+		Filename: city03.shp
 	Inherits: ^city3x2

 city04:
+	Defaults:
+		Filename: city04.shp
 	Inherits: ^city3x2

 city05:
+	Defaults:
+		Filename: city05.shp
 	Inherits: ^city3x2

 city06:
+	Defaults:
+		Filename: city06.shp
 	Inherits: ^city4x2

 city07:
 	Inherits: ^city4x2
 	Defaults:
+		Filename: city07.shp
 		Offset: -12, -30, 36

 city08:
+	Defaults:
+		Filename: city08.shp
 	Inherits: ^city2x2

 city09:
+	Defaults:
+		Filename: city09.shp
 	Inherits: ^city2x2

 city10:
+	Defaults:
+		Filename: city10.shp
 	Inherits: ^city2x2

 city11:
+	Defaults:
+		Filename: city11.shp
 	Inherits: ^city2x2

 city12:
+	Defaults:
+		Filename: city12.shp
 	Inherits: ^city2x2

 city13:
+	Defaults:
+		Filename: city13.shp
 	Inherits: ^city2x2

 city14:
+	Defaults:
+		Filename: city14.shp
 	Inherits: ^city1x1

 city15:
+	Defaults:
+		Filename: city15.shp
 	Inherits: ^city4x2

 city16:
 	Inherits: ^city4x2
 	Defaults:
+		Filename: city16.shp
 		Offset: -24, -30, 36

 city17:
+	Defaults:
+		Filename: city17.shp
 	Inherits: ^city4x3

 city18:
+	Defaults:
+		Filename: city18.shp
 	Inherits: ^city3x5

 city19:
+	Defaults:
+		Filename: city19.shp
 	Inherits: ^city2x2

 city20:
+	Defaults:
+		Filename: city20.shp
 	Inherits: ^city1x1

 city21:
+	Defaults:
+		Filename: city21.shp
 	Inherits: ^city1x1

 city22:
+	Defaults:
+		Filename: city22.shp
 	Inherits: ^city2x2

 ctdam:
 	Defaults:
+		Filename: ctdam.shp
 		Offset: 36,-42, 42
 	idle:
 	damaged-idle:
 		Start: 1
-	idle-lights-bright: ctdam_a
+	idle-lights-bright:
+		Filename: ctdam_a.shp
 		Length: 10
 		Tick: 200
 		IgnoreWorldTint: True
-	damaged-idle-lights-bright: ctdam_a
+	damaged-idle-lights-bright:
+		Filename: ctdam_a.shp
 		Start: 10
 		Length: 10
 		Tick: 200
 		IgnoreWorldTint: True
-	idle-water-a: ctdam_b
+	idle-water-a:
+		Filename: ctdam_b.shp
 		Length: 8
 		Tick: 200
-	damaged-idle-water-a: ctdam_b
+	damaged-idle-water-a:
+		Filename: ctdam_b.shp
 		Start: 8
 		Length: 8
 		Tick: 200
-	idle-water-b: ctdam_b
+	idle-water-b:
+		Filename: ctdam_b.shp
 		Start: 16
 		Length: 8
 		Tick: 200
-	damaged-idle-water-b: ctdam_b
+	damaged-idle-water-b:
+		Filename: ctdam_b.shp
 		Start: 24
 		Start: 8
 		Length: 8
@@ -557,6 +785,7 @@ ctdam:

 ctvega:
 	Defaults:
+		Filename: ctvega.shp
 		DepthSprite: isodepth.shp
 		Offset: 0, -48, 48
 	idle:
@@ -572,32 +801,57 @@ ctvega:
 	idle:
 		ShadowStart: 2
 		DepthSprite: isodepth.shp
-		UseTilesetCode: true
 		Offset: 0, -24, 24

 gaoldcc1:
 	Inherits: ^gaoldcc
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtoldcc1.shp
+			SNOW: gaoldcc1.shp

 gaoldcc2:
 	Inherits: ^gaoldcc
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtoldcc2.shp
+			SNOW: gaoldcc2.shp

 gaoldcc3:
 	Inherits: ^gaoldcc
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtoldcc3.shp
+			SNOW: gaoldcc3.shp

 gaoldcc4:
 	Inherits: ^gaoldcc
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtoldcc4.shp
+			SNOW: gaoldcc4.shp

 gaoldcc5:
 	Inherits: ^gaoldcc
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtoldcc5.shp
+			SNOW: gaoldcc5.shp

 gaoldcc6:
 	Inherits: ^gaoldcc
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtoldcc6.shp
+			SNOW: gaoldcc6.shp

 gakodk:
 	Defaults:
+		TilesetFilenames:
+			TEMPERATE: gtkodk.shp
+			SNOW: gakodk.shp
 		DepthSprite: isodepth.shp
 		DepthSpriteOffset: -24, 0
-		UseTilesetCode: true
 		Offset: -24, -36, 36
 	idle:
 		ShadowStart: 3
@@ -607,41 +861,71 @@ gakodk:
 	critical-idle:
 		Start: 2
 		ShadowStart: 5
-	large-lights: gakodk_a
+	large-lights:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_a.shp
+			SNOW: gakodk_a.shp
 		Length: 12
 		Tick: 200
-	large-lights-bright: gakodk_a
+	large-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_a.shp
+			SNOW: gakodk_a.shp
 		Length: 12
 		Tick: 200
 		IgnoreWorldTint: True
-	damaged-large-lights: gakodk_a
+	damaged-large-lights:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_a.shp
+			SNOW: gakodk_a.shp
 		Start: 12
 		Length: 12
 		Tick: 200
-	damaged-large-lights-bright: gakodk_a
+	damaged-large-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_a.shp
+			SNOW: gakodk_a.shp
 		Start: 12
 		Length: 12
 		Tick: 200
 		IgnoreWorldTint: True
-	small-light: gakodk_b
+	small-light:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_b.shp
+			SNOW: gakodk_b.shp
 		Length: 22
 		Tick: 200
-	small-light-bright: gakodk_b
+	small-light-bright:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_b.shp
+			SNOW: gakodk_b.shp
 		Length: 22
 		Tick: 200
 		IgnoreWorldTint: True
-	small-lights: gakodk_c
+	small-lights:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_c.shp
+			SNOW: gakodk_c.shp
 		Length: 12
 		Tick: 200
-	small-lights-bright: gakodk_c
+	small-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_c.shp
+			SNOW: gakodk_c.shp
 		Length: 12
 		Tick: 200
 		IgnoreWorldTint: True
-	damaged-small-lights: gakodk_c
+	damaged-small-lights:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_c.shp
+			SNOW: gakodk_c.shp
 		Start: 12
 		Length: 12
 		Tick: 200
-	damaged-small-lights-bright: gakodk_c
+	damaged-small-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: gtkodk_c.shp
+			SNOW: gakodk_c.shp
 		Start: 12
 		Length: 12
 		Tick: 200
@@ -649,9 +933,11 @@ gakodk:

 gaspot:
 	Defaults:
+		TilesetFilenames:
+			TEMPERATE: gtspot.shp
+			SNOW: gaspot.shp
 		DepthSprite: isodepth.shp
 		Offset: 0, -12, 12
-		UseTilesetCode: true
 	idle:
 		ShadowStart: 3
 	damaged-idle:
@@ -661,67 +947,85 @@ gaspot:
 		Start: 2
 		ShadowStart: 5
 		Tick: 400
-	idle-lights-bright: gaspot_a
+	idle-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: gtspot_a.shp
+			SNOW: gaspot_a.shp
 		Length: 8
 		Tick: 200
 		IgnoreWorldTint: True
-	damaged-idle-lights-bright: gaspot_a
+	damaged-idle-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: gtspot_a.shp
+			SNOW: gaspot_a.shp
 		Start: 8
 		Length: 8
 		Tick: 200
 		IgnoreWorldTint: True
-	make: gaspotmk
+	make:
+		TilesetFilenames:
+			TEMPERATE: gtspotmk.shp
+			SNOW: gaspotmk.shp
 		Length: 14
 		ShadowStart: 14
-	emp-overlay: emp_fx01
+	emp-overlay:
+		Filename: emp_fx01.shp
+		TilesetFilenames:
 		Length: *
 		Offset: 0, 0
-		-DepthSprite:
-		UseTilesetCode: false
+		DepthSprite:
 		ZOffset: 512
 		BlendMode: Additive
 		IgnoreWorldTint: True
-	icon: spoticon
+	icon:
+		Filename: spoticon.shp
+		TilesetFilenames:
 		Offset: 0, 0
-		UseTilesetCode: false
-		-DepthSprite:
+		DepthSprite:

 galite:
 	Defaults:
 		DepthSprite: isodepth.shp
 		Offset: 0, -12, 12
-		UseTilesetCode: true
-	idle: gtlite
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtlite.shp
+			SNOW: galite.shp
 		ShadowStart: 2
-	damaged-idle: gtlite
+	damaged-idle:
+		TilesetFilenames:
+			TEMPERATE: gtlite.shp
+			SNOW: galite.shp
 		Start: 1
 		ShadowStart: 3
-	lighting: alphatst
+	lighting:
+		Filename: alphatst.shp
 		BlendMode: DoubleMultiplicative
-		UseTilesetCode: false
 		IgnoreWorldTint: true
-		-DepthSprite:
+		DepthSprite:
 		Offset: 0, 0, 240
 		ZRamp: 1
 		ZOffset: 10240
-	emp-overlay: emp_fx01
+	emp-overlay:
+		Filename: emp_fx01.shp
 		Length: *
 		Offset: 0, 0
-		-DepthSprite:
-		UseTilesetCode: false
+		DepthSprite:
 		ZOffset: 512
 		BlendMode: Additive
 		IgnoreWorldTint: True
-	icon: liteicon
+	icon:
+		Filename: liteicon.shp
 		Offset: 0, 0
-		-DepthSprite:
-		UseTilesetCode: false
+		DepthSprite:

 namntk:
 	Defaults:
+		TilesetFilenames:
+			TEMPERATE: ntmntk.shp
+			SNOW: namntk.shp
 		DepthSprite: isodepth.shp
 		DepthSpriteOffset: 24, 0
-		UseTilesetCode: true
 		Offset: 24, -24, 24
 	idle:
 		ShadowStart: 3
@@ -731,16 +1035,23 @@ namntk:
 	critical-idle:
 		Start: 2
 		ShadowStart: 5
-	idle-lights: namntk_a
+	idle-lights:
+		TilesetFilenames:
+			TEMPERATE: ntmntk_a.shp
+			SNOW: namntk_a.shp
 		Length: 8
 		Tick: 200
-	idle-lights-bright: namntk_a
+	idle-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: ntmntk_a.shp
+			SNOW: namntk_a.shp
 		Length: 8
 		Tick: 200
 		IgnoreWorldTint: True

 ntpyra:
 	Defaults:
+		Filename: ntpyra.shp
 		DepthSprite: isodepth.shp
 		Offset: 0, -42, 42
 	idle:
@@ -751,16 +1062,18 @@ ntpyra:
 	critical-idle:
 		Start: 2
 		ShadowStart: 5
-	idle-lights: ntpyra_a
+	idle-lights:
+		Filename: ntpyra_a.shp
 		Length: 16
 		Tick: 200
-	damaged-idle-lights: ntpyra_a
+	damaged-idle-lights:
+		Filename: ntpyra_a.shp
 		Start: 16
 		Length: 16
 		Tick: 200

 ufo:
-	idle: ufo.tem
+	idle:
+		Filename: ufo.tem
 		DepthSprite: isodepth.shp
 		Offset: -24, -60, 60
-		AddExtension: false
--- a/mods/ts/sequences/critters.yaml
+++ b/mods/ts/sequences/critters.yaml
@@ -1,5 +1,6 @@
 doggie:
 	Defaults:
+		Filename: doggie.shp
 		Tick: 80
 		Offset: 0, 0, 16
 	stand:
@@ -34,7 +35,8 @@ doggie:
 		Start: 99
 		Length: 10
 		ShadowStart: 218
-	die-exploding: s_bang34
+	die-exploding:
+		Filename: s_bang34.shp
 		Length: *
 	die-crushed:
 		Start: 105
@@ -54,6 +56,7 @@ doggie:

 vissml:
 	idle:
+		Filename: vissml.shp
 		Length: 90
 		ShadowStart: 90
 		Tick: 80
@@ -61,16 +64,19 @@ vissml:

 vislrg:
 	idle:
+		Filename: vislrg.shp
 		Length: 90
 		ShadowStart: 90
 		Tick: 80
 		Offset: 0, 0, 16
 	attack:
 		Combine:
-			vislgatk:
+			0:
+				Filename: vislgatk.shp
 				Start: 5
 				Length: 35
-			vislgatk:
+			1:
+				Filename: vislgatk.shp
 				Start: 0
 				Length: 5
 		Facings: -8
@@ -80,6 +86,8 @@ vislrg:
 #		ShadowStart: 40 # TODO: enable shadow frames

 floater:
+	Defaults:
+		Filename: floater.shp
 	idle:
 		Length: 16
 		ShadowStart: 32
--- a/mods/ts/sequences/infantry.yaml
+++ b/mods/ts/sequences/infantry.yaml
@@ -36,7 +36,8 @@
 		Start: 149
 		Length: 15
 		ShadowStart: 441
-	die-exploding: s_bang34
+	die-exploding:
+		Filename: s_bang34.shp
 		Length: *
 	die-crushed:
 		Start: 159
@@ -49,7 +50,8 @@
 		Length: 2
 		Facings: 8
 		ShadowStart: 552
-	die-melting: electro
+	die-melting:
+		Filename: electro.shp
 		Frames: 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 		Length: *

@@ -78,81 +80,125 @@
 e1.gdi:
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	Defaults: e1
-	icon: sidebar-gdi|e1icon
+	Defaults:
+		Filename: e1.shp
+	icon:
+		Filename: sidebar-gdi|e1icon.shp

 e1.nod:
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	Defaults: e1
-	icon: sidebar-nod|e1icon
+	Defaults:
+		Filename: e1.shp
+	icon:
+		Filename: sidebar-nod|e1icon.shp

 e2:
+	Defaults:
+		Filename: e2.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	icon: e2icon
+	icon:
+		Filename: e2icon.shp

 e3:
+	Defaults:
+		Filename: e3.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	icon: e4icon
+	icon:
+		Filename: e4icon.shp

 engineer.gdi:
 	Inherits: ^BasicInfantry
-	Defaults: engineer
-	icon: sidebar-gdi|engnicon
+	Defaults:
+		Filename: engineer.shp
+	icon:
+		Filename: sidebar-gdi|engnicon.shp

 engineer.nod:
 	Inherits: ^BasicInfantry
-	Defaults: engineer
-	icon: sidebar-nod|engnicon
+	Defaults:
+		Filename: engineer.shp
+	icon:
+		Filename: sidebar-nod|engnicon.shp

 umagon:
+	Defaults:
+		Filename: umagon.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	icon: umagicon
+	icon:
+		Filename: umagicon.shp

 ghost:
+	Defaults:
+		Filename: ghost.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	icon: gosticon
+	icon:
+		Filename: gosticon.shp

 mhijack:
+	Defaults:
+		Filename: mhijack.shp
 	Inherits: ^BasicInfantry
-	icon: chamicon
+	icon:
+		Filename: chamicon.shp

 chamspy:
+	Defaults:
+		Filename: chamspy.shp
 	Inherits: ^BasicInfantry
-	icon: chamicon
+	icon:
+		Filename: chamicon.shp

 mutant:
+	Defaults:
+		Filename: mutant.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	icon: mutcicon
+	icon:
+		Filename: mutcicon.shp

 mwmn:
+	Defaults:
+		Filename: mwmn.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	icon: mutcicon
+	icon:
+		Filename: mutcicon.shp

 mutant3:
+	Defaults:
+		Filename: mutant3.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack
-	icon: mutcicon
+	icon:
+		Filename: mutcicon.shp

 tratos:
+	Defaults:
+		Filename: tratos.shp
 	Inherits: ^BasicInfantry
-	icon: mutcicon
+	icon:
+		Filename: mutcicon.shp

 oxanna:
+	Defaults:
+		Filename: oxanna.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack

 slav:
+	Defaults:
+		Filename: slav.shp
 	Inherits: ^BasicInfantry
 	Inherits@attack: ^BasicInfantryAttack

 civ1:
+	Defaults:
+		Filename: civ1.shp
 	Inherits: ^BasicInfantry
 	attack:
 		Start: 164
@@ -175,6 +221,8 @@ civ1:
 		ShadowStart: 292

 civ2:
+	Defaults:
+		Filename: civ2.shp
 	Inherits: ^BasicInfantry
 	panic-run:
 		Start: 86
@@ -186,10 +234,13 @@ civ2:
 		ShadowStart: 292

 civ3:
+	Defaults:
+		Filename: civ3.shp
 	Inherits: civ1

 cyborg:
 	Defaults:
+		Filename: cyborg.shp
 		Tick: 80
 		Offset: 0, 0, 16
 	stand:
@@ -238,15 +289,18 @@ cyborg:
 		Length: 6
 		Facings: 8
 		IgnoreWorldTint: True
-	emp-overlay: emp_fx01
+	emp-overlay:
+		Filename: emp_fx01.shp
 		Length: *
 		ZOffset: 512
 		BlendMode: Additive
 		IgnoreWorldTint: True
-	icon: cybiicon
+	icon:
+		Filename: cybiicon.shp

 cyc2:
 	Defaults:
+		Filename: cyc2.shp
 		Offset: 0, 0, 16
 	stand:
 		Facings: 8
@@ -297,15 +351,18 @@ cyc2:
 		Facings: 8
 		ShadowStart: 568
 		IgnoreWorldTint: True
-	emp-overlay: emp_fx01
+	emp-overlay:
+		Filename: emp_fx01.shp
 		Length: *
 		ZOffset: 512
 		BlendMode: Additive
 		IgnoreWorldTint: True
-	icon: cybcicon
+	icon:
+		Filename: cybcicon.shp

 medic:
 	Defaults:
+		Filename: medic.shp
 		Tick: 80
 		Offset: 0, 0, 16
 	stand:
@@ -342,7 +399,8 @@ medic:
 		Start: 149
 		Length: 15
 		ShadowStart: 455
-	die-exploding: s_bang34
+	die-exploding:
+		Filename: s_bang34.shp
 		Length: *
 	die-crushed:
 		Start: 159
@@ -359,13 +417,16 @@ medic:
 		Start: 292
 		Length: 14
 		ShadowStart: 599
-	die-melting: electro
+	die-melting:
+		Filename: electro.shp
 		Frames: 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 		Length: *
-	icon: mediicon
+	icon:
+		Filename: mediicon.shp

 jumpjet:
 	Defaults:
+		Filename: jumpjet.shp
 		Tick: 80
 		Offset: 0, 0, 16
 	stand:
@@ -413,9 +474,11 @@ jumpjet:
 		Start: 445
 		Length: 6
 		ShadowStart: 896
-	die-splash: h2o_exp2
+	die-splash:
+		Filename: h2o_exp2.shp
 		Length: *
-	die-exploding: s_bang34
+	die-exploding:
+		Filename: s_bang34.shp
 		Length: *
 	die-crushed:
 		Start: 450
@@ -457,13 +520,16 @@ jumpjet:
 		Length: 2
 		Facings: 8
 		ShadowStart: 711
-	die-melting: electro
+	die-melting:
+		Filename: electro.shp
 		Frames: 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 		Length: *
-	icon: jjeticon
+	icon:
+		Filename: jjeticon.shp

 weedguy:
-	Defaults: weed
+	Defaults:
+		Filename: weed.shp
 		Tick: 80
 		Offset: 0, 0, 16
 	stand:
@@ -522,7 +588,8 @@ weedguy:
 		Start: 177
 		Length: 20
 		ShadowStart: 379
-	die-melting: electro
+	die-melting:
+		Filename: electro.shp
 		Frames: 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 		Length: *
 	die-crushed:
@@ -533,6 +600,7 @@ weedguy:

 flameguy:
 	Defaults:
+		Filename: flameguy.shp
 		Facings: 8
 		Tick: 80
 		ShadowStart: 148
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
--- a/mods/ts/sequences/trees.yaml
+++ b/mods/ts/sequences/trees.yaml
@@ -1,6 +1,5 @@
 ^tibtree:
 	Defaults:
-		UseTilesetExtension: true
 		Offset: 0, -12, 12
 	idle:
 		ShadowStart: 11
@@ -11,29 +10,43 @@
 		Tick: 160

 tibtre01:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: tibtre01.tem
+			SNOW: tibtre01.sno
 	Inherits: ^tibtree

 tibtre02:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: tibtre02.tem
+			SNOW: tibtre02.sno
 	Inherits: ^tibtree

 tibtre03:
+	Defaults:
+		TilesetFilenames:
+			TEMPERATE: tibtre03.tem
+			SNOW: tibtre03.sno
 	Inherits: ^tibtree

 bigblue:
 	Defaults:
 		Offset: 0, 0, 12
-	idle: bigblue2
+	idle:
+		Filename: bigblue2.shp
 		ShadowStart: 10
-	active: bigblue2
+	active:
+		Filename: bigblue2.shp
 		Start: 1
 		Length: 9
 		ShadowStart: 11
 		Tick: 160

 bigblue3:
-	Defaults: bigblue3.tem
+	Defaults:
+		Filename: bigblue3.tem
 		Offset: 0, -12, 12
-		AddExtension: false
 	idle:
 		ShadowStart: 10
 	active:
@@ -45,152 +58,267 @@ bigblue3:
 ^tree:
 	idle:
 		ShadowStart: 1
-		UseTilesetExtension: true
 		Offset: 0, -12, 12

 tree01:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree01.tem
+			SNOW: tree01.sno

 tree02:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree02.tem
+			SNOW: tree02.sno

 tree03:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree03.tem
+			SNOW: tree03.sno

 tree04:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree04.tem
+			SNOW: tree04.sno

 tree05:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree05.tem
+			SNOW: tree05.sno

 tree06:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree06.tem
+			SNOW: tree06.sno

 tree07:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree07.tem
+			SNOW: tree07.sno

 tree08:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree08.tem
+			SNOW: tree08.sno

 tree09:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree09.tem
+			SNOW: tree09.sno

 tree10:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree10.tem
+			SNOW: tree10.sno

 tree11:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree11.tem
+			SNOW: tree11.sno

 tree12:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree12.tem
+			SNOW: tree12.sno

 tree13:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree13.tem
+			SNOW: tree13.sno

 tree14:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree14.tem
+			SNOW: tree14.sno

 tree15:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree15.tem
+			SNOW: tree15.sno

 tree16:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree16.tem
+			SNOW: tree16.sno

 tree17:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree17.tem
+			SNOW: tree17.sno

 tree18:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree18.tem
+			SNOW: tree18.sno

 tree19:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree19.tem
+			SNOW: tree19.sno

 tree20:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree20.tem
+			SNOW: tree20.sno

 tree21:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree21.tem
+			SNOW: tree21.sno

 tree22:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree22.tem
+			SNOW: tree22.sno

 tree23:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree23.tem
+			SNOW: tree23.sno

 tree24:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree24.tem
+			SNOW: tree24.sno

 tree25:
 	Inherits: ^tree
+	idle:
+		TilesetFilenames:
+			TEMPERATE: tree25.tem
+			SNOW: tree25.sno

 ^fona:
 	Inherits: ^tree
 	idle:
-		AddExtension: false

 fona01:
 	Inherits: ^fona
-	Defaults: fona01.tem
+	idle:
+		Filename: fona01.tem

 fona02:
 	Inherits: ^fona
-	Defaults: fona02.tem
+	idle:
+		Filename: fona02.tem

 fona03:
 	Inherits: ^fona
-	Defaults: fona03.tem
+	idle:
+		Filename: fona03.tem

 fona04:
 	Inherits: ^fona
-	Defaults: fona04.tem
+	idle:
+		Filename: fona04.tem

 fona05:
 	Inherits: ^fona
-	Defaults: fona05.tem
+	idle:
+		Filename: fona05.tem

 fona06:
 	Inherits: ^fona
-	Defaults: fona06.tem
+	idle:
+		Filename: fona06.tem

 fona07:
 	Inherits: ^fona
-	Defaults: fona07.tem
+	idle:
+		Filename: fona07.tem

 fona08:
 	Inherits: ^fona
-	Defaults: fona08.tem
+	idle:
+		Filename: fona08.tem

 fona09:
 	Inherits: ^fona
-	Defaults: fona09.tem
+	idle:
+		Filename: fona09.tem

 fona10:
 	Inherits: ^fona
-	Defaults: fona10.tem
+	idle:
+		Filename: fona10.tem

 fona11:
 	Inherits: ^fona
-	Defaults: fona11.tem
+	idle:
+		Filename: fona11.tem

 fona12:
 	Inherits: ^fona
-	Defaults: fona12.tem
+	idle:
+		Filename: fona12.tem

 fona13:
 	Inherits: ^fona
-	Defaults: fona13.tem
+	idle:
+		Filename: fona13.tem

 fona14:
 	Inherits: ^fona
-	Defaults: fona14.tem
+	idle:
+		Filename: fona14.tem

 fona15:
 	Inherits: ^fona
-	Defaults: fona15.tem
+	idle:
+		Filename: fona15.tem

 veinhole:
 	idle:
+		TilesetFilenames:
+			TEMPERATE: veinhole.tem
+			SNOW: veinhole.sno
 		ShadowStart: 1
-		UseTilesetExtension: true
 		Offset: 0, -36, 1
 		ZRamp: 1
--- a/mods/ts/sequences/vehicles.yaml
+++ b/mods/ts/sequences/vehicles.yaml
@@ -1,5 +1,6 @@
 ^VehicleOverlays:
-	emp-overlay: emp_fx01
+	emp-overlay:
+		Filename: emp_fx01.shp
 		Offset: 0, 0, 24
 		Length: *
 		BlendMode: Additive
@@ -7,118 +8,149 @@

 mcv.gdi:
 	Inherits: ^VehicleOverlays
-	icon: sidebar-gdi|mcvicon
+	icon:
+		Filename: sidebar-gdi|mcvicon.shp

 mcv.nod:
 	Inherits: ^VehicleOverlays
-	icon: sidebar-nod|mcvicon
+	icon:
+		Filename: sidebar-nod|mcvicon.shp

 apc:
 	Inherits: ^VehicleOverlays
-	icon: apcicon
+	icon:
+		Filename: apcicon.shp

 harv.gdi:
 	Inherits: ^VehicleOverlays
-	harvest: harvestr
+	harvest:
+		Filename: harvestr.shp
 		Length: *
 		ZRamp: 1
 		Offset: 0, 0, 1
-	icon: sidebar-gdi|harvicon
+	icon:
+		Filename: sidebar-gdi|harvicon.shp

 harv.nod:
 	Inherits: ^VehicleOverlays
-	harvest: harvestr
+	harvest:
+		Filename: harvestr.shp
 		Length: *
 		ZRamp: 1
 		Offset: 0, 0, 1
-	icon: sidebar-nod|harvicon
+	icon:
+		Filename: sidebar-nod|harvicon.shp

 hvr:
 	Inherits: ^VehicleOverlays
-	icon: hovricon
+	icon:
+		Filename: hovricon.shp

 4tnk:
 	Inherits: ^VehicleOverlays
-	muzzle: gunfire
+	muzzle:
+		Filename: gunfire.shp
 		Length: *
 		IgnoreWorldTint: True

 lpst.gdi:
 	Inherits: ^VehicleOverlays
-	idle: gadpsa
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtdpsa.shp
+			SNOW: gadpsa.shp
 		DepthSprite: isodepth.shp
 		DepthSpriteOffset: -6, -6
 		Offset: 0, -13, 12
-		UseTilesetCode: true
 		ShadowStart: 3
-	make: gadpsamk
+	make:
+		TilesetFilenames:
+			TEMPERATE: gtdpsamk.shp
+			SNOW: gadpsamk.shp
 		DepthSprite: isodepth.shp
 		DepthSpriteOffset: -6, -6
 		Offset: 0, -13, 12
-		UseTilesetCode: true
 		Length: 36
 		ShadowStart: 36
-	idle-lights: gadpsa_a
+	idle-lights:
+		TilesetFilenames:
+			TEMPERATE: gtdpsa_a.shp
+			SNOW: gadpsa_a.shp
 		DepthSprite: isodepth.shp
 		DepthSpriteOffset: -6, -6
 		Offset: 0, -13, 12
-		UseTilesetCode: true
 		Length: 10
 		Tick: 200
-	idle-lights-bright: gadpsa_a
+	idle-lights-bright:
+		TilesetFilenames:
+			TEMPERATE: gtdpsa_a.shp
+			SNOW: gadpsa_a.shp
 		DepthSprite: isodepth.shp
 		DepthSpriteOffset: -6, -6
 		Offset: 0, -13, 12
-		UseTilesetCode: true
 		Length: 10
 		Tick: 200
 		IgnoreWorldTint: True
-	icon: sidebar-gdi|lpsticon
+	icon:
+		Filename: sidebar-gdi|lpsticon.shp

 lpst.nod:
 	Inherits: lpst.gdi
-	icon: sidebar-nod|lpsticon
+	icon:
+		Filename: sidebar-nod|lpsticon.shp

 repair:
 	Inherits: ^VehicleOverlays
-	icon: rboticon
+	icon:
+		Filename: rboticon.shp

 art2:
 	Inherits: ^VehicleOverlays
-	icon: artyicon
-	idle: gaarty
+	icon:
+		Filename: artyicon.shp
+	idle:
+		TilesetFilenames:
+			TEMPERATE: gtarty.shp
+			SNOW: gaarty.shp
 		ShadowStart: 3
 		Offset: 0, -12, 12
-		UseTilesetCode: true
 		DepthSprite: isodepth.shp
-	damaged-idle: gaarty
+	damaged-idle:
+		TilesetFilenames:
+			TEMPERATE: gtarty.shp
+			SNOW: gaarty.shp
 		Start: 1
 		ShadowStart: 4
 		Offset: 0, -12, 12
-		UseTilesetCode: true
 		DepthSprite: isodepth.shp
-	make: gaartymk
+	make:
+		TilesetFilenames:
+			TEMPERATE: gtartymk.shp
+			SNOW: gaartymk.shp
 		Length: 16
 		ShadowStart: 16
 		Offset: 0, -12, 12
-		UseTilesetCode: true
 		DepthSprite: isodepth.shp
-	muzzle: gunfire
+	muzzle:
+		Filename: gunfire.shp
 		Length: *
 		Offset: 0, 0, 24
 		IgnoreWorldTint: True

 weed:
 	Inherits: ^VehicleOverlays
-	icon: weedicon
+	icon:
+		Filename: weedicon.shp

 hmec:
 	Inherits: ^VehicleOverlays
-	icon: hmecicon
+	icon:
+		Filename: hmecicon.shp

 bike:
 	Inherits: ^VehicleOverlays
-	icon: cyclicon
+	icon:
+		Filename: cyclicon.shp

 bggy:
 	Inherits: ^VehicleOverlays
@@ -126,64 +158,84 @@ bggy:
 		Offset: 0, 0, 24
 	muzzle:
 		Combine:
-			mgun-n:
+			0:
+				Filename: mgun-n.shp
 				Length: 6
-			mgun-nw:
+			1:
+				Filename: mgun-nw.shp
 				Length: 6
-			mgun-w:
+			2:
+				Filename: mgun-w.shp
 				Length: 6
-			mgun-sw:
+			3:
+				Filename: mgun-sw.shp
 				Length: 6
-			mgun-s:
+			4:
+				Filename: mgun-s.shp
 				Length: 6
-			mgun-se:
+			5:
+				Filename: mgun-se.shp
 				Length: 6
-			mgun-e:
+			6:
+				Filename: mgun-e.shp
 				Length: 6
-			mgun-ne:
+			7:
+				Filename: mgun-ne.shp
 				Length: 6
 		Facings: 8
 		Length: 6
 		IgnoreWorldTint: True
-	icon: bggyicon
+	icon:
+		Filename: bggyicon.shp
 		Offset: 0, 0

 sapc:
 	Inherits: ^VehicleOverlays
-	icon: sapcicon
+	icon:
+		Filename: sapcicon.shp

 subtank:
 	Inherits: ^VehicleOverlays
-	icon: subticon
+	icon:
+		Filename: subticon.shp

 sonic:
 	Inherits: ^VehicleOverlays
-	icon: soniicon
+	icon:
+		Filename: soniicon.shp

 ttnk:
 	Inherits: ^VehicleOverlays
-	idle: gatick
+	idle:
+		Filename: gatick.shp
 		ShadowStart: 3
 		Offset: 0, -14, 14
-	damaged-idle: gatick
+	damaged-idle:
+		Filename: gatick.shp
 		Start: 1
 		ShadowStart: 4
 		Offset: 0, -14, 14
-	make: gatickmk
+	make:
+		Filename: gatickmk.shp
 		Length: 24
 		ShadowStart: 24
 		Offset: 0, -14, 14
-	muzzle: gunfire
+	muzzle:
+		Filename: gunfire.shp
 		Length: *
 		Offset: 0, 0, 24
 		IgnoreWorldTint: True
-	icon: tickicon
+	icon:
+		Filename: tickicon.shp

 stnk:
 	Inherits: ^VehicleOverlays
-	icon: stnkicon
+	icon:
+		Filename: stnkicon.shp

 mmch:
+	Defaults:
+		Filename: mmch.shp
 	Inherits: ^VehicleOverlays
 	stand:
 		Facings: -8
@@ -200,41 +252,51 @@ mmch:
 		Start: 120
 		Facings: -32
 		Offset: 0, 0, 12
-	muzzle: gunfire
+	muzzle:
+		Filename: gunfire.shp
 		Length: *
 		Offset: 0, 0, 12
 		IgnoreWorldTint: True
-	icon: mmchicon
+	icon:
+		Filename: mmchicon.shp

 jugg:
 	Inherits: ^VehicleOverlays
-	icon: juggicon
-	stand: jugger
+	icon:
+		Filename: juggicon.shp
+	stand:
+		Filename: jugger.shp
 		Facings: -8
 		Stride: 15
 		ShadowStart: 120
 		Offset: 0, 0, 12
-	walk: jugger
+	walk:
+		Filename: jugger.shp
 		Length: 15
 		Facings: -8
 		ShadowStart: 120
 		Offset: 0, 0, 12
 		Tick: 60
-	turret: djugg_a
+	turret:
+		Filename: djugg_a.shp
 		Facings: 32
 		Offset: -4, 0, 12
-	idle: djugg
+	idle:
+		Filename: djugg.shp
 		ShadowStart: 3
 		Offset: 0, -12, 12
-	damaged-idle: djugg
+	damaged-idle:
+		Filename: djugg.shp
 		Start: 1
 		ShadowStart: 4
 		Offset: 0, -12, 12
-	make: djuggmk
+	make:
+		Filename: djuggmk.shp
 		Length: 18
 		ShadowStart: 18
 		Offset: 0, -12, 12
-	muzzle: gunfire
+	muzzle:
+		Filename: gunfire.shp
 		Length: *
 		Offset: 0, 0, 24
 		IgnoreWorldTint: True
@@ -242,6 +304,7 @@ jugg:
 gghunt:
 	Inherits: ^VehicleOverlays
 	idle:
+		Filename: gghunt.shp
 		Facings: 1
 		Length: 8
 		ShadowStart: 8
@@ -249,6 +312,7 @@ gghunt:
 smech:
 	Inherits: ^VehicleOverlays
 	Defaults:
+		Filename: smech.shp
 		Offset: 0,0,8
 	stand:
 		Start: 96
@@ -271,7 +335,8 @@ smech:
 		Facings: -8
 		Tick: 80
 		IgnoreWorldTint: True
-	icon: smchicon
+	icon:
+		Filename: smchicon.shp

 trucka:
 	Inherits: ^VehicleOverlays