Start moving bullet ammo parameters to more sensible places
This commit is contained in:
@@ -18,7 +18,6 @@ data Bullet = Bullet
|
||||
{ _buDelayFraction :: Float
|
||||
, _buEffect :: BulletEffect
|
||||
, _buSpawn :: BulletSpawn
|
||||
, _buUpdateMod :: BulletUpdateMod
|
||||
, _buTrajectory :: BulletTrajectory
|
||||
, _buVel :: Point2
|
||||
, _buDrag :: Float
|
||||
@@ -34,10 +33,6 @@ data EnergyBallType = IncBall | TeslaBall | ConcBall
|
||||
| FlashBall
|
||||
deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
|
||||
|
||||
data BulletUpdateMod = NoBulletUpdateMod
|
||||
| ABulletUpdateMod -- hack for template splicing
|
||||
deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
|
||||
|
||||
data BulletEffect
|
||||
= DestroyBullet
|
||||
| BounceBullet
|
||||
@@ -69,7 +64,6 @@ data BulletTrajectoryType
|
||||
makeLenses ''Bullet
|
||||
makeLenses ''BulletSpawn
|
||||
deriveJSON defaultOptions ''EnergyBallType
|
||||
deriveJSON defaultOptions ''BulletUpdateMod
|
||||
deriveJSON defaultOptions ''BulletEffect
|
||||
deriveJSON defaultOptions ''BulletSpawn
|
||||
deriveJSON defaultOptions ''BulletTrajectory
|
||||
|
||||
Reference in New Issue
Block a user