From b5f36013c230f22bad42522abbd18bdd9ba24835 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 21 Aug 2016 19:36:48 +0200 Subject: [PATCH] TD yaml style fixes --- mods/cnc/chrome/color-picker.yaml | 2 +- mods/cnc/chrome/music.yaml | 2 +- mods/cnc/maps/cnc64gdi01/sequences.yaml | 4 ++-- mods/cnc/maps/funpark01/sequences.yaml | 4 ++-- mods/cnc/maps/gdi01/sequences.yaml | 4 ++-- mods/cnc/maps/gdi02/sequences.yaml | 4 ++-- mods/cnc/maps/gdi06/sequences.yaml | 4 ++-- mods/cnc/maps/nod04a/rules.yaml | 1 + mods/cnc/rules/campaign-tooltips.yaml | 1 - mods/cnc/sequences/civilian.yaml | 1 + mods/cnc/sequences/misc.yaml | 3 ++- mods/cnc/sequences/structures.yaml | 12 ++++++------ mods/cnc/sequences/vehicles.yaml | 2 +- 13 files changed, 23 insertions(+), 21 deletions(-) diff --git a/mods/cnc/chrome/color-picker.yaml b/mods/cnc/chrome/color-picker.yaml index 1685118d81..93d9b6eb08 100644 --- a/mods/cnc/chrome/color-picker.yaml +++ b/mods/cnc/chrome/color-picker.yaml @@ -41,4 +41,4 @@ Background@COLOR_CHOOSER: Y: 21 Width: 80 Height: 73 - Animate: true \ No newline at end of file + Animate: true diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index f9c8931b21..bb36ade8ac 100644 --- a/mods/cnc/chrome/music.yaml +++ b/mods/cnc/chrome/music.yaml @@ -197,4 +197,4 @@ Container@MUSIC_PANEL: Y: 399 Width: 300 Height: 20 - Font: Small \ No newline at end of file + Font: Small diff --git a/mods/cnc/maps/cnc64gdi01/sequences.yaml b/mods/cnc/maps/cnc64gdi01/sequences.yaml index 6a9db3291d..3f043f3d34 100644 --- a/mods/cnc/maps/cnc64gdi01/sequences.yaml +++ b/mods/cnc/maps/cnc64gdi01/sequences.yaml @@ -1,7 +1,7 @@ -oldlst: +oldlst: idle: lst Start: 0 Facings: 1 ZOffset: -1024 icon: lsticnh.tem - AddExtension: False \ No newline at end of file + AddExtension: False diff --git a/mods/cnc/maps/funpark01/sequences.yaml b/mods/cnc/maps/funpark01/sequences.yaml index 6a9db3291d..3f043f3d34 100644 --- a/mods/cnc/maps/funpark01/sequences.yaml +++ b/mods/cnc/maps/funpark01/sequences.yaml @@ -1,7 +1,7 @@ -oldlst: +oldlst: idle: lst Start: 0 Facings: 1 ZOffset: -1024 icon: lsticnh.tem - AddExtension: False \ No newline at end of file + AddExtension: False diff --git a/mods/cnc/maps/gdi01/sequences.yaml b/mods/cnc/maps/gdi01/sequences.yaml index 6a9db3291d..3f043f3d34 100644 --- a/mods/cnc/maps/gdi01/sequences.yaml +++ b/mods/cnc/maps/gdi01/sequences.yaml @@ -1,7 +1,7 @@ -oldlst: +oldlst: idle: lst Start: 0 Facings: 1 ZOffset: -1024 icon: lsticnh.tem - AddExtension: False \ No newline at end of file + AddExtension: False diff --git a/mods/cnc/maps/gdi02/sequences.yaml b/mods/cnc/maps/gdi02/sequences.yaml index 6a9db3291d..3f043f3d34 100644 --- a/mods/cnc/maps/gdi02/sequences.yaml +++ b/mods/cnc/maps/gdi02/sequences.yaml @@ -1,7 +1,7 @@ -oldlst: +oldlst: idle: lst Start: 0 Facings: 1 ZOffset: -1024 icon: lsticnh.tem - AddExtension: False \ No newline at end of file + AddExtension: False diff --git a/mods/cnc/maps/gdi06/sequences.yaml b/mods/cnc/maps/gdi06/sequences.yaml index 6a9db3291d..3f043f3d34 100644 --- a/mods/cnc/maps/gdi06/sequences.yaml +++ b/mods/cnc/maps/gdi06/sequences.yaml @@ -1,7 +1,7 @@ -oldlst: +oldlst: idle: lst Start: 0 Facings: 1 ZOffset: -1024 icon: lsticnh.tem - AddExtension: False \ No newline at end of file + AddExtension: False diff --git a/mods/cnc/maps/nod04a/rules.yaml b/mods/cnc/maps/nod04a/rules.yaml index 5fa188dc16..661775e6aa 100644 --- a/mods/cnc/maps/nod04a/rules.yaml +++ b/mods/cnc/maps/nod04a/rules.yaml @@ -13,6 +13,7 @@ World: InitialSmudges: 37,24: sc6,0 36,18: sc6,0 + Player: EnemyWatcher: PlayerResources: diff --git a/mods/cnc/rules/campaign-tooltips.yaml b/mods/cnc/rules/campaign-tooltips.yaml index b9fa3822f2..e186d6689d 100644 --- a/mods/cnc/rules/campaign-tooltips.yaml +++ b/mods/cnc/rules/campaign-tooltips.yaml @@ -1,4 +1,3 @@ - ^Vehicle: Tooltip: GenericVisibility: Enemy diff --git a/mods/cnc/sequences/civilian.yaml b/mods/cnc/sequences/civilian.yaml index afc9a36d21..f745b17f39 100644 --- a/mods/cnc/sequences/civilian.yaml +++ b/mods/cnc/sequences/civilian.yaml @@ -50,6 +50,7 @@ c1: Start: 16 Length: 4 Tick: 1600 + c2: Inherits: c1 diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml index e1a6412312..2bcf3281a0 100644 --- a/mods/cnc/sequences/misc.yaml +++ b/mods/cnc/sequences/misc.yaml @@ -73,7 +73,7 @@ smoke_m: ZOffset: 512 laserfire: - idle:veh-hit3 + idle: veh-hit3 Length: * ZOffset: 511 @@ -238,6 +238,7 @@ camera: clock: idle: hclock Length: * + pips: pip-empty: pip-green: diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml index 2925ed4258..9a63bdd73a 100644 --- a/mods/cnc/sequences/structures.yaml +++ b/mods/cnc/sequences/structures.yaml @@ -131,11 +131,11 @@ hand: pyle: idle: Length: 10 - Tick: 100 + Tick: 100 damaged-idle: Start: 10 Length: 10 - Tick: 100 + Tick: 100 dead: Start: 20 Tick: 800 @@ -268,7 +268,7 @@ hpad: damaged-active: Start: 8 Length: 6 - Tick: 100 + Tick: 100 ZOffset: -1023 dead: Start: 14 @@ -462,7 +462,7 @@ gun: sam: closed-idle: - Start:0 + Start: 0 opening: Start: 1 Length: 16 @@ -476,7 +476,7 @@ sam: Length: 14 Tick: 30 damaged-closed-idle: - Start:64 + Start: 64 damaged-opening: Start: 65 Length: 16 @@ -508,7 +508,7 @@ gtwr: dead: Start: 2 Tick: 800 - make: + make: Combine: gtwrmake: Length: 17 diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index 63a0ae64ba..2c94db9f8b 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -335,4 +335,4 @@ apc.destroyed: ZOffset: -512 turret: apctur Facings: 32 - ZOffset: -512 \ No newline at end of file + ZOffset: -512