Start work on crafting/combinations

src/Dodge/Item/Weapon/BatteryGuns.hs

@@ -46,7 +46,7 @@ teslaGun = defaultGun
         [ ammoCheckI
         , withTempLight 1 100 (V3 0 0 1)
         , withSoundForI elecCrackleS 1
-        , useAmmo 1
+        , useAmmoAmount 1
         ]
         & useAim . aimSpeed .~ 0.4
         & useAim . aimStance .~ TwoHandFlat
@@ -73,7 +73,7 @@ lasGun = defaultAutoGun
         [ ammoCheckI
         , withTempLight 1 100 (V3 1 1 0)
         , withSoundForI tone440sawtoothquietS 2
-        , useAmmo 1
+        , useAmmoAmount 1
         ]
         & useAim . aimSpeed .~ 0.4
         & useAim . aimRange .~ 1
@@ -286,7 +286,7 @@ tractorPullPos q p1 p = p -.- m *.* (0.3/ x' *.* q +.+ g y *.* p4)
         | x > -5 = -0.02
         | otherwise = (x - 10) / 250
     --p4 = vNormal p5
-    p4 = vNormal $ safeNormalizeV q
+    p4 = vNormal $ squashNormalizeV q
     p3 = p1 +.+ p4
 
 tractorSPic :: Prop -> SPic
@@ -301,6 +301,6 @@ tractorSPic pj = (,) mempty $ setLayer 1 $ setDepth 20 $ color (withAlpha 0.5 co
     size = fromIntegral (_pjTime pj)
     spos = _pjPos pj
     xpos = _pjStartPos pj
-    d = safeNormalizeV $ spos -.- xpos
+    d = squashNormalizeV $ spos -.- xpos
     n = vNormal d
     col = mixColors 0.5 0.5 white blue