Add new bullet trajectories

src/Dodge/Combine/Combinations.hs

@@ -111,10 +111,23 @@ moduleCombinations =
             ,amod [BOUNCEMODULE]     "+BOUNCE"     (f $ destroyOnImpact bulBounceArmCr' bulBounceWall)
             ]
         )
-    ,   ( ModBulletTarget
+    ,   ( ModTarget
         , launcher : bulletWeapons
+        ,   [amod [MICROCHIP,CREATURESENSOR] "+CREATURETARGETING" (itTargeting .~ targetRBCreature)
+            ,amod [MICROCHIP,PRISM] "+LASERTARGETING" (itTargeting .~ targetLaser)
+            ,amod [MICROCHIP,TIN] "+POSTIONALTARGETING" (itTargeting .~ targetRBPress)
+            ]
+        )
+    ,   ( ModBulletTrajectory
+        ,   bulletWeapons
         ,   [amod [TELEPORTMODULE,MICROCHIP] "+TELEPORT" (itUse . useMods .:~ withPositionWallCheck (const . const mouseWorldPos))
             ,amod [TELEPORTMODULE] "+DIRECTEDTELE" makeDirectedTele
+            ,amod [MAGNET,MICROCHIP,HARDWARE] "+MAGNETTRAJECTORY" 
+                (itConsumption . aoType . amBulTraj .~ MagnetTrajectory)
+            ,amod [MICROCHIP,HARDWARE] "+FLECHETTETRAJECTORY"
+                (itConsumption . aoType . amBulTraj .~ FlechetteTrajectory)
+            ,amod [MAGNET,AIUNIT,HARDWARE] "+BEZIERTRAJECTORY" 
+                (itConsumption . aoType . amBulTraj .~ BezierTrajectory)
             ]
         )
     ]
@@ -136,19 +149,19 @@ moduleCombinations =
 
 bulletWeapons :: [Item]
 bulletWeapons = [bangStick i | i <- [1..9] ]
-            ++ [bangCaneX i | i <- [1..6] ]
-            ++ [revolverX i | i <- [1..5] ]
-            ++ [miniGunX i   | i <- [3..16] ]
-            ++ [bangCane
-            ,pistol
-            ,autoPistol
-            ,smg
-            ,machinePistol
-            ,revolver
-            ,rifle
-            ,repeater
-            ,autoRifle
-            ,burstRifle
-            ,fastBurstRifle
-            ,completeBurstRifle
-            ]
+    ++ [bangCaneX i | i <- [1..6] ]
+    ++ [revolverX i | i <- [1..5] ]
+    ++ [miniGunX  i | i <- [3..16] ]
+    ++ [bangCane
+    ,pistol
+    ,autoPistol
+    ,smg
+    ,machinePistol
+    ,revolver
+    ,rifle
+    ,repeater
+    ,autoRifle
+    ,burstRifle
+    ,fastBurstRifle
+    ,completeBurstRifle
+    ]

src/Dodge/Combine/Data.hs

@@ -84,11 +84,14 @@ data CombineType
     | MAGNET
     | PLATE
     | MICROCHIP
+    | AIUNIT
     | LED
     | NAILBOX
     | IRONBAR
     | LIGHTSENSOR
     | SOUNDSENSOR
+    | HEATSENSOR
+    | CREATURESENSOR
     | COPPERWIRE
     | BATTERY
     | FUELCELL