Clean the yaml up and fix wrong inheritance on Fort Lonestar

Fort Lonestar became unplayable when someone changed the weapon default definitions
As most of its weapons try to override the defaults this resulted in two SpreadDamageWarheads (Warhead: and Warhead@1Dam:) for each weapon

mods/ra/maps/fort-lonestar/fort-lonestar.lua

@@ -166,12 +166,6 @@ WorldLoaded = function()
 		players[i] = player
 	end
 
-	Utils.Do(Snipers, function(a)
-		if a.Owner == soviets then
-			a.GrantUpgrade("unkillable")
-		end
-	end)
-
 	Media.DisplayMessage("Defend Fort Lonestar at all costs!")
 
 	SendWave()

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

@@ -502,11 +502,7 @@ Rules:
 		-SpawnMPUnits:
 		-MPStartLocations:
 		WeatherOverlay:
-			ParticleDensityFactor: 0.0007625
-			ChangingWindLevel: true
-			WindLevels: -5, -3, -2, 0, 2, 3, 5
 			WindTick: 150, 550
-			InstantWindChanges: false
 			UseSquares: false
 			ScatterDirection: 0, 0
 			Gravity: 8.00, 12.00
@@ -527,8 +523,6 @@ Rules:
 			Type: LightningStrike
 		LuaScript:
 			Scripts: fort-lonestar.lua
-		ScriptUpgradesCache:
-			Upgrades: unkillable
 	FORTCRATE:
 		Inherits: ^Crate
 		SupportPowerCrateAction@parabombs:
@@ -547,8 +541,6 @@ Rules:
 			Units: e7
 			SelectionShares: 10
 	Player:
-		PlayerResources:
-			InitialCash: 50
 		ClassicProductionQueue@Infantry:
 			BuildSpeed: 1
 		-EnemyWatcher:
@@ -607,7 +599,6 @@ Rules:
 		Valued:
 			Cost: 40
 		Explodes:
-			Weapon: UnitExplodeSmall
 			Chance: 20
 	E3:
 		Buildable:
@@ -635,7 +626,6 @@ Rules:
 			Weapon: TankNapalm
 			Recoil: 200
 			RecoilRecovery: 38
-			LocalOffset: 0,85,0, 0,-85,0
 	MEDI:
 		Buildable:
 			Prerequisites: barracks
@@ -653,25 +643,24 @@ Rules:
 			Prerequisites: barracks
 		Health:
 			HP: 200
-		AutoTarget:
-			InitialStanceAI: Defend
 	SNIPER.soviets:
 		Inherits: SNIPER
 		Buildable:
 			Prerequisites: ~disabled
 		MustBeDestroyed:
-		DamageMultiplier@UNKILLABLE:
+		Targetable:
-			UpgradeTypes: unkillable
+			TargetTypes: Disguise
-			Modifier: 0, 0
+		AutoTarget:
+			InitialStanceAI: AttackAnything
 		RenderSprites:
 			Image: SNIPER
 	SPY:
 		Buildable:
-			Queue: Infantry
 			BuildPaletteOrder: 60
 			Prerequisites: barracks
 		Valued:
 			Cost: 300
+		-MustBeDestroyed:
 	FTRK:
 		-Armament@AA:
 		-Armament@AG:
@@ -694,22 +683,17 @@ Rules:
 	4TNK:
 		Health:
 			HP: 2500
-		Armor:
-			Type: Heavy
 		Mobile:
 			Speed: 56
 		RevealsShroud:
 			Range: 14c0
 		Turreted:
 			ROT: 1
-		AttackTurreted:
+		Armament@PRIMARY:
-			PrimaryWeapon: 120mm
+			Recoil: 8
-			SecondaryWeapon: MammothTusk
+			RecoilRecovery: 0c7
-			PrimaryLocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
+		Armament@SECONDARY:
-			SecondaryLocalOffset: -7,2,0,0,25, 7,2,0,0,-25
+			Recoil: 2
-			PrimaryRecoil: 8
-			PrimaryRecoilRecovery: 0.7
-			SecondaryRecoil: 2
 		Explodes:
 			Weapon: napalm
 			EmptyWeapon: napalm
@@ -717,29 +701,17 @@ Rules:
 			Step: 2
 			Ticks: 1
 			HealIfBelow: 40%
-			DamageCooldown: 150
 	BADR.Bomber:
-		Inherits: ^Plane
-		AttackBomber:
-		Armament:
-			Weapon: ParaBomb
 		Health:
 			HP: 60
-		Armor:
-			Type: Light
 		Aircraft:
-			ROT: 5
 			Speed: 280
 		AmmoPool:
 			Ammo: 30
-		WithFacingSpriteBody:
-		WithShadow:
-		-Selectable:
-		-GainsExperience:
 		Tooltip:
 			Name: Mig Bomber
-		-EjectOnDeath:
+		SpawnActorOnDeath:
-		AutoSelectionSize:
+			Actor: MIG.Husk
 		RenderSprites:
 			Image: mig
 	SILO:
@@ -796,46 +768,34 @@ Weapons:
 	120mm:
 		ReloadDelay: 150
 		Range: 10c0
-		Report: cannon1.aud
 		Burst: 6
 		Projectile: Bullet
 			Speed: 204
-			High: true
+			Blockable: false
 			Inaccuracy: 1c682
 			Image: 120MM
 			ContrailLength: 50
