Move towards allowing equipable targeting items

2023-01-06 11:01:32 +00:00
parent bf479ca080
commit 612ee85579
23 changed files with 152 additions and 145 deletions
@@ -71,13 +71,13 @@ useAmmoParams it cr w =
    settrajectory traj = case traj of
        BasicBulletTrajectory -> BasicBulletTrajectory
        MagnetTrajectory{} -> fromMaybe BasicBulletTrajectory $ do
-            tpos <- it ^? itUse . heldTargeting . tgPos . _Just
+            tpos <- cr ^? crTargeting . ctPos . _Just
            return $ MagnetTrajectory tpos
        FlechetteTrajectory{} -> fromMaybe BasicBulletTrajectory $ do
-            tpos <- it ^? itUse . heldTargeting . tgPos . _Just
+            tpos <- cr ^? crTargeting . ctPos . _Just
            return $ FlechetteTrajectory tpos
        BezierTrajectory{} -> fromMaybe BasicBulletTrajectory $ do
-            tpos <- it ^? itUse . heldTargeting . tgPos . _Just
+            tpos <- cr ^? crTargeting . ctPos . _Just
            return $ BezierTrajectory sp tpos (mouseWorldPos (w ^. input) (w ^. cWorld . camPos))

 bounceDir :: (Point2, Either Creature Wall) -> Maybe Point2