From c92d1342f01f8f3c8fe4efdf6e75231211309dbb Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 21 Mar 2015 15:56:34 +0000 Subject: [PATCH 1/2] Allow mods to define Defaults for all animations in a sequence. --- OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs b/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs index 5286bb9210..a32a2cdaf2 100644 --- a/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs +++ b/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs @@ -28,8 +28,16 @@ namespace OpenRA.Mods.Common.Graphics public IReadOnlyDictionary ParseSequences(ModData modData, TileSet tileSet, SpriteCache cache, MiniYamlNode node) { var sequences = new Dictionary(); + var nodes = node.Value.ToDictionary(); - foreach (var kvp in node.Value.ToDictionary()) + MiniYaml defaults; + if (nodes.TryGetValue("Defaults", out defaults)) + { + nodes.Remove("Defaults"); + nodes = nodes.ToDictionary(kv => kv.Key, kv => MiniYaml.MergeStrict(kv.Value, defaults)); + } + + foreach (var kvp in nodes) { using (new Support.PerfTimer("new Sequence(\"{0}\")".F(node.Key), 20)) { From a7c64a0941857897b1a40e92c4b4a5db7ca314a8 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 21 Mar 2015 16:27:53 +0000 Subject: [PATCH 2/2] Remove redundancies from TS sequences. --- mods/ts/sequences/aircraft.yaml | 9 - mods/ts/sequences/civilian.yaml | 271 -------------- mods/ts/sequences/infantry.yaml | 97 ----- mods/ts/sequences/misc.yaml | 302 ++------------- mods/ts/sequences/structures.yaml | 600 +++++++----------------------- mods/ts/sequences/trees.yaml | 59 +-- mods/ts/sequences/vehicles.yaml | 52 +-- 7 files changed, 171 insertions(+), 1219 deletions(-) diff --git a/mods/ts/sequences/aircraft.yaml b/mods/ts/sequences/aircraft.yaml index 65b01f7e9f..207ce6b5a2 100644 --- a/mods/ts/sequences/aircraft.yaml +++ b/mods/ts/sequences/aircraft.yaml @@ -1,36 +1,27 @@ dpod: icon: podsicon - Start: 0 dshp: icon: xxicon - Start: 0 orca: icon: orcaicon - Start: 0 orcab: icon: obmbicon - Start: 0 orcatran: icon: crryicon - Start: 0 trnsport: icon: otrnicon - Start: 0 scrin: icon: proicon - Start: 0 apache: icon: apchicon - Start: 0 rotor: lrotor - Start: 0 Length: 4 slow-rotor: lrotor Start: 4 diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml index 247c06e01a..dcd97555ef 100644 --- a/mods/ts/sequences/civilian.yaml +++ b/mods/ts/sequences/civilian.yaml @@ -1,475 +1,343 @@ ammocrat: idle: ammo01 - Start: 0 ShadowStart: 2 aban01: idle: aban01 - Start: 0 ShadowStart: 2 aban02: idle: aban02 - Start: 0 ShadowStart: 2 aban03: idle: aban03 - Start: 0 ShadowStart: 2 aban04: idle: aban04 - Start: 0 ShadowStart: 2 aban05: idle: aban05 - Start: 0 ShadowStart: 2 aban06: idle: aban06 - Start: 0 ShadowStart: 2 aban07: idle: aban07 - Start: 0 ShadowStart: 2 aban08: idle: aban08 - Start: 0 ShadowStart: 2 aban09: idle: aban09 - Start: 0 ShadowStart: 2 aban10: idle: aban10 - Start: 0 ShadowStart: 2 aban11: idle: aban11 - Start: 0 ShadowStart: 2 aban12: idle: aban12 - Start: 0 ShadowStart: 2 aban13: idle: aban13 - Start: 0 ShadowStart: 2 aban14: idle: aban14 - Start: 0 ShadowStart: 2 aban15: idle: aban15 - Start: 0 ShadowStart: 2 aban16: idle: aban16 - Start: 0 ShadowStart: 2 aban17: idle: aban17 - Start: 0 ShadowStart: 2 aban18: idle: aban18 - Start: 0 ShadowStart: 2 bboard01: idle: bboard01 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard02: idle: bboard02 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard03: idle: bboard03 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard04: idle: bboard04 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard05: idle: bboard05 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard06: idle: bboard06 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard07: idle: bboard07 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard08: idle: bboard08 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard09: idle: bboard09 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard10: idle: bboard10 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard11: idle: bboard11 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard12: idle: bboard12 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard13: idle: bboard13 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard14: idle: bboard14 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard15: idle: bboard15 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 bboard16: idle: bboard16 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0001: idle: ct0001 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0002: idle: ct0002 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0003: idle: ct0003 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0004: idle: ct0004 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0005: idle: ct0005 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0006: idle: ct0006 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0007: idle: ct0007 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0008: idle: ct0008 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0009: idle: ct0009 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0010: idle: ct0010 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0011: idle: ct0011 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0012: idle: ct0012 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0013: idle: ct0013 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0014: idle: ct0014 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0015: idle: ct0015 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0016: idle: ct0016 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0017: idle: ct0017 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0018: idle: ct0018 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0019: idle: ct0019 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0020: idle: ct0020 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 ca0021: idle: ct0021 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 caarmr: idle: ctarmr - Start: 0 ShadowStart: 3 damaged-idle: ctarmr Start: 1 - Length: 1 ShadowStart: 4 critical-idle: ctarmr Start: 2 @@ -477,11 +345,9 @@ caarmr: caaray: idle: ctaray - Start: 0 ShadowStart: 3 damaged-idle: ctaray Start: 1 - Length: 1 ShadowStart: 4 critical-idle: ctaray Start: 2 @@ -489,389 +355,266 @@ caaray: cabhut: idle: cabhut - Start: 0 cacrsh01: idle: ctcrsh01 - Start: 0 cacrsh02: idle: ctcrsh02 - Start: 0 cacrsh03: idle: ctcrsh03 - Start: 0 cacrsh04: idle: ctcrsh04 - Start: 0 cacrsh05: idle: ctcrsh05 - Start: 0 cahosp: idle: cthosp - Start: 0 ShadowStart: 2 capyr01: idle: ctpyr01 - Start: 0 ShadowStart: 1 capyr02: idle: ctpyr02 - Start: 0 ShadowStart: 1 capyr03: idle: ctpyr03 - Start: 0 ShadowStart: 1 city01: idle: city01 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city01 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city02: idle: city02 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city02 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city03: idle: city03 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city03 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city04: idle: city04 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city04 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city05: idle: city05 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city05 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city06: idle: city06 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city06 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city07: idle: city07 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city07 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city08: idle: city08 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city08 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city09: idle: city09 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city09 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city10: idle: city10 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city10 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city11: idle: city11 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city11 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city12: idle: city12 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city12 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city13: idle: city13 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city13 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city14: idle: city14 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city14 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city15: idle: city15 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city15 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city16: idle: city16 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city16 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city17: idle: city17 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city17 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city18: idle: city18 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city18 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city19: idle: city19 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city19 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city20: idle: city20 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city20 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city21: idle: city21 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city21 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 city22: idle: city22 - Start: 0 ShadowStart: 2 - Length: 1 damaged-idle: Start: 1 - Length: 1 ShadowStart: 3 make: city22 - Start: 0 ShadowStart: 2 - Length: 1 Tick: 80 ctdam: idle: ctdam - Start: 0 ctvega: idle: ctvega - Start: 0 ShadowStart: 3 damaged-idle: ctvega Start: 1 - Length: 1 ShadowStart: 4 critical-idle: ctvega Start: 2 @@ -879,46 +622,37 @@ ctvega: gaoldcc1: idle: gtoldcc1 - Start: 0 ShadowStart: 2 gaoldcc2: idle: gtoldcc2 - Start: 0 ShadowStart: 2 gaoldcc3: idle: gtoldcc3 - Start: 0 ShadowStart: 2 gaoldcc4: idle: gtoldcc4 - Start: 0 ShadowStart: 2 gaoldcc5: idle: gtoldcc5 - Start: 0 ShadowStart: 2 gaoldcc6: idle: gtoldcc6 - Start: 0 ShadowStart: 2 gagreen: idle: gagreen - Start: 0 ShadowStart: 2 gakodk: idle: gtkodk - Start: 0 ShadowStart: 3 damaged-idle: gtkodk Start: 1 - Length: 1 ShadowStart: 4 critical-idle: gtkodk Start: 2 @@ -926,11 +660,9 @@ gakodk: namntk: idle: ntmntk - Start: 0 ShadowStart: 3 damaged-idle: ntmntk Start: 1 - Length: 1 ShadowStart: 4 critical-idle: ntmntk Start: 2 @@ -938,11 +670,9 @@ namntk: ntpyra: idle: ntpyra - Start: 0 ShadowStart: 3 damaged-idle: ntpyra Start: 1 - Length: 1 ShadowStart: 4 critical-idle: ntpyra Start: 2 @@ -950,5 +680,4 @@ ntpyra: ufo: idle: ufo - Start: 0 Offset: -24, -60 diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 7da2bf6246..4a8ce4bb5d 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -1,6 +1,5 @@ e1: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -27,7 +26,6 @@ e1: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -42,7 +40,6 @@ e1: ShadowStart: 441 Tick: 80 die3: infdie - Start: 0 Length: * Tick: 80 die-crushed: @@ -75,15 +72,12 @@ e1: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: e1icon - Start: 0 e2: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -110,7 +104,6 @@ e2: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -125,7 +118,6 @@ e2: ShadowStart: 441 Tick: 80 die3: infdie - Start: 0 Length: * Tick: 80 die-crushed: @@ -158,15 +150,12 @@ e2: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: e2icon - Start: 0 e3: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -193,7 +182,6 @@ e3: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -208,7 +196,6 @@ e3: ShadowStart: 441 Tick: 80 die3: infdie - Start: 0 Length: * Tick: 80 die-crushed: @@ -241,15 +228,12 @@ e3: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: e4icon - Start: 0 weedguy: stand: weed - Start: 0 Facings: 8 ShadowStart: 202 run: weed @@ -260,7 +244,6 @@ weedguy: ShadowStart: 210 shoot: weed Start: 56 - Length: 1 Facings: 8 Tick: 80 prone-shoot: weed @@ -281,7 +264,6 @@ weedguy: ShadowStart: 288 prone-stand: weed Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 288 @@ -311,7 +293,6 @@ weedguy: ShadowStart: 379 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 die-crushed: weed @@ -320,11 +301,9 @@ weedguy: ShadowStart: 376 Tick: 1000 icon: weaticon - Start: 0 medic: stand: - Start: 0 Facings: 8 ShadowStart: 307 run: @@ -351,7 +330,6 @@ medic: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -402,15 +380,12 @@ medic: Length: 104 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mediicon - Start: 0 engineer: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -437,7 +412,6 @@ engineer: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -474,15 +448,12 @@ engineer: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: engnicon - Start: 0 umagon: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -509,7 +480,6 @@ umagon: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -558,15 +528,12 @@ umagon: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: umagicon - Start: 0 ghost: # TODO unused GUNFIRE.SHP stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -593,7 +560,6 @@ ghost: # TODO unused GUNFIRE.SHP ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -642,15 +608,12 @@ ghost: # TODO unused GUNFIRE.SHP ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: gosticon - Start: 0 jumpjet: # TODO: ShadowStart: stand: - Start: 0 Facings: 8 ShadowStart: 451 run: @@ -676,7 +639,6 @@ jumpjet: # TODO: ShadowStart: Tick: 80 ShadowStart: 538 prone-stand: - Start: 0 Facings: 8 ShadowStart: 451 die1: @@ -724,15 +686,12 @@ jumpjet: # TODO: ShadowStart: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: jjeticon - Start: 0 mhijack: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -759,7 +718,6 @@ mhijack: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -808,15 +766,12 @@ mhijack: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mutcicon - Start: 0 chamspy: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -843,7 +798,6 @@ chamspy: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -892,15 +846,12 @@ chamspy: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: chamicon - Start: 0 cyc2: stand: - Start: 0 Facings: 8 ShadowStart: 308 run: @@ -927,7 +878,6 @@ cyc2: ShadowStart: 418 prone-stand: Start: 110 - Length: 1 Facings: 8 Stride: 9 ShadowStart: 418 @@ -942,7 +892,6 @@ cyc2: ShadowStart: 505 Tick: 80 die3: infexpl - Start: 0 Length: * Tick: 80 shoot: @@ -969,15 +918,12 @@ cyc2: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: cybcicon - Start: 0 cyborg: stand: - Start: 0 Facings: 8 ShadowStart: 370 run: @@ -1004,7 +950,6 @@ cyborg: ShadowStart: 456 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 456 @@ -1047,15 +992,12 @@ cyborg: ShadowStart: 677 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: cybiicon - Start: 0 mutant: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1082,7 +1024,6 @@ mutant: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -1131,15 +1072,12 @@ mutant: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mutcicon - Start: 0 mwmn: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1166,7 +1104,6 @@ mwmn: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -1215,15 +1152,12 @@ mwmn: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mutcicon - Start: 0 mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1250,7 +1184,6 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN- ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -1299,15 +1232,12 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN- ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mutcicon - Start: 0 tratos: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1334,7 +1264,6 @@ tratos: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -1383,15 +1312,12 @@ tratos: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mutcicon - Start: 0 oxanna: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1418,7 +1344,6 @@ oxanna: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -1467,15 +1392,12 @@ oxanna: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mutcicon - Start: 0 slav: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1502,7 +1424,6 @@ slav: ShadowStart: 378 prone-stand: Start: 86 - Length: 1 Facings: 8 Stride: 6 ShadowStart: 378 @@ -1551,15 +1472,12 @@ slav: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: mutcicon - Start: 0 doggie: # TODO: not sure what frame 88 and following is stand: - Start: 0 Facings: 8 ShadowStart: 119 run: @@ -1606,32 +1524,25 @@ doggie: # TODO: not sure what frame 88 and following is ShadowStart: 228 Tick: 80 icon: xxicon - Start: 0 vissml: idle: - Start: 0 Length: 90 ShadowStart: 90 icon: xxicon - Start: 0 vislrg: idle: - Start: 0 Length: 90 ShadowStart: 90 muzzle: vislgatk # TODO: unused - Start: 0 Length: 5 Facings: 8 ShadowStart: 40 icon: xxicon - Start: 0 civ1: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1685,15 +1596,12 @@ civ1: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: xxicon - Start: 0 civ2: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1747,15 +1655,12 @@ civ2: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: xxicon - Start: 0 civ3: stand: - Start: 0 Facings: 8 ShadowStart: 292 run: @@ -1809,8 +1714,6 @@ civ3: ShadowStart: 190 Tick: 80 die6: electro - Start: 0 Length: * Tick: 80 icon: xxicon - Start: 0 diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 5f9bf6cb17..e3b3ad4e68 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -1,44 +1,26 @@ overlay: - build-valid-interior: place - Start: 0 + Defaults: + Start: 1 Offset: 0, -12 build-valid-snow: place Start: 0 - Offset: 0, -12 build-valid-temperat: place Start: 0 - Offset: 0, -12 build-invalid: place - Start: 1 - Offset: 0, -12 target-select: place - Start: 1 - Offset: 0, -12 target-valid-desert: place - Start: 1 - Offset: 0, -12 target-valid-interior: place - Start: 1 - Offset: 0, -12 target-valid-snow: place - Start: 1 - Offset: 0, -12 target-valid-temperat: place - Start: 1 - Offset: 0, -12 target-invalid: place - Start: 1 - Offset: 0, -12 poweroff: offline: poweroff - Start: 0 Length: * Tick: 160 allyrepair: repair: wrench - Start: 0 Length: * Tick: 160 @@ -50,7 +32,6 @@ rallypoint: Offset: 5,-3 BlendMode: Additive circles: ring - Start: 0 Length: 12 BlendMode: Additive @@ -59,38 +40,21 @@ beacon: Start: 6 Offset: 1,-12 circles: ring - Start: 0 Length: 12 BlendMode: Additive crate-effects: + Defaults: + Length: * dollar: money - Start: 0 - Length: * reveal-map: reveal - Start: 0 - Length: * hide-map: shroudx - Start: 0 - Length: * fpower: firepowr - Start: 0 - Length: * armor: armor - Start: 0 - Length: * stealth: cloak - Start: 0 - Length: * heal: healall - Start: 0 - Length: * nuke: mltimisl - Start: 0 - Length: * levelup: veteran - Start: 0 - Length: * rank: rank: pips @@ -99,17 +63,14 @@ rank: mpspawn: # TODO: backfall to RA asset idle: - Start: 0 Length: * waypoint: # TODO: backfall to RA asset idle: - Start: 0 Length: * clock: idle: gclock2 - Start: 0 Length: * pips: @@ -121,7 +82,6 @@ pips: tag-primary: pipsra #TODO: backfall to RA asset Start: 2 pip-empty: pips2 - Start: 0 pip-green: pips2 Start: 1 pip-yellow: pips2 @@ -133,12 +93,10 @@ pips: pip-blue: pips2 Start: 5 pip-ammo: ammopips - Start: 0 pip-ammoempty: ammopips Start: 1 # TODO: pip-empty-building: - Start: 0 pip-green-building: Start: 1 pip-yellow-building: @@ -151,301 +109,136 @@ pips: Start: 5 explosion: + Defaults: + Length: * building: twlt070 - Start: 0 - Length: * ionring: ring1 - Start: 0 - Length: * pulse_explosion: pulsefx2 - Start: 0 - Length: * BlendMode: Additive small_watersplash: h2o_exp2 - Start: 0 - Length: * large_watersplash: h2o_exp1 - Start: 0 - Length: * water_piff: w_piff - Start: 0 - Length: * water_piffs: w_piffs - Start: 0 - Length: * piff: piff - Start: 0 - Length: * piffs: piffpiff - Start: 0 - Length: * small_explosion: explosml - Start: 0 - Length: * medium_explosion: explomed - Start: 0 - Length: * large_explosion: explolrg - Start: 0 - Length: * tiny_bang: s_bang16 - Start: 0 - Length: * small_bang: s_bang24 - Start: 0 - Length: * medium_bang: s_bang34 - Start: 0 - Length: * large_bang: s_bang48 - Start: 0 - Length: * tiny_brnl: s_brnl20 - Start: 0 - Length: * small_brnl: s_brnl30 - Start: 0 - Length: * medium_brnl: s_brnl40 - Start: 0 - Length: * large_brnl: s_brnl58 - Start: 0 - Length: * tiny_tumu: s_tumu22 - Start: 0 - Length: * small_tumu: s_tumu30 - Start: 0 - Length: * medium_tumu: s_tumu42 - Start: 0 - Length: * large_tumu: s_tumu60 - Start: 0 - Length: * tiny_clsn: s_clsn16 - Start: 0 - Length: * small_clsn: s_clsn22 - Start: 0 - Length: * medium_clsn: s_clsn30 - Start: 0 - Length: * large_clsn: s_clsn42 - Start: 0 - Length: * verylarge_clsn: s_clsn58 - Start: 0 - Length: * tiny_twlt: twlt026 - Start: 0 - Length: * small_twlt: twlt036 - Start: 0 - Length: * medium_twlt: twlt050 - Start: 0 - Length: * large_twlt: twlt070 - Start: 0 - Length: * verylarge_twlt: twlt100 - Start: 0 - Length: * tiny_grey_explosion: xgrysml1 - Start: 0 - Length: * small_grey_explosion: xgrysml2 - Start: 0 - Length: * medium_grey_explosion: xgrymed1 - Start: 0 - Length: * large_grey_explosion: xgrymed2 - Start: 0 - Length: * discus: idle: - Start: 0 Length: * canister: idle: - Start: 0 Length: * pulsball: idle: - Start: 0 Length: * dragon: idle: - Start: 0 Facings: 32 crystal4: idle: - Start: 0 Length: 15 ShadowStart: 15 120mm: idle: - Start: 0 torpedo: idle: - Start: 0 Length: * flameall: idle: - Start: 0 Length: 19 Facings: -8 Tick: 160 largesmoke: idle: lgrysmk1 - Start: 0 Length: * smallsmoke: idle: sgrysmk1 - Start: 0 Length: * largefire: idle: fire1 - Start: 0 Length: * mediumfire: idle: fire2 - Start: 0 Length: * smallfire: idle: fire3 - Start: 0 Length: * tinyfire: idle: fire4 - Start: 0 Length: * moveflsh: idle: ring - Start: 0 Length: * Tick: 30 resources: + Defaults: + Length: 12 + ShadowStart: 12 + Offset: 0, -12 tib01: tib01 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib02: tib02 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib03: tib03 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib04: tib04 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib05: tib05 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib06: tib06 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib07: tib07 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib08: tib08 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib09: tib09 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib10: tib10 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib11: tib11 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib12: tib12 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib13: tib13 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib14: tib14 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib15: tib15 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib16: tib16 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib17: tib17 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib18: tib18 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib19: tib19 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 tib20: tib20 - Start: 0 - Length: 12 - ShadowStart: 12 - Offset: 0, -12 shroud: shroud: shroud @@ -454,155 +247,104 @@ shroud: Length: * smallscorches: + Defaults: + Offset: 0, -12 sc1: burnt01 - Length: 1 - Offset: 0, -12 sc2: burnt02 - Length: 1 - Offset: 0, -12 sc3: burnt03 - Length: 1 - Offset: 0, -12 sc4: burnt04 - Length: 1 - Offset: 0, -12 sc5: burnt05 - Length: 1 - Offset: 0, -12 sc6: burnt06 - Length: 1 - Offset: 0, -12 mediumscorches: + Defaults: + Offset: 0, -18 sc7: burnt07 - Length: 1 - Offset: 0, -18 sc8: burnt08 - Length: 1 - Offset: 0, -18 sc9: burnt09 - Length: 1 - Offset: 0, -18 sc10: burnt10 - Length: 1 - Offset: 0, -18 largescorches: + Defaults: + Offset: 0, -24 sc11: burnt11 - Length: 1 - Offset: 0, -24 sc12: burnt12 - Length: 1 - Offset: 0, -24 smallcraters: + Defaults: + Offset: 0, -12 cr1: crater01 - Length: 1 - Offset: 0, -12 cr2: crater02 - Length: 1 - Offset: 0, -12 cr3: crater03 - Length: 1 - Offset: 0, -12 cr4: crater04 - Length: 1 - Offset: 0, -12 cr5: crater05 - Length: 1 - Offset: 0, -12 cr6: crater06 - Length: 1 - Offset: 0, -12 mediumcraters: + Defaults: + Offset: 0, -12 cr7: crater07 - Length: 1 - Offset: 0, -12 cr8: crater08 - Length: 1 - Offset: 0, -12 cr9: crater09 - Length: 1 - Offset: 0, -12 cr10: crater10 - Length: 1 - Offset: 0, -12 largecraters: + Defaults: + Offset: 0, -24 cr11: crater11 - Length: 1 - Offset: 0, -24 cr12: crater12 - Length: 1 - Offset: 0, -24 icon: clustermissile: mltiicon - Start: 0 ioncannon: ioncicon - Start: 0 clustermissile: up: null # TODO - Start: 0 Length: * down: null # TODO - Start: 0 Length: * ionbeam: idle: - Start: 0 Length: * Offset: 0, -78 ZOffset: 1 trock01: idle: - Start: 0 ShadowStart: 1 trock02: idle: - Start: 0 ShadowStart: 1 trock03: idle: - Start: 0 ShadowStart: 1 trock04: idle: - Start: 0 ShadowStart: 1 trock05: idle: - Start: 0 ShadowStart: 1 srock01: idle: - Start: 0 ShadowStart: 1 srock02: idle: - Start: 0 ShadowStart: 1 srock03: idle: - Start: 0 ShadowStart: 1 srock04: idle: - Start: 0 ShadowStart: 1 srock05: idle: - Start: 0 ShadowStart: 1 diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index ef9a15b5f0..f638ce4649 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -1,781 +1,591 @@ gacnst: - idle: gtcnst - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -36 + idle: gtcnst + ShadowStart: 3 damaged-idle: gtcnst Start: 1 ShadowStart: 4 - Offset: 0, -36 dead: gtcnst Start: 2 ShadowStart: 5 - Offset: 0, -36 Tick: 400 make: gtcnstmk - Start: 0 Length: 24 ShadowStart: 24 - Offset: 0, -36 crane-overlay: gtcnst_d - Start: 0 Length: 20 - Offset: 0, -36 damaged-crane-overlay: gtcnst_d - Start: 0 Length: 20 - Offset: 0, -36 critical-crane-overlay: gtcnst_d Start: 20 Length: 20 - Offset: 0, -36 idle-top: gtcnst_c - Start: 0 Length: 15 Tick: 200 - Offset: 0, -36 damaged-idle-top: gtcnst_c Start: 15 Length: 15 Tick: 200 - Offset: 0, -36 idle-side: gtcnst_a - Start: 0 Length: 10 - Offset: 0, -36 damaged-idle-side: gtcnst_a Start: 10 Length: 10 - Offset: 0, -36 idle-front: gtcnst_b - Start: 0 Length: 10 - Offset: 0, -36 damaged-idle-front: gtcnst_b - Start: 0 Length: 10 - Offset: 0, -36 icon: facticon - Start: 0 + Offset: 0,0 gapowr: - idle: gtpowr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: gtpowr + ShadowStart: 3 damaged-idle: gtpowr Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: gtpowr Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 idle-lights: gtpowr_a - Start: 0 Length: 12 Tick: 200 - Offset: 0, -24 damaged-idle-lights: gtpowr_a Start: 12 Length: 12 Tick: 200 - Offset: 0, -24 idle-plug: gtpowr_b - Start: 0 Length: 12 Tick: 200 - Offset: 0, -24 damaged-idle-plug: gtpowr_b - Start: 0 Length: 12 Tick: 200 - Offset: 0, -24 make: gtpowrmk - Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -24 icon: powricon - Start: 0 + Offset: 0, 0 gapile: - idle: gtpile - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: gtpile + ShadowStart: 3 damaged-idle: gtpile Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: gtpile Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 production-lights: gtpile_a - Start: 0 Length: 7 Tick: 200 - Offset: 0, -24 damaged-production-lights: gtpile_a Start:7 Length: 7 Tick: 200 - Offset: 0, -24 idle-light: gtpile_b - Start: 0 Length: 7 Tick: 200 - Offset: 0, -24 damaged-idle-light: gtpile_b Start:7 Length: 7 Tick: 200 - Offset: 0, -24 idle-flag: gtpile_c - Start:0 Length: 7 - Offset: 0, -24 damaged-idle-flag: gtpile_c Start:7 Length: 7 - Offset: 0, -24 make: gtpilemk - Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -24 icon: brrkicon - Start: 0 + Offset: 0, 0 gaweap: - idle: gtweap - Start: 0 - ShadowStart: 3 + Defaults: Offset: -12, -42 + idle: gtweap + ShadowStart: 3 damaged-idle: gtweap Start: 1 ShadowStart: 4 - Offset: -12, -42 dead: gtweap Start: 2 ShadowStart: 5 - Offset: -12, -42 Tick: 400 production-lights-white: gtweap_a - Start: 0 Length: 8 Tick: 100 ZOffset: 2048 - Offset: -12, -42 damaged-production-lights-white: gtweap_a Start: 8 Length: 8 Tick: 100 ZOffset: 2048 - Offset: -12, -42 production-lights-red: gtweap_b - Start: 0 Length: 4 Tick: 120 ZOffset: 2048 - Offset: -12, -42 damaged-production-lights-red: gtweap_b Start: 4 Length: 4 Tick: 120 ZOffset: 2048 - Offset: -12, -42 idle-turbines: gtweap_c - Start: 0 Length: 4 Tick: 80 ZOffset: 2048 - Offset: -12, -42 damaged-idle-turbines: gtweap_c - Start: 0 Length: 4 Tick: 80 ZOffset: 2048 - Offset: -12, -42 build-top: gtweap_d - Start: 0 Length: 9 ShadowStart: 9 - Offset: -12, -42 damaged-build-top: gtweap_d - Start: 0 Length: 9 ShadowStart: 9 - Offset: -12, -42 idle-top: gtweap_2 - Start: 0 - Offset: -12, -42 damaged-idle-top: gtweap_2 Start: 1 - Offset: -12, -42 make: gtweapmk - Start: 0 Length: 20 Tick: 80 ShadowStart: 20 - Offset: -12, -42 - icon: weapicon - Start: 0 bib: gtweapbb - Start: 0 Length: 1 - Offset: -12, -42 damaged-bib: gtweapbb Start: 1 Length: 1 - Offset: -12, -42 dead-bib: gtweapbb Start: 2 Length: 1 - Offset: -12, -42 + icon: weapicon + Offset: 0, 0 # TODO: gtweap_1 & gtweap_a & gtweap_b & gtweap_c are unused napowr: - idle: ntpowr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: ntpowr + ShadowStart: 3 damaged-idle: ntpowr Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: ntpowr Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 idle-lights: ntpowr_a - Start: 0 Length: 9 Tick: 200 - Offset: 0, -24 damaged-idle-lights: ntpowr_a Start: 9 Length: 9 Tick: 200 - Offset: 0, -24 make: ntpowrmk - Start: 0 Length: 19 ShadowStart: 19 - Offset: 0, -24 icon: npwricon - Start: 0 + Offset: 0, 0 naapwr: - idle: ntapwr - Start: 0 + Defaults: Offset: 12, -30 + idle: ntapwr ShadowStart: 3 damaged-idle: ntapwr Start: 1 ShadowStart: 4 - Offset: 12, -30 dead: ntapwr Start: 2 ShadowStart: 5 - Offset: 12, -30 Tick: 400 idle-lights: ntapwr_a - Start: 0 Length: 9 Tick: 200 - Offset: 12, -30 damaged-idle-lights: ntapwr_a Start: 9 Length: 9 Tick: 200 - Offset: 12, -30 make: ntapwrmk - Start: 0 Length: 19 ShadowStart: 19 - Offset: 12, -30 icon: apwricon - Start: 0 + Offset: 0, 0 nahand: - idle: nthand - Start: 0 - ShadowStart: 3 + Defaults: Offset: -6, -30 + idle: nthand + ShadowStart: 3 damaged-idle: nthand Start: 1 ShadowStart: 4 - Offset: -6, -30 dead: nthand Start: 2 ShadowStart: 5 - Offset: -6, -30 Tick: 400 production-light: nthand_a - Start: 0 Length: 5 Tick: 100 - Offset: -6, -30 damaged-production-light: nthand_a Start: 5 Length: 5 Tick: 100 - Offset: -6, -30 idle-lights: nthand_b - Start: 0 Length: 8 Tick: 200 - Offset: -6, -30 damaged-idle-lights: nthand_b Start: 8 Length: 8 Tick: 200 - Offset: -6, -30 make: nthandmk - Start: 0 Length: 15 ShadowStart: 15 - Offset: -6, -30 icon: handicon - Start: 0 + Offset: 0, 0 naweap: - idle: ntweap - Start: 0 - ShadowStart: 3 + Defaults: Offset: -12, -42 + idle: ntweap + ShadowStart: 3 damaged-idle: ntweap Start: 1 ShadowStart: 4 - Offset: -12, -42 dead: ntweap Start: 2 ShadowStart: 5 - Offset: -12, -42 Tick: 400 production-lights: ntweap_a - Start: 0 Length: 16 Tick: 100 ZOffset: 2048 - Offset: -12, -42 damaged-production-lights: ntweap_a Start: 16 Length: 16 Tick: 100 ZOffset: 2048 - Offset: -12, -42 build-top: ntweap_b - Start: 0 Length: 10 ShadowStart: 10 - Offset: -12, -42 damaged-build-top: ntweap_b Start: 10 Length: 10 ShadowStart: 20 - Offset: -12, -42 idle-top: ntweap_2 - Start: 0 - Offset: -12, -42 damaged-idle-top: ntweap_2 Start: 1 - Offset: -12, -42 make: ntweapmk - Start: 0 Length: 22 Tick: 80 ShadowStart: 22 - Offset: -12, -42 - icon: nwepicon - Start: 0 bib: ntweapbb - Start: 0 - Length: 1 - Offset: -12, -42 damaged-bib: ntweapbb Start: 1 - Length: 1 - Offset: -12, -42 dead-bib: ntweapbb Start: 2 - Length: 1 - Offset: -12, -42 + icon: nwepicon + Offset: 0, 0 # TODO: ntweap_1 & ntweap_b & ntweap_c are unused naradr: - idle: ntradr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: ntradr + ShadowStart: 3 damaged-idle: ntradr Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: ntradr Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 idle-dish: ntradr_a - Start: 0 Length: 24 Tick: 120 - Offset: 0, -24 damaged-idle-dish: ntradr_a Start: 24 Length: 24 Tick: 120 - Offset: 0, -24 make: ntradrmk - Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -24 icon: nradicon - Start: 0 + Offset: 0, 0 natech: - idle: nttech - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: nttech + ShadowStart: 3 damaged-idle: nttech Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: nttech Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 idle-lights: nttech_a - Start: 0 Length: 9 Tick: 120 - Offset: 0, -24 damaged-idle-lights: nttech_a - Start: 0 Length: 9 Tick: 120 - Offset: 0, -24 make: nttechmk - Start: 0 Length: 18 ShadowStart: 18 - Offset: 0, -24 icon: ntchicon - Start: 0 + Offset: 0, 0 garadr: - idle: gtradr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: gtradr + ShadowStart: 3 damaged-idle: gtradr Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: gtradr Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 idle-dish: gtradr_a Frames: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 Length: 28 Tick: 200 - Offset: 0, -24 damaged-idle-dish: gtradr_a Frames: 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16 Length: 28 Tick: 240 - Offset: 0, -24 make: gtradrmk - Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -24 icon: radricon - Start: 0 + Offset: 0, 0 gatech: - idle: gttech - Start: 0 - ShadowStart: 3 + Defaults: Offset: -12, -30 + idle: gttech + ShadowStart: 3 damaged-idle: gttech Start: 1 ShadowStart: 4 - Offset: -12, -30 dead: gttech Start: 2 ShadowStart: 5 - Offset: -12, -30 Tick: 400 idle-lights: gttech_a - Start: 0 Length: 8 Tick: 200 - Offset: -12, -30 damaged-idle-lights: gttech_a Start: 8 Length: 8 Tick: 240 - Offset: -12, -30 make: gttechmk - Start: 0 Length: 20 ShadowStart: 20 - Offset: -12, -30 icon: techicon - Start: 0 + Offset: 0, 0 gasand: + Defaults: + Offset: 0, -12 idle: gtsand - Start: 0 Length: 16 ShadowStart: 32 - Offset: 0, -12 damaged-idle: gtsand Start: 16 Length: 16 ShadowStart: 48 - Offset: 0, -12 icon: sbagicon - Start: 0 + Offset: 0, 0 gawall: + Defaults: + Offset: 0, -12 idle: gtwall - Start: 0 Length: 16 ShadowStart: 48 - Offset: 0, -12 damaged-idle: gtwall Start: 16 Length: 16 ShadowStart: 64 - Offset: 0, -12 critical-idle: gtwall Start: 32 Length: 16 ShadowStart: 80 - Offset: 0, -12 icon: wallicon - Start: 0 + Offset: 0, 0 nawall: + Defaults: + Offset: 0, -12 idle: ntwall - Start: 0 Length: 16 ShadowStart: 48 - Offset: 0, -12 damaged-idle: ntwall Start: 16 Length: 16 ShadowStart: 64 - Offset: 0, -12 critical-idle: ntwall Start: 32 Length: 16 ShadowStart: 80 - Offset: 0, -12 icon: nwalicon - Start: 0 + Offset: 0, 0 gatick: + Defaults: + Offset: 0, -13 idle: - Start: 0 - Facings: 1 ShadowStart: 3 - Offset: 0,-13 damaged-idle: Start: 1 - Facings: 1 ShadowStart: 4 - Offset: 0,-13 muzzle: gunfire - Start: 0 Length: * + Offset: 0, 0 make: gatickmk - Start: 0 Length: 24 ShadowStart: 24 - Offset: 0,-13 gaicbm: + Defaults: + Offset: 0, -12 idle: - Start: 0 - Facings: 1 ShadowStart: 3 - Offset: 0,-12 damaged-idle: Start: 1 - Facings: 1 ShadowStart: 4 - Offset: 0,-12 make: gaicbmmk - Start: 0 Length: 30 ShadowStart: 30 - Offset: 0,-12 gadpsa: + Defaults: + Offset: 0, -12 idle: - Start: 0 - Facings: 1 ShadowStart: 3 - Offset: 0,-12 damaged-idle: Start: 1 - Facings: 1 ShadowStart: 4 - Offset: 0,-12 make: gadpsamk - Start: 0 Length: 36 ShadowStart: 36 - Offset: 0,-12 gaarty: + Defaults: + Offset: 0, -12 idle: - Start: 0 - Facings: 1 ShadowStart: 3 - Offset: 0,-12 damaged-idle: Start: 1 - Facings: 1 ShadowStart: 4 - Offset: 0,-12 muzzle: gunfire - Start: 0 Length: * + Offset: 0, 0 make: gaartymk - Start: 0 Length: 16 ShadowStart: 16 - Offset: 0,-12 naobel: - idle: ntobel - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: ntobel + ShadowStart: 3 damaged-idle: ntobel Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: ntobel Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 active: ntobel #placeholder until Charge supports overlays - Start: 0 - Length: 1 ShadowStart: 3 - Offset: 0, -24 # active: ntobel_b -# Start: 0 # Length: 12 # Tick: 240 -# Offset: 0, -24 idle-lights: ntobel_a - Start: 0 Length: 12 Tick: 80 - Offset: 0, -24 make: ntobelmk - Start: 0 Length: 19 ShadowStart: 19 - Offset: 0, -24 icon: obliicon - Start: 0 + Offset: 0, 0 nalasr: - idle: ntlasr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -12 + idle: ntlasr + ShadowStart: 3 damaged-idle: ntlasr Start: 1 ShadowStart: 4 - Offset: 0, -12 dead: ntlasr Start: 2 ShadowStart: 5 - Offset: 0, -12 Tick: 400 make: ntlasrmk - Start: 0 Length: 21 ShadowStart: 21 - Offset: 0, -12 icon: plticon - Start: 0 + Offset: 0, 0 nasam: - idle: ntsam - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -12 + idle: ntsam + ShadowStart: 3 damaged-idle: ntsam Start: 1 ShadowStart: 4 - Offset: 0, -12 dead: ntsam Start: 2 ShadowStart: 5 - Offset: 0, -12 Tick: 400 turret: gtctwr_d - Start: 0 Facings: 32 Offset: -4, 0 make: ntsammk - Start: 0 Length: 8 ShadowStart: 8 - Offset: 0, -12 icon: samicon - Start: 0 + Offset: 0, 0 napuls: - idle: ntpuls - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: ntpuls + ShadowStart: 3 damaged-idle: ntpuls Start: 1 ShadowStart: 4 - Offset: 0, -24 dead: ntpuls Start: 2 ShadowStart: 5 - Offset: 0, -24 Tick: 400 turret: ntpuls_a - Start: 0 Facings: 32 - Offset: 0, -24 make: ntpulsmk - Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -24 icon: pulsicon - Start: 0 + Offset: 0, 0 nastlh: + Defaults: + Offset: -6, -30 idle: ntstlh - Start: 0 ShadowStart: 3 damaged-idle: ntstlh Start: 1 @@ -785,7 +595,6 @@ nastlh: ShadowStart: 5 Tick: 400 pulse: ntstlh_a - Start: 0 Length: 4 Tick: 480 damaged-pulse: ntstlh_a @@ -793,219 +602,158 @@ nastlh: Length: 4 Tick: 480 make: ntstlhmk - Start: 0 Length: 18 ShadowStart: 20 icon: clckicon - Start: 0 + Offset: 0, 0 gavulc: - idle: gtctwr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -12 + idle: gtctwr + ShadowStart: 3 damaged-idle: gtctwr Start: 1 ShadowStart: 4 - Offset: 0, -12 dead: gtctwr Start: 2 ShadowStart: 5 - Offset: 0, -12 Tick: 400 turret: gtctwr_b - Start: 0 Facings: 32 - Offset: 0, -12 muzzle0: mgun-n - Start: 0 Length: * - Offset: 0, -12 muzzle1: mgun-nw - Start: 0 Length: * - Offset: 0, -12 muzzle2: mgun-w - Start: 0 Length: * - Offset: 0, -12 muzzle3: mgun-sw - Start: 0 Length: * - Offset: 0, -12 muzzle4: mgun-s - Start: 0 Length: * - Offset: 0, -12 muzzle5: mgun-se - Start: 0 Length: * - Offset: 0, -12 muzzle6: mgun-e - Start: 0 Length: * - Offset: 0, -12 muzzle7: mgun-ne - Start: 0 Length: * - Offset: 0, -12 idle-lights: gtctwr_a - Start: 0 Length: 6 Tick: 200 - Offset: 0, -12 damaged-idle-lights: gtctwr_a - Start: 0 Length: 6 Tick: 200 - Offset: 0, -12 make: gtctwrmk - Start: 0 Length: 11 ShadowStart: 11 - Offset: 0, -12 icon: twr1icon - Start: 0 + Offset: 0, 0 garock: - idle: gtctwr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -12 + idle: gtctwr + ShadowStart: 3 damaged-idle: gtctwr Start: 1 ShadowStart: 4 - Offset: 0, -12 dead: gtctwr Start: 2 ShadowStart: 5 - Offset: 0, -12 Tick: 400 turret: gtctwr_c - Start: 0 Facings: 32 - Offset: 0, -12 idle-lights: gtctwr_a - Start: 0 Length: 6 Tick: 200 - Offset: 0, -12 damaged-idle-lights: gtctwr_a - Start: 0 Length: 6 Tick: 200 - Offset: 0, -12 make: gtctwrmk - Start: 0 Length: 11 ShadowStart: 11 - Offset: 0, -12 icon: twr2icon - Start: 0 + Offset: 0, 0 gacsam: - idle: gtctwr - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -12 + idle: gtctwr + ShadowStart: 3 damaged-idle: gtctwr Start: 1 ShadowStart: 4 - Offset: 0, -12 dead: gtctwr Start: 2 ShadowStart: 5 - Offset: 0, -12 Tick: 400 turret: gtctwr_d - Start: 0 Facings: 32 - Offset: 0, -12 idle-lights: gtctwr_a - Start: 0 Length: 6 Tick: 200 - Offset: 0, -12 damaged-idle-lights: gtctwr_a - Start: 0 Length: 6 Tick: 200 - Offset: 0, -12 make: gtctwrmk - Start: 0 Length: 11 ShadowStart: 11 - Offset: 0, -12 icon: twr3icon - Start: 0 + Offset: 0, 0 gaspot: - idle: - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -12 + idle: + ShadowStart: 3 damaged-idle: Start: 1 ShadowStart: 4 - Offset: 0, -12 dead: Start: 2 ShadowStart: 5 - Offset: 0, -12 Tick: 400 idle-lights: gaspot_a - Start: 0 Length: 8 Tick: 200 - Offset: 0, -12 damaged-idle-lights: gaspot_a Start: 8 Length: 8 Tick: 200 - Offset: 0, -12 make: gaspotmk - Start: 0 Length: 14 ShadowStart: 14 - Offset: 0, -12 icon: spoticon - Start: 0 + Offset: 0, 0 gahpad: - idle: gthpad - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: gthpad + ShadowStart: 3 ZOffset: -1c511 damaged-idle: gthpad Start: 1 ShadowStart: 4 - Offset: 0, -24 ZOffset: -1c511 dead: gthpad Start: 2 ShadowStart: 5 - Offset: 0, -24 ZOffset: -1c511 Tick: 400 idle-platform: gthpadbb - Start: 0 ShadowStart: 3 - Offset: 0, -24 ZOffset: -1c511 damaged-idle-platform: gthpadbb Start: 1 ShadowStart: 4 - Offset: 0, -24 ZOffset: -1c511 dead-platform: gthpadbb Start: 2 ShadowStart: 5 - Offset: 0, -24 ZOffset: -1c511 Tick: 400 idle-lights: gthpad_a - Start: 0 Length: 8 Tick: 200 Offset: 0, -36 @@ -1017,326 +765,246 @@ gahpad: Offset: 0, -36 ZOffset: -1c511 make: gthpadmk - Start: 0 Length: 18 ShadowStart: 18 - Offset: 0, -24 ZOffset: -1c511 icon: heliicon - Start: 0 + Offset: 0, 0 nahpad: - idle: nthpad - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -24 + idle: nthpad + ShadowStart: 3 ZOffset: -1c511 damaged-idle: nthpad Start: 1 ShadowStart: 4 - Offset: 0, -24 ZOffset: -1c511 dead: nthpad Start: 2 ShadowStart: 5 - Offset: 0, -24 ZOffset: -1c511 Tick: 400 idle-platform: nthpadbb - Start: 0 ShadowStart: 3 - Offset: 0, -24 ZOffset: -1c511 damaged-idle-platform: nthpadbb Start: 1 ShadowStart: 4 - Offset: 0, -24 ZOffset: -1c511 dead-platform: nthpadbb Start: 2 ShadowStart: 5 - Offset: 0, -24 ZOffset: -1c511 Tick: 400 idle-lights: nthpad_a - Start: 0 Length: 46 - Offset: 0, -24 ZOffset: -1c511 Tick: 120 damaged-idle-lights: nthpad_a Start: 46 Length: 46 Tick: 120 - Offset: 0, -24 ZOffset: -1c511 make: nthpadmk - Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -24 icon: nhpdicon - Start: 0 + Offset: 0, 0 proc: # TODO: unused narefn_a, narefn_b - idle: ntrefn - Start: 0 - ShadowStart: 3 + Defaults: Offset: -12, -42 + idle: ntrefn + ShadowStart: 3 damaged-idle: ntrefn Start: 1 ShadowStart: 4 - Offset: -12, -42 dead: ntrefn Start: 2 ShadowStart: 5 - Offset: -12, -42 Tick: 400 make: ntrefnmk - Start: 0 Length: 20 ShadowStart: 20 - Offset: -12, -42 idle-redlights: ntrefn_c - Start: 0 Length: 16 Tick: 120 - Offset: -12, -42 damaged-idle-redlights: ntrefn_c - Start: 0 Length: 16 Tick: 120 - Offset: -12, -42 bib: ntrefnbb - Start: 0 - Length: 1 - Offset: -12, -42 damaged-bib: ntrefnbb Start: 1 - Length: 1 - Offset: -12, -42 icon: reficon - Start: 0 + Offset: 0, 0 gasilo: - idle: gtsilo_a - Start: 0 - Length: 4 + Defaults: Offset: 0, -24 + idle: gtsilo_a + Length: 4 damaged-idle: gtsilo_a Start: 4 Length: 4 - Offset: 0, -24 idle-underlay: gtsilo - Start: 0 ShadowStart: 3 ZOffset: -512 - Offset: 0, -24 damaged-idle-underlay: gtsilo Start: 1 ShadowStart: 4 ZOffset: -512 - Offset: 0, -24 dead: gtsilo Start: 2 ShadowStart: 5 ZOffset: -512 - Offset: 0, -24 Tick: 400 idle-lights: gtsilo_b - Start: 0 Length: 16 Tick: 120 - Offset: 0, -24 damaged-idle-lights: gtsilo_b Start: 16 Length: 16 Tick: 120 - Offset: 0, -24 icon: siloicon - Start: 0 + Offset: 0, 0 make: gtsilomk - Start: 0 Length: 18 ShadowStart: 20 - Offset: 0, -24 galite: - idle: gtlite - Start: 0 - ShadowStart: 2 + Defaults: Offset: 0, -12 + idle: gtlite + ShadowStart: 2 damaged-idle: gtlite Start: 1 ShadowStart: 3 - Offset: 0, -12 # lighting: alphatst -# Start: 0 # ZOffset: -1c511 # BlendMode: Alpha icon: liteicon - Start: 0 + Offset: 0, 0 gadept: - idle: gtdept - Start: 0 - ShadowStart: 3 + Defaults: Offset: 0, -36 + idle: gtdept + ShadowStart: 3 damaged-idle: gtdept Start: 1 ShadowStart: 4 - Offset: 0, -36 dead: gtdept Start: 2 ShadowStart: 5 - Offset: 0, -36 Tick: 400 ground: gtdeptbb - Start: 0 ShadowStart: 3 ZOffset: -1c611 - Offset: 0, -36 damaged-ground: gtdeptbb Start: 1 ShadowStart: 4 ZOffset: -1c611 - Offset: 0, -36 dead-ground: gtdeptbb Start: 2 ShadowStart: 5 ZOffset: -1c611 - Offset: 0, -36 Tick: 400 idle-light: gtdept_b - Start: 0 Length: 7 Tick: 120 - Offset: 0, -36 damaged-idle-light: gtdept_b Start: 7 Length: 7 Tick: 120 - Offset: 0, -36 circuits: gtdept_a - Start: 0 Length: 5 ZOffset: -1c511 - Offset: 0, -36 damaged-circuits: gtdept_a Start: 5 Length: 5 ZOffset: -1c511 - Offset: 0, -36 crane: gtdept_c - Start: 0 Length: 16 - Offset: 0, -36 platform: gtdept_d - Start: 0 Length: 7 ZOffset: -1c511 - Offset: 0, -36 damaged-platform: gtdept_d Start: 7 Length: 7 ZOffset: -1c511 - Offset: 0, -36 make: gtdeptmk - Start: 0 Length: 10 Tick: 60 ShadowStart: 10 - Offset: 0, -36 icon: fixicon - Start: 0 + Offset: 0, 0 namisl: - idle: ntmisl - Start: 0 + Defaults: Offset: 0, -24 + idle: ntmisl damaged-idle: ntmisl Start: 1 - Offset: 0, -24 dead: ntmisl Start: 2 - Offset: 0, -24 Tick: 400 idle-lights: ntmisl_b - Start: 0 Length: 10 Tick: 120 - Offset: 0, -24 damaged-idle-lights: ntmisl_b Start: 10 Length: 10 Tick: 120 - Offset: 0, -24 make: ntmislmk - Start: 0 Length: 18 ShadowStart: 18 - Offset: 0, -24 active: ntmisl_a - Start: 0 Length: 10 Tick: 80 - Offset: 0, -24 damaged-active: ntmisl_a Start: 10 Length: 10 Tick: 80 - Offset: 0, -24 icon: msslicon - Start: 0 + Offset: 0, 0 gaplug: - idle: gaplug - Start: 0 - ShadowStart: 3 + Defaults: Offset: 12, -30 + idle: gaplug + ShadowStart: 3 damaged-idle: gaplug Start: 1 ShadowStart: 4 - Offset: 12, -30 dead: gaplug Start: 2 ShadowStart: 5 - Offset: 12, -30 Tick: 400 idle-dish: gaplug_a - Start: 0 Length: 20 Tick: 120 - Offset: 12, -30 damaged-idle-dish: gaplug_a Start: 20 Length: 20 Tick: 120 - Offset: 12, -30 idle-lights: gaplug_b - Start: 0 Length: 20 Tick: 120 - Offset: 12, -30 damaged-idle-lights: gaplug_b Start: 20 Length: 20 Tick: 120 - Offset: 12, -30 idle-strip: gaplug_c - Start: 0 Length: 8 Tick: 120 - Offset: 12, -30 damaged-idle-strip: gaplug_c Start: 8 Length: 8 Tick: 120 - Offset: 12, -30 make: gtplugmk - Start: 0 Length: 17 ShadowStart: 17 - Offset: 12, -30 icon: plugicon - Start: 0 + Offset: 0, 0 diff --git a/mods/ts/sequences/trees.yaml b/mods/ts/sequences/trees.yaml index 587c447522..ca2eb4c751 100644 --- a/mods/ts/sequences/trees.yaml +++ b/mods/ts/sequences/trees.yaml @@ -1,180 +1,147 @@ tibtre01: - idle: - Start: 0 - Length: 1 - ShadowStart: 11 + Defaults: Offset: 0, -12 + idle: + ShadowStart: 11 active: Start: 1 Length: 10 ShadowStart: 12 Tick: 160 - Offset: 0, -12 tibtre02: - idle: - Start: 0 - Length: 1 - ShadowStart: 11 + Defaults: Offset: 0, -12 + idle: + ShadowStart: 11 active: Start: 1 Length: 10 ShadowStart: 12 Tick: 160 - Offset: 0, -12 tibtre03: - idle: - Start: 0 - Length: 1 - ShadowStart: 11 + Defaults: Offset: 0, -12 + idle: + ShadowStart: 11 active: Start: 1 Length: 10 ShadowStart: 12 Tick: 160 - Offset: 0, -12 bigblue: - idle: bigblue2 - Start: 0 - Length: 1 - ShadowStart: 10 + Defaults: Offset: 0, -12 + idle: bigblue2 + ShadowStart: 10 active: bigblue2 Start: 1 Length: 9 ShadowStart: 11 Tick: 160 - Offset: 0, -12 tree01: idle: - Start: 0 ShadowStart: 1 tree02: idle: - Start: 0 ShadowStart: 1 tree03: idle: - Start: 0 ShadowStart: 1 tree04: idle: - Start: 0 ShadowStart: 1 tree05: idle: - Start: 0 ShadowStart: 1 tree06: idle: - Start: 0 ShadowStart: 1 tree07: idle: - Start: 0 ShadowStart: 1 tree08: idle: - Start: 0 ShadowStart: 1 tree09: idle: - Start: 0 ShadowStart: 1 tree10: idle: - Start: 0 ShadowStart: 1 tree11: idle: - Start: 0 ShadowStart: 1 tree12: idle: - Start: 0 ShadowStart: 1 tree13: idle: - Start: 0 ShadowStart: 1 tree14: idle: - Start: 0 ShadowStart: 1 tree15: idle: - Start: 0 ShadowStart: 1 tree16: idle: - Start: 0 ShadowStart: 1 tree17: idle: - Start: 0 ShadowStart: 1 tree18: idle: - Start: 0 ShadowStart: 1 tree19: idle: - Start: 0 ShadowStart: 1 tree20: idle: - Start: 0 ShadowStart: 1 + tree21: idle: - Start: 0 ShadowStart: 1 tree22: idle: - Start: 0 ShadowStart: 1 tree23: idle: - Start: 0 ShadowStart: 1 tree24: idle: - Start: 0 ShadowStart: 1 tree25: idle: - Start: 0 ShadowStart: 1 veinhole: idle: - Start: 0 ShadowStart: 1 diff --git a/mods/ts/sequences/vehicles.yaml b/mods/ts/sequences/vehicles.yaml index 17c49a50f8..a9787def6d 100644 --- a/mods/ts/sequences/vehicles.yaml +++ b/mods/ts/sequences/vehicles.yaml @@ -1,136 +1,94 @@ mcv: icon: mcvicon - Start: 0 apc: icon: apcicon - Start: 0 harv: icon: harvicon - Start: 0 harvest: harvestr - Start: 0 Length: * hvr: icon: hovricon - Start: 0 4tnk: muzzle: gunfire - Start: 0 Length: * icon: xxicon - Start: 0 truckb: icon: xxicon - Start: 0 lpst: icon: lpsticon - Start: 0 icbm: icon: xxicon - Start: 0 repair: icon: rboticon - Start: 0 art2: icon: artyicon - Start: 0 weed: icon: weedicon - Start: 0 bus: icon: xxicon - Start: 0 pick: icon: xxicon - Start: 0 car: icon: xxicon - Start: 0 wini: icon: xxicon - Start: 0 hmec: icon: hmecicon - Start: 0 bike: icon: cyclicon - Start: 0 bggy: + Defaults: + Length: * muzzle0: mgun-n - Start: 0 - Length: * muzzle1: mgun-nw - Start: 0 - Length: * muzzle2: mgun-w - Start: 0 - Length: * muzzle3: mgun-sw - Start: 0 - Length: * muzzle4: mgun-s - Start: 0 - Length: * muzzle5: mgun-se - Start: 0 - Length: * muzzle6: mgun-e - Start: 0 - Length: * muzzle7: mgun-ne - Start: 0 - Length: * icon: bggyicon - Start: 0 sapc: icon: sapcicon - Start: 0 subtank: icon: subticon - Start: 0 sonic: icon: soniicon - Start: 0 ttnk: muzzle: gunfire - Start: 0 Length: * icon: tickicon - Start: 0 stnk: icon: stnkicon - Start: 0 mmch: stand: - Start: 0 Facings: -8 Stride: 15 ShadowStart: 152 run: - Start: 0 Length: 15 Facings: -8 ShadowStart: 152 @@ -138,19 +96,15 @@ mmch: Start: 120 Facings: -32 muzzle: gunfire - Start: 0 Length: * icon: mmchicon - Start: 0 gghunt: idle: - Start: 0 Facings: 1 Length: 8 ShadowStart: 8 icon: seekicon - Start: 0 smech: stand: @@ -158,7 +112,6 @@ smech: Facings: -8 ShadowStart: 232 run: - Start: 0 Facings: -8 Length: 12 ShadowStart: 136 @@ -169,4 +122,3 @@ smech: ShadowStart: 240 Tick: 100 icon: smchicon - Start: 0 \ No newline at end of file