Move bullet modifications from weapons to magazines

This commit is contained in:
2024-06-22 10:40:11 +01:00
parent a3eca3a674
commit a9ac974a2c
18 changed files with 254 additions and 277 deletions
-1
View File
@@ -44,7 +44,6 @@ data ItemParams
, _dbGap :: Float
}
| Attracting {_attractionPower :: Point2}
| BulletShooter
| Sprayer {_sprayNozzles :: [Nozzle]}
| AngleWalk
{ _maxWalkAngle :: Float
+1 -9
View File
@@ -75,15 +75,7 @@ data AttachParams
}
| TargetAttachParams
data AmmoParams = DefaultAmmoParams
| BulletParams
{ _bupEffect :: BulletEffect
, _bupSpawn :: BulletSpawn
, _bupDrag :: Float
, _bupWidth :: Float
, _bupTimer :: Int
, _bupDamages :: [Damage]
}
data AmmoParams = BulletParams {_ampBullet :: Bullet}
data ScrollAttachParams
= ZoomScrollParams
+3 -8
View File
@@ -44,19 +44,14 @@ data AmmoSourceType
data AmmoType
= ProjectileAmmo
{ _amPayload :: Payload
, _amString :: String
, _amPjDraw :: ProjectileDraw
, _amPjCreation :: ProjectileCreate
}
| BulletAmmo
{ _amString :: String
, _amBullet :: Bullet
}
| SmallBulletAmmo
| LargeBulletAmmo
| DroneAmmo
{_amString :: String}
| GasAmmo
{ _amString :: String
, _amCreateGas :: GasCreate
{ _amCreateGas :: GasCreate
}
| ForceFieldAmmo
{ _amForceFieldType :: ForceFieldType