Remove old datatypes, change ammomag inv text colour

This commit is contained in:
2024-06-22 12:15:10 +01:00
parent 8e127f0603
commit e977673aa2
8 changed files with 13 additions and 22 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ data ItemUse
| AttachUse
{_attachParams :: AttachParams}
| AmmoMagUse
{ _amagLoadStatus :: InternalAmmo
{ _amagLoadStatus :: ReloadStatus
, _amagParams :: AmmoParams }
--deriving (Eq, Show, Read) --Generic, Flat)
+3 -12
View File
@@ -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