Start more sensibly separating avatar from ai creatures

src/Dodge/Tree/Compose.hs

@@ -16,7 +16,7 @@ module Dodge.Tree.Compose (
     attachOnward,
     attachOnward',
     showIntsString,
-    module Dodge.Tree.Compose.Data,
+    module Dodge.Data.MetaTree
 ) where
 
 import Control.Monad.State
@@ -24,7 +24,7 @@ import Data.List (intersperse)
 import Data.Maybe
 import Data.Tuple
 import Dodge.Data.GenWorld
-import Dodge.Tree.Compose.Data
+import Dodge.Data.MetaTree
 import LensHelp
 import TreeHelp
 

src/Dodge/Tree/Compose/Data.hs

@@ -1,19 +0,0 @@
-{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE StrictData #-}
-module Dodge.Tree.Compose.Data where
-import Data.Tree
-import Control.Lens
-
-
-data MetaTree a b = MTree {_mtLabel :: b , _mtTree :: MetaNode a b, _mtBranches :: [MetaBranch a b] }
-data MetaNode a b = NodeTree {_nodeTree :: Tree a} | NodeMTree {_nodeMetaTree :: MetaTree a b}
-data MetaBranch a b = MBranch {_mbAttach :: a -> Maybe a, _mbTree :: MetaTree a b}
-
-newtype SelfTree a = ST {_unST :: Tree (a,Either (Tree a) (SelfTree a))}
-
-makeLenses ''MetaTree
-makeLenses ''MetaBranch
-makeLenses ''MetaNode
-
-instance Functor (MetaTree a) where
-    fmap f (MTree b mn bs) = MTree (f b) (mn & nodeMetaTree %~ fmap f) (map (mbTree %~ fmap f) bs)