Cleanup

src/Dodge/Module.hs

@@ -20,33 +20,31 @@ moduleSize imt = case imt of
     EMPTYMODULE -> 0
     _ -> 1
 
---moduleStrings :: Item -> [String]
---moduleStrings = moduleFold (++) (^? modName) []
 moduleStrings :: Item -> [String]
-moduleStrings = map moduleName . M.elems . _iyModules . _itType
+moduleStrings = M.elems . M.mapMaybe moduleName . _iyModules . _itType
 
-moduleName :: ItemModuleType -> String
+moduleName :: ItemModuleType -> Maybe String
 moduleName imt = case imt of
-    EMPTYMODULE -> ""
-    DRUMMAG     -> "+DRUM MAG"
-    BELTMAG     -> "+BELT FEED"
-    MAGNETMAG   -> "+MAGNET FEED"
-    INCENDBUL   -> "+INCENDIARY"
-    BOUNCEBUL   -> "+BOUNCE"
-    STATICBUL   -> "+STATIC"
-    CONCUSBUL   -> "+CONCUSS"
-    TARGCR      -> "+CREATURETARGETING"
-    TARGLAS     -> "+LASERTARGETING"
-    TARGPOS     -> "+POSTIONALTARGETING"
-    MAGNETTRAJ  -> "+MAGNETTRAJECTORY" 
-    FLECHETRAJ  -> "+FLECHETTETRAJECTORY"
-    BEZIERTRAJ  -> "+BEZIERTRAJECTORY" 
-    INCENDLAS   -> "+INCENDIARY"
-    SPLITLAS    -> "+SPLIT"
-    STATICLAS   -> "+STATIC" 
-    WEPTELE     -> "+DIRECTEDTELE"
-    LAUNCHHOME  -> "+TARGET HOMING"
-    EXTRABATTERY -> "+BATTERY"
+    EMPTYMODULE -> Nothing
+    DRUMMAG     -> Just "+DRUM MAG"
+    BELTMAG     -> Just "+BELT FEED"
+    MAGNETMAG   -> Just "+MAGNET FEED"
+    INCENDBUL   -> Just "+INCENDIARY"
+    BOUNCEBUL   -> Just "+BOUNCE"
+    STATICBUL   -> Just "+STATIC"
+    CONCUSBUL   -> Just "+CONCUSS"
+    TARGCR      -> Just "+CREATURETARGETING"
+    TARGLAS     -> Just "+LASERTARGETING"
+    TARGPOS     -> Just "+POSTIONALTARGETING"
+    MAGNETTRAJ  -> Just "+MAGNETTRAJECTORY" 
+    FLECHETRAJ  -> Just "+FLECHETTETRAJECTORY"
+    BEZIERTRAJ  -> Just "+BEZIERTRAJECTORY" 
+    INCENDLAS   -> Just "+INCENDIARY"
+    SPLITLAS    -> Just "+SPLIT"
+    STATICLAS   -> Just "+STATIC" 
+    WEPTELE     -> Just "+DIRECTEDTELE"
+    LAUNCHHOME  -> Just "+TARGET HOMING"
+    EXTRABATTERY -> Just "+BATTERY"
 
 --moduleFold :: (m -> m -> m) -> (ItemModule -> Maybe m) -> m -> Item -> m
 --moduleFold g f e = foldr (g . fromMaybe e . f) e