Cleanup

src/Dodge/Item/Equipment.hs

@@ -18,7 +18,7 @@ import Control.Lens
 
 magShield :: Item
 magShield = defaultEquipment
-    { _itCombineType = MAGSHIELD
+    { _itType = MAGSHIELD
     , _itName = "MAGSHIELD"
     , _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ polygon $ map toV2 [(-3,-3),(-3,3),(3,3),(3,-3)]
     , _itEquipPict = \_ _ -> (,) emptySH blank
@@ -26,7 +26,7 @@ magShield = defaultEquipment
     }
 flameShield :: Item 
 flameShield = defaultEquipment
-    { _itCombineType = FLAMESHIELD
+    { _itType = FLAMESHIELD
     , _itName = "FLAMESHIELD"
     , _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ polygon $ map toV2 [(-3,-3),(-3,3),(3,3),(3,-3)]
     , _itEquipPict = \cr _ -> (,) emptySH $ onLayer CrLayer $ pictures [color cyan $ circle (_crRad cr+2)]
@@ -35,7 +35,7 @@ flameShield = defaultEquipment
 {- | Slows you down, blocks forward projectiles. -}
 frontArmour :: Item
 frontArmour = defaultEquipment
-    { _itCombineType = FRONTARMOUR
+    { _itType = FRONTARMOUR
     , _itName = "FARMOUR"
     , _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ translate 0 (-5) $ pictures 
         [color (greyN 0.1) $ thickArc 0        (pi/2) 10 5
@@ -53,7 +53,7 @@ flatShield = defaultEquipment
     { _itEquipPict = pictureWeaponOnAim' flatShieldEquipSPic -- this will not work any more because the shield has no aim stance
     , _itEffect = effectOnOffEquip createShieldWall removeShieldWall
     , _itName   = "SHIELD"
-    , _itCombineType = FLATSHIELD
+    , _itType = FLATSHIELD
     }
 flatShieldEquipSPic :: Item -> SPic
 flatShieldEquipSPic _ = 
@@ -131,7 +131,7 @@ effectOnOffEquip f f' = ItInvEffectID
 {- | Increases speed, reduces friction, cannot only move forwards. -}
 jetPack :: Item
 jetPack = defaultEquipment
-    { _itCombineType = JETPACK
+    { _itType = JETPACK
     , _itName = "JETPACK"
     , _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ color yellow $ polygon $ map toV2 [(-3,-3),(-3,3),(3,3),(3,-3)]
     , _itEquipPict = \_ _ -> (,) emptySH $ onLayer CrLayer