Delete cruft, add Reader monad to some internal ai

src/Dodge/WorldEvent.hs

@@ -39,27 +39,27 @@ import Data.Function
 import Data.List
 import qualified Data.IntMap.Strict as IM
 
-createBarrelSpark :: Int -> Int -> Point2 -> Float -> Maybe Int -> World -> World
-createBarrelSpark time colid pos dir maycid w = over worldEvents 
-                                        ((.) $ ( over particles ((:) spark) 
-                                               . sparkFlashAt pos')
-                                        ) w
-    where spark = Bul'  { _ptDraw = drawBul
-                        , _ptUpdate' = mvGenBullet'
-                        , _btVel' = rotateV dir (5,0)
-                        , _btColor' = numColor colid
-                        , _btTrail' = [pos]
-                        , _btPassThrough' = maycid
-                        , _btWidth' = 1
-                        , _btTimer' = time
-                        , _btHitEffect' = destroyOnImpact sparkEff noEff noEff
-                        }
-          x = fst $ randomR (0,20) $ _randGen w
-          pos' = pos +.+ rotateV dir (x,0)
-          sparkEff bt p cr = over (creatures . ix (_crID cr) . crState . crDamage)
-                                  ((:) $ SparkDam 1 sp p ep)
-            where sp = head (_btTrail' bt)
-                  ep = sp +.+ _btVel' bt
+createBarrelSpark :: Point2 -> Float -> Maybe Int -> Int -> Int -> World -> World
+createBarrelSpark pos dir maycid time colid w 
+    = over worldEvents (( over particles (spark :) . sparkFlashAt pos') . ) w
+  where 
+    spark = Bul'  
+        { _ptDraw = drawBul
+        , _ptUpdate' = mvGenBullet'
+        , _btVel' = rotateV dir (5,0)
+        , _btColor' = numColor colid
+        , _btTrail' = [pos]
+        , _btPassThrough' = maycid
+        , _btWidth' = 1
+        , _btTimer' = time
+        , _btHitEffect' = destroyOnImpact sparkEff noEff noEff
+        }
+    x = fst $ randomR (0,20) $ _randGen w
+    pos' = pos +.+ rotateV dir (x,0)
+    sparkEff bt p cr = over (creatures . ix (_crID cr) . crState . crDamage)
+                            ((:) $ SparkDam 1 sp p ep)
+      where sp = head (_btTrail' bt)
+            ep = sp +.+ _btVel' bt