Merge pull request #7 from OpenGOAL-Mods/break-creats-if-orb-warp-is-…

…true Only dont pick up orbs if warp on orb is on
OpenGOAL-Mods · Apr 8, 2024 · 38bafc5 · 38bafc5
2 parents fe04916 + c1150b3
commit 38bafc5
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/goal_src/jak1/engine/common-obs/crates.gc b/goal_src/jak1/engine/common-obs/crates.gc
@@ -798,14 +798,14 @@
     (if (nonzero? (-> self sound))
         (stop! (-> self sound))
         )
-    ;; (if (and *target*
-    ;;          (and (logtest? (-> *target* control root-prim prim-core action) (collide-action racer snowball tube flut))
-    ;;               (!= (-> self fact pickup-type) 6)
-    ;;               (not arg0)
-    ;;               )
-    ;;          )
-    ;;     (logior! (-> self fact options) (fact-options instant-collect))
-    ;;     )
+    (if (and *target* (not (-> *randomizer-settings* warp-on-orb?))
+             (and (logtest? (-> *target* control root-prim prim-core action) (collide-action racer snowball tube flut))
+                  (!= (-> self fact pickup-type) 6)
+                  (not arg0)
+                  )
+             )
+        (logior! (-> self fact options) (fact-options instant-collect))
+        )
     (when (not arg0)
       (let ((s5-1 (current-time)))
         (until (time-elapsed? s5-1 (seconds 0.04))