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

Merge pull request #6675 from Mailaender/ts-harvester-attack-notifier

Browse Source 
Fixed Tiberian Sun harvester under attack notification not playing.
This commit is contained in:
Taryn Hill
2014-10-08 10:41:48 -05:00
parent c1d1c6f226 25c89698fd
commit dc9b97c695
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,12 +15,21 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
[Desc("Plays an audio notification and shows a radar ping when a building is attacked.",
"Attach this to the player actor.")]
public class BaseAttackNotifierInfo : ITraitInfo
{
public readonly int NotifyInterval = 30; // seconds
[Desc("Minimum duration (in seconds) between notification events.")]
public readonly int NotifyInterval = 30;
public readonly Color RadarPingColor = Color.Red;
[Desc("Length of time (in ticks) to display a location ping in the minimap.")]
public readonly int RadarPingDuration = 10 * 25;
[Desc("The audio notification type to play.")]
public string Notification = "BaseAttack";
public object Create(ActorInitializer init) { return new BaseAttackNotifier(init.self, this); }
}
@@ -58,7 +67,7 @@ namespace OpenRA.Mods.RA
if (self.World.WorldTick - lastAttackTime > info.NotifyInterval * 25)
{
Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", "BaseAttack", self.Owner.Country.Race);
Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.Notification, self.Owner.Country.Race);
if (radarPings != null)
radarPings.Add(() => self.Owner == self.World.LocalPlayer, self.CenterPosition, info.RadarPingColor, info.RadarPingDuration);

13
OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs
View File

@@ -14,12 +14,21 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
[Desc("Plays an audio notification and shows a radar ping when a harvester is attacked.",
"Attach this to the player actor.")]
public class HarvesterAttackNotifierInfo : ITraitInfo
{
public readonly int NotifyInterval = 30; // seconds
[Desc("Minimum duration (in seconds) between notification events.")]
public readonly int NotifyInterval = 30;
public readonly Color RadarPingColor = Color.Red;
[Desc("Length of time (in ticks) to display a location ping in the minimap.")]
public readonly int RadarPingDuration = 10 * 25;
[Desc("The audio notification type to play.")]
public string Notification = "HarvesterAttack";
public object Create(ActorInitializer init) { return new HarvesterAttackNotifier(init.self, this); }
}
@@ -49,7 +58,7 @@ namespace OpenRA.Mods.RA
if (self.World.WorldTick - lastAttackTime > info.NotifyInterval * 25)
{
Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", "HarvesterAttack", self.Owner.Country.Race);
Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.Notification, self.Owner.Country.Race);
if (radarPings != null)
radarPings.Add(() => self.Owner == self.World.LocalPlayer, self.CenterPosition, info.RadarPingColor, info.RadarPingDuration);

1
mods/ts/rules/player.yaml
View File

@@ -42,6 +42,7 @@ Player:
Shroud:
FrozenActorLayer:
BaseAttackNotifier:
HarvesterAttackNotifier:
PlayerStatistics:
PlaceBeacon: