Tweak module display and logic

src/Dodge/Data/Bullet.hs

@@ -43,7 +43,7 @@ data BulletEffect
     | PenetrateBullet
     deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
 
-data BulletSpawn = BulBall EnergyBallType | BulSpark
+data BulletSpawn = BulBall {_spawnEBT :: EnergyBallType} | BulSpark
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 data BulletTrajectory
@@ -54,6 +54,7 @@ data BulletTrajectory
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 makeLenses ''Bullet
+makeLenses ''BulletSpawn
 deriveJSON defaultOptions ''EnergyBallType
 deriveJSON defaultOptions ''BulletUpdateMod
 deriveJSON defaultOptions ''BulletEffect

src/Dodge/Data/Equipment/Misc.hs

@@ -14,7 +14,6 @@ data EquipSite
     | GoesOnBack
     | GoesOnWrist
     | GoesOnLegs
-    | GoesOnSpecial
     deriving (Eq,Ord,Show,Read)
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 

src/Dodge/Data/Item/Combine.hs

@@ -67,13 +67,10 @@ data CraftType
     | BATTERY
     | FUELCELL
     | PORTABLEFUSION
-    | INCENDIARYMODULE
-    | STATICMODULE
-    | CONCUSSMODULE
     | FRAGMODULE
     | FLASHMODULE
-    | BOUNCEMODULE
-    | PENMODULE
+    | BULPAYLOADMODULE EnergyBallType
+    | BULBODYMODULE BulletEffect
     | TELEPORTMODULE
     | TIMEMODULE
     | SIZEMODULE
@@ -186,11 +183,8 @@ data ItemModuleType
     | DRUMMAG
     | BELTMAG
     | MAGNETMAG
-    | INCENDBUL
-    | BOUNCEBUL
-    | PENBUL
-    | STATICBUL
-    | CONCUSBUL
+    | BULPAY EnergyBallType
+    | BULBODY BulletEffect
     | TARGET TargetType
     | MAGNETTRAJ
     | FLECHETRAJ