Cruise missile tracking fix. Tomahawk balance pass. Add Tomahawk/Disc…

… to AI. Vertigo decloaks on approaching target. Reduced Vertigo damage vs buildings and removed concussion.

OpenRA.Mods.CA/Activities/CruiseMissileFly.cs

@@ -42,7 +42,7 @@ public CruiseMissileFly(Actor self, Target t, CruiseMissile cm, WDist maxAltitud
 			length = Math.Max((targetPos - launchPos).Length / this.cm.Info.Speed, 1);
 			facing = (targetPos - launchPos).Yaw;
 			cm.Facing = GetEffectiveFacing();
-			trackingActive = !trackTarget;
+			trackingActive = trackTarget;
 			this.maxAltitude = maxAltitude;
 			this.maxTargetMovement = maxTargetMovement;
 			launchAngleDegrees = (int)(cm.Info.LaunchAngle.Angle / (1024f / 360f));

OpenRA.Mods.CA/Traits/CruiseMissile.cs

@@ -39,7 +39,7 @@ public class CruiseMissileInfo : MissileBaseInfo
 		public readonly string DescendingCondition = null;
 
 		[Desc("If true, missile will track target.")]
-		public readonly bool TrackTarget = true;
+		public readonly bool TrackTarget = false;
 
 		public override object Create(ActorInitializer init) { return new CruiseMissile(init, this); }
 	}

mods/ca/rules/ai.yaml

@@ -923,6 +923,7 @@ Player:
 			bdrone.upgrade: 1
 			abur.upgrade: 1
 			bjet.upgrade: 1
+			thwk.upgrade: 1
 			tow.upgrade: 1
 			pointdef.upgrade: 1
 			hypersonic.upgrade: 1
@@ -1152,6 +1153,7 @@ Player:
 			bdrone.upgrade: 1
 			abur.upgrade: 1
 			bjet.upgrade: 1
+			thwk.upgrade: 1
 			tow.upgrade: 1
 			pointdef.upgrade: 1
 			hypersonic.upgrade: 1
@@ -1380,6 +1382,7 @@ Player:
 			bdrone.upgrade: 1
 			abur.upgrade: 1
 			bjet.upgrade: 1
+			thwk.upgrade: 1
 			tow.upgrade: 1
 			pointdef.upgrade: 1
 			hypersonic.upgrade: 1
@@ -1608,6 +1611,7 @@ Player:
 			bdrone.upgrade: 1
 			abur.upgrade: 1
 			bjet.upgrade: 1
+			thwk.upgrade: 1
 			tow.upgrade: 1
 			pointdef.upgrade: 1
 			hypersonic.upgrade: 1
@@ -1804,6 +1808,7 @@ Player:
 			bdrone.upgrade: 1
 			abur.upgrade: 1
 			bjet.upgrade: 1
+			thwk.upgrade: 1
 			tow.upgrade: 1
 			pointdef.upgrade: 1
 			hypersonic.upgrade: 1
@@ -2023,6 +2028,7 @@ Player:
 			htnk.hover: 40
 			htnk.drone: 40
 			v3rl: 3
+			thwk: 3
 			titn: 40
 			titn.rail: 40
 			jugg: 10
@@ -2059,6 +2065,7 @@ Player:
 			yak: 2
 			disr: 10
 			kiro: 2
+			disc: 2
 			a10: 5
 			a10.upg: 5
 			auro: 5
@@ -2115,6 +2122,7 @@ Player:
 			jjet: 8
 			bjet: 8
 			kiro: 4
+			disc: 4
 			deva: 4
 			pac: 4
 			ss: 10
@@ -2294,6 +2302,7 @@ Player:
 			htnk.hover: 40
 			htnk.drone: 40
 			v3rl: 3
+			thwk: 3
 			titn: 40
 			titn.rail: 40
 			jugg: 10
@@ -2330,6 +2339,7 @@ Player:
 			yak: 2
 			disr: 10
 			kiro: 2
+			disc: 2
 			a10: 5
 			a10.upg: 5
 			auro: 5
@@ -2386,6 +2396,7 @@ Player:
 			jjet: 8
 			bjet: 8
 			kiro: 3
+			disc: 3
 			deva: 3
 			pac: 3
 			ss: 10
@@ -2532,6 +2543,7 @@ Player:
 			htnk.hover: 40
 			htnk.drone: 40
 			v3rl: 3
+			thwk: 3
 			titn: 40
 			titn.rail: 40
 			jugg: 10
