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

Allow to customize which terrain types are considered water by Parachutable

Browse Source
This commit is contained in:
reaperrr
2016-07-10 22:29:06 +02:00
parent 3e217c2192
commit 1e43554559
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Traits/Parachutable.cs
View File

@@ -9,6 +9,7 @@
*/ */
#endregion #endregion
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Traits; using OpenRA.Traits;
@@ -32,6 +33,9 @@ namespace OpenRA.Mods.Common.Traits
[SequenceReference("Image")] public readonly string WaterCorpseSequence = null; [SequenceReference("Image")] public readonly string WaterCorpseSequence = null;
[PaletteReference] public readonly string WaterCorpsePalette = "effect"; [PaletteReference] public readonly string WaterCorpsePalette = "effect";
[Desc("Terrain types on which to display WaterCorpseSequence.")]
public readonly HashSet<string> WaterTerrainTypes = new HashSet<string> { "Water" };
public readonly int FallRate = 13; public readonly int FallRate = 13;
[UpgradeGrantedReference] [UpgradeGrantedReference]
@@ -59,19 +63,23 @@ namespace OpenRA.Mods.Common.Traits
if (!info.KilledOnImpassableTerrain) if (!info.KilledOnImpassableTerrain)
return; return;
if (positionable.CanEnterCell(self.Location, self)) var cell = self.Location;
if (self.World.Map.Contains(cell))
return; return;
if (ignore != null && self.World.ActorMap.GetActorsAt(self.Location).Any(a => a != ignore)) if (positionable.CanEnterCell(cell, self))
return; return;
var terrain = self.World.Map.GetTerrainInfo(self.Location); if (ignore != null && self.World.ActorMap.GetActorsAt(cell).Any(a => a != ignore))
return;
var sound = terrain.IsWater ? info.WaterImpactSound : info.GroundImpactSound; var onWater = info.WaterTerrainTypes.Contains(self.World.Map.GetTerrainInfo(cell).Type);
var sound = onWater ? info.WaterImpactSound : info.GroundImpactSound;
Game.Sound.Play(sound, self.CenterPosition); Game.Sound.Play(sound, self.CenterPosition);
var sequence = terrain.IsWater ? info.WaterCorpseSequence : info.GroundCorpseSequence; var sequence = onWater ? info.WaterCorpseSequence : info.GroundCorpseSequence;
var palette = terrain.IsWater ? info.WaterCorpsePalette : info.GroundCorpsePalette; var palette = onWater ? info.WaterCorpsePalette : info.GroundCorpsePalette;
if (sequence != null && palette != null) if (sequence != null && palette != null)
self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(self.OccupiesSpace.CenterPosition, w, info.Image, sequence, palette))); self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(self.OccupiesSpace.CenterPosition, w, info.Image, sequence, palette)));