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/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 47b9c78a35..75f390dcd6 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -471,11 +471,11 @@ TargetableBuilding: TargetTypes: Ground, DetonateAttack RenderBuildingWall: - Palette: terrain + Palette: effect GivesExperience: EditorAppearance: RelativeToTopLeft: true - UseTerrainPalette: true + UseTerrainPalette: false AutoTargetIgnore: ProximityCaptor: Types: Wall diff --git a/mods/ra/sequences/aircraft.yaml b/mods/ra/sequences/aircraft.yaml index ce76b19b33..12bda8f73b 100644 --- a/mods/ra/sequences/aircraft.yaml +++ b/mods/ra/sequences/aircraft.yaml @@ -1,60 +1,45 @@ mig: idle: - Start: 0 Facings: 16 icon: migicon - Start: 0 yak: idle: - Start: 0 Facings: 16 muzzle: minigun - Start: 0 Length: 6 Facings: 8 icon: yakicon - Start: 0 heli: idle: - Start: 0 Facings: 32 rotor: lrotor - Start: 0 Length: 4 slow-rotor: lrotor Start: 4 Length: 8 icon: heliicon - Start: 0 hind: idle: - Start: 0 Facings: 32 rotor: lrotorlg - Start: 0 Length: 4 slow-rotor: lrotorlg Start: 4 Length: 8 muzzle: minigun - Start: 0 Length: 6 Facings: 8 icon: hindicon - Start: 0 tran: idle: tran2 - Start: 0 Facings: 32 rotor: lrotor - Start: 0 Length: 4 rotor2: rrotor - Start: 0 Length: 4 slow-rotor: lrotor Start: 4 @@ -68,24 +53,17 @@ tran: unload: tran2 Start: 35 icon: tranicon - Start: 0 tran1husk: idle: - Start: 0 - Length: * tran2husk: idle: - Start: 0 - Length: * u2: idle: - Start: 0 Facings: 16 badr: idle: - Start: 0 Facings: 16 diff --git a/mods/ra/sequences/decorations.yaml b/mods/ra/sequences/decorations.yaml index adc6107e6c..6b9d2438c5 100644 --- a/mods/ra/sequences/decorations.yaml +++ b/mods/ra/sequences/decorations.yaml @@ -1,6 +1,10 @@ tc04: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -9,8 +13,12 @@ tc04: Tick: 80 tc05: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -19,8 +27,12 @@ tc05: Tick: 80 tc03: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -29,8 +41,12 @@ tc03: Tick: 80 tc02: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -39,8 +55,11 @@ tc02: Tick: 80 tc01: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -49,8 +68,12 @@ tc01: Tick: 80 t17: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -59,8 +82,12 @@ t17: Tick: 80 t16: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -69,8 +96,12 @@ t16: Tick: 80 t15: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -79,8 +110,12 @@ t15: Tick: 80 t14: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -89,8 +124,12 @@ t14: Tick: 80 t13: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -99,8 +138,12 @@ t13: Tick: 80 t12: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -109,8 +152,12 @@ t12: Tick: 80 t11: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -119,8 +166,12 @@ t11: Tick: 80 t10: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -129,8 +180,11 @@ t10: Tick: 80 t08: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -139,8 +193,12 @@ t08: Tick: 80 t07: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -149,8 +207,12 @@ t07: Tick: 80 t06: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -159,8 +221,12 @@ t06: Tick: 80 t05: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -169,8 +235,12 @@ t05: Tick: 80 t03: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -179,33 +249,37 @@ t03: Tick: 80 ice01: - idle: - Start: 0 + idle: ice01.sno Length: * + AddExtension: false ice02: - idle: - Start: 0 + idle: ice02.sno Length: * + AddExtension: false ice03: - idle: - Start: 0 + idle: ice03.sno Length: * + AddExtension: false ice04: - idle: - Start: 0 + idle: ice04.sno Length: * + AddExtension: false ice05: - idle: - Start: 0 + idle: ice05.sno Length: * + AddExtension: false t02: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -214,8 +288,12 @@ t02: Tick: 80 t01: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -224,26 +302,42 @@ 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: Start: 2 active: @@ -252,117 +346,172 @@ 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 damaged-idle: Start: 1 ZOffset: -512 v15: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 ZOffset: -512 damaged-idle: Start: 1 ZOffset: -512 v16: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 ZOffset: -512 damaged-idle: Start: 1 ZOffset: -512 v17: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 ZOffset: -512 damaged-idle: Start: 1 ZOffset: -512 v18: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT idle: - Start: 0 ZOffset: -512 damaged-idle: Start: 1 ZOffset: -512 rice: - idle: - Start: 0 + Defaults: + AddExtension: false + idle: rice.tem ZOffset: -512 - damaged-idle: + damaged-idle: rice.tem Start: 1 ZOffset: -512 v19: idle: - Start: 0 Length: 14 v19.husk: idle: v19 Start: 28 fire-start: flmspt - Start: 0 Length: * Offset: 7,-15 fire-loop: flmspt @@ -372,7 +521,6 @@ v19.husk: utilpol1: idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -380,7 +528,6 @@ utilpol1: utilpol2: idle: - Start: 0 damaged-idle: Start: 1 dead: @@ -388,42 +535,31 @@ utilpol2: ammobox1: idle: - Start: 0 - Length: 1 ammobox2: idle: - Start: 0 - Length: 1 ammobox3: idle: - Start: 0 - Length: 1 tanktrap1: idle: - Start: 0 tanktrap2: idle: - Start: 0 rushouse: idle: - Start: 0 damaged-idle: Start: 1 asianhut: idle: - Start: 0 damaged-idle: Start: 1 barb: idle: - Start: 0 Length: 16 damaged-idle: Start: 16 @@ -431,7 +567,6 @@ barb: wood: idle: - Start: 0 Length: 16 damaged-idle: Start: 16 @@ -439,229 +574,233 @@ wood: barl: idle: - Start: 0 - Length: * brl3: idle: - Start: 0 - Length: * # Interior Terrain boxes01: - idle: - Start: 0 - Length: * + idle: boxes01.int + AddExtension: false boxes02: - idle: - Start: 0 - Length: * + idle: boxes02.int + AddExtension: false boxes03: - idle: - Start: 0 - Length: * + idle: boxes03.int + AddExtension: false boxes04: - idle: - Start: 0 - Length: * + idle: boxes04.int + AddExtension: false boxes05: - idle: - Start: 0 - Length: * + idle: boxes05.int + AddExtension: false boxes06: - idle: - Start: 0 - Length: * + idle: boxes06.int + AddExtension: false boxes07: - idle: - Start: 0 - Length: * + idle: boxes07.int + AddExtension: false boxes08: - idle: - Start: 0 - Length: * + idle: boxes08.int + AddExtension: false boxes09: - idle: - Start: 0 - Length: * + idle: boxes09.int + 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: idle: - Start: 0 Length: 3 Tick: 360 damaged-idle: Start: 3 - Length: 1 Tick: 120 \ No newline at end of file diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index 99c8b450a8..ed8a7e586b 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -1,6 +1,5 @@ e1: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -58,23 +57,26 @@ e1: Start: 324 Length: 18 die6: electro - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT die-crushed: corpse1 - Start: 0 - Length: 6 + Length: * Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT garrison-muzzle: minigun - Start: 0 Length: 6 Facings: 8 icon: e1icon - Start: 0 sniper: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -132,23 +134,27 @@ sniper: Start: 452 Length: 18 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: 3 Stride: 6 Facings: 8 icon: snipericon - Start: 0 e3: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -186,13 +192,19 @@ e3: Start: 340 Length: 18 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 @@ -207,11 +219,9 @@ e3: Length: 10 Facings: 8 icon: e3icon - Start: 0 e6: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -245,13 +255,19 @@ e6: Start: 182 Length: 18 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 @@ -262,14 +278,11 @@ e6: Facings: 8 Tick: 100 icon: e6icon - Start: 0 medi: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 run: Start: 8 @@ -308,13 +321,19 @@ medi: Start: 229 Length: 18 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 @@ -325,14 +344,11 @@ medi: Facings: 8 Tick: 100 icon: mediicon - Start: 0 mech: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 run: Start: 8 @@ -371,13 +387,19 @@ mech: Start: 229 Length: 18 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 @@ -388,11 +410,9 @@ mech: Facings: 8 Tick: 100 icon: mechicon - Start: 0 e2: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -430,13 +450,19 @@ e2: Start: 452 Length: 18 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 @@ -451,14 +477,11 @@ e2: Length: 12 Facings: 8 icon: e2icon - Start: 0 dog: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 run: Start: 8 @@ -489,23 +512,22 @@ dog: Start: 251 Length: 14 die6: electdog - Start: 0 Length: * die-crushed: corpse1 - Start: 0 Length: 6 Tick: 1600 ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT shoot: dogbullt - Start: 0 Length: 4 Facings: 8 icon: dogicon - Start: 0 spy: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -543,13 +565,19 @@ spy: Start: 324 Length: 18 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 @@ -564,14 +592,11 @@ spy: Length: 8 Facings: 8 icon: spyicon - Start: 0 thf: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 run: Start: 8 @@ -594,26 +619,29 @@ thf: Start: 175 Length: 18 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 Facings: 8 icon: thficon - Start: 0 hijacker: stand: thf - Start: 0 Facings: 8 stand2: thf - Start: 0 Facings: 8 run: thf Start: 8 @@ -636,26 +664,29 @@ hijacker: Start: 175 Length: 18 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 Facings: 8 icon: hijackericon - Start: 0 e7: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 run: Start: 8 @@ -690,13 +721,19 @@ e7: Start: 298 Length: 18 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 @@ -711,16 +748,13 @@ e7: Length: 7 Facings: 8 garrison-muzzle: minigun - Start: 0 Length: 3 Stride: 6 Facings: 8 icon: e7icon - Start: 0 e4: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -758,13 +792,19 @@ e4: Start: 452 Length: 18 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 @@ -779,14 +819,11 @@ e4: Length: 16 Facings: 8 icon: e4icon - Start: 0 gnrl: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 run: Start: 8 @@ -833,17 +870,22 @@ gnrl: Start: 246 Length: 18 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: - Start: 0 Facings: 8 stand2: Start: 8 @@ -901,22 +943,25 @@ shok: Start: 452 Length: 18 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 c1: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 panic-stand: Start: 8 @@ -946,13 +991,19 @@ c1: Start: 160 Length: 8 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 @@ -961,10 +1012,8 @@ c1: c2: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 panic-stand: Start: 8 @@ -994,13 +1043,19 @@ c2: Start: 160 Length: 8 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 @@ -1009,10 +1064,8 @@ c2: c3: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 panic-stand: Start: 8 @@ -1042,13 +1095,19 @@ c3: Start: 160 Length: 8 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 @@ -1057,10 +1116,8 @@ c3: einstein: stand: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 panic-run: Start: 8 @@ -1091,20 +1148,24 @@ einstein: Start: 123 Length: 8 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: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 panic-run: Start: 8 @@ -1135,20 +1196,24 @@ delphi: Start: 123 Length: 8 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: - Start: 0 Facings: 8 stand2: - Start: 0 Facings: 8 panic-run: Start: 8 @@ -1179,17 +1244,22 @@ chan: Start: 123 Length: 8 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: - Start: 0 Facings: 8 stand2: Start: 8 @@ -1222,19 +1292,23 @@ zombie: Start: 114 Length: 18 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 ant: stand: - Start: 0 Facings: 8 stand2: Start: 8 @@ -1257,4 +1331,3 @@ ant: Tick: 400 ZOffset: -511 icon: anticon - Start: 0 diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index e0dbb80170..191127ae58 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -1,6 +1,5 @@ clock: idle: - Start: 0 Length: * powerdown: @@ -9,73 +8,56 @@ powerdown: 120mm: idle: - Start: 0 50cal: idle: - Start: 0 explosion: piff: piff - Start: 0 Length: * piffs: piffpiff - Start: 0 Length: * water_piff: wpiff - Start: 0 Length: * water_piffs: wpifpif - Start: 0 Length: * small_explosion: veh-hit3 - Start: 0 Length: * med_explosion: veh-hit2 - Start: 0 Length: * small_explosion_air: flak - Start: 0 Length: * med_explosion_air: veh-hit1 - Start: 0 Length: * large_splash: h2o_exp1 - Start: 0 Length: * napalm: napalm2 - Start: 0 Length: * nuke: atomsfx - Start: 0 Length: * med_splash: h2o_exp2 - Start: 0 Length: * self_destruct: art-exp1 - Start: 0 Length: * artillery_explosion: art-exp1 - Start: 0 Length: * building: fball1 - Start: 0 Length: * Offset: 0,-9 small_splash: h2o_exp3 - Start: 0 Length: * large_explosion: frag1 - Start: 0 Length: * Offset: -2,0 small_napalm: napalm1 - Start: 0 Length: * corpse: corpse1 - Start: 0 - Length: 6 + Length: * Tick: 1600 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT pips: groups: @@ -92,7 +74,6 @@ pips: tag-primary: Start: 2 pip-empty: pips2 - Start: 0 pip-green: pips2 Start: 1 pip-yellow: pips2 @@ -106,16 +87,13 @@ pips: v2: idle: - Start: 0 Facings: 32 rallypoint: flag:flagfly - Start: 0 Length: * Offset: 11,-5 circles:fpls - Start: 0 Length: * beacon: @@ -123,36 +101,28 @@ beacon: Start: 5 Offset: 1,-12 circles: fpls - Start: 0 Length: * atomicon: lores-atomicon - Start: 0 Length: * Offset: 0,-42 pbmbicon: lores-pbmbicon - Start: 0 Length: * Offset: 0,-42 camicon: lores-camicon - Start: 0 Length: * Offset: 0,-42 pinficon: lores-pinficon - Start: 0 Length: * Offset: 0,-42 armordropicon: lores-pinficon - Start: 0 Length: * Offset: 0,-42 clock: beaconclock - Start: 0 Length: * Offset: 0,-42 smoke_m: idle: - Start: 0 Length: * Offset: 2, -5 ZOffset: 512 @@ -162,35 +132,29 @@ smoke_m: Offset: 2, -5 ZOffset: 512 end: - Start: 0 Length: 26 Offset: 2, -5 ZOffset: 512 dragon: idle: - Start: 0 Facings: 32 smokey: idle: - Start: 0 Length: * ZOffset: 1023 bomb: idle: - Start: 0 Length: * missile: idle: - Start: 0 Facings: 32 litning: bright: - Start: 0 Length: 4 dim: Start: 4 @@ -198,49 +162,43 @@ litning: fb1: idle: - Start: 0 Length: * moveflsh: idle: - Start: 0 Length: * Tick: 80 - + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT select: repair: Start: 2 poweroff: offline: - Start: 0 Length: * Tick: 160 allyrepair: repair: - Start: 0 Length: * Tick: 160 tabs: left-normal: - Start: 0 left-pressed: Start: 1 sputnik: idle: - Start: 0 Length: * Offset: -4,0 dd-crnr: idle: - Start: 0 Length: * top-left: - Start: 0 top-right: Start: 1 bottom-left: @@ -250,21 +208,17 @@ dd-crnr: fb2: idle: - Start: 0 Length: * fb3: idle: - Start: 0 Facings: 32 fb4: idle: - Start: 0 Length: * scrate: idle: - Start: 0 ZOffset: -511 land: Start: 1 @@ -277,12 +231,10 @@ scrate: wcrate: idle: - Start: 0 ZOffset: -511 xcratea: idle: - Start: 0 ZOffset: -511 land: Start: 1 @@ -295,7 +247,6 @@ xcratea: xcrateb: idle: - Start: 0 ZOffset: -511 land: Start: 1 @@ -308,7 +259,6 @@ xcrateb: xcratec: idle: - Start: 0 ZOffset: -511 land: Start: 1 @@ -321,7 +271,6 @@ xcratec: xcrated: idle: - Start: 0 ZOffset: -511 land: Start: 1 @@ -334,61 +283,43 @@ xcrated: crate-effects: speed: speed - Start: 0 Length: * dollar: dollar - Start: 0 Length: * reveal-map: earth - Start: 0 Length: * hide-map: empulse - Start: 0 Length: * fpower: fpower - Start: 0 Length: * gps: gpsbox - Start: 0 Length: * invuln: invulbox - Start: 0 Length: * heal: invun - Start: 0 Length: * nuke: missile2 - Start: 0 Length: * parabombs: parabox - Start: 0 Length: * sonar: sonarbox - Start: 0 Length: * stealth: stealth2 - Start: 0 Length: * timequake: tquake - Start: 0 Length: * armor: armor - Start: 0 Length: * chrono: chronbox - Start: 0 Length: * airstrike: deviator - Start: 0 Length: * levelup: levelup - Start: 0 Length: * Tick: 200 parach: open: - Start: 0 Length: 5 idle: Start: 5 @@ -396,27 +327,22 @@ parach: parach-shadow: idle: - Start: 0 Length: * atomicup: idle: - Start: 0 Length: * atomicdn: idle: - Start: 0 Length: * bomblet: idle: - Start: 0 Length: * parabomb: open: - Start: 0 Length: 8 idle: Start: 8 @@ -424,7 +350,6 @@ parabomb: smokland: open: playersmoke - Start: 0 Length: 60 Tick: 120 ZOffset: 1023 @@ -436,63 +361,51 @@ smokland: fire: 1: fire1 - Start: 0 Length: * Offset: 0,-3 ZOffset: 1023 2: fire2 - Start: 0 Length: * Offset: 0,-3 ZOffset: 1023 3: fire3 - Start: 0 Length: * Offset: 0,-3 ZOffset: 1023 4: fire4 - Start: 0 Length: * Offset: 0,-3 ZOffset: 1023 rank: rank: - Start: 0 Length: * atomic: up: atomicup - Start: 0 Length: * down: atomicdn - Start: 0 Length: * bubbles: idle: - Start: 0 Length: * Tick: 220 mpspawn: idle: - Start: 0 Length: * waypoint: idle: - Start: 0 Length: * camera: idle: - Start: 0 Length: * gpsdot: Infantry: - Start: 0 Vehicle: Start: 1 Ship: @@ -508,27 +421,17 @@ gpsdot: icon: abomb: atomicon - Start: 0 invuln: infxicon - Start: 0 chrono: warpicon - Start: 0 spyplane: smigicon - Start: 0 paratroopers: pinficon - Start: 0 armordrop: armordropicon - Start: 0 gps: gpssicon - Start: 0 parabombs: pbmbicon - Start: 0 sonar: sonricon - Start: 0 quee: idle: - Start: 0 Length: 10 damaged-idle: Start: 10 @@ -536,69 +439,53 @@ quee: lar1: idle: - Start: 0 - Length: * lar2: idle: - Start: 0 - Length: * minp: idle: - Start: 0 ZOffset: -512 icon: jmin - Start: 0 minv: idle: - Start: 0 ZOffset: -512 icon: jmin - Start: 0 overlay: build-valid-desert: - Start: 0 build-valid-interior: - Start: 0 build-valid-snow: Start: 2 build-valid-temperat: - Start: 0 build-invalid: Start: 1 target-select: Start: 2 target-valid-desert: - Start: 0 target-valid-interior: - Start: 0 target-valid-snow: Start: 2 target-valid-temperat: - Start: 0 target-invalid: 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,54 +494,55 @@ 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: - Start: 0 + UseTilesetExtension: true ZOffset: -512 gmine: idle: - Start: 0 ZOffset: -512 + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT railmine: idle: - Start: 0 ZOffset: -512 + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT ctflag: idle: - Start: 0 Length: 9 Tick: 50 Offset: 0,-12 bib: mbGAP - Start: 0 Length: * + UseTilesetExtension: true diff --git a/mods/ra/sequences/ships.yaml b/mods/ra/sequences/ships.yaml index 1a26f8b0ff..55f044559a 100644 --- a/mods/ra/sequences/ships.yaml +++ b/mods/ra/sequences/ships.yaml @@ -1,49 +1,35 @@ ss: idle: - Start: 0 Facings: 16 icon: ssicon - Start: 0 ca: idle: - Start: 0 Facings: 16 turret: turr - Start: 0 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 icon: caicon - Start: 0 dd: idle: - Start: 0 Facings: 16 turret: ssam - Start: 0 Facings: 32 icon: ddicon - Start: 0 pt: idle: - Start: 0 Facings: 16 turret: mgun - Start: 0 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 icon: pticon - Start: 0 lst: idle: - Start: 0 open: Start: 1 Length: 4 @@ -52,11 +38,8 @@ lst: Start: 4 ZOffset: -511 icon: lsticon - Start: 0 msub: idle: - Start: 0 Facings: 16 - icon: msubicon - Start: 0 \ No newline at end of file + icon: msubicon \ No newline at end of file diff --git a/mods/ra/sequences/structures.yaml b/mods/ra/sequences/structures.yaml index e27f55c7b0..941226ef23 100644 --- a/mods/ra/sequences/structures.yaml +++ b/mods/ra/sequences/structures.yaml @@ -1,18 +1,17 @@ fcom: idle: - Start: 0 damaged-idle: Start: 1 make: fcommake - Start: 0 Length: * bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT hosp: idle: - Start: 0 Length: 4 damaged-idle: Start: 4 @@ -21,43 +20,38 @@ hosp: Start: 8 Tick: 800 make: hospmake - Start: 0 Length: * bib: mbHOSP - Start: 0 Length: * Offset: 0,1 + UseTilesetExtension: true icon: hospicon - Start: 0 bio: idle: - Start: 0 damaged-idle: Start: 1 dead: Start: 2 Tick: 800 make: biomake - Start: 0 Length: * oilb: idle: - Start: 0 damaged-idle: Start: 1 Length: * make: - Start: 0 bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT + fact: idle: - Start: 0 make: factmake - Start: 0 Length: * build: Start: 1 @@ -68,44 +62,38 @@ fact: Start: 27 Length: 25 dead: factdead - Start: 0 Tick: 800 bib: bib2 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: facticon - Start: 0 fake-icon: facficon - Start: 0 proc: idle: - Start: 0 ZOffset: -1c511 damaged-idle: - Start: 1 ZOffset: -1c511 idle-top: proctop - Start: 0 ZOffset: 0 damaged-idle-top: proctop Start: 1 ZOffset: 0 make: procmake - Start: 0 Length: * dead: procdead - Start: 0 Tick: 800 bib: bib2 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: procicon - Start: 0 silo: idle: silo2 - Start: 0 Length: 9 Offset: 0,-1 damaged-idle: silo2 @@ -113,174 +101,152 @@ silo: Length: 9 Offset: 0,-1 make: silomake - Start: 0 Length: * Offset: 0,-1 bib: mbSILO - Start: 0 Length: * + UseTilesetExtension: true icon: siloicon - Start: 0 powr: idle: - Start: 0 damaged-idle: Start: 1 make: powrmake - Start: 0 Length: * dead: powrdead - Start: 0 Tick: 800 bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: powricon - Start: 0 apwr: idle: - Start: 0 damaged-idle: Start: 1 make: apwrmake - Start: 0 Length: * dead: apwrdead - Start: 0 Tick: 800 bib: bib2 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: apwricon - Start: 0 barr: idle: - Start: 0 Length: 10 damaged-idle: Start: 10 Length: 10 make: barrmake - Start: 0 Length: * bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: barricon - Start: 0 tent: idle: - Start: 0 Length: 10 damaged-idle: Start: 10 Length: 10 make: tentmake - Start: 0 Length: * bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: tenticon - Start: 0 kenn: idle: - Start: 0 damaged-idle: Start: 1 make: kennmake - Start: 0 Length: * bib: mbSILO - Start: 0 Length: * + UseTilesetExtension: true icon: kennicon - Start: 0 dome: idle: - Start: 0 damaged-idle: Start: 1 make: domemake - Start: 0 Length: * bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: domeicon - Start: 0 fake-icon: domficon - Start: 0 atek: idle: - Start: 0 damaged-idle: Start: 1 make: atekmake - Start: 0 Length: * active: sputdoor - Start: 0 Length: * Offset: -4,0 bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: atekicon - Start: 0 fake-icon: ateficon - Start: 0 stek: idle: - Start: 0 damaged-idle: Start: 1 make: stekmake - Start: 0 Length: * bib: bib2 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: stekicon - Start: 0 weap: idle: - Start: 0 damaged-idle: Start: 1 make: weapmake - Start: 0 Length: * build-top: weap3 - Start: 0 Length: 10 damaged-build-top: weap2 Start: 4 Length: 4 idle-top: weap2 - Start: 0 damaged-idle-top: weap2 Start: 4 bib: bib2 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: weapicon - Start: 0 fake-icon: weaficon - Start: 0 hpad: idle: - Start: 0 ZOffset: -1023 damaged-idle: Start: 7 @@ -294,17 +260,16 @@ hpad: Length: 6 ZOffset: -1023 make: hpadmake - Start: 0 Length: * bib: bib3 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT icon: hpadicon - Start: 0 afld: idle: afldidle - Start: 0 Length: 8 Tick: 160 ZOffset: -1023 @@ -314,7 +279,6 @@ afld: Tick: 160 ZOffset: -1023 active: - Start: 0 Length: 8 Tick: 160 ZOffset: -1023 @@ -324,40 +288,29 @@ afld: Tick: 160 ZOffset: -1023 make: afldmake - Start: 0 Length: * icon: afldicon - Start: 0 spen: idle: - Start: 0 damaged-idle: Start: 1 make: spenmake - Start: 0 Length: * icon: spenicon - Start: 0 fake-icon: speficon - Start: 0 syrd: idle: - Start: 0 damaged-idle: Start: 1 make: syrdmake - Start: 0 Length: * icon: syrdicon - Start: 0 fake-icon: syrficon - Start: 0 fix: idle: - Start: 0 Offset: 0,1 ZOffset: -1c511 damaged-idle: @@ -375,26 +328,22 @@ fix: Offset: 0,1 ZOffset: -1c511 make: fixmake - Start: 0 Length: * Offset: 0,1 bib: mbFIX - Start: 0 Length: * ZOffset: -1c511 Offset: 0,-4 + UseTilesetExtension: true icon: fixicon - Start: 0 gun: idle: - Start: 0 Facings: 32 recoil: Start: 32 Facings: 32 make: gunmake - Start: 0 Length: * damaged-idle: Start: 64 @@ -403,18 +352,15 @@ gun: Start: 96 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 bib: mbGUN - Start: 0 Length: * Offset: -1,-1 + UseTilesetExtension: true icon: gunicon - Start: 0 agun: idle: - Start: 0 Facings: 32 Offset: 0,-1 recoil: @@ -422,7 +368,6 @@ agun: Facings: 32 Offset: 0,-1 make: agunmake - Start: 0 Length: * Offset: 0,-1 damaged-idle: @@ -438,14 +383,12 @@ agun: Length: 4 Offset: 0,-1 bib: mbAGUN - Start: 0 Length: * + UseTilesetExtension: true icon: agunicon - Start: 0 sam: idle: sam2 - Start: 0 Facings: 32 Offset: -2,-2 damaged-idle: sam2 @@ -453,47 +396,39 @@ sam: Facings: 32 Offset: -2,-2 make: sammake - Start: 0 Length: * Offset: -2,-2 muzzle: samfire - Start: 0 Length: 18 Facings: 8 Offset: -2,-2 bib: mbSAM - Start: 0 Length: * Offset: 0,1 + UseTilesetExtension: true icon: samicon - Start: 0 ftur: idle: - Start: 0 Offset: 0,-2 damaged-idle: Start: 1 Offset: 0,-2 make: fturmake - Start: 0 Length: * Offset: 0,-2 bib: mbFTUR - Start: 0 Length: * + UseTilesetExtension: true icon: fturicon - Start: 0 tsla: idle: - Start: 0 Offset: 0,-1 damaged-idle: Start: 10 Offset: 0,-1 make: tslamake - Start: 0 Length: * Offset: 0,-1 active: @@ -507,48 +442,44 @@ tsla: Tick: 100 Offset: 0,-1 bib: mbTSLA - Start: 0 Length: * + UseTilesetExtension: true icon: tslaicon - Start: 0 pbox: idle: - Start: 0 damaged-idle: Start: 1 make: pboxmake - Start: 0 Length: * muzzle: minigun - Start: 0 Length: 6 Facings: 8 bib: mbPBOX - Start: 0 Length: * Offset: 0,-2 + UseTilesetExtension: true icon: pboxicon - Start: 0 hbox: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT + idle: damaged-idle: Start: 2 - idle: - Start: 0 make: hboxmake - Start: 0 Length: * muzzle: minigun - Start: 0 Length: 6 Facings: 8 + UseTilesetExtension: false icon: hboxicon - Start: 0 + UseTilesetExtension: false gap: idle: - Start: 0 Length: 32 Offset: 0,-2 damaged-idle: @@ -556,21 +487,17 @@ gap: Length: 32 Offset: 0,-2 make: gapmake - Start: 0 Length: * Offset: 0,-2 bib: mbGAP - Start: 0 Length: * + UseTilesetExtension: true icon: gapicon - Start: 0 iron: idle: - Start: 0 Offset: 0,-12 active: - Start: 0 Length: 11 Offset: 0,-12 damaged-idle: @@ -581,46 +508,41 @@ iron: Length: 11 Offset: 0,-12 make: ironmake - Start: 0 Length: * Offset: 0,-12 bib: mbIRON - Start: 0 Length: * Offset: 0,2 + UseTilesetExtension: true icon: ironicon - Start: 0 pdox: idle: - Start: 0 damaged-idle: Start: 29 active: - Start: 0 Length: 29 damaged-active: Start: 29 Length: 29 make: pdoxmake - Start: 0 Length: * bib: mbPDOX - 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: Start: 8 make: mslomake - Start: 0 Length: * active: Start: 1 @@ -630,28 +552,27 @@ mslo: Start: 9 Length: 7 icon: msloicon2 - Start: 0 + UseTilesetExtension: false fake-icon: mslficon - Start: 0 + UseTilesetExtension: false miss: idle: - Start: 0 damaged-idle: Start: 1 dead: Start: 2 Tick: 800 make: missmake - Start: 0 Length: * bib: bib2 - Start: 0 Length: * + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT brik: idle: - Start: 0 Length: 16 scratched-idle: Start: 16 @@ -660,25 +581,19 @@ brik: Start: 32 Length: 16 icon: brikicon - Start: 0 sbag: idle: - Start: 0 Length: 16 icon: sbagicon - Start: 0 fenc: idle: - Start: 0 Length: 16 icon: fencicon - Start: 0 cycl: idle: - Start: 0 Length: 16 damaged-idle: Start: 16 diff --git a/mods/ra/sequences/vehicles.yaml b/mods/ra/sequences/vehicles.yaml index 9341dbc589..8f5a647dc3 100644 --- a/mods/ra/sequences/vehicles.yaml +++ b/mods/ra/sequences/vehicles.yaml @@ -1,26 +1,20 @@ mcv: idle: - Start: 0 Facings: 32 icon: mcvicon - Start: 0 mcvhusk: idle: - Start: 0 Facings: 32 ZOffset: -1023 truk: idle: - Start: 0 Facings: 32 icon: trukicon - Start: 0 harv: idle: - Start: 0 Facings: 32 harvest: Start: 32 @@ -37,7 +31,6 @@ harv: harvhalf: idle: - Start: 0 Facings: 32 harvest: Start: 32 @@ -52,7 +45,6 @@ harvhalf: harvempty: idle: - Start: 0 Facings: 32 harvest: Start: 32 @@ -67,32 +59,26 @@ harvempty: hhusk: idle: - Start: 0 Facings: 32 ZOffset: -1023 hhusk2: idle: - Start: 0 Facings: 32 ZOffset: -1023 1tnk: idle: - Start: 0 Facings: 32 turret: Start: 32 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 2 icon: 1tnkicon - Start: 0 1tnk.destroyed: idle: 1tnk - Start: 0 Facings: 32 ZOffset: -512 turret: 1tnk @@ -102,20 +88,16 @@ hhusk2: 2tnk: idle: - Start: 0 Facings: 32 turret: Start: 32 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 icon: 2tnkicon - Start: 0 2tnk.destroyed: idle: 2tnk - Start: 0 Facings: 32 ZOffset: -512 turret: 2tnk @@ -125,20 +107,16 @@ hhusk2: 3tnk: idle: - Start: 0 Facings: 32 turret: Start: 32 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 icon: 3tnkicon - Start: 0 3tnk.destroyed: idle: 3tnk - Start: 0 Facings: 32 ZOffset: -512 turret: 3tnk @@ -148,20 +126,16 @@ hhusk2: 4tnk: idle: - Start: 0 Facings: 32 turret: Start: 32 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 icon: 4tnkicon - Start: 0 4tnk.destroyed: idle: 4tnk - Start: 0 Facings: 32 ZOffset: -512 turret: 4tnk @@ -171,7 +145,6 @@ hhusk2: v2rl: idle: - Start: 0 Facings: 32 empty-idle: Start: 32 @@ -183,41 +156,31 @@ v2rl: Start: 72 Facings: 8 icon: v2rlicon - Start: 0 arty: idle: - Start: 0 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 icon: artyicon - Start: 0 jeep: idle: - Start: 0 Facings: 32 turret: Start: 32 Facings: 32 muzzle: minigun - Start: 0 Length: 6 Facings: 8 unload: - Start: 0 Facings: 32 icon: jeepicon - Start: 0 apc: idle: - Start: 0 Facings: 32 muzzle: minigun - Start: 0 Length: 6 Facings: 8 open: @@ -226,28 +189,22 @@ apc: unload: Start: 32 icon: apcicon - Start: 0 mnly: idle: - Start: 0 Facings: 32 icon: mnlyicon - Start: 0 mrj: idle: - Start: 0 Facings: 32 spinner: Start: 32 Length: 32 icon: mrjicon - Start: 0 mgg: idle: - Start: 0 Facings: 32 spinner: Start: 32 @@ -256,11 +213,9 @@ mgg: Start: 32 Length: 1 icon: mggicon - Start: 0 mgg.destroyed: idle: mgg - Start: 0 Facings: 32 ZOffset: -512 spinner: mgg @@ -269,65 +224,50 @@ mgg.destroyed: ZOffset: -512 spinner-idle: mgg Start: 32 - Length: 1 ttnk: idle: - Start: 0 Facings: 32 spinner: Start: 32 Length: 32 icon: ttnkicon - Start: 0 ftrk: idle: - Start: 0 Facings: 32 turret: Start: 32 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 2 icon: ftrkicon - Start: 0 dtrk: idle: - Start: 0 Facings: 32 icon: dtrkicon - Start: 0 ctnk: idle: - Start: 0 Facings: 32 muzzle: gunfire2 - Start: 0 Length: 5 icon: ctnkicon - Start: 0 qtnk: idle: - Start: 0 Facings: 32 piston: Start: 32 Facings: 8 Length: 8 icon: qtnkicon - Start: 0 stnk: idle: - Start: 0 Facings: 32 turret: Start: 38 Facings: 32 icon: stnkicon - Start: 0 \ No newline at end of file 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: