From a917abe75b8c9ef405ce1d3e41d986ee7dcb173d Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 1 May 2020 15:17:37 +0200 Subject: [PATCH] Fix diving units targeting. --- mods/ra2/rules/allied-naval.yaml | 4 ++-- mods/ra2/rules/soviet-naval.yaml | 10 ++++++---- mods/ra2/weapons/missiles.yaml | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mods/ra2/rules/allied-naval.yaml b/mods/ra2/rules/allied-naval.yaml index 3af6183e6..73d32cc5c 100644 --- 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 index 5bf32c352..c270fa14c 100644 --- 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 index a749be492..89dbeb8c7 100644 --- 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