Remove _crCamouflage/wrist invisibility on equip/unequip

Invisibility no longer works

src/Dodge/Item/Ammo.hs

@@ -100,7 +100,7 @@ battery =
         & itUse .~ UseNothing
         & itConsumables
             .~ AmmoMag
-                { _magParams = BulletParams defaultBullet
+                { _magParams = NoAmmoParams
                 , _magType = ElectricalAmmo
                 , _magLoadStatus =
                     ReloadStatus

src/Dodge/Item/Display.hs

@@ -88,7 +88,7 @@ itemNumberDisplay cr ci = case (ci ^. _2, itm ^?! itUse, itm ^. itType) of
         $ itm ^? itConsumables . magLoadStatus . iaLoaded]
     (_,UseHeld{},_) -> []
     (_,UseHotkey{_leftConsumption=lc},_) -> [showAutoRechargeProgress lc]
-    (_,UseEquip{},_) -> showEquipmentNumber cr itm
+    (_,UseEquip{},_) -> mempty
     (_,UseNothing,_) -> []
     (_,UseConsume {},_) -> []
     (_,UseAttach (APInt i),_) -> [show i]
@@ -105,15 +105,6 @@ displayPulse x = take 5 $ drop y "----^-----"
   where
     y = min 5 $ x `div` 3
 
-showEquipmentNumber :: Creature -> Item -> [String]
-showEquipmentNumber _ itm = case _eeUse ee of
---    EFuelSource x _ -> [show x]
-    EAmmoSource{_euseAmmoAmount = x} -> [show x]--showAmmoSource cr itm
-    EBatterySource{_euseBatteryAmount = x} -> [show x]
-    _ -> [""]
-  where
-    ee = itm ^?! itUse . uequipEffect
-
 maybeWarmupStatus :: Item -> Maybe String
 maybeWarmupStatus it = case it ^? itUse . heldDelay . warmMax of
     Nothing -> Nothing

src/Dodge/Item/Equipment.hs

@@ -18,8 +18,8 @@ module Dodge.Item.Equipment (
     pulseChecker,
 ) where
 
+import Dodge.Item.Weapon.Bullet
 import Geometry.Data
-import Dodge.Data.CamouflageStatus
 import Dodge.Data.Item
 import Dodge.Default
 import Dodge.Item.Equipment.Booster
@@ -59,7 +59,17 @@ batteryPack =
     defaultEquipment
         & itUse . uequipEffect . eeSite .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-8) 0 10
-        & itUse . uequipEffect . eeUse .~ EBatterySource 10000 10000
+        & itUse . uequipEffect . eeUse .~ EDoNothing
+        & itConsumables
+            .~ AmmoMag
+                { _magParams = NoAmmoParams
+                , _magType = ElectricalAmmo
+                , _magLoadStatus =
+                    ReloadStatus
+                        { _iaMax = 10000000
+                        , _iaLoaded = 10000000
+                        }
+                }
         & itType .~ EQUIP BATTERYPACK
 
 fuelPack :: Item
@@ -85,7 +95,17 @@ bulletBeltPack =
     defaultEquipment
         & itUse . uequipEffect . eeSite .~ GoesOnBack
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
-        & itUse . uequipEffect . eeUse .~ EAmmoSource 2000 2000 Nothing
+        & itUse . uequipEffect . eeUse .~ EDoNothing
+        & itConsumables
+            .~ AmmoMag
+                { _magParams = BulletParams defaultBullet
+                , _magType = BeltBulletAmmo
+                , _magLoadStatus =
+                    ReloadStatus
+                        { _iaMax = 10000000
+                        , _iaLoaded = 10000000
+                        }
+                }
         & itType .~ EQUIP BULLETBELTPACK
 
 bulletBeltBracer :: Item
@@ -93,7 +113,17 @@ bulletBeltBracer =
     defaultEquipment
         & itUse . uequipEffect . eeSite .~ GoesOnWrist
         & itUse . uequipEffect . eeAttachPos .~ V3 (-9) 0 10
-        & itUse . uequipEffect . eeUse .~ EAmmoSource 100 100 Nothing
+        & itUse . uequipEffect . eeUse .~ EDoNothing
+        & itConsumables
+            .~ AmmoMag
+                { _magParams = BulletParams defaultBullet
+                , _magType = BeltBulletAmmo
+                , _magLoadStatus =
+                    ReloadStatus
+                        { _iaMax = 100000
+                        , _iaLoaded = 100000
+                        }
+                }
         & itType .~ EQUIP BULLETBELTBRACER
 
 brainHat :: Item
@@ -131,8 +161,8 @@ wristInvisibility :: Item
 wristInvisibility =
     defaultEquipment
         & itUse . uequipEffect . eeSite .~ GoesOnWrist
-        & itUse . uequipEffect . eeOnEquip .~ ECamouflage Invisible 
-        & itUse . uequipEffect . eeOnRemove .~ ECamouflage FullyVisible 
+--        & itUse . uequipEffect . eeOnEquip .~ ECamouflage Invisible 
+--        & itUse . uequipEffect . eeOnRemove .~ ECamouflage FullyVisible 
         & itType .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)
 
 pulseChecker :: Item