Commit before moving to external weapon magazines

src/Dodge/Item/Display.hs

@@ -2,7 +2,7 @@ module Dodge.Item.Display (
     --itemDisplay,
     itemDisplayOffset,
     canAttachTargetingBelow,
---    selectedItemDisplay,
+    --    selectedItemDisplay,
     itemString,
     itemBaseName,
     basicItemDisplay,
@@ -10,21 +10,24 @@ module Dodge.Item.Display (
 
 import Control.Applicative
 import Control.Monad
-import Dodge.Item.Info
 import Data.Maybe
 import Dodge.Data.Creature
+import Dodge.Item.Info
 import Dodge.Item.SlotsTaken
 import Dodge.Module
 import LensHelp
 import Padding
 
-itemDisplayOffset :: Creature -> Item -> (Int,[String])
+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
@@ -34,7 +37,7 @@ targetItemCanAttachAbove cr itm = fromMaybe False $ do
     return $ canAttachTargetingBelow itm'
 
 canAttachTargetingBelow :: Item -> Bool
-canAttachTargetingBelow itm = 
+canAttachTargetingBelow itm =
     isJust (itm ^? itType . iyModules . ix ModBulletTrajectory . imtBulletTrajectoryType)
         || Just LAUNCHHOME == (itm ^? itType . iyModules . ix ModLauncherHoming)
 
@@ -45,11 +48,10 @@ targetingTypeString tt = case tt of
     TargetRBLine -> ""
     TargetRBCreature -> "LIFEFORM"
     TargetCursor -> "CURSOR"
-    
-    
 
 itemDisplay :: Creature -> Item -> [String]
-itemDisplay cr itm = --itemDisplayWithNumber (showConsumption cr it) it
+itemDisplay cr itm =
+    --itemDisplayWithNumber (showConsumption cr it) it
     zipWithDefaults id (leftPad 15 ' ') itemDisplayPad (basicItemDisplay itm) (itemNumberDisplay cr itm)
 
 zipWithDefaults :: (a -> c) -> (b -> c) -> (a -> b -> c) -> [a] -> [b] -> [c]
@@ -57,18 +59,17 @@ zipWithDefaults f g h = go
   where
     go [] bs = map g bs
     go as [] = map f as
-    go (a:as) (b:bs) = h a b : go as bs
-
+    go (a : as) (b : bs) = h a b : go as bs
 
 itemDisplayPad :: [Char] -> String -> [Char]
 itemDisplayPad ls rs
     | rs == "" = ls
-    | otherwise = midPadL 15 ' ' ls (' ':rs)
+    | otherwise = midPadL 15 ' ' ls (' ' : rs)
 
 basicItemDisplay :: Item -> [String]
 basicItemDisplay itm =
     Prelude.take (itSlotsTaken itm) $
-        itemBaseName itm  :
+        itemBaseName itm :
         catMaybes [maybeWarmupStatus itm, maybeRateStatus itm]
             ++ moduleStrings itm
             ++ repeat "*"
@@ -85,6 +86,7 @@ itemBaseName it = case _iyBase $ _itType it of
         Nothing -> show hit
     LEFT lit -> show lit
     EQUIP eit -> showEquipItem eit
+    AMMO ait -> show ait
     Consumable cit -> show cit
 
 showEquipItem :: EquipItemType -> String
@@ -125,8 +127,8 @@ itemNumberDisplay cr itm = case iu of
 showEquipmentNumber :: Creature -> Item -> [String]
 showEquipmentNumber cr itm = case _eeUse ee of
     EFuelSource x _ -> [show x]
-    EAmmoSource {} -> showAmmoSource cr itm
-    EBatterySource {_euseBatteryAmount = x} -> [show x]
+    EAmmoSource{} -> showAmmoSource cr itm
+    EBatterySource{_euseBatteryAmount = x} -> [show x]
     _ -> [""]
   where
     ee = itm ^?! itUse . equipEffect
@@ -137,11 +139,13 @@ showAmmoSource cr itm = fromMaybe ["FAIL"] $ do
     atype <- eu ^? euseAmmoSourceType
     x <- fmap showIntKMG' $ eu ^? euseAmmoAmount
     i <- itm ^? itLocation . ipInvID
-    (do 
-        at' <- cr ^? crInv . ix (i + 1) . itUse . heldConsumption . laSourceType
-        as <-  cr ^? crInv . ix (i + 1) . itUse . heldConsumption . laSource
-        guard (at' == atype && as == AboveSource)
-        return ["vvvv",x] ) <|> Just [x]
+    ( do
+            at' <- cr ^? crInv . ix (i + 1) . itUse . heldConsumption . laSourceType
+            as <- cr ^? crInv . ix (i + 1) . itUse . heldConsumption . laSource
+            guard (at' == atype && as == AboveSource)
+            return ["vvvv", x]
+        )
+        <|> Just [x]
 
 showReloadProgress :: Creature -> Item -> String
 showReloadProgress cr itm = case ic ^? laSource of

src/Dodge/Item/Draw/SPic.hs

@@ -23,6 +23,7 @@ itemSPic it =
         HELD ht -> heldItemSPic ht it
         LEFT lt -> leftItemSPic lt it
         EQUIP et -> equipItemSPic et it
+        AMMO {} -> defSPic
         Consumable{} -> defSPic
 
 equipItemSPic :: EquipItemType -> Item -> SPic