fix crates and shit

goal_src/jak1/engine/common-obs/crates.gc

@@ -540,7 +540,7 @@
     (suspend)
     (update-transforms! (-> self root))
     (logior! (-> self mask) (process-mask sleep))
-    (if (and (-> *randomizer-settings* warp-on-orb?) (= (-> self defense) 'steel))
+    (if (and (= (-> self fact pickup-type) (pickup-type money)) (-> *randomizer-settings* warp-on-orb?)) ;; pre-break crates if we're warping on orb
       (go-virtual die #f 0)
       )
     (loop
@@ -631,7 +631,8 @@
     (behavior ((arg0 symbol) (arg1 int))
       (clear-collide-with-as (-> self root))
       (if (nonzero? (-> self sound)) (stop! (-> self sound)))
-      (if (and *target* (not (-> *randomizer-settings* warp-on-orb?))
+      (if (and *target* 
+               (not (and (= (-> self fact pickup-type) (pickup-type money)) (-> *randomizer-settings* warp-on-orb?))) ;; if orb crate and warp on orb, no instant collect
                (and (logtest? (-> *target* control root-prim prim-core action) (collide-action racer snowball tube flut))
                     (!= (-> self fact pickup-type) 6)
                     (not arg0)))

goal_src/jak1/engine/target/target-death.gc

@@ -706,6 +706,9 @@
       (apply-settings *setting-control*)
       (set! (-> self control transv quad) (the-as uint128 0))
       (logior! (-> self state-flags) (state-flags dying))
+      (when (and (-> *randomizer-settings* checkpoint-randomizer?) (-> *randomizer-settings* warp-on-death?))
+        (orchestrateCheckpointWarp 1)
+        )
       (case arg0
         (('none 'instant-death))
         (('ogreboss-super-boulder)
@@ -887,9 +890,6 @@
         (else
          (case arg0
            (('tar) (sound-play "death-drown")))
-         (when (and (-> *randomizer-settings* checkpoint-randomizer?) (-> *randomizer-settings* warp-on-death?))
-          (orchestrateCheckpointWarp 1)
-          )
          (+! (-> *game-info* death-movie-tick) 1)
          (if (= (death-movie-remap (+ (-> *game-info* death-movie-tick) -1) (-> *death-spool-array* length))
                 (death-movie-remap (-> *game-info* death-movie-tick) (-> *death-spool-array* length)))

goal_src/jak1/engine/ui/hud-classes.gc

@@ -893,7 +893,7 @@
                                   (- string-y 5)
                                   (font-color yellow)
                                   (font-flags shadow kerning middle large)
-                                  0.8)))
+                                  0.8))))
         (((hud-collectable-view original))
          ;; show original (cells collected across entire game)
          (draw-string-xy (string-format "~D" (-> this value))

goal_src/jak1/engine/ui/text-h.gc

@@ -849,55 +849,6 @@
   (checkpoint-swamp-flutflut    #x1755)
   (checkpoint-village3-cart     #x1756)
 
-  ;; Mod Options
-  (mod-options                  #x1700)
-  (checkpoint-randomizer        #x1701)
-  (custom-challenges            #x1702)
-  (rng-lib                      #x1703)
-  (mod-powercellcutscenes       #x1704)
-  (additional-checkpoints       #x1705)
-
-  ;; Checkpoint Randomizer
-  (item-count-to-trigger-warp   #x1710)
-  (use-random-seed?             #x1711)
-  (randomizer-random-seed       #x1712)
-  (randomizer-set-seed          #x1713)
-  (randomizer-warp-options      #x1714)
-  (checkpoint-warpcells?        #x1715)
-  (checkpoint-warporbs?         #x1716)
-  (checkpoint-warpbuzzer?       #x1717)
-  (checkpoint-warpgreeneco?     #x1718)
-  (checkpoint-warpblueeco?      #x1719)
-  (checkpoint-warpredeco?       #x171a)
-  (checkpoint-warpyelloweco?    #x171b)
-  (checkpoint-warpecovents?     #x171c)
-  (checkpoint-warpdeath?        #x171d)
-  (show-warp-counter?           #x171e)
-  (checkpoint-logic             #x171f)
-  (logic-random-checkpoint      #x1720)
-  (logic-random-level           #x1721)
-
-  ;;Challenges
-  (challenges-orbless           #x1730)
-  (challenges-hardcore          #x1731)
-  (challenges-damageless        #x1732)
-  (challenges-bonkless          #x1733)
-  (challenges-casual            #x1734)
-  (challenges-pacifist          #x1735)
-
-  ;;RNG Library
-  (rand-vu                      #x1740)
-  (knuth                        #x1741)
-
-  ;;Additional Checkpoints
-  (checkpoint-training-far      #x1750)
-  (checkpoint-village1-far      #x1751)
-  (checkpoint-beach-pelican     #x1752)
-  (checkpoint-beach-far         #x1753)
-  (checkpoint-jungle-far        #x1754)
-  (checkpoint-swamp-flutflut    #x1755)
-  (checkpoint-village3-cart     #x1756)
-
   ;; mod text mod-base-change
   (pad-triangle #x2000)
   (pad-circle #x2001)

goal_src/jak1/pc/progress-pc.gc

@@ -2106,9 +2106,14 @@
   (set! (-> *options-remap* (progress-screen checkpoint-select)) *checkpoint-select-options*)
   (set! (-> *options-remap* (progress-screen music-player)) *music-player-options*)
   (set! (-> *options-remap* (progress-screen flava-player)) *temp-options*)
+  (set! (-> *options-remap* (progress-screen randomizer-main-options))    *randomizer-main-options*)
+  (set! (-> *options-remap* (progress-screen randomizer-warp-options))    *randomizer-warp-options*)
+  (set! (-> *options-remap* (progress-screen challenges-options))         *challenges-options*)
+  (set! (-> *options-remap* (progress-screen mod-options))                *mod-options*)
   (set! (-> *options-remap* (progress-screen memcard-disable-auto-save)) *yes-no-options*)
   (set! (-> *options-remap* (progress-screen memcard-auto-save-disabled)) *ok-options*)
   (set! (-> *options-remap* (progress-screen monitor)) *temp-options*)
+  (set! (-> *options-remap* (progress-screen additional-checkpoint-options)) *additional-checkpoint-options*)
   (set! (-> *options-remap* (progress-screen speedrun-options)) *speedrun-options*)
   (set! (-> *options-remap* (progress-screen speedrun-il-options)) *speedrun-il-options*)
   (set! (-> *options-remap* (progress-screen speedrun-cat-ext-options)) *speedrun-cat-ext-options*)