Cleanup, remove bullet tweaks

src/Dodge/Item/Weapon/Bullet.hs

@@ -1,15 +1,10 @@
 module Dodge.Item.Weapon.Bullet
     ( basicBullet
-    , incBullet
-    , staticBullet
-    , conBullet
-    , bounceBullet
     , ltBullet
     , hvBullet
     ) where
 import Dodge.Data
 import Dodge.WorldEvent.HitEffect
-import Dodge.WorldEvent.SpawnParticle
 import Dodge.Particle.Bullet.HitEffect
 
 import Geometry.Data
@@ -21,38 +16,6 @@ basicBullet = BulletAmmo
     , _amBulVel = V2 50 0
     , _amBulTraj = BasicBulletTrajectory
     }
-incBullet :: AmmoType
-incBullet = BulletAmmo
-    { _amString = "INCENDIARY"
-    , _amBulEff = destroyOnImpact bulIncCr bulIncWall
-    , _amBulWth = 2
-    , _amBulVel = V2 50 0
-    , _amBulTraj = BasicBulletTrajectory
-    }
-staticBullet :: AmmoType
-staticBullet = BulletAmmo
-    { _amString = "STATIC"
-    , _amBulEff = bulletDestroySpawn aStaticBall
-    , _amBulWth = 2
-    , _amBulVel = V2 50 0
-    , _amBulTraj = BasicBulletTrajectory
-    }
-conBullet :: AmmoType
-conBullet = BulletAmmo
-    { _amString = "CONCUSSIVE"
-    , _amBulEff = destroyOnImpact bulConCr bulConWall
-    , _amBulWth = 2
-    , _amBulVel = V2 50 0
-    , _amBulTraj = BasicBulletTrajectory
-    }
-bounceBullet :: AmmoType
-bounceBullet = BulletAmmo
-    { _amString = "BOUNCING"
-    , _amBulEff = destroyOnImpact bulHitCr bulBounceWall
-    , _amBulWth = 2
-    , _amBulVel = V2 50 0
-    , _amBulTraj = BasicBulletTrajectory
-    }
 ltBullet :: AmmoType
 ltBullet = BulletAmmo
     { _amString = "LTBULLET"

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

@@ -14,7 +14,6 @@ module Dodge.Item.Weapon.BulletGun.Cane
 import Dodge.Item.Weapon.BulletGun.Clip
 import Dodge.Data
 --import Dodge.ChainEffect
-import Dodge.TweakBullet
 import Dodge.Default.Weapon
 import Dodge.Item.Weapon.InventoryDisplay
 import Dodge.Default
@@ -72,7 +71,6 @@ bangCane = defaultGun
         , withSmoke 1 black 20 200 5
         , withMuzFlareI
         ]
-    , _itTweaks = defaultBulletSelTweak
     , _itDimension = ItemDimension
         { _dimRad = 8
         , _dimCenter = V3 5 0 0
@@ -292,7 +290,6 @@ miniGunX i = defaultAutoGun
         , _randomOffset = 10
         }
     , _itEquipPict = pictureWeaponAim (miniGunXPictItem i)
-    , _itTweaks = defaultBulletSelTweak
     , _itInvSize = 4
     , _itInvDisplay = \it -> head (basicItemDisplay it) : 
         ["*" ++ replicate 13 ' ' ++ "*"

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

@@ -10,7 +10,6 @@ module Dodge.Item.Weapon.BulletGun.Stick
 import Dodge.Item.Weapon.BulletGun.Clip
 import Dodge.Data
 import Dodge.ChainEffect
-import Dodge.TweakBullet
 import Dodge.Default.Weapon
 --import Dodge.Item.Weapon.InventoryDisplay
 import Dodge.Default
@@ -78,7 +77,6 @@ bangStick i = defaultGun
         , _torqueAfter = 0.18 + 0.02 * fromIntegral i
         , _randomOffset = 0
         }
-    , _itTweaks = defaultBulletSelTweak
     , _itInvSize = fromIntegral i / 3
     , _itDimension = ItemDimension
         { _dimRad = 5
@@ -187,7 +185,6 @@ pistol = (bangStick 1)
 --    , _itEquipPict = pictureWeaponAim pistolPic
     , _itID = Nothing
     , _itInvColor = white
-    , _itTweaks = defaultBulletSelTweak
     } & itDimension . dimSPic .~ (\it -> noPic $ baseStickShape <> makeTinClipAt pi (V3 5 2 0) it)
     & itParams %~
         ( ( muzVel .~ 0.8 )

src/Dodge/Item/Weapon/BulletGuns.hs

@@ -9,7 +9,6 @@ module Dodge.Item.Weapon.BulletGuns
     , hvAutoGun
     , autogunSpread
     , autoGun
-    , multGun
     , autoGunPic
     , longGun
     , module Dodge.Item.Weapon.BulletGun.Stick
@@ -23,7 +22,6 @@ import Dodge.Item.Weapon.ZoomScope
 --import Dodge.Item.Weapon.BulletGun.Clip
 import Dodge.Data
 --import Dodge.ChainEffect
-import Dodge.TweakBullet
 import Dodge.Default.Weapon
 import Dodge.Item.Weapon.InventoryDisplay
 import Dodge.Default
@@ -92,7 +90,6 @@ autoGun = defaultAutoGun
         , _torqueAfter = 0
         , _randomOffset = 0
         }
-    , _itTweaks = defaultBulletSelTweak
     }
 autoGunPic :: Item -> SPic
 autoGunPic it = noPic $
@@ -148,7 +145,6 @@ bangCone = defaultGun
         , _dimSPic = const $ noPic $ colorSH cyan $ upperPrismPoly 3 (rectXH 5 2)
             <> upperPrismPoly 6 (rectNSEW 4 (-4) 15 5)
         }
-    , _itTweaks = defaultBulletSelTweak
     }
 coneRandItemUpdate :: State StdGen (Item -> Item)
 coneRandItemUpdate = do
@@ -273,45 +269,6 @@ ltAutoGun = defaultAutoGun
         , _bore = 2
         , _gunBarrels = SingleBarrel autogunSpread
         }
-    , _itTweaks = defaultBulletSelTweak
-    }
-multGun :: Item
-multGun = defaultGun 
-    { _itName = "MULTGUN"
-    , _itType = MULTGUN
-    , _itConsumption = defaultAmmo 
-        { _aoType = basicBullet
-        , _ammoBaseMax = 5
-        , _ammoLoaded = 2
-        , _reloadTime = 10
-        , _reloadType = ActivePartial 1
-        }
-    , _itUse = ruseAmmoParamsRate 20 upHammer
-        [ ammoCheckI
-        , hammerCheckI
-        , useTimeCheck
-        , withSoundStart shotgunS
-        , useAllAmmo
-        , withRecoil
-        , withMuzFlareI
-        , duplicateLoadedBarrels
-        ]
-        & useAim . aimSpeed .~ 0.4
-        & useAim . aimRange .~ 1
-        & useAim . aimStance .~ TwoHandTwist
-        & useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
---    , _itFloorPict = multGunSPic
-    , _itParams = defBulletShooter
-        { _muzVel = 1
-        , _rifling = 0.9
-        , _bore = 3
-        , _gunBarrels = MultiBarrel 
-            {_brlNum = 5
-            ,_brlSpread = AlignedBarrels
-            ,_brlInaccuracy = 0
-            }
-        }
-    , _itTweaks = defaultBulletSelTweak
     }
 longGun :: Item
 longGun = defaultGun