Cleanup, tweak aiming

src/Dodge/Creature/YourControl.hs

@@ -39,11 +39,10 @@ wasdWithAiming ::
     Creature ->
     Creature
 wasdWithAiming w speed cr
---    | isAiming = addAnyTwist $ set crDir mouseDir $ theMovement cr
     | isAiming = addAnyTwist $ aimTurn mouseDir $ theMovement $ setMvAim cr
     | crIsReloading cr && SDL.ButtonRight `M.member` _mouseButtons (_input w) =
-        addAnyTwist $ aimTurn (mouseDir + anytwist) $ theMovement $ setMvAim cr
---    | otherwise = theMovement $ theTurn $ removeTwist $ setMvAim cr
+        --addAnyTwist $ aimTurn (mouseDir + anytwist) $ theMovement $ setMvAim cr
+        aimTurn mouseDir $ removeTwist $ theMovement $ setMvAim cr
     | otherwise = noaimmove $ theTurn $ removeTwist $ setMvAim cr
   where
     setMvAim = maybe id (crMvAim .~) dir
@@ -55,7 +54,14 @@ wasdWithAiming w speed cr
     anytwist = case cr ^? crInv . ix (crSel cr) . itUse . heldAim . aimStance of
         Just TwoHandTwist -> twistamount * pi
         _ -> 0
-    addAnyTwist = crTwist .~ anytwist
+    --addAnyTwist = crTwist .~ anytwist
+    addAnyTwist = case cr ^? crInv . ix (crSel cr) . itUse . heldAim . aimStance of
+        Just TwoHandTwist -> case cr ^. crTwist of
+            0 -> (crTwist .~ twistamount * pi)
+                . (crDir -~ twistamount * pi)
+            _ -> id
+        _ -> id
+            
     theMovement
         | movDir == V2 0 0 = id
         | otherwise = crMvAbsolute (speed *.* movAbs)

src/Dodge/Data/Item/Combine.hs

@@ -16,7 +16,6 @@ import Dodge.Data.Item.Use.Consumption
 data ItemType = ItemType
     { _iyBase :: ItemBaseType
     , _iyModules :: M.Map ModuleSlot ItemModuleType
-    , _iyStack :: Stack
     }
     deriving (Eq,Ord,Show,Read)
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)

src/Dodge/Default/Item.hs

@@ -57,7 +57,7 @@ defaultCraftItem =
         & itInvColor .~ green
 
 defaultItemType :: ItemType
-defaultItemType = ItemType NoItemType mempty NoStack
+defaultItemType = ItemType NoItemType mempty
 
 defaultBulletWeapon :: Item
 defaultBulletWeapon =