diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 205850522a..35a05c416a 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -201,4 +201,9 @@ SupportsMapsFrom: ra SpriteFormats: ShpTD, TmpRA, TmpTD, ShpTS -SpriteSequenceFormat: DefaultSpriteSequence +SpriteSequenceFormat: TilesetSpecificSpriteSequence + TilesetExtensions: + TEMPERAT: .tem + SNOW: .sno + INTERIOR: .int + DESERT: .des diff --git a/mods/ra/sequences/decorations.yaml b/mods/ra/sequences/decorations.yaml index adc6107e6c..50ef965629 100644 --- a/mods/ra/sequences/decorations.yaml +++ b/mods/ra/sequences/decorations.yaml @@ -1,4 +1,10 @@ tc04: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 0 damaged-idle: @@ -9,6 +15,11 @@ tc04: Tick: 80 tc05: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -19,6 +30,11 @@ tc05: Tick: 80 tc03: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -29,6 +45,11 @@ tc03: Tick: 80 tc02: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -39,6 +60,11 @@ tc02: Tick: 80 tc01: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -49,6 +75,11 @@ tc01: Tick: 80 t17: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -59,6 +90,11 @@ t17: Tick: 80 t16: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -69,6 +105,11 @@ t16: Tick: 80 t15: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -79,6 +120,11 @@ t15: Tick: 80 t14: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -89,6 +135,11 @@ t14: Tick: 80 t13: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -99,6 +150,11 @@ t13: Tick: 80 t12: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -109,6 +165,11 @@ t12: Tick: 80 t11: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -119,6 +180,11 @@ t11: Tick: 80 t10: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -129,6 +195,11 @@ t10: Tick: 80 t08: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -139,6 +210,11 @@ t08: Tick: 80 t07: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -149,6 +225,11 @@ t07: Tick: 80 t06: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -159,6 +240,11 @@ t06: Tick: 80 t05: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -169,6 +255,11 @@ t05: Tick: 80 t03: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -179,31 +270,41 @@ t03: Tick: 80 ice01: - idle: + idle: ice01.sno Start: 0 Length: * + AddExtension: false ice02: - idle: + idle: ice02.sno Start: 0 Length: * + AddExtension: false ice03: - idle: + idle: ice03.sno Start: 0 Length: * + AddExtension: false ice04: - idle: + idle: ice04.sno Start: 0 Length: * + AddExtension: false ice05: - idle: + idle: ice05.sno Start: 0 Length: * + AddExtension: false t02: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -214,6 +315,11 @@ t02: Tick: 80 t01: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -224,24 +330,44 @@ t01: Tick: 80 v01: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v02: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v03: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v04: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -252,60 +378,110 @@ v04: Start: 3 v05: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 2 v06: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v07: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 2 v08: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v09: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v10: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v11: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v12: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v13: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: Start: 1 v14: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 ZOffset: -512 @@ -314,6 +490,11 @@ v14: ZOffset: -512 v15: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 ZOffset: -512 @@ -322,6 +503,11 @@ v15: ZOffset: -512 v16: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 ZOffset: -512 @@ -330,6 +516,11 @@ v16: ZOffset: -512 v17: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 ZOffset: -512 @@ -338,6 +529,11 @@ v17: ZOffset: -512 v18: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: Start: 0 ZOffset: -512 @@ -346,10 +542,12 @@ v18: ZOffset: -512 rice: - idle: + Defaults: + AddExtension: false + idle: rice.tem Start: 0 ZOffset: -512 - damaged-idle: + damaged-idle: rice.tem Start: 1 ZOffset: -512 @@ -449,211 +647,239 @@ brl3: # Interior Terrain boxes01: - idle: + idle: boxes01.int Start: 0 Length: * + AddExtension: false boxes02: - idle: + idle: boxes02.int Start: 0 Length: * + AddExtension: false boxes03: - idle: + idle: boxes03.int Start: 0 Length: * + AddExtension: false boxes04: - idle: + idle: boxes04.int Start: 0 Length: * + AddExtension: false boxes05: - idle: + idle: boxes05.int Start: 0 Length: * + AddExtension: false boxes06: - idle: + idle: boxes06.int Start: 0 Length: * + AddExtension: false boxes07: - idle: + idle: boxes07.int Start: 0 Length: * + AddExtension: false boxes08: - idle: + idle: boxes08.int Start: 0 Length: * + AddExtension: false boxes09: - idle: + idle: boxes09.int Start: 0 Length: * + AddExtension: false -#Desert Terrain Expansion +# Desert Terrain Expansion rock1: - idle: - Start: 0 + idle: rock1.des + AddExtension: false rock2: - idle: - Start: 0 + idle: rock2.des + AddExtension: false rock3: - idle: - Start: 0 + idle: rock3.des + AddExtension: false rock4: - idle: - Start: 0 + idle: rock4.des + AddExtension: false rock5: - idle: - Start: 0 + idle: rock5.des + AddExtension: false rock6: - idle: - Start: 0 + idle: rock6.des + AddExtension: false rock7: - idle: - Start: 0 + idle: rock7.des + AddExtension: false t04: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: t04.des + damaged-idle: t04.des Start: 1 - dead: + dead: t04.des Start: 2 Length: 8 Tick: 80 v20: - idle: - Start: 0 + Defaults: + AddExtension: false + idle: v20.des Length: 3 Tick: 120 - damaged-idle: + damaged-idle: v20.des Start: 3 Length: 3 Tick: 120 v21: - idle: - Start: 0 + Defaults: + AddExtension: false + idle: v21.des Length: 3 Tick: 120 - damaged-idle: + damaged-idle: v21.des Start: 3 Length: 3 Tick: 120 v22: - idle: - Start: 0 + Defaults: + AddExtension: false + idle: v22.des Length: 3 Tick: 120 - damaged-idle: + damaged-idle: v22.des Start: 3 Length: 3 Tick: 120 v23: - idle: - Start: 0 + Defaults: + AddExtension: false + idle: v23.des Length: 3 Tick: 120 - damaged-idle: + damaged-idle: v23.des Start: 3 Length: 3 Tick: 120 v24: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v24.des + damaged-idle: v24.des Start: 1 v25: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v25.des + damaged-idle: v25.des Start: 1 v26: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v26.des + damaged-idle: v26.des Start: 1 v27: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v27.des + damaged-idle: v27.des Start: 1 v28: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v28.des + damaged-idle: v28.des Start: 1 v29: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v29.des + damaged-idle: v29.des Start: 1 v30: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v30.des + damaged-idle: v30.des Start: 2 v31: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v31.des + damaged-idle: v31.des Start: 1 v32: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v32.des + damaged-idle: v32.des Start: 1 v33: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v33.des + damaged-idle: v33.des Start: 1 v34: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v34.des + damaged-idle: v34.des Start: 1 v35: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v35.des + damaged-idle: v35.des Start: 1 v36: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v36.des + damaged-idle: v36.des Start: 1 v37: - idle: - Start: 0 - damaged-idle: + Defaults: + AddExtension: false + idle: v37.des + damaged-idle: v37.des Start: 1 snowhut: diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index 99c8b450a8..f3663708a2 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -60,11 +60,19 @@ e1: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT garrison-muzzle: minigun Start: 0 Length: 6 @@ -133,11 +141,19 @@ sniper: Length: 18 die6: electro Start: 0 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT garrison-muzzle: minigun Start: 0 Length: 3 @@ -188,11 +204,19 @@ e3: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 144 Length: 4 @@ -247,11 +271,19 @@ e6: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 82 Length: 4 @@ -310,11 +342,19 @@ medi: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 130 Length: 4 @@ -373,11 +413,19 @@ mech: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 130 Length: 4 @@ -432,11 +480,19 @@ e2: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 240 Length: 4 @@ -496,6 +552,10 @@ dog: Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT shoot: dogbullt Start: 0 Length: 4 @@ -545,11 +605,19 @@ spy: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 144 Length: 4 @@ -596,11 +664,19 @@ thf: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT crawl: Start: 72 Length: 4 @@ -638,11 +714,19 @@ hijacker: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT crawl: thf Start: 72 Length: 4 @@ -692,11 +776,19 @@ e7: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 128 Length: 4 @@ -760,11 +852,19 @@ e4: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT prone-stand: Start: 208 Length: 4 @@ -835,11 +935,19 @@ gnrl: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT shok: stand: @@ -903,11 +1011,19 @@ shok: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT icon: shokicon Start: 0 @@ -948,11 +1064,19 @@ c1: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT run: Start: 56 Length: 6 @@ -996,11 +1120,19 @@ c2: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT run: Start: 56 Length: 6 @@ -1044,11 +1176,19 @@ c3: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT run: Start: 56 Length: 6 @@ -1093,11 +1233,19 @@ einstein: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT delphi: stand: @@ -1137,11 +1285,19 @@ delphi: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT chan: stand: @@ -1181,11 +1337,19 @@ chan: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT zombie: stand: @@ -1224,11 +1388,19 @@ zombie: die6: electro Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT icon: zombicon Start: 0 diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index e0dbb80170..cb9f79198b 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -76,6 +76,10 @@ explosion: Start: 0 Length: 6 Tick: 1600 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT pips: groups: @@ -206,7 +210,9 @@ moveflsh: Start: 0 Length: * Tick: 80 - + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT select: repair: Start: 2 @@ -583,22 +589,20 @@ overlay: Start: 1 resources: + Defaults: + Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT + DESERT: TEMPERAT gold01: gold01 - Length: * gold02: gold02 - Length: * gold03: gold03 - Length: * gold04: gold04 - Length: * gem01: gem01 - Length: * gem02: gem02 - Length: * gem03: gem03 - Length: * gem04: gem04 - Length: * shroud: shroud: shadow @@ -607,32 +611,30 @@ shroud: # Note: The order of smudges and craters determines # the index that is mapped to them in maps scorches: + Defaults: + Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT sc1: sc1 - Length: * sc2: sc2 - Length: * sc3: sc3 - Length: * sc4: sc4 - Length: * sc5: sc5 - Length: * sc6: sc6 - Length: * craters: + Defaults: + Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT cr1: cr1 - Length: * cr2: cr2 - Length: * cr3: cr3 - Length: * cr4: cr4 - Length: * cr5: cr5 - Length: * cr6: cr6 - Length: * mine: idle: @@ -643,11 +645,17 @@ gmine: idle: Start: 0 ZOffset: -512 + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT railmine: idle: Start: 0 ZOffset: -512 + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT ctflag: idle: @@ -658,3 +666,4 @@ ctflag: bib: mbGAP Start: 0 Length: * + UseTilesetExtension: true diff --git a/mods/ra/sequences/structures.yaml b/mods/ra/sequences/structures.yaml index e27f55c7b0..2b6dac1819 100644 --- a/mods/ra/sequences/structures.yaml +++ b/mods/ra/sequences/structures.yaml @@ -9,6 +9,9 @@ fcom: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT hosp: idle: @@ -27,6 +30,7 @@ hosp: Start: 0 Length: * Offset: 0,1 + UseTilesetExtension: true icon: hospicon Start: 0 @@ -53,6 +57,10 @@ oilb: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT + fact: idle: Start: 0 @@ -73,6 +81,9 @@ fact: bib: bib2 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: facticon Start: 0 fake-icon: facficon @@ -100,6 +111,9 @@ proc: bib: bib2 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: procicon Start: 0 @@ -119,6 +133,7 @@ silo: bib: mbSILO Start: 0 Length: * + UseTilesetExtension: true icon: siloicon Start: 0 @@ -136,6 +151,9 @@ powr: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: powricon Start: 0 @@ -153,6 +171,9 @@ apwr: bib: bib2 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: apwricon Start: 0 @@ -169,6 +190,9 @@ barr: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: barricon Start: 0 @@ -185,6 +209,9 @@ tent: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: tenticon Start: 0 @@ -199,6 +226,7 @@ kenn: bib: mbSILO Start: 0 Length: * + UseTilesetExtension: true icon: kennicon Start: 0 @@ -213,6 +241,9 @@ dome: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: domeicon Start: 0 fake-icon: domficon @@ -233,6 +264,9 @@ atek: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: atekicon Start: 0 fake-icon: ateficon @@ -249,6 +283,9 @@ stek: bib: bib2 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: stekicon Start: 0 @@ -273,6 +310,9 @@ weap: bib: bib2 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: weapicon Start: 0 fake-icon: weaficon @@ -299,6 +339,9 @@ hpad: bib: bib3 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: hpadicon Start: 0 @@ -383,6 +426,7 @@ fix: Length: * ZOffset: -1c511 Offset: 0,-4 + UseTilesetExtension: true icon: fixicon Start: 0 @@ -409,6 +453,7 @@ gun: Start: 0 Length: * Offset: -1,-1 + UseTilesetExtension: true icon: gunicon Start: 0 @@ -440,6 +485,7 @@ agun: bib: mbAGUN Start: 0 Length: * + UseTilesetExtension: true icon: agunicon Start: 0 @@ -465,6 +511,7 @@ sam: Start: 0 Length: * Offset: 0,1 + UseTilesetExtension: true icon: samicon Start: 0 @@ -482,6 +529,7 @@ ftur: bib: mbFTUR Start: 0 Length: * + UseTilesetExtension: true icon: fturicon Start: 0 @@ -509,6 +557,7 @@ tsla: bib: mbTSLA Start: 0 Length: * + UseTilesetExtension: true icon: tslaicon Start: 0 @@ -528,10 +577,15 @@ pbox: Start: 0 Length: * Offset: 0,-2 + UseTilesetExtension: true icon: pboxicon Start: 0 hbox: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT damaged-idle: Start: 2 idle: @@ -543,8 +597,10 @@ hbox: Start: 0 Length: 6 Facings: 8 + UseTilesetExtension: false icon: hboxicon Start: 0 + UseTilesetExtension: false gap: idle: @@ -562,6 +618,7 @@ gap: bib: mbGAP Start: 0 Length: * + UseTilesetExtension: true icon: gapicon Start: 0 @@ -588,6 +645,7 @@ iron: Start: 0 Length: * Offset: 0,2 + UseTilesetExtension: true icon: ironicon Start: 0 @@ -609,12 +667,17 @@ pdox: Start: 0 Length: * Offset: 0,-4 + UseTilesetExtension: true icon: pdoxicon Start: 0 fake-icon: pdoficon Start: 0 mslo: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT idle: Start: 0 damaged-idle: @@ -631,8 +694,10 @@ mslo: Length: 7 icon: msloicon2 Start: 0 + UseTilesetExtension: false fake-icon: mslficon Start: 0 + UseTilesetExtension: false miss: idle: @@ -648,6 +713,9 @@ miss: bib: bib2 Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT brik: idle: diff --git a/mods/ra/tilesets/desert.yaml b/mods/ra/tilesets/desert.yaml index 1d8abaf065..6280c67094 100644 --- a/mods/ra/tilesets/desert.yaml +++ b/mods/ra/tilesets/desert.yaml @@ -3,7 +3,7 @@ General: Id: DESERT Palette: desert.pal PlayerPalette: temperat.pal - Extensions: .des, .tem, .shp + Extensions: # Obsolete WaterPaletteRotationBase: 32 EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge diff --git a/mods/ra/tilesets/interior.yaml b/mods/ra/tilesets/interior.yaml index c17fe0d70d..d46063d90c 100644 --- a/mods/ra/tilesets/interior.yaml +++ b/mods/ra/tilesets/interior.yaml @@ -2,7 +2,7 @@ General: Name: Interior Id: INTERIOR Palette: interior.pal - Extensions: .int, .shp, .tem + Extensions: # Obsolete EditorTemplateOrder: Floor, Wall Terrain: diff --git a/mods/ra/tilesets/snow.yaml b/mods/ra/tilesets/snow.yaml index 626530e6dc..93bfd29005 100644 --- a/mods/ra/tilesets/snow.yaml +++ b/mods/ra/tilesets/snow.yaml @@ -2,7 +2,7 @@ General: Name: Snow Id: SNOW Palette: snow.pal - Extensions: .sno, .shp, .tem + Extensions: # Obsolete EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge Terrain: diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index d450d2605b..7a03f50db8 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -2,7 +2,7 @@ General: Name: Temperate Id: TEMPERAT Palette: temperat.pal - Extensions: .tem, .shp + Extensions: # Obsolete EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge Terrain: