Reorganise weapons

src/Dodge/Combine/Combinations.hs

@@ -3,6 +3,8 @@ module Dodge.Combine.Combinations where
 import Dodge.Data
 import Dodge.Item.Weapon.BulletGuns
 import Dodge.Item.Weapon.Launcher
+import Dodge.Item.Weapon.SprayGuns
+
 itemCombinations :: [([(Int,CombineType)],Item)]
 itemCombinations =
     [ po [PIPE, HARDWARE]             (bangStick 1)
@@ -24,7 +26,7 @@ itemCombinations =
     , po [BANGCANE,TIN] rifle
     , po [RIFLE,SPRING,HARDWARE] autoRifle
     , po [RIFLE,SPRING,CAN] assaultRifle
-    , po [BANGCANE,BANGCANE] miniGun
+    , po [MOTOR,BANGCANE,BANGCANE,BANGCANE] miniGun
 
     , p [p 3 PIPE,o HARDWARE] bangRod
     , po [BANGROD,PLANK,HARDWARE]  elephantGun
@@ -33,6 +35,11 @@ itemCombinations =
     , po [BANGROD,PLATE,DRUM,MOTOR] machineGun
 
     , p [p 3 TUBE,o HARDWARE] launcher
+
+    , po [LIGHTER,PIPE,CAN]  flameStick
+    , po [FLAMESTICK,CAN,PUMP] blowTorch
+    , po [FLAMESTICK,IRONBAR,DRUM] flameThrower
+    , po [FLAMESTICK,DRUM,DRUM] flameWall
     ] 
     ++ map (\i -> po [PIPE,BANGSTICK i] $ bangStick (i+1)) [1..8]
     ++ map (\i -> po [REVOLVERX i,CAN]  $ revolverX (i+1)) [1..5]

src/Dodge/Combine/Data.hs

@@ -30,6 +30,9 @@ data CombineType
     | AMR
     | SNIPERRIFLE
     | MACHINEGUN
+    | FLAMESTICK
+    | BLOWTORCH
+    | FLAMETHROWER
     | AUTOGUN
     | SPREADGUN
     | MULTGUN