@@ -2568,6 +2580,7 @@ Player:
 			yak: 2
 			disr: 10
 			kiro: 2
+			disc: 2
 			a10: 5
 			a10.upg: 5
 			auro: 5
@@ -2621,6 +2634,7 @@ Player:
 			jjet: 8
 			bjet: 8
 			kiro: 2
+			disc: 2
 			deva: 2
 			pac: 2
 			ss: 10
@@ -2767,6 +2781,7 @@ Player:
 			htnk.hover: 40
 			htnk.drone: 40
 			v3rl: 3
+			thwk: 3
 			titn: 40
 			titn.rail: 40
 			jugg: 10
@@ -2803,6 +2818,7 @@ Player:
 			yak: 2
 			disr: 10
 			kiro: 2
+			disc: 2
 			a10: 5
 			a10.upg: 5
 			auro: 5
@@ -2856,6 +2872,7 @@ Player:
 			jjet: 8
 			bjet: 8
 			kiro: 1
+			disc: 1
 			deva: 1
 			pac: 1
 			ss: 10
@@ -2932,6 +2949,7 @@ Player:
 			yak: 2
 			disr: 10
 			kiro: 2
+			disc: 2
 			a10: 5
 			a10.upg: 5
 			auro: 5

mods/ca/rules/aircraft.yaml

@@ -4080,6 +4080,10 @@ VERT:
 		Weapon: VertigoBomb
 		LocalOffset: 2,0,-43
 		PauseOnCondition: !ammo
+	Armament@DECLOAK:
+		Name: secondary
+		Weapon: VertigoBombTargeter
+		PauseOnCondition: !ammo
 	AttackAircraft:
 		FacingTolerance: 80
 		PersistentTargeting: false
@@ -4103,6 +4107,7 @@ VERT:
 		Ammo: 1
 		ReloadDelay: 180
 		AmmoCondition: ammo
+		Armaments: primary
 	WithAmmoPipsDecoration:
 		Position: BottomLeft
 		Margin: 4, 3
@@ -4176,6 +4181,9 @@ VERT:
 	GrantConditionOnDamageState@UNCLOAK:
 		Condition: cloak-force-disabled
 		ValidDamageStates: Critical
+	-RangeMultiplier@SEEK:
+	-RangeMultiplier@SEEK2:
+	-RangeMultiplier@SEEK3:
 
 MCOR:
 	Inherits: ^HelicopterTD
@@ -4329,7 +4337,7 @@ DISC:
 		RequiresCondition: resourcedraining
 	WithIdleOverlay@Drain:
 		Sequence: drain
-		Palette: effect-ignore-lighting-alpha85
+		Palette: effect
 		RequiresCondition: powerdraining || resourcedraining
 		IsDecoration: true
 	AmbientSoundCA@Drain:
@@ -4344,9 +4352,6 @@ DISC:
 	SpawnActorOnDeath@EMP:
 		Actor: DISC.Husk.EMP
 		RequiresCondition: airborne && empdisable && !being-warped
-	AutoTarget:
-		InitialStance: HoldFire
-		InitialStanceAI: AttackAnything
 	LeavesTrails@2:
 		Offsets: 0,300,0
 		MovingInterval: 2

mods/ca/rules/defaults.yaml

@@ -581,7 +581,7 @@
 	ExternalCondition@DiscPowerDrain:
 		Condition: discpowerdrain
 	Power@DiscPowerDrain:
-		Power: -10000
+		Amount: -10000
 		RequiresCondition: discpowerdrain
 	WithColoredOverlay@POWERDRAIN:
 		RequiresCondition: powerdrain || discpowerdrain

mods/ca/rules/husks.yaml

@@ -1963,6 +1963,7 @@ DISC.Husk:
 	Inherits: ^HelicopterHusk
 	Tooltip:
 		Name: Floating Disc
+	Aircraft:
 		TurnSpeed: 12
 		Speed: 112
 	LeavesTrails:
@@ -1985,5 +1986,5 @@ DISC.Husk:
 		Image: disccrash
 
 DISC.Husk.EMP:
-	Inherits: HIND.Husk
+	Inherits: DISC.Husk
 	Inherits: ^EmpVisualEffect

mods/ca/rules/vehicles.yaml

@@ -7363,10 +7363,10 @@ THWK:
 		Prerequisites: gtek, ~thwk.upgrade, ~techlevel.high
 		Queue: VehicleSQ, VehicleMQ
 		IconPalette: chrometd
-		Description: Extreme Long-range missile artillery.
+		Description: Extreme long-range missile artillery.
 	TooltipExtras:
