Tweak walk cycle parameters

src/Dodge/Item/Weapon/AutoGun.hs

@@ -28,7 +28,7 @@ autoGun = defaultAutoGun
     , _wpLoadedAmmo = 30
     , _wpReloadTime = 80
     , _wpReloadState = 0
-    , _itUseRate = 6
+    , _itUseRate = 5
     , _itUseTime = 0
     , _itUse   = \_ -> charFiringStrat
         [('M',autoFireMode) 
@@ -37,15 +37,14 @@ autoGun = defaultAutoGun
     , _wpSpread = autogunSpread
     , _wpRange = 20
     , _itHammer = HammerUp
-    , _itFloorPict = onLayer FlItLayer autoGunPict
+    , _itFloorPict = onLayer FlItLayer autoGunPic
     , _itAimingSpeed = 0.4
     , _itAimingRange = 1
     , _itZoom = defaultItZoom {_itAimZoomFac = 1.5}
-    , _itEquipPict = pictureWeaponOnAim autoGunPict
+    , _itEquipPict = pictureWeaponOnAim autoGunPic
     , _itEffect = wpRecock
     , _itAttachment = Just $ ItCharMode $ Seq.fromList "MS"
-    , _itScrollUp   = incCharMode
-    , _itScrollDown = decCharMode
+    , _itScroll   = scrollCharMode
     , _itInvDisplay = basicWeaponDisplay
     , _wpAmmo = basicBullet    
     }
@@ -60,8 +59,8 @@ autoGunNonTwistEff = withRecoil 40
     . withVelWthHiteff (50,0) 3 
     $ destroyOnImpact bulHitCr bulHitWall' bulHitFF'
 
-autoGunPict :: Picture
-autoGunPict = color red $ polygon $ rectNESW 4 12 (-4) (-12)
+autoGunPic :: Picture
+autoGunPic = color red $ polygon $ rectNESW 4 12 (-4) (-12)
 
 autogunSpread :: Float
 autogunSpread = 0.07

src/Dodge/Item/Weapon/Bezier.hs

@@ -4,6 +4,7 @@ import Dodge.Data
 import Dodge.Base
 import Dodge.Default.Weapon
 import Dodge.Item.Data
+import Dodge.Item.Draw
 import Dodge.Item.Weapon.Targeting
 import Dodge.Item.Weapon.TriggerType
 import Dodge.Item.Weapon.ExtraEffect
@@ -12,6 +13,7 @@ import Dodge.Particle.Bullet.Spawn
 import Dodge.Particle.Bullet.HitEffect
 import Dodge.WorldEvent.HitEffect
 import Dodge.RandomHelp
+import Dodge.Picture.Layer
 import Picture
 import Geometry
 
@@ -28,14 +30,20 @@ bezierGun = defaultGun
         . withRecoil 40
         . torqueBefore 0.05 -- I believe that this doesn't affect
         $ shootBezier $ fromJust p    -- <- the start point
+    , _itFloorPict = onLayer FlItLayer bezierGunPic
+    , _itEquipPict = pictureWeaponOnAim bezierGunPic
     , _itAttachment = Nothing
-    , _itScrollUp   = removeItTarget 0
-    , _itScrollDown = removeItTarget 0
+    , _itScroll   = removeItTarget 0
     , _itHammer = HammerUp
     , _itEffect = rbSetTarget
     , _itZoom = defaultItZoom
     , _itAimingRange = 0
+    , _wpMaxAmmo = 50
+    , _itUseRate = 6
+    , _itAimStance = TwoHandTwist
     }
+bezierGunPic :: Picture
+bezierGunPic = color red $ polygon $ rectNESW 4 12 (-4) (-12)
 
 shootBezier :: Point2 -> Creature -> World -> World
 shootBezier targetp cr w = w & particles %~ (theBullet :)

src/Dodge/Item/Weapon/Bullet.hs

@@ -10,3 +10,10 @@ basicBullet = BulletAmmo
     , _amBulWth = 2
     , _amBulVel = (30,0)
     }
+hvBullet :: Ammo
+hvBullet = BulletAmmo
+    { _amString = "HVBULLET"
+    , _amBulEff = penWalls hvBulHitCr hvBulHitWall' bulHitFF'
+    , _amBulWth = 6
+    , _amBulVel = (80,0)
+    }

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -13,6 +13,7 @@ import Dodge.Item.Weapon.UseEffect
 import Dodge.WorldEvent.Flash
 import Dodge.WorldEvent.ThingsHit
 import Dodge.Picture.Layer
+import Dodge.Creature.Test
 import Picture
 import Geometry.Vector
 
@@ -58,7 +59,7 @@ itemLaserScopeEffect
     moveHammerUp !HammerDown = HammerReleased
     moveHammerUp !_          = HammerUp
     f _ cr invid w 
-        | invid == _crInvSel cr = w 
+        | invid == _crInvSel cr && crIsAiming' cr = w 
             & particles %~ (:) (makeLaserScope sp ep reloadFrac)
             & creatures . ix (_crID cr) . crInv . ix invid . itHammer %~ moveHammerUp
             & laserScopeTargetGlow col glowPoint 

src/Dodge/Item/Weapon/Targeting.hs

@@ -13,8 +13,8 @@ useTargetPos f cr w = case cr ^? crInv . ix (_crInvSel cr) . itTargeting . _Just
     Nothing -> w
     Just (g,_) -> f (g w) cr w
 
-removeItTarget :: Int -> Int -> World -> World
-removeItTarget i _ w = w & creatures . ix i . crInv . ix itRef . itTargeting .~ Nothing
+removeItTarget :: Int -> Float -> Creature -> World -> World
+removeItTarget i _ _ w = w & creatures . ix i . crInv . ix itRef . itTargeting .~ Nothing
   where 
     cr = _creatures w IM.! i
     itRef = _crInvSel cr