Cleanup

2024-09-27 23:10:01 +01:00
parent 6c3d0d5def
commit d1690ed3ac
10 changed files with 124 additions and 194 deletions
@@ -18,22 +18,14 @@ import Dodge.Data.Payload
 data ProjectileDraw = DrawShell | DrawRemoteShell | DrawDrone | DrawBlankProjectile
    deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)

-data ProjectileCreate = CreateShell | CreateTrackingShell
-    deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
-
 data ProjectileUpdate
-    = PJThrust {_pjuStart :: Int, _pjuEnd :: Int}
-    | PJSpin {_pjuTime :: Int, _pjuCID :: Int, _pjuSpinAmound :: Int}
--    | PJTrack {_pjuStart :: Int, _pjuEnd :: Int, _pjuScreenID :: Int}
-    | PJRemoteSetDirection {_pjuStart :: Int, _pjuEnd :: Int, _pjuControllerID :: Maybe Int}
-    | PJReduceSpin {_pjuReduceSpin :: Float}
--    | PJRemoteDirection {_pjuStart :: Int, _pjuEnd :: Int, _pjuCID :: Int, _pjuITID :: Int}
--    | PJSetScope {_pjuITID :: Int}
-    | PJRetireRemote {_pjuScreenID :: Maybe Int, _pjuTimer :: Int, _pjuPJID :: Int}
-    | PJDecTimMvVel
--    | PJShellCollisionCheck
-    | PJRemoteShellCollisionCheck {_pjuScreenID :: Maybe Int}
--    | PJRemoteShellExplosion
+    = ThrustPU {_pjuStart :: Int, _pjuEnd :: Int}
+    | StartSpinPU {_pjuTime :: Int, _pjuCID :: Int, _pjuSpinAmound :: Int}
+    | RemoteDirectionPU {_pjuStart :: Int, _pjuEnd :: Int, _pjuControllerID :: Maybe Int}
+    | ReduceSpinPU {_pjuReduceSpin :: Float}
+    | DestroyPU {_pjuScreenID :: Maybe Int, _pjuTimer :: Int}
+    | TimePU
+    | CollisionEffectPU {_pjuScreenID :: Maybe Int}
    deriving (Show, Eq, Ord, Read) --Generic, Flat)

 data AmmoType
@@ -58,7 +50,6 @@ makeLenses ''ProjectileUpdate
 makeLenses ''AmmoType
 deriveJSON defaultOptions ''GasFuel
 deriveJSON defaultOptions ''ProjectileDraw
-deriveJSON defaultOptions ''ProjectileCreate
 deriveJSON defaultOptions ''ProjectileUpdate
 deriveJSON defaultOptions ''GasCreate
 deriveJSON defaultOptions ''ForceFieldType