Refactoring

src/Dodge/WorldEvent/Explosion.hs

@@ -63,11 +63,11 @@ makeExplosionAt
     :: Point2   -- ^ Position
     -> World 
     -> World
-makeExplosionAt p w = soundOncePos grenadeBang p
+makeExplosionAt p w 
+    = soundOncePos grenadeBang p
     . addFlames 
     . explosionFlashAt p
-    $ makeShockwaveAt [] p 50 10 1 white
-        w
+    $ makeShockwaveAt [] p 50 10 1 white w
   where 
     fVs  = replicateM 75 (randInCirc 1)  & evalState $ _randGen w
     fPs' = replicateM 75 (randInCirc 15) & evalState $ _randGen w
@@ -79,6 +79,5 @@ makeExplosionAt p w = soundOncePos grenadeBang p
     mF q v size time = makeFlameletTimed q v Nothing size time
     newFs = zipWith4 mF fPs (fmap (3 *.*) fVs') sizes times
     addFlames w = foldr ($) w newFs
-    pushAgainstWalls q = maybe q (uncurry (+.+)) 
-                                     $ collidePointWalls p q $ wallsNearPoint q w
+    pushAgainstWalls q = maybe q (uncurry (+.+)) $ reflectPointWalls p q $ wallsNearPoint q w
 

src/Dodge/WorldEvent/SpawnParticle.hs

@@ -304,7 +304,7 @@ moveTeslaArc p d i w =
     sID  = newProjectileKey w
     q1 = last $ init ps'
     q2 = last ps'
-    hitWall = collidePointWalls q1 ((2 *.* q2) -.- q1) $ wallsNearPoint q1 w
+    hitWall = reflectPointWalls q1 ((2 *.* q2) -.- q1) $ wallsNearPoint q1 w
     (d1,_)  = randomR (-0.7,0.7) $ _randGen w
     sv = maybe (q2 -.- q1) snd hitWall
 
@@ -362,7 +362,7 @@ crOrWallSensitive p dir wlAttract w =
         . sortBy (compare `on` dist p)
         $ mapMaybe 
             ( fmap fst
-            . (\p1 -> collidePointWalls p p1 $ wallsNearPoint p w)
+            . (\p1 -> reflectPointWalls p p1 $ wallsNearPoint p w)
             . (+.+) p
             . (\d -> rotateV d (100,0))
             . (+ dir)
@@ -385,17 +385,18 @@ crOrWall p dir w = fromMaybe (E3x3 $ p +.+ rotateV dir (arcLen,0))
                                         $ catMaybes [cr,wlp]
   where 
     cr  = E3x1 <$> nearestCrInFront p dir 100 w
-    wlp = fmap E3x2 $ listToMaybe
-           $ sortBy (compare `on` dist p)
-           $ mapMaybe 
-               ( fmap fst
-               . (\p1 -> collidePointWalls p p1 $ wallsNearPoint p w)
-               . (+.+) p
-               . (\d -> rotateV d (100,0))
-               . (+) dir
-               )
-               [-(3*pi/8),-pi/4,-pi/8,0,pi/8,pi/4,3*pi/8]
-               --[-pi/4,-pi/8,0,pi/8,pi/4]
+    wlp = fmap E3x2 
+        $ listToMaybe
+        $ sortBy (compare `on` dist p)
+        $ mapMaybe 
+            ( fmap fst
+            . (\p1 -> reflectPointWalls p p1 $ wallsNearPoint p w)
+            . (+.+) p
+            . (\d -> rotateV d (100,0))
+            . (+) dir
+            )
+            [-(3*pi/8),-pi/4,-pi/8,0,pi/8,pi/4,3*pi/8]
+            --[-pi/4,-pi/8,0,pi/8,pi/4]
     g (E3x2 p1)  = 100 + dist p p1 -- tweak makes it more likely to hit crs first
     --g (E3x2 p1)  = dist p p1 - 100 -- tweak makes it more likely to hit walls first
     g (E3x1 cr1) = dist p $ _crPos cr1