Remove heldParams record

This commit is contained in:
2025-06-04 13:33:44 +01:00
parent 0cb7b54180
commit 9797f610aa
7 changed files with 38 additions and 28 deletions
+9 -9
View File
@@ -33,7 +33,7 @@ data ItemUse
= UseHeld
{ _heldDelay :: UseDelay
, _heldMuzzles :: [Muzzle]
, _heldParams :: HeldParams
-- , _heldParams :: HeldParams
, _heldFrame :: Int
, _heldUseEffect :: HeldUseEffect
}
@@ -73,12 +73,12 @@ data AttachParams
| APNothing
deriving (Eq, Show, Read)
data HeldParams
= DefaultHeldParams
| GasSprayParams { _weaponInvLock :: Int }
| BeamShooterParams
| BulletShooterParams { _weaponInvLock :: Int }
deriving (Eq, Show, Read) --Generic, Flat)
--data HeldParams
-- = DefaultHeldParams
-- | GasSprayParams { _weaponInvLock :: Int }
-- | BeamShooterParams
-- | BulletShooterParams { _weaponInvLock :: Int }
-- deriving (Eq, Show, Read) --Generic, Flat)
data AmmoParams
= BulletParams {_ampBullet :: Bullet}
@@ -149,7 +149,7 @@ makeLenses ''ItemUse
--makeLenses ''AimParams
makeLenses ''Muzzle
makeLenses ''HeldParams
--makeLenses ''HeldParams
makeLenses ''AttachParams
makeLenses ''AmmoParams
makeLenses ''MuzzleEffect
@@ -163,7 +163,7 @@ deriveJSON defaultOptions ''UseCondition
deriveJSON defaultOptions ''MuzzleEffect
deriveJSON defaultOptions ''FlareType
deriveJSON defaultOptions ''AmmoParams
deriveJSON defaultOptions ''HeldParams
--deriveJSON defaultOptions ''HeldParams
deriveJSON defaultOptions ''AmmoPerShot
deriveJSON defaultOptions ''Muzzle
deriveJSON defaultOptions ''AttachParams