Return to project, unsure about changes

src/Dodge/Item/Display.hs

@@ -1,7 +1,7 @@
 module Dodge.Item.Display (
     --itemDisplay,
     itemDisplayOffset,
-    canAttachTargetingBelow,
+    canAttachTargeting,
     --    selectedItemDisplay,
     itemString,
     itemBaseName,
@@ -20,34 +20,29 @@ import Padding
 
 itemDisplayOffset :: Creature -> Item -> (Int, [String])
 itemDisplayOffset cr itm = case itm ^. itType . iyBase of
-    EQUIP (TARGETINGHAT tt)
-        | targetItemCanAttachAbove cr itm ->
-            ( -1
-            , leftPad 15 ' ' (targetingTypeString tt) :
-              (itemDisplay cr itm & ix 0 %~ (\s -> itemDisplayPad s (replicate (length (targetingTypeString tt)) '^')))
-            )
-    EQUIP (TARGETINGHAT tt) ->
-        (0, itemDisplay cr itm & ix 0 %~ (\s -> itemDisplayPad s (targetingTypeString tt)))
+--    EQUIP (TARGETINGHAT tt)
+--        | targetItemCanAttachAbove cr itm ->
+--            ( -1
+--            , leftPad 15 ' ' (targetingTypeString tt) :
+--              (itemDisplay cr itm & ix 0 %~ (\s -> itemDisplayPad s (replicate (length (targetingTypeString tt)) '^')))
+--            )
+--    EQUIP (TARGETINGHAT tt) ->
+--        (0, itemDisplay cr itm & ix 0 %~ (\s -> itemDisplayPad s (targetingTypeString tt)))
     _ -> (0, itemDisplay cr itm)
 
-targetItemCanAttachAbove :: Creature -> Item -> Bool
-targetItemCanAttachAbove cr itm = fromMaybe False $ do
-    i <- itm ^? itLocation . ipInvID
-    itm' <- cr ^? crInv . ix (i - 1)
-    return $ canAttachTargetingBelow itm'
-
-canAttachTargetingBelow :: Item -> Bool
-canAttachTargetingBelow itm =
+canAttachTargeting :: TargetType -> Item -> Bool
+canAttachTargeting TARGETLASER _ = True
+canAttachTargeting _ itm =
     isJust (itm ^? itType . iyModules . ix ModBulletTrajectory . imtBulletTrajectoryType)
         || Just LAUNCHHOME == (itm ^? itType . iyModules . ix ModLauncherHoming)
 
-targetingTypeString :: TargetType -> String
-targetingTypeString tt = case tt of
-    TargetLaser -> "LASER"
-    TargetRBPress -> "POS"
-    TargetRBLine -> ""
-    TargetRBCreature -> "LIFEFORM"
-    TargetCursor -> "CURSOR"
+--targetingTypeString :: TargetType -> String
+--targetingTypeString tt = case tt of
+--    TARGETLASER -> "LASER"
+--    TargetRBPress -> "POS"
+--    TargetRBLine -> ""
+--    TargetRBCreature -> "LIFEFORM"
+--    TargetCursor -> "CURSOR"
 
 itemDisplay :: Creature -> Item -> [String]
 itemDisplay cr itm =