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

Merge pull request #3243 from ScottNZ/balance

Browse Source 
RA Balance (destructible mines; badr and mamooth and cruiser buff)
This commit is contained in:
Matthias Mailänder
2013-05-10 02:55:17 -07:00
parent 90ac648ff1 48010197f4
commit c2d0799595
5 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Mine.cs
View File

@@ -20,7 +20,6 @@ namespace OpenRA.Mods.RA
class MineInfo : ITraitInfo
{
public readonly string[] CrushClasses = { };
[WeaponReference] public readonly string Weapon = "ATMine";
public readonly bool AvoidFriendly = true;
public readonly string[] DetonateClasses = { };
@@ -44,15 +43,14 @@ namespace OpenRA.Mods.RA
public void OnCrush(Actor crusher)
{
if (crusher.HasTrait<MineImmune>() || self.Owner.Stances[crusher.Owner] == Stance.Ally)
if (crusher.HasTrait<MineImmune>() || (self.Owner.Stances[crusher.Owner] == Stance.Ally && info.AvoidFriendly))
return;
var mobile = crusher.TraitOrDefault<Mobile>();
if (mobile != null && !info.DetonateClasses.Intersect(mobile.Info.Crushes).Any())
return;
Combat.DoExplosion(self, info.Weapon, crusher.CenterLocation, 0);
self.QueueActivity(new RemoveSelf());
self.Kill(crusher);
}
public bool CrushableBy(string[] crushClasses, Player owner)