Merge ConditionManager trait directly into Actor

2020-04-18 23:25:05 -05:00
parent e12c1dc9aa
commit 259c8d2c98
65 changed files with 466 additions and 707 deletions
--- a/OpenRA.Mods.Common/Traits/Render/TimedConditionBar.cs
+++ b/OpenRA.Mods.Common/Traits/Render/TimedConditionBar.cs
@@ -15,7 +15,7 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits.Render
 {
 	[Desc("Visualizes the remaining time for a condition.")]
-	class TimedConditionBarInfo : ITraitInfo, Requires<ConditionManagerInfo>
+	class TimedConditionBarInfo : ITraitInfo
 	{
 		[FieldLoader.Require]
 		[Desc("Condition that this bar corresponds to")]