Cleanup

src/Dodge/Item/Draw.hs

@@ -22,12 +22,12 @@ itemEquipPict cr itmtree = case itm ^. itUse of
     ituse -> fold $ do
         attachpos <- ituse ^? uequipEffect . eeAttachPos
         i <- itm ^? itLocation . ilInvID
-        epos <- cr ^? crInv . ix i . itLocation . ilEquipPosition . _Just
+        epos <- cr ^? crInv . ix i . itLocation . ilEquipSite . _Just
         return $ equipPosition epos cr attachpos (itemSPic itm)
   where
     itm = itmtree ^. ldtValue . _1
 
-equipPosition :: EquipPosition -> Creature -> Point3 -> SPic -> SPic
+equipPosition :: EquipSite -> Creature -> Point3 -> SPic -> SPic
 equipPosition epos cr p sh = case epos of
     OnLeftWrist -> translateToLeftWrist cr sh
     OnRightWrist -> translateToRightWrist cr sh

src/Dodge/Item/Equipment.hs

@@ -28,25 +28,25 @@ magShield =
     defaultEquipment
         & itParams .~ MagShieldParams Nothing
         & itUse . uequipEffect . eeUse .~ EMagShield
-        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itType .~ EQUIP MAGSHIELD
 
 flameShield :: Item
 flameShield =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnChest
+        & itUse . uequipEffect . eeType .~ GoesOnChest
         & itType .~ EQUIP FLAMESHIELD
 
 frontArmour :: Item
 frontArmour =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnChest
+        & itUse . uequipEffect . eeType .~ GoesOnChest
         & itType .~ EQUIP FRONTARMOUR
 
 wristArmour :: Item
 wristArmour =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itUse . uequipEffect . eeOnEquip .~ EonWristShield
         & itUse . uequipEffect . eeUse .~ EWristShield
         & itUse . uequipEffect . eeOnRemove .~ EoffWristShield
@@ -55,7 +55,7 @@ wristArmour =
 batteryPack :: Item
 batteryPack =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeType .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-8) 0 10
         & itUse . uequipEffect . eeUse .~ EDoNothing
         & itConsumables
@@ -73,7 +73,7 @@ batteryPack =
 fuelPack :: Item
 fuelPack =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeType .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
 --        & itUse . uequipEffect . eeUse .~ EFuelSource 10000 10000
         & itType .~ EQUIP FUELPACK
@@ -91,7 +91,7 @@ fuelPack =
 bulletBeltPack :: Item
 bulletBeltPack =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnBack
+        & itUse . uequipEffect . eeType .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
         & itUse . uequipEffect . eeUse .~ EDoNothing
         & itConsumables
@@ -109,7 +109,7 @@ bulletBeltPack =
 bulletBeltBracer :: Item
 bulletBeltBracer =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
         & itUse . uequipEffect . eeUse .~ EDoNothing
         & itConsumables
@@ -127,26 +127,26 @@ bulletBeltBracer =
 brainHat :: Item
 brainHat =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnHead
+        & itUse . uequipEffect . eeType .~ GoesOnHead
         & itType .~ EQUIP BRAINHAT
 
 hat :: Item
 hat =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnHead
+        & itUse . uequipEffect . eeType .~ GoesOnHead
         & itType .~ EQUIP HAT
 
 headLamp :: Item
 headLamp =
     defaultEquipment
         & itUse . uequipEffect . eeUse .~ EHeadLamp
-        & itUse . uequipEffect . eeSite .~ GoesOnHead
+        & itUse . uequipEffect . eeType .~ GoesOnHead
         & itType .~ EQUIP HEADLAMP
 
 powerLegs :: Item
 powerLegs =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnLegs
+        & itUse . uequipEffect . eeType .~ GoesOnLegs
         & itType .~ EQUIP POWERLEGS
 
 speedLegs :: Item
@@ -158,7 +158,7 @@ jumpLegs = powerLegs & itType .~ EQUIP JUMPLEGS
 wristInvisibility :: Item
 wristInvisibility =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeType .~ GoesOnWrist
 --        & itUse . uequipEffect . eeOnEquip .~ ECamouflage Invisible 
 --        & itUse . uequipEffect . eeOnRemove .~ ECamouflage FullyVisible 
         & itType .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)
@@ -166,5 +166,5 @@ wristInvisibility =
 pulseChecker :: Item
 pulseChecker =
     defaultEquipment
-        & itUse . uequipEffect . eeSite .~ GoesOnWrist
+        & itUse . uequipEffect . eeType .~ GoesOnWrist
         & itType .~ EQUIP WRIST_ECG

src/Dodge/Item/Info.hs

@@ -210,9 +210,9 @@ aimStanceInfo as = case as of
     OneHand -> "It is held in one hand."
 
 itmEquipSiteInfo :: Item -> String
-itmEquipSiteInfo = maybe "" equipSiteInfo . (^? itUse . uequipEffect . eeSite)
+itmEquipSiteInfo = maybe "" equipSiteInfo . (^? itUse . uequipEffect . eeType)
 
-equipSiteInfo :: EquipSite -> String
+equipSiteInfo :: EquipType -> String
 equipSiteInfo es = case es of
     GoesOnHead -> " on the head"
     GoesOnChest -> " on the chest"

src/Dodge/Item/Location/Initialize.hs

@@ -50,7 +50,7 @@ initCrItemLocation cr invid w it = (w & itemLocations . at locid ?~ loc
             , _ilIsRoot = False
             , _ilIsSelected = False
             , _ilIsAttached = False
-            , _ilEquipPosition = Nothing
+            , _ilEquipSite = Nothing
             }