Add bangcone

src/Dodge/Combine.hs

@@ -5,7 +5,7 @@ import Dodge.Data
 --import Dodge.Combine.Data
 import Multiset
 import Dodge.Item.Weapon.BulletGuns
-import Dodge.Item.Craftable
+--import Dodge.Item.Craftable
 
 import Control.Lens
 import Data.Bifunctor
@@ -18,14 +18,19 @@ import Data.List (scanl')
 itemCombinations :: [ (M.Map CombineType Int, Item) ]
 itemCombinations = map (first toMultiset) $
     [ p [PIPE,HARDWARE] (bangStick 1)
-    , p [LONGPIPE,HARDWARE] bangCane
-    , p [VERYLONGPIPE,HARDWARE] bangRod
-    , p [PIPE,PIPE]     $ makeTypeCraft LONGPIPE
-    , p [LONGPIPE,PIPE] $ makeTypeCraft VERYLONGPIPE
+    , p [PIPE,PIPE,HARDWARE] bangCane
+    , p [PIPE,PIPE,PIPE,HARDWARE] bangRod
     , p [BANGSTICK 1,CAN] revolver
     , p [BANGSTICK 1,TIN] pistol
-    , p [PISTOL, SPRING, HARDWARE] ltAutoGun
+    , p [PISTOL, SPRING, HARDWARE] autoPistol
+    , p [AUTOPISTOL, PLANK, HARDWARE] smg
+    , p [AUTOPISTOL, HARDWARE] machinePistol
     , p [REVOLVER, SPRING, HARDWARE] $ revolverX 1
+    , p [PIPE,TUBE,HARDWARE] bangCone
+    , p [BANGCONE,PLANK] blunderbuss
+    , p [BANGCONE,PUMP,HARDWARE] $ grenadeLauncher 1
+    , p [GRENADELAUNCHER 1,MOTOR,DRUM] $ grenadeLauncher 2
+    , p [BLUNDERBUSS,TUBE] grapeShotCannon
     ] 
     ++ map (\i -> ([PIPE,BANGSTICK i],bangStick (i+1))) [1..8]
     ++ map (\i -> ([REVOLVERX i,CAN] ,revolverX (i+1))) [1..6]