From 52816dcc3bff7bd40dc4fcff28b0f53eb9b22e62 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 18 May 2014 00:29:34 +0200 Subject: [PATCH 1/2] Adds WaterExplosion and WaterImpactSound to UnitExplodeSmall. Fixes #4515. --- mods/ra/weapons.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 956e453f0d..5dfc8c0b19 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1167,8 +1167,10 @@ UnitExplodeSmall: Light: 60% Heavy: 25% Explosion: large_explosion + WaterExplosion: large_splash InfDeath: 4 ImpactSound: kaboom15.aud + WaterImpactSound: splash9.aud BarrelExplode: Warhead: From b85ea7cb3a2c877c47487484656855ce51e3a826 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Mon, 19 May 2014 18:00:40 +0200 Subject: [PATCH 2/2] Changes isWater check to trigger at pos.Z at or below 0, not just at 0. --- OpenRA.Mods.RA/Combat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs index 1f2658f352..fc6c371da5 100755 --- a/OpenRA.Mods.RA/Combat.cs +++ b/OpenRA.Mods.RA/Combat.cs @@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA if (!world.Map.IsInMap(targetTile)) return; - var isWater = pos.Z == 0 && world.GetTerrainInfo(targetTile).IsWater; + var isWater = pos.Z <= 0 && world.GetTerrainInfo(targetTile).IsWater; var explosionType = isWater ? warhead.WaterExplosion : warhead.Explosion; var explosionTypePalette = isWater ? warhead.WaterExplosionPalette : warhead.ExplosionPalette;