Move towards working implementation of attachment tree ammo

src/Dodge/Data/ComposedItem.hs

@@ -13,6 +13,7 @@ import Dodge.Data.Item.Use.Consumption.Ammo
 data ComposeLinkType 
     = AmmoInLink AmmoType
     | AmmoModLink
+    deriving (Eq,Ord,Show,Read)
 
 data ComposedItem = WeaponCI
     | WeaponScopeCI
@@ -23,3 +24,4 @@ data ComposedItem = WeaponCI
 
 makeLenses ''ComposedItem
 deriveJSON defaultOptions ''ComposedItem
+deriveJSON defaultOptions ''ComposeLinkType

src/Dodge/Data/DoubleTree.hs

@@ -49,4 +49,6 @@ instance Functor (LabelDoubleTree b) where
     fmap f (LDT x l r) = LDT (f x) (fmap (second $ fmap f) l) (fmap (second $ fmap f) r)
 
 makeLenses ''DoubleTree
+makeLenses ''LabelDoubleTree
 deriveJSON defaultOptions ''DoubleTree
+deriveJSON defaultOptions ''LabelDoubleTree

src/Dodge/Data/WorldEffect.hs

@@ -5,6 +5,8 @@
 
 module Dodge.Data.WorldEffect where
 
+import Dodge.Data.ComposedItem
+import Dodge.Data.DoubleTree
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CreatureEffect
@@ -30,7 +32,7 @@ data WdWd
     | TorqueCr Float Int
     | WdWdNegateTrig Int
     | WdWdFromItixCrixWdWd Int Int ItCrWdWd
-    | WdWdFromItCrixWdWd Item Int ItCrWdWd
+    | WdWdFromItCrixWdWd (LabelDoubleTree ComposeLinkType Item) Int ItCrWdWd
     --deriving (Eq, Show, Read) --, Generic)
     --h--deriving (Eq, Show, Read) --Generic, Flat)