Fix burst rifle rate delay bug, various cleanups

src/Dodge/Data/ComposedItem.hs

@@ -12,7 +12,7 @@ import Dodge.Data.Item
 import Geometry.Data
 import Linear.Quaternion (Quaternion (..))
 
-data ComposeLinkType
+data CLinkType
     = AmmoInLink Int AmmoType
     | TriggerLink
     | AmmoModLink
@@ -65,29 +65,29 @@ data ItemStructuralFunction
     | MapperSF
     deriving (Eq, Ord, Show, Read)
 
-type ComposedItem = (Item, ItemStructuralFunction, LinkTest)
+type CItem = (Item, ItemStructuralFunction, LinkTest)
 
 data ItemLink = ILink
-    { _iatType :: ComposeLinkType
-    , _iatOrient :: Item -> ComposeLinkType -> Item -> (Point3, Quaternion Float)
+    { _iatType :: CLinkType
+    , _iatOrient :: Item -> CLinkType -> Item -> (Point3, Quaternion Float)
     }
 
 -- this should possibly use a full item structure tree rather than a
--- ComposedItem as arguments
+-- CItem as arguments
 data LinkTest = LTest
-    { _tryLeftLink :: LabelDoubleTree ItemLink ComposedItem -> Maybe LinkUpdate
-    , _tryRightLink :: LabelDoubleTree ItemLink ComposedItem -> Maybe LinkUpdate
+    { _tryLeftLink :: LabelDoubleTree ItemLink CItem -> Maybe LinkUpdate
+    , _tryRightLink :: LabelDoubleTree ItemLink CItem -> Maybe LinkUpdate
     }
 
 data LinkUpdate = LUpdate
     { _luLinkType :: ItemLink
-    , _luParentUpdate :: ComposedItem -> ComposedItem
-    , _luChildUpdate :: ComposedItem -> ComposedItem
+    , _luParentUpdate :: CItem -> CItem
+    , _luChildUpdate :: CItem -> CItem
     }
 
 makeLenses ''ItemLink
 makeLenses ''LinkTest
 makeLenses ''LinkUpdate
-makeLenses ''ComposeLinkType
+makeLenses ''CLinkType
 --deriveJSON defaultOptions ''ItemStructuralFunction
 --deriveJSON defaultOptions ''ComposeLinkType

src/Dodge/Data/Item/Use.hs

@@ -25,7 +25,6 @@ import Dodge.Data.Item.BulletMod
 import Dodge.Data.Item.Scope
 import Dodge.Data.Item.Targeting
 import Dodge.Data.Payload
---import Dodge.Data.Item.Use.Consumption
 import Geometry.Data
 
 data ItemUse
@@ -54,7 +53,6 @@ data AmmoParams
     = BulletParams {_ampBullet :: Bullet}
     | ProjectileParams {_ampPayload :: Payload}
     | GasParams {_ampCreateGas :: GasFuel}
-    | NoAmmoParams
     deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''ItemUse

src/Dodge/Data/Muzzle.hs

@@ -14,7 +14,7 @@ data Muzzle = Muzzle
     , _mzFlareType :: FlareType
     , _mzEffect :: MuzzleEffect
     , _mzAmmoPerShot :: AmmoPerShot
-    , _mzFrame :: Int
+--    , _mzFrame :: Int
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)