Develop laser upgrade path slightly

src/Dodge/Combine/Combinations.hs

@@ -67,6 +67,7 @@ itemCombinations =
     , po [FLAMETHROWER,PUMP] flameTorrent
 
     , p [o PRISM,o TRANSFORMER,o PIPE] lasGun
+    , p [o LASGUN,o TRANSFORMER,o PRISM] (lasGunWide 2)
 
     , p [o TRANSFORMER,p 2 CAN] sparkGun
     , p [o SPARKGUN,p 2 PIPE] teslaGun
@@ -79,6 +80,8 @@ itemCombinations =
 
     , p [p 2 PLATE] flatShield
     ] 
+    ++ map (\i -> po [LASGUNWIDE i,TRANSFORMER,PRISM] $ lasGunWide (i+1)) [1..9]
+    ++ map (\i -> po [LASGUNWIDE i,HARDWARE] $ lasGunFocus (i)) [1..10]
     ++ map (\i -> po [PIPE,BANGSTICK i] $ bangStick (i+1)) [1..8]
     ++ map (\i -> po [REVOLVERX i,CAN]  $ revolverX (i+1)) [1..5]
     ++ map (\i -> p [o (BANGCANEX i),p 2 PIPE] $ bangCaneX (i+1)) [1..5]
@@ -147,6 +150,11 @@ moduleCombinations =
                 (itConsumption . aoType . amPjCreation .~ fireTrackingShell)
             ]
         )
+    ,   ( ModBattery
+        , batteryGuns
+        ,   [amod [BATTERY] "+BATTERY" (itConsumption . ammoBaseMax +~ 1000)
+            ]
+        )
     ]
   where
     makeDirectedTele it = it 
@@ -167,6 +175,16 @@ moduleCombinations =
 homingLaunchers :: [Item]
 homingLaunchers = launcher : [launcherX i | i <- [2..10]]
 
+batteryGuns :: [Item]
+batteryGuns =
+    [ teslaGun
+    , sparkGun
+    , lasGun
+    ] ++ 
+    [ lasGunWide i | i <- [1..10]
+    ] ++
+    [ lasGunFocus i | i <- [1..10]]
+
 bulletWeapons :: [Item]
 bulletWeapons = [bangStick i | i <- [1..9] ]
     ++ [bangCaneX i | i <- [1..6] ]

src/Dodge/Combine/Data.hs

@@ -50,6 +50,8 @@ data CombineType
     | SPARKGUN
     | TESLAGUN
     | LASGUN
+    | LASGUNWIDE Int
+    | LASGUNFOCUS Int
     | SONICGUN
     | TRACTORGUN
     | LAUNCHER