Commit before messing with item tree orientation etc

src/Dodge/Item/HeldOffset.hs

@@ -36,11 +36,11 @@ heldItemRelativeOrient
 heldItemRelativeOrient itm cr (p,q)
     | Aiming {} <- _posture (_crStance cr) =
         (p + aimingWeaponZeroPos cr itm `v2z` shoulderHeight, Q.qID * q)
-    |  TwoHandFlat <- aStance itm = 
+    |  TwoHandFlat <- itemBaseStance itm = 
         ( V3 (crRad $ cr ^. crType) 0 handD + rotate3 (twoFlatHRot cr) (transToHandle itm p)
         , Q.axisAngle (V3 0 0 1) (twoFlatHRot cr) * q
         )
-    |  OneHand <- aStance itm = 
+    |  OneHand <- itemBaseStance itm = 
             ( V3 (crRad (cr ^. crType) * 0.7 + handPos) (crRad (cr ^. crType) * negate 0.7) handD
                 + transToHandle itm p
             , Q.qID * q
@@ -63,7 +63,7 @@ aimingWeaponZeroPos cr it = aimStanceHandlePos cr it - handlePos it
 
 -- the position of a weapon handle
 aimStanceHandlePos :: Creature -> Item -> Point2
-aimStanceHandlePos _ it = case aStance it of
+aimStanceHandlePos _ it = case itemBaseStance it of
     TwoHandUnder -> V2 (-2) 0
     TwoHandOver -> V2 (-7) 0
     OneHand -> V2 10 (-2)