Start moving bullet ammo parameters to more sensible places

src/Dodge/Data/Bullet.hs

@@ -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

src/Dodge/Data/Item/Params.hs

@@ -45,13 +45,6 @@ data ItemParams
         }
     | Attracting {_attractionPower :: Point2}
     | BulletShooter
-        { _muzVel :: Float
-        , _rifling :: Float
-        , _bore :: Float
-        , _recoil :: Float
-        , _torqueAfter :: Float
-        , _randomOffset :: Float
-        }
     | Sprayer {_sprayNozzles :: [Nozzle]}
     | AngleWalk
         { _maxWalkAngle :: Float

src/Dodge/Data/Item/Use.hs

@@ -33,6 +33,7 @@ data ItemUse
         , _heldHammer :: HammerPosition
         , _heldAim :: AimParams
         , _heldConsumption :: HeldConsumption
+        , _heldParams :: HeldParams
 --        , _useTargeting :: Maybe TargetType
         }
     | LeftUse
@@ -56,6 +57,16 @@ data ItemUse
         {_attachParams :: AttachParams}
     --deriving (Eq, Show, Read) --Generic, Flat)
 
+data HeldParams
+    = DefaultHeldParams
+    | BulletShooterParams
+        { _muzVel :: Float
+        , _rifling :: Float
+        , _recoil :: Float
+        , _torqueAfter :: Float
+        , _randomOffset :: Float
+        }
+
 data AttachParams
     = ScrollAttachParams {_scrollAttachParams :: ScrollAttachParams}
     | AmmoAttachParams 
@@ -65,6 +76,14 @@ data AttachParams
     | TargetAttachParams
 
 data AmmoParams = DefaultAmmoParams
+    | BulletParams
+        { _bupEffect :: BulletEffect
+        , _bupSpawn :: BulletSpawn
+        , _bupDrag :: Float
+        , _bupWidth :: Float
+        , _bupTimer :: Int
+        , _bupDamages :: [Damage]
+        }
 
 data ScrollAttachParams
     = ZoomScrollParams
@@ -126,10 +145,12 @@ makeLenses ''ItemUse
 makeLenses ''AimParams
 makeLenses ''ItZoom
 makeLenses ''Muzzle
+makeLenses ''HeldParams
 makeLenses ''AttachParams
 makeLenses ''ScrollAttachParams
 makeLenses ''AmmoParams
 deriveJSON defaultOptions ''AmmoParams
+deriveJSON defaultOptions ''HeldParams
 deriveJSON defaultOptions ''Muzzle
 deriveJSON defaultOptions ''AimStance
 deriveJSON defaultOptions ''ScrollAttachParams