diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index f0a23f61a..d5bf447ec 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -281,6 +281,8 @@ testInventory = stackedInventory :: [Item] stackedInventory = [ torch + , bangCone + , megaTinMag 100 , augmentedHUD , smallBattery , makeTypeCraft TRANSFORMER @@ -310,12 +312,10 @@ stackedInventory = , tinMag , pistol , tinMag - , teslaGun , blinker , miniGunX 3 , beltMag , flatShield --- , lasWide 20 , poisonSprayer , bulletBeltPack , bulletBeltBracer diff --git a/src/Dodge/Item/Held/Cone.hs b/src/Dodge/Item/Held/Cone.hs index 7a88fa137..3884de42b 100644 --- a/src/Dodge/Item/Held/Cone.hs +++ b/src/Dodge/Item/Held/Cone.hs @@ -15,6 +15,7 @@ bangCone = & itUse . heldAim . aimMuzzles .~ replicate 15 (Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType MuzzleShootBullet (UseExactly 1) 0) + & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ PistolFlare & itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8 & itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8 & itUse . heldParams . recoil .~ 150