Replace buggy circle seg intersection with a simpler test

2024-12-26 21:53:18 +00:00
parent 91ba6ee148
commit 0ef28c132e
29 changed files with 528 additions and 332 deletions
@@ -225,10 +225,10 @@ inventoryX c = case c of
            ]
    'M' -> stackedInventory
    'N' -> [zoomScope,laser,battery, sniperRifle, tinMag]
-    'O' -> [ launcherX 2
+    'O' -> [ rLauncherX 2
            , shellMag
            , shellMag
-            , launcherX 3
+            , rLauncherX 3
            , shellMag
            , shellMag
            , shellMag
@@ -243,19 +243,20 @@ inventoryX c = case c of
        [ battery
        , laser
        , augmentedHUD
-        , launcher
+        , rLauncher
        , megaShellMag
        , homingModule
        , remoteScreen
        , remoteController
        , remoteDetonator
-        , launcherX 3
+        , rLauncherX 3
        , megaShellMag
        , homingModule
        , megaShellMag
        , homingModule
        , megaShellMag
        , homingModule
+        , gLauncher
        ]
        <> [shellModule p | p <- [minBound .. maxBound]]
    'V' -> 
@@ -317,9 +318,9 @@ stackedInventory =
    , bulletSynthesizer
    , zoomScope
    , drumMag
-    , launcherX 3
-    , megaShellMag
+    , rLauncher
    , megaShellMag
+    , gLauncher
    , megaShellMag
    , pipe
    , timeScroller