Cleanup

src/Dodge/Item/Scope.hs

@@ -15,23 +15,19 @@ import Dodge.Data.Item
 import Dodge.Default.Item
 
 zoomScope :: Item
-zoomScope =
-    defaultHeldItem
-        & itType . iyBase .~ ATTACH ZOOMSCOPE
---        & itUse .~ AttachUse (ScrollAttachParams (ZoomScrollParams{_opticPos = 0, _opticZoom = 1, _opticDefaultZoom = 0.5}))
-        & itUse .~ ScopeUse OpticScope{_opticPos = 0, _opticZoom = 1, _opticDefaultZoom = 0.5}
+zoomScope = defaultHeldItem
+    & itType .~ ATTACH ZOOMSCOPE
+    & itUse .~ ScopeUse OpticScope{_opticPos = 0, _opticZoom = 1, _opticDefaultZoom = 0.5}
 
 targetingScope :: TargetingType -> Item
-targetingScope tt =
-    defaultHeldItem
-        & itType . iyBase .~ TARGETING tt
-        & itUse .~ TargetingUse Nothing Nothing False
+targetingScope tt = defaultHeldItem
+    & itType .~ TARGETING tt
+    & itUse .~ TargetingUse Nothing Nothing False
 
 homingModule :: Item
-homingModule =
-    defaultHeldItem
-        & itType . iyBase .~ ATTACH HOMINGMODULE
-        & itUse .~ AttachUse Nothing
+homingModule = defaultHeldItem
+     & itType .~ ATTACH HOMINGMODULE
+     & itUse .~ AttachUse Nothing
 
 fletchingModule :: Item
 fletchingModule = bulletTargetingModule FlechetteTrajectoryType
@@ -39,7 +35,7 @@ fletchingModule = bulletTargetingModule FlechetteTrajectoryType
 bulletModule :: BulletMod -> Item
 bulletModule bm =
     defaultHeldItem
-        & itType . iyBase .~ BULLETMOD bm
+        & itType .~ BULLETMOD bm
         & itUse .~ BulletModUse bm
 
 bulletTargetingModule :: BulletTrajectoryType -> Item
@@ -50,11 +46,11 @@ bulletPayloadModule = bulletModule . BulletModPayload
 
 augmentedHUD :: Item
 augmentedHUD = defaultHeldItem
-        & itType . iyBase .~ ATTACH AUGMENTEDHUD
+        & itType .~ ATTACH AUGMENTEDHUD
         & itUse .~ AttachUse Nothing
 
 remoteScreen :: Item
 remoteScreen =
     defaultHeldItem
-        & itType . iyBase .~ ATTACH REMOTESCREEN
+        & itType .~ ATTACH REMOTESCREEN
         & itUse .~ AttachUse Nothing