Move toward data-ifying item SPics

src/Dodge/Combine/Graph.hs

@@ -43,13 +43,13 @@ bulletCombinations = filter
 
 maxShowX :: ItemBaseType -> Maybe Int
 maxShowX bt = case bt of
-    BANGSTICK _ -> Just 2
-    REVOLVERX _ -> Just 1
-    VOLLEYGUN _ -> Just 3
-    MINIGUNX  _ -> Just 3
-    GRAPECANNON _ -> Just 1
-    LAUNCHERX _ -> Just 2
-    LASWIDE _ -> Just 2
+    HELD (BANGSTICK _) -> Just 2
+    HELD (REVOLVERX _) -> Just 1
+    HELD (VOLLEYGUN _) -> Just 3
+    HELD (MINIGUNX  _) -> Just 3
+    HELD (GRAPECANNON _) -> Just 1
+    HELD (LAUNCHERX _) -> Just 2
+    HELD (LASWIDE _) -> Just 2
 --    LASGUNFOCUS _ -> Just 2
     _ -> Nothing
 
@@ -73,12 +73,12 @@ combinationsGraph = FGL.labnfilter (f . _unCombNode . snd)
     f (Left (CRAFT _)) = False
     f (Left bt) = case maxShowX bt of
         Nothing -> True
-        Just i -> _xNum bt <= i
+        Just i -> _xNum (_ibtHeld bt) <= i
 
 belowNumX :: ItemBaseType -> Bool
 belowNumX bt = case maxShowX bt of
     Nothing -> True
-    Just i -> _xNum bt <= i
+    Just i -> _xNum (_ibtHeld bt) <= i
 
 toCombNodeLabel :: CombNode -> String
 toCombNodeLabel (CombNode (Left ibt)) = show ibt