Cleanup

src/Dodge/Combine.hs

@@ -13,6 +13,7 @@ import Dodge.Data
 import Dodge.Item.Amount
 import Dodge.Inventory.ItemSpace
 import Dodge.Combine.Module
+import Dodge.Module
 --import Dodge.Combine.Data
 import Multiset
 import SimpleTrie
@@ -80,7 +81,7 @@ addModules (ps,it) = (is , (applyModules newm it, ss))
 applyModules :: M.Map ModuleSlot ItemModuleType -> Item -> Item
 applyModules ms it = foldr f (it & itType . iyModules .~ ms) ms
   where
-    f m = fromMaybe id (fromModuleType m ^? modModification)
+    f m = moduleModification m
 --    (is , ) <$> [ (it & itModules .~ themodules,s) | (themodules,s) <- combinedmodules]
 --  where
 --    (ms,is) = unzip ps
@@ -104,7 +105,7 @@ combineModules = mergeA
         = ("WARNING:REMOVES":ss im1,im2)
     h _ _ im | im /= EMPTYMODULE = ([],im)
     h _ im _ = ([],im)
-    ss imt = _modName $ fromModuleType imt
+    ss imt = [moduleName imt]
 
 toggleCombineInv :: World -> World
 toggleCombineInv w = case _hudElement (_hud w) of