Start unifying heldUse and heldMods

src/Dodge/Combine/Combinations.hs

@@ -89,7 +89,7 @@ itemCombinations =
            , p [o $ cr PRISM, o $ cr TRANSFORMER, o $ cr PIPE] lasGun
            , po [HELD LASGUN, HELD LASGUN, cr HARDWARE] dualBeam
            , po [HELD LASGUN, cr TRANSFORMER] (lasWide 2)
-           , po [HELD LASGUN, HELD LASGUN, HELD LASGUN, cr HARDWARE] lasCircle
+--           , po [HELD LASGUN, HELD LASGUN, HELD LASGUN, cr HARDWARE] lasCircle
            , p [o $ cr TRANSFORMER, p 2 $ cr CAN] sparkGun
            , p [o (HELD SPARKGUN), p 2 $ cr PIPE] teslaGun
            , p [o $ cr TELEPORTMODULE, p 2 $ cr MICROCHIP] blinkGun
@@ -201,13 +201,13 @@ moduleCombinations =
             , amod [cr (ENERGYBALLCRAFT TeslaBall)] STATICLAS
             ]
         )
-    ,
-        ( ModTeleport
-        , teleportableWeapons
-        ,
-            [ amod [cr TELEPORTMODULE, cr MICROCHIP] WEPTELE
-            ]
-        )
+--    ,
+--        ( ModTeleport
+--        , teleportableWeapons
+--        ,
+--            [ amod [cr TELEPORTMODULE, cr MICROCHIP] WEPTELE
+--            ]
+--        )
     ,
         ( ModLauncherHoming
         , homingLaunchers
@@ -224,17 +224,17 @@ moduleCombinations =
 homingLaunchers :: [Item]
 homingLaunchers = launcher : [launcherX i | i <- [2 .. 10]]
 
-batteryGuns :: [Item]
-batteryGuns =
-    [ teslaGun
-    , sparkGun
-    , lasGun
-    ]
-        ++ [ lasWide i | i <- [2 .. 10]
-           ]
+--batteryGuns :: [Item]
+--batteryGuns =
+--    [ teslaGun
+--    , sparkGun
+--    , lasGun
+--    ]
+--        ++ [ lasWide i | i <- [2 .. 10]
+--           ]
 
-teleportableWeapons :: [Item]
-teleportableWeapons = bulletWeapons ++ batteryGuns ++ homingLaunchers
+--teleportableWeapons :: [Item]
+--teleportableWeapons = bulletWeapons ++ batteryGuns ++ homingLaunchers
 
 bulletMagazines :: [Item]
 bulletMagazines =

src/Dodge/Combine/Module.hs

@@ -30,18 +30,17 @@ moduleModification imt = case imt of
     STATICLAS ->
         (itParams . lasBeam .~ BeamCombine TeslaBeamCombine)
             . (itParams . subParams ?~ teslaParams)
-    WEPTELE -> makeDirectedTele
+--    WEPTELE -> makeDirectedTele
     --LAUNCHHOME -> itUse . heldConsumption . laAmmoType . amPjCreation .~ CreateTrackingShell
     LAUNCHHOME -> id
     ATTACHTORCH -> id
   where
-    makeDirectedTele it =
-        it
---            & itUse . useTargeting ?~ TargetRBPress
-            & itUse . heldMods %~ ModWithDirectedTeleport -- .:~ withPosDirWallCheck directedTelPos
-            -- for the camera: the simplest option is to remove all zoom/offset
-            & itUse . heldAim . aimZoom . izFac .~ 1
-            & itUse . heldAim . aimRange .~ 0
+--    makeDirectedTele it =
+--        it
+--            & itUse . heldMods %~ ModWithDirectedTeleport -- .:~ withPosDirWallCheck directedTelPos
+--            -- for the camera: the simplest option is to remove all zoom/offset
+--            & itUse . heldAim . aimZoom . izFac .~ 1
+--            & itUse . heldAim . aimRange .~ 0
 
 -- a better option would be to involve a "scope" centered on the firing
 -- position