Fix diving units targeting.

OpenRA · May 10, 2020 · 0bd1e28 · 0bd1e28
1 parent 96f2d92
commit 0bd1e28
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/mods/ra2/rules/allied-naval.yaml b/mods/ra2/rules/allied-naval.yaml
@@ -198,10 +198,10 @@ dlph:
 		UncloakOn: Damage
 		IsPlayerPalette: true
 	Targetable:
-		TargetTypes: Ground, Water, ImmuneToAllySonic
+		TargetTypes: Ground, Water, ImmuneToAllySonic, Submergeable
 		RequiresCondition: !underwater
 	Targetable@underwater:
-		TargetTypes: Underwater, ImmuneToAllySonic
+		TargetTypes: Underwater, ImmuneToAllySonic, Submergeable
 		RequiresCondition: underwater
 	DetectCloaked:
 		CloakTypes: Underwater

diff --git a/mods/ra2/rules/soviet-naval.yaml b/mods/ra2/rules/soviet-naval.yaml
@@ -61,9 +61,11 @@ sub:
 	-LeavesTrails:
 	RevealsShroud:
 		Range: 6c0
-	-Targetable:
 	Targetable:
-		TargetTypes: Ground, Water, Repair
+		TargetTypes: Ground, Water, Repair, Submergeable
+		RequiresCondition: !underwater
+	Targetable@UNDERWATER:
+		TargetTypes: Underwater, Submergeable
 		RequiresCondition: underwater
 	Cloak:
 		CloakTypes: Underwater
@@ -195,10 +197,10 @@ sqd:
 		UncloakOn: Damage, Attack
 		IsPlayerPalette: true
 	Targetable:
-		TargetTypes: Ground, Water
+		TargetTypes: Ground, Water, Submergeable
 		RequiresCondition: !underwater
 	Targetable@underwater:
-		TargetTypes: Underwater
+		TargetTypes: Underwater, Submergeable
 		RequiresCondition: underwater
 	DetectCloaked:
 		CloakTypes: Underwater

diff --git a/mods/ra2/weapons/missiles.yaml b/mods/ra2/weapons/missiles.yaml
@@ -240,13 +240,13 @@ HornetBombE:
 ASWBomb:
 	Inherits: HornetBomb
 	Range: 3c0
-	ValidTargets: Underwater
+	ValidTargets: Submergeable
 	Projectile: Missile
 		BoundToTerrainType: Water
 	Warhead@1Dam: SpreadDamage
 		Damage: 50
 		Spread: 426
-		ValidTargets: Water, Underwater
+		ValidTargets: Submergeable
 		Versus:
 			None: 25
 			Flak: 25