Cleanup

src/Dodge/Data.hs

@@ -21,6 +21,7 @@ module Dodge.Data
     , module Dodge.Item.Data
     , module Dodge.Config.Data
     , module Dodge.Equipment.Data
+    , module MaybeHelp
     ) where
 import Dodge.ShortShow
 import Dodge.Creature.State.Data
@@ -47,6 +48,7 @@ import Dodge.GameRoom
 import Color
 import Shape
 import Data.Tile
+import MaybeHelp
 
 --import qualified Data.Vector as V
 import qualified Linear.Quaternion as Q
@@ -469,12 +471,12 @@ _itUseAimStance :: Item -> AimStance
 _itUseAimStance = _aimStance . _useAim . _itUse
 data ItemConsumption
     = LoadableAmmo
-        { _aoType      :: AmmoType
-        , _ammoBaseMax :: Int
-        , _ammoLoaded  :: Int
-        , _reloadTime  :: Int
-        , _reloadState :: Maybe' Int
-        , _reloadType  :: ReloadType
+        { _laType  :: AmmoType
+        , _laMax   :: Int
+        , _laLoaded     :: Int
+        , _laReloadTime     :: Int
+        , _laReloadState    :: Maybe' Int
+        , _laReloadType     :: ReloadType
         }
     | ChargeableAmmo
         { _wpMaxCharge  :: Int
@@ -1053,12 +1055,6 @@ data WallStructure
         { _wlStCreature :: Int 
         , _wlStDamCreature :: Damage -> Wall -> Int -> World -> World
         }
--- | Strict maybe
-data Maybe' a = Just' {__Just' :: a} | Nothing'
-    deriving (Eq,Ord,Show)
-strictify :: Maybe a -> Maybe' a
-strictify Nothing  = Nothing'
-strictify (Just x) = Just' x
 
 data ActionPlan
     = Inanimate
@@ -1606,7 +1602,6 @@ makeLenses ''Universe
 makeLenses ''LSParam
 makeLenses ''ItemParams
 makeLenses ''ItemTweaks
-makeLenses ''Maybe'
 makeLenses ''ItemPortage
 makeLenses ''Magnet
 makeLenses ''Gust