Refactoring

2021-05-03 23:59:20 +02:00
parent b826299cbd
commit e21178b688
20 changed files with 830 additions and 731 deletions
@@ -288,15 +288,15 @@ blinkAction
    :: Int      -- ^ Creature id
    -> World 
    -> World
-blinkAction n w = soundOnce teleSound 
-    $ set (creatures . ix n . crPos) p3
-    $ blinkShockwave n p3
-    $ inverseShockwaveAt cp 40 2 2 2 
-        w
+blinkAction n w 
+    = soundOnce teleSound 
+    . set (creatures . ix n . crPos) p3
+    . blinkShockwave n p3
+    $ inverseShockwaveAt cp 40 2 2 2 w
  where
    p1 = _cameraCenter w +.+ (1 / _cameraZoom w) *.* rotateV (_cameraRot w) (_mousePos w)
    cp = _crPos $ _creatures w IM.! n
-    p2 = collidePointWalls cp p1 $ wallsAlongLine cp p1 w
+    p2 = reflectPointWalls cp p1 $ wallsAlongLine cp p1 w
    r  = 1.5 * _crRad (_creatures w IM.! n)
    p3 = fromMaybe p1 (fmap ((\p -> moveAmountToward p r cp) . fst) p2)