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/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -10,7 +10,6 @@ spicebloom.spawnpoint:
 		Sequence: grow3
 	BodyOrientation:
 		QuantizedFacings: 1
-	ConditionManager:
 	GrantConditionOnTerrain:
 		Condition: clearsand
 		TerrainTypes: SpiceSand
@@ -125,7 +124,6 @@ sandworm:
 		TerrainTypes: Sand, Dune, SpiceSand, Spice
 		MovingInterval: 3
 		RequiresCondition: !attacking
-	ConditionManager:
 	RevealOnFire:
 		Duration: 50
 		Radius: 2c512
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -5,7 +5,6 @@
 	GivesExperience:
 		PlayerExperienceModifier: 1
 	ScriptTriggers:
-	ConditionManager:
 	RenderDebugState:

 ^SpriteActor:
--- a/mods/d2k/rules/player.yaml
+++ b/mods/d2k/rules/player.yaml
@@ -150,6 +150,5 @@ Player:
 	ResourceStorageWarning:
 		AdviceInterval: 26
 	PlayerExperience:
-	ConditionManager:
 	GameSaveViewportManager:
 	PlayerRadarTerrain: