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
@@ -78,10 +78,10 @@ itemCombinations =
           , po [HELD RIFLE, cr PIPE] amr
           , po [HELD AMR, cr SPRING] autoAmr
 --           , po [HELD AMR, cr MOTOR] machineGun
-           , p [p 2 $ cr TUBE, o $ cr HARDWARE] launcher
-           , p [p 2 $ cr TUBE, o $ HELD LAUNCHER] (launcherX 2)
+           , p [p 2 $ cr TUBE, o $ cr HARDWARE] rLauncher
+           , p [p 2 $ cr TUBE, o $ HELD RLAUNCHER] (rLauncherX 2)
           ]
-        ++ [p [p 2 $ cr TUBE, o $ HELD (LAUNCHERX i)] (launcherX (i + 1)) | i <- [2 .. 9]]
+        ++ [p [p 2 $ cr TUBE, o $ HELD (RLAUNCHERX i)] (rLauncherX (i + 1)) | i <- [2 .. 9]]
        ++ [ po [cr LIGHTER, cr PUMP, cr CAN] flameSpitter
           , po [HELD FLAMESPITTER, cr CAN, cr PUMP] blowTorch
           , po [HELD FLAMESPITTER, cr STEELDRUM] flameThrower