Campaign file changes and cleanup

Remove NoAutoTarget

mods/ra/maps/allies-01/allies01.lua

@@ -37,7 +37,6 @@ RunInitialActivities = function()
 	Patrol2.Hunt()
 	Patrol3.Hunt()
 	Patrol4.Hunt()
-	Harvester.FindResources()
 	Civilian1.Wait(DateTime.Seconds(6))
 	Civilian2.Wait(DateTime.Seconds(6))
 	Civilian1.Hunt()

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

@@ -149,11 +149,9 @@ Actors:
 	Actor33: proc
 		Location: 73,58
 		Owner: USSR
-		FreeActor: False
 	Actor34: kenn
 		Location: 64,65
 		Owner: USSR
-		Health: 99
 	Actor35: powr
 		Location: 65,57
 		Owner: USSR
@@ -364,10 +362,6 @@ Actors:
 	OilPump: v19
 		Location: 59,57
 		Owner: USSR
-	Harvester: harv
-		Location: 72,60
-		Owner: USSR
-		Facing: 224
 	LabGuard1: e1
 		Location: 64,61
 		Owner: USSR

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

@@ -1,10 +1,2 @@
 8Inch:
 	Range: 25c0
-
-M60mg:
-	Range: 5c0
-	ReloadDelay: 20
-	Burst: 1
-	Warhead: SpreadDamage
-		Damage: 20
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath

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

@@ -460,7 +460,6 @@ Actors:
 	Actor137: e2
 		Location: 73,51
 		Owner: USSR
-		Health: 56
 		Facing: 224
 		SubCell: 4
 	Actor138: medi
@@ -567,7 +566,6 @@ Actors:
 	SovietKennel: kenn
 		Location: 58,68
 		Owner: USSR
-		Health: 99
 	SovietBarracks: barr
 		Location: 56,66
 		Owner: USSR
@@ -577,7 +575,6 @@ Actors:
 	Harvester: harv
 		Location: 55,65
 		Owner: USSR
-		Health: 50
 		Facing: 160
 	PathGuard1: e1
 		Location: 50,72
@@ -673,5 +670,3 @@ Actors:
 		Owner: Neutral
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml
-
-Weapons: weapons.yaml

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

@@ -24,10 +24,6 @@ World:
 			tough: Real tough guy
 		Default: easy
 
-HARV:
-	Buildable:
-		Prerequisites: weap
-
 APWR:
 	Buildable:
 		Prerequisites: ~disabled

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

@@ -1,7 +0,0 @@
-M60mg:
-	Range: 5c0
-	ReloadDelay: 20
-	Burst: 1
-	Warhead: SpreadDamage
-		Damage: 20
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath

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

@@ -63,14 +63,6 @@ CAMERA:
 	RevealsShroud:
 		Range: 8c5
 
-FTUR:
-	DetectCloaked:
-		Range: 0
-
-DOME:
-	DetectCloaked:
-		Range: 0
-
 CAMERA.VeryLarge:
 	Inherits: CAMERA
 	RevealsShroud:

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

@@ -5,10 +5,6 @@ Colt45:
 		Versus:
 			Truk: 50
 
-FireballLauncher:
-	Projectile:
-		High: True
-
 BarrelExplode:
 	Warhead@1Dam:
 		ValidTargets: Ground, Prisoner

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

@@ -24,19 +24,11 @@ Camera.Small:
 	RevealsShroud:
 		Range: 4c0
 
-FTUR:
-	DetectCloaked:
-		Range: 0
-
 TSLA:
-	DetectCloaked:
-		Range: 0
 	Buildable:
 		Prerequisites: ~disabled
 
 SAM:
-	DetectCloaked:
-		Range: 0
 	Buildable:
 		Prerequisites: ~disabled
 
@@ -97,7 +89,7 @@ MISS:
 		TargetTypes: Ground, C4, DetonateAttack, Structure, Mission Objectives
 	AttackOmni:
 	Armament:
-		Weapon: MissionColt
+		Weapon: PrisonColt
 
 E1.Autotarget:
 	Inherits: E1

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

