Merge pull request #7700 from pchote/sequence-defaults

Add support for per-sequence animation defaults
This commit is contained in:
Matthias Mailänder
2015-03-22 20:22:04 +01:00
8 changed files with 180 additions and 1220 deletions

View File

@@ -28,8 +28,16 @@ namespace OpenRA.Mods.Common.Graphics
public IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, TileSet tileSet, SpriteCache cache, MiniYamlNode node) public IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, TileSet tileSet, SpriteCache cache, MiniYamlNode node)
{ {
var sequences = new Dictionary<string, ISpriteSequence>(); var sequences = new Dictionary<string, ISpriteSequence>();
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)) using (new Support.PerfTimer("new Sequence(\"{0}\")".F(node.Key), 20))
{ {

View File

@@ -1,36 +1,27 @@
dpod: dpod:
icon: podsicon icon: podsicon
Start: 0
dshp: dshp:
icon: xxicon icon: xxicon
Start: 0
orca: orca:
icon: orcaicon icon: orcaicon
Start: 0
orcab: orcab:
icon: obmbicon icon: obmbicon
Start: 0
orcatran: orcatran:
icon: crryicon icon: crryicon
Start: 0
trnsport: trnsport:
icon: otrnicon icon: otrnicon
Start: 0
scrin: scrin:
icon: proicon icon: proicon
Start: 0
apache: apache:
icon: apchicon icon: apchicon
Start: 0
rotor: lrotor rotor: lrotor
Start: 0
Length: 4 Length: 4
slow-rotor: lrotor slow-rotor: lrotor
Start: 4 Start: 4

View File

@@ -1,475 +1,343 @@
ammocrat: ammocrat:
idle: ammo01 idle: ammo01
Start: 0
ShadowStart: 2 ShadowStart: 2
aban01: aban01:
idle: aban01 idle: aban01
Start: 0
ShadowStart: 2 ShadowStart: 2
aban02: aban02:
idle: aban02 idle: aban02
Start: 0
ShadowStart: 2 ShadowStart: 2
aban03: aban03:
idle: aban03 idle: aban03
Start: 0
ShadowStart: 2 ShadowStart: 2
aban04: aban04:
idle: aban04 idle: aban04
Start: 0
ShadowStart: 2 ShadowStart: 2
aban05: aban05:
idle: aban05 idle: aban05
Start: 0
ShadowStart: 2 ShadowStart: 2
aban06: aban06:
idle: aban06 idle: aban06
Start: 0
ShadowStart: 2 ShadowStart: 2
aban07: aban07:
idle: aban07 idle: aban07
Start: 0
ShadowStart: 2 ShadowStart: 2
aban08: aban08:
idle: aban08 idle: aban08
Start: 0
ShadowStart: 2 ShadowStart: 2
aban09: aban09:
idle: aban09 idle: aban09
Start: 0
ShadowStart: 2 ShadowStart: 2
aban10: aban10:
idle: aban10 idle: aban10
Start: 0
ShadowStart: 2 ShadowStart: 2
aban11: aban11:
idle: aban11 idle: aban11
Start: 0
ShadowStart: 2 ShadowStart: 2
aban12: aban12:
idle: aban12 idle: aban12
Start: 0
ShadowStart: 2 ShadowStart: 2
aban13: aban13:
idle: aban13 idle: aban13
Start: 0
ShadowStart: 2 ShadowStart: 2
aban14: aban14:
idle: aban14 idle: aban14
Start: 0
ShadowStart: 2 ShadowStart: 2
aban15: aban15:
idle: aban15 idle: aban15
Start: 0
ShadowStart: 2 ShadowStart: 2
aban16: aban16:
idle: aban16 idle: aban16
Start: 0
ShadowStart: 2 ShadowStart: 2
aban17: aban17:
idle: aban17 idle: aban17
Start: 0
ShadowStart: 2 ShadowStart: 2
aban18: aban18:
idle: aban18 idle: aban18
Start: 0
ShadowStart: 2 ShadowStart: 2
bboard01: bboard01:
idle: bboard01 idle: bboard01
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard02: bboard02:
idle: bboard02 idle: bboard02
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard03: bboard03:
idle: bboard03 idle: bboard03
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard04: bboard04:
idle: bboard04 idle: bboard04
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard05: bboard05:
idle: bboard05 idle: bboard05
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard06: bboard06:
idle: bboard06 idle: bboard06
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard07: bboard07:
idle: bboard07 idle: bboard07
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard08: bboard08:
idle: bboard08 idle: bboard08
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard09: bboard09:
idle: bboard09 idle: bboard09
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard10: bboard10:
idle: bboard10 idle: bboard10
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard11: bboard11:
idle: bboard11 idle: bboard11
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard12: bboard12:
idle: bboard12 idle: bboard12
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard13: bboard13:
idle: bboard13 idle: bboard13
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard14: bboard14:
idle: bboard14 idle: bboard14
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard15: bboard15:
idle: bboard15 idle: bboard15
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
bboard16: bboard16:
idle: bboard16 idle: bboard16
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0001: ca0001:
idle: ct0001 idle: ct0001
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0002: ca0002:
idle: ct0002 idle: ct0002
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0003: ca0003:
idle: ct0003 idle: ct0003
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0004: ca0004:
idle: ct0004 idle: ct0004
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0005: ca0005:
idle: ct0005 idle: ct0005
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0006: ca0006:
idle: ct0006 idle: ct0006
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0007: ca0007:
idle: ct0007 idle: ct0007
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0008: ca0008:
idle: ct0008 idle: ct0008
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0009: ca0009:
idle: ct0009 idle: ct0009
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0010: ca0010:
idle: ct0010 idle: ct0010
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0011: ca0011:
idle: ct0011 idle: ct0011
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0012: ca0012:
idle: ct0012 idle: ct0012
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0013: ca0013:
idle: ct0013 idle: ct0013
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0014: ca0014:
idle: ct0014 idle: ct0014
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0015: ca0015:
idle: ct0015 idle: ct0015
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0016: ca0016:
idle: ct0016 idle: ct0016
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0017: ca0017:
idle: ct0017 idle: ct0017
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0018: ca0018:
idle: ct0018 idle: ct0018
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0019: ca0019:
idle: ct0019 idle: ct0019
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0020: ca0020:
idle: ct0020 idle: ct0020
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
ca0021: ca0021:
idle: ct0021 idle: ct0021
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
caarmr: caarmr:
idle: ctarmr idle: ctarmr
Start: 0
ShadowStart: 3 ShadowStart: 3
damaged-idle: ctarmr damaged-idle: ctarmr
Start: 1 Start: 1
Length: 1
ShadowStart: 4 ShadowStart: 4
critical-idle: ctarmr critical-idle: ctarmr
Start: 2 Start: 2
@@ -477,11 +345,9 @@ caarmr:
caaray: caaray:
idle: ctaray idle: ctaray
Start: 0
ShadowStart: 3 ShadowStart: 3
damaged-idle: ctaray damaged-idle: ctaray
Start: 1 Start: 1
Length: 1
ShadowStart: 4 ShadowStart: 4
critical-idle: ctaray critical-idle: ctaray
Start: 2 Start: 2
@@ -489,389 +355,266 @@ caaray:
cabhut: cabhut:
idle: cabhut idle: cabhut
Start: 0
cacrsh01: cacrsh01:
idle: ctcrsh01 idle: ctcrsh01
Start: 0
cacrsh02: cacrsh02:
idle: ctcrsh02 idle: ctcrsh02
Start: 0
cacrsh03: cacrsh03:
idle: ctcrsh03 idle: ctcrsh03
Start: 0
cacrsh04: cacrsh04:
idle: ctcrsh04 idle: ctcrsh04
Start: 0
cacrsh05: cacrsh05:
idle: ctcrsh05 idle: ctcrsh05
Start: 0
cahosp: cahosp:
idle: cthosp idle: cthosp
Start: 0
ShadowStart: 2 ShadowStart: 2
capyr01: capyr01:
idle: ctpyr01 idle: ctpyr01
Start: 0
ShadowStart: 1 ShadowStart: 1
capyr02: capyr02:
idle: ctpyr02 idle: ctpyr02
Start: 0
ShadowStart: 1 ShadowStart: 1
capyr03: capyr03:
idle: ctpyr03 idle: ctpyr03
Start: 0
ShadowStart: 1 ShadowStart: 1
city01: city01:
idle: city01 idle: city01
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city01 make: city01
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city02: city02:
idle: city02 idle: city02
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city02 make: city02
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city03: city03:
idle: city03 idle: city03
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city03 make: city03
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city04: city04:
idle: city04 idle: city04
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city04 make: city04
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city05: city05:
idle: city05 idle: city05
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city05 make: city05
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city06: city06:
idle: city06 idle: city06
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city06 make: city06
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city07: city07:
idle: city07 idle: city07
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city07 make: city07
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city08: city08:
idle: city08 idle: city08
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city08 make: city08
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city09: city09:
idle: city09 idle: city09
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city09 make: city09
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city10: city10:
idle: city10 idle: city10
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city10 make: city10
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city11: city11:
idle: city11 idle: city11
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city11 make: city11
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city12: city12:
idle: city12 idle: city12
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city12 make: city12
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city13: city13:
idle: city13 idle: city13
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city13 make: city13
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city14: city14:
idle: city14 idle: city14
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city14 make: city14
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city15: city15:
idle: city15 idle: city15
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city15 make: city15
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city16: city16:
idle: city16 idle: city16
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city16 make: city16
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city17: city17:
idle: city17 idle: city17
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city17 make: city17
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city18: city18:
idle: city18 idle: city18
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city18 make: city18
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city19: city19:
idle: city19 idle: city19
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city19 make: city19
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city20: city20:
idle: city20 idle: city20
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city20 make: city20
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city21: city21:
idle: city21 idle: city21
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city21 make: city21
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
city22: city22:
idle: city22 idle: city22
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
damaged-idle: damaged-idle:
Start: 1 Start: 1
Length: 1
ShadowStart: 3 ShadowStart: 3
make: city22 make: city22
Start: 0
ShadowStart: 2 ShadowStart: 2
Length: 1
Tick: 80 Tick: 80
ctdam: ctdam:
idle: ctdam idle: ctdam
Start: 0
ctvega: ctvega:
idle: ctvega idle: ctvega
Start: 0
ShadowStart: 3 ShadowStart: 3
damaged-idle: ctvega damaged-idle: ctvega
Start: 1 Start: 1
Length: 1
ShadowStart: 4 ShadowStart: 4
critical-idle: ctvega critical-idle: ctvega
Start: 2 Start: 2
@@ -879,46 +622,37 @@ ctvega:
gaoldcc1: gaoldcc1:
idle: gtoldcc1 idle: gtoldcc1
Start: 0
ShadowStart: 2 ShadowStart: 2
gaoldcc2: gaoldcc2:
idle: gtoldcc2 idle: gtoldcc2
Start: 0
ShadowStart: 2 ShadowStart: 2
gaoldcc3: gaoldcc3:
idle: gtoldcc3 idle: gtoldcc3
Start: 0
ShadowStart: 2 ShadowStart: 2
gaoldcc4: gaoldcc4:
idle: gtoldcc4 idle: gtoldcc4
Start: 0
ShadowStart: 2 ShadowStart: 2
gaoldcc5: gaoldcc5:
idle: gtoldcc5 idle: gtoldcc5
Start: 0
ShadowStart: 2 ShadowStart: 2
gaoldcc6: gaoldcc6:
idle: gtoldcc6 idle: gtoldcc6
Start: 0
ShadowStart: 2 ShadowStart: 2
gagreen: gagreen:
idle: gagreen idle: gagreen
Start: 0
ShadowStart: 2 ShadowStart: 2
gakodk: gakodk:
idle: gtkodk idle: gtkodk
Start: 0
ShadowStart: 3 ShadowStart: 3
damaged-idle: gtkodk damaged-idle: gtkodk
Start: 1 Start: 1
Length: 1
ShadowStart: 4 ShadowStart: 4
critical-idle: gtkodk critical-idle: gtkodk
Start: 2 Start: 2
@@ -926,11 +660,9 @@ gakodk:
namntk: namntk:
idle: ntmntk idle: ntmntk
Start: 0
ShadowStart: 3 ShadowStart: 3
damaged-idle: ntmntk damaged-idle: ntmntk
Start: 1 Start: 1
Length: 1
ShadowStart: 4 ShadowStart: 4
critical-idle: ntmntk critical-idle: ntmntk
Start: 2 Start: 2
@@ -938,11 +670,9 @@ namntk:
ntpyra: ntpyra:
idle: ntpyra idle: ntpyra
Start: 0
ShadowStart: 3 ShadowStart: 3
damaged-idle: ntpyra damaged-idle: ntpyra
Start: 1 Start: 1
Length: 1
ShadowStart: 4 ShadowStart: 4
critical-idle: ntpyra critical-idle: ntpyra
Start: 2 Start: 2
@@ -950,5 +680,4 @@ ntpyra:
ufo: ufo:
idle: ufo idle: ufo
Start: 0
Offset: -24, -60 Offset: -24, -60

View File

@@ -1,6 +1,5 @@
e1: e1:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -27,7 +26,6 @@ e1:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -42,7 +40,6 @@ e1:
ShadowStart: 441 ShadowStart: 441
Tick: 80 Tick: 80
die3: infdie die3: infdie
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
die-crushed: die-crushed:
@@ -75,15 +72,12 @@ e1:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: e1icon icon: e1icon
Start: 0
e2: e2:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -110,7 +104,6 @@ e2:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -125,7 +118,6 @@ e2:
ShadowStart: 441 ShadowStart: 441
Tick: 80 Tick: 80
die3: infdie die3: infdie
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
die-crushed: die-crushed:
@@ -158,15 +150,12 @@ e2:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: e2icon icon: e2icon
Start: 0
e3: e3:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -193,7 +182,6 @@ e3:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -208,7 +196,6 @@ e3:
ShadowStart: 441 ShadowStart: 441
Tick: 80 Tick: 80
die3: infdie die3: infdie
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
die-crushed: die-crushed:
@@ -241,15 +228,12 @@ e3:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: e4icon icon: e4icon
Start: 0
weedguy: weedguy:
stand: weed stand: weed
Start: 0
Facings: 8 Facings: 8
ShadowStart: 202 ShadowStart: 202
run: weed run: weed
@@ -260,7 +244,6 @@ weedguy:
ShadowStart: 210 ShadowStart: 210
shoot: weed shoot: weed
Start: 56 Start: 56
Length: 1
Facings: 8 Facings: 8
Tick: 80 Tick: 80
prone-shoot: weed prone-shoot: weed
@@ -281,7 +264,6 @@ weedguy:
ShadowStart: 288 ShadowStart: 288
prone-stand: weed prone-stand: weed
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 288 ShadowStart: 288
@@ -311,7 +293,6 @@ weedguy:
ShadowStart: 379 ShadowStart: 379
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
die-crushed: weed die-crushed: weed
@@ -320,11 +301,9 @@ weedguy:
ShadowStart: 376 ShadowStart: 376
Tick: 1000 Tick: 1000
icon: weaticon icon: weaticon
Start: 0
medic: medic:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 307 ShadowStart: 307
run: run:
@@ -351,7 +330,6 @@ medic:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -402,15 +380,12 @@ medic:
Length: 104 Length: 104
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mediicon icon: mediicon
Start: 0
engineer: engineer:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -437,7 +412,6 @@ engineer:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -474,15 +448,12 @@ engineer:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: engnicon icon: engnicon
Start: 0
umagon: umagon:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -509,7 +480,6 @@ umagon:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -558,15 +528,12 @@ umagon:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: umagicon icon: umagicon
Start: 0
ghost: # TODO unused GUNFIRE.SHP ghost: # TODO unused GUNFIRE.SHP
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -593,7 +560,6 @@ ghost: # TODO unused GUNFIRE.SHP
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -642,15 +608,12 @@ ghost: # TODO unused GUNFIRE.SHP
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: gosticon icon: gosticon
Start: 0
jumpjet: # TODO: ShadowStart: jumpjet: # TODO: ShadowStart:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 451 ShadowStart: 451
run: run:
@@ -676,7 +639,6 @@ jumpjet: # TODO: ShadowStart:
Tick: 80 Tick: 80
ShadowStart: 538 ShadowStart: 538
prone-stand: prone-stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 451 ShadowStart: 451
die1: die1:
@@ -724,15 +686,12 @@ jumpjet: # TODO: ShadowStart:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: jjeticon icon: jjeticon
Start: 0
mhijack: mhijack:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -759,7 +718,6 @@ mhijack:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -808,15 +766,12 @@ mhijack:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mutcicon icon: mutcicon
Start: 0
chamspy: chamspy:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -843,7 +798,6 @@ chamspy:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -892,15 +846,12 @@ chamspy:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: chamicon icon: chamicon
Start: 0
cyc2: cyc2:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 308 ShadowStart: 308
run: run:
@@ -927,7 +878,6 @@ cyc2:
ShadowStart: 418 ShadowStart: 418
prone-stand: prone-stand:
Start: 110 Start: 110
Length: 1
Facings: 8 Facings: 8
Stride: 9 Stride: 9
ShadowStart: 418 ShadowStart: 418
@@ -942,7 +892,6 @@ cyc2:
ShadowStart: 505 ShadowStart: 505
Tick: 80 Tick: 80
die3: infexpl die3: infexpl
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
shoot: shoot:
@@ -969,15 +918,12 @@ cyc2:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: cybcicon icon: cybcicon
Start: 0
cyborg: cyborg:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 370 ShadowStart: 370
run: run:
@@ -1004,7 +950,6 @@ cyborg:
ShadowStart: 456 ShadowStart: 456
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 456 ShadowStart: 456
@@ -1047,15 +992,12 @@ cyborg:
ShadowStart: 677 ShadowStart: 677
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: cybiicon icon: cybiicon
Start: 0
mutant: mutant:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1082,7 +1024,6 @@ mutant:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -1131,15 +1072,12 @@ mutant:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mutcicon icon: mutcicon
Start: 0
mwmn: mwmn:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1166,7 +1104,6 @@ mwmn:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -1215,15 +1152,12 @@ mwmn:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mutcicon icon: mutcicon
Start: 0
mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: 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 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 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 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mutcicon icon: mutcicon
Start: 0
tratos: tratos:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1334,7 +1264,6 @@ tratos:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -1383,15 +1312,12 @@ tratos:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mutcicon icon: mutcicon
Start: 0
oxanna: oxanna:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1418,7 +1344,6 @@ oxanna:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -1467,15 +1392,12 @@ oxanna:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mutcicon icon: mutcicon
Start: 0
slav: slav:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1502,7 +1424,6 @@ slav:
ShadowStart: 378 ShadowStart: 378
prone-stand: prone-stand:
Start: 86 Start: 86
Length: 1
Facings: 8 Facings: 8
Stride: 6 Stride: 6
ShadowStart: 378 ShadowStart: 378
@@ -1551,15 +1472,12 @@ slav:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: mutcicon icon: mutcicon
Start: 0
doggie: # TODO: not sure what frame 88 and following is doggie: # TODO: not sure what frame 88 and following is
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 119 ShadowStart: 119
run: run:
@@ -1606,32 +1524,25 @@ doggie: # TODO: not sure what frame 88 and following is
ShadowStart: 228 ShadowStart: 228
Tick: 80 Tick: 80
icon: xxicon icon: xxicon
Start: 0
vissml: vissml:
idle: idle:
Start: 0
Length: 90 Length: 90
ShadowStart: 90 ShadowStart: 90
icon: xxicon icon: xxicon
Start: 0
vislrg: vislrg:
idle: idle:
Start: 0
Length: 90 Length: 90
ShadowStart: 90 ShadowStart: 90
muzzle: vislgatk # TODO: unused muzzle: vislgatk # TODO: unused
Start: 0
Length: 5 Length: 5
Facings: 8 Facings: 8
ShadowStart: 40 ShadowStart: 40
icon: xxicon icon: xxicon
Start: 0
civ1: civ1:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1685,15 +1596,12 @@ civ1:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: xxicon icon: xxicon
Start: 0
civ2: civ2:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1747,15 +1655,12 @@ civ2:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: xxicon icon: xxicon
Start: 0
civ3: civ3:
stand: stand:
Start: 0
Facings: 8 Facings: 8
ShadowStart: 292 ShadowStart: 292
run: run:
@@ -1809,8 +1714,6 @@ civ3:
ShadowStart: 190 ShadowStart: 190
Tick: 80 Tick: 80
die6: electro die6: electro
Start: 0
Length: * Length: *
Tick: 80 Tick: 80
icon: xxicon icon: xxicon
Start: 0

View File

@@ -1,44 +1,26 @@
overlay: overlay:
build-valid-interior: place Defaults:
Start: 0 Start: 1
Offset: 0, -12 Offset: 0, -12
build-valid-snow: place build-valid-snow: place
Start: 0 Start: 0
Offset: 0, -12
build-valid-temperat: place build-valid-temperat: place
Start: 0 Start: 0
Offset: 0, -12
build-invalid: place build-invalid: place
Start: 1
Offset: 0, -12
target-select: place target-select: place
Start: 1
Offset: 0, -12
target-valid-desert: place target-valid-desert: place
Start: 1
Offset: 0, -12
target-valid-interior: place target-valid-interior: place
Start: 1
Offset: 0, -12
target-valid-snow: place target-valid-snow: place
Start: 1
Offset: 0, -12
target-valid-temperat: place target-valid-temperat: place
Start: 1
Offset: 0, -12
target-invalid: place target-invalid: place
Start: 1
Offset: 0, -12
poweroff: poweroff:
offline: poweroff offline: poweroff
Start: 0
Length: * Length: *
Tick: 160 Tick: 160
allyrepair: allyrepair:
repair: wrench repair: wrench
Start: 0
Length: * Length: *
Tick: 160 Tick: 160
@@ -50,7 +32,6 @@ rallypoint:
Offset: 5,-3 Offset: 5,-3
BlendMode: Additive BlendMode: Additive
circles: ring circles: ring
Start: 0
Length: 12 Length: 12
BlendMode: Additive BlendMode: Additive
@@ -59,38 +40,21 @@ beacon:
Start: 6 Start: 6
Offset: 1,-12 Offset: 1,-12
circles: ring circles: ring
Start: 0
Length: 12 Length: 12
BlendMode: Additive BlendMode: Additive
crate-effects: crate-effects:
Defaults:
Length: *
dollar: money dollar: money
Start: 0
Length: *
reveal-map: reveal reveal-map: reveal
Start: 0
Length: *
hide-map: shroudx hide-map: shroudx
Start: 0
Length: *
fpower: firepowr fpower: firepowr
Start: 0
Length: *
armor: armor armor: armor
Start: 0
Length: *
stealth: cloak stealth: cloak
Start: 0
Length: *
heal: healall heal: healall
Start: 0
Length: *
nuke: mltimisl nuke: mltimisl
Start: 0
Length: *
levelup: veteran levelup: veteran
Start: 0
Length: *
rank: rank:
rank: pips rank: pips
@@ -99,17 +63,14 @@ rank:
mpspawn: # TODO: backfall to RA asset mpspawn: # TODO: backfall to RA asset
idle: idle:
Start: 0
Length: * Length: *
waypoint: # TODO: backfall to RA asset waypoint: # TODO: backfall to RA asset
idle: idle:
Start: 0
Length: * Length: *
clock: clock:
idle: gclock2 idle: gclock2
Start: 0
Length: * Length: *
pips: pips:
@@ -121,7 +82,6 @@ pips:
tag-primary: pipsra #TODO: backfall to RA asset tag-primary: pipsra #TODO: backfall to RA asset
Start: 2 Start: 2
pip-empty: pips2 pip-empty: pips2
Start: 0
pip-green: pips2 pip-green: pips2
Start: 1 Start: 1
pip-yellow: pips2 pip-yellow: pips2
@@ -133,12 +93,10 @@ pips:
pip-blue: pips2 pip-blue: pips2
Start: 5 Start: 5
pip-ammo: ammopips pip-ammo: ammopips
Start: 0
pip-ammoempty: ammopips pip-ammoempty: ammopips
Start: 1 Start: 1
# TODO: # TODO:
pip-empty-building: pip-empty-building:
Start: 0
pip-green-building: pip-green-building:
Start: 1 Start: 1
pip-yellow-building: pip-yellow-building:
@@ -151,301 +109,136 @@ pips:
Start: 5 Start: 5
explosion: explosion:
Defaults:
Length: *
building: twlt070 building: twlt070
Start: 0
Length: *
ionring: ring1 ionring: ring1
Start: 0
Length: *
pulse_explosion: pulsefx2 pulse_explosion: pulsefx2
Start: 0
Length: *
BlendMode: Additive BlendMode: Additive
small_watersplash: h2o_exp2 small_watersplash: h2o_exp2
Start: 0
Length: *
large_watersplash: h2o_exp1 large_watersplash: h2o_exp1
Start: 0
Length: *
water_piff: w_piff water_piff: w_piff
Start: 0
Length: *
water_piffs: w_piffs water_piffs: w_piffs
Start: 0
Length: *
piff: piff piff: piff
Start: 0
Length: *
piffs: piffpiff piffs: piffpiff
Start: 0
Length: *
small_explosion: explosml small_explosion: explosml
Start: 0
Length: *
medium_explosion: explomed medium_explosion: explomed
Start: 0
Length: *
large_explosion: explolrg large_explosion: explolrg
Start: 0
Length: *
tiny_bang: s_bang16 tiny_bang: s_bang16
Start: 0
Length: *
small_bang: s_bang24 small_bang: s_bang24
Start: 0
Length: *
medium_bang: s_bang34 medium_bang: s_bang34
Start: 0
Length: *
large_bang: s_bang48 large_bang: s_bang48
Start: 0
Length: *
tiny_brnl: s_brnl20 tiny_brnl: s_brnl20
Start: 0
Length: *
small_brnl: s_brnl30 small_brnl: s_brnl30
Start: 0
Length: *
medium_brnl: s_brnl40 medium_brnl: s_brnl40
Start: 0
Length: *
large_brnl: s_brnl58 large_brnl: s_brnl58
Start: 0
Length: *
tiny_tumu: s_tumu22 tiny_tumu: s_tumu22
Start: 0
Length: *
small_tumu: s_tumu30 small_tumu: s_tumu30
Start: 0
Length: *
medium_tumu: s_tumu42 medium_tumu: s_tumu42
Start: 0
Length: *
large_tumu: s_tumu60 large_tumu: s_tumu60
Start: 0
Length: *
tiny_clsn: s_clsn16 tiny_clsn: s_clsn16
Start: 0
Length: *
small_clsn: s_clsn22 small_clsn: s_clsn22
Start: 0
Length: *
medium_clsn: s_clsn30 medium_clsn: s_clsn30
Start: 0
Length: *
large_clsn: s_clsn42 large_clsn: s_clsn42
Start: 0
Length: *
verylarge_clsn: s_clsn58 verylarge_clsn: s_clsn58
Start: 0
Length: *
tiny_twlt: twlt026 tiny_twlt: twlt026
Start: 0
Length: *
small_twlt: twlt036 small_twlt: twlt036
Start: 0
Length: *
medium_twlt: twlt050 medium_twlt: twlt050
Start: 0
Length: *
large_twlt: twlt070 large_twlt: twlt070
Start: 0
Length: *
verylarge_twlt: twlt100 verylarge_twlt: twlt100
Start: 0
Length: *
tiny_grey_explosion: xgrysml1 tiny_grey_explosion: xgrysml1
Start: 0
Length: *
small_grey_explosion: xgrysml2 small_grey_explosion: xgrysml2
Start: 0
Length: *
medium_grey_explosion: xgrymed1 medium_grey_explosion: xgrymed1
Start: 0
Length: *
large_grey_explosion: xgrymed2 large_grey_explosion: xgrymed2
Start: 0
Length: *
discus: discus:
idle: idle:
Start: 0
Length: * Length: *
canister: canister:
idle: idle:
Start: 0
Length: * Length: *
pulsball: pulsball:
idle: idle:
Start: 0
Length: * Length: *
dragon: dragon:
idle: idle:
Start: 0
Facings: 32 Facings: 32
crystal4: crystal4:
idle: idle:
Start: 0
Length: 15 Length: 15
ShadowStart: 15 ShadowStart: 15
120mm: 120mm:
idle: idle:
Start: 0
torpedo: torpedo:
idle: idle:
Start: 0
Length: * Length: *
flameall: flameall:
idle: idle:
Start: 0
Length: 19 Length: 19
Facings: -8 Facings: -8
Tick: 160 Tick: 160
largesmoke: largesmoke:
idle: lgrysmk1 idle: lgrysmk1
Start: 0
Length: * Length: *
smallsmoke: smallsmoke:
idle: sgrysmk1 idle: sgrysmk1
Start: 0
Length: * Length: *
largefire: largefire:
idle: fire1 idle: fire1
Start: 0
Length: * Length: *
mediumfire: mediumfire:
idle: fire2 idle: fire2
Start: 0
Length: * Length: *
smallfire: smallfire:
idle: fire3 idle: fire3
Start: 0
Length: * Length: *
tinyfire: tinyfire:
idle: fire4 idle: fire4
Start: 0
Length: * Length: *
moveflsh: moveflsh:
idle: ring idle: ring
Start: 0
Length: * Length: *
Tick: 30 Tick: 30
resources: resources:
Defaults:
Length: 12
ShadowStart: 12
Offset: 0, -12
tib01: tib01 tib01: tib01
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib02: tib02 tib02: tib02
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib03: tib03 tib03: tib03
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib04: tib04 tib04: tib04
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib05: tib05 tib05: tib05
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib06: tib06 tib06: tib06
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib07: tib07 tib07: tib07
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib08: tib08 tib08: tib08
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib09: tib09 tib09: tib09
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib10: tib10 tib10: tib10
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib11: tib11 tib11: tib11
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib12: tib12 tib12: tib12
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib13: tib13 tib13: tib13
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib14: tib14 tib14: tib14
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib15: tib15 tib15: tib15
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib16: tib16 tib16: tib16
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib17: tib17 tib17: tib17
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib18: tib18 tib18: tib18
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib19: tib19 tib19: tib19
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
tib20: tib20 tib20: tib20
Start: 0
Length: 12
ShadowStart: 12
Offset: 0, -12
shroud: shroud:
shroud: shroud shroud: shroud
@@ -454,155 +247,104 @@ shroud:
Length: * Length: *
smallscorches: smallscorches:
Defaults:
Offset: 0, -12
sc1: burnt01 sc1: burnt01
Length: 1
Offset: 0, -12
sc2: burnt02 sc2: burnt02
Length: 1
Offset: 0, -12
sc3: burnt03 sc3: burnt03
Length: 1
Offset: 0, -12
sc4: burnt04 sc4: burnt04
Length: 1
Offset: 0, -12
sc5: burnt05 sc5: burnt05
Length: 1
Offset: 0, -12
sc6: burnt06 sc6: burnt06
Length: 1
Offset: 0, -12
mediumscorches: mediumscorches:
Defaults:
Offset: 0, -18
sc7: burnt07 sc7: burnt07
Length: 1
Offset: 0, -18
sc8: burnt08 sc8: burnt08
Length: 1
Offset: 0, -18
sc9: burnt09 sc9: burnt09
Length: 1
Offset: 0, -18
sc10: burnt10 sc10: burnt10
Length: 1
Offset: 0, -18
largescorches: largescorches:
Defaults:
Offset: 0, -24
sc11: burnt11 sc11: burnt11
Length: 1
Offset: 0, -24
sc12: burnt12 sc12: burnt12
Length: 1
Offset: 0, -24
smallcraters: smallcraters:
Defaults:
Offset: 0, -12
cr1: crater01 cr1: crater01
Length: 1
Offset: 0, -12
cr2: crater02 cr2: crater02
Length: 1
Offset: 0, -12
cr3: crater03 cr3: crater03
Length: 1
Offset: 0, -12
cr4: crater04 cr4: crater04
Length: 1
Offset: 0, -12
cr5: crater05 cr5: crater05
Length: 1
Offset: 0, -12
cr6: crater06 cr6: crater06
Length: 1
Offset: 0, -12
mediumcraters: mediumcraters:
Defaults:
Offset: 0, -12
cr7: crater07 cr7: crater07
Length: 1
Offset: 0, -12
cr8: crater08 cr8: crater08
Length: 1
Offset: 0, -12
cr9: crater09 cr9: crater09
Length: 1
Offset: 0, -12
cr10: crater10 cr10: crater10
Length: 1
Offset: 0, -12
largecraters: largecraters:
Defaults:
Offset: 0, -24
cr11: crater11 cr11: crater11
Length: 1
Offset: 0, -24
cr12: crater12 cr12: crater12
Length: 1
Offset: 0, -24
icon: icon:
clustermissile: mltiicon clustermissile: mltiicon
Start: 0
ioncannon: ioncicon ioncannon: ioncicon
Start: 0
clustermissile: clustermissile:
up: null # TODO up: null # TODO
Start: 0
Length: * Length: *
down: null # TODO down: null # TODO
Start: 0
Length: * Length: *
ionbeam: ionbeam:
idle: idle:
Start: 0
Length: * Length: *
Offset: 0, -78 Offset: 0, -78
ZOffset: 1 ZOffset: 1
trock01: trock01:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
trock02: trock02:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
trock03: trock03:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
trock04: trock04:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
trock05: trock05:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
srock01: srock01:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
srock02: srock02:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
srock03: srock03:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
srock04: srock04:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
srock05: srock05:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1

File diff suppressed because it is too large Load Diff

View File

@@ -1,180 +1,147 @@
tibtre01: tibtre01:
idle: Defaults:
Start: 0
Length: 1
ShadowStart: 11
Offset: 0, -12 Offset: 0, -12
idle:
ShadowStart: 11
active: active:
Start: 1 Start: 1
Length: 10 Length: 10
ShadowStart: 12 ShadowStart: 12
Tick: 160 Tick: 160
Offset: 0, -12
tibtre02: tibtre02:
idle: Defaults:
Start: 0
Length: 1
ShadowStart: 11
Offset: 0, -12 Offset: 0, -12
idle:
ShadowStart: 11
active: active:
Start: 1 Start: 1
Length: 10 Length: 10
ShadowStart: 12 ShadowStart: 12
Tick: 160 Tick: 160
Offset: 0, -12
tibtre03: tibtre03:
idle: Defaults:
Start: 0
Length: 1
ShadowStart: 11
Offset: 0, -12 Offset: 0, -12
idle:
ShadowStart: 11
active: active:
Start: 1 Start: 1
Length: 10 Length: 10
ShadowStart: 12 ShadowStart: 12
Tick: 160 Tick: 160
Offset: 0, -12
bigblue: bigblue:
idle: bigblue2 Defaults:
Start: 0
Length: 1
ShadowStart: 10
Offset: 0, -12 Offset: 0, -12
idle: bigblue2
ShadowStart: 10
active: bigblue2 active: bigblue2
Start: 1 Start: 1
Length: 9 Length: 9
ShadowStart: 11 ShadowStart: 11
Tick: 160 Tick: 160
Offset: 0, -12
tree01: tree01:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree02: tree02:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree03: tree03:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree04: tree04:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree05: tree05:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree06: tree06:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree07: tree07:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree08: tree08:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree09: tree09:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree10: tree10:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree11: tree11:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree12: tree12:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree13: tree13:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree14: tree14:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree15: tree15:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree16: tree16:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree17: tree17:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree18: tree18:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree19: tree19:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree20: tree20:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree21: tree21:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree22: tree22:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree23: tree23:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree24: tree24:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
tree25: tree25:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1
veinhole: veinhole:
idle: idle:
Start: 0
ShadowStart: 1 ShadowStart: 1

View File

@@ -1,136 +1,94 @@
mcv: mcv:
icon: mcvicon icon: mcvicon
Start: 0
apc: apc:
icon: apcicon icon: apcicon
Start: 0
harv: harv:
icon: harvicon icon: harvicon
Start: 0
harvest: harvestr harvest: harvestr
Start: 0
Length: * Length: *
hvr: hvr:
icon: hovricon icon: hovricon
Start: 0
4tnk: 4tnk:
muzzle: gunfire muzzle: gunfire
Start: 0
Length: * Length: *
icon: xxicon icon: xxicon
Start: 0
truckb: truckb:
icon: xxicon icon: xxicon
Start: 0
lpst: lpst:
icon: lpsticon icon: lpsticon
Start: 0
icbm: icbm:
icon: xxicon icon: xxicon
Start: 0
repair: repair:
icon: rboticon icon: rboticon
Start: 0
art2: art2:
icon: artyicon icon: artyicon
Start: 0
weed: weed:
icon: weedicon icon: weedicon
Start: 0
bus: bus:
icon: xxicon icon: xxicon
Start: 0
pick: pick:
icon: xxicon icon: xxicon
Start: 0
car: car:
icon: xxicon icon: xxicon
Start: 0
wini: wini:
icon: xxicon icon: xxicon
Start: 0
hmec: hmec:
icon: hmecicon icon: hmecicon
Start: 0
bike: bike:
icon: cyclicon icon: cyclicon
Start: 0
bggy: bggy:
Defaults:
Length: *
muzzle0: mgun-n muzzle0: mgun-n
Start: 0
Length: *
muzzle1: mgun-nw muzzle1: mgun-nw
Start: 0
Length: *
muzzle2: mgun-w muzzle2: mgun-w
Start: 0
Length: *
muzzle3: mgun-sw muzzle3: mgun-sw
Start: 0
Length: *
muzzle4: mgun-s muzzle4: mgun-s
Start: 0
Length: *
muzzle5: mgun-se muzzle5: mgun-se
Start: 0
Length: *
muzzle6: mgun-e muzzle6: mgun-e
Start: 0
Length: *
muzzle7: mgun-ne muzzle7: mgun-ne
Start: 0
Length: *
icon: bggyicon icon: bggyicon
Start: 0
sapc: sapc:
icon: sapcicon icon: sapcicon
Start: 0
subtank: subtank:
icon: subticon icon: subticon
Start: 0
sonic: sonic:
icon: soniicon icon: soniicon
Start: 0
ttnk: ttnk:
muzzle: gunfire muzzle: gunfire
Start: 0
Length: * Length: *
icon: tickicon icon: tickicon
Start: 0
stnk: stnk:
icon: stnkicon icon: stnkicon
Start: 0
mmch: mmch:
stand: stand:
Start: 0
Facings: -8 Facings: -8
Stride: 15 Stride: 15
ShadowStart: 152 ShadowStart: 152
run: run:
Start: 0
Length: 15 Length: 15
Facings: -8 Facings: -8
ShadowStart: 152 ShadowStart: 152
@@ -138,19 +96,15 @@ mmch:
Start: 120 Start: 120
Facings: -32 Facings: -32
muzzle: gunfire muzzle: gunfire
Start: 0
Length: * Length: *
icon: mmchicon icon: mmchicon
Start: 0
gghunt: gghunt:
idle: idle:
Start: 0
Facings: 1 Facings: 1
Length: 8 Length: 8
ShadowStart: 8 ShadowStart: 8
icon: seekicon icon: seekicon
Start: 0
smech: smech:
stand: stand:
@@ -158,7 +112,6 @@ smech:
Facings: -8 Facings: -8
ShadowStart: 232 ShadowStart: 232
run: run:
Start: 0
Facings: -8 Facings: -8
Length: 12 Length: 12
ShadowStart: 136 ShadowStart: 136
@@ -169,4 +122,3 @@ smech:
ShadowStart: 240 ShadowStart: 240
Tick: 100 Tick: 100
icon: smchicon icon: smchicon
Start: 0