Fix tab available on low money

Porenutak · Jun 11, 2024 · 820fdb3 · 820fdb3
1 parent fa6f1d6
commit 820fdb3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
@@ -319,6 +319,19 @@ public virtual IEnumerable<ActorInfo> BuildableItems()
 			return buildableProducibles;
 		}
 
+		public virtual bool AnyItemsToBuild()
+		{
+			if (productionTraits.Length > 0 && productionTraits.All(p => p.IsTraitDisabled))
+				return false;
+			if (!Enabled)
+				return false;
+			if (developerMode.AllTech && Producible.Keys.Count != 0)
+				return true;
+			if (buildableProducibles.Any())
+				return true;
+			return false;
+		}
+
 		public bool CanBuild(ActorInfo actor)
 		{
 			if (!Producible.TryGetValue(actor, out var ps))

diff --git a/OpenRA.Mods.Common/Traits/ProductionQueueFromSelection.cs b/OpenRA.Mods.Common/Traits/ProductionQueueFromSelection.cs
@@ -63,7 +63,7 @@ void INotifySelection.SelectionChanged()
 					.FirstOrDefault(q => q.Enabled && types.Contains(q.Info.Type));
 			}
 
-			if (queue == null || !queue.BuildableItems().Any())
+			if (queue == null || !queue.AnyItemsToBuild())
 				return;
 
 			if (tabsWidget.Value != null)

diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs
@@ -42,7 +42,7 @@ void SelectTab(bool reverse)
 				palette.PickUpCompletedBuilding();
 			}
 
-			button.IsDisabled = () => !queues.Any(q => q.BuildableItems().Any());
+			button.IsDisabled = () => !queues.Any(q => q.AnyItemsToBuild());
 			button.OnMouseUp = mi => SelectTab(mi.Modifiers.HasModifier(Modifiers.Shift));
 			button.OnKeyPress = e => SelectTab(e.Modifiers.HasModifier(Modifiers.Shift));
 			button.OnClick = () => SelectTab(false);