Move towards implementing wrist shields

src/Dodge/Creature/HandPos.hs

@@ -23,8 +23,30 @@ aimingMuzzlePos :: Creature -> Item -> Float
 aimingMuzzlePos cr it = aimingWeaponZeroPos cr it 
     + fromMaybe 0 (it ^? itDimension . dimPortage . muzPos)
 
+translatePointToRightHand :: Creature -> Point3 -> Point3
+translatePointToRightHand cr = translatePointToRightHand' cr . mirrorV3xz
+
+mirrorV3xz :: Point3 -> Point3
+mirrorV3xz (V3 x y z) = V3 x (-y) z
+
+translatePointToRightHand' :: Creature -> Point3 -> Point3
+translatePointToRightHand' cr
+    | oneH cr = (+.+.+ V3 11 (-3) 20) . rotate3 (-0.5)-- . scaleSH (V3 1 1.5 1)
+    | twists cr = (+.+.+ V3 0 5 20) . rotate3 (-1) . (+.+.+ V3 4 (-10) 0)
+    | twoFlat cr = (+.+.+ V3 4 (-8) 10)
+    | otherwise = case cr ^? crStance . carriage of
+        Just (Walking sa LeftForward)  -> (+.+.+ V3 (-f sa) (-off) 10)
+        _ -> (+.+.+ V3 0 (-off) 10)
+  where
+    off = 8
+    sLen = _strideLength $ _crStance cr
+    f i = negate 2 + negate 6 * fromIntegral (sLen - i) / fromIntegral sLen
+
 translateToRightHand :: Creature -> SPic -> SPic
-translateToRightHand cr
+translateToRightHand cr = translateToRightHand' cr . mirrorSPxz
+
+translateToRightHand' :: Creature -> SPic -> SPic
+translateToRightHand' cr
     | oneH cr = shoulderSP . translateSPf 11 (-3) . rotateSP (-0.5)-- . scaleSH (V3 1 1.5 1)
     | twists cr = shoulderSP . translateSPf 0 5 . rotateSP (-1) . translateSPf 4 (-10)
     | twoFlat cr = waistSP . translateSPf 4 (-8)
@@ -36,6 +58,19 @@ translateToRightHand cr
     sLen = _strideLength $ _crStance cr
     f i = negate 2 + negate 6 * fromIntegral (sLen - i) / fromIntegral sLen
 
+translatePointToLeftHand :: Creature -> Point3 -> Point3
+translatePointToLeftHand cr
+    | oneH cr = (+.+.+ V3 0 0 10) . rotate3 0.4 . (+.+.+ V3 0 off 0)
+    | twists cr = (+.+.+ V3 0 5 20) . rotate3 (-1) . (+.+.+ V3 12 4 0)
+    | twoFlat cr = (+.+.+ V3 4 8 10)
+    | otherwise = case cr ^? crStance . carriage of
+        Just (Walking sa RightForward)  -> (+.+.+ V3 (-f sa) off 10)
+        _ -> (+.+.+ V3 0 off 10)
+  where
+    off = 8
+    sLen = _strideLength $ _crStance cr
+    f i = negate 2 + negate 6 * fromIntegral (sLen - i) / fromIntegral sLen
+
 translateToLeftHand :: Creature -> SPic -> SPic
 translateToLeftHand cr
     | oneH cr = waistSP . rotateSP 0.4 . translateSPf 0 off

src/Dodge/Creature/Impulse/UseItem.hs

@@ -32,42 +32,49 @@ itemEffect cr it w = case it ^? itUse of
     hammerTest f = case _crHammerPosition cr of
         HammerUp -> f w
         _ -> w & setuhamdown
-    lhammer f' = w & case _crHammerPosition cr of
-        HammerUp -> creatures . ix (_crID cr) %~ f'
-        _ -> id
     setuhamdown = creatures . ix (_crID cr) . crHammerPosition .~ HammerDown
-    doequipmentchange = setuhamdown $ lhammer (toggleEquipmentAt (_rbOptions w) (_crInvSel cr)
-        . activateEquipmentAt (_rbOptions w))
+    doequipmentchange = setuhamdown $ hammerTest (toggleEquipmentAt (_rbOptions w) (_crInvSel cr) cr
+        . activateEquipmentAt (_rbOptions w) cr)
 
