epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5346 from reaperrr/heli-watercrash

Browse Source 
Changed Combat WaterExplosion check to trigger below 0 as well
This commit is contained in:
Paul Chote
2014-05-20 11:51:15 +12:00
parent 66398d85f7 b85ea7cb3a
commit 32373e84c8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Combat.cs
View File

@@ -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;

2
mods/ra/weapons.yaml
View File

@@ -1168,8 +1168,10 @@ UnitExplodeSmall:
Light: 60%
Heavy: 25%
Explosion: large_explosion
WaterExplosion: large_splash
InfDeath: 4
ImpactSound: kaboom15.aud
WaterImpactSound: splash9.aud
BarrelExplode:
Warhead: