Make examine inventory controlled by item, perhaps still buggy

src/Dodge/Data/ComposedItem.hs

@@ -61,6 +61,7 @@ data ItemStructuralFunction
     | MakeAutoSF
     | ProjectileStabiliserSF
     | GrenadeHitEffectSF
+    | ToggleSF
     deriving (Eq, Ord, Show, Read)
 
 type ComposedItem = (Item, ItemStructuralFunction, LinkTest)

src/Dodge/Data/HUD.hs

@@ -25,12 +25,6 @@ data HUDElement
         }
     | DisplayCarte
 
---data MouseInventorySelection
---    = MouseInvSelect
---        {_misSelStart :: (Int, Int), _misMaybeEnd :: Maybe (Int, Int)}
---    | MouseInvDrag
---    | MouseInvNothing
-
 data SubInventory
     = NoSubInventory
     | ExamineInventory

src/Dodge/Data/Item/Effect.hs

@@ -1,13 +1,17 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Item.Effect where
+module Dodge.Data.Item.Effect (
+    module Dodge.Data.Item.Effect,
+    module Dodge.Data.BlBl,
+) where
 
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Dodge.Data.BlBl
 
 data ItEffect = ItEffect
     { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
@@ -23,6 +27,8 @@ data ItInvEffect
     | RemoveShieldWall
     | EffectWhileRoot ItInvEffect
     | EffectWhileAttached ItInvEffect
+    | ItemUseToggle BlBl
+    | ItemCancelExamineInventory
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ItDropEffect = NoDropEffect

src/Dodge/Data/Item/Use.hs

@@ -43,6 +43,7 @@ data ItemUse
     | UseNothing
     | UseScope { _uScope :: Scope }
     | UseBulletMod { _ubMod :: BulletMod }
+    | UseToggle {_useToggle :: Bool}
     deriving (Eq, Show, Read)
 
 data HeldUseEffect

src/Dodge/Data/Item/Use/Consumption/Ammo.hs

@@ -19,7 +19,6 @@ data ProjectileUpdate
     = ThrustPU {_pjuStart :: Int, _pjuEnd :: Int}
     | StartSpinPU {_pjuTime :: Int, _pjuCID :: Int, _pjuSpinAmound :: Int}
     | RemoteDirectionPU {_pjuStart :: Int, _pjuEnd :: Int}
---    | ApplyGravityPU
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 data AmmoType

src/Dodge/Data/Terminal.hs

@@ -11,6 +11,7 @@ import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import Dodge.Data.WorldEffect
+import Dodge.Data.BlBl
 
 data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
     deriving Eq
@@ -85,11 +86,6 @@ data TerminalToggle = TerminalToggle
     }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data BlBl
-    = BlNegate
-    | BlConst Bool
-    | BlId
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
@@ -135,7 +131,6 @@ concat <$> mapM (deriveJSON defaultOptions)
     , ''TmTm
     , ''TerminalLine
     , ''TerminalBootProgram
-    , ''BlBl
     , ''TerminalToggle
     , ''EffectArguments
     , ''TerminalCommandEffect