Cleanup combining code, flatten modules

src/Dodge/Item/Draw/SPic.hs

@@ -27,7 +27,7 @@ itemTreeSPic (LDT (itm, _) l r) =
 itemRotTreeSPic :: Item -> (ItemLink, LabelDoubleTree ItemLink ComposedItem) -> SPic
 itemRotTreeSPic par (il, t) = fromMaybe mempty $ do
     (p, q) <- _iatOrient il par (_iatType il) itm
-    return $ (translateSP p $ overPosSP (Q.rotate q) $ itemTreeSPic t)
+    return . translateSP p . overPosSP (Q.rotate q) $ itemTreeSPic t
   where
     itm = t ^. ldtValue . _1
 
@@ -178,22 +178,22 @@ heldItemSPic ht it = case ht of
     FORCEFIELDGUN -> defSPic
     TORCH -> noPic torchShape
     BANGSTICK i -> noPic $ baseStickShapeX it i -- <> addBullets it
-    PISTOL -> noPic $ baseStickShape
-    MACHINEPISTOL -> noPic $ baseStickShape
-    AUTOPISTOL -> noPic $ baseStickShape
-    SMG -> noPic $ baseSMGShape
+    PISTOL -> noPic baseStickShape
+    MACHINEPISTOL -> noPic baseStickShape
+    AUTOPISTOL -> noPic baseStickShape
+    SMG -> noPic baseSMGShape
     BANGCONE -> noPic $ bangConeShape 5
     BLUNDERBUSS -> noPic $ bangConeShape 20
     GRAPECANNON _ -> noPic $ bangConeShape 20
     MINIGUNX i -> miniGunXPictItem i it
     VOLLEYGUN i -> noPic $ volleyGunShape i -- <> addBullets it
     RIFLE -> noPic baseRifleShape -- <> addBullets it
-    AUTORIFLE -> noPic $ baseRifleShape
-    BURSTRIFLE -> noPic $ baseRifleShape
+    AUTORIFLE -> noPic baseRifleShape
+    BURSTRIFLE -> noPic baseRifleShape
     BANGROD -> noPic baseRodShape -- <> addBullets it
     ELEPHANTGUN -> noPic baseAMRShape -- <> addBullets it
-    AMR -> noPic $ baseAMRShape
-    AUTOAMR -> noPic $ baseAMRShape
+    AMR -> noPic baseAMRShape
+    AUTOAMR -> noPic baseAMRShape
     SNIPERRIFLE -> noPic baseAMRShape -- <> addBullets it
     --    MACHINEGUN -> noPic $ baseAMRShape <> addTinClip it
     FLAMESPITTER -> flamerPic it
@@ -360,11 +360,12 @@ teslaGunPic =
 
 lasGunPic :: Item -> SPic
 lasGunPic _ =
-    ( colorSH blue $
-        upperBoxST 4 (rectNESW 3 30 1 0)
+    colorSH
+        blue
+        ( upperBoxST 4 (rectNESW 3 30 1 0)
             <> upperBoxSU 4 (rectNESW (-1) 30 (-3) 0)
             <> upperBoxSU 1 (rectNESW 3 30 (-3) 0)
-    )
+        )
         :!: (setLayer BloomNoZWrite . color col . setDepth 1.1 . polygon $ rectNESW 1 30 (-1) 0)
   where
     --amFrac = fractionLoadedAmmo it