Cleanup, work towards unifying spayguns

src/Dodge/Combine/Combinations.hs

@@ -50,12 +50,14 @@ itemCombinations =
 
     , p [p 3 PIPE,o HARDWARE] bangRod
     , po [BANGROD,PLANK,HARDWARE]  elephantGun
+    , po [ELEPHANTGUN,HARDWARE,PRISM] sniperRifle
     , po [ELEPHANTGUN,HARDWARE,TIN] amr
-    , po [ELEPHANTGUN,HARDWARE,CAN] sniperRifle
+    , po [AMR,HARDWARE,SPRING] autoAmr
     , po [BANGROD,PLATE,DRUM,MOTOR] machineGun
 
     , p [p 2 TUBE,o HARDWARE] launcher
-    , p [p 2 TUBE,o LAUNCHER] doubleLauncher
+    , p [p 2 TUBE,o LAUNCHER] (launcherX 2)
+    , p [p 2 TUBE,o $ LAUNCHERX 2] (launcherX 3)
     , po [TRANSMITTER,MINIDISPLAY,LAUNCHER] remoteLauncher
 
     , po [LIGHTER,PIPE,CAN]  flameStick
@@ -155,10 +157,7 @@ moduleCombinations =
     amod cts str func = (cts,ItemModule [str] 1 func)
 
 homingLaunchers :: [Item]
-homingLaunchers = 
-    [ launcher
-    , doubleLauncher
-    ]
+homingLaunchers = launcher : [launcherX i | i <- [2..3]]
 
 bulletWeapons :: [Item]
 bulletWeapons = [bangStick i | i <- [1..9] ]

src/Dodge/Combine/Data.hs

@@ -35,6 +35,7 @@ data CombineType
     | BANGROD
     | ELEPHANTGUN
     | AMR
+    | AUTOAMR
     | SNIPERRIFLE
     | MACHINEGUN
     | FLAMESTICK
@@ -50,7 +51,7 @@ data CombineType
     | SONICGUN
     | TRACTORGUN
     | LAUNCHER
-    | DOUBLELAUNCHER
+    | LAUNCHERX Int
 --    | TRACKINGLAUNCHER
     | REMOTELAUNCHER
     | SPRAYER