diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index 19a3eb1e2..f5c199bae 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -129,6 +129,11 @@ inventoryX c = case c of , tinMag , tinMag , tinMag + , volleyGun 4 + , tinMag + , tinMag + , drumMag + , drumMag , burstRifle , bangCone , tinMag diff --git a/src/Dodge/Item/Draw/SPic.hs b/src/Dodge/Item/Draw/SPic.hs index cb46a68dc..5f42f5b66 100644 --- a/src/Dodge/Item/Draw/SPic.hs +++ b/src/Dodge/Item/Draw/SPic.hs @@ -369,7 +369,7 @@ miniGunXPictItem i it = miniGunXPict i (f $ _wTime (_itParams it)) where f x = y * (y + z) / (100 +z) where - z = 0 + z = 0 -- increase to adjust acceleration y = fromIntegral x miniGunXPict :: Int -> Float -> SPic diff --git a/src/Dodge/Item/Orientation.hs b/src/Dodge/Item/Orientation.hs index 37192a62b..d40730dfc 100644 --- a/src/Dodge/Item/Orientation.hs +++ b/src/Dodge/Item/Orientation.hs @@ -34,6 +34,8 @@ orientChild itm = case _itType itm of orientByParentChSF :: Item -> ItemSF -> Point3Q orientByParentChSF itm lt = case (_itType itm, lt) of (HELD FLAMETHROWER, AmmoMagSF{}) -> (V3 4 (-6) 0, Q.qID) + (HELD (VOLLEYGUN n), AmmoMagSF i _) + -> (V3 2 (2.5 + fromIntegral i * 5 - (0.5 * 5 * fromIntegral n)) 3, Q.qz (pi/2)) (HELD _, AmmoMagSF{_amsfType = ElectricalAmmo}) -> (V3 0 0 z, Q.qID) (HELD _, AmmoMagSF{}) -> (V3 7 (itemShapeMin _y itm) 0, Q.qID) (HELD _, WeaponScopeSF) -> (V3 5 0 5, Q.qID)