Work on held item usage

This commit is contained in:
2023-05-27 12:32:09 +01:00
parent 4cfb7d431a
commit ec8317c14e
19 changed files with 150 additions and 173 deletions
-19
View File
@@ -48,7 +48,6 @@ data ItemParams
{ _muzVel :: Float
, _rifling :: Float
, _bore :: Float
, _gunBarrels :: [GunBarrel]
, _recoil :: Float
, _torqueAfter :: Float
, _randomOffset :: Float
@@ -76,12 +75,6 @@ data ShrinkGunStatus = FullSize | Shrunk
data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data GunBarrel = GunBarrel
{ _barlPos :: Point2
, _barlRot :: Float
, _barlInaccuracy :: Float
}
--data GunBarrels
---- = MultiBarrel
---- { _brlSpread :: BarrelSpread
@@ -103,21 +96,9 @@ data Nozzle = Nozzle
}
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
--data BarrelSpread
-- = AlignedBarrels
-- | SpreadBarrels {_spreadAngle :: Float}
-- | RotatingBarrels {_rotatingBarrelInaccuracy :: Float}
-- --deriving (Eq, Ord, Show, Read) --Generic, Flat)
--makeLenses ''BarrelSpread
makeLenses ''ItemParams
makeLenses ''Nozzle
--makeLenses ''GunBarrels
makeLenses ''GunBarrel
deriveJSON defaultOptions ''ShrinkGunStatus
deriveJSON defaultOptions ''PreviousArcEffect
deriveJSON defaultOptions ''Nozzle
--deriveJSON defaultOptions ''BarrelSpread
deriveJSON defaultOptions ''GunBarrel
--deriveJSON defaultOptions ''GunBarrels
deriveJSON defaultOptions ''ItemParams