Refactor

src/Dodge/Item/Weapon.hs

@@ -136,8 +136,7 @@ autoGun = defaultGun
 autoFireMode = shootWithSound (fromIntegral autoGunSound) 
     . torqueBefore 0.05
     $ autoGunNonTwistEff
-singleFireMode = hammerCheck $ shootWithSound (fromIntegral autoGunSound) 
-    $ autoGunNonTwistEff
+singleFireMode = hammerCheck $ shootWithSound (fromIntegral autoGunSound) autoGunNonTwistEff
 autoGunNonTwistEff = withRecoil 40
     . withRandomDir (autogunSpread/2)
     . withMuzFlare
@@ -612,12 +611,12 @@ aTeslaArc cid w = aTeslaArc' cid
                 $ soundFrom (CrWeaponSound cid) 25 1 0 w
 
 aTeslaArc' :: Int -> World -> World
-aTeslaArc' cid w = 
-                teslaGunFlashAt (pos +.+ 5 *.* unitVectorAtAngle dir)
-                $ over projectiles (IM.insert i (makeTeslaArcAt i pos dir)) 
-                $ set randGen g w
+aTeslaArc' cid w 
+    = teslaGunFlashAt (pos +.+ 5 *.* unitVectorAtAngle dir)
+    $ over projectiles (IM.insert i (makeTeslaArcAt i pos dir)) 
+    $ set randGen g w
   where 
-    cr  = (_creatures w IM.! cid)
+    cr  = _creatures w IM.! cid
     i = newProjectileKey w
     pos = _crPos cr +.+ ((_crRad cr +1) *.* unitVectorAtAngle dir) 
                     +.+ sideOffset *.* vNormal (unitVectorAtAngle dir)
@@ -1019,13 +1018,18 @@ moveRemoteShell time i cid itid dir w
                           . _Just . scopePos .~ (newPos -.- _crPos (_creatures w' IM.! cid))
               _   -> w'
 
-explodeRemoteRocket :: Int -> Int -> Int -> World -> World
+explodeRemoteRocket 
+    :: Int  -- ^ Item id
+    -> Int  -- ^ Projectile id
+    -> Int 
+    -> World 
+    -> World
 explodeRemoteRocket itid pjid n w
     = set (projectiles . ix pjid . pjUpdate) (retireRemoteRocket itid 30 pjid)
-        $ set (projectiles . ix pjid . pjPict) blank
-        $ set (itPoint . wpFire) (flip const)
-        $ resetName
-        $ makeExplosionAt (_pjPos (_projectiles w IM.! pjid)) w
+    $ set (projectiles . ix pjid . pjPict) blank
+    $ set (itPoint . wpFire) (const id)
+    $ resetName
+    $ makeExplosionAt (_pjPos (_projectiles w IM.! pjid)) w
   where 
     resetName = set (itPoint . itName) "REMOTELAUNCHER"
     itPoint = pointToItem $ _itemPositions w IM.! itid
@@ -1073,7 +1077,7 @@ explodeRemoteBomb :: Int -> Int -> Int -> World -> World
 explodeRemoteBomb itid pjid n w
     = set (projectiles . ix pjid . pjUpdate) (retireRemoteBomb itid 30 pjid)
         $ set (projectiles . ix pjid . pjPict) blank
-        $ set (creatures . ix n . crInv . ix j . twFire) (flip const)
+        $ set (creatures . ix n . crInv . ix j . twFire) (const id)
         $ resetName
         $ resetPict
 --        $ resetScope