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

Fix Production Palette audio (Bug #1004).

Browse Source
This commit is contained in:
Paul Chote
2011-07-14 20:56:17 +12:00
parent 5fceaaec58
commit 725b0cda40
2 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs
View File

@@ -34,6 +34,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{ {
public readonly int Columns = 3; public readonly int Columns = 3;
public readonly string TabClick = null; public readonly string TabClick = null;
public readonly string DisabledTabClick = null;
public readonly string TooltipContainer; public readonly string TooltipContainer;
public readonly string TooltipTemplate = "PRODUCTION_TOOLTIP"; public readonly string TooltipTemplate = "PRODUCTION_TOOLTIP";
@@ -136,48 +137,56 @@ namespace OpenRA.Mods.Cnc.Widgets
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)
{ {
Sound.Play(TabClick);
// Pick up a completed building // Pick up a completed building
if (first != null && first.Done && actor.Traits.Contains<BuildingInfo>()) if (first != null && first.Done && actor.Traits.Contains<BuildingInfo>())
{
Sound.Play(TabClick);
world.OrderGenerator = new PlaceBuildingOrderGenerator(CurrentQueue.self, clicked.Name); world.OrderGenerator = new PlaceBuildingOrderGenerator(CurrentQueue.self, clicked.Name);
}
// Resume a paused item // Resume a paused item
else if (first != null && first.Paused) else if (first != null && first.Paused)
world.IssueOrder(Order.PauseProduction(CurrentQueue.self, clicked.Name, false));
// Queue a new item
else StartProduction(world, clicked.Name);
}
// Hold/Cancel an existing item
else if (mi.Button == MouseButton.Right && first != null)
{
Sound.Play(TabClick);
// instant cancel of things we havent started yet and things that are finished
if (first.Paused || first.Done || first.TotalCost == first.RemainingCost)
{ {
Sound.Play(CurrentQueue.Info.CancelledAudio); Sound.Play(TabClick);
world.IssueOrder(Order.CancelProduction(CurrentQueue.self, clicked.Name, world.IssueOrder(Order.PauseProduction(CurrentQueue.self, clicked.Name, false));
}
// Queue a new item
else if (CurrentQueue.BuildableItems().Any(a => a.Name == clicked.Name))
{
Sound.Play(TabClick);
Sound.Play(CurrentQueue.Info.QueuedAudio);
world.IssueOrder(Order.StartProduction(CurrentQueue.self, clicked.Name,
Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1)); Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1));
} }
else else
Sound.Play(DisabledTabClick);
}
// Hold/Cancel an existing item
else if (mi.Button == MouseButton.Right)
{
if (first != null)
{ {
Sound.Play(CurrentQueue.Info.OnHoldAudio); Sound.Play(TabClick);
world.IssueOrder(Order.PauseProduction(CurrentQueue.self, clicked.Name, true));
// instant cancel of things we havent started yet and things that are finished
if (first.Paused || first.Done || first.TotalCost == first.RemainingCost)
{
Sound.Play(CurrentQueue.Info.CancelledAudio);
world.IssueOrder(Order.CancelProduction(CurrentQueue.self, clicked.Name,
Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1));
}
else
{
Sound.Play(CurrentQueue.Info.OnHoldAudio);
world.IssueOrder(Order.PauseProduction(CurrentQueue.self, clicked.Name, true));
}
} }
else
Sound.Play(DisabledTabClick);
} }
return true; return true;
} }
void StartProduction( World world, string item )
{
Sound.Play(CurrentQueue.Info.QueuedAudio);
world.IssueOrder(Order.StartProduction(CurrentQueue.self, item,
Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1));
}
public void RefreshIcons() public void RefreshIcons()
{ {
Icons = new Dictionary<Rectangle, ProductionIcon>(); Icons = new Dictionary<Rectangle, ProductionIcon>();

1
mods/cnc/chrome/ingame.yaml
View File

@@ -337,6 +337,7 @@ Container@PLAYER_WIDGETS:
X:WINDOW_RIGHT - 204 X:WINDOW_RIGHT - 204
Y:287 Y:287
TabClick: button.aud TabClick: button.aud
DisabledTabClick:scold2.aud
TooltipContainer:TOOLTIP_CONTAINER TooltipContainer:TOOLTIP_CONTAINER
Background@FMVPLAYER: Background@FMVPLAYER:
Id:FMVPLAYER Id:FMVPLAYER