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

removed BuildingCapture redundancy

Browse Source
This commit is contained in:
Matthias Mailänder
2013-11-09 10:26:09 +01:00
parent bfcef9df45
commit fb6bb63b29
4 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenRA.Mods.D2k/BuildingCaptureNotification.cs
View File

@@ -1,38 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2012 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class CaptureNotificationInfo : ITraitInfo
{
public readonly string Notification = "BuildingCaptured";
public object Create(ActorInitializer init) { return new CaptureNotification(this); }
}
class CaptureNotification : INotifyCapture
{
CaptureNotificationInfo captureInfo;
public CaptureNotification(CaptureNotificationInfo info)
{
captureInfo = info;
}
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
if (captor.World.LocalPlayer != captor.Owner)
return;
Sound.PlayNotification(captor.World.LocalPlayer, "Speech", captureInfo.Notification, newOwner.Country.Race);
}
}
}

1
OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
View File

@@ -77,7 +77,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Widgets\Logic\D2kInstallFromCDLogic.cs" />
<Compile Include="BuildingCaptureNotification.cs" />
<Compile Include="Render\WithCrumbleOverlay.cs" />
<Compile Include="PaletteFromR8.cs" />
</ItemGroup>

13
OpenRA.Mods.RA/BuildingCaptureNotification.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -15,25 +15,26 @@ namespace OpenRA.Mods.RA
class CaptureNotificationInfo : ITraitInfo
{
public readonly string Notification = "BuildingCaptured";
public readonly bool NewOwnerVoice = true;
public object Create(ActorInitializer init) { return new CaptureNotification(this); }
}
class CaptureNotification : INotifyCapture
{
CaptureNotificationInfo Info;
CaptureNotificationInfo info;
public CaptureNotification(CaptureNotificationInfo info)
{
Info = info;
this.info = info;
}
public void OnCapture (Actor self, Actor captor, Player oldOwner, Player newOwner)
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
if (captor.World.LocalPlayer != captor.Owner)
return;
Sound.PlayNotification(captor.World.LocalPlayer, "Speech", Info.Notification, oldOwner.Country.Race);
var race = info.NewOwnerVoice ? newOwner.Country.Race : oldOwner.Country.Race;
Sound.PlayNotification(captor.World.LocalPlayer, "Speech", info.Notification, race);
}
}
}

1
mods/cnc/rules/defaults.yaml
View File

@@ -322,6 +322,7 @@
GivesExperience:
CaptureNotification:
Notification: BuildingCaptured
NewOwnerVoice: no
ActorLostNotification:
Notification: BuildingLost
EditorAppearance: