Merge pull request #9705 from reaperrr/misc-cleanup

Misc yaml formatting cleanup

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -2144,10 +2144,20 @@ namespace OpenRA.Mods.Common.UtilityCommands
 				{
 					// Rename WithMuzzleFlash to WithMuzzleOverlay
 					if (depth == 1 && node.Key.StartsWith("WithMuzzleFlash"))
-						node.Key = node.Key.Replace("WithMuzzleFlash", "WithMuzzleOverlay");
+					{
+						var parts = node.Key.Split('@');
+						node.Key = "WithMuzzleOverlay";
+						if (parts.Length > 1)
+							node.Key += "@" + parts[1];
+					}
 
 					if (depth == 1 && node.Key.StartsWith("-WithMuzzleFlash"))
-						node.Key = node.Key.Replace("-WithMuzzleFlash", "-WithMuzzleOverlay");
+					{
+						var parts = node.Key.Split('@');
+						node.Key = "-WithMuzzleOverlay";
+						if (parts.Length > 1)
+							node.Key += "@" + parts[1];
+					}
 				}
 
 				// WithSiloAnimation received own Sequence property, idle sequence is only 1 frame long now

mods/cnc/cursors.yaml

@@ -87,7 +87,6 @@ Cursors:
 			Start: 136
 		joystick-tl-blocked:
 			Start: 137
-
 # Cursors that need minimap variants
 		deploy:
 			Start: 53
@@ -150,7 +149,6 @@ Cursors:
 		move-blocked-minimap:
 			Start: 25
 			Length: 1
-
 	mouse5.shp: cursor
 		guard:
 			Start: 0
@@ -158,7 +156,6 @@ Cursors:
 		guard-minimap:
 			Start: 8
 			Length: 8
-
 	mouse6.shp: cursor
 		goldwrench:
 			Start: 0
@@ -190,7 +187,6 @@ Cursors:
 		enter-blocked-minimap:
 			Start: 17
 			Length: 1
-
 	mouse7.shp: cursor
 		attackoutsiderange:
 			Start: 0

mods/cnc/maps/cnc64gdi01/map.yaml

@@ -839,6 +839,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/funpark01/map.yaml

@@ -532,6 +532,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi01/map.yaml

@@ -557,6 +557,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi02/map.yaml

@@ -785,6 +785,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi03/map.yaml

@@ -850,6 +850,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi04a/map.yaml

@@ -538,6 +538,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi04b/map.yaml

@@ -612,6 +612,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi04c/map.yaml

@@ -844,6 +844,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi05a/map.yaml

@@ -947,6 +947,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/gdi05b/map.yaml

@@ -780,6 +780,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod01/map.yaml

@@ -342,6 +342,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod02a/map.yaml

@@ -358,6 +358,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod02b/map.yaml

@@ -400,6 +400,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod03a/map.yaml

@@ -568,6 +568,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod03b/map.yaml

@@ -612,6 +612,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod04a/map.yaml

@@ -700,6 +700,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod04b/map.yaml

@@ -560,6 +560,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod05/map.yaml

@@ -521,6 +521,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod06a/map.yaml

@@ -727,6 +727,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod06b/map.yaml

@@ -665,6 +665,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/nod06c/map.yaml

@@ -636,6 +636,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/shellmap/map.yaml

@@ -1011,6 +1011,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/maps/the-hot-box/map.yaml

@@ -251,6 +251,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/cnc/rules/world.yaml

@@ -154,3 +154,4 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorResourceLayer:
+

mods/cnc/tilesets/desert.yaml

@@ -2148,3 +2148,4 @@ Templates:
 			3: Clear
 			4: Clear
 			5: Clear
+

mods/d2k/cursors.yaml

@@ -243,7 +243,6 @@ Cursors:
 			Start: 236
 			X: 24
 			Y: 24
-
 # Cursors that need minimap variants
 		deploy:
 			Start: 96

mods/d2k/maps/atreides-01a/map.yaml

@@ -175,6 +175,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/maps/atreides-01b/map.yaml

@@ -174,6 +174,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/maps/atreides-02a/map.yaml

@@ -232,6 +232,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/maps/atreides-02b/map.yaml

@@ -207,6 +207,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/maps/mount-idaho/map.yaml

@@ -102,6 +102,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/maps/oasis-conquest/map.yaml

@@ -169,6 +169,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/maps/pasty-mesa/map.yaml

@@ -99,6 +99,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/maps/shellmap/map.yaml

@@ -137,6 +137,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/d2k/rules/world.yaml

@@ -148,3 +148,4 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	D2kEditorResourceLayer:
+

mods/d2k/weapons/debris.yaml

@@ -130,3 +130,4 @@ Debris4:
 	Warhead@3Eff: CreateEffect
 		Explosion: large_explosion
 		ImpactSound: EXPLLG5.WAV
+

mods/ra/cursors.yaml

@@ -142,7 +142,6 @@ Cursors:
 			Start: 130
 		joystick-tl-blocked:
 			Start: 131
-
 # Cursors that need minimap variants
 		deploy:
 			Start: 59
@@ -180,7 +179,6 @@ Cursors:
 		sell2:
 			Start: 148
 			Length: 12
-
 	nopower.shp: cursor
 		powerdown-blocked:
 			Start: 0
@@ -188,7 +186,6 @@ Cursors:
 		powerdown:
 			Start: 1
 			Length: 3
