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

Enables "insufficient power"-speech in RA and C&C when powered-down supportpowerwidget is clicked

Browse Source
This commit is contained in:
Kanar
2014-01-27 04:29:32 +01:00
parent 8685ec64ae
commit 17cf890dce
10 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.RA/SupportPowers/SupportPower.cs
View File

@@ -24,6 +24,7 @@ namespace OpenRA.Mods.RA
public readonly string BeginChargeSound = null;
public readonly string EndChargeSound = null;
public readonly string SelectTargetSound = null;
public readonly string InsufficientPowerSound = null;
public readonly string LaunchSound = null;
public readonly string IncomingSound = null;

3
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -370,8 +370,9 @@ namespace OpenRA.Mods.RA.Widgets
// Check if the item's build-limit has already been reached
var queued = CurrentQueue.AllQueued().Count(a => a.Item == unit.Name);
var inWorld = world.ActorsWithTrait<Buildable>().Count(a => a.Actor.Info.Name == unit.Name && a.Actor.Owner == world.LocalPlayer);
var buildLimit = unit.Traits.Get<BuildableInfo>().BuildLimit;
if (!((unit.Traits.Get<BuildableInfo>().BuildLimit != 0) && (inWorld + queued >= unit.Traits.Get<BuildableInfo>().BuildLimit)))
if (!((buildLimit != 0) && (inWorld + queued >= buildLimit)))
Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, world.LocalPlayer.Country.Race);
else
Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.BlockedAudio, world.LocalPlayer.Country.Race);

10
OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs
View File

@@ -167,7 +167,15 @@ namespace OpenRA.Mods.RA.Widgets
Action<MouseInput> HandleSupportPower(string key, SupportPowerManager manager)
{
return mi => { if (mi.Button == MouseButton.Left) manager.Target(key); };
return mi =>
{
if (mi.Button == MouseButton.Left)
{
if (!manager.Powers[key].Active)
Sound.PlayToPlayer(manager.self.Owner, manager.Powers[key].Info.InsufficientPowerSound);
manager.Target(key);
}
};
}
}
}