Fix zoom bug

src/Dodge/Creature/ChaseCrit.hs

@@ -56,5 +56,5 @@ chaseCritVocalization =
         , seagullCry1S
         , seagullCry2S
         ]
-                (50,100)
+        (50, 200)
         0

src/Dodge/Update/Camera.hs

@@ -159,28 +159,18 @@ zoomSpeed :: Float
 zoomSpeed = 39 / 40
 
 zoomInLongGun :: Point2 -> Scope -> Scope
-zoomInLongGun mousep sc
+zoomInLongGun mousep sc = fromMaybe sc $ do
-    | currentZoom < 8 =
+    curzoom <- sc ^? scopeZoom   
-        sc
+    guard $ curzoom < 8
-            & scopePos .+.+~ (1 - zoomSpeed) / newzoom *.* mousep
+    return $ sc & scopePos .+.+~ (1 - zoomSpeed)*zoomSpeed/curzoom *.* mousep
         & scopeZoom %~ (/ zoomSpeed)
-    | otherwise = sc
-  where
-    Just currentZoom = sc ^? scopeZoom
-    newzoom = (sc ^?! scopeZoom) / zoomSpeed
 
 zoomOutLongGun :: Scope -> Scope
-zoomOutLongGun sc
+zoomOutLongGun sc = fromMaybe sc $ do
-    | currentzoom > 0.5 =
+    curzoom <- sc ^? scopeZoom
-        sc
+    guard $ curzoom > 0.5
-            & scopePos %~ (\p -> p +.+ (zoomSpeed-1) / currentzoom *.* p)
+    return $ sc & scopePos %~ (\p -> p +.+ (zoomSpeed - 1) / curzoom *.* p)
---            & scopePos .*.*~ 1 - ((newzoom * 2) ** zoomSpeed)
         & scopeZoom *~ zoomSpeed
-    | otherwise = sc
-        & scopePos .~ V2 0 0
-  where
-    Just currentzoom = sc ^? scopeZoom
-    --newzoom = (sc ^?! scopeZoom) / zoomSpeed
 
 ifConfigWallRotate :: Configuration -> World -> World
 ifConfigWallRotate cfig w