-
 	attackmove.shp: cursor
 		attackmove:
 			Start: 0

mods/ra/maps/allies-01/map.yaml

@@ -576,6 +576,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/allies-02/map.yaml

@@ -32,8 +32,8 @@ Options:
 	FragileAlliances: False
 	StartingCash: 5700
 	ConfigurableStartingUnits: False
-	ShortGame: False
 	Difficulties: Easy, Normal, Hard, Real tough guy
+	ShortGame: False
 
 Players:
 	PlayerReference@USSR:
@@ -842,6 +842,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/allies-03a/map.yaml

@@ -1553,6 +1553,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/allies-03b/map.yaml

@@ -1439,6 +1439,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/allies-05a/map.yaml

@@ -1839,6 +1839,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 	Sounds:
 		Notifications:

mods/ra/maps/bomber-john/map.yaml

@@ -973,6 +973,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/burlesca/map.yaml

@@ -226,6 +226,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/center-of-attention-redux-2/map.yaml

@@ -908,6 +908,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/desert-shellmap/map.yaml

@@ -1361,6 +1361,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml

@@ -368,6 +368,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/drop-zone-w/map.yaml

@@ -325,6 +325,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/drop-zone/map.yaml

@@ -263,6 +263,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/fort-lonestar/map.yaml

@@ -20,10 +20,6 @@ Type: Minigame
 
 Videos:
 
-Music:
-	rain: Rain (ambient)
-		Hidden: true
-
 Options:
 	Fog: True
 	Shroud: True
@@ -1004,6 +1000,10 @@ Weapons:
 
 Voices:
 
+Music:
+	rain: Rain (ambient)
+		Hidden: true
+
 Notifications:
 
 Translations:

mods/ra/maps/intervention/map.yaml

@@ -2410,6 +2410,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/koth-hopes-anchor/map.yaml

@@ -661,6 +661,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/monster-tank-madness/map.yaml

@@ -2407,6 +2407,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/poland-raid/map.yaml

@@ -802,6 +802,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/snow town/map.yaml

@@ -690,6 +690,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-01/map.yaml

@@ -680,6 +680,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-02a/map.yaml

@@ -708,6 +708,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-02b/map.yaml

@@ -676,6 +676,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-03/map.yaml

@@ -1296,6 +1296,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 	Sounds:
 		Notifications:

mods/ra/maps/soviet-04a/map.yaml

@@ -755,6 +755,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-04b/map.yaml

@@ -783,6 +783,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-05/map.yaml

@@ -741,6 +741,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-06a/map.yaml

@@ -975,6 +975,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-06b/map.yaml

@@ -655,6 +655,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/soviet-07/map.yaml

@@ -944,6 +944,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/survival01/map.yaml

@@ -1386,6 +1386,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/survival02/map.yaml

@@ -1181,6 +1181,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/maps/training-camp/map.yaml

@@ -1061,6 +1061,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ra/rules/world.yaml

@@ -173,3 +173,4 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorResourceLayer:
+

mods/ts/maps/arivruns/map.yaml

@@ -1314,6 +1314,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ts/maps/gdi4a/map.yaml

@@ -1767,6 +1767,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ts/maps/rivrrad4/map.yaml

@@ -889,6 +889,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ts/maps/springs/map.yaml

@@ -874,6 +874,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ts/maps/tread_l/map.yaml

@@ -1183,6 +1183,8 @@ Weapons:
 
 Voices:
 
+Music:
+
 Notifications:
 
 Translations:

mods/ts/rules/aircraft.yaml

@@ -328,3 +328,4 @@ HUNTER:
 	SelectionDecorations:
 		Palette: pips
 	ActorLostNotification:
+

mods/ts/rules/defaults.yaml

@@ -714,3 +714,4 @@
 	Inherits: ^TerrainOverlay
 	CustomSelectionSize:
 		CustomBounds: 220,220
+

mods/ts/rules/misc.yaml

@@ -211,3 +211,4 @@ TUNTOP03:
 
 TUNTOP04:
 	Inherits: ^Tunnel
+

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

mods/ts/rules/shared-vehicles.yaml

@@ -148,3 +148,4 @@ LPST:
 		UpgradeMinEnabledLevel: 1
 		Range: 18
 	RenderDetectionCircle:
+

mods/ts/rules/world.yaml

@@ -175,3 +175,4 @@ EditorWorld:
 	Inherits: ^BaseWorld
 	EditorActorLayer:
 	EditorResourceLayer:
+

mods/ts/weapons/energyweapons.yaml

@@ -124,8 +124,7 @@ Proton:
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
 
-# Obelisk laser
+ObeliskLaserFire:
-LaserFire:
 	ReloadDelay: 120
 	Range: 10c512
 	Charges: true
@@ -137,8 +136,7 @@ LaserFire:
 		Damage: 250
 		DamageTypes: Prone60Percent, TriggerProne, EnergyDeath
 
-# Laser turret
+TurretLaserFire:
-LaserFire2:
 	ReloadDelay: 40
 	Range: 5c512
 	Report: LASTUR1.AUD

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
+

mods/ts/weapons/smallguns.yaml

@@ -275,3 +275,4 @@ Sniper:
 			Heavy: 5
 			Concrete: 5
 		DamageTypes: Prone100Percent, TriggerProne, HeadshotDeath
+