-		Strengths: • Strong vs Buildings, Defenses, Infantry, Light Armor
-		Weaknesses: • Weak vs Heavy Armor\n• Cannot attack Aircraft\n• Has difficulty hitting moving targets\n• Cannot fire while moving
+		Strengths: • Strong vs Buildings, Defenses, Light Armor
+		Weaknesses: • Cannot attack Aircraft\n• Has difficulty hitting moving targets\n• Cannot fire while moving\n• Rockets can be shot down by static anti-air defenses
 	Mobile:
 		Speed: 44
 		Voice: Move
@@ -7390,7 +7390,6 @@ THWK:
 		Weapon: THLauncher
 	AttackTurreted:
 		TargetFrozenActors: True
-		ForceFireIgnoresActors: True
 		Voice: Attack
 		PauseOnCondition: empdisable || being-warped
 	WithSpriteTurret@OneMissile:
@@ -7403,7 +7402,7 @@ THWK:
 		RespawnTicks: 249
 		LoadedCondition: loaded
 		LaunchingCondition: launching
-		SpawnOffset: 0,256,128
+		SpawnOffset: 100,426,512
 	WithSpawnerMasterPipsDecoration:
 		Position: BottomLeft
 		Margin: 4, 3
@@ -7441,8 +7440,10 @@ TH:
 		LaunchAngle: 128
 		Speed: 165
 		MaxAltitude: 2c511
-		MaxTargetMovement: 21c0
+		MinAirborneAltitude: 256
 		AirborneCondition: airborne
+		TrackTarget: true
+		MaxTargetMovement: 2c0
 	LeavesTrailsCA:
 		Image: icbmsmoke
 		MovingInterval: 2
@@ -7456,3 +7457,8 @@ TH:
 	Explodes:
 		Weapon: THExplodeAirborne
 		RequiresCondition: airborne
+	ThrowsShrapnel@Debris:
+		Weapons: SmallDebris
+		Pieces: 3, 5
+		Range: 1c511, 3c0
+		RequiresCondition: airborne

mods/ca/sequences/aircraft.yaml

@@ -594,9 +594,10 @@ disc:
 		Length: *
 		ZOffset: -128
 		Offset: 0, 10
-		AlphaFade: True
+		Tick: 60
+		Alpha: 0.65
 	charge:
-    	Filename: disccharge.shp
+		Filename: disccharge.shp
 		Length: *
 		Tick: 70
 		ZOffset: 1023

mods/ca/weapons/missiles.yaml

@@ -1071,25 +1071,12 @@ THWeapon:
 		Falloff: 1000, 448, 192, 50, 18, 7, 0
 		ValidTargets: Ground, Water, Trees
 		Versus:
-			None: 90
-			Wood: 100
-			Light: 65
-			Heavy: 25
-			Concrete: 60
+			None: 60
+			Wood: 75
+			Light: 80
+			Heavy: 100
+			Concrete: 75
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath, FlakVestMitigated
-	Warhead@antiHeavySplash: SpreadDamage
-		Damage: 3400
-		Spread: 448
-		Falloff: 1000, 448, 192, 50, 18, 7, 0
-		ValidTargets: Vehicle, Husk
-		Versus:
-			Heavy: 35
-			None: 0
-			Wood: 0
-			Light: 5
-			Concrete: 0
-			Brick: 0
-		DamageTypes: SmallExplosionDeath
 	Warhead@3Eff: CreateEffect
 		ImpactSounds: xplobig4.aud
 		Explosions: building, building2

mods/ca/weapons/other.yaml

@@ -2587,7 +2587,7 @@ JDAM:
 		RandomClusterCount: 3
 		Dimensions: 3,3
 		Footprint: xxx xxx xxx
-	Warhead@Concussion2: GrantExternalCondition
+	Warhead@Concussion: GrantExternalCondition
 		Range: 3c0
 		Duration: 70
 		Condition: concussion
@@ -2932,6 +2932,16 @@ VertigoBomb:
 	Report: vert-bomb1.aud
 	Warhead@3Eff: CreateEffect
 		ImpactSounds: vert-bombhit1.aud, vert-bombhit2.aud
+	Warhead@1Dam: SpreadDamage
+		Versus:
+			Wood: 80
+	-Warhead@Concussion:
+
+VertigoBombTargeter:
+	Range: 9c0
+	ReloadDelay: 50
+	Projectile: InstantHit
+	Warhead@1Dam: Dummy
 
 PeacemakerBombs:
 	ReloadDelay: 10