@@ -1,12 +1,6 @@
-MissionColt:
+PrisonColt:
-	ReloadDelay: 6
+	ReloadDelay: 5
-	Range: 7c0
 	Report: gun5.aud
 	Projectile: InstantHit
 	Warhead@1Dam: SpreadDamage
-		Spread: 42
-		Damage: 50
-		Versus:
-			Wood: 10
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 		AffectsParent: true

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

@@ -638,5 +638,3 @@ Actors:
 		Location: 73,90
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml
-
-Weapons: weapons.yaml

mods/ra/maps/allies-06a/weapons.yaml

@@ -1,7 +0,0 @@
-M60mg:
-	Range: 5c0
-	ReloadDelay: 20
-	Burst: 1
-	Warhead: SpreadDamage
-		Damage: 20
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath

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

@@ -148,11 +148,9 @@ Actors:
 	Actor34: fact
 		Location: 72,52
 		Owner: USSR
-		Health: 99
 	Actor35: weap
 		Location: 41,50
 		Owner: Germany
-		Health: 98
 	Actor37: fact
 		Location: 39,54
 		Owner: Germany
@@ -162,7 +160,6 @@ Actors:
 	Actor40: powr
 		Location: 36,52
 		Owner: Germany
-		Health: 99
 	Actor41: tent
 		Location: 41,58
 		Owner: Germany
@@ -494,15 +491,12 @@ Actors:
 	CommandCenter: fcom
 		Location: 76,52
 		Owner: USSR
-		Health: 99
 	AlliedDome: dome
 		Location: 45,50
 		Owner: Germany
-		Health: 98
 	AlliedProc: proc
 		Location: 43,53
 		Owner: Germany
-		Health: 99
 	Barrel: brl3
 		Location: 60,60
 		Owner: Germany

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

@@ -92,17 +92,11 @@ AFLD:
 	ParatroopersPower@paratroopers:
 		Prerequisites: ~disabled
 
-DOG:
-	Health:
-		HP: 25
-	AutoTarget:
-		ScanRadius: 5
-
-powerproxy.paratroopers:
-	ParatroopersPower:
-		DropItems: E2,E2,E2,E2,E2
-
 HARV:
 	Harvester:
 		SearchFromProcRadius: 50
 		SearchFromOrderRadius: 50
+
+powerproxy.paratroopers:
+	ParatroopersPower:
+		DropItems: E2,E2,E2,E2,E2

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

@@ -197,7 +197,6 @@ Actors:
 	Actor51: proc
 		Location: 80,59
 		Owner: Germany
-		FreeActor: False
 	Actor52: powr
 		Location: 83,55
 		Owner: Germany
@@ -288,12 +287,10 @@ Actors:
 	Actor86: jeep
 		Location: 85,66
 		Owner: Germany
-		Health: 55
 		Facing: 128
 	Actor89: jeep
 		Location: 55,56
 		Owner: Germany
-		Health: 59
 		Facing: 224
 	Actor90: jeep
 		Location: 79,54
@@ -443,12 +440,10 @@ Actors:
 	BridgeGun1: gun
 		Location: 68,64
 		Owner: Germany
-		Health: 56
 		Facing: 160
 	BridgeGun2: gun
 		Location: 74,64
 		Owner: Germany
-		Health: 53
 		Facing: 160
 	IntroSoldier1: e1
 		Location: 71,65
@@ -489,5 +484,3 @@ Actors:
 		Owner: Neutral
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml
-
-Weapons: weapons.yaml

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

@@ -84,12 +84,6 @@ MIG:
 	Buildable:
 		Prerequisites: ~disabled
 
-GUN:
-	-RepairableBuilding:
-
-FCOM:
-	RepairableBuilding:
-
 AFLD:
 	Buildable:
 		Prerequisites: ~disabled
@@ -98,29 +92,14 @@ AFLD:
 	ParatroopersPower@paratroopers:
 		Prerequisites: ~disabled
 
-DOG:
+GUN:
-	Health:
+	-RepairableBuilding:
-		HP: 25
-	AutoTarget:
-		ScanRadius: 5
 
 HARV:
 	Harvester:
 		SearchFromProcRadius: 50
 		SearchFromOrderRadius: 50
 
