From 4c3e23bcb93d41d4306aeb9f176b9f5c88c0aa95 Mon Sep 17 00:00:00 2001 From: Zedb0T <89345505+Zedb0T@users.noreply.github.com> Date: Sun, 17 Jul 2022 14:14:57 -0400 Subject: [PATCH] Pc port debug small qol (#1663) * Enable L2 'boost if cheatmode is on and PC PORT Nice QOL * Enable daxter intro CS skip in retail mode on PC_PORT * Add empty jak1 folder in ISO_DATA We can revert this if we want but yeah I just think its more convenient by a tiny tiny tiny amount * Fix typo in comment to be consistant This probably isn't a typo but like a EU/US thing or something however I changed it just to be consistent with the other 382 instances in the port. * Add gitignore back to root ISO_Data folder * Remove early mention of Jak 2 * Update .gitignore !**/.gitignore --- goal_src/jak1/engine/entity/entity.gc | 2 +- goal_src/jak1/levels/racer_common/target-racer.gc | 2 +- goal_src/jak1/levels/title/title-obs.gc | 2 +- iso_data/.gitignore | 5 ++++- iso_data/jak1/.gitignore | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 iso_data/jak1/.gitignore diff --git a/goal_src/jak1/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc index 361362f261..d86550aae7 100644 --- a/goal_src/jak1/engine/entity/entity.gc +++ b/goal_src/jak1/engine/entity/entity.gc @@ -1966,7 +1966,7 @@ ((and (= (-> e tag i name) 'text-id) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) int32)) (format *debug-temp-string* " (game-text-id ~S)" (enum->string game-text-id (-> (the (pointer int32) data) 0))) ) - ;; eco-info, like in vents, crates, or collectibles in general + ;; eco-info, like in vents, crates, or collectables in general ((and (= (-> e tag i name) 'eco-info) (= (-> e tag i elt-count) 2) (= (-> e tag i elt-type) int32)) (format *debug-temp-string* " ~S " (pickup-type->string (the-as pickup-type (-> (the (pointer int32) data) 0)))) (if (= (pickup-type fuel-cell) (-> (the (pointer int32) data) 0)) diff --git a/goal_src/jak1/levels/racer_common/target-racer.gc b/goal_src/jak1/levels/racer_common/target-racer.gc index 3ce5827055..ec6378f927 100644 --- a/goal_src/jak1/levels/racer_common/target-racer.gc +++ b/goal_src/jak1/levels/racer_common/target-racer.gc @@ -842,7 +842,7 @@ (if (and (>= (-> self racer heat) (-> *RACER-bank* heat-max)) (= (-> self game mode) 'play)) (send-event self 'attack #f (static-attack-info ((mode 'heat)))) ) - (if (and *cheat-mode* *debug-segment* (cpad-pressed? 0 l2)) + (if (and *cheat-mode* (or *debug-segment* PC_PORT) (cpad-pressed? 0 l2)) (send-event self 'boost 1.0) ) (let ((v1-218 (- (-> *display* base-frame-counter) (-> self racer boost-time)))) diff --git a/goal_src/jak1/levels/title/title-obs.gc b/goal_src/jak1/levels/title/title-obs.gc index d5b68c8493..1620f9d2ff 100644 --- a/goal_src/jak1/levels/title/title-obs.gc +++ b/goal_src/jak1/levels/title/title-obs.gc @@ -483,7 +483,7 @@ ) :trans (behavior () ((-> (method-of-type logo startup) trans)) - (if (and *debug-segment* + (if (and (or *debug-segment* PC_PORT) (cpad-pressed? 0 start circle x) (member (level-status *level* 'village1) '(loaded active)) ) diff --git a/iso_data/.gitignore b/iso_data/.gitignore index d6b7ef32c8..9de2d8d96b 100644 --- a/iso_data/.gitignore +++ b/iso_data/.gitignore @@ -1,2 +1,5 @@ * -!.gitignore +!**/.gitignore +# Add Empty folders to place your assets. + + diff --git a/iso_data/jak1/.gitignore b/iso_data/jak1/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/iso_data/jak1/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore