Allow for equipment items to set a minimum view distance

src/Dodge/Update/Camera.hs

@@ -8,6 +8,7 @@ module Dodge.Update.Camera
 import Dodge.Data
 import Dodge.Base
 import Dodge.Zone
+import Dodge.Equipment
 import Dodge.Creature.Test
 import Geometry
 --import Geometry.ConvexPoly
@@ -110,7 +111,7 @@ zoomInLongGun w
     wpPointer = creatures . ix 0 . crInv . ix (_crInvSel (_creatures w IM.! 0))
     wp = _crInv (_creatures w IM.! 0) IM.! _crInvSel (_creatures w IM.! 0)
     Just currentZoom = wp ^? itScope . scopeZoom
-    newzoom = fromJust (wp ^? itScope . scopeZoom) / zoomSpeed
+    newzoom = (wp ^?! itScope . scopeZoom) / zoomSpeed
     mousep = rotateV (_cameraRot w) $ _mousePos w
 
 zoomOutLongGun :: World -> World
@@ -188,7 +189,9 @@ setViewDistance cfig w = w & viewDistance
 
 -- TODO consider adding visible/nearby creatures as view points
 farWallDist :: Point2 -> Configuration -> World -> Float
-farWallDist p cfig w = (winFac /) . min maxViewDistance $ ssfold (> maxViewDistance) findMax 1 vps
+--farWallDist p cfig w = (winFac /) . min maxViewDistance $ ssfold (> maxViewDistance) findMax 1 vps
+farWallDist p cfig w = (winFac /) 
+    . min maxViewDistance $ ssfold (> maxViewDistance) findMax distFromEqmnt vps
   where
     findMax curMax pout = max curMax $ dist p $ collidePointUpToIndirectMinDist p pout curMax wos
     hw = halfWidth  cfig
@@ -197,6 +200,8 @@ farWallDist p cfig w = (winFac /) . min maxViewDistance $ ssfold (> maxViewDista
     vps = concatMap _grViewpoints grs ++ extendedViewPoints p grs
     grs = filter (pointInOrOnPolygon p . _grBound) (_gameRooms w)
     wos = wallsOnScreen cfig w
+    distFromEqmnt = foldr max 1 $ IM.mapMaybe (_eqViewDist . _eqEq. _itUse) $ getCrEquipment $ you w
+    
 
 extendedViewPoints :: Point2 -> [GameRoom] -> [Point2]
 extendedViewPoints p grs = map extend