Commit before attempting to unify hammers for used items

src/Dodge/Combine/Combinations.hs

@@ -60,11 +60,11 @@ itemCombinations =
     , po [FLAMETHROWER,cr PUMP] flameTorrent
 
     , p [o $ cr PRISM,o $ cr TRANSFORMER,o $ cr PIPE] lasGun
-    , p [o LASGUN,o $ cr PRISM] lasSway
-    , p [o LASGUN,o $ cr HARDWARE] lasSwing
+--    , p [o LASGUN,o $ cr PRISM] lasSway
+--    , p [o LASGUN,o $ cr HARDWARE] lasSwing
 --    , p [o LASGUN,o PIPE] lasGunPulse
-    , p [o LASGUN,p 2 $ cr PIPE] lasDual
-    , p [o LASGUN,o $ cr PIPE, o $ cr PRISM] lasWidePulse
+    , p [p 2 LASGUN,p 1 $ cr HARDWARE] dualBeam
+--    , p [o LASGUN,o $ cr PIPE, o $ cr PRISM] lasWidePulse
     , p [o LASGUN,o $ cr TRANSFORMER] (lasGunWide 2)
 
     , p [o $ cr TRANSFORMER,p 2 $ cr CAN] sparkGun
@@ -145,7 +145,7 @@ moduleCombinations =
             ]
         )
     ,   ( ModDualBeam
-        ,   [lasDual]
+        ,   [dualBeam]
         ,   [amod [cr INCENDIARYMODULE] INCENDLAS
             ,amod [cr TRANSFORMER]      SPLITLAS
             ,amod [cr STATICMODULE]     STATICLAS

src/Dodge/Combine/Data.hs

@@ -109,11 +109,11 @@ data ItemBaseType
     | TESLAGUN
     | LASGUN
     | LASPULSE
-    | LASGUNDUAL
+    | DUALBEAM
     | LASGUNSWING
     | LASGUNSWAY
     | LASGUNWIDEPULSE
-    | LASGUNWIDE Int
+    | LASGUNWIDE {_xNum :: Int}
     | LASGUNFOCUS Int
     | SONICGUN
     | TRACTORGUN

src/Dodge/Combine/Graph.hs

@@ -49,7 +49,7 @@ maxShowX bt = case bt of
     MINIGUNX  _ -> Just 3
     GRAPECANNON _ -> Just 1
     LAUNCHERX _ -> Just 2
---    LASGUNWIDE _ -> Just 2
+    LASGUNWIDE _ -> Just 2
 --    LASGUNFOCUS _ -> Just 2
     _ -> Nothing
 
@@ -59,7 +59,7 @@ itemCombinationsEdges = concatMap (f . over _2 (_iyBase . _itType)) itemCombinat
   where
     f (abts,bt) 
         | bt `elem` bts = []
-        | any (not . belowNumX) bts = []
+        | (not . all belowNumX) bts = []
         | otherwise =  (CombNode $ Right abts,CombNode $  Left bt,0) :  map g abts
       where
         bts = map snd abts
@@ -96,7 +96,7 @@ myParams = defaultParams -- {globalAttributes = [GraphAttrs [RankDir FromLeft]]}
 --    & globalAttributesL .~ [GraphAttrs [RankDir FromLeft,Splines PolyLine]]
     & globalAttributesL .~ [GraphAttrs [RankDir FromLeft]]
     & clusterByL .~ clusterFunc
-    & isDotClusterL .~ (const False)
+    & isDotClusterL .~ const False
     & clusterIDL .~ setClusterID
     & fmtClusterL .~ clusterFormatting
     & fmtEdgeL .~ edgeFormatting