Vleanup

src/Dodge/Creature/ArmourChase.hs

@@ -3,6 +3,7 @@ module Dodge.Creature.ArmourChase (
     flockArmourChaseCrit,
 ) where
 
+import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Dodge.Creature.ChaseCrit
 import Dodge.Data.Creature

src/Dodge/Creature/ChaseCrit.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.ChaseCrit (
     chaseCrit,
 ) where
 
+import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Dodge.Data.Creature
 import Dodge.Default

src/Dodge/Creature/Impulse/UseItem.hs

@@ -53,7 +53,7 @@ useItemLoc cr loc pt w
     | Just b <- itm ^? itUse . useToggle
       , pt == InitialPress =
         return $ w & pointerToItem itm . itUse . useToggle .~ not b
-    | isJust $ itm ^? itUse . uequipEffect
+    | isJust $ itm ^? itType . ibtEquip
       , pt == InitialPress
       , Just invid' <- itm ^? itLocation . ilInvID =
         return $ toggleEquipmentAt invid' cr w
@@ -67,7 +67,7 @@ useLocation ::
     LocationLDT ItemLink ComposedItem ->
     LocationLDT ItemLink ComposedItem
 useLocation loc
-    | isJust $ loc ^? locLDT . ldtValue . _1 . itUse . uequipEffect = loc
+    | isJust $ loc ^? locLDT . ldtValue . _1 . itType . ibtEquip = loc
     | isJust $ loc ^? locLDT . ldtValue . _1 . itUse . uaParams . apProjectiles . ix 0 =
         loc
     | sf <- loc ^. locLDT . ldtValue . _2

src/Dodge/Creature/Test.hs

@@ -24,6 +24,7 @@ module Dodge.Creature.Test (
     crSafeDistFromTarg,
 ) where
 
+import Dodge.Data.Equipment.Misc
 import Dodge.Data.AimStance
 import Dodge.Item.AimStance
 import Control.Lens

src/Dodge/Creature/YourControl.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.YourControl (
     yourControl,
 ) where
 
+import Dodge.Data.Equipment.Misc
 import Control.Monad
 import qualified Data.Map.Strict as M
 import Data.Maybe
@@ -11,7 +12,7 @@ import Dodge.Creature.Impulse.Movement
 import Dodge.Creature.Impulse.UseItem
 import Dodge.Data.AimStance
 import Dodge.Data.World
-import Dodge.Hotkey
+import Dodge.AssignHotkey
 import Dodge.InputFocus
 import Dodge.Inventory
 import Dodge.Item.AimStance