Start to implement equipment sites on body

2022-05-21 12:13:50 +01:00
parent bc0f7ada3c
commit 398ed6d982
8 changed files with 94 additions and 23 deletions
@@ -169,9 +169,8 @@ rememberSounds w cr = cr

 -- TODO work out correct form for sounds passing through walls
 soundIsClose :: World -> Creature -> (Point2,Float) -> Bool
-soundIsClose w cr (pos,vol) 
-    | dist cpos pos > 2000 = False
-    | hasLOS cpos pos w = vol > (_auDist . _crAudition $ _crPerception cr) (dist pos cpos)
-    | otherwise = False
+soundIsClose w cr (pos,vol) = dist cpos pos < 2000 
+    && vol > (_auDist . _crAudition $ _crPerception cr) (dist pos cpos)
+    && hasLOS cpos pos w
  where
    cpos = _crPos cr