Vleanup

src/Dodge/Item/Draw.hs

@@ -4,6 +4,7 @@ module Dodge.Item.Draw (
     itemEquipPict,
 ) where
 
+import Dodge.Data.Equipment.Misc
 import Dodge.Data.ComposedItem
 import Dodge.Data.DoubleTree
 import Geometry.Data

src/Dodge/Item/Equipment.hs

@@ -17,6 +17,7 @@ module Dodge.Item.Equipment (
     pulseChecker,
 ) where
 
+import Dodge.Data.Equipment.Misc
 import Dodge.Data.Magnet
 import Dodge.Item.Weapon.Bullet
 import Dodge.Data.Item
@@ -40,17 +41,10 @@ frontArmour =
         & itType .~ EQUIP FRONTARMOUR
 
 wristArmour :: Item
-wristArmour =
-    defaultEquipment
---        & itUse . uequipEffect . eeOnEquip .~ EonWristShield
---        & itUse . uequipEffect . eeUse .~ EWristShield
---        & itUse . uequipEffect . eeOnRemove .~ EoffWristShield
-        & itType .~ EQUIP WRISTARMOUR
+wristArmour = defaultEquipment & itType .~ EQUIP WRISTARMOUR
 
 batteryPack :: Item
-batteryPack =
-    defaultEquipment
---        & itUse . uequipEffect . eeUse .~ EDoNothing
+batteryPack = defaultEquipment
         & itConsumables
             .~ AmmoMag
                 { _magParams = NoAmmoParams

src/Dodge/Item/Info.hs

@@ -4,6 +4,7 @@ module Dodge.Item.Info (
     itemInfo,
 ) where
 
+import Dodge.Data.Equipment.Misc
 import Dodge.Data.EquipType
 import Dodge.Data.AimStance
 import Data.Char