Refactor bullet particles

src/Dodge/Item/Weapon.hs

@@ -11,7 +11,8 @@ import Dodge.RandomHelp
 import Dodge.WorldEvent
 import Dodge.Default
 import Dodge.Item.Draw
-import Dodge.Item.Weapon.Bullet
+import Dodge.Particle.Bullet.HitEffect
+import Dodge.Particle.Bullet.Spawn
 --import Dodge.Item.Weapon.Decoration
 import Dodge.Item.Weapon.InventoryDisplay
 import Dodge.Item.Weapon.TriggerType
@@ -44,7 +45,6 @@ pistol
     ,lasGun
     ,tractorGun
     ,launcher
-    ,autoGun
     ,ltAutoGun
     ,hvAutoGun
     ,miniGun
@@ -78,7 +78,7 @@ pistol = Weapon
         . withRandomDir 0.1
         . withMuzFlare
         . withVelWthHiteff (30,0) 2 
-        $ destroyOnImpact bulHitCr' bulHitWall' bulHitFF'
+        $ destroyOnImpact bulHitCr bulHitWall' bulHitFF'
     , _wpSpread = 0.02
     , _wpRange = 20
     , _itHammer = HammerUp
@@ -114,7 +114,7 @@ autoEffectGun name eff = defaultAutoGun
     { _itName = name ++ "Gun"
     , _wpFire = eff
     }
-
+autoGun :: Item
 autoGun = defaultGun 
     { _itName = "AUTOGUN"
     , _itIdentity = AutoGun
@@ -153,7 +153,7 @@ autoGunNonTwistEff = withRecoil 40
     . withRandomDir (autogunSpread/2)
     . withMuzFlare
     . withVelWthHiteff (50,0) 3 
-    $ destroyOnImpact bulHitCr' bulHitWall' bulHitFF'
+    $ destroyOnImpact bulHitCr bulHitWall' bulHitFF'
 
 rezGun = defaultGun
     { _itName = "REANIMATOR"
@@ -356,7 +356,7 @@ shootBezier targetp cid w = over particles (theBullet :) w
         startp 
         (controlp +.+ randPos) 
         (targetp +.+ randPos')
-        (destroyOnImpact bulHitCr' bulHitWall' bulHitFF') 
+        (destroyOnImpact bulHitCr bulHitWall' bulHitFF') 
         5
     controlp = mouseWorldPos w
     cr = _creatures w IM.! cid