Remove old datatypes, change ammomag inv text colour
This commit is contained in:
@@ -56,7 +56,7 @@ data ItemUse
|
||||
| AttachUse
|
||||
{_attachParams :: AttachParams}
|
||||
| AmmoMagUse
|
||||
{ _amagLoadStatus :: InternalAmmo
|
||||
{ _amagLoadStatus :: ReloadStatus
|
||||
, _amagParams :: AmmoParams }
|
||||
--deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
|
||||
@@ -25,14 +25,7 @@ data HeldConsumption
|
||||
| NoConsumption
|
||||
deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
data AmmoSource
|
||||
= InternalSource InternalAmmo
|
||||
| AboveSource
|
||||
| BelowSource
|
||||
| EitherSource
|
||||
deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
data InternalAmmo = InternalAmmo
|
||||
data ReloadStatus = ReloadStatus
|
||||
{ _iaMax :: Int
|
||||
, _iaLoaded :: Int
|
||||
, _iaPrimed :: Bool
|
||||
@@ -64,10 +57,8 @@ newtype ItAmount = ItAmount {_getItAmount :: Int}
|
||||
makeLenses ''HeldConsumption
|
||||
makeLenses ''LeftConsumption
|
||||
makeLenses ''ItAmount
|
||||
makePrisms ''AmmoSource
|
||||
makeLenses ''InternalAmmo
|
||||
deriveJSON defaultOptions ''InternalAmmo
|
||||
deriveJSON defaultOptions ''AmmoSource
|
||||
makeLenses ''ReloadStatus
|
||||
deriveJSON defaultOptions ''ReloadStatus
|
||||
deriveJSON defaultOptions ''HeldConsumption
|
||||
deriveJSON defaultOptions ''LeftConsumption
|
||||
deriveJSON defaultOptions ''ItAmount
|
||||
|
||||
Reference in New Issue
Block a user