-		Warhead: SpreadDamage
+		Warhead@1Dam: SpreadDamage
 			Spread: 256
 			Versus:
 				None: 75
-				Wood: 75
-				Light: 75
 				Concrete: 100
 			Damage: 150
-			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-		Warhead@2Smu: LeaveSmudge
-			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
 			Explosions: self_destruct
 	MammothTusk:
 		ReloadDelay: 300
 		Range: 10c0
-		Report: missile6.aud
-		Burst: 2
 		ValidTargets: Ground, Air
 		Projectile: Missile
 			MaximumLaunchSpeed: 128
-			Arm: 2
+			Blockable: false
-			High: true
-			Shadow: false
-			Proximity: true
 			TrailImage: smokey
 			ContrailLength: 150
-			Inaccuracy: 853
+			Inaccuracy: 0c853
-			Image: DRAGON
 			ROT: 10
 			RangeLimit: 80
-		Warhead: SpreadDamage
+		Warhead@1Dam: SpreadDamage
 			Spread: 640
 			ValidTargets: Ground, Air
 			Versus:
@@ -845,9 +805,6 @@ Weapons:
 				Heavy: 100
 				Concrete: 200
 			Damage: 250
-			DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-		Warhead@2Smu: LeaveSmudge
-			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
 			Explosions: nuke
 	TankNapalm:
@@ -861,8 +818,9 @@ Weapons:
 			Speed: 426
 			Image: 120MM
 			Inaccuracy: 2c512
-			Trail: smokey
+			TrailImage: smokey
 			ContrailLength: 2
+			Blockable: false
 		Warhead: SpreadDamage
 			Spread: 341
 			ValidTargets: Ground
@@ -882,11 +840,10 @@ Weapons:
 	ParaBomb:
 		ReloadDelay: 5
 		Range: 5c0
-		Report: chute1.aud
 		Projectile: GravityBomb
 			Image: BOMBLET
 			-OpenSequence:
-		Warhead: SpreadDamage
+		Warhead@1Dam: SpreadDamage
 			Spread: 426
 			Versus:
 				None: 125
@@ -895,8 +852,6 @@ Weapons:
 				Concrete: 25
 			Damage: 200
 			DamageTypes: Prone50Percent, TriggerProne, FireDeath
-		Warhead@2Smu: LeaveSmudge
-			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
 			Explosions: napalm
 			ImpactSounds: firebl3.aud
@@ -904,28 +859,23 @@ Weapons:
 		ReloadDelay: 10
 		Range: 7c5
 		Burst: 20
-		MinRange: 3c0
 		-Report:
 		Projectile: Bullet
 			Speed: 170
-			Trail: fb4
+			TrailImage: fb4
 			Image: fb3
-			High: true
+			Blockable: false
 			Angle: 30
 			Inaccuracy: 1c682
 			ContrailLength: 2
-		Warhead: SpreadDamage
+		Warhead@1Dam: SpreadDamage
-			Spread: 426
 			Versus:
 				None: 80
 				Wood: 100
-				Light: 60
 				Heavy: 75
 				Concrete: 35
-			Damage: 10
+			Damage: 20
 			DamageTypes: Prone50Percent, TriggerProne, FireDeath
-		Warhead@2Smu: LeaveSmudge
-			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
 			Explosions: small_napalm
 			ImpactSounds: firebl3.aud
@@ -936,7 +886,7 @@ Weapons:
 		ValidTargets: Air, Ground
 		Projectile: Bullet
 			Speed: 1c682
-			High: true
+			Blockable: false
 		Warhead: SpreadDamage
 			Spread: 213
 			ValidTargets: Air, Ground
@@ -955,54 +905,33 @@ Weapons:
 	SCUD:
 		ReloadDelay: 280
 		Range: 7c0
-		MinRange: 3c0
-		Report: missile1.aud
 		Projectile: Bullet
-			Speed: 170
 			Arm: 10
-			High: true
+			TrailImage: smokey
-			Shadow: false
+			Blockable: false
-			Proximity: true
+			Inaccuracy: 0c426
-			Trail: smokey
-			Inaccuracy: 426
-			Image: V2
 			Angle: 216
-		Warhead: SpreadDamage
+		Warhead@1Dam: SpreadDamage
 			Spread: 853
+			Falloff: 100, 37, 14, 5, 0
 			Versus:
 				None: 100
 				Wood: 90
 				Light: 80
 				Heavy: 70
 			Damage: 500
-			DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
+			AffectsParent: true
-		Warhead@2Smu: LeaveSmudge
-			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
 			Explosions: nuke
 			ImpactSounds: kaboom1.aud
-			ValidImpactTypes: Ground
-		Warhead@4Eff: CreateEffect
-			Explosions: large_splash
-			ImpactSounds: kaboom1.aud
-			ValidImpactTypes: Water
 	SilencedPPK:
-		ReloadDelay: 80
 		Range: 25c0
-		Report: silppk.aud
+		ValidTargets: Infantry, Tank, Vehicle, Husk
-		Projectile: Bullet
+		InvalidTargets: Water, Structure, Wall
-			Speed: 1c682
+		Warhead@1Dam: SpreadDamage
-		Warhead: SpreadDamage
+			ValidTargets: Infantry, Tank, Vehicle, Husk
-			Spread: 128
 			Versus:
-				Wood: 0
-				Light: 0
 				Heavy: 50
-				Concrete: 0
-			Damage: 150
-			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-		Warhead@2Eff: CreateEffect
-			Explosions: piffs
 
 Voices: