Remove _itInvColor

src/Dodge/Item/Craftable.hs

@@ -1,7 +1,6 @@
 module Dodge.Item.Craftable where
 
 import Dodge.Default.Item
-import Color
 import Control.Lens
 import Dodge.Data.Item
 
@@ -17,10 +16,7 @@ makeTypeCraft :: CraftType -> Item
 makeTypeCraft = makeTypeCraftNum 1
 
 energyBallCraft :: EnergyBallType -> Item
-energyBallCraft ebt = 
-    makeTypeCraft (ENERGYBALLCRAFT ebt)
-        & itInvSize .~ 1
-        & itInvColor .~ chartreuse
+energyBallCraft ebt = makeTypeCraft (ENERGYBALLCRAFT ebt) & itInvSize .~ 1
 
 incendiaryModule :: Item
 incendiaryModule = energyBallCraft IncBall
@@ -29,34 +25,21 @@ bulletBodyCraft :: BulletEffect -> Item
 bulletBodyCraft ebt = 
     makeTypeCraft (BULBODYCRAFT ebt)
         & itInvSize .~ 1
-        & itInvColor .~ chartreuse
 
 bounceModule :: Item
 bounceModule = bulletBodyCraft BounceBullet
 
 teleportModule :: Item
-teleportModule =
-    makeTypeCraft TELEPORTMODULE
-        & itInvSize .~ 1
-        & itInvColor .~ chartreuse
+teleportModule = makeTypeCraft TELEPORTMODULE & itInvSize .~ 1
 
 timeModule :: Item
-timeModule =
-    makeTypeCraft TIMEMODULE
-        & itInvSize .~ 1
-        & itInvColor .~ chartreuse
+timeModule = makeTypeCraft TIMEMODULE & itInvSize .~ 1
 
 sizeModule :: Item
-sizeModule =
-    makeTypeCraft SIZEMODULE
-        & itInvSize .~ 1
-        & itInvColor .~ chartreuse
+sizeModule = makeTypeCraft SIZEMODULE & itInvSize .~ 1
 
 gravityModule :: Item
-gravityModule =
-    makeTypeCraft GRAVITYMODULE
-        & itInvSize .~ 1
-        & itInvColor .~ chartreuse
+gravityModule = makeTypeCraft GRAVITYMODULE & itInvSize .~ 1
 
 pipe :: Item
 pipe = makeTypeCraft PIPE

src/Dodge/Item/Equipment.hs

@@ -127,14 +127,10 @@ powerLegs =
         & itType . iyBase .~ EQUIP POWERLEGS
 
 speedLegs :: Item
-speedLegs =
-    powerLegs
-        & itType . iyBase .~ EQUIP SPEEDLEGS
+speedLegs = powerLegs & itType . iyBase .~ EQUIP SPEEDLEGS
 
 jumpLegs :: Item
-jumpLegs =
-    powerLegs
-        & itType . iyBase .~ EQUIP JUMPLEGS
+jumpLegs = powerLegs & itType . iyBase .~ EQUIP JUMPLEGS
 
 wristInvisibility :: Item
 wristInvisibility =

src/Dodge/Item/Held/Cane.hs

@@ -55,7 +55,8 @@ rifle =
         & itUse . heldAim . aimStance .~ TwoHandUnder
         & itType . iyBase .~ HELD RIFLE
         & itUse . heldConsumption . laSource . _InternalSource . iaMax .~ 1
-        & itUse . heldConsumption . laSource . _InternalSource . iaCycle .~ [loadEject 5, loadInsert 5, loadPrime 5]
+        & itUse . heldConsumption . laSource . _InternalSource . iaCycle 
+            .~ [loadEject 5, loadInsert 5, loadPrime 5]
         & itUse . heldAim . aimWeight .~ 6
         & itUse . heldAim . aimRange .~ 1
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}

src/Dodge/Item/Held/Utility.hs

@@ -2,7 +2,6 @@ module Dodge.Item.Held.Utility where
 
 import Linear
 import Dodge.Default.Item
-import Color
 import Control.Lens
 import Dodge.Data.Item
 --import Geometry.Data
@@ -19,15 +18,10 @@ flatShield =
         & itType . iyBase .~ HELD FLATSHIELD
 
 keyCard :: Int -> Item
-keyCard n =
-    defaultHeldItem
-        & itInvColor .~ aquamarine
-        & itType . iyBase .~ HELD (KEYCARD n)
+keyCard n = defaultHeldItem & itType . iyBase .~ HELD (KEYCARD n)
 
 latchkey :: Int -> Item
-latchkey _ =
-    defaultHeldItem
-        & itInvColor .~ yellow
+latchkey _ = defaultHeldItem 
 
 binoculars :: Item
 binoculars =

src/Dodge/Item/Weapon/Utility.hs

@@ -10,7 +10,6 @@ module Dodge.Item.Weapon.Utility
 import Control.Lens
 import Dodge.Data.Item
 import Dodge.Default
-import Picture
 
 stopWatch :: Item
 stopWatch =
@@ -20,7 +19,6 @@ stopWatch =
                     & leftUse .~ LTimePause
                     & equipEffect . eeSite .~ GoesOnWrist
                )
-        & itInvColor .~ cyan
         & itEffect . ieInv .~ ChargeIfEquipped
         & itEffect . ieOnDrop .~ SetCharge 0
         & itType . iyBase .~ LEFT STOPWATCH
@@ -53,8 +51,7 @@ shrinkGun =
 blinkGun :: Item
 blinkGun =
     defaultLeftItem
-        { _itInvColor = cyan
-        , _itUse =
+        { _itUse =
             defaultLeftUse
                 & leftUse .~ LBlink --hammerCheckL (shootL $ const blinkAction)
                 & equipEffect . eeSite .~ GoesOnWrist