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

GivesBounty: Replace Stances with ValidStances

Browse Source
This commit is contained in:
Taryn Hill
2016-07-02 11:06:23 -05:00
parent ec808ddc54
commit 3f6f918b3d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/GivesBounty.cs
View File

@@ -10,7 +10,6 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Warheads; using OpenRA.Mods.Common.Warheads;
using OpenRA.Traits; using OpenRA.Traits;
@@ -27,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int LevelMod = 125; public readonly int LevelMod = 125;
[Desc("Stance the attacking player needs to receive the bounty.")] [Desc("Stance the attacking player needs to receive the bounty.")]
public readonly Stance[] Stances = { Stance.Neutral, Stance.Enemy }; public readonly Stance ValidStances = Stance.Neutral | Stance.Enemy;
[Desc("Whether to show a floating text announcing the won bounty.")] [Desc("Whether to show a floating text announcing the won bounty.")]
public readonly bool ShowBounty = true; public readonly bool ShowBounty = true;
@@ -64,7 +63,7 @@ namespace OpenRA.Mods.Common.Traits
if (e.Attacker == null || e.Attacker.Disposed) if (e.Attacker == null || e.Attacker.Disposed)
return; return;
if (!info.Stances.Contains(e.Attacker.Owner.Stances[self.Owner])) if (!info.ValidStances.HasStance(e.Attacker.Owner.Stances[self.Owner]))
return; return;
var warhead = e.Warhead as DamageWarhead; var warhead = e.Warhead as DamageWarhead;