-BARL:
-	Health:
-		HP: 1
-	Explodes:
-		Weapon: MissionBarrelExplode
-
-BRL3:
-	Health:
-		HP: 1
-	Explodes:
-		Weapon: MissionBarrelExplode
-
 MONEYCRATE:
 	GiveCashCrateAction:
 		Amount: 2000

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

@@ -1,21 +0,0 @@
-MissionBarrelExplode:
-	Warhead@1Dam: SpreadDamage
-		Spread: 600
-		Damage: 100
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		Delay: 5
-		Versus:
-			None: 120
-			Wood: 200
-			Light: 50
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 2,1
-		Delay: 5
-	Warhead@3Eff: CreateEffect
-		Explosions: napalm
-		ImpactSounds: firebl3.aud
-		Delay: 5

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

@@ -411,7 +411,6 @@ Actors:
 	Actor120: v07
 		Location: 42,37
 		Owner: Germany
-		Health: 99
 	Actor122: brl3
 		Location: 43,38
 		Owner: Creeps
@@ -978,7 +977,6 @@ Actors:
 	BaseBuilding6: miss
 		Location: 78,27
 		Owner: Soviet
-		Health: 56
 	CameraBarrier: waypoint
 		Location: 64,51
 		Owner: Neutral
@@ -1124,18 +1122,15 @@ Actors:
 	SpyHideout1: v01
 		Location: 77,52
 		Owner: Germany
-		Health: 99
 	SpyHideout2: v01
 		Location: 37,63
 		Owner: Germany
-		Health: 99
 	SpyHideout3: v01
 		Location: 61,36
 		Owner: Germany
 	SpyHideout4: v01
 		Location: 36,32
 		Owner: Germany
-		Health: 99
 	SpyWaypoint1: waypoint
 		Location: 76,42
 		Owner: Neutral
@@ -1170,6 +1165,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml
 
-Weapons: weapons.yaml
-
 Notifications: notifications.yaml

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

@@ -16,10 +16,6 @@ World:
 			hard: Hard
 		Default: easy
 
-^TechBuilding:
-	Targetable:
-		TargetTypes: Ground, C4, DetonateAttack, Structure, NoAutoTarget
-
 ^Infantry:
 	-GivesBounty:
 
@@ -31,18 +27,6 @@ World:
 	Health:
 		HP: 9000
 
-BARL:
-	Health:
-		HP: 1
-	Explodes:
-		Weapon: MissionBarrelExplode
-
-BRL3:
-	Health:
-		HP: 1
-	Explodes:
-		Weapon: MissionBarrelExplode
-
 FENC:
 	Health:
 		HP: 9000

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

@@ -1,21 +0,0 @@
-MissionBarrelExplode:
-	Warhead@1Dam: SpreadDamage
-		Spread: 600
-		Damage: 200
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		Delay: 5
-		Versus:
-			None: 120
-			Wood: 200
-			Light: 50
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 2,1
-		Delay: 5
-	Warhead@3Eff: CreateEffect
-		Explosions: napalm
-		ImpactSounds: firebl3.aud
-		Delay: 5

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

@@ -387,12 +387,10 @@ Actors:
 	Actor144: 2tnk
 		Location: 92,55
 		Owner: Greece
-		Health: 99
 		Facing: 192
 	Actor145: 2tnk
 		Location: 86,58
 		Owner: Greece
-		Health: 99
 		Facing: 160
 	Actor146: jeep
 		Location: 89,60
@@ -530,7 +528,6 @@ Actors:
 	Tank3: 3tnk
 		Location: 87,86
 		Owner: USSR
-		Health: 99
 	Tank4: 3tnk
 		Location: 85,86
 		Owner: USSR

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

@@ -270,7 +270,7 @@ Actors:
 	Barr: tent
 		Location: 63,47
 		Owner: Greece
-	Shipyard: syrd
+	Navalyard: syrd
 		Location: 78,48
 		Owner: Greece
 	Actor73: powr

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

@@ -85,11 +85,6 @@ APC:
 DOME:
 	ExternalCondition@lua:
 		Condition: captured
