Merge pull request #11858 from reaperrr/fix-yaml-style

Yaml style clean-up
2016-08-24 22:53:01 +02:00
parent fab807b86e 01282e7b3c
commit 20624aa232
32 changed files with 49 additions and 58 deletions
--- 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
+			Animate: true
--- 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
+			Font: Small
--- 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
+		AddExtension: False
--- 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
+		AddExtension: False
--- 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
+		AddExtension: False
--- 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
+		AddExtension: False
--- 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
+		AddExtension: False
--- 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:
--- a/mods/cnc/rules/campaign-tooltips.yaml
+++ b/mods/cnc/rules/campaign-tooltips.yaml
@@ -1,4 +1,3 @@
-
 ^Vehicle:
 	Tooltip:
 		GenericVisibility: Enemy
--- 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

--- 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:
--- 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
--- 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
+		ZOffset: -512
--- a/mods/d2k/chrome/color-picker.yaml
+++ b/mods/d2k/chrome/color-picker.yaml
@@ -42,4 +42,3 @@ Background@COLOR_CHOOSER:
 			Y: 21
 			Width: 80
 			Height: 73
-
--- a/mods/d2k/maps/atreides-03b/rules.yaml
+++ b/mods/d2k/maps/atreides-03b/rules.yaml
@@ -1,4 +1,3 @@
-
 Player:
 	PlayerResources:
 		DefaultCash: 3000
--- a/mods/d2k/rules/campaign-rules.yaml
+++ b/mods/d2k/rules/campaign-rules.yaml
@@ -29,4 +29,3 @@ World:
 		TechLevelLocked: True
 		ShortGameLocked: True
 		ShortGameEnabled: False
-
--- a/mods/ra/maps/bomber-john/sequences.yaml
+++ b/mods/ra/maps/bomber-john/sequences.yaml
@@ -1,21 +1,23 @@
-miner: 
-	idle: 
+miner:
+	idle:
 		Start: 0
 		Length: 1
 		ZOffset: -512
-	damaged-idle: 
+	damaged-idle:
 		Start: 1
 		Length: *
 		ZOffset: -512
-	damaged-build: 
+	damaged-build:
 		Start: 1
 		Length: *
 		ZOffset: -512
 	icon: jmin
 		Start: 0
-mnlyr: 
+
+mnlyr:
 	icon: mnlyicon
-brick: 
-	idle: 
+
+brick:
+	idle:
 		Start: 0
-		Length: *
+		Length: *
--- a/mods/ra/maps/drop-zone-w/sequences.yaml
+++ b/mods/ra/maps/drop-zone-w/sequences.yaml
@@ -1,8 +1,8 @@
-lst: 
+lst:
 	muzzle: minigun
 		Start: 0
 		Length: 6
 		Facings: 8
 	turret: mgun
 		Start: 0
-		Facings: 32
+		Facings: 32
--- a/mods/ra/maps/evacuation/map.yaml
+++ b/mods/ra/maps/evacuation/map.yaml
@@ -12,7 +12,7 @@ MapSize: 128,128

 Bounds: 16,16,96,96

-Visibility: MissionSelector, Lobby
+Visibility: Lobby, MissionSelector

 Categories: Mission, Cooperative Mission

--- a/mods/ra/rules/campaign-rules.yaml
+++ b/mods/ra/rules/campaign-rules.yaml
@@ -37,4 +37,3 @@ E7.noautotarget:

 ^Vehicle:
 	Demolishable:
-
--- a/mods/ra/rules/campaign-tooltips.yaml
+++ b/mods/ra/rules/campaign-tooltips.yaml
@@ -78,4 +78,3 @@ FLARE:
 SPY:
 	DisguiseToolTip:
 		ShowOwnerRow: false
-
--- a/mods/ra/sequences/aircraft.yaml
+++ b/mods/ra/sequences/aircraft.yaml
@@ -56,7 +56,7 @@ tran:
 	unload: tran2
 		Start: 35
 	icon: tranicon
-		
+
 tran1husk:
 	idle:

