Remove data Hammers

src/Dodge/Data/Creature.hs

@@ -14,7 +14,6 @@ module Dodge.Data.Creature (
     module Dodge.Data.ActionPlan,
     module Dodge.Data.Item,
     module Dodge.Data.Material,
-    module Dodge.Data.Hammer,
 ) where
 
 import Control.Lens
@@ -27,7 +26,6 @@ import Dodge.Data.Creature.Misc
 import Dodge.Data.Creature.Perception
 import Dodge.Data.Creature.Stance
 import Dodge.Data.Creature.State
-import Dodge.Data.Hammer
 import Dodge.Data.Item
 import Dodge.Data.Material
 import Geometry.Data
@@ -66,7 +64,6 @@ data Creature = Creature
     , _crGroup :: CrGroup
     , _crIntention :: Intention
     , _crMvType :: CrMvType
---    , _crHammerPosition :: HammerPosition
     , _crName :: String
     , _crStatistics :: CreatureStatistics
     , _crDeathTimer :: Int

src/Dodge/Data/Hammer.hs

@@ -1,25 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Hammer where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-
-data HammerType
-    = NoHammer
-    | HasHammer {_hammerPosition :: HammerPosition}
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data HammerPosition
-    = HammerDown
-    | HammerReleased
-    | HammerUp
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''HammerType
-deriveJSON defaultOptions ''HammerPosition
-deriveJSON defaultOptions ''HammerType

src/Dodge/Data/Item/Use.hs

@@ -9,7 +9,6 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Item.HeldUse,
     module Dodge.Data.Item.HeldDelay,
     module Dodge.Data.Item.Use.Consumption,
-    module Dodge.Data.Hammer,
     module Dodge.Data.Item.Targeting,
     module Dodge.Data.GenFloat,
     module Dodge.Data.Item.Scope,
@@ -22,7 +21,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.GenFloat
-import Dodge.Data.Hammer
 import Dodge.Data.Item.HeldDelay
 import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.Targeting
@@ -34,7 +32,6 @@ import Sound.Data
 data ItemUse
     = UseHeld
         { _heldDelay :: UseDelay
-        , _heldHammer :: HammerPosition
         , _heldAim :: AimParams
         , _heldParams :: HeldParams
         , _heldTriggerType :: TriggerType
@@ -43,7 +40,6 @@ data ItemUse
         }
     | UseEquip { _uequipEffect :: EquipEffect }
     | UseAttach {_uaParams :: AttachParams}
-    | UseHammer {_heldHammer :: HammerPosition}
     | UseNothing
     | UseScope { _uScope :: Scope }
     | UseBulletMod { _ubMod :: BulletMod }

src/Dodge/Data/World.hs

@@ -9,7 +9,6 @@ module Dodge.Data.World (
     module Dodge.Data.CWorld,
     module Dodge.Data.RightButtonOptions,
     module Dodge.Data.SoundOrigin,
-    module Dodge.Data.Hammer,
     module Dodge.Data.Input,
 ) where
 
@@ -20,7 +19,6 @@ import Data.IntSet (IntSet)
 import qualified Data.Map.Strict as M
 import Data.Set (Set)
 import Dodge.Data.CWorld
-import Dodge.Data.Hammer
 import Dodge.Data.Input
 import Dodge.Data.RightButtonOptions
 import Dodge.Data.SaveSlot