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

support ProductionBar properly in cnc too

Browse Source
This commit is contained in:
Chris Forbes
2011-03-02 23:22:57 +13:00
parent 0bfcb4585c
commit 43dccb073d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/ProductionBar.cs
View File

@@ -26,12 +26,12 @@ namespace OpenRA.Mods.RA
public float GetValue() public float GetValue()
{ {
var queue = self.TraitOrDefault<ProductionQueue>(); var queue = self.TraitsImplementing<ProductionQueue>().FirstOrDefault(q => q.CurrentItem() != null);
if (queue == null) if (queue == null)
{ {
var produces = self.Trait<Production>().Info.Produces; var produces = self.Trait<Production>().Info.Produces;
queue = self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>() queue = self.Owner.PlayerActor.TraitsImplementing<ProductionQueue>()
.First(q => produces.Contains(q.Info.Type)); .FirstOrDefault(q => produces.Contains(q.Info.Type));
} }
if (queue == null || queue.CurrentItem() == null) if (queue == null || queue.CurrentItem() == null)

7
mods/cnc/rules/structures.yaml
View File

@@ -41,6 +41,7 @@ FACT:
OnHoldAudio: onhold1.aud OnHoldAudio: onhold1.aud
CancelledAudio: cancel1.aud CancelledAudio: cancel1.aud
BaseBuilding: BaseBuilding:
ProductionBar:
NUKE: NUKE:
Inherits: ^Building Inherits: ^Building
@@ -171,6 +172,8 @@ PYLE:
ReadyAudio: unitredy.aud ReadyAudio: unitredy.aud
OnHoldAudio: onhold1.aud OnHoldAudio: onhold1.aud
CancelledAudio: cancel1.aud CancelledAudio: cancel1.aud
ProductionBar:
HAND: HAND:
Inherits: ^Building Inherits: ^Building
Valued: Valued:
@@ -208,6 +211,7 @@ HAND:
ReadyAudio: unitredy.aud ReadyAudio: unitredy.aud
OnHoldAudio: onhold1.aud OnHoldAudio: onhold1.aud
CancelledAudio: cancel1.aud CancelledAudio: cancel1.aud
ProductionBar:
AFLD: AFLD:
Inherits: ^Building Inherits: ^Building
@@ -248,6 +252,7 @@ AFLD:
ReadyAudio: ReadyAudio:
OnHoldAudio: onhold1.aud OnHoldAudio: onhold1.aud
CancelledAudio: cancel1.aud CancelledAudio: cancel1.aud
ProductionBar:
WEAP: WEAP:
Inherits: ^Building Inherits: ^Building
@@ -289,6 +294,7 @@ WEAP:
ReadyAudio: unitredy.aud ReadyAudio: unitredy.aud
OnHoldAudio: onhold1.aud OnHoldAudio: onhold1.aud
CancelledAudio: cancel1.aud CancelledAudio: cancel1.aud
ProductionBar:
HQ: HQ:
RequiresPower: RequiresPower:
@@ -415,6 +421,7 @@ HPAD:
ReadyAudio: unitredy.aud ReadyAudio: unitredy.aud
OnHoldAudio: onhold1.aud OnHoldAudio: onhold1.aud
CancelledAudio: cancel1.aud CancelledAudio: cancel1.aud
ProductionBar:
EYE: EYE:
RequiresPower: RequiresPower: