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

working on letting _any_ actor be a production-queue. (chrome still needs work)

Browse Source
This commit is contained in:
Bob
2009-12-15 22:59:48 +13:00
parent 47d5b8508c
commit e505726a8b
7 changed files with 86 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRa.Game/Chrome.cs
View File

@@ -108,6 +108,8 @@ namespace OpenRa.Game
if (currentTab == null || !Rules.TechTree.BuildableItems(Game.LocalPlayer, currentTab).Any())
ChooseAvailableTab();
var queue = Game.LocalPlayer.PlayerActor.traits.Get<Traits.ProductionQueue>();
foreach (var q in tabSprites)
{
var groupName = q.Key;
@@ -117,7 +119,7 @@ namespace OpenRa.Game
continue;
}
var producing = Game.LocalPlayer.Producing(groupName);
var producing = queue.Producing(groupName);
var index = q.Key == currentTab ? 2 : (producing != null && producing.Done) ? 1 : 0;
chromeRenderer.DrawSprite(q.Value[index], new float2(x, y), 0);
@@ -134,7 +136,8 @@ namespace OpenRa.Game
void CheckDeadTab( string groupName )
{
var item = Game.LocalPlayer.Producing(groupName);
var queue = Game.LocalPlayer.PlayerActor.traits.Get<Traits.ProductionQueue>();
var item = queue.Producing( groupName );
if (item != null)
Game.controller.AddOrder(Order.CancelProduction(Game.LocalPlayer, item.Item));
}
@@ -186,7 +189,8 @@ namespace OpenRa.Game
{
return () =>
{
var producing = Game.LocalPlayer.Producing(group);
var queue = Game.LocalPlayer.PlayerActor.traits.Get<Traits.ProductionQueue>();
var producing = queue.Producing( group );
if (producing == null) return 0;
return (producing.TotalTime - producing.RemainingTime) * NumClockFrames / producing.TotalTime;
};
@@ -195,7 +199,7 @@ namespace OpenRa.Game
void DrawBuildPalette(string queueName)
{
if (queueName == null) return;
var buildItem = Game.LocalPlayer.Producing(queueName);
var x = 0;
var y = 0;
@@ -205,7 +209,8 @@ namespace OpenRa.Game
.Where(a => Rules.UnitInfo[a].TechLevel != -1)
.OrderBy(a => Rules.UnitInfo[a].TechLevel);
var currentItem = Game.LocalPlayer.Producing(queueName);
var queue = Game.LocalPlayer.PlayerActor.traits.Get<Traits.ProductionQueue>();
var currentItem = queue.Producing( queueName );
var overlayBits = new List<Pair<Sprite, float2>>();
@@ -272,7 +277,8 @@ namespace OpenRa.Game
{
var player = Game.LocalPlayer;
var group = Rules.UnitCategory[item];
var producing = player.Producing(group);
var queue = player.PlayerActor.traits.Get<Traits.ProductionQueue>();
var producing = queue.Producing( group );
Sound.Play("ramenu1.aud");