--- a/mods/ra/sequences/decorations.yaml
+++ b/mods/ra/sequences/decorations.yaml
@@ -985,4 +985,3 @@ windmill:
 		Start: 8
 		Length: 8
 		Tick: 80
-
--- a/mods/ra/sequences/infantry.yaml
+++ b/mods/ra/sequences/infantry.yaml
@@ -358,7 +358,7 @@ medi:
 		Facings: 8
 		Tick: 100
 	icon: mediicon
-		
+
 mech:
 	stand:
 		Facings: 8
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -211,7 +211,7 @@ litning:
 		ZOffset: 1023

 fb1:
-	idle: 
+	idle:
 		Length: *
 		ZOffset: 1023

--- a/mods/ra/sequences/ships.yaml
+++ b/mods/ra/sequences/ships.yaml
@@ -46,4 +46,4 @@ lst:
 msub:
 	idle:
 		Facings: 16
-	icon: msubicon
+	icon: msubicon
--- a/mods/ts/chrome/color-picker.yaml
+++ b/mods/ts/chrome/color-picker.yaml
@@ -42,4 +42,4 @@ Background@COLOR_CHOOSER:
 			Y: 11
 			Width: 80
 			Height: 74
-			Animate: true
+			Animate: true
--- a/mods/ts/maps/fields-of-green/map.yaml
+++ b/mods/ts/maps/fields-of-green/map.yaml
@@ -1422,7 +1422,6 @@ Actors:
 Rules:
 	Player:
 		-ConquestVictoryConditions:
-
 	World:
 		-CrateSpawner:
 		-StartGameNotification:
@@ -1439,27 +1438,21 @@ Rules:
 			Ambient: 0.7
 		ScriptUpgradesCache:
 			Upgrades: unkillable
-
 	HARV:
 		-Targetable:
-
 	GALITE:
 		-Targetable:
-
 	APC:
 		Cargo:
 			InitialUnits: e1, e1, e2, e2, medic
-
 	GACTWR:
 		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
 			Modifier: 0, 0
-
 	NAOBEL:
 		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
 			Modifier: 0, 0
-
 	NALASR:
 		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
--- a/mods/ts/maps/karasjok/map.yaml
+++ b/mods/ts/maps/karasjok/map.yaml
@@ -1560,4 +1560,4 @@ Rules:
 			Red: 0.5
 			Green: 0.7
 			Blue: 0.7
-			Ambient: 0.78
+			Ambient: 0.78
--- a/mods/ts/sequences/aircraft.yaml
+++ b/mods/ts/sequences/aircraft.yaml
@@ -19,4 +19,4 @@ apache:
 		Length: 8

 orcatran:
-	icon: crryicon
+	icon: crryicon
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -471,7 +471,7 @@ srock05:
 dbrissm:
 	Defaults:
 		ZOffset: 1023
-		Length:*
+		Length: *
 	1: dbris1sm
 	2: dbris2sm
 	3: dbris3sm
@@ -486,7 +486,7 @@ dbrissm:
 dbrislg:
 	Defaults:
 		ZOffset: 1023
-		Length:*
+		Length: *
 	1: dbris1lg
 	2: dbris2lg
 	3: dbris3lg
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -133,7 +133,7 @@ gapile:
 		Tick: 200
 		ZOffset: 1023
 	damaged-production-lights: gtpile_a
-		Start:7
+		Start: 7
 		Length: 7
 		Tick: 200
 		ZOffset: 1023
@@ -141,13 +141,13 @@ gapile:
 		Length: 7
 		Tick: 200
 	damaged-idle-light: gtpile_b
-		Start:7
+		Start: 7
 		Length: 7
 		Tick: 200
 	idle-flag: gtpile_c
 		Length: 7
 	damaged-idle-flag: gtpile_c
-		Start:7
+		Start: 7
 		Length: 7
 	make: gtpilemk
 		Length: 20
@@ -1877,4 +1877,4 @@ gaplug2:
 	icon: rad2icon

 gaplug3:
-	icon: rad3icon
+	icon: rad3icon