Replace buggy circle seg intersection with a simpler test

src/Dodge/Data/Item/Combine.hs

@@ -148,8 +148,9 @@ data HeldItemType
     | TESLAGUN
     | LASER
     | TRACTORGUN
-    | LAUNCHER
-    | LAUNCHERX {_xNum :: Int}
+    | RLAUNCHER
+    | RLAUNCHERX {_xNum :: Int}
+    | GLAUNCHER
     | POISONSPRAYER
     | SHATTERGUN
     | TORCH

src/Dodge/Data/Item/Use.hs

@@ -140,7 +140,8 @@ data MuzzleEffect
     | MuzzleLaser
     | MuzzleTesla
     | MuzzleTractor
-    | MuzzleLauncher
+    | MuzzleRLauncher
+    | MuzzleGLauncher
     | MuzzleNozzle
         { _nzPressure :: GenFloat
         , _nzMaxWalkAngle :: Float

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

@@ -37,6 +37,7 @@ data ProjectileUpdate
         ,_pjuDetonatorID :: Maybe (NewInt ItmInt)
         ,_pjuScreenID :: Maybe (NewInt ItmInt)
         }
+    | ApplyGravityPU
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 data AmmoType

src/Dodge/Data/Projectile.hs

@@ -14,7 +14,6 @@ import Geometry.Data
 data Projectile
     = Shell
         { _prjPos :: Point2
-        , _prjStartPos :: Point2
         , _prjVel :: Point2
         , _prjAcc :: Point2
         , _prjDir :: Float
@@ -24,6 +23,7 @@ data Projectile
         , _prjPayload :: Payload
         , _prjTimer :: Int
         , _prjZ :: Float
+        , _prjZVel :: Float
         , _prjUpdates :: [ProjectileUpdate]
         }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)