Further tweak bullet modules

src/Dodge/Data/Bullet.hs

@@ -53,6 +53,13 @@ data BulletTrajectory
     | MagnetTrajectory Point2
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
+data BulletTrajectoryType
+    = BasicBulletTrajectoryType
+    | BezierTrajectoryType
+    | FlechetteTrajectoryType
+    | MagnetTrajectoryType
+    deriving (Show, Eq, Ord, Read) --Generic, Flat)
+
 makeLenses ''Bullet
 makeLenses ''BulletSpawn
 deriveJSON defaultOptions ''EnergyBallType
@@ -60,4 +67,5 @@ deriveJSON defaultOptions ''BulletUpdateMod
 deriveJSON defaultOptions ''BulletEffect
 deriveJSON defaultOptions ''BulletSpawn
 deriveJSON defaultOptions ''BulletTrajectory
+deriveJSON defaultOptions ''BulletTrajectoryType
 deriveJSON defaultOptions ''Bullet

src/Dodge/Data/Item/Combine.hs

@@ -70,7 +70,7 @@ data CraftType
     | FRAGMODULE
     | FLASHMODULE
     | BULPAYLOADMODULE EnergyBallType
-    | BULBODYMODULE BulletEffect
+    | BULBODYCRAFT BulletEffect
     | TELEPORTMODULE
     | TIMEMODULE
     | SIZEMODULE
@@ -185,10 +185,8 @@ data ItemModuleType
     | MAGNETMAG
     | BULPAY EnergyBallType
     | BULBODY BulletEffect
+    | BULTRAJ BulletTrajectoryType
     | TARGET TargetType
-    | MAGNETTRAJ
-    | FLECHETRAJ
-    | BEZIERTRAJ
     | INCENDLAS
     | SPLITLAS
     | STATICLAS