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

Merge commit 'matt/dune^'

Browse Source 
Conflicts:
	.gitignore
	mods/d2k/rules/system.yaml
This commit is contained in:
Chris Forbes
2012-06-25 09:05:49 +12:00
parent 2ed12f1d95 7220025a62
commit a2b92d0fe4
31 changed files with 585 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.RA
{
public readonly int NotifyInterval = 30; /* seconds */
public readonly string Audio = "baseatk1.aud";
public readonly string Race = null;
public object Create(ActorInitializer init) { return new BaseAttackNotifier(this); }
}
@@ -34,6 +35,7 @@ namespace OpenRA.Mods.RA
public void Damaged(Actor self, AttackInfo e)
{
if (info.Race != null && info.Race != self.Owner.Country.Race) return;
/* only track last hit against our base */
if (!self.HasTrait<Building>())
return;