Move towards positional item targeting

src/Dodge/Data/Item/Combine.hs

@@ -191,7 +191,7 @@ data ItemModuleType
     | BULPAY BulletSpawn
     | BULBODY BulletEffect
     | BULTRAJ BulletTrajectoryType
-    | TARGET TargetType
+    | TARGET {_imtTargetType :: TargetType}
     | INCENDLAS
     | SPLITLAS
     | STATICLAS
@@ -224,6 +224,7 @@ data ModuleSlot
 makeLenses ''ItemType
 makeLenses ''ItemBaseType
 makeLenses ''HeldItemType
+makeLenses ''ItemModuleType
 deriveJSON defaultOptions ''Stack
 deriveJSON defaultOptions ''CraftType
 deriveJSON defaultOptions ''ConsumableItemType

src/Dodge/Data/Item/Use.hs

@@ -34,7 +34,7 @@ data ItemUse
         , _heldAim :: AimParams
         , _heldScroll :: HeldScroll
         , _heldConsumption :: HeldConsumption
-        , _useTargeting :: Maybe TargetType
+--        , _useTargeting :: Maybe TargetType
         }
     | LeftUse
         { _leftUse :: Luse
@@ -49,7 +49,7 @@ data ItemUse
         }
     | EquipUse
         { _equipEffect :: EquipEffect
-        , _useTargeting :: Maybe TargetType
+        , _equipTargeting :: Maybe TargetType
         }
     | CraftUse
         {_useAmount :: ItAmount}