Cleanup zoning

2022-06-28 13:43:37 +01:00
parent e770fba7bf
commit 9801a40b9e
14 changed files with 84 additions and 106 deletions
@@ -70,7 +70,7 @@ mvShockwave is w pt
            w'
            id
            hitBlocks
-    hitBlocks = S.map snd . overlapCircWalls p rad $ wallsInsideCirc p rad w 
+    hitBlocks = S.map snd . overlapCircWalls p rad $ wlsInsideCirc p rad w 
        -- this is not expansive enough
    damCr cr 
        | _crID cr `elem` is || dist (_crPos cr) p >= rad + _crRad cr  = cr
@@ -214,7 +214,7 @@ damageInArea crt wlt pt w = damwls damcrs
            w' 
            id
        . S.filter wlt
-        $ wallsNearPoint p w'
+        $ wlsNearPoint p w'
    hiteff = _ptHitEff pt pt

 -- | At writing the radius is half the size of the effect area
@@ -60,4 +60,4 @@ wlsHit sp ep
    | sp == ep  = const mempty
    | otherwise = sortStreamOn (dist sp . fst)
        . overlapSegWalls sp ep
-        . wallsAlongLine sp ep
+        . wlsNearSeg sp ep