Partially refactor ammo extraction, work on pulse rifle
This commit is contained in:
@@ -62,7 +62,6 @@ data CraftType
|
||||
| PUMP
|
||||
| MOTOR
|
||||
| TRANSFORMER
|
||||
| CAPACITOR
|
||||
| PRISM
|
||||
| LIGHTER
|
||||
| MAGNET
|
||||
@@ -101,6 +100,7 @@ data AttachType
|
||||
| SMOKEREDUCER
|
||||
| HOMINGMODULE
|
||||
| SHELLPAYLOAD {_shellPayload :: Payload}
|
||||
| CAPACITOR
|
||||
deriving (Eq, Ord, Show, Read)
|
||||
|
||||
data AmmoMagType
|
||||
|
||||
@@ -10,7 +10,7 @@ data Muzzle = Muzzle
|
||||
{ _mzPos :: V2 Float
|
||||
, _mzRot :: Float
|
||||
, _mzInaccuracy :: Float
|
||||
, _mzAmmoSlot :: Int
|
||||
, _mzAmmoSlot :: AmmoExtractPosition
|
||||
, _mzFlareType :: FlareType
|
||||
, _mzEffect :: MuzzleEffect
|
||||
, _mzAmmoPerShot :: AmmoPerShot
|
||||
@@ -18,6 +18,9 @@ data Muzzle = Muzzle
|
||||
}
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data AmmoExtractPosition = MagBelow Int | CapacitorBelow Int | CapacitorSelf
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data FlareType
|
||||
= NoFlare
|
||||
| BasicFlare
|
||||
@@ -32,6 +35,7 @@ data MuzzleEffect
|
||||
= MuzzleShootBullet
|
||||
| MuzzleLaser
|
||||
| MuzzlePulseLaser
|
||||
| MuzzlePulseBall
|
||||
| MuzzleTesla
|
||||
| MuzzleTractor
|
||||
| MuzzleRLauncher
|
||||
|
||||
Reference in New Issue
Block a user