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

Play appropriate audio notifications when build/production limit is reached.

Browse Source
This commit is contained in:
Paul Chote
2018-03-29 19:47:18 +01:00
committed by reaperrr
parent da10e94b41
commit f2cf51d1a4
2 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
View File

@@ -54,11 +54,16 @@ namespace OpenRA.Mods.Common.Traits
"The filename of the audio is defined per faction in notifications.yaml.")]
public readonly string ReadyAudio = "UnitReady";
[Desc("Notification played when you can't train another unit",
[Desc("Notification played when you can't train another actor",
"when the build limit exceeded or the exit is jammed.",
"The filename of the audio is defined per faction in notifications.yaml.")]
public readonly string BlockedAudio = "NoBuild";
[Desc("Notification played when you can't queue another actor",
"when the queue length limit is exceeded.",
"The filename of the audio is defined per faction in notifications.yaml.")]
public readonly string LimitedAudio = null;
[Desc("Notification played when user clicks on the build palette icon.",
"The filename of the audio is defined per faction in notifications.yaml.")]
public readonly string QueuedAudio = "Training";
@@ -291,6 +296,42 @@ namespace OpenRA.Mods.Common.Traits
queue[0].Tick(playerResources);
}
public bool CanQueue(ActorInfo actor, out string notificationAudio)
{
notificationAudio = Info.BlockedAudio;
var bi = actor.TraitInfoOrDefault<BuildableInfo>();
if (bi == null)
return false;
if (!developerMode.AllTech)
{
if (Info.QueueLimit > 0 && queue.Count >= Info.QueueLimit)
{
notificationAudio = Info.LimitedAudio;
return false;
}
var queueCount = queue.Count(i => i.Item == actor.Name);
if (Info.ItemLimit > 0 && queueCount >= Info.ItemLimit)
{
notificationAudio = Info.LimitedAudio;
return false;
}
if (bi.BuildLimit > 0)
{
var owned = self.Owner.World.ActorsHavingTrait<Buildable>()
.Count(a => a.Info.Name == actor.Name && a.Owner == self.Owner);
if (queueCount + owned >= bi.BuildLimit)
return false;
}
}
notificationAudio = Info.QueuedAudio;
return true;
}
public void ResolveOrder(Actor self, Order order)
{
if (!Enabled)

16
OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
View File

@@ -275,13 +275,21 @@ namespace OpenRA.Mods.Common.Widgets
return true;
}
if (CurrentQueue.BuildableItems().Any(a => a.Name == icon.Name))
var buildable = CurrentQueue.BuildableItems().FirstOrDefault(a => a.Name == icon.Name);
if (buildable != null)
{
// Queue a new item
Game.Sound.Play(SoundType.UI, TabClick);
Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, World.LocalPlayer.Faction.InternalName);
World.IssueOrder(Order.StartProduction(CurrentQueue.Actor, icon.Name, handleCount));
return true;
string notification;
var canQueue = CurrentQueue.CanQueue(buildable, out notification);
Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", notification, World.LocalPlayer.Faction.InternalName);
if (canQueue)
{
World.IssueOrder(Order.StartProduction(CurrentQueue.Actor, icon.Name, handleCount));
return true;
}
}
return false;