Cleanup, fix broken records in LeftUse

src/Dodge/Item/Equipment.hs

@@ -28,95 +28,86 @@ magShield :: Item
 magShield =
     defaultEquipment
         & itParams .~ MagShieldParams Nothing
-        & itUse . equipEffect . eeUse .~ EMagShield
-        & itUse . equipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeUse .~ EMagShield
+        & itUse . uequipEffect . eeSite .~ GoesOnWrist
         & itType .~ EQUIP MAGSHIELD
 
 flameShield :: Item
 flameShield =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnChest
+        & itUse . uequipEffect . eeSite .~ GoesOnChest
         & itType .~ EQUIP FLAMESHIELD
 
 frontArmour :: Item
 frontArmour =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnChest
+        & itUse . uequipEffect . eeSite .~ GoesOnChest
         & itType .~ EQUIP FRONTARMOUR
 
 wristArmour :: Item
 wristArmour =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnWrist
-        & itUse . equipEffect . eeOnEquip .~ EonWristShield
-        & itUse . equipEffect . eeUse .~ EWristShield
-        & itUse . equipEffect . eeOnRemove .~ EoffWristShield
+        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeOnEquip .~ EonWristShield
+        & itUse . uequipEffect . eeUse .~ EWristShield
+        & itUse . uequipEffect . eeOnRemove .~ EoffWristShield
         & itType .~ EQUIP WRISTARMOUR
 
 batteryPack :: Item
 batteryPack =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeAttachPos .~ V3 (-8) 0 10
+        & itUse . uequipEffect . eeUse .~ EBatterySource 10000 10000
         & itType .~ EQUIP BATTERYPACK
-        & itUse . equipEffect . eeAttachPos .~ V3 (-8) 0 10
-        & itUse . equipEffect . eeUse .~ EBatterySource 10000 10000
 
 fuelPack :: Item
 fuelPack =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
+        & itUse . uequipEffect . eeUse .~ EFuelSource 10000 10000
         & itType .~ EQUIP FUELPACK
-        & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
-        & itUse . equipEffect . eeUse .~ EFuelSource 10000 10000
 
 bulletBeltPack :: Item
 bulletBeltPack =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
+        & itUse . uequipEffect . eeUse .~ EAmmoSource 2000 2000 Nothing
         & itType .~ EQUIP BULLETBELTPACK
-        & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
-        & itUse . equipEffect . eeUse .~ EAmmoSource 2000 2000 --BulletSource 
-            Nothing
 
 bulletBeltBracer :: Item
 bulletBeltBracer =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
+        & itUse . uequipEffect . eeUse .~ EAmmoSource 100 100 Nothing
         & itType .~ EQUIP BULLETBELTBRACER
-        & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
-        & itUse . equipEffect . eeUse .~ EAmmoSource 100 100 --BulletSource 
-            Nothing
 
 brainHat :: Item
 brainHat =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnHead
+        & itUse . uequipEffect . eeSite .~ GoesOnHead
         & itType .~ EQUIP BRAINHAT
 
 hat :: Item
 hat =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnHead
+        & itUse . uequipEffect . eeSite .~ GoesOnHead
         & itType .~ EQUIP HAT
 
---targetingHat :: TargetingType -> Item
---targetingHat tt = 
---    defaultEquipment
---        & itUse . equipEffect . eeSite .~ GoesOnHead
---        & itType .~ EQUIP (TARGETINGHAT tt)
---        & itUse . equipTargeting ?~ tt
-
 headLamp :: Item
 headLamp =
     defaultEquipment
-        & itUse . equipEffect . eeUse .~ EHeadLamp
-        & itUse . equipEffect . eeSite .~ GoesOnHead
+        & itUse . uequipEffect . eeUse .~ EHeadLamp
+        & itUse . uequipEffect . eeSite .~ GoesOnHead
         & itType .~ EQUIP HEADLAMP
 
 powerLegs :: Item
 powerLegs =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnLegs
+        & itUse . uequipEffect . eeSite .~ GoesOnLegs
         & itType .~ EQUIP POWERLEGS
 
 speedLegs :: Item
@@ -128,7 +119,7 @@ jumpLegs = powerLegs & itType .~ EQUIP JUMPLEGS
 wristInvisibility :: Item
 wristInvisibility =
     defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnWrist
-        & itUse . equipEffect . eeOnEquip .~ ECamouflage Invisible --overCID (crCamouflage .~ Invisible)
-        & itUse . equipEffect . eeOnRemove .~ ECamouflage FullyVisible --overCID (crCamouflage .~ FullyVisible)
+        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeOnEquip .~ ECamouflage Invisible 
+        & itUse . uequipEffect . eeOnRemove .~ ECamouflage FullyVisible 
         & itType .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)