Cleanup, stop assigning hotkeys to unequipped items
This commit is contained in:
@@ -56,7 +56,7 @@ data Creature = Creature
|
||||
, _crInvLock :: Bool
|
||||
, _crInvEquipped :: IM.IntMap EquipPosition
|
||||
, _crEquipment :: M.Map EquipPosition Int
|
||||
, _crLeftInvSel :: LeftInvSel
|
||||
-- , _crLeftInvSel :: LeftInvSel
|
||||
, _crInvHotkeys :: IM.IntMap Hotkey
|
||||
, _crHotkeys :: M.Map Hotkey Int
|
||||
, _crState :: CreatureState
|
||||
|
||||
@@ -33,6 +33,12 @@ data Hotkey = HotkeyQ
|
||||
| Hotkey2
|
||||
| Hotkey3
|
||||
| Hotkey4
|
||||
| Hotkey5
|
||||
| Hotkey6
|
||||
| Hotkey7
|
||||
| Hotkey8
|
||||
| Hotkey9
|
||||
| Hotkey0
|
||||
deriving (Eq, Show, Read, Ord, Bounded, Enum) --Generic, Flat)
|
||||
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ data Manipulation -- should be ManipulatedObject?
|
||||
data ManipulatedObject
|
||||
= InInventory {_inInventory :: InventoryManipulation}
|
||||
| SelNothing
|
||||
-- | SelCloseObject {_ispCloseObject :: Int}
|
||||
| InNearby {_inNearby :: NearbyManipulation}
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
@@ -46,16 +45,11 @@ data InvSelAction
|
||||
| ReloadAction {_actionProgress :: Int, _reloadAction :: LoadAction}
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data LeftInvSel = LeftInvSel
|
||||
{ _lisMPos :: Maybe Int
|
||||
}
|
||||
|
||||
makeLenses ''LoadAction
|
||||
makeLenses ''ManipulatedObject
|
||||
makeLenses ''Manipulation
|
||||
makeLenses ''InventoryManipulation
|
||||
makeLenses ''NearbyManipulation
|
||||
makeLenses ''LeftInvSel
|
||||
makeLenses ''InvSelAction
|
||||
deriveJSON defaultOptions ''LoadAction
|
||||
deriveJSON defaultOptions ''InvSelAction
|
||||
@@ -63,4 +57,3 @@ deriveJSON defaultOptions ''InventoryManipulation
|
||||
deriveJSON defaultOptions ''NearbyManipulation
|
||||
deriveJSON defaultOptions ''ManipulatedObject
|
||||
deriveJSON defaultOptions ''Manipulation
|
||||
deriveJSON defaultOptions ''LeftInvSel
|
||||
|
||||
Reference in New Issue
Block a user