From d5f11109cd40bb7ae3dba2fae3ccb86cb0a22a22 Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Thu, 3 Mar 2022 23:04:45 +0000
Subject: [PATCH] Cleanup cone weapon path

---
 src/Dodge/Item/Weapon/BulletGuns.hs | 77 ++++-------------------------
 1 file changed, 9 insertions(+), 68 deletions(-)

diff --git a/src/Dodge/Item/Weapon/BulletGuns.hs b/src/Dodge/Item/Weapon/BulletGuns.hs
index e4294ef93..9b2b3922d 100644
--- a/src/Dodge/Item/Weapon/BulletGuns.hs
+++ b/src/Dodge/Item/Weapon/BulletGuns.hs
@@ -182,95 +182,38 @@ blunderbuss = bangCone
     }
     & itConsumption . ammoBaseMax .~ 25
     & itConsumption . reloadTime .~ 30
-    & itUse . useMods .~
-        [ ammoCheckI
-        , hammerCheckI
-        , useTimeCheck
-        , withSoundStart bangEchoS
-        , useAllAmmo
-        , torqueAfterI 0.1
-        , withRecoilI 150
-        , duplicateLoaded
-        , withMuzFlareI
-        , applyInaccuracy
-        , withRandomOffsetI 12
-        , withRandomItemUpdate coneRandItemUpdate
-        , withRandomItemParams coneRandItemParams
-        ]
     & itUse . useAim . aimStance .~ TwoHandTwist
     & itUse . useAim . aimSpeed .~ 0.4
 bigBlunderbuss :: Item
 bigBlunderbuss = blunderbuss
     {_itName = "BIGBLUNDERBUSS"
     ,_itType = BIGBLUNDERBUSS
-    ,_itUse = ruseAmmoParamsRate 20 upHammer
-        [ ammoCheckI
-        , hammerCheckI
-        , useTimeCheck
-        , withSoundStart bangEchoS
-        , useAllAmmo
-        , torqueAfterI 0.3
-        , withRecoilI 200
-        , duplicateLoaded
-        , withMuzFlareI
-        , applyInaccuracy
-        , withRandomOffsetI 16
-        , withRandomItemUpdate coneRandItemUpdate
-        , withRandomItemParams coneRandItemParams
-        ]
-        & useAim . aimStance .~ TwoHandTwist
-        & useAim . aimSpeed .~ 0.4
     }
     & itConsumption . ammoBaseMax .~ 50
     & itConsumption . reloadTime .~ 36
+    & itParams . recoil .~ 200
+    & itParams . torqueAfter .~ 0.3
+    & itParams . randomOffset .~ 16
 biggerBlunderbuss :: Item
 biggerBlunderbuss = bigBlunderbuss
     {_itName = "BIGGERBLUNDERBUSS"
     ,_itType = BIGGERBLUNDERBUSS
-    ,_itUse = ruseAmmoParamsRate 20 upHammer
-        [ ammoCheckI
-        , hammerCheckI
-        , useTimeCheck
-        , withSoundStart bangEchoS
-        , useAllAmmo
-        , torqueAfterI 0.5
-        , withRecoilI 250
-        , duplicateLoaded
-        , withMuzFlareI
-        , applyInaccuracy
-        , withRandomOffsetI 20
-        , withRandomItemUpdate coneRandItemUpdate
-        , withRandomItemParams coneRandItemParams
-        ]
-        & useAim . aimStance .~ TwoHandTwist
-        & useAim . aimSpeed .~ 0.4
     }
     & itConsumption . ammoBaseMax .~ 75
     & itConsumption . reloadTime .~ 43
+    & itParams . recoil .~ 250
+    & itParams . torqueAfter .~ 0.5
+    & itParams . randomOffset .~ 20
 biggestBlunderbuss :: Item
 biggestBlunderbuss = biggerBlunderbuss
     {_itName = "BIGGESTBLUNDERBUSS"
     ,_itType = BIGGESTBLUNDERBUSS
-    ,_itUse = ruseAmmoParamsRate 20 upHammer
-        [ ammoCheckI
-        , hammerCheckI
-        , useTimeCheck
-        , withSoundStart bangEchoS
-        , useAllAmmo
-        , torqueAfterI 0.7
-        , withRecoilI 300
-        , duplicateLoaded
-        , withMuzFlareI
-        , applyInaccuracy
-        , withRandomOffsetI 24
-        , withRandomItemUpdate coneRandItemUpdate
-        , withRandomItemParams coneRandItemParams
-        ]
-        & useAim . aimStance .~ TwoHandTwist
-        & useAim . aimSpeed .~ 0.4
     }
     & itConsumption . ammoBaseMax .~ 100
     & itConsumption . reloadTime .~ 50
+    & itParams . recoil .~ 300
+    & itParams . torqueAfter .~ 0.7
+    & itParams . randomOffset .~ 24
 
 grapeShotCannon :: Item
 grapeShotCannon = blunderbuss
@@ -300,8 +243,6 @@ grapeShotCannon = blunderbuss
 grenadeLauncher :: Int -> Item
 grenadeLauncher _ = bangCone
 
-
-
 hvAutoGun :: Item
 hvAutoGun = defaultAutoGun 
     { _itName = "AUTO-HV"