Continue weapon refactor, gas combinations

src/Dodge/Data/Item/Use.hs

@@ -74,9 +74,19 @@ data TriggerType = AutoTrigger
 data HeldParams
     = DefaultHeldParams
     | GasSprayParams
-        {_gasCreation :: GasCreate}
+        {_gasCreation :: GasCreate
+        , _recoil :: Float
+        , _torqueAfter :: Float
+        , _randomOffset :: Float
+        , _sidePush :: Float
+        , _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel
+                                        -- if >0, continue playing sound for
+                                        -- given time
+        , _weaponInvLock :: Int
+        , _weaponRepeat :: [Int]
+        }
     | BeamShooterParams
-        { _bulGunSound :: (SoundID, Int) -- if the int is 0, play sound on new channel
+        { _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel
             -- TODO remove duplicate
         }
     | BulletShooterParams
@@ -86,7 +96,7 @@ data HeldParams
         , _torqueAfter :: Float
         , _randomOffset :: Float
         , _sidePush :: Float
-        , _bulGunSound :: (SoundID, Int) -- if the int is 0, play sound on new channel
+        , _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel
                                         -- if >0, continue playing sound for
                                         -- given time
         , _weaponInvLock :: Int
@@ -106,7 +116,7 @@ data AmmoParams = BulletParams {_ampBullet :: Bullet}
         , _ampPjDraw :: ProjectileDraw
         , _ampPjCreation :: ProjectileCreate
         }
-    | GasParams {_ampCreateGas :: GasCreate}
+    | GasParams {_ampCreateGas :: GasFuel}
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data ScrollAttachParams
@@ -147,8 +157,12 @@ data MuzzleEffect
     | MuzzleTesla
     | MuzzleTractor
     | MuzzleLauncher
-    | MuzzleFlame
-    | MuzzleGas
+    | MuzzleNozzle
+        { _nzPressure :: GenFloat
+        , _nzMaxWalkAngle :: Float
+        , _nzCurrentWalkAngle :: Float
+        , _nzWalkSpeed :: Float
+        }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Muzzle = Muzzle