Distinguish between selected item and root-selected item

src/Dodge/HeldUse.hs

@@ -115,7 +115,12 @@ applySidePush maxSide cr w = w
     (pushAmount, g) = randomR (- maxSide, maxSide) $ _randGen w
 
 applyTorqueCME :: Item -> Creature -> World -> World
-applyTorqueCME itm cr w = w
+applyTorqueCME itm cr w 
+    | cid == 0 = w
+        & wCam . camRot -~ rot
+        & cWorld . lWorld . creatures . ix cid . crDir +~ rot
+        & randGen .~ g
+    | otherwise = w
         & cWorld . lWorld . creatures . ix cid . crDir +~ rot
         & randGen .~ g
   where
@@ -221,7 +226,7 @@ shootTractorBeam _ cr w = w & cWorld . lWorld . tractorBeams .:~ tractorBeamAt'
     dir = _crDir cr
     outpos = fst $ collidePointWallsFilter (const True) cpos xpos w
     power = _attractionPower . _itParams $ _crInv cr IM.! itRef
-    itRef = cr ^?! crManipulation . manObject . inInventory . ispItem -- unsafe!! TODO change
+    itRef = cr ^?! crManipulation . manObject . inInventory . imRootItem -- unsafe!! TODO change
 
 tractorBeamAt' :: Point2 -> Point2 -> Float -> Point2 -> TractorBeam
 tractorBeamAt' pos outpos dir power =
@@ -309,8 +314,8 @@ useHeld hu = case hu of
     HeldDetectorEffect dt -> detectorEffect dt . _ldtValue
 --    HeldTeslaArc -> shootTeslaArc . _ldtValue
 --    HeldLaser -> shootLaser . _ldtValue
-    HeldCircleLaser -> circleLaser . _ldtValue
-    HeldDualLaser -> shootDualLaser . _ldtValue
+--    HeldCircleLaser -> circleLaser . _ldtValue
+--    HeldDualLaser -> shootDualLaser . _ldtValue
     HeldTractor -> aTractorBeam . _ldtValue
     --    HeldSonicWave -> aSonicWave
     HeldForceField -> useForceFieldGun . _ldtValue
@@ -466,7 +471,7 @@ shootTeslaArc itm cr mz w =
     w'
         & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix itRef . itParams .~ ip
   where
-    itRef = cr ^?! crManipulation . manObject . inInventory . ispItem -- unsafe!! TODO change
+    itRef = cr ^?! crManipulation . manObject . inInventory . imRootItem -- unsafe!! TODO change
     (w', ip) = makeTeslaArc (_itParams itm) pos dir w
     pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm)
     dir = _crDir cr + _mzRot mz