Commit before partial cleanup, continue weapon effect refactor

src/Dodge/Data/Item/Combine.hs

@@ -98,6 +98,8 @@ data AttachType
     = SCROLLATTACH ScrollAttachType
     | TARGETATTACH {_ibtAttachTarget :: TargetType}
     | BULLETSYNTHESIZER
+    | ROCKETHOMER
+    | ROCKETREMOTESCREEN
 --    | BULPAYLOADATTACH
 --    | BULTRAJECTORYATTACH
     deriving (Eq, Ord, Show, Read)
@@ -178,7 +180,7 @@ data HeldItemType
     | AMR
     | AUTOAMR
     | SNIPERRIFLE
-    | MACHINEGUN
+--    | MACHINEGUN
     | FLAMESPITTER
     | FLAMETHROWER
     | FLAMETORRENT
@@ -188,8 +190,8 @@ data HeldItemType
     | TESLAGUN
     | LASGUN
 --    | LASCIRCLE
-    | DUALBEAM
-    | LASWIDE {_xNum :: Int}
+--    | DUALBEAM
+--    | LASWIDE {_xNum :: Int}
     | TRACTORGUN
     | LAUNCHER
     | LAUNCHERX {_xNum :: Int}