Unify bullet creation

src/Dodge/Combine/Combinations.hs

@@ -10,7 +10,6 @@ import Dodge.Item.Weapon.BulletGuns
 import Dodge.Item.Weapon.BatteryGuns
 import Dodge.Item.Weapon.Launcher
 import Dodge.Item.Weapon.SprayGuns
-import Dodge.Item.Weapon.Bezier
 import Dodge.Item.Weapon.TriggerType
 import Dodge.Item.Weapon.ExtraEffect
 import Dodge.Base
@@ -41,7 +40,6 @@ itemCombinations =
     , po [BANGCANE,TIN] rifle
     , po [RIFLE,PLANK]  repeater
     , po [REPEATER,SPRING,HARDWARE] autoRifle
-    , po [AUTORIFLE,MICROCHIP,MAGNET] bezierGun
     , po [REPEATER,SPRING,CAN] burstRifle
     , po [BURSTRIFLE,SPRING,HARDWARE] fastBurstRifle
     , po [FASTBURSTRIFLE,SPRING,HARDWARE] completeBurstRifle
@@ -120,13 +118,12 @@ moduleCombinations =
         )
     ,   ( ModBulletTrajectory
         ,   bulletWeapons
-        ,   [amod [TELEPORTMODULE,MICROCHIP] "+TELEPORT" (itUse . useMods .:~ withPositionWallCheck (const . const mouseWorldPos))
-            ,amod [TELEPORTMODULE] "+DIRECTEDTELE" makeDirectedTele
+        ,   [amod [TELEPORTMODULE,MICROCHIP] "+DIRECTEDTELE" makeDirectedTele
             ,amod [MAGNET,MICROCHIP,HARDWARE] "+MAGNETTRAJECTORY" 
-                (itConsumption . aoType . amBulTraj .~ MagnetTrajectory)
+                ( (itConsumption . aoType . amBulTraj .~ MagnetTrajectory) )
             ,amod [MICROCHIP,HARDWARE] "+FLECHETTETRAJECTORY"
                 (itConsumption . aoType . amBulTraj .~ FlechetteTrajectory)
-            ,amod [MAGNET,AIUNIT,HARDWARE] "+BEZIERTRAJECTORY" 
+            ,amod [ANTIMATTER,HARDWARE] "+BEZIERTRAJECTORY" 
                 (itConsumption . aoType . amBulTraj .~ BezierTrajectory)
             ]
         )

src/Dodge/Combine/Data.hs

@@ -82,6 +82,7 @@ data CombineType
     | PRISM
     | LIGHTER
     | MAGNET
+    | ANTIMATTER
     | PLATE
     | MICROCHIP
     | AIUNIT