Merge pull request #9705 from reaperrr/misc-cleanup

Misc yaml formatting cleanup
2015-10-23 14:38:44 +02:00
parent 60d7880b77 78def7330e
commit fcd27707d7
85 changed files with 169 additions and 25 deletions
--- a/mods/ts/maps/arivruns/map.yaml
+++ b/mods/ts/maps/arivruns/map.yaml
@@ -1314,6 +1314,8 @@ Weapons:

 Voices:

+Music:
+
 Notifications:

 Translations:
--- a/mods/ts/maps/gdi4a/map.yaml
+++ b/mods/ts/maps/gdi4a/map.yaml
@@ -1767,6 +1767,8 @@ Weapons:

 Voices:

+Music:
+
 Notifications:

 Translations:
--- a/mods/ts/maps/rivrrad4/map.yaml
+++ b/mods/ts/maps/rivrrad4/map.yaml
@@ -889,6 +889,8 @@ Weapons:

 Voices:

+Music:
+
 Notifications:

 Translations:
--- a/mods/ts/maps/springs/map.yaml
+++ b/mods/ts/maps/springs/map.yaml
@@ -874,6 +874,8 @@ Weapons:

 Voices:

+Music:
+
 Notifications:

 Translations:
--- a/mods/ts/maps/tread_l/map.yaml
+++ b/mods/ts/maps/tread_l/map.yaml
@@ -1183,6 +1183,8 @@ Weapons:

 Voices:

+Music:
+
 Notifications:

 Translations:
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -328,3 +328,4 @@ HUNTER:
 	SelectionDecorations:
 		Palette: pips
 	ActorLostNotification:
+
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -714,3 +714,4 @@
 	Inherits: ^TerrainOverlay
 	CustomSelectionSize:
 		CustomBounds: 220,220
+
--- a/mods/ts/rules/misc.yaml
+++ b/mods/ts/rules/misc.yaml
@@ -211,3 +211,4 @@ TUNTOP03:

 TUNTOP04:
 	Inherits: ^Tunnel
+
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -54,7 +54,7 @@ NALASR:
 		Offset: 298,-171,0
 	AttackTurreted:
 	Armament:
-		Weapon: LaserFire2
+		Weapon: TurretLaserFire
 	RenderVoxels:
 	WithVoxelTurret:
 	Power:
@@ -87,7 +87,7 @@ NAOBEL:
 	RevealsShroud:
 		Range: 8c0
 	Armament:
-		Weapon: LaserFire
+		Weapon: ObeliskLaserFire
 		LocalOffset: 1400,200,1250
 	AttackCharge:
 		ChargeAudio: obelpowr.aud
--- a/mods/ts/rules/shared-vehicles.yaml
+++ b/mods/ts/rules/shared-vehicles.yaml
@@ -148,3 +148,4 @@ LPST:
 		UpgradeMinEnabledLevel: 1
 		Range: 18
 	RenderDetectionCircle:
+
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -175,3 +175,4 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorResourceLayer:
+
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -124,8 +124,7 @@ Proton:
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water

-# Obelisk laser
-LaserFire:
+ObeliskLaserFire:
 	ReloadDelay: 120
 	Range: 10c512
 	Charges: true
@@ -137,8 +136,7 @@ LaserFire:
 		Damage: 250
 		DamageTypes: Prone60Percent, TriggerProne, EnergyDeath

-# Laser turret
-LaserFire2:
+TurretLaserFire:
 	ReloadDelay: 40
 	Range: 5c512
 	Report: LASTUR1.AUD
--- a/mods/ts/weapons/explosions.yaml
+++ b/mods/ts/weapons/explosions.yaml
@@ -65,3 +65,4 @@ LargeDebris:
 		Image: dbrislg
 		Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 		Shadow: true
+
--- a/mods/ts/weapons/smallguns.yaml
+++ b/mods/ts/weapons/smallguns.yaml
@@ -275,3 +275,4 @@ Sniper:
 			Heavy: 5
 			Concrete: 5
 		DamageTypes: Prone100Percent, TriggerProne, HeadshotDeath
+