-activateEquipmentAt :: RightButtonOptions -> Creature -> Creature
-activateEquipmentAt rbo = case (rbo ^? opActivateEquipment . activateEquipment, rbo ^? opActivateEquipment . deactivateEquipment) of
+activateEquipmentAt :: RightButtonOptions -> Creature -> World -> World
+activateEquipmentAt rbo cr = creatures . ix (_crID cr) %~ case (rbo ^? opActivateEquipment . activateEquipment, rbo ^? opActivateEquipment . deactivateEquipment) of
     (Just i,_) -> crLeftInvSel ?~ i
     (_,Just _) -> crLeftInvSel .~ Nothing
     _ -> id
 
-toggleEquipmentAt :: RightButtonOptions -> Int -> Creature -> Creature
-toggleEquipmentAt rbops invid cr = case rbops ^? opAllocateEquipment of
-    Just DoNotMoveEquipment -> cr
+toggleEquipmentAt :: RightButtonOptions -> Int -> Creature -> World -> World
+toggleEquipmentAt rbops invid cr w = case rbops ^? opAllocateEquipment of
+    Just DoNotMoveEquipment -> w
     Just PutOnEquipment {_allocNewPos = newp}
-        -> cr & crEquipment . at newp ?~ invid
-            & crInvEquipped . at invid ?~ newp
+        -> w & crpoint . crEquipment . at newp ?~ invid
+            & crpoint . crInvEquipped . at invid ?~ newp
+            & onequip itm cr
     Just MoveEquipment {_allocNewPos=newp,_allocOldPos = oldp }
-        -> cr & crEquipment . at newp ?~ invid
-            & crEquipment . at oldp .~ Nothing
-            & crInvEquipped . at invid ?~ newp
+        -> w & crpoint . crEquipment . at newp ?~ invid
+            & crpoint . crEquipment . at oldp .~ Nothing
+            & crpoint . crInvEquipped . at invid ?~ newp
     Just SwapEquipment {_allocNewPos=newp, _allocOldPos = oldp, _allocSwapID = sid }
-        -> cr & crEquipment . at newp ?~ invid
-            & crEquipment . at oldp ?~ sid
-            & crInvEquipped . at invid ?~ newp
-            & crInvEquipped . at sid ?~ oldp
+        -> w & crpoint . crEquipment . at newp ?~ invid
+            & crpoint . crEquipment . at oldp ?~ sid
+            & crpoint . crInvEquipped . at invid ?~ newp
+            & crpoint . crInvEquipped . at sid ?~ oldp
     Just ReplaceEquipment {_allocNewPos = newp, _allocRemoveID = rid }
-        -> cr & crEquipment . at newp ?~ invid
-            & crInvEquipped . at invid ?~ newp
-            & crInvEquipped . at rid .~ Nothing
+        -> w & crpoint . crEquipment . at newp ?~ invid
+            & crpoint . crInvEquipped . at invid ?~ newp
+            & crpoint . crInvEquipped . at rid .~ Nothing
+            & onremove (itmat rid) cr
+            & onequip itm cr
     Just RemoveEquipment {_allocOldPos = oldp }
-        -> cr & crEquipment . at oldp .~ Nothing
-            & crInvEquipped . at invid .~ Nothing
+        -> w & crpoint . crEquipment . at oldp .~ Nothing
+            & crpoint . crInvEquipped . at invid .~ Nothing
+            & onremove itm cr
     Nothing -> error "tried to toggle equipment whilst not prepared"
+  where
+    crpoint = creatures . ix (_crID cr)
+    itmat i = _crInv cr IM.! i
+    itm = itmat (_crInvSel cr)
+    onequip itm' = (_eqOnEquip . _itUse) itm' itm'
+    onremove itm' = (_eqOnRemove . _itUse) itm' itm'
 
 useLeftItem :: Int -> World -> World
 useLeftItem cid w 

src/Dodge/Creature/State.hs

@@ -145,7 +145,9 @@ useUpdate = (useHammer . hammerPosition %~ moveHammerUp)
     . (useDelay . rateTime %~ decreaseToZero)
 
 useEquipment :: Creature -> Int -> World -> World
-useEquipment cr i = _eqUse (_itUse $ _crInv cr IM.! i) cr i
+useEquipment cr i = _eqUse (_itUse itm) itm cr
+  where
+    itm = _crInv cr IM.! i
 -- a map updating all inventory items
 upInv :: Creature -> World -> World
 upInv cr = creatures . ix (_crID cr) . crInv %~ IM.mapWithKey (itemUpdate cr)