Tweak tesla gun

src/Dodge/Combine/Combinations.hs

@@ -7,12 +7,7 @@ import Dodge.Particle.HitEffect.ExpireAndDamage
 import Dodge.Particle.Damage
 import Dodge.Item.Equipment
 import Dodge.Item.Craftable
-import Dodge.Item.Weapon.BulletGuns
-import Dodge.Item.Weapon.BatteryGuns
-import Dodge.Item.Weapon.Launcher
-import Dodge.Item.Weapon.SprayGuns
-import Dodge.Item.Weapon.TriggerType
-import Dodge.Item.Weapon.ExtraEffect
+import Dodge.Item.Weapon
 import Dodge.Base
 import LensHelp
 
@@ -77,6 +72,8 @@ itemCombinations =
     , p [o TRANSFORMER,p 2 CAN] sparkGun
     , p [o SPARKGUN,p 2 PIPE] teslaGun
 
+    , p [o TELEPORTMODULE,p 2 MICROCHIP] blinkGun
+
     , po [MAGNET,TIN] magShield
 
     , p [p 4 CAN] plateCraft
@@ -138,8 +135,7 @@ moduleCombinations =
         )
     ,   ( ModBulletTrajectory
         ,   bulletWeapons
-        ,   [amod [TELEPORTMODULE,MICROCHIP] "+DIRECTEDTELE" makeDirectedTele
-            ,amod [MAGNET,MICROCHIP,HARDWARE] "+MAGNETTRAJECTORY" 
+        ,   [amod [MAGNET,MICROCHIP,HARDWARE] "+MAGNETTRAJECTORY" 
                 ( (itConsumption . aoType . amBulTraj .~ MagnetTrajectory) 
                 . (itConsumption . aoType . amBulVel  .~ V2 10 0)
                 )
@@ -149,6 +145,18 @@ moduleCombinations =
                 (itConsumption . aoType . amBulTraj .~ BezierTrajectory)
             ]
         )
+    ,   ( ModDualBeam
+        ,   [lasGunDual]
+        ,   [amod [INCENDIARYMODULE] "+INCENDIARY" (itParams . lasBeam .~ BeamCombine flameBeamCombine)
+            ,amod [STATICMODULE]     "+STATIC" (itParams . lasBeam .~ BeamCombine teslaBeamCombine)
+            ,amod [TRANSFORMER]      "+SPLIT"  (itParams . lasBeam .~ BeamCombine splitBeamCombine)
+            ]
+        )
+    ,   ( ModTeleport
+        ,   teleportableWeapons
+        ,   [amod [TELEPORTMODULE,MICROCHIP] "+DIRECTEDTELE" makeDirectedTele
+            ]
+        )
     ,   ( ModLauncherHoming
         ,   homingLaunchers
         ,   [ amod [MICROCHIP,TRANSMITTER] "+TARGET HOMING" 
@@ -192,6 +200,9 @@ batteryGuns =
     ] ++
     [ lasGunFocus i | i <- [1..10]]
 
+teleportableWeapons :: [Item]
+teleportableWeapons  = bulletWeapons ++ batteryGuns ++ homingLaunchers
+
 bulletWeapons :: [Item]
 bulletWeapons = [bangStick i | i <- [1..9] ]
     ++ [bangCaneX i | i <- [1..6] ]