Rethink weapon repetitions
This commit is contained in:
@@ -33,7 +33,6 @@ data ItemUse
|
||||
= UseHeld
|
||||
{ _heldDelay :: UseDelay
|
||||
, _heldMuzzles :: [Muzzle]
|
||||
-- , _heldParams :: HeldParams
|
||||
, _heldFrame :: Int
|
||||
, _heldUseEffect :: HeldUseEffect
|
||||
}
|
||||
@@ -73,13 +72,6 @@ data AttachParams
|
||||
| APNothing
|
||||
deriving (Eq, Show, Read)
|
||||
|
||||
--data HeldParams
|
||||
-- = DefaultHeldParams
|
||||
-- | GasSprayParams { _weaponInvLock :: Int }
|
||||
-- | BeamShooterParams
|
||||
-- | BulletShooterParams { _weaponInvLock :: Int }
|
||||
-- deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
data AmmoParams
|
||||
= BulletParams {_ampBullet :: Bullet}
|
||||
| ProjectileParams {_ampPayload :: Payload}
|
||||
@@ -146,10 +138,7 @@ data Muzzle = Muzzle
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
makeLenses ''ItemUse
|
||||
|
||||
--makeLenses ''AimParams
|
||||
makeLenses ''Muzzle
|
||||
--makeLenses ''HeldParams
|
||||
makeLenses ''AttachParams
|
||||
makeLenses ''AmmoParams
|
||||
makeLenses ''MuzzleEffect
|
||||
@@ -163,10 +152,7 @@ deriveJSON defaultOptions ''UseCondition
|
||||
deriveJSON defaultOptions ''MuzzleEffect
|
||||
deriveJSON defaultOptions ''FlareType
|
||||
deriveJSON defaultOptions ''AmmoParams
|
||||
--deriveJSON defaultOptions ''HeldParams
|
||||
deriveJSON defaultOptions ''AmmoPerShot
|
||||
deriveJSON defaultOptions ''Muzzle
|
||||
deriveJSON defaultOptions ''AttachParams
|
||||
|
||||
--deriveJSON defaultOptions ''AimParams
|
||||
deriveJSON defaultOptions ''ItemUse
|
||||
|
||||
@@ -35,6 +35,7 @@ data WdWd
|
||||
| WdWdFromItCrixWdWd (LabelDoubleTree ComposeLinkType Item) Int ItCrWdWd
|
||||
| MakeTempLight LSParam Int
|
||||
| UseInvItem Int PressType
|
||||
| WdWdBurstFireRepeats Int Int
|
||||
--deriving (Eq, Show, Read) --, Generic)
|
||||
--h--deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user