Continue bullet refactor

2022-07-17 23:02:07 +01:00
parent bf023a61ce
commit ce3154d311
14 changed files with 121 additions and 153 deletions
@@ -635,17 +635,10 @@ data AmmoType
        , _amString :: String
        , _amPjDraw :: Prop -> SPic
        , _amPjCreation :: Item -> Creature -> World -> World
--        , _aProjectile :: Ammo -> Prop
        }
    | BulletAmmo
        { _amString :: String 
--        , _amBulEff :: HitEffect'
-        , _amBulDams :: [Damage]
-        , _amBulWth :: Float
-        , _amBulVel :: Point2
-        , _amBulTraj :: BulletTrajectory
-        , _amBulEffect :: BulletEffect
-        , _amBulSpawn  :: BulletSpawn
+        , _amBullet :: Bullet
        }
    | DroneAmmo
        { _amString :: String }