Cleanup

src/Dodge/Inventory/RBList.hs

@@ -1,21 +1,22 @@
 {-# LANGUAGE TupleSections #-}
+
 module Dodge.Inventory.RBList (
     updateRBList,
     equipmentDesignation,
     eqTypeToSites,
 ) where
 
-import NewInt
 --import qualified Data.IntMap.Strict as IM
-import Dodge.Data.Equipment.Misc
-import Dodge.Data.EquipType
+
 --import Control.Applicative
 import Control.Lens
 import Data.List (elemIndex, findIndex)
 import qualified Data.Map.Strict as M
 import Data.Maybe
 import Dodge.Base.You
+import Dodge.Data.EquipType
 import Dodge.Data.World
+import NewInt
 import qualified SDL
 
 updateRBList :: World -> World
@@ -27,8 +28,9 @@ updateRBList w = case w ^. rbState of
         itid <- cr ^? crInv . ix i
         itm <- w ^? cWorld . lWorld . items . ix itid
         etype <- equipType itm
-        return $ w & rbState
-         .~ EquipOptions (chooseEquipPosition itm cr (eqTypeToSites etype))
+        return $
+            w & rbState
+                .~ EquipOptions (chooseEquipPosition itm cr (eqTypeToSites etype))
   where
     --norightclick = not $ SDL.ButtonRight `M.member` (w ^. input . mouseButtons)
     norightclick = null $ w ^. input . mouseButtons . at SDL.ButtonRight
@@ -40,6 +42,7 @@ chooseEquipPosition :: Item -> Creature -> [EquipSite] -> Int
 chooseEquipPosition itm cr eps = fromMaybe (chooseFreeSite cr eps) $ do
     ep <- itm ^? itLocation . ilEquipSite . _Just
     elemIndex ep eps
+--    (elemIndex <$> (itm ^? itLocation . ilEquipSite . _Just)) ?? eps
 
 chooseFreeSite :: Creature -> [EquipSite] -> Int
 chooseFreeSite cr = fromMaybe 0 . findIndex hasnoequipment
@@ -52,27 +55,24 @@ equipmentDesignation invid w = fromMaybe DoNotMoveEquipment $ do
     etype <- w ^? cWorld . lWorld . items . ix itid >>= equipType
     let mesite = w ^? cWorld . lWorld . items . ix itid . itLocation . ilEquipSite . _Just
     i <- w ^? rbState . opSel
-    es <- eqTypeToSites etype ^? ix i
+    new <- eqTypeToSites etype ^? ix i
     return $ case mesite of
-        Just epos | es == epos -> RemoveEquipment{_allocOldPos = epos}
-        Just epos | isJust (you w ^? crEquipment . ix es) ->
+        Just old | new == old -> RemoveEquipment{_allocOldPos = old}
+        Just old
+            | isJust (you w ^? crEquipment . ix new) ->
                 SwapEquipment
-                    { _allocOldPos = epos
-                    , _allocNewPos = es
-                    , _allocSwapID = _crEquipment (you w) M.! es
+                    { _allocOldPos = old
+                    , _allocNewPos = new
+                    , _allocSwapID = _crEquipment (you w) M.! new
                     }
-        Just epos ->
-            MoveEquipment
-                { _allocOldPos = epos
-                , _allocNewPos = es
-                }
+        Just old -> MoveEquipment{_allocOldPos = old, _allocNewPos = new}
         Nothing
-            | isJust (you w ^? crEquipment . ix es) ->
+            | isJust (you w ^? crEquipment . ix new) ->
                 ReplaceEquipment
-                    { _allocNewPos = es
-                    , _allocRemoveID = _crEquipment (you w) M.! es
+                    { _allocNewPos = new
+                    , _allocRemoveID = _crEquipment (you w) M.! new
                     }
-        Nothing -> PutOnEquipment{_allocNewPos = es}
+        Nothing -> PutOnEquipment{_allocNewPos = new}
 
 eqTypeToSites :: EquipType -> [EquipSite]
 eqTypeToSites es = case es of