mirror of
https://github.com/open-goal/jak-project
synced 2026-08-17 05:31:46 -04:00
jak2 ref
This commit is contained in:
Hat Kid
+1
-1
@@ -5256,7 +5256,7 @@
|
||||
0
|
||||
0
|
||||
0
|
||||
(let* ((minutes (the int (* 0.016666668 time)))
|
||||
(let* ((minutes (the int (/ time 60)))
|
||||
(remainder-minutes (- time (* 60.0 (the float minutes))))
|
||||
(seconds (the int remainder-minutes))
|
||||
(remainder-seconds (- remainder-minutes (the float seconds)))
|
||||
|
||||
+31
-31
@@ -1167,14 +1167,14 @@
|
||||
(seek-ease
|
||||
(-> self menu-transition)
|
||||
0.0
|
||||
(* 0.1 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 10)
|
||||
0.4
|
||||
(* 0.01 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 100)
|
||||
)
|
||||
)
|
||||
)
|
||||
(else
|
||||
(seek! (-> self menu-transition) 1.0 (* 0.1 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> self menu-transition) 1.0 (/ (-> self clock time-adjust-ratio) 10))
|
||||
(when (and (= (-> self menu-transition) 1.0)
|
||||
(or (and (nonzero? (-> self state-pos)) (= (-> self anim-frame) 1.0))
|
||||
(or (and (zero? (-> self state-pos)) (= (-> self anim-frame) 0.0))
|
||||
@@ -1215,12 +1215,12 @@
|
||||
(if (= (-> self ring-angle) (-> self ring-want-angle))
|
||||
(respond-to-cpad self)
|
||||
)
|
||||
(let ((f30-0 (* 0.005 (-> self clock time-adjust-ratio))))
|
||||
(let ((f30-0 (/ (-> self clock time-adjust-ratio) 200)))
|
||||
(cond
|
||||
((= (-> self menu-transition) 1.0)
|
||||
(if (and (zero? (-> self state-pos)) (= (-> *progress-state* starting-state) 'main))
|
||||
(seek! (-> self anim-frame) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> self anim-frame) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> self anim-frame) 0.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
(seek! (-> self anim-frame) 1.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
)
|
||||
(let ((f0-27 (if (and (zero? (-> self state-pos)) (!= (-> *progress-state* starting-state) 'title))
|
||||
0.0
|
||||
@@ -1230,14 +1230,14 @@
|
||||
)
|
||||
(when (= (-> self next) 'bigmap)
|
||||
(set! f0-27 0.4)
|
||||
(set! f30-0 (* 0.008 (-> self clock time-adjust-ratio)))
|
||||
(set! f30-0 (/ (-> self clock time-adjust-ratio) 125))
|
||||
)
|
||||
(seek! (-> self pos-transition) f0-27 f30-0)
|
||||
)
|
||||
)
|
||||
((zero? (-> self state-pos))
|
||||
(if (= (-> self current) 'bigmap)
|
||||
(set! f30-0 (* 0.05 (-> self clock time-adjust-ratio)))
|
||||
(set! f30-0 (/ (-> self clock time-adjust-ratio) 20))
|
||||
)
|
||||
(if (!= (-> *progress-state* starting-state) 'title)
|
||||
(seek! (-> self pos-transition) 0.0 f30-0)
|
||||
@@ -1288,9 +1288,9 @@
|
||||
(set! (-> self swing) (seek-ease
|
||||
(-> self swing)
|
||||
4.0
|
||||
(* 0.05 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 20)
|
||||
0.5
|
||||
(* 0.005 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 200)
|
||||
)
|
||||
)
|
||||
(set! (-> self swing) (seek-ease
|
||||
@@ -1464,9 +1464,9 @@
|
||||
(set! (-> self scanlines-alpha) (seek-ease
|
||||
(-> self scanlines-alpha)
|
||||
(- 1.0 (-> self menu-transition))
|
||||
(* 0.05 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 20)
|
||||
0.3
|
||||
(* 0.001 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 1000)
|
||||
)
|
||||
)
|
||||
(end-scan sv-152 (-> self scanlines-alpha))
|
||||
@@ -1769,16 +1769,16 @@
|
||||
)
|
||||
)
|
||||
:trans (behavior ()
|
||||
(seek! (-> self anim-frame) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> self anim-frame) 0.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
(cond
|
||||
((= (-> self anim-frame) 0.0)
|
||||
(seek! (-> self pos-transition) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> self pos-transition) 1.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
(if (= (-> self pos-transition) 1.0)
|
||||
(go-virtual gone)
|
||||
)
|
||||
)
|
||||
(else
|
||||
(seek! (-> self pos-transition) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> self pos-transition) 0.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
)
|
||||
)
|
||||
(set-ring-position self)
|
||||
@@ -1926,13 +1926,13 @@
|
||||
(arg1
|
||||
(cond
|
||||
((cpad-hold? 0 left l-analog-left)
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 0.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
(if (!= (-> (the-as (pointer float) gp-0)) 0.0)
|
||||
(set! s4-0 #t)
|
||||
)
|
||||
)
|
||||
((cpad-hold? 0 right l-analog-right)
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 1.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
(if (!= (-> (the-as (pointer float) gp-0)) 1.0)
|
||||
(set! s4-0 #t)
|
||||
)
|
||||
@@ -1945,13 +1945,13 @@
|
||||
(else
|
||||
(cond
|
||||
((cpad-hold? 0 left l-analog-left)
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 0.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
(if (!= (-> (the-as (pointer float) gp-0)) 0.0)
|
||||
(set! s4-0 #t)
|
||||
)
|
||||
)
|
||||
((cpad-hold? 0 right l-analog-right)
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
|
||||
(seek! (-> (the-as (pointer float) gp-0)) 1.0 (/ (-> self clock time-adjust-ratio) 50))
|
||||
(if (!= (-> (the-as (pointer float) gp-0)) 1.0)
|
||||
(set! s4-0 #t)
|
||||
)
|
||||
@@ -2952,9 +2952,9 @@
|
||||
(set! (-> arg0 sliding-height) (seek-ease
|
||||
(-> arg0 sliding-height)
|
||||
0.0
|
||||
(* 0.1 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 10)
|
||||
0.3
|
||||
(* 0.001 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 1000)
|
||||
)
|
||||
)
|
||||
(let ((s4-0 #f))
|
||||
@@ -3048,9 +3048,9 @@
|
||||
(set! (-> arg0 sliding-height) (seek-ease
|
||||
(-> arg0 sliding-height)
|
||||
0.0
|
||||
(* 0.1 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 10)
|
||||
0.3
|
||||
(* 0.01 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 100)
|
||||
)
|
||||
)
|
||||
(let ((gp-0 #f))
|
||||
@@ -3133,9 +3133,9 @@
|
||||
(set! (-> arg0 sliding-height) (seek-ease
|
||||
(-> arg0 sliding-height)
|
||||
0.0
|
||||
(* 0.1 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 10)
|
||||
0.3
|
||||
(* 0.01 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 100)
|
||||
)
|
||||
)
|
||||
(let ((s5-0 #f))
|
||||
@@ -3183,17 +3183,17 @@
|
||||
(set! (-> progress sliding) (seek-ease
|
||||
(-> progress sliding)
|
||||
0.0
|
||||
(* 0.1 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 10)
|
||||
0.3
|
||||
(* 0.001 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 1000)
|
||||
)
|
||||
)
|
||||
(set! (-> progress sliding-off) (seek-ease
|
||||
(-> progress sliding-off)
|
||||
1.0
|
||||
(* 0.1 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 10)
|
||||
-0.3
|
||||
(* 0.001 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 1000)
|
||||
)
|
||||
)
|
||||
(when (-> *bigmap* progress-minimap)
|
||||
@@ -3263,9 +3263,9 @@
|
||||
(set! (-> arg0 sliding) (seek-ease
|
||||
(-> arg0 sliding)
|
||||
0.0
|
||||
(* 0.1 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 10)
|
||||
0.3
|
||||
(* 0.001 (-> self clock time-adjust-ratio))
|
||||
(/ (-> self clock time-adjust-ratio) 1000)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
|
||||
Reference in New Issue
Block a user