Cleanup

src/Dodge/Item/Weapon/AmmoParams.hs

@@ -1,6 +1,5 @@
 module Dodge.Item.Weapon.AmmoParams
-    ( ruseAmmoParams
-    , useAmmoParams
+    ( useAmmoParams
     , fractionLoadedAmmo
     , fractionLoadedAmmo2
     ) where
@@ -16,25 +15,6 @@ import LensHelp
 import Data.Maybe
 --import Control.Lens
 
-ruseAmmoParams :: ItemUse
-ruseAmmoParams = RightUse
-    { _rUse = useAmmoParams Nothing
-    , _useDelay = FixedRate {_rateMax = 10, _rateTime = 0}
-    , _useMods = []
-    , _useHammer = HammerUp
-    , _useAim = defaultAimParams
-    , _heldScroll = \_ _ -> id
-    }
-
---defaultAimParams :: AimParams
---defaultAimParams = AimParams
---    { _aimWeight = 0
---    , _aimRange = 0
---    , _aimZoom = ItZoom 20 0.2 1
---    , _aimStance = OneHand
---    , _aimHandlePos = 10
---    , _aimMuzPos = 20
---    }
 useAmmoParams :: Maybe Float -> Item -> Creature -> World -> World
 useAmmoParams vfact it cr w = w & instantParticles .:~ aBulAt 
     vfact 

src/Dodge/Item/Weapon/BulletGun/Cane.hs

@@ -191,7 +191,7 @@ burstRifle = repeater
 --        , withRecoil
 --        ]
 miniGunUse :: Int -> ItemUse
-miniGunUse i = ruseAmmoParams
+miniGunUse i = defaultrUse
     & rUse .~ useAmmoParams (Just 1)
     & useDelay .~ NoDelay
     & useMods .~

src/Dodge/Item/Weapon/BulletGun/Stick.hs

@@ -11,13 +11,6 @@ import Dodge.Reloading.Action
 import Dodge.Data
 import Dodge.ChainEffect
 import Dodge.Default.Weapon
---import Dodge.Item.Weapon.InventoryDisplay
---import Dodge.Default
---import Dodge.Item.Attachment
---import Dodge.Item.Weapon.ExtraEffect
---import Dodge.Item.Weapon.InventoryDisplay
-import Dodge.Item.Weapon.AmmoParams
---import Dodge.Item.Draw
 import Dodge.Item.Weapon.TriggerType
 import Dodge.SoundLogic.LoadSound
 import Geometry
@@ -37,7 +30,7 @@ bangStickSoundChoice it
 
 bangStick :: Int -> Item
 bangStick i = defaultBulletWeapon 
-    { _itUse = ruseAmmoParams
+    { _itUse = defaultrUse
         & useDelay . rateMax .~ 8
         & useMods .~
             [ ammoHammerCheck

src/Dodge/Item/Weapon/Radar.hs

@@ -6,7 +6,6 @@ import Dodge.Item.Weapon.TriggerType
 import Dodge.Item.Weapon.ExtraEffect
 import Dodge.Item.Weapon.UseEffect
 --import Dodge.Item.Weapon.Remote
-import Dodge.Default.Weapon
 import Dodge.SoundLogic
 
 import Control.Lens

src/Dodge/Item/Weapon/SprayGuns.hs

@@ -21,7 +21,6 @@ import Dodge.Default
 --import Dodge.Item.Weapon.BulletGuns
 --import Dodge.Item.Weapon.InventoryDisplay
 import Dodge.Item.Weapon.TriggerType
-import Dodge.Default.Weapon
 --import Dodge.Item.Attachment
 import Geometry
 import LensHelp

src/Dodge/Item/Weapon/Utility.hs

@@ -6,7 +6,6 @@ import Dodge.Default
 import Dodge.Creature.Action
 import Dodge.Item.Weapon.TriggerType
 import Dodge.Item.Weapon.ExtraEffect
-import Dodge.Default.Weapon
 import Dodge.Wall.ForceField
 import Dodge.Wall.Move
 --import Sound.Data