-	Targetable:
-		RequiresCondition: captured
-	Targetable@NOAUTOTARGET:
-		RequiresCondition: !captured
-		TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate, NoAutoTarget
 
 powerproxy.paratroopers:
 	ParatroopersPower:

mods/ra/maps/soviet-05/soviet05-AI.lua

@@ -99,7 +99,7 @@ ProduceInfantry = function()
 end
 
 ProduceShips = function()
-	if Shipyard.IsDead then
+	if Navalyard.IsDead then
 		return
 	end
 

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

@@ -585,12 +585,10 @@ Actors:
 	Actor186: 3tnk
 		Location: 56,47
 		Owner: USSR
-		Health: 99
 		Facing: 32
 	Actor187: 3tnk
 		Location: 60,49
 		Owner: USSR
-		Health: 99
 		Facing: 32
 	Actor191: v2rl
 		Location: 57,49

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

@@ -146,12 +146,6 @@ MNLY:
 	Buildable:
 		Prerequisites: ~disabled
 
-DOG:
-	Health:
-		HP: 25
-	AutoTarget:
-		ScanRadius: 5
-
 HARV:
 	Harvester:
 		SearchFromProcRadius: 50

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

@@ -325,12 +325,10 @@ Actors:
 	Actor110: 3tnk
 		Location: 43,63
 		Owner: USSR
-		Health: 99
 		Facing: 32
 	Actor111: 3tnk
 		Location: 44,62
 		Owner: USSR
-		Health: 99
 		Facing: 32
 	Actor112: v2rl
 		Location: 41,64

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

@@ -146,12 +146,6 @@ MNLY:
 	Buildable:
 		Prerequisites: ~disabled
 
-DOG:
-	Health:
-		HP: 25
-	AutoTarget:
-		ScanRadius: 5
-
 HARV:
 	Harvester:
 		SearchFromProcRadius: 50

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

@@ -19,30 +19,11 @@ World:
 ^Infantry:
 	-GivesBounty:
 
-BARL:
-	Health:
-		HP: 1
-	Explodes:
-		Weapon: MissionBarrelExplodeInterior
-
-BRL3:
-	Health:
-		HP: 1
-	Explodes:
-		Weapon: MissionBarrelExplodeInterior
-
 CAMERA:
 	RevealsShroud:
 		Range: 6c0
 
-E1:
-	Armament@PRIMARY:
-		Weapon: M1CarbineInterior
-
 FTUR:
-	Armament:
-		Weapon: FireballLauncherInterior
-		LocalOffset: 512,0,0
 	Valued:
 		Cost: 0
 	Power:

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

@@ -1,64 +1,5 @@
-M1CarbineInterior:
+M1Carbine:
-	ReloadDelay: 20
 	Range: 3c0
-	Report: gun11.aud
-	Projectile: Bullet
-		Speed: 1c682
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 15
-		Versus:
-			Wood: 25
-			Light: 30
-			Heavy: 10
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: piffs
 
-FireballLauncherInterior:
+FireballLauncher:
-	ReloadDelay: 65
+	Range: 3c128
-	Range: 3c0
-	Burst: 2
-	BurstDelays: 20
-	Projectile: Bullet
-		Speed: 204
-		TrailImage: fb2
-		Image: FB1
-	Warhead@1Dam: SpreadDamage
-		Spread: 213
-		Damage: 150
-		Versus:
-			None: 90
-			Wood: 50
-			Light: 60
-			Heavy: 25
-			Concrete: 50
-		DamageTypes: Prone50Percent, TriggerProne, FireDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-	Warhead@3Eff: CreateEffect
-		Explosions: napalm
-		ImpactSounds: firebl3.aud
-
-MissionBarrelExplodeInterior:
-	Warhead@1Dam: SpreadDamage
-		Spread: 350
-		Damage: 250
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		Delay: 5
-		Versus:
-			None: 120
-			Wood: 200
-			Light: 50
-			Heavy: 25
-			Concrete: 10
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		Size: 2,1
-		Delay: 5
-	Warhead@3Eff: CreateEffect
-		Explosions: napalm
-		ImpactSounds: firebl3.aud
-		Delay: 5