Cleanup

src/Dodge/Item/Held/BatteryGuns.hs

@@ -83,6 +83,6 @@ tractorGun =
         & itUse . heldAim . aimWeight .~ 6
         & itUse . heldAim . aimRange .~ 1
         & itUse . heldAim . aimStance .~ TwoHandUnder
-        & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ DefaultFlareType
+        & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ NoFlare
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTractor
         & itType .~ HELD TRACTORGUN

src/Dodge/Item/Held/Cone.hs

@@ -14,7 +14,7 @@ bangCone =
         & itUse . heldDelay . rateMax .~ 20
         & itUse . heldAim . aimMuzzles 
             .~ replicate 15 
-               (Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType MuzzleShootBullet (UseExactly 1) 0)
+               (Muzzle (V2 15 0) 0 0.5 0 NoFlare MuzzleShootBullet (UseExactly 1) 0)
         & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ PistolFlare
         & itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8
         & itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8

src/Dodge/Item/Held/Launcher.hs

@@ -33,7 +33,7 @@ launcherX i =
         & itUse . heldAim . aimMuzzles .~ getZipList 
             (ZipList [Muzzle (V2 20 0) a 0 | a <- angles] 
             <*> ZipList [0..] 
-            <*> pure DefaultFlareType
+            <*> pure NoFlare
             <*> pure MuzzleLauncher
             <*> pure (UseExactly 1)
             <*> pure 0

src/Dodge/Item/Held/SprayGuns.hs

@@ -77,7 +77,7 @@ flameThrower =
         & itUse . heldAim . aimWeight .~ 5
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5}
         & itUse . heldAim . aimStance .~ TwoHandUnder
-        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0 0 DefaultFlareType 
+        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0 0 NoFlare 
             MuzzleNozzle
                         { _nzPressure = ConstFloat 4
                         , _nzMaxWalkAngle = 0.2

src/Dodge/Item/Held/Stick.hs

@@ -26,12 +26,13 @@ bangStick i =
                 a
                 0.01
                 0
-                DefaultFlareType
+                NoFlare
                 MuzzleShootBullet
                 (UseExactly 1)
                 0
                | a <- spreadAroundCenter i baseStickSpread
                ]
+        & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ PistolFlare
 
 baseStickSpread :: Float
 baseStickSpread = 0.2