Cleanup

src/Dodge/Data/Item/Tweak.hs

@@ -1,39 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Item.Tweak where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import qualified IntMapHelp as IM
-
-data ItemTweaks
-    = NoTweaks
-    | Tweakable
-        { _tweakParams :: IM.IntMap TweakParam
-        }
-    deriving (Eq, Show, Read) --Generic, Flat)
-
-data TweakType
-    = TweakPhaseV
-    | TweakTractionPower
-    | TweakSpinDrag
-    | TweakSpinAmount
-    | TweakThrustDelay
-    deriving (Eq, Show, Read) --Generic, Flat)
-
-data TweakParam = TweakParam
-    { _tweakType :: TweakType -- Int -> Item -> Item
-    , _tweakVal :: Int
-    , _tweakMax :: Int
-    }
-    deriving (Eq, Show, Read) --Generic, Flat)
-
-makeLenses ''TweakParam
-makeLenses ''ItemTweaks
-deriveJSON defaultOptions ''TweakType
-deriveJSON defaultOptions ''TweakParam
-deriveJSON defaultOptions ''ItemTweaks

src/Dodge/Data/Item/Use.hs

@@ -34,19 +34,15 @@ import Geometry.Data
 import Sound.Data
 
 data ItemUse
-    = HeldUse
-        { -- _heldUse :: Huse
-          _heldDelay :: UseDelay
---        , _heldMods :: HeldMod
+    = UseHeld
+        { _heldDelay :: UseDelay
         , _heldHammer :: HammerPosition
         , _heldAim :: AimParams
         , _heldAmmoTypes :: IM.IntMap AmmoType
         , _heldParams :: HeldParams
         , _heldTriggerType :: TriggerType
-        , _heldUsageTime :: Int -- this is not yet implemented
-        --        , _useTargeting :: Maybe TargetType
         }
-    | LeftUse
+    | UseHotkey
         { _leftUse :: Luse
         , _leftDelay :: UseDelay
         , _leftHammer :: HammerPosition