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/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -5,7 +5,6 @@
 	GivesExperience:
 		PlayerExperienceModifier: 1
 	ScriptTriggers:
-	ConditionManager:
 	RenderDebugState:

 ^SpriteActor:
@@ -779,7 +778,6 @@

 ^CivBuilding:
 	Inherits: ^Building
-	-ConditionManager:
 	Tooltip:
 		GenericName: Civilian Building
 		GenericStancePrefix: false
--- a/mods/cnc/rules/player.yaml
+++ b/mods/cnc/rules/player.yaml
@@ -58,6 +58,5 @@ Player:
 	GrantConditionOnPrerequisiteManager:
 	ResourceStorageWarning:
 	PlayerExperience:
-	ConditionManager:
 	GameSaveViewportManager:
 	PlayerRadarTerrain: