From 45c41b669623b2782b2ff8dace17e74b663ac0f5 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 24 Nov 2011 15:23:08 +1300
Subject: [PATCH] allow building repair always

---
 .../Widgets/Logic/CncIngameChromeLogic.cs           |  4 +---
 OpenRA.Mods.RA/Buildings/RepairableBuilding.cs      |  3 ---
 OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs       | 13 +------------
 .../Widgets/Logic/OrderButtonsChromeLogic.cs        |  2 --
 mods/cnc/rules/structures.yaml                      |  1 -
 mods/ra/rules/structures.yaml                       |  1 -
 6 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs
index eccc0c6e76..38e63567d4 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs
@@ -118,12 +118,10 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			sellIcon.GetImageName = () => world.OrderGenerator is SellOrderGenerator ? "sell-active" : "sell";
 
 			var repairButton = sidebarRoot.GetWidget<ToggleButtonWidget>("REPAIR_BUTTON");
-			repairButton.IsDisabled = () => !RepairOrderGenerator.PlayerIsAllowedToRepair( world );
 			repairButton.OnClick = () => world.ToggleInputMode<RepairOrderGenerator>();
 			repairButton.IsToggled = () => world.OrderGenerator is RepairOrderGenerator;
 			var repairIcon = repairButton.GetWidget<ImageWidget>("ICON");
-			repairIcon.GetImageName = () => repairButton.IsDisabled() ? "repair-disabled" :
-				world.OrderGenerator is RepairOrderGenerator ? "repair-active" : "repair";
+			repairIcon.GetImageName = () => world.OrderGenerator is RepairOrderGenerator ? "repair-active" : "repair";
 
 			var playerResources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
 			sidebarRoot.GetWidget<LabelWidget>("CASH_DISPLAY").GetText = () =>
diff --git a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
index 3cfe8fb0d4..a59c85e62c 100755
--- a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
+++ b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
@@ -95,7 +95,4 @@ namespace OpenRA.Mods.RA.Buildings
 				--remainingTicks;
 		}
 	}
-
-	public class AllowsBuildingRepairInfo : TraitInfo<AllowsBuildingRepair> { }
-	public class AllowsBuildingRepair { }
 }
diff --git a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
index 627a6e551e..c1ede6fc60 100644
--- a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
+++ b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
@@ -42,18 +42,7 @@ namespace OpenRA.Mods.RA.Orders
 			}
 		}
 
-		public void Tick(World world)
-		{
-			if (!PlayerIsAllowedToRepair(world))
-				world.CancelInputMode();
-		}
-
-		public static bool PlayerIsAllowedToRepair(World world)
-		{
-			return world.ActorsWithTrait<AllowsBuildingRepair>()
-				 .Any(a => a.Actor.Owner == world.LocalPlayer);
-		}
-
+		public void Tick(World world) { }
 		public void RenderAfterWorld(WorldRenderer wr, World world) { }
 		public void RenderBeforeWorld(WorldRenderer wr, World world) { }
 
diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
index 5a131d4bbc..234e053924 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
@@ -41,10 +41,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			var repair = moneybin.GetWidget<OrderButtonWidget>("REPAIR");
 			if (repair != null)
 			{
-				repair.Enabled = () => { return RepairOrderGenerator.PlayerIsAllowedToRepair( world ); };
 				repair.Pressed = () => world.OrderGenerator is RepairOrderGenerator;
 				repair.OnMouseDown = mi => world.ToggleInputMode<RepairOrderGenerator>();
-				repair.GetLongDesc = () => { return repair.Enabled() ? repair.LongDesc : repair.LongDesc + "\n\nRequires: Construction Yard"; };
 			}
 		}
 	}
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index d9129eef84..e2975b32e5 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -16,7 +16,6 @@ FACT:
 	RevealsShroud:
 		Range: 5
 	Bib:
-	AllowsBuildingRepair:
 	Production:
 		Produces: Building,Defense
 	Transforms:
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index 1535f162db..bf9ca0d575 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -626,7 +626,6 @@ FACT:
 	CustomSellValue:
 		Value: 2500
 	BaseBuilding:
-	AllowsBuildingRepair:
 	Transforms:
 		IntoActor: mcv
 		Offset:1,1