From a63cb1d21265ce7387c5d0e8d920b0d2bc27a2f0 Mon Sep 17 00:00:00 2001 From: Matt Dallmeyer Date: Sat, 18 Apr 2026 15:47:36 -0700 Subject: [PATCH] [jak2/jak3] Fix off by one bug in trick display (#4224) fixes #3150 the scoring system counts up to 16 (point-scoring) tricks, but the opengoal-secret display system was ignoring the 16th one, causing score discrepancies --- goal_src/jak2/engine/target/board/target-board.gc | 2 +- goal_src/jak3/engine/target/board/target-board.gc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goal_src/jak2/engine/target/board/target-board.gc b/goal_src/jak2/engine/target/board/target-board.gc index 26cebe1d7f..3f89d513ea 100644 --- a/goal_src/jak2/engine/target/board/target-board.gc +++ b/goal_src/jak2/engine/target/board/target-board.gc @@ -46,7 +46,7 @@ (when (not (-> this combo-in-progress?)) (set! (-> this combo-in-progress?) #t) (reset-combo! this)) - (when (< (-> this num-tricks-in-combo) 15) + (when (< (-> this num-tricks-in-combo) 16) (set! (-> this tricks-in-combo (-> this num-tricks-in-combo)) trick) (set! (-> this num-tricks-in-combo) (inc (-> this num-tricks-in-combo))) (set! (-> this points-in-combo) (+ (-> this points-in-combo) points))) diff --git a/goal_src/jak3/engine/target/board/target-board.gc b/goal_src/jak3/engine/target/board/target-board.gc index 54245943b3..a1d2336c48 100644 --- a/goal_src/jak3/engine/target/board/target-board.gc +++ b/goal_src/jak3/engine/target/board/target-board.gc @@ -26,7 +26,7 @@ (when (not (-> this combo-in-progress?)) (set! (-> this combo-in-progress?) #t) (reset-combo! this)) - (when (< (-> this num-tricks-in-combo) 15) + (when (< (-> this num-tricks-in-combo) 16) (set! (-> this tricks-in-combo (-> this num-tricks-in-combo)) trick) (set! (-> this num-tricks-in-combo) (inc (-> this num-tricks-in-combo))) (set! (-> this points-in-combo) (+ (-> this points-in-combo) points)))