Tweak rockets, smoke

src/Dodge/Data/Item/Use/Consumption/Ammo.hs

@@ -18,7 +18,7 @@ import Dodge.Data.Bullet
 import Dodge.Data.Payload
 
 data ProjectileUpdate
-    = ThrustPU {_pjuStart :: Int, _pjuEnd :: Int, _pjuSmokeless :: Bool}
+    = ThrustPU {_pjuStart :: Int, _pjuEnd :: Int}
     | StartSpinPU {_pjuTime :: Int, _pjuCID :: Int, _pjuSpinAmound :: Int}
     | RemoteDirectionPU {_pjuStart :: Int, _pjuEnd :: Int}
     | ReduceSpinPU {_pjuReduceSpin :: Float}

src/Dodge/Data/Projectile.hs

@@ -13,11 +13,6 @@ import Data.Aeson.TH
 import Dodge.Data.Item.Use.Consumption.Ammo
 import Geometry.Data
 
-data ProjectileType
-    = Grenade
-    | Rocket {_rkHoming :: RocketHoming}
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data Projectile
     = Shell
         { _prjPos :: Point2
@@ -34,16 +29,29 @@ data Projectile
         }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+data ProjectileType
+    = Grenade
+    | Rocket 
+        {_rkHoming :: RocketHoming
+        ,_rkSmoke :: Maybe RocketSmoke
+        }
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
 data RocketHoming 
     = NoHoming 
     | HomeUsingRemoteScreen {_phRemoteID :: NewInt ItmInt}
     | HomeUsingTargeting {_phTargetingID :: NewInt ItmInt}
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
+data RocketSmoke
+    = ReducedRocketSmoke 
+    deriving (Show, Eq, Ord, Read) --Generic, Flat)
+
 
 makeLenses ''Projectile
 makeLenses ''ProjectileType
 makeLenses ''RocketHoming
 deriveJSON defaultOptions ''RocketHoming
+deriveJSON defaultOptions ''RocketSmoke
 deriveJSON defaultOptions ''ProjectileType
 deriveJSON defaultOptions ''Projectile