Cleanup targeting

2023-01-05 11:01:12 +00:00
parent c48a553967
commit 0302685053
24 changed files with 66 additions and 95 deletions
@@ -73,7 +73,7 @@ sniperRifle =
        & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 0.5, _izMin = 0.5}
        & itUse . heldScroll .~ HeldScrollZoom -- zoomLongGun
        & itScope .~ ZoomScope (V2 0 0) 0 1 0.5 False
-        & itTargeting .~ targetLaser
+        & itUse . heldTargeting .~ (defaultTargeting & tgType .~ TargetLaser)
        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}

 machineGun :: Item
@@ -44,7 +44,7 @@ torch =
 forceFieldGun :: Item
 forceFieldGun =
    defaultWeapon
-        & itTargeting .~ (targetRBPress & tgDraw .~ TargetDistanceDraw)
+        & itUse . heldTargeting .~ (defaultTargeting & tgType .~ TargetRBLine)
        & itParams .~ ParamMID Nothing
        & itUse . heldUse .~ HeldForceField --useForceFieldGun
        & itUse . heldDelay .~ NoDelay