Cleanup

src/Dodge/Item/Equipment.hs

@@ -4,7 +4,6 @@ module Dodge.Item.Equipment (
     powerLegs,
     wristInvisibility,
     wristArmour,
-    targetingHat,
     hat,
     brainHat,
     frontArmour,
@@ -32,19 +31,19 @@ magShield =
         & itParams .~ MagShieldParams Nothing
         & itUse . equipEffect . eeUse .~ EMagShield
         & itUse . equipEffect . eeSite .~ GoesOnWrist
-        & itType . iyBase .~ EQUIP MAGSHIELD
+        & itType .~ EQUIP MAGSHIELD
 
 flameShield :: Item
 flameShield =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnChest
-        & itType . iyBase .~ EQUIP FLAMESHIELD
+        & itType .~ EQUIP FLAMESHIELD
 
 frontArmour :: Item
 frontArmour =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnChest
-        & itType . iyBase .~ EQUIP FRONTARMOUR
+        & itType .~ EQUIP FRONTARMOUR
 
 wristArmour :: Item
 wristArmour =
@@ -53,13 +52,13 @@ wristArmour =
         & itUse . equipEffect . eeOnEquip .~ EonWristShield
         & itUse . equipEffect . eeUse .~ EWristShield
         & itUse . equipEffect . eeOnRemove .~ EoffWristShield
-        & itType . iyBase .~ EQUIP WRISTARMOUR
+        & itType .~ EQUIP WRISTARMOUR
 
 batteryPack :: Item
 batteryPack =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnBack
-        & itType . iyBase .~ EQUIP BATTERYPACK
+        & itType .~ EQUIP BATTERYPACK
         & itUse . equipEffect . eeAttachPos .~ V3 (-8) 0 10
         & itUse . equipEffect . eeUse .~ EBatterySource 10000 10000
 
@@ -67,7 +66,7 @@ fuelPack :: Item
 fuelPack =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnBack
-        & itType . iyBase .~ EQUIP FUELPACK
+        & itType .~ EQUIP FUELPACK
         & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
         & itUse . equipEffect . eeUse .~ EFuelSource 10000 10000
 
@@ -75,7 +74,7 @@ bulletBeltPack :: Item
 bulletBeltPack =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnBack
-        & itType . iyBase .~ EQUIP BULLETBELTPACK
+        & itType .~ EQUIP BULLETBELTPACK
         & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
         & itUse . equipEffect . eeUse .~ EAmmoSource 2000 2000 --BulletSource 
             Nothing
@@ -84,7 +83,7 @@ bulletBeltBracer :: Item
 bulletBeltBracer =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnWrist
-        & itType . iyBase .~ EQUIP BULLETBELTBRACER
+        & itType .~ EQUIP BULLETBELTBRACER
         & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
         & itUse . equipEffect . eeUse .~ EAmmoSource 100 100 --BulletSource 
             Nothing
@@ -93,46 +92,46 @@ jetPack :: Item
 jetPack =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnBack
-        & itType . iyBase .~ EQUIP JETPACK
+        & itType .~ EQUIP JETPACK
         & itUse . equipEffect . eeAttachPos .~ V3 (-8) 0 10
 
 brainHat :: Item
 brainHat =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnHead
-        & itType . iyBase .~ EQUIP BRAINHAT
+        & itType .~ EQUIP BRAINHAT
 
 hat :: Item
 hat =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnHead
-        & itType . iyBase .~ EQUIP HAT
+        & itType .~ EQUIP HAT
 
-targetingHat :: TargetingType -> Item
-targetingHat tt = 
-    defaultEquipment
-        & itUse . equipEffect . eeSite .~ GoesOnHead
-        & itType . iyBase .~ EQUIP (TARGETINGHAT tt)
-        & itUse . equipTargeting ?~ tt
+--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
-        & itType . iyBase .~ EQUIP HEADLAMP
+        & itType .~ EQUIP HEADLAMP
 
 powerLegs :: Item
 powerLegs =
     defaultEquipment
         & itUse . equipEffect . eeSite .~ GoesOnLegs
-        & itType . iyBase .~ EQUIP POWERLEGS
+        & itType .~ EQUIP POWERLEGS
 
 speedLegs :: Item
-speedLegs = powerLegs & itType . iyBase .~ EQUIP SPEEDLEGS
+speedLegs = powerLegs & itType .~ EQUIP SPEEDLEGS
 
 jumpLegs :: Item
-jumpLegs = powerLegs & itType . iyBase .~ EQUIP JUMPLEGS
+jumpLegs = powerLegs & itType .~ EQUIP JUMPLEGS
 
 wristInvisibility :: Item
 wristInvisibility =
@@ -140,4 +139,4 @@ wristInvisibility =
         & itUse . equipEffect . eeSite .~ GoesOnWrist
         & itUse . equipEffect . eeOnEquip .~ ECamouflage Invisible --overCID (crCamouflage .~ Invisible)
         & itUse . equipEffect . eeOnRemove .~ ECamouflage FullyVisible --overCID (crCamouflage .~ FullyVisible)
-        & itType . iyBase .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)
+        & itType .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)