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
@@ -9,32 +9,38 @@ import Dodge.Data.Item
 import qualified IntMapHelp as IM
 import Geometry.Data

-launcher :: Item
-launcher =
+rLauncher :: Item
+rLauncher =
    defaultHeldItem
        & itUse . heldDelay . rateMax .~ 20
        & itUse . heldAim . aimWeight .~ 8
        & itUse . heldAim . aimRange .~ 0.5
        & itUse . heldAim . aimStance .~ TwoHandOver
        & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
-        & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleLauncher
+        & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleRLauncher
+        & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 20 0
        & itAmmoSlots .~ singleAmmo LauncherAmmo
-        & itType .~ HELD LAUNCHER
+        & itType .~ HELD RLAUNCHER
        & itUse . heldParams . muzVel .~ ConstFloat 0
        & itUse . heldParams . rifling .~ ConstFloat 0
        & itUse . heldParams . recoil .~ 0
        & itUse . heldParams . torqueAfter .~ 0
        & itUse . heldParams . bulGunSound ?~ (tap4S, 0)

-launcherX :: Int -> Item
-launcherX i =
-    launcher
-        & itType .~ HELD (LAUNCHERX i)
+gLauncher :: Item
+gLauncher = rLauncher
+        & itType .~ HELD GLAUNCHER
+        & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleGLauncher
+
+rLauncherX :: Int -> Item
+rLauncherX i =
+    rLauncher
+        & itType .~ HELD (RLAUNCHERX i)
        & itUse . heldAim . aimMuzzles .~ getZipList 
            (ZipList [Muzzle (V2 20 0) a 0 | a <- angles] 
            <*> ZipList [0..] 
            <*> pure NoFlare
-            <*> pure MuzzleLauncher
+            <*> pure MuzzleRLauncher
            <*> pure (UseExactly 1)
            <*> pure 0
            )