More streaming refactoring

src/Dodge/Creature/Action.hs

@@ -29,7 +29,7 @@ import Dodge.Creature.Stance.Data
 import Dodge.WorldEvent.Shockwave
 import Dodge.Data
 import Dodge.Base
-import Dodge.Zone
+--import Dodge.Zone
 import Dodge.SoundLogic
 --import Dodge.WorldEvent
 import Dodge.Inventory
@@ -172,7 +172,7 @@ blinkActionFail cr w = w
     cid  = _crID cr
     p1 = mouseWorldPos w
     cpos = _crPos cr
-    p2 = reflectPointWalls cpos p1 $ wallsAlongLine cpos p1 w
+    p2 = reflectPointWallsDamp (const True) 1 cpos p1 w
     r  = 1.5 * _crRad cr
     p3 = maybe p1 (mvPointTowardAtSpeed r cpos . fst) p2
 
@@ -193,7 +193,7 @@ blinkAction cr w = w
     cid  = _crID cr
     p1 = mouseWorldPos w
     cpos = _crPos cr
-    p2 = reflectPointWalls cpos p1 $ wallsAlongLine cpos p1 w
+    p2 = reflectPointWallsDamp (const True) 1 cpos p1 w
     r  = 1.5 * _crRad cr
     p3 = maybe p1 (mvPointTowardAtSpeed r cpos . fst) p2
 
@@ -215,7 +215,7 @@ unsafeBlinkAction cr w
             Damage ENTERREMENT 10000 mwp mwp mwp NoDamageEffect
   where
     success = fromMaybe True $ do
-        (_,wl) <- collidePointWallsWall mwp cpos $ wallsAlongLine mwp cpos w
+        wl <- snd $ collidePointWallsFilterStream (const True) mwp cpos w
         return (isLHS mwp `uncurry` _wlLine wl)
     distR = 120
     distortionBulge =