From a5a4be6bff412ed0739c3d80e9ddbfdebe09f612 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Fri, 31 Jan 2020 21:40:29 +0300 Subject: [PATCH] Adjust dolphin weapon. --- mods/ra2/rules/allied-naval.yaml | 4 ++-- mods/ra2/weapons/zaps.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ra2/rules/allied-naval.yaml b/mods/ra2/rules/allied-naval.yaml index 492f5c6a5..892d4b7bf 100644 --- a/mods/ra2/rules/allied-naval.yaml +++ b/mods/ra2/rules/allied-naval.yaml @@ -175,10 +175,10 @@ dlph: UncloakOn: Damage IsPlayerPalette: true Targetable: - TargetTypes: Ground, Water + TargetTypes: Ground, Water, ImmuneToAllySonic RequiresCondition: underwater Targetable@underwater: - TargetTypes: Underwater + TargetTypes: Underwater, ImmuneToAllySonic RequiresCondition: underwater DetectCloaked: CloakTypes: Underwater diff --git a/mods/ra2/weapons/zaps.yaml b/mods/ra2/weapons/zaps.yaml index 61fb28f0a..bc38532f0 100644 --- a/mods/ra2/weapons/zaps.yaml +++ b/mods/ra2/weapons/zaps.yaml @@ -69,11 +69,10 @@ SonicZap: Range: 6c0 Report: vdolatta.wav ValidTargets: Water, Underwater - Burst: 2 Projectile: AreaBeam - Speed: 1c0 - Duration: 10 - DamageInterval: 5 + Speed: 0c256 + Duration: 5 + DamageInterval: 1 Width: 0c512 Shape: Flat ZOffset: 2047 @@ -102,6 +101,7 @@ SonicZap: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath ValidTargets: Water, Underwater + InvalidTargets: ImmuneToAllySonic PrismShot: ReloadDelay: 1