Move AmmoType, going towards no need for Aeson
This commit is contained in:
@@ -13,7 +13,7 @@ module Dodge.Data.Item (
|
||||
) where
|
||||
|
||||
import Geometry.Data
|
||||
import qualified Data.IntMap.Strict as IM
|
||||
--import qualified Data.IntMap.Strict as IM
|
||||
import Control.Lens
|
||||
import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
@@ -34,7 +34,7 @@ data Consumables
|
||||
| AmmoMag
|
||||
{ _magLoadStatus :: ReloadStatus
|
||||
, _magParams :: AmmoParams
|
||||
, _magType :: AmmoType
|
||||
-- , _magType :: AmmoType
|
||||
}
|
||||
deriving (Eq, Show, Read)
|
||||
|
||||
@@ -47,7 +47,7 @@ data Item = Item
|
||||
, _itLocation :: ItemLocation
|
||||
, _itEffect :: ItEffect
|
||||
, _itTargeting :: ItemTargeting
|
||||
, _itAmmoSlots :: IM.IntMap AmmoType
|
||||
-- , _itAmmoSlots :: IM.IntMap AmmoType
|
||||
, _itParams :: ItemParams
|
||||
, _itScroll :: ItemScroll
|
||||
, _itTimeLastUsed :: Int
|
||||
|
||||
Reference in New Issue
Block a user