Split UseItem module

src/Dodge/Item/Weapon.hs

@@ -7,7 +7,7 @@ module Dodge.Item.Weapon
 import Dodge.Data
 import Dodge.Base
 import Dodge.SoundLogic
-import Dodge.CreatureActions
+import Dodge.CreatureAction
 import Dodge.RandomHelp
 import Dodge.WorldActions
 import Dodge.Debug
@@ -55,7 +55,6 @@ pistol = Weapon
     , _itIdentity = Pistol
     , _wpMaxAmmo = 15
     , _wpLoadedAmmo = 15
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 40
     , _wpReloadState = 0
     , _wpFireRate = 8
@@ -100,7 +99,6 @@ autoGun = defaultGun
     , _itIdentity = AutoGun
     , _wpMaxAmmo = 30
     , _wpLoadedAmmo = 30
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 6
@@ -164,7 +162,6 @@ rezGun = defaultGun
     { _itName = "REANIMATOR"
     , _wpMaxAmmo = 50
     , _wpLoadedAmmo = 50
-    , _wpAmmoType = Battery
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 0
@@ -189,7 +186,6 @@ teslaGun = defaultAutoGun
     , _itIdentity = TeslaGun
     , _wpMaxAmmo = 200
     , _wpLoadedAmmo = 200
-    , _wpAmmoType = Battery
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 0
@@ -215,7 +211,6 @@ lasGun = defaultAutoGun
     , _itIdentity = LasGun
     , _wpMaxAmmo = 200
     , _wpLoadedAmmo = 200
-    , _wpAmmoType = Battery
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 0
@@ -260,7 +255,6 @@ forceFieldGun = defaultGun
     , _itIdentity = ForceFieldGun
     , _wpMaxAmmo = 100
     , _wpLoadedAmmo = 100
-    , _wpAmmoType = Battery
     , _wpReloadTime = 40
     , _wpReloadState = 0
     , _wpFireRate = 10
@@ -279,7 +273,6 @@ forceFieldGun = defaultGun
 --     , _itIdentity = GrapGun
 --     , _wpMaxAmmo = 1
 --     , _wpLoadedAmmo = 1
---     , _wpAmmoType = Battery
 --     , _wpReloadTime = 40
 --     , _wpReloadState = 0
 --     , _wpFireRate = 10
@@ -299,7 +292,6 @@ tractorGun = defaultAutoGun
     , _itIdentity = TractorGun
     , _wpMaxAmmo = 10000
     , _wpLoadedAmmo = 10000
-    , _wpAmmoType = Battery
     , _wpReloadTime = 40
     , _wpReloadState = 0
     , _wpFireRate = 0
@@ -319,7 +311,6 @@ launcher = defaultGun
     , _itIdentity = Launcher
     , _wpMaxAmmo = 30
     , _wpLoadedAmmo = 30
-    , _wpAmmoType = Shell
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 20
@@ -354,7 +345,6 @@ remoteLauncher = defaultGun
     , _itIdentity = RemoteLauncher
     , _wpMaxAmmo = 1
     , _wpLoadedAmmo = 1
-    , _wpAmmoType = Shell
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 10
@@ -375,7 +365,6 @@ hvAutoGun = defaultAutoGun
     , _itIdentity = HvAutoGun
     , _wpMaxAmmo = 100
     , _wpLoadedAmmo = 100
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 200
     , _wpReloadState = 0
     , _wpFireRate = 25
@@ -402,7 +391,6 @@ ltAutoGun = defaultAutoGun
     , _itIdentity = LtAutoGun
     , _wpMaxAmmo = 25
     , _wpLoadedAmmo = 25
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 4
@@ -427,7 +415,6 @@ miniGun = defaultAutoGun
     , _itIdentity = MiniGun
     , _wpMaxAmmo = 150
     , _wpLoadedAmmo = 150
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 200
     , _wpReloadState = 0
     , _wpFireRate = 2
@@ -448,7 +435,6 @@ spreadGun = defaultGun
     , _itIdentity = SpreadGun
     , _wpMaxAmmo = 5
     , _wpLoadedAmmo = 5
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 20
@@ -472,7 +458,6 @@ spreadGun = defaultGun
 --     , _itIdentity = ShatterGun
 --     , _wpMaxAmmo = 50
 --     , _wpLoadedAmmo = 50
---     , _wpAmmoType = PistolBullet
 --     , _wpReloadTime = 80
 --     , _wpReloadState = 0
 --     , _wpFireRate = 40
@@ -492,7 +477,6 @@ multGun = defaultGun
     , _itIdentity = MultGun
     , _wpMaxAmmo = 2
     , _wpLoadedAmmo = 2
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 40
     , _wpReloadState = 0
     , _wpFireRate = 20
@@ -523,7 +507,6 @@ longGun = defaultGun
     , _itIdentity = LongGun
     , _wpMaxAmmo = 1
     , _wpLoadedAmmo = 1
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 80
     , _wpReloadState = 0
     , _wpFireRate = 100
@@ -564,7 +547,6 @@ poisonSprayer = defaultAutoGun
     , _itIdentity = PoisonSprayer
     , _wpMaxAmmo = 500
     , _wpLoadedAmmo = 500
-    , _wpAmmoType = LiquidFuel
     , _wpReloadTime = 100
     , _wpReloadState = 0
     , _wpFireRate = 0
@@ -586,7 +568,6 @@ flamer = defaultAutoGun
     , _itIdentity = Flamethrower
     , _wpMaxAmmo = 250
     , _wpLoadedAmmo = 250
-    , _wpAmmoType = LiquidFuel
     , _wpReloadTime = 100
     , _wpReloadState = 0
     , _wpFireRate = 0
@@ -610,7 +591,6 @@ blinkGun = defaultGun
     , _itIdentity = Blinker
     , _wpMaxAmmo = 100
     , _wpLoadedAmmo = 100
-    , _wpAmmoType = Battery
     , _wpReloadTime = 20
     , _wpReloadState = 0
     , _wpFireRate = 0
@@ -1982,7 +1962,6 @@ radar = defaultGun
     , _itIdentity = Generic
     , _wpMaxAmmo = 100
     , _wpLoadedAmmo = 100
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 200
     , _wpReloadState = 0
     , _wpFireRate = 120
@@ -2004,7 +1983,6 @@ sonar = defaultGun
     , _itIdentity = Generic
     , _wpMaxAmmo = 100
     , _wpLoadedAmmo = 100
-    , _wpAmmoType = PistolBullet
     , _wpReloadTime = 200
     , _wpReloadState = 0
     , _wpFireRate = 120

src/Dodge/Item/Weapon/TriggerType.hs

@@ -2,7 +2,7 @@ module Dodge.Item.Weapon.TriggerType
     where
 import Dodge.Data
 import Dodge.SoundLogic
-import Dodge.CreatureActions (reloadWeapon)
+import Dodge.CreatureAction (reloadWeapon)
 import Dodge.WorldActions (muzFlareAt,lowLightAt,tLightAt)
 import Dodge.RandomHelp