From e5b9c6416cd5c8325e1b1ca58cf833aea74bfcc8 Mon Sep 17 00:00:00 2001 From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> Date: Sat, 7 Dec 2024 21:08:45 +0100 Subject: [PATCH] jak3 gsrc --- goal_src/jak3/engine/camera/cam-layout.gc | 2 +- goal_src/jak3/engine/camera/cam-master.gc | 12 ++---- goal_src/jak3/engine/camera/cam-states-dbg.gc | 16 ++++---- goal_src/jak3/engine/camera/cam-states.gc | 4 +- goal_src/jak3/engine/camera/camera.gc | 18 ++++---- goal_src/jak3/engine/collide/collide-touch.gc | 2 +- .../jak3/engine/common-obs/blocking-plane.gc | 8 ++-- .../jak3/engine/common-obs/collectables.gc | 10 ++--- goal_src/jak3/engine/common-obs/crates.gc | 13 +++--- .../jak3/engine/common-obs/enemy-states.gc | 19 +++++---- .../engine/common-obs/guard-projectile.gc | 2 +- .../engine/common-obs/metalhead-projectile.gc | 2 +- goal_src/jak3/engine/common-obs/water.gc | 4 +- .../jak3/engine/debug/collision-editor.gc | 2 +- goal_src/jak3/engine/debug/default-menu.gc | 30 +++++++------- goal_src/jak3/engine/debug/manipulator.gc | 22 +++++----- goal_src/jak3/engine/game/effect-control.gc | 2 +- goal_src/jak3/engine/game/game-info.gc | 12 +++--- goal_src/jak3/engine/game/settings.gc | 2 +- goal_src/jak3/engine/game/task/task-arrow.gc | 4 +- .../engine/gfx/background/hfrag/hfrag-work.gc | 2 +- .../jak3/engine/gfx/background/hfrag/hfrag.gc | 10 ++--- goal_src/jak3/engine/gfx/blit-displays.gc | 8 ++-- goal_src/jak3/engine/gfx/foreground/ripple.gc | 2 +- .../gfx/generic/lightning/lightning-new.gc | 8 ++-- goal_src/jak3/engine/gfx/hw/video.gc | 2 +- goal_src/jak3/engine/gfx/mood/mood-tables2.gc | 4 +- goal_src/jak3/engine/gfx/mood/mood.gc | 8 ++-- goal_src/jak3/engine/gfx/ocean/ocean-mid.gc | 4 +- goal_src/jak3/engine/gfx/ocean/ocean-near.gc | 4 +- .../jak3/engine/gfx/ocean/ocean-texture.gc | 6 +-- goal_src/jak3/engine/gfx/ocean/ocean.gc | 20 ++++----- .../gfx/sprite/particles/light-trails.gc | 6 +-- .../engine/gfx/sprite/particles/sparticle.gc | 4 +- .../jak3/engine/gfx/sprite/sprite-distort.gc | 4 +- .../jak3/engine/gfx/sprite/sprite-glow.gc | 2 +- goal_src/jak3/engine/nav/nav-mesh.gc | 2 +- goal_src/jak3/engine/physics/cloth.gc | 6 +-- goal_src/jak3/engine/physics/dynamics-h.gc | 6 +-- goal_src/jak3/engine/physics/ragdoll-edit.gc | 6 +-- goal_src/jak3/engine/physics/rigid-body.gc | 4 +- goal_src/jak3/engine/physics/trajectory.gc | 4 +- goal_src/jak3/engine/sound/gsound.gc | 11 ++--- .../jak3/engine/target/board/board-states.gc | 23 ++++++----- .../jak3/engine/target/board/target-board.gc | 16 ++++---- .../engine/target/collide-reaction-target.gc | 2 +- .../jak3/engine/target/gun/gun-blue-shot.gc | 15 +++---- .../jak3/engine/target/gun/gun-dark-shot.gc | 41 +++++++------------ goal_src/jak3/engine/target/gun/gun-part.gc | 2 +- .../jak3/engine/target/gun/gun-red-shot.gc | 10 ++--- .../jak3/engine/target/gun/gun-yellow-shot.gc | 14 ++++--- goal_src/jak3/engine/target/logic-target.gc | 2 +- goal_src/jak3/engine/target/mech/mech-part.gc | 2 +- .../jak3/engine/target/mech/mech-states.gc | 12 ++++-- goal_src/jak3/engine/target/surface-h.gc | 6 +-- goal_src/jak3/engine/target/target-anim.gc | 8 ++-- goal_src/jak3/engine/target/target-darkjak.gc | 6 +-- goal_src/jak3/engine/target/target-death.gc | 29 ++++++++----- goal_src/jak3/engine/target/target-gun.gc | 4 +- .../jak3/engine/target/target-invisible.gc | 10 +++-- goal_src/jak3/engine/target/target-launch.gc | 4 +- .../jak3/engine/target/target-lightjak.gc | 13 +++--- goal_src/jak3/engine/target/target-swim.gc | 4 +- goal_src/jak3/engine/target/target-tube.gc | 2 +- .../jak3/engine/target/target-turret-shot.gc | 2 +- goal_src/jak3/engine/target/target-util.gc | 10 ++--- goal_src/jak3/engine/target/target.gc | 6 +-- goal_src/jak3/engine/target/target2.gc | 25 +++++++---- goal_src/jak3/engine/ui/hud-classes.gc | 2 +- goal_src/jak3/engine/ui/hud.gc | 2 +- .../jak3/engine/ui/progress/progress-draw.gc | 24 ++++------- goal_src/jak3/engine/ui/progress/progress.gc | 37 ++++++++--------- goal_src/jak3/engine/ui/text.gc | 2 +- goal_src/jak3/engine/util/smush-control-h.gc | 2 +- goal_src/jak3/engine/util/sync-info.gc | 6 +-- .../levels/city/blow-tower/blow-tower-obs.gc | 16 ++++---- .../levels/city/blow-tower/blow-tower-obs2.gc | 31 ++++++++------ .../levels/city/blow-tower/cty-blow-tower.gc | 18 ++++---- goal_src/jak3/levels/city/bombbot/bombbot.gc | 6 +-- .../jak3/levels/city/common/guard-grenade.gc | 2 +- .../jak3/levels/city/common/guard-states.gc | 2 +- goal_src/jak3/levels/city/common/nav-graph.gc | 6 +-- goal_src/jak3/levels/city/common/trail.gc | 2 +- goal_src/jak3/levels/city/ctywide-obs.gc | 11 +++-- .../jak3/levels/city/hijack/cty-hijack.gc | 14 ++++--- .../jak3/levels/city/hijack/guide-arrow.gc | 2 +- .../levels/city/port/attack/ctyport-attack.gc | 18 ++++---- .../jak3/levels/city/port/attack/h-torpedo.gc | 22 +++++----- .../jak3/levels/city/protect/assault-task.gc | 11 +++-- .../jak3/levels/city/protect/flying-turret.gc | 8 ++-- .../levels/city/protect/protect-gunship.gc | 19 +++++---- .../levels/city/protect/roboguard-city.gc | 21 ++++++---- .../levels/city/sniper/cty-sniper-turret.gc | 32 ++++++++------- .../city/traffic/citizen/citizen-norm.gc | 2 +- .../levels/city/traffic/citizen/citizen.gc | 2 +- .../levels/city/traffic/citizen/civilian.gc | 2 +- .../city/traffic/citizen/metalhead-flitter.gc | 8 ++-- .../traffic/citizen/metalhead-predator.gc | 2 +- .../levels/city/traffic/traffic-engine.gc | 4 +- .../jak3/levels/city/traffic/vehicle/bike.gc | 16 ++++---- .../jak3/levels/city/traffic/vehicle/car.gc | 8 ++-- .../city/traffic/vehicle/vehicle-effects.gc | 12 +++--- .../city/traffic/vehicle/vehicle-physics.gc | 2 +- .../city/traffic/vehicle/vehicle-util.gc | 2 +- .../levels/city/traffic/vehicle/vehicle.gc | 4 +- .../levels/city/vinroom/ljkdxvin-texture.gc | 4 +- goal_src/jak3/levels/comb/comb-field.gc | 6 +-- goal_src/jak3/levels/comb/comb-sentry.gc | 5 ++- goal_src/jak3/levels/comb/h-sled.gc | 37 +++++++++-------- goal_src/jak3/levels/comb/railx-mood.gc | 2 +- goal_src/jak3/levels/common-obs/ladder.gc | 12 +++--- goal_src/jak3/levels/common/elec-gate.gc | 8 ++-- .../common/enemy/darkprec/dp-bipedal.gc | 2 +- .../levels/common/enemy/darkprec/neo-wasp.gc | 7 ++-- goal_src/jak3/levels/common/enemy/flitter.gc | 8 ++-- .../levels/common/enemy/hover/robo-hover.gc | 8 ++-- goal_src/jak3/levels/common/enemy/mantis.gc | 17 ++++---- .../common/enemy/prebot-eco-creature.gc | 14 +++---- goal_src/jak3/levels/common/enemy/spyder.gc | 5 +-- .../jak3/levels/common/enemy/spydroid-orig.gc | 11 ++--- goal_src/jak3/levels/common/enemy/spydroid.gc | 4 +- .../levels/common/external-player-control.gc | 4 +- .../levels/common/hvehicle/squad-control.gc | 2 +- .../levels/common/hvehicle/turret-control.gc | 2 +- .../jak3/levels/common/race/race-manager.gc | 6 +-- goal_src/jak3/levels/common/race/race-mesh.gc | 4 +- .../levels/desert/boss/terraformer-setup.gc | 4 +- .../jak3/levels/desert/des-burning-bush.gc | 8 ++-- goal_src/jak3/levels/desert/des-bush.gc | 4 +- goal_src/jak3/levels/desert/des-cactus.gc | 7 ++-- .../jak3/levels/desert/desert-dust-storm.gc | 8 ++-- .../jak3/levels/desert/hover/des-beast-2.gc | 14 ++++--- .../jak3/levels/desert/hover/des-beast.gc | 4 +- .../levels/desert/hover/deshover-texture.gc | 4 +- .../levels/desert/race/turtle-training.gc | 27 ++++++++---- .../levels/desert/rescue/desert-rescue.gc | 9 ++-- .../levels/desert/rescue/neo-satellite.gc | 12 +++--- .../desert/wvehicle/was-squad-control.gc | 2 +- .../levels/desert/wvehicle/wcar-marauder.gc | 2 +- .../levels/desert/wvehicle/wcar-mirage.gc | 2 +- .../desert/wvehicle/wcar-projectiles.gc | 4 +- .../jak3/levels/desert/wvehicle/wcar-rhino.gc | 2 +- .../levels/desert/wvehicle/wcar-scorpion.gc | 6 +-- .../jak3/levels/desert/wvehicle/wcar-toad.gc | 4 +- .../levels/desert/wvehicle/wcar-turtle.gc | 6 +-- .../levels/desert/wvehicle/wvehicle-ai.gc | 2 +- .../levels/desert/wvehicle/wvehicle-hud.gc | 2 +- .../desert/wvehicle/wvehicle-physics.gc | 12 +++--- .../levels/desert/wvehicle/wvehicle-states.gc | 4 +- .../jak3/levels/desert/wvehicle/wvehicle.gc | 6 +-- .../levels/factory/car/hvehicle-physics.gc | 8 ++-- .../jak3/levels/factory/car/hvehicle-util.gc | 2 +- goal_src/jak3/levels/factory/car/hvehicle.gc | 6 +-- .../levels/factory/fac-robotank-turret.gc | 16 +++++--- goal_src/jak3/levels/factory/fac-robotank.gc | 8 ++-- goal_src/jak3/levels/factory/fac-tower.gc | 9 ++-- .../levels/factory/factory-boss-states.gc | 4 +- .../jak3/levels/factory/factory-manager.gc | 2 +- .../jak3/levels/factory/ffight-projectile.gc | 2 +- .../jak3/levels/factory/ftank-projectile.gc | 2 +- .../jak3/levels/factory/fturret-projectile.gc | 2 +- goal_src/jak3/levels/factory/h-warf.gc | 14 +++---- goal_src/jak3/levels/factory/missile-bot.gc | 2 +- .../jak3/levels/factory/warf-projectile.gc | 4 +- .../jak3/levels/forest/for-turret-shot.gc | 2 +- goal_src/jak3/levels/forest/for-turret.gc | 2 +- goal_src/jak3/levels/forest/foresta-obs.gc | 2 +- goal_src/jak3/levels/glider/glider-manager.gc | 8 ++-- goal_src/jak3/levels/glider/h-glider.gc | 2 +- .../jak3/levels/hiphog/ltnfxhip-texture.gc | 4 +- .../jak3/levels/mhcity/destroy-dark-eco.gc | 8 ++-- goal_src/jak3/levels/mine/gekko.gc | 10 +++-- goal_src/jak3/levels/mine/manta.gc | 2 +- goal_src/jak3/levels/mine/mine-obs.gc | 11 +++-- goal_src/jak3/levels/mine/prebot-extras.gc | 4 +- goal_src/jak3/levels/mine/prebot-states.gc | 4 +- goal_src/jak3/levels/mine/rat.gc | 5 ++- goal_src/jak3/levels/nest/egg-spider.gc | 10 +++-- goal_src/jak3/levels/nest/mh-centipede.gc | 18 ++++---- .../jak3/levels/precursor/precura-obs2.gc | 9 ++-- goal_src/jak3/levels/sewer/mh-wasp.gc | 9 ++-- goal_src/jak3/levels/sewer/saberfish.gc | 6 ++- .../jak3/levels/sewer/sew-laser-turret.gc | 9 ++-- goal_src/jak3/levels/sewer/sew-whirlpool.gc | 2 +- .../jak3/levels/sewer/sewer-move-turret.gc | 2 +- .../jak3/levels/stadium/dm-mine-spider.gc | 8 ++-- goal_src/jak3/levels/stadium/rubble-part.gc | 4 +- goal_src/jak3/levels/temple/temple-obs.gc | 39 ++++++++++-------- goal_src/jak3/levels/temple/temple-obs2.gc | 2 +- .../jak3/levels/temple/templea-texture.gc | 8 ++-- goal_src/jak3/levels/volcano/volcano-obs.gc | 7 ++-- goal_src/jak3/levels/volcano/volcano-obs2.gc | 4 +- .../jak3/levels/volcano/volcano-scenes.gc | 4 +- goal_src/jak3/levels/volcano/volcanox-obs.gc | 8 ++-- .../jak3/levels/volcano/volcanox-texture.gc | 4 +- goal_src/jak3/levels/wascity/ctymark-obs.gc | 2 +- .../levels/wascity/defend/was-pre-game.gc | 34 +++++++-------- goal_src/jak3/levels/wascity/dm-flyer.gc | 2 +- goal_src/jak3/levels/wascity/tizard.gc | 8 ++-- .../jak3/levels/wascity/wascity-turret.gc | 9 ++-- .../jak3/levels/wascity/wasdef-manager.gc | 8 ++-- goal_src/jak3/levels/wascity/wasgun-hud.gc | 2 +- .../jak3/levels/wascity/wasgun-manager.gc | 9 ++-- .../levels/wascity/wasstadium/wasstadb-obs.gc | 8 ++-- .../levels/wascity/wasstadium/wasstadc-obs.gc | 24 +++++++---- goal_src/jak3/levels/wascity/wlander-male.gc | 2 +- 206 files changed, 906 insertions(+), 790 deletions(-) diff --git a/goal_src/jak3/engine/camera/cam-layout.gc b/goal_src/jak3/engine/camera/cam-layout.gc index fc7746d817..95e918b380 100644 --- a/goal_src/jak3/engine/camera/cam-layout.gc +++ b/goal_src/jak3/engine/camera/cam-layout.gc @@ -1072,7 +1072,7 @@ (defun fov->maya ((arg0 float)) (if (= arg0 0.0) 0.0 - (/ 12.700255 (tan (* 0.5 arg0))) + (/ 12.700255 (tan (/ arg0 2))) ) ) diff --git a/goal_src/jak3/engine/camera/cam-master.gc b/goal_src/jak3/engine/camera/cam-master.gc index abdd08ca09..5ca59215f7 100644 --- a/goal_src/jak3/engine/camera/cam-master.gc +++ b/goal_src/jak3/engine/camera/cam-master.gc @@ -231,10 +231,10 @@ (let ((f30-0 (vector-dot s5-7 (-> self local-down)))) (vector--float*! s5-7 s5-7 (-> self local-down) f30-0) (if (< 0.0 f30-0) - (set! (-> self upspeed) (* 0.5 (-> self upspeed))) + (set! (-> self upspeed) (/ (-> self upspeed) 2)) ) (vector+! (-> self tpos-tgt) (-> self tpos-tgt) s5-7) - (let ((f0-26 (* 0.05 f30-0))) + (let ((f0-26 (/ f30-0 20))) (vector+float*! (-> self tpos-tgt) (-> self tpos-tgt) (-> self local-down) f0-26) ) ) @@ -995,9 +995,7 @@ (-> self local-down) (vector-normalize-copy! (-> self local-down) (-> *standard-dynamics* gravity) 1.0) ) - (when (nonzero? cam-master-effect) ;; og:preserve-this not-yet-implemented check - (cam-master-effect) - ) + (cam-master-effect) ) ) :code (behavior () @@ -1059,9 +1057,7 @@ (let ((a1-4 (new-stack-vector0))) (tracking-spline-method-10 (-> self target-spline) a1-4) ) - (when (nonzero? group-rain-screend-drop) ;; og:preserve-this not-yet-implemented check - (set! (-> self water-drip) (create-launch-control group-rain-screend-drop self)) - ) + (set! (-> self water-drip) (create-launch-control group-rain-screend-drop self)) (set! (-> self water-drip-time) (seconds -60)) (go cam-master-active) 0 diff --git a/goal_src/jak3/engine/camera/cam-states-dbg.gc b/goal_src/jak3/engine/camera/cam-states-dbg.gc index f36e06d6d4..fea30383f2 100644 --- a/goal_src/jak3/engine/camera/cam-states-dbg.gc +++ b/goal_src/jak3/engine/camera/cam-states-dbg.gc @@ -47,10 +47,10 @@ ) (cond ((cpad-hold? (-> *CAMERA-bank* joypad) r2) - (set! (-> s5-0 y) (- (-> s5-0 y) (* 0.2 (-> *CAM_POINT_WATCH-bank* rot-speed) (- f26-0)))) - (set! (-> s5-0 x) (- (-> s5-0 x) (* 0.2 (-> *CAM_POINT_WATCH-bank* rot-speed) (- f0-0)))) - (+! (-> gp-0 x) (* 0.2 (-> *CAM_POINT_WATCH-bank* speed) f28-0)) - (+! (-> gp-0 z) (* 0.2 (-> *CAM_POINT_WATCH-bank* speed) f30-0)) + (set! (-> s5-0 y) (- (-> s5-0 y) (* (/ (-> *CAM_POINT_WATCH-bank* rot-speed) 5) (- f26-0)))) + (set! (-> s5-0 x) (- (-> s5-0 x) (* (/ (-> *CAM_POINT_WATCH-bank* rot-speed) 5) (- f0-0)))) + (+! (-> gp-0 x) (* (/ (-> *CAM_POINT_WATCH-bank* speed) 5) f28-0)) + (+! (-> gp-0 z) (* (/ (-> *CAM_POINT_WATCH-bank* speed) 5) f30-0)) ) (else (set! (-> s5-0 y) (- (-> s5-0 y) (* 2.0 (-> *CAM_POINT_WATCH-bank* rot-speed) (- f26-0)))) @@ -293,16 +293,16 @@ ((logtest? (-> (the-as cpad-list (+ (* arg4 4) (the-as int *cpad-list*))) cpads 0 button0-abs 0) (pad-buttons l2) ) - (set! (-> arg1 y) (- (-> arg1 y) (* 0.5 (-> *CAM_FREE-bank* rot-speed) (- f24-0)))) - (set! (-> arg1 x) (- (-> arg1 x) (* 0.5 (-> *CAM_FREE-bank* rot-speed) (- f0-19)))) + (set! (-> arg1 y) (- (-> arg1 y) (* (/ (-> *CAM_FREE-bank* rot-speed) 2) (- f24-0)))) + (set! (-> arg1 x) (- (-> arg1 x) (* (/ (-> *CAM_FREE-bank* rot-speed) 2) (- f0-19)))) ) (else (set! (-> arg1 y) (- (-> arg1 y) (* (- f24-0) (-> *CAM_FREE-bank* rot-speed)))) (set! (-> arg1 x) (- (-> arg1 x) (* (- f0-19) (-> *CAM_FREE-bank* rot-speed)))) ) ) - (+! (-> arg2 x) (* 0.2 f30-0 f26-2)) - (+! (-> arg2 z) (* 0.2 f30-0 f28-4)) + (+! (-> arg2 x) (* (/ f30-0 5) f26-2)) + (+! (-> arg2 z) (* (/ f30-0 5) f28-4)) ) ((and (not s3-0) (cpad-hold? arg4 l2)) (+! (-> arg2 x) (* f26-2 f30-0)) diff --git a/goal_src/jak3/engine/camera/cam-states.gc b/goal_src/jak3/engine/camera/cam-states.gc index 8bd1dc27e9..2776f90288 100644 --- a/goal_src/jak3/engine/camera/cam-states.gc +++ b/goal_src/jak3/engine/camera/cam-states.gc @@ -2443,7 +2443,7 @@ (set! f28-0 0.0) ) (if (-> self have-phony-joystick) - (set! f28-0 (* 0.05 (-> self phony-joystick-y))) + (set! f28-0 (/ (-> self phony-joystick-y) 20)) ) (if (and (-> *camera* being-attacked) (not (time-elapsed? (-> *camera* attack-start) (seconds 0.25)))) (set! f28-0 0.05) @@ -2466,7 +2466,7 @@ (let ((f0-23 f26-0)) (when (and (< f26-0 0.0) (not (logtest? (cam-slave-options BOMBBOT) (-> *camera* settings slave-options)))) (let ((f0-26 - (/ (- (-> self string-min-val z) (vector-length (-> self view-flat))) (* 0.5 (-> self string-min-val z))) + (/ (- (-> self string-min-val z) (vector-length (-> self view-flat))) (/ (-> self string-min-val z) 2)) ) ) (set! f0-23 (fmin 0.75 f0-26)) diff --git a/goal_src/jak3/engine/camera/camera.gc b/goal_src/jak3/engine/camera/camera.gc index f094a459b6..8733bdd8fb 100644 --- a/goal_src/jak3/engine/camera/camera.gc +++ b/goal_src/jak3/engine/camera/camera.gc @@ -285,7 +285,7 @@ 0.0 ) ((>= 0.25 arg0) - (* 0.5 arg0) + (/ arg0 2) ) ((>= arg0 0.75) (- 1.0 (* 0.5 (- 1.0 arg0))) @@ -788,7 +788,7 @@ (the-as vector (-> this point (-> this end-point))) ) (let* ((f0-0 (vector-length s3-0)) - (f1-1 (* 0.33333334 (- 1.5 (* 0.00024414062 f0-0)))) + (f1-1 (* 0.33333334 (- 1.5 (/ f0-0 METER_LENGTH)))) ) 0.0 (let* ((f1-2 (fmax 0.0 f1-1)) @@ -818,7 +818,7 @@ (the-as vector (+ (the-as uint (-> this point 0 direction)) (* 48 v1-18))) ) (let* ((f0-5 (vector-normalize-ret-len! s2-0 1.0)) - (f0-6 (* 0.5 f0-5)) + (f0-6 (/ f0-5 2)) (f26-0 (* (fmin 1.0 f0-6) f30-0 (vector-dot arg0 s2-0))) ) (let ((f1-14 (vector-dot s2-0 s3-0))) @@ -894,7 +894,7 @@ (tracking-spline-method-19 this (* (-> this max-move) (-> pp clock time-adjust-ratio)) arg0 arg5 s3-0) (tracking-spline-method-14 this s3-0) (dotimes (s2-0 63) - (tracking-spline-method-18 this (* 0.015625 (-> this sample-len)) arg0 arg5 s3-0) + (tracking-spline-method-18 this (/ (-> this sample-len) 64) arg0 arg5 s3-0) ) (vector-float*! arg0 arg0 0.015625) (vector-float*! arg5 arg5 0.015625) @@ -1283,7 +1283,7 @@ (vector-! s2-0 s2-0 (-> arg0 follow-off)) (vector-float*! s2-0 s2-0 f0-23) ) - (+! (-> arg0 follow-blend) (* 0.016666668 (-> pp clock time-adjust-ratio))) + (+! (-> arg0 follow-blend) (/ (-> pp clock time-adjust-ratio) 60)) (vector+! (-> arg0 follow-off) (-> arg0 follow-off) s2-0) ) (else @@ -1518,7 +1518,7 @@ (let ((f28-0 (vector-dot s3-0 (-> arg0 rvec)))) (set! sv-128 s2-0) (set! sv-112 (-> arg0 rvec)) - (let ((f0-7 (* 0.8 (tan (* 0.5 arg2))))) + (let ((f0-7 (* 0.8 (tan (/ arg2 2))))) (.lvf vf1 (&-> sv-112 quad)) (let ((v1-11 f0-7)) (.mov vf2 v1-11) @@ -1551,7 +1551,7 @@ (let ((f28-1 (vector-dot s3-0 (-> arg0 uvec)))) (set! sv-160 s2-0) (set! sv-144 (-> arg0 uvec)) - (let ((f0-16 (* 0.525 (tan (* 0.5 arg2))))) + (let ((f0-16 (* 0.525 (tan (/ arg2 2))))) (.lvf vf1 (&-> sv-144 quad)) (let ((v1-32 f0-16)) (.mov vf2 v1-32) @@ -1577,7 +1577,7 @@ (let ((f28-2 (vector-dot s3-0 (-> arg0 uvec)))) (let ((s0-1 s2-0)) (set! sv-176 (-> arg0 uvec)) - (let ((f0-26 (* 0.525 (tan (* 0.5 arg2))))) + (let ((f0-26 (* 0.525 (tan (/ arg2 2))))) (vector-float*! s0-1 sv-176 f0-26) ) ) @@ -1741,7 +1741,7 @@ (set! sv-256 vector-into-frustum-nosmooth!) (set! sv-272 s1-0) (set! sv-288 arg1) - (let ((a2-5 (lerp-clamp arg3 (* 0.25 arg3) (-> arg0 underwater-blend value)))) + (let ((a2-5 (lerp-clamp arg3 (/ arg3 4) (-> arg0 underwater-blend value)))) (sv-256 sv-272 sv-288 a2-5) ) (cond diff --git a/goal_src/jak3/engine/collide/collide-touch.gc b/goal_src/jak3/engine/collide/collide-touch.gc index 2355329d66..592fd009f6 100644 --- a/goal_src/jak3/engine/collide/collide-touch.gc +++ b/goal_src/jak3/engine/collide/collide-touch.gc @@ -488,7 +488,7 @@ ) ) (let ((f1-2 (- (- (vector-length gp-1) (-> v1-0 prim-core world-sphere w)) (-> s4-0 prim-core world-sphere w)))) - (vector-normalize! gp-1 (+ (-> s4-0 prim-core world-sphere w) (* 0.5 f1-2))) + (vector-normalize! gp-1 (+ (-> s4-0 prim-core world-sphere w) (/ f1-2 2))) ) (vector+! arg0 gp-1 (the-as vector (-> s4-0 prim-core))) ) diff --git a/goal_src/jak3/engine/common-obs/blocking-plane.gc b/goal_src/jak3/engine/common-obs/blocking-plane.gc index 7b681e325a..18d1affbaf 100644 --- a/goal_src/jak3/engine/common-obs/blocking-plane.gc +++ b/goal_src/jak3/engine/common-obs/blocking-plane.gc @@ -154,11 +154,11 @@ ) (vector+! (-> s2-1 trans) s3-0 s4-0) (vector-float*! (-> s2-1 trans) (-> s2-1 trans) 0.5) - (+! (-> s2-1 trans y) (* 0.5 arg1)) + (+! (-> s2-1 trans y) (/ arg1 2)) (vector-! (-> s1-0 rvec) s4-0 s3-0) (let ((f30-1 (vector-normalize-ret-len! (-> s1-0 rvec) 1.0))) - (set! (-> s2-1 scale x) (* 0.00024414062 f30-1)) - (set! (-> s2-1 scale y) (* 0.00024414062 arg1)) + (set! (-> s2-1 scale x) (/ f30-1 METER_LENGTH)) + (set! (-> s2-1 scale y) (/ arg1 METER_LENGTH)) (set! (-> s2-1 scale z) 0.0) (set! (-> s1-0 uvec quad) (-> (new 'static 'vector :y 1.0 :w 1.0) quad)) (vector-cross! (-> s1-0 fvec) (-> s1-0 rvec) (-> s1-0 uvec)) @@ -166,7 +166,7 @@ (matrix->quaternion (-> s2-1 quat) s1-0) (let ((v1-20 (-> this root root-prim local-sphere))) (set! (-> v1-20 x) 0.0) - (set! (-> v1-20 y) (* 0.00024414062 (* 0.5 arg1))) + (set! (-> v1-20 y) (* 0.00024414062 (/ arg1 2))) (set! (-> v1-20 z) 0.0) (let ((f0-17 0.5) (f1-7 (* f30-1 f30-1)) diff --git a/goal_src/jak3/engine/common-obs/collectables.gc b/goal_src/jak3/engine/common-obs/collectables.gc index 5da58d9c62..c0b2c851ef 100644 --- a/goal_src/jak3/engine/common-obs/collectables.gc +++ b/goal_src/jak3/engine/common-obs/collectables.gc @@ -916,7 +916,7 @@ (set! (-> self root trans y) (-> self base y)) (cond ((< (-> self root transv y) -8192.0) - (set! (-> self root transv y) (* -0.5 (-> self root transv y))) + (set! (-> self root transv y) (/ (-> self root transv y) -2)) ) (else (if (and (logtest? (-> self fact options) (actor-option suck-in)) @@ -1057,7 +1057,7 @@ ) (else (if (nonzero? (-> self part)) - (set! (-> self part local-space-binding) (the-as particle-local-space-info (* 0.0033333334 f0-1))) + (set! (-> self part local-space-binding) (the-as particle-local-space-info (/ f0-1 300))) ) (when (nonzero? (-> self draw)) (logior! (-> self draw status) (draw-control-status force-fade)) @@ -1717,7 +1717,7 @@ (set! (-> a0-6 y) 0.0) (vector-normalize! a0-6 1.0) ) - (vector-float*! gp-2 gp-2 (rand-vu-float-range (* 0.25 f30-0) (* 0.75 f30-0))) + (vector-float*! gp-2 gp-2 (rand-vu-float-range (/ f30-0 4) (* 0.75 f30-0))) ) (set! (-> self root transv quad) (-> gp-2 quad)) ) @@ -2795,7 +2795,7 @@ ((and (>= f24-1 f0-10) (logtest? s2-0 (game-feature gun-red-1 gun-red-2 gun-red-3))) (set! (-> arg1 0) (pickup-type ammo-red)) (if (>= 1 (mod (the-as int (rand-uint31-gen *random-generator*)) 3)) - (set! (-> arg2 0) (* 0.5 (-> arg2 0))) + (set! (-> arg2 0) (/ (-> arg2 0) 2)) ) ) ((and (>= f28-1 f0-10) (logtest? s2-0 (game-feature gun-blue-1 gun-blue-2 gun-blue-3))) @@ -2805,7 +2805,7 @@ ) ((and (>= f30-1 f0-10) (logtest? (game-feature gun-dark-1 gun-dark-2 gun-dark-3) s2-0)) (set! (-> arg1 0) (pickup-type ammo-dark)) - (set! (-> arg2 0) (the float (the int (fmax 1.0 (* 0.06666667 (-> arg2 0)))))) + (set! (-> arg2 0) (the float (the int (fmax 1.0 (/ (-> arg2 0) 15))))) ) (else (pickup-dark-set! arg0 arg1 arg2 arg3) diff --git a/goal_src/jak3/engine/common-obs/crates.gc b/goal_src/jak3/engine/common-obs/crates.gc index baa3b14e7c..10a3ea1d5a 100644 --- a/goal_src/jak3/engine/common-obs/crates.gc +++ b/goal_src/jak3/engine/common-obs/crates.gc @@ -920,7 +920,8 @@ ) ) (when (not arg0) - (suspend-for (seconds 0.04)) + (suspend-for (seconds 0.04) + ) (case (-> self look) (('iron) (sound-play "icrate-break") @@ -1012,9 +1013,11 @@ (drop-pickup (-> self fact) #t *entity-pool* (the-as fact-info #f) arg1 #t) (process-entity-status! self (entity-perm-status dead) #t) (process-entity-status! self (entity-perm-status subtask-complete) #t) - (suspend-for (seconds 5)) + (suspend-for (seconds 5) + ) (when (logtest? (actor-option cond-respawn) (-> self fact options)) - (suspend-for (seconds 15)) + (suspend-for (seconds 15) + ) (go-virtual hide) ) ) @@ -1346,9 +1349,9 @@ (defmethod smush-update! ((this crate)) (let ((f0-0 (update! (-> this smush)))) - (set! (-> this root scale x) (+ 1.0 (* -0.5 f0-0))) + (set! (-> this root scale x) (+ 1.0 (/ f0-0 -2))) (set! (-> this root scale y) (+ 1.0 f0-0)) - (set! (-> this root scale z) (+ 1.0 (* -0.5 f0-0))) + (set! (-> this root scale z) (+ 1.0 (/ f0-0 -2))) ) 0 (none) diff --git a/goal_src/jak3/engine/common-obs/enemy-states.gc b/goal_src/jak3/engine/common-obs/enemy-states.gc index 9d3d07f1ab..db1a23ffe5 100644 --- a/goal_src/jak3/engine/common-obs/enemy-states.gc +++ b/goal_src/jak3/engine/common-obs/enemy-states.gc @@ -669,7 +669,8 @@ :code (behavior () (cond ((handle->process (-> self ragdoll-proc)) - (suspend-for (seconds 0.2)) + (suspend-for (seconds 0.2) + ) (until (ragdoll-settled? self) (if (or (time-elapsed? (-> self state-time) (seconds 4)) (enemy-method-109 self)) (go-die self) @@ -975,11 +976,13 @@ :code (behavior () (cond ((handle->process (-> self ragdoll-proc)) - (suspend-for (seconds 0.2)) + (suspend-for (seconds 0.2) + ) (if (-> self skel effect) (do-effect (-> self skel effect) "death-default" 0.0 -1) ) - (suspend-for (seconds 0.8)) + (suspend-for (seconds 0.8) + ) ) (else (ja-channel-push! 1 (seconds 0.075)) @@ -1061,11 +1064,13 @@ :code (behavior () (cond ((handle->process (-> self ragdoll-proc)) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (if (-> self skel effect) (do-effect (-> self skel effect) "death-default" 0.0 -1) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (deactivate-ragdoll! self) ) (else @@ -1182,7 +1187,7 @@ (f26-1 (fmax 0.0 (fmin 1.0 f0-12))) (f28-1 (* f28-0 f26-1)) ) - (let* ((f1-8 (* 0.000061035156 (-> self root root-prim local-sphere w))) + (let* ((f1-8 (/ (-> self root root-prim local-sphere w) (meters 4))) (f0-21 (fmax 0.0 (fmin 1.0 f1-8))) ) (* f30-0 (lerp 2.0 1.0 f0-21)) @@ -1212,7 +1217,7 @@ (f0-34 (/ (- f0-32 (* (the float (the int (/ f0-32 f30-3))) f30-3)) f30-3)) (f0-36 (cos (* 65536.0 f0-34))) (f0-37 (+ 1.0 f0-36)) - (f28-3 (* 0.5 f0-37)) + (f28-3 (/ f0-37 2)) ) (ja :num! identity :frame-interp0 f28-3 :frame-interp1 f28-3) (let ((a0-20 (-> self skel root-channel 1))) diff --git a/goal_src/jak3/engine/common-obs/guard-projectile.gc b/goal_src/jak3/engine/common-obs/guard-projectile.gc index d09cea5f64..f9389db065 100644 --- a/goal_src/jak3/engine/common-obs/guard-projectile.gc +++ b/goal_src/jak3/engine/common-obs/guard-projectile.gc @@ -372,7 +372,7 @@ (launch-particles (-> *part-id-table* 852) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000027126736 f30-0)) + (f26-0 (/ f30-0 (meters 9))) (f30-1 (-> *part-id-table* 853 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 853 init-specs 4 initial-valuef)) ) diff --git a/goal_src/jak3/engine/common-obs/metalhead-projectile.gc b/goal_src/jak3/engine/common-obs/metalhead-projectile.gc index 6b4534223d..7d35e38898 100644 --- a/goal_src/jak3/engine/common-obs/metalhead-projectile.gc +++ b/goal_src/jak3/engine/common-obs/metalhead-projectile.gc @@ -367,7 +367,7 @@ (launch-particles (-> *part-id-table* 864) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000020345053 f30-0)) + (f26-0 (/ f30-0 (meters 12))) (f30-1 (-> *part-id-table* 865 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 865 init-specs 5 initial-valuef)) ) diff --git a/goal_src/jak3/engine/common-obs/water.gc b/goal_src/jak3/engine/common-obs/water.gc index 231acd69ea..77e2ee1082 100644 --- a/goal_src/jak3/engine/common-obs/water.gc +++ b/goal_src/jak3/engine/common-obs/water.gc @@ -593,7 +593,7 @@ ) (set-time! (-> this drip-time)) (logclear! (-> this flags) (water-flag spawn-drip)) - (seek! (-> this drip-wetness) 0.0 (* 0.001 (-> this drip-speed))) + (seek! (-> this drip-wetness) 0.0 (/ (-> this drip-speed) 1000)) (set! (-> this drip-speed) (* 1.05 (-> this drip-speed))) (if (= (-> this drip-wetness) 0.0) (set! (-> this drip-height) 0.0) @@ -733,7 +733,7 @@ (set! (-> *part-id-table* 759 init-specs 4 initial-valuef) (+ 24576.0 arg0)) (set! (-> *part-id-table* 759 init-specs 19 initial-valuef) (+ 49152.0 arg0)) (set! (-> *part-id-table* 759 init-specs 1 initial-valuef) (* 0.0000036621095 f30-0)) - (set! (-> *part-id-table* 759 init-specs 2 initial-valuef) (* 0.1 f30-0)) + (set! (-> *part-id-table* 759 init-specs 2 initial-valuef) (/ f30-0 10)) (set! (-> *part-id-table* 759 init-specs 13 initial-valuef) 0.7111111) (set! (-> *part-id-table* 759 init-specs 3 initial-valuef) arg3) (set! (-> *part-id-table* 759 init-specs 5 initial-valuef) arg3) diff --git a/goal_src/jak3/engine/debug/collision-editor.gc b/goal_src/jak3/engine/debug/collision-editor.gc index e32c2daf9e..14c090e04c 100644 --- a/goal_src/jak3/engine/debug/collision-editor.gc +++ b/goal_src/jak3/engine/debug/collision-editor.gc @@ -762,7 +762,7 @@ (when (= (-> this analog-func) (collision-editor-func analog)) (set! f30-0 (* -409.6 f30-0)) (set! f28-0 (* -409.6 f28-0)) - (let ((f0-8 (+ (* 0.01 f24-0) (* -0.01 f26-0)))) + (let ((f0-8 (+ (/ f24-0 100) (/ f26-0 -100)))) (set! f24-0 (+ 1.0 f0-8)) ) (set! f26-0 0.0) diff --git a/goal_src/jak3/engine/debug/default-menu.gc b/goal_src/jak3/engine/debug/default-menu.gc index cfc95a87e0..4a4a532998 100644 --- a/goal_src/jak3/engine/debug/default-menu.gc +++ b/goal_src/jak3/engine/debug/default-menu.gc @@ -266,13 +266,13 @@ (case arg0 (('close) (if (and *math-camera* *subdivide-settings*) - (* 0.00024414062 (-> *subdivide-settings* close 0)) + (/ (-> *subdivide-settings* close 0) METER_LENGTH) arg3 ) ) (('far) (if (and *math-camera* *subdivide-settings*) - (* 0.00024414062 (-> *subdivide-settings* far 0)) + (/ (-> *subdivide-settings* far 0) METER_LENGTH) arg3 ) ) @@ -534,7 +534,7 @@ (if (= arg1 (debug-menu-msg press)) (set! (-> v1-0 camera-to-bbox-dist) (* 4096.0 arg2)) ) - (* 0.00024414062 (-> v1-0 camera-to-bbox-dist)) + (/ (-> v1-0 camera-to-bbox-dist) METER_LENGTH) ) ) @@ -1039,7 +1039,7 @@ ) ) ) - (set! f30-0 (* 0.00024414062 f1-2)) + (set! f30-0 (/ f1-2 METER_LENGTH)) ) ) ) @@ -1074,7 +1074,7 @@ (set! (-> (the-as prototype-bucket-tie s2-0) tie-vanish-far) f0-0) ) ) - (set! f30-0 (* 0.00024414062 f0-0)) + (set! f30-0 (/ f0-0 METER_LENGTH)) ) ) ) @@ -2602,7 +2602,7 @@ (set! (-> s2-0 dists x) (* 4096.0 arg2)) (prototype-bucket-recalc-fields s2-0) ) - (set! f30-0 (* 0.00024414062 (-> s2-0 dists x))) + (set! f30-0 (/ (-> s2-0 dists x) METER_LENGTH)) ) ) ) @@ -2636,7 +2636,7 @@ (set! (-> s2-0 dists w) (* 4096.0 arg2)) (prototype-bucket-recalc-fields s2-0) ) - (set! f30-0 (* 0.00024414062 (-> s2-0 dists w))) + (set! f30-0 (/ (-> s2-0 dists w) METER_LENGTH)) ) ) ) @@ -6095,13 +6095,13 @@ fog-dists x ) - (* 0.00024414062 - (-> *overide-mood-fog-table* + (/ (-> *overide-mood-fog-table* data (the-as uint (logand (-> *time-of-day-context* mode) (time-of-day-palette-id unk0 unk1 unk2))) fog-dists x ) + METER_LENGTH ) ) (set! (-> *overide-mood-fog-table* @@ -6110,13 +6110,13 @@ fog-dists y ) - (* 0.00024414062 - (-> *overide-mood-fog-table* + (/ (-> *overide-mood-fog-table* data (the-as uint (logand (-> *time-of-day-context* mode) (time-of-day-palette-id unk0 unk1 unk2))) fog-dists y ) + METER_LENGTH ) ) ) @@ -6129,10 +6129,10 @@ (dotimes (v1-0 8) (set! (-> *overide-mood-fog-table* data v1-0 fog-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-0 fog-dists x) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-0 fog-dists x)) + (/ (-> *overide-mood-fog-table* data v1-0 fog-dists x) METER_LENGTH) ) (set! (-> *overide-mood-fog-table* data v1-0 fog-dists y) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-0 fog-dists y)) + (/ (-> *overide-mood-fog-table* data v1-0 fog-dists y) METER_LENGTH) ) ) #f @@ -6455,10 +6455,10 @@ (set! (-> *overide-mood-color-table* data v1-0 amb-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-0 fog-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-0 fog-dists x) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-0 fog-dists x)) + (/ (-> *overide-mood-fog-table* data v1-0 fog-dists x) METER_LENGTH) ) (set! (-> *overide-mood-fog-table* data v1-0 fog-dists y) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-0 fog-dists y)) + (/ (-> *overide-mood-fog-table* data v1-0 fog-dists y) METER_LENGTH) ) (set-vector! (-> *time-of-day-context* times v1-0) 1.0 1.0 1.0 1.0) ) diff --git a/goal_src/jak3/engine/debug/manipulator.gc b/goal_src/jak3/engine/debug/manipulator.gc index ebd3f5ea62..6d3bca4c47 100644 --- a/goal_src/jak3/engine/debug/manipulator.gc +++ b/goal_src/jak3/engine/debug/manipulator.gc @@ -132,7 +132,7 @@ ) (v1-22 (vector-orient-by-quat! (new 'stack-no-clear 'vector) s1-0 a2-3)) ) - (let ((a0-13 (* 0.25 arg3))) + (let ((a0-13 (/ arg3 4))) (.mov vf7 a0-13) ) (.lvf vf5 (&-> v1-22 quad)) @@ -152,7 +152,7 @@ ) (v1-29 (vector-orient-by-quat! (new 'stack-no-clear 'vector) s1-0 a2-7)) ) - (let ((a0-17 (* 0.25 arg3))) + (let ((a0-17 (/ arg3 4))) (.mov vf7 a0-17) ) (.lvf vf5 (&-> v1-29 quad)) @@ -208,7 +208,7 @@ s5-0 (the-as vector (-> this mat)) f30-1 - (* 0.25 f30-1) + (/ f30-1 4) (if (= (-> this action) (manipulator-action ma1)) *color-yellow* *color-red* @@ -216,17 +216,17 @@ ) ) (if s3-0 - (draw-axis s5-0 (-> this mat uvec) f30-1 (* 0.25 f30-1) (if (= (-> this action) (manipulator-action ma2)) - *color-yellow* - *color-green* - ) + (draw-axis s5-0 (-> this mat uvec) f30-1 (/ f30-1 4) (if (= (-> this action) (manipulator-action ma2)) + *color-yellow* + *color-green* + ) ) ) (if s2-0 - (draw-axis s5-0 (-> this mat fvec) f30-1 (* 0.25 f30-1) (if (= (-> this action) (manipulator-action ma3)) - *color-yellow* - *color-blue* - ) + (draw-axis s5-0 (-> this mat fvec) f30-1 (/ f30-1 4) (if (= (-> this action) (manipulator-action ma3)) + *color-yellow* + *color-blue* + ) ) ) (let ((s1-0 (new 'stack-no-clear 'vector)) diff --git a/goal_src/jak3/engine/game/effect-control.gc b/goal_src/jak3/engine/game/effect-control.gc index ba36a3b16d..b593a11c50 100644 --- a/goal_src/jak3/engine/game/effect-control.gc +++ b/goal_src/jak3/engine/game/effect-control.gc @@ -1064,7 +1064,7 @@ (sound-play-by-name (sound-name-with-material "zoom-land" (-> self control ground-pat) "") (new-sound-id) - (the int (* 1024.0 (* 0.000016276043 (-> self control ground-impact-vel)))) + (the int (* 1024.0 (/ (-> self control ground-impact-vel) (meters 15)))) 0 0 (sound-group) diff --git a/goal_src/jak3/engine/game/game-info.gc b/goal_src/jak3/engine/game/game-info.gc index 664ffc2480..22b0344fe3 100644 --- a/goal_src/jak3/engine/game/game-info.gc +++ b/goal_src/jak3/engine/game/game-info.gc @@ -80,10 +80,10 @@ ) (set! f0-0 (-> *FACT-bank* ammo-yellow-max)) (if (logtest? (game-feature gun-upgrade-yellow-ammo-1) (-> this features)) - (set! f0-0 (+ (the-as float f0-0) (* 0.5 (-> *FACT-bank* ammo-yellow-max)))) + (set! f0-0 (+ (the-as float f0-0) (/ (-> *FACT-bank* ammo-yellow-max) 2))) ) (if (logtest? (game-feature gun-upgrade-yellow-ammo-2) (-> this features)) - (set! f0-0 (+ (the-as float f0-0) (* 0.5 (-> *FACT-bank* ammo-yellow-max)))) + (set! f0-0 (+ (the-as float f0-0) (/ (-> *FACT-bank* ammo-yellow-max) 2))) ) (if (logtest? (game-secrets gun-upgrade-ammo-yellow) (-> this secrets)) (set! f0-0 (+ (the-as float f0-0) (-> *FACT-bank* ammo-yellow-max))) @@ -97,10 +97,10 @@ ) (set! f0-0 (-> *FACT-bank* ammo-red-max)) (if (logtest? (game-feature gun-upgrade-red-ammo-1) (-> this features)) - (set! f0-0 (+ (the-as float f0-0) (* 0.5 (-> *FACT-bank* ammo-red-max)))) + (set! f0-0 (+ (the-as float f0-0) (/ (-> *FACT-bank* ammo-red-max) 2))) ) (if (logtest? (game-feature gun-upgrade-red-ammo-2) (-> this features)) - (set! f0-0 (+ (the-as float f0-0) (* 0.5 (-> *FACT-bank* ammo-red-max)))) + (set! f0-0 (+ (the-as float f0-0) (/ (-> *FACT-bank* ammo-red-max) 2))) ) (if (logtest? (game-secrets gun-upgrade-ammo-red) (-> this secrets)) (set! f0-0 (+ (the-as float f0-0) (-> *FACT-bank* ammo-red-max))) @@ -114,10 +114,10 @@ ) (set! f0-0 (-> *FACT-bank* ammo-blue-max)) (if (logtest? (game-feature gun-upgrade-blue-ammo-1) (-> this features)) - (set! f0-0 (+ (the-as float f0-0) (* 0.5 (-> *FACT-bank* ammo-blue-max)))) + (set! f0-0 (+ (the-as float f0-0) (/ (-> *FACT-bank* ammo-blue-max) 2))) ) (if (logtest? (game-feature gun-upgrade-blue-ammo-2) (-> this features)) - (set! f0-0 (+ (the-as float f0-0) (* 0.5 (-> *FACT-bank* ammo-blue-max)))) + (set! f0-0 (+ (the-as float f0-0) (/ (-> *FACT-bank* ammo-blue-max) 2))) ) (if (logtest? (game-secrets gun-upgrade-ammo-blue) (-> this secrets)) (set! f0-0 (+ (the-as float f0-0) (-> *FACT-bank* ammo-blue-max))) diff --git a/goal_src/jak3/engine/game/settings.gc b/goal_src/jak3/engine/game/settings.gc index e8fd3851d7..7bbd395e79 100644 --- a/goal_src/jak3/engine/game/settings.gc +++ b/goal_src/jak3/engine/game/settings.gc @@ -1752,7 +1752,7 @@ (seek! (-> s5-0 dust-storm-sound-scalar) (-> s4-0 dust-storm-sound-scalar) - (* 0.5 (-> *display* real-clock seconds-per-frame)) + (/ (-> *display* real-clock seconds-per-frame) 2) ) (set! (-> s5-0 ambient-wind-scalar) (-> s4-0 ambient-wind-scalar)) (set! (-> s5-0 halfpipe-jump-mult) (-> s4-0 halfpipe-jump-mult)) diff --git a/goal_src/jak3/engine/game/task/task-arrow.gc b/goal_src/jak3/engine/game/task/task-arrow.gc index f5356c10e0..5af437c1ea 100644 --- a/goal_src/jak3/engine/game/task/task-arrow.gc +++ b/goal_src/jak3/engine/game/task/task-arrow.gc @@ -203,11 +203,11 @@ (* (-> this alpha) (rand-vu-float-range 80.0 96.0)) ) (let ((f1-18 (lerp-scale 18432.0 44236.8 (- (-> (math-camera-pos) y) (-> this root trans y)) 12288.0 49152.0)) - (f0-56 (* 0.16666667 (-> this base-scale) f30-1)) + (f0-56 (* (/ (-> this base-scale) 6) f30-1)) ) (set! (-> *part-id-table* 410 init-specs 3 initial-valuef) (* f1-18 f0-56)) (set! (-> *part-id-table* 410 init-specs 5 initial-valuef) (* 73728.0 f0-56)) - (set! (-> *part-id-table* 411 init-specs 3 initial-valuef) (* 0.25 f0-56 f1-18)) + (set! (-> *part-id-table* 411 init-specs 3 initial-valuef) (* (/ f0-56 4) f1-18)) (set! (-> *part-id-table* 411 init-specs 5 initial-valuef) (* 18432.0 f0-56)) (if (or (not (logtest? (-> this flags) (task-arrow-flags taf4))) (< 0.0 f0-56)) (spawn (-> this part) (-> this root trans)) diff --git a/goal_src/jak3/engine/gfx/background/hfrag/hfrag-work.gc b/goal_src/jak3/engine/gfx/background/hfrag/hfrag-work.gc index 075335d0f7..2f81710a3c 100644 --- a/goal_src/jak3/engine/gfx/background/hfrag/hfrag-work.gc +++ b/goal_src/jak3/engine/gfx/background/hfrag/hfrag-work.gc @@ -250,7 +250,7 @@ ) (let ((f2-1 (* 0.14285715 (- f0-0 f1-0)))) (set! (-> this dists x) (- f1-0)) - (set! (-> this dists y) (- (+ f1-0 (* 0.5 f2-1)))) + (set! (-> this dists y) (- (+ f1-0 (/ f2-1 2)))) (set! (-> this dists z) (- (+ f1-0 (* 2.0 f2-1)))) ) (set! (-> this dists w) (- f0-0)) diff --git a/goal_src/jak3/engine/gfx/background/hfrag/hfrag.gc b/goal_src/jak3/engine/gfx/background/hfrag/hfrag.gc index 19b7c449fa..4b0d9b23dd 100644 --- a/goal_src/jak3/engine/gfx/background/hfrag/hfrag.gc +++ b/goal_src/jak3/engine/gfx/background/hfrag/hfrag.gc @@ -125,7 +125,7 @@ 0 (let ((s4-0 *math-camera*)) (vector-! s2-0 (camera-pos) (-> s5-0 start-corner)) - (+ (* (the int (* 0.0000019073486 (-> s2-0 y))) 32) (the int (* 0.0000019073486 (-> s2-0 x)))) + (+ (* (the int (/ (-> s2-0 y) (meters 128))) 32) (the int (/ (-> s2-0 x) (meters 128)))) (.lvf vf16 (&-> s4-0 plane 0 quad)) (.lvf vf17 (&-> s4-0 plane 1 quad)) (.lvf vf18 (&-> s4-0 plane 2 quad)) @@ -702,7 +702,7 @@ (s2-0 (-> this pat-array 0)) ) (when (not (logtest? (-> arg1 ignore-pat) s2-0)) - (when (nonzero? (-> v1-0 a0-2 packed-index bit11)) + (when (nonzero? (-> (the-as hfrag-vertex (-> v1-0 a0-2)) packed-index bit11)) (set! sv-16 (-> v1-0 a0-2 height)) (set! sv-24 (-> v1-0 (+ a0-2 1) height)) (set! sv-32 (-> v1-0 (+ a0-2 512) height)) @@ -754,8 +754,8 @@ (set! sv-24 (the int (* 0.000030517578 (- (-> arg1 bbox min z) (-> this start-corner z))))) (set! sv-32 (the int (* 0.000030517578 (- (-> arg1 bbox max x) (-> this start-corner x))))) (set! sv-40 (the int (* 0.000030517578 (- (-> arg1 bbox max z) (-> this start-corner z))))) - (set! sv-48 (the int (* 0.125 (-> arg1 bbox min y)))) - (set! sv-56 (the int (* 0.125 (-> arg1 bbox max y)))) + (set! sv-48 (the int (/ (-> arg1 bbox min y) 8))) + (set! sv-56 (the int (/ (-> arg1 bbox max y) 8))) (set! sv-16 (max 0 (min 511 sv-16))) (set! sv-32 (max 0 (min 511 sv-32))) (set! sv-24 (max 0 (min 511 sv-24))) @@ -807,7 +807,7 @@ (set! sv-68 (new 'stack-no-clear 'vector)) (set! sv-72 (new 'stack-no-clear 'vector)) (set! sv-76 (the-as float 0.000030517578)) - (set! sv-80 (* 0.000030517578 (-> arg1 radius))) + (set! sv-80 (/ (-> arg1 radius) (meters 8))) (vector-! sv-64 (-> arg1 start-pos) (-> this start-corner)) (vector-float*! sv-64 sv-64 sv-76) (vector-float*! sv-72 (-> arg1 move-dist) sv-76) diff --git a/goal_src/jak3/engine/gfx/blit-displays.gc b/goal_src/jak3/engine/gfx/blit-displays.gc index 3878a712d6..1e4b019d34 100644 --- a/goal_src/jak3/engine/gfx/blit-displays.gc +++ b/goal_src/jak3/engine/gfx/blit-displays.gc @@ -402,9 +402,9 @@ (cond ((-> this zoom-blur-2d) (set! (-> s5-0 quad) (-> this zoom-blur-pos quad)) - (let* ((f2-0 (* 0.001953125 f28-0 (-> s5-0 x))) + (let* ((f2-0 (* (/ f28-0 512) (-> s5-0 x))) (f0-6 (- f26-0 (- f28-0 f2-0))) - (f3-1 (* 0.0024038462 f28-0 (-> s5-0 y))) + (f3-1 (* (/ f28-0 416) (-> s5-0 y))) (f1-4 (- f30-0 (- f28-0 f3-1))) ) (set! (-> (the-as (inline-array vector4w) s2-0) 0 quad) (-> this sprite-slow-tmpl dma-vif quad)) @@ -430,10 +430,10 @@ ) (+! (-> s5-0 x) -1792.0) (+! (-> s5-0 y) -1840.0) - (let* ((f1-10 (* 0.001953125 f28-0 (-> s5-0 x))) + (let* ((f1-10 (* (/ f28-0 512) (-> s5-0 x))) (f2-8 (fmax 0.0 (fmin f1-10 f28-0))) (f0-22 (- f26-0 (- f28-0 f2-8))) - (f3-4 (* 0.0024038462 f28-0 (-> s5-0 y))) + (f3-4 (* (/ f28-0 416) (-> s5-0 y))) (f3-6 (fmax 0.0 (fmin f3-4 f28-0))) (f1-16 (- f30-0 (- f28-0 f3-6))) ) diff --git a/goal_src/jak3/engine/gfx/foreground/ripple.gc b/goal_src/jak3/engine/gfx/foreground/ripple.gc index 7fb1b6ff5c..7aa0caf123 100644 --- a/goal_src/jak3/engine/gfx/foreground/ripple.gc +++ b/goal_src/jak3/engine/gfx/foreground/ripple.gc @@ -187,7 +187,7 @@ (if (< f0-23 0.0) (set! f0-23 (-> gp-0 global-scale)) ) - (+ f30-0 (* 0.0078125 f1-12 f0-23)) + (+ f30-0 (* (/ f1-12 128) f0-23)) ) ) ) diff --git a/goal_src/jak3/engine/gfx/generic/lightning/lightning-new.gc b/goal_src/jak3/engine/gfx/generic/lightning/lightning-new.gc index df2a90e6b1..c57a4db05d 100644 --- a/goal_src/jak3/engine/gfx/generic/lightning/lightning-new.gc +++ b/goal_src/jak3/engine/gfx/generic/lightning/lightning-new.gc @@ -715,10 +715,10 @@ (v1-13 (matrix-f-u-compose (new 'stack-no-clear 'matrix) (the-as vector arg4) a2-4)) (f26-1 6.0) ) - (set! sv-160 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 rvec) (* 0.5 f22-0))) - (set! sv-164 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 rvec) (* -0.5 f22-0))) - (set! sv-168 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 uvec) (* 0.5 f22-0))) - (set! sv-172 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 uvec) (* -0.5 f22-0))) + (set! sv-160 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 rvec) (/ f22-0 2))) + (set! sv-164 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 rvec) (/ f22-0 -2))) + (set! sv-168 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 uvec) (/ f22-0 2))) + (set! sv-172 (vector+float*! (new 'stack-no-clear 'vector) arg0 (-> v1-13 uvec) (/ f22-0 -2))) (set! sv-176 (the-as rgba (new 'stack-no-clear 'array 'rgba 1))) (set! sv-176 (-> this base-color)) (set! sv-176 (copy-and-set-field sv-176 a (the int (* 128.0 f24-0)))) diff --git a/goal_src/jak3/engine/gfx/hw/video.gc b/goal_src/jak3/engine/gfx/hw/video.gc index d7f67fa336..b72cae7e7d 100644 --- a/goal_src/jak3/engine/gfx/hw/video.gc +++ b/goal_src/jak3/engine/gfx/hw/video.gc @@ -32,7 +32,7 @@ (set! (-> *video-params* reset-video-mode) #t) (set! (-> *math-camera* isometric uvec y) 0.5) (set! (-> *math-camera* y-clip) 416.0) - (set! (-> *math-camera* y-pix) (* 0.5 (-> *math-camera* y-clip))) + (set! (-> *math-camera* y-pix) (/ (-> *math-camera* y-clip) 2)) (set! *profile-y* 1848) (set! (-> *video-params* set-video-mode) #t) 0 diff --git a/goal_src/jak3/engine/gfx/mood/mood-tables2.gc b/goal_src/jak3/engine/gfx/mood/mood-tables2.gc index e0bbc974e7..997ca61aeb 100644 --- a/goal_src/jak3/engine/gfx/mood/mood-tables2.gc +++ b/goal_src/jak3/engine/gfx/mood/mood-tables2.gc @@ -426,8 +426,8 @@ (format 0 " :fog-start (meters ~f) :fog-end (meters ~f) :fog-min ~f :fog-max ~f ~%" - (* 0.00024414062 (-> *overide-table* mood-fog-table data _fog-idx fog-dists x)) - (* 0.00024414062 (-> *overide-table* mood-fog-table data _fog-idx fog-dists y)) + (/ (-> *overide-table* mood-fog-table data _fog-idx fog-dists x) METER_LENGTH) + (/ (-> *overide-table* mood-fog-table data _fog-idx fog-dists y) METER_LENGTH) (-> *overide-table* mood-fog-table data _fog-idx fog-dists w) (-> *overide-table* mood-fog-table data _fog-idx fog-dists z) ) diff --git a/goal_src/jak3/engine/gfx/mood/mood.gc b/goal_src/jak3/engine/gfx/mood/mood.gc index 8068f4d4d2..07b3e7803a 100644 --- a/goal_src/jak3/engine/gfx/mood/mood.gc +++ b/goal_src/jak3/engine/gfx/mood/mood.gc @@ -574,8 +574,8 @@ (set! (-> arg0 times arg1 w) f28-0) (when (not (paused?)) (if (< 0.75 f28-0) - (set! (-> gp-0 fade) (- (-> gp-0 fade) (* 0.04 (-> pp clock time-adjust-ratio)))) - (set! (-> gp-0 fade) (- (-> gp-0 fade) (* 0.02 (-> pp clock time-adjust-ratio)))) + (set! (-> gp-0 fade) (- (-> gp-0 fade) (/ (-> pp clock time-adjust-ratio) 25))) + (set! (-> gp-0 fade) (- (-> gp-0 fade) (/ (-> pp clock time-adjust-ratio) 50))) ) ) ) @@ -1576,11 +1576,11 @@ (format *stdcon* "overide fog ~f~%" (-> this overide fog)) ) (else - (format *stdcon* "time until random cloud ~f~%" (* 0.0033333334 (-> this time-until-random cloud))) + (format *stdcon* "time until random cloud ~f~%" (/ (-> this time-until-random cloud) 300)) (format *stdcon* "current cloud ~f~%" (-> this current-interp cloud)) (format *stdcon* "target cloud ~f~%" (-> this target-interp cloud)) (format *stdcon* "speed cloud ~f~%" (* (/ 1.0 (-> this speed-interp cloud)) (seconds-per-frame))) - (format *stdcon* "time until random fog ~f~%" (* 0.0033333334 (-> this time-until-random fog))) + (format *stdcon* "time until random fog ~f~%" (/ (-> this time-until-random fog) 300)) (format *stdcon* "current fog ~f~%" (-> this current-interp fog)) (format *stdcon* "target fog ~f~%" (-> this target-interp fog)) (format *stdcon* "speed fog ~f~%" (* (/ 1.0 (-> this speed-interp fog)) (seconds-per-frame))) diff --git a/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc b/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc index 911aa5399a..cd8fff9e93 100644 --- a/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc +++ b/goal_src/jak3/engine/gfx/ocean/ocean-mid.gc @@ -19,7 +19,7 @@ (set-vector! (-> arg0 constants) -0.25 -0.5 0.0 393216.0) (let* ((s4-0 (-> (matrix-local->world #f #f) fvec)) (f0-12 (- 1.5 (* 0.000015258789 (atan (-> s4-0 x) (-> s4-0 z))))) - (f1-1 (+ 0.5 (* -0.5 (-> s4-0 y)))) + (f1-1 (+ 0.5 (/ (-> s4-0 y) -2))) ) (set-vector! (-> arg0 constants2) f0-12 f1-1 1.0 0.0) ) @@ -271,7 +271,7 @@ (let ((f0-16 (* 128.0 (-> *time-of-day-context* ocean-alpha)))) (if (-> *time-of-day-context* sky) (set-vector! (-> arg0 env-color) f0-16 f0-16 f0-16 f0-16) - (set-vector! (-> arg0 env-color) f0-16 f0-16 (* 0.5 f0-16) f0-16) + (set-vector! (-> arg0 env-color) f0-16 f0-16 (/ f0-16 2) f0-16) ) ) (set-vector! (-> arg0 index-table 0) 63 84 66 0) diff --git a/goal_src/jak3/engine/gfx/ocean/ocean-near.gc b/goal_src/jak3/engine/gfx/ocean/ocean-near.gc index 5bf67054e8..579ae0321e 100644 --- a/goal_src/jak3/engine/gfx/ocean/ocean-near.gc +++ b/goal_src/jak3/engine/gfx/ocean/ocean-near.gc @@ -45,7 +45,7 @@ (set-vector! (-> arg0 constants) -0.25 -0.5 0.0 0.000010172526) (let* ((s4-0 (-> (matrix-local->world #f #f) fvec)) (f0-12 (- 1.5 (* 0.000015258789 (atan (-> s4-0 x) (-> s4-0 z))))) - (f1-1 (+ 0.5 (* -0.5 (-> s4-0 y)))) + (f1-1 (+ 0.5 (/ (-> s4-0 y) -2))) ) (set-vector! (-> arg0 constants2) f0-12 f1-1 1.0 128.0) ) @@ -342,7 +342,7 @@ (let ((f0-28 (* 128.0 (-> *time-of-day-context* ocean-alpha)))) (if (-> *time-of-day-context* sky) (set-vector! (-> arg0 env-color) f0-28 f0-28 f0-28 f0-28) - (set-vector! (-> arg0 env-color) f0-28 f0-28 (* 0.5 f0-28) f0-28) + (set-vector! (-> arg0 env-color) f0-28 f0-28 (/ f0-28 2) f0-28) ) ) (set! (-> arg0 drw2-adgif tag) (new 'static 'gif-tag64 :nloop #x2 :eop #x1 :nreg #x1)) diff --git a/goal_src/jak3/engine/gfx/ocean/ocean-texture.gc b/goal_src/jak3/engine/gfx/ocean/ocean-texture.gc index 930544311e..8fb25396f1 100644 --- a/goal_src/jak3/engine/gfx/ocean/ocean-texture.gc +++ b/goal_src/jak3/engine/gfx/ocean/ocean-texture.gc @@ -575,8 +575,8 @@ (defmethod ocean-method-83 ((this ocean) (arg0 dma-buffer) (arg1 sky-upload-data) (arg2 vector4w) (arg3 float)) (when (>= (-> arg1 sun 0 pos y) -150.0) - (let* ((f2-0 (* 0.00010050251 (-> arg1 sun 0 pos x))) - (f1-3 (* 0.00010050251 (-> arg1 sun 0 pos z))) + (let* ((f2-0 (/ (-> arg1 sun 0 pos x) 9950)) + (f1-3 (/ (-> arg1 sun 0 pos z) 9950)) (f0-6 (if (< 0.0 (-> arg1 sun 0 pos y)) 1.0 (* 0.006666667 (+ 150.0 (-> arg1 sun 0 pos y))) @@ -743,7 +743,7 @@ (vector--float*! s2-0 arg2 (-> s3-0 sun1-normal) 9.0) (vector--float*! s4-0 arg2 (-> s3-0 moon-normal) 9.0) (vector-float*! s5-0 s5-0 (* (-> s3-0 sun0-scale) f28-0)) - (vector+float*! s5-0 s5-0 s2-0 (* 0.25 f28-0 (-> s3-0 sun1-scale))) + (vector+float*! s5-0 s5-0 s2-0 (* (/ f28-0 4) (-> s3-0 sun1-scale))) (vector+float*! s5-0 s5-0 s4-0 (* (-> s3-0 moon-scale) f28-0)) ) (+! (-> arg0 x) (fmax (fmin (-> s5-0 x) f30-0) (- f30-0))) diff --git a/goal_src/jak3/engine/gfx/ocean/ocean.gc b/goal_src/jak3/engine/gfx/ocean/ocean.gc index efa2aedc32..eac2328daa 100644 --- a/goal_src/jak3/engine/gfx/ocean/ocean.gc +++ b/goal_src/jak3/engine/gfx/ocean/ocean.gc @@ -18,8 +18,8 @@ ;; DECOMP BEGINS (defmethod set-corners! ((this ocean) (arg0 float) (arg1 float)) - (let* ((f2-0 (* 0.00008138021 arg0)) - (f3-0 (* 0.00008138021 arg1)) + (let* ((f2-0 (/ arg0 (meters 3))) + (f3-0 (/ arg1 (meters 3))) (f0-2 f2-0) (f0-4 (- f0-2 (the float (the int f0-2)))) (f1-6 f3-0) @@ -49,8 +49,8 @@ ((and (-> this heights) *ocean-map*) (let* ((f30-0 (- (-> arg0 x) (-> this start-corner x))) (f28-0 (- (-> arg0 z) (-> this start-corner z))) - (v1-3 (the int (* 0.0000025431316 f30-0))) - (a0-2 (the int (* 0.0000025431316 f28-0))) + (v1-3 (the int (/ f30-0 (meters 96)))) + (a0-2 (the int (/ f28-0 (meters 96)))) (v1-7 (-> this ocean-trans-indices data (+ (* 48 a0-2) v1-3))) ) (cond @@ -61,8 +61,8 @@ ) ) ((begin - (let ((a0-8 (logand (the int (* 0.000010172526 f30-0)) 3)) - (a3-4 (logand (the int (* 0.000010172526 f28-0)) 3)) + (let ((a0-8 (logand (the int (/ f30-0 (meters 24))) 3)) + (a3-4 (logand (the int (/ f28-0 (meters 24))) 3)) (v1-10 (-> this ocean-near-indices data (-> v1-7 child))) ) (set! v1-12 (-> (the-as (pointer int16) (+ (* (+ (* a3-4 4) a0-8) 2) (the-as int v1-10))))) @@ -75,14 +75,12 @@ ) ) (else - (let ((a0-14 (logand (the int (* 0.00008138021 f30-0)) 7))) + (let ((a0-14 (logand (the int (/ f30-0 (meters 3))) 7))) (cond - ((not (logtest? (-> this ocean-mid-masks data v1-12 mask (logand (the int (* 0.00008138021 f28-0)) 7)) - (ash 1 a0-14) - ) + ((not (logtest? (-> this ocean-mid-masks data v1-12 mask (logand (the int (/ f28-0 (meters 3))) 7)) (ash 1 a0-14)) ) (let* ((f1-2 (vector-vector-distance arg0 (math-camera-pos))) - (f26-0 (- 1.0 (fmin 1.0 (* 0.000010172526 f1-2)))) + (f26-0 (- 1.0 (fmin 1.0 (/ f1-2 (meters 24))))) ) (if (-> this ocean-near-translucent?) (+ (* f26-0 (set-corners! this f30-0 f28-0)) (-> this start-corner y)) diff --git a/goal_src/jak3/engine/gfx/sprite/particles/light-trails.gc b/goal_src/jak3/engine/gfx/sprite/particles/light-trails.gc index eb7238fb19..ad0e25b03d 100644 --- a/goal_src/jak3/engine/gfx/sprite/particles/light-trails.gc +++ b/goal_src/jak3/engine/gfx/sprite/particles/light-trails.gc @@ -164,7 +164,7 @@ ((= (-> this appearance lie-mode) (lie-mode use-two-strips)) (let ((s1-0 (new 'stack-no-clear 'vector))) (set! (-> s1-0 quad) (-> this cache-vector 0 quad)) - (vector-normalize! s1-0 (* 0.5 arg2)) + (vector-normalize! s1-0 (/ arg2 2)) (add-vert-to-prim-strip! this (-> this strip) @@ -184,7 +184,7 @@ ) (let ((s1-1 (new 'stack-no-clear 'vector))) (set! (-> s1-1 quad) (-> this cache-vector 1 quad)) - (vector-normalize! s1-1 (* 0.5 arg2)) + (vector-normalize! s1-1 (/ arg2 2)) (add-vert-to-prim-strip! this (-> this strip2) @@ -206,7 +206,7 @@ (else (let ((s1-2 (new 'stack-no-clear 'vector))) (set! (-> s1-2 quad) (-> arg3 quad)) - (vector-normalize! s1-2 (* 0.5 arg2)) + (vector-normalize! s1-2 (/ arg2 2)) (add-vert-to-prim-strip! this (-> this strip) diff --git a/goal_src/jak3/engine/gfx/sprite/particles/sparticle.gc b/goal_src/jak3/engine/gfx/sprite/particles/sparticle.gc index 95aab61513..e84e1eaa5a 100644 --- a/goal_src/jak3/engine/gfx/sprite/particles/sparticle.gc +++ b/goal_src/jak3/engine/gfx/sprite/particles/sparticle.gc @@ -297,8 +297,8 @@ (set! (-> arg1 radius) f28-0) (let ((f24-0 (sin f26-0)) (f26-1 (cos f26-0)) - (f22-0 (sin (* 0.5 f30-0))) - (f0-5 (cos (* 0.5 f30-0))) + (f22-0 (sin (/ f30-0 2))) + (f0-5 (cos (/ f30-0 2))) (a2-1 (new 'stack-no-clear 'quaternion)) (s4-0 (new 'stack-no-clear 'vector)) ) diff --git a/goal_src/jak3/engine/gfx/sprite/sprite-distort.gc b/goal_src/jak3/engine/gfx/sprite/sprite-distort.gc index 4c9387a76c..4a9399a3b1 100644 --- a/goal_src/jak3/engine/gfx/sprite/sprite-distort.gc +++ b/goal_src/jak3/engine/gfx/sprite/sprite-distort.gc @@ -44,7 +44,7 @@ (let ((f26-0 (* 65536.0 (/ (the float s2-0) (the float s4-0))))) (set-vector! (-> gp-0 entry s3-0) (* (sin f26-0) f28-0) (* (cos f26-0) f30-0) 0.0 0.0) (let ((s3-1 (+ s3-0 1))) - (set-vector! (-> gp-0 entry s3-1) (* 0.001953125 f28-0 (sin f26-0)) (* 0.001953125 f30-0 (cos f26-0)) 0.0 0.0) + (set-vector! (-> gp-0 entry s3-1) (* (/ f28-0 512) (sin f26-0)) (* (/ f30-0 512) (cos f26-0)) 0.0 0.0) (set! s3-0 (+ s3-1 1)) ) ) @@ -53,7 +53,7 @@ ) (set-vector! (-> gp-0 entry s3-0) 0.0 f30-0 0.0 0.0) (let ((v1-20 (+ s3-0 1))) - (set-vector! (-> gp-0 entry v1-20) 0.0 (* 0.001953125 f30-0) 0.0 0.0) + (set-vector! (-> gp-0 entry v1-20) 0.0 (/ f30-0 512) 0.0 0.0) (+ v1-20 1) ) ) diff --git a/goal_src/jak3/engine/gfx/sprite/sprite-glow.gc b/goal_src/jak3/engine/gfx/sprite/sprite-glow.gc index 23ea7cefa7..d308241d84 100644 --- a/goal_src/jak3/engine/gfx/sprite/sprite-glow.gc +++ b/goal_src/jak3/engine/gfx/sprite/sprite-glow.gc @@ -532,7 +532,7 @@ 1.0 ) (else - (let* ((f1-1 (* 0.00024414062 a0-5)) + (let* ((f1-1 (/ a0-5 METER_LENGTH)) (f0-4 (- f1-1 (the float (the int f1-1)))) ) (let ((f1-3 (* 4096.0 (- f1-1 f0-4)))) diff --git a/goal_src/jak3/engine/nav/nav-mesh.gc b/goal_src/jak3/engine/nav/nav-mesh.gc index 4446d4e7df..30ec82bb05 100644 --- a/goal_src/jak3/engine/nav/nav-mesh.gc +++ b/goal_src/jak3/engine/nav/nav-mesh.gc @@ -823,7 +823,7 @@ ) (set! (-> s5-0 word02) (the int - (+ 1.0 (* (fmax 1.0 (* 0.000015258789 (-> s5-0 float00))) (fmax 1.0 (* 0.000015258789 (-> s5-0 float01))))) + (+ 1.0 (* (fmax 1.0 (/ (-> s5-0 float00) (meters 16))) (fmax 1.0 (/ (-> s5-0 float01) (meters 16))))) ) ) (set! (-> s5-0 word03) (min 4096 (* (-> s5-0 word01) (-> s5-0 word02)))) diff --git a/goal_src/jak3/engine/physics/cloth.gc b/goal_src/jak3/engine/physics/cloth.gc index c969a7e4a8..dd9aab5f06 100644 --- a/goal_src/jak3/engine/physics/cloth.gc +++ b/goal_src/jak3/engine/physics/cloth.gc @@ -667,7 +667,7 @@ ) (set! (-> s4-0 one-over-two-times-constraint-length) (/ 1.0 (* 2.0 f0-1))) (set! (-> s4-0 constraint-length-sqd) (* f0-1 f0-1)) - (set! (-> s4-0 constraint-length-half) (* 0.5 f0-1)) + (set! (-> s4-0 constraint-length-half) (/ f0-1 2)) ) ) ) @@ -925,7 +925,7 @@ (let* ((f1-4 (/ (+ f1-2 (vector-dot a3-4 a3-4)) (* 2.0 f0-1))) (f0-3 (/ (- f1-4 f0-1) f1-4)) ) - (vector-float*! a3-4 a3-4 (* 0.5 f0-3)) + (vector-float*! a3-4 a3-4 (/ f0-3 2)) ) ) (let ((f1-6 1.0) @@ -1976,7 +1976,7 @@ (-> this collision-constraints data s5-0 r) *color-cyan* ) - (format *stdcon* "Transform ~d, size ~f~%" s5-0 (* 0.00024414062 (-> this collision-constraints data s5-0 r))) + (format *stdcon* "Transform ~d, size ~f~%" s5-0 (/ (-> this collision-constraints data s5-0 r) METER_LENGTH)) ) (dotimes (s5-1 (-> this disc-collision-constraints length)) (add-debug-sphere diff --git a/goal_src/jak3/engine/physics/dynamics-h.gc b/goal_src/jak3/engine/physics/dynamics-h.gc index fa1d233b6f..023288a628 100644 --- a/goal_src/jak3/engine/physics/dynamics-h.gc +++ b/goal_src/jak3/engine/physics/dynamics-h.gc @@ -30,7 +30,7 @@ ) (defun time-to-apex ((arg0 float) (arg1 float)) - (the int (/ arg0 (- (* 0.0033333334 arg1)))) + (the int (/ arg0 (- (/ arg1 300)))) ) (defun time-to-ground ((arg0 float) (arg1 float) (arg2 float)) @@ -38,8 +38,8 @@ (v0-0 0) ) (while (< (- arg2) f0-0) - (set! arg0 (- arg0 (* 0.0033333334 arg1))) - (+! f0-0 (* 0.0033333334 arg0)) + (set! arg0 (- arg0 (/ arg1 300))) + (+! f0-0 (/ arg0 300)) (+! v0-0 1) ) v0-0 diff --git a/goal_src/jak3/engine/physics/ragdoll-edit.gc b/goal_src/jak3/engine/physics/ragdoll-edit.gc index 22f651890e..a6e5cfc9e5 100644 --- a/goal_src/jak3/engine/physics/ragdoll-edit.gc +++ b/goal_src/jak3/engine/physics/ragdoll-edit.gc @@ -1015,13 +1015,13 @@ (set! f26-0 (* 546.13336 f26-0)) ) ((= v1-135 2) - (let ((f0-25 (* 0.01 f30-0))) + (let ((f0-25 (/ f30-0 100))) (set! f30-0 (+ 1.0 f0-25)) ) - (let ((f0-27 (* -0.01 f28-0))) + (let ((f0-27 (/ f28-0 -100))) (set! f28-0 (+ 1.0 f0-27)) ) - (let ((f0-29 (* 0.01 f26-0))) + (let ((f0-29 (/ f26-0 100))) (set! f26-0 (+ 1.0 f0-29)) ) ) diff --git a/goal_src/jak3/engine/physics/rigid-body.gc b/goal_src/jak3/engine/physics/rigid-body.gc index a184d0ad8f..bf5f21c10d 100644 --- a/goal_src/jak3/engine/physics/rigid-body.gc +++ b/goal_src/jak3/engine/physics/rigid-body.gc @@ -45,7 +45,7 @@ ) (matrix-identity! (-> this inertial-tensor)) (matrix-identity! (-> this inv-inertial-tensor)) - (let ((f0-4 (* 0.083333336 f24-0))) + (let ((f0-4 (/ f24-0 12))) (let* ((f1-1 f30-0) (f1-3 (* f1-1 f1-1)) (f2-0 f26-0) @@ -1375,7 +1375,7 @@ (f0-9 (/ 163840.0 (get-inv-mass (the-as process-focusable s4-1)))) ) (vector-reset! (-> this player-force)) - (set! (-> this player-force y) (* -0.1 f0-9 f30-2)) + (set! (-> this player-force y) (* (/ f0-9 -10) f30-2)) ) ) ) diff --git a/goal_src/jak3/engine/physics/trajectory.gc b/goal_src/jak3/engine/physics/trajectory.gc index abf4e7910b..b24bfa4401 100644 --- a/goal_src/jak3/engine/physics/trajectory.gc +++ b/goal_src/jak3/engine/physics/trajectory.gc @@ -9,7 +9,7 @@ (defmethod compute-trans-at-time ((this trajectory) (arg0 float) (arg1 vector)) (vector+float*! arg1 (-> this initial-position) (-> this initial-velocity) arg0) - (+! (-> arg1 y) (* 0.5 arg0 arg0 (-> this gravity))) + (+! (-> arg1 y) (* (/ arg0 2) arg0 (-> this gravity))) arg1 ) @@ -31,7 +31,7 @@ (vector-! (-> this initial-velocity) arg1 arg0) (vector-xz-normalize! (-> this initial-velocity) f0-3) ) - (set! (-> this initial-velocity y) (- (/ (- (-> arg1 y) (-> arg0 y)) arg2) (* 0.5 arg2 (-> this gravity)))) + (set! (-> this initial-velocity y) (- (/ (- (-> arg1 y) (-> arg0 y)) arg2) (* (/ arg2 2) (-> this gravity)))) 0 (none) ) diff --git a/goal_src/jak3/engine/sound/gsound.gc b/goal_src/jak3/engine/sound/gsound.gc index bc6e1c5506..0f1ca067e8 100644 --- a/goal_src/jak3/engine/sound/gsound.gc +++ b/goal_src/jak3/engine/sound/gsound.gc @@ -545,9 +545,9 @@ ) ) ) - (set! (-> int-trans 0) (the int (* 0.0625 (-> v1-0 x)))) - (set! (-> int-trans 1) (the int (* 0.0625 (-> v1-0 y)))) - (set! (-> int-trans 2) (the int (* 0.0625 (-> v1-0 z)))) + (set! (-> int-trans 0) (the int (/ (-> v1-0 x) 16))) + (set! (-> int-trans 1) (the int (/ (-> v1-0 y) 16))) + (set! (-> int-trans 2) (the int (/ (-> v1-0 z) 16))) ) 0 ) @@ -1071,7 +1071,7 @@ ) (defmethod set-falloff-far! ((this ambient-sound) (arg0 float)) - (set! (-> this falloff-far) (the int (* 0.00024414062 arg0))) + (set! (-> this falloff-far) (the int (/ arg0 METER_LENGTH))) 0 (none) ) @@ -1291,7 +1291,8 @@ (set! (-> a1-3 0) 'empty0) (want-sound-banks *load-state* a1-3) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (let ((a1-4 (new 'stack-no-clear 'array 'symbol 4))) (set! (-> a1-4 2) (-> gp-0 4)) (set! (-> a1-4 1) (-> gp-0 2)) diff --git a/goal_src/jak3/engine/target/board/board-states.gc b/goal_src/jak3/engine/target/board/board-states.gc index 5bb52ebe41..93c912a71a 100644 --- a/goal_src/jak3/engine/target/board/board-states.gc +++ b/goal_src/jak3/engine/target/board/board-states.gc @@ -44,8 +44,8 @@ ) ) (set! (-> self board turn-anim-targ) (+ (lerp-scale - (* 0.5 (-> *TARGET_BOARD-bank* turn-frames)) - (* -0.5 (-> *TARGET_BOARD-bank* turn-frames)) + (/ (-> *TARGET_BOARD-bank* turn-frames) 2) + (/ (-> *TARGET_BOARD-bank* turn-frames) -2) f26-0 -5461.3335 5461.3335 @@ -58,8 +58,8 @@ 32768.0 ) (lerp-scale - (* 0.2 (-> *TARGET_BOARD-bank* turn-frames)) - (* -0.2 (-> *TARGET_BOARD-bank* turn-frames)) + (/ (-> *TARGET_BOARD-bank* turn-frames) 5) + (/ (-> *TARGET_BOARD-bank* turn-frames) -5) (-> self board turn-anim-mag) 1.0 -1.0 @@ -67,7 +67,7 @@ ) ) (when (and (or (< (* f30-0 (-> self board turn-anim-targ)) 0.0) (= f30-0 0.0)) - (and (< (* 0.2 (-> *TARGET_BOARD-bank* turn-frames)) (fabs (- f30-0 (-> self board turn-anim-targ)))) + (and (< (/ (-> *TARGET_BOARD-bank* turn-frames) 5) (fabs (- f30-0 (-> self board turn-anim-targ)))) (>= (current-time) (-> self control turn-lockout-end-time)) ) ) @@ -647,7 +647,7 @@ (vector-float*! (-> self control transv) (-> self control transv) - (+ 1.0 (* 0.5 (-> *setting-control* user-current halfpipe-jump-mult))) + (+ 1.0 (/ (-> *setting-control* user-current halfpipe-jump-mult) 2)) ) ) (else @@ -859,7 +859,7 @@ (vector-float*! (-> self control transv) (-> self control transv) - (+ 1.0 f30-0 (* 0.5 (-> *setting-control* user-current halfpipe-jump-mult))) + (+ 1.0 f30-0 (/ (-> *setting-control* user-current halfpipe-jump-mult) 2)) ) ) ) @@ -1351,7 +1351,7 @@ (vector-float*! (-> self control transv) (-> self control transv) - (+ 1.0 (* 0.5 (-> *setting-control* user-current halfpipe-jump-mult))) + (+ 1.0 (/ (-> *setting-control* user-current halfpipe-jump-mult) 2)) ) ) (target-board-spin-check) @@ -2420,7 +2420,7 @@ (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-quat) 1.0 1.0 1.0) (set! (-> self control ctrl-xz-vel) - (* f30-0 (* 0.000024414063 (-> self clock frames-per-second) (-> self align delta trans z))) + (* f30-0 (* (/ (-> self clock frames-per-second) (meters 10)) (-> self align delta trans z))) ) (vector-float*! (-> self control transv) gp-0 (-> self control ctrl-xz-vel)) (let ((v1-31 (new-stack-vector0)) @@ -2639,7 +2639,7 @@ (else (let ((f30-1 (* (lerp-scale 0.7 1.0 (fabs (-> self board ride-lean)) 0.0 1.0) - (lerp-scale 0.8 1.0 (fabs (-> self board ride-speed)) 0.0 (* 0.5 (-> self control mod-surface transv-max))) + (lerp-scale 0.8 1.0 (fabs (-> self board ride-speed)) 0.0 (/ (-> self control mod-surface transv-max) 2)) ) ) (f28-1 @@ -3373,7 +3373,8 @@ (let ((s4-1 (new-stack-vector0))) (set! (-> s4-1 quad) (-> self control last-trans-on-ground quad)) (ja-channel-set! 0) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (move-to-point! (-> self control) s4-1) ) (set! (-> self control camera-pos quad) (-> self control trans quad)) diff --git a/goal_src/jak3/engine/target/board/target-board.gc b/goal_src/jak3/engine/target/board/target-board.gc index af3c4cc26b..bc75df1d08 100644 --- a/goal_src/jak3/engine/target/board/target-board.gc +++ b/goal_src/jak3/engine/target/board/target-board.gc @@ -76,7 +76,7 @@ (set! (-> arg0 slope-down-factor) (-> arg1 slope-down-factor)) (set! (-> arg0 seek0) (lerp-scale - (* 0.1 (-> arg0 seek0)) + (/ (-> arg0 seek0) 10) (-> arg0 seek0) (the float (- (current-time) (-> self board spin-time))) 0.0 @@ -85,7 +85,7 @@ ) (set! (-> arg0 seek90) (lerp-scale - (* 0.1 (-> arg0 seek90)) + (/ (-> arg0 seek90) 10) (-> arg0 seek90) (the float (- (current-time) (-> self board spin-time))) 0.0 @@ -101,8 +101,8 @@ (when (not (time-elapsed? (-> self board spin-ground-start-time) (seconds 0.3))) (set-time! (-> self control last-attack-end-time)) (set-time! (-> self board spin-ground-time)) - (set! (-> arg0 seek0) (* 0.1 (-> arg0 seek0))) - (set! (-> arg0 seek90) (* 0.1 (-> arg0 seek90))) + (set! (-> arg0 seek0) (/ (-> arg0 seek0) 10)) + (set! (-> arg0 seek90) (/ (-> arg0 seek90) 10)) (set! (-> arg0 vel-turn) 131072.0) (set! (-> arg0 turnv) 91022.22) ) @@ -801,7 +801,7 @@ (set! f26-0 (-> s5-1 v1-18 w)) ) ) - (let ((f28-1 (* 0.0625 f28-0))) + (let ((f28-1 (/ f28-0 16))) (vector-normalize! s4-0 1.0) (set! (-> self control idx-of-fastest-xz-vel) s2-0) (set! (-> self control average-xz-vel) f28-1) @@ -1900,7 +1900,7 @@ (< 0.98 (vector-dot (-> self board probe-normal) (-> self control standard-dynamics gravity-normal))) (< f26-0 8192.0) (< f30-0 8192.0) - (or (< (* 0.2 f28-0) f30-0) (not (time-elapsed? (-> self board last-jump-time) (seconds 0.1)))) + (or (< (/ f28-0 5) f30-0) (not (time-elapsed? (-> self board last-jump-time) (seconds 0.1)))) ) (vector+float*! (-> self control transv) @@ -2300,7 +2300,7 @@ (set! (-> s2-0 start-pos quad) (-> v1-2 prim-core world-sphere quad)) (set! (-> s2-0 move-dist quad) (-> arg1 quad)) (let ((a0-3 s2-0)) - (set! (-> a0-3 radius) (* 0.5 (-> v1-2 prim-core world-sphere w))) + (set! (-> a0-3 radius) (/ (-> v1-2 prim-core world-sphere w) 2)) (set! (-> a0-3 collide-with) (-> v1-2 prim-core collide-with)) (set! (-> a0-3 ignore-process0) (-> arg0 process)) (set! (-> a0-3 ignore-process1) #f) @@ -2682,7 +2682,7 @@ (let* ((f30-0 (-> self board ride-speed)) (f0-4 (lerp-scale (-> self control current-surface fric) - (* 0.2 (-> self control current-surface fric)) + (/ (-> self control current-surface fric) 5) f30-0 0.0 (-> self control current-surface transv-max) diff --git a/goal_src/jak3/engine/target/collide-reaction-target.gc b/goal_src/jak3/engine/target/collide-reaction-target.gc index 5d04729a83..440c125b23 100644 --- a/goal_src/jak3/engine/target/collide-reaction-target.gc +++ b/goal_src/jak3/engine/target/collide-reaction-target.gc @@ -152,7 +152,7 @@ ) (when (and (or (and (< f0-27 0.95) (>= f30-0 0.0)) (and (logtest? sv-32 (cshape-reaction-flags csrf05)) (< f0-27 0.3)) - (< f1-11 (* -0.25 (-> arg1 best-my-prim local-sphere w))) + (< f1-11 (/ (-> arg1 best-my-prim local-sphere w) -4)) ) (>= (vector-dot tangent contact-normal) -0.000001) ) diff --git a/goal_src/jak3/engine/target/gun/gun-blue-shot.gc b/goal_src/jak3/engine/target/gun/gun-blue-shot.gc index 1d13854152..1feba0cb7c 100644 --- a/goal_src/jak3/engine/target/gun/gun-blue-shot.gc +++ b/goal_src/jak3/engine/target/gun/gun-blue-shot.gc @@ -37,7 +37,7 @@ (set! (-> v1-0 y) (- (-> arg2 rvec y) (-> a0-1 y))) (set! (-> v1-0 z) (- (-> arg2 rvec z) (-> a0-1 z))) (let ((f1-3 (vector-length v1-0))) - (set! (-> arg2 fvec w) (* 128.0 (- 1.0 (* 0.0000024414062 f1-3)))) + (set! (-> arg2 fvec w) (* 128.0 (- 1.0 (/ f1-3 (meters 100))))) ) ) 0 @@ -246,7 +246,7 @@ (let ((s3-0 (new 'stack-no-clear 'dist-dot-val))) (get-dist-and-dot (the-as gun-blue-shot arg0) s3-0) (when (< (-> s3-0 dist) 49152.0) - (let ((f0-12 (* 0.000020345053 (-> s3-0 dist))) + (let ((f0-12 (/ (-> s3-0 dist) (meters 12))) (f24-1 (* 0.5 (+ 1.0 (-> s3-0 dot)))) ) (set! f24-0 (* (lerp 65536.0 131072.0 f0-12) (- 2.0 f24-1))) @@ -494,7 +494,6 @@ (when (and (!= *target* s4-1) (!= sv-1300 s4-1) (not (focus-test? (the-as process-focusable s4-1) disable dead inactive gun-no-target)) - (pc-check-focus-fix (the-as process-focusable s4-1)) ;; og:preserve-this (or (logtest? (process-mask crate enemy vehicle civilian) (-> s4-1 mask)) (and (logtest? (process-mask guard) (-> s4-1 mask)) (-> *setting-control* user-current gun-target-guards?)) ) @@ -534,7 +533,7 @@ (set! f30-0 (+ 28.0 f30-0)) ) (if (logtest? (process-mask vehicle civilian) (-> s4-1 mask)) - (set! f30-0 (* 0.25 f30-0)) + (set! f30-0 (/ f30-0 4)) ) (set! (-> sv-1284 sv-1288 value) f30-0) (set! sv-1296 (+ sv-1296 f30-0)) @@ -865,7 +864,7 @@ (set! sv-80 (new 'stack-no-clear 'vector)) 0.0 (let* ((f28-0 (acos f0-2)) - (f0-4 (* 0.000030517578 f28-0)) + (f0-4 (/ f28-0 (meters 8))) ) 0.0 0.0 @@ -2668,7 +2667,8 @@ (defstate dissipate (gun-blue-shot-3) :virtual #t :code (behavior () - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (go-virtual die) ) ) @@ -2676,7 +2676,8 @@ (defstate impact (gun-blue-shot-3) :virtual #t :code (behavior () - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (go-virtual die) ) ) diff --git a/goal_src/jak3/engine/target/gun/gun-dark-shot.gc b/goal_src/jak3/engine/target/gun/gun-dark-shot.gc index 7d9f00b95c..829508a019 100644 --- a/goal_src/jak3/engine/target/gun/gun-dark-shot.gc +++ b/goal_src/jak3/engine/target/gun/gun-dark-shot.gc @@ -201,13 +201,7 @@ ) (set! (-> self root trans quad) (-> arg0 pos quad)) (quaternion-identity! (-> self root quat)) - (set-vector! - (-> self root scale) - (* 0.00024414062 (-> arg0 size-x)) - (* 0.00024414062 (-> arg0 size-y)) - 1.0 - 1.0 - ) + (set-vector! (-> self root scale) (/ (-> arg0 size-x) METER_LENGTH) (/ (-> arg0 size-y) METER_LENGTH) 1.0 1.0) (go-virtual active) ) @@ -218,13 +212,7 @@ (('set-pos-and-size) (let ((v1-2 (the-as gun-dark-3-sphere-init-params (-> block param 0)))) (set! (-> self root trans quad) (-> v1-2 pos quad)) - (set-vector! - (-> self root scale) - (* 0.00024414062 (-> v1-2 size-x)) - (* 0.00024414062 (-> v1-2 size-y)) - 1.0 - 1.0 - ) + (set-vector! (-> self root scale) (/ (-> v1-2 size-x) METER_LENGTH) (/ (-> v1-2 size-y) METER_LENGTH) 1.0 1.0) (vector-float*! (-> self root scale) (-> self root scale) 1.7) (set! (-> self alpha-val) (-> v1-2 alpha-val)) ) @@ -1691,7 +1679,7 @@ (set! f30-0 (lerp-scale 4096.0 1228.8 f0-9 30.0 300.0)) ) ) - (let ((f30-1 (* 0.5 f30-0))) + (let ((f30-1 (/ f30-0 2))) (vector-normalize! (-> self spin-vector) f30-1) (vector-normalize! (-> self core-velocity) 7372.8) (set! (-> s5-0 fvec quad) (-> s4-0 quad)) @@ -2510,7 +2498,7 @@ ) (s3-1 s2-2 (the-as quaternion s1-0) (+ f30-0 (* f28-0 (+ -1.0 (the-as float v1-40)))) *up-vector*) ) - (let ((f0-18 (* 0.000061035156 (-> self obj-radius)))) + (let ((f0-18 (/ (-> self obj-radius) (meters 4)))) 0.0 (let* ((f30-1 (lerp 1.0 0.2 f0-18)) (s3-2 s5-4) @@ -2782,7 +2770,7 @@ (let* ((f0-1 (vector-normalize-ret-len! s5-1 1.0)) (f0-2 (* 182.04445 f0-1)) (f0-3 (* 360.0 f0-2)) - (f0-4 (* 0.2 f0-3)) + (f0-4 (/ f0-3 5)) (f30-0 (fmin 116508.445 f0-4)) (s4-0 (handle->process (-> this parent-hand))) ) @@ -2884,7 +2872,7 @@ (until (< (-> self end-time) (current-time)) (suspend) ) - (let* ((f0-1 (+ 0.5 (* 0.0625 (-> self cached-damage)))) + (let* ((f0-1 (+ 0.5 (/ (-> self cached-damage) 16))) (f0-2 (fmin 0.9 f0-1)) ) (send-event (handle->process (-> self parent-hand)) 'gun-dark-2-off f0-2) @@ -2915,8 +2903,7 @@ ;; WARN: Return type mismatch int vs object. (defbehavior zero-g-wait-for-land gravity-spinner () - (suspend-for - (seconds 1.5) + (suspend-for (seconds 1.5) (let* ((s4-0 (handle->process (-> self parent-hand))) (s5-0 (if (type? s4-0 process-focusable) s4-0 @@ -2998,7 +2985,7 @@ (let ((f0-0 (vector-length (the-as vector (-> block param 1))))) 0.0 (when (< 40960.0 f0-0) - (let ((f30-0 (* 0.000024414063 f0-0))) + (let ((f30-0 (/ f0-0 (meters 10)))) (format 0 "Receving impact damage ~f~%" f30-0) (+! (-> self cached-damage) f30-0) ) @@ -3151,7 +3138,7 @@ ) 0.0 (set! (-> self cached-damage) (* 2.0 (-> self cached-damage))) - (let* ((f0-6 (* 0.00012207031 f0-5)) + (let* ((f0-6 (/ f0-5 (meters 2))) (f0-7 (fmax 1.0 f0-6)) ) (+! (-> self cached-damage) f0-7) @@ -3308,8 +3295,8 @@ (vector4-lerp! s5-0 (-> v1-0 0 dir0 color) (-> v1-0 0 dir1 color) (-> v1-0 0 dir1 extra x)) (fmax (fmax (-> s4-0 x) (-> s4-0 y)) (-> s4-0 z)) (fmax (fmax (-> s5-0 x) (-> s5-0 y)) (-> s5-0 z)) - (let* ((f0-10 (+ (* 0.2 (-> s4-0 x)) (* 0.75 (-> s4-0 y)) (* 0.05 (-> s4-0 z)))) - (f1-12 (+ (* 0.2 (-> s5-0 x)) (* 0.75 (-> s5-0 y)) (* 0.05 (-> s5-0 z)))) + (let* ((f0-10 (+ (/ (-> s4-0 x) 5) (* 0.75 (-> s4-0 y)) (/ (-> s4-0 z) 20))) + (f1-12 (+ (/ (-> s5-0 x) 5) (* 0.75 (-> s5-0 y)) (/ (-> s5-0 z) 20))) (f0-12 (* 0.5 (+ f0-10 f1-12))) (f30-0 (lerp-scale-clamp 0.0 1.0 f0-12 0.0 1.0)) (s5-1 (new 'stack 'rgbaf)) @@ -3613,9 +3600,11 @@ ) ) (set! f30-0 (+ -0.6 f30-0)) - (suspend-for (seconds 0.15)) + (suspend-for (seconds 0.15) + ) + ) + (suspend-for (seconds 13.5) ) - (suspend-for (seconds 13.5)) (go empty-state) (set! f30-0 4.0) ) diff --git a/goal_src/jak3/engine/target/gun/gun-part.gc b/goal_src/jak3/engine/target/gun/gun-part.gc index a788130826..37bd83514c 100644 --- a/goal_src/jak3/engine/target/gun/gun-part.gc +++ b/goal_src/jak3/engine/target/gun/gun-part.gc @@ -3845,7 +3845,7 @@ gun (let* ((f0-4 (vector-normalize-ret-len! s5-0 1.0)) (f0-6 (- (* 300.0 f0-4) (* f30-0 (seconds-per-frame)))) (f0-7 (fmax 0.0 f0-6)) - (f0-8 (* 0.0033333334 f0-7)) + (f0-8 (/ f0-7 300)) ) (vector-normalize! s5-0 f0-8) ) diff --git a/goal_src/jak3/engine/target/gun/gun-red-shot.gc b/goal_src/jak3/engine/target/gun/gun-red-shot.gc index 3b1d386633..788aa18a14 100644 --- a/goal_src/jak3/engine/target/gun/gun-red-shot.gc +++ b/goal_src/jak3/engine/target/gun/gun-red-shot.gc @@ -1312,9 +1312,9 @@ ) ) (let ((v1-8 (new 'stack-no-clear 'vector))) - (set! (-> v1-8 x) (* 0.00024414062 (-> this current-warp-radius))) + (set! (-> v1-8 x) (/ (-> this current-warp-radius) METER_LENGTH)) (set! (-> v1-8 y) 1.0) - (set! (-> v1-8 z) (* 0.00024414062 (-> this current-warp-radius))) + (set! (-> v1-8 z) (/ (-> this current-warp-radius) METER_LENGTH)) (set! (-> v1-8 w) 1.0) (send-event (handle->process (-> this explosion-1)) 'scale v1-8) ) @@ -1433,7 +1433,7 @@ (set-time! (-> self state-time)) (set! (-> self max-radius) (lerp (-> self min-charge-radius) (-> self max-charge-radius) (-> self strength))) (/ (-> self max-radius) (-> self max-charge-radius)) - (let ((f0-15 (* 0.000012207031 (-> self max-radius)))) + (let ((f0-15 (/ (-> self max-radius) (meters 20)))) 0.0 (let ((f1-5 (/ (* 2.0 (- (* 163840.0 f0-15) (-> self max-radius))) (* f0-15 f0-15)))) (set! (-> *part-id-table* 353 init-specs 9 initial-valuef) (* 1.2 f1-5)) @@ -1531,7 +1531,7 @@ (lerp 20480.0 24576.0 (/ (-> self max-radius) (-> self max-charge-radius))) ) (set! (-> *part-id-table* 226 init-specs 3 initial-valuef) - (* 0.5 (-> *part-id-table* 226 init-specs 3 initial-valuef)) + (/ (-> *part-id-table* 226 init-specs 3 initial-valuef) 2) ) (set! (-> *part-id-table* 226 init-specs 3 random-rangef) (lerp 0.0 20480.0 (/ (-> self max-radius) (-> self max-charge-radius))) @@ -1946,7 +1946,7 @@ (let ((gp-6 (vector-! (new 'stack-no-clear 'vector) (-> self root trans) (math-camera-pos)))) 0.0 (let* ((f0-2 (vector-length gp-6)) - (f30-0 (* 0.0000016276042 f0-2)) + (f30-0 (/ f0-2 (meters 150))) ) (cpad-set-buzz! (-> *cpad-list* cpads 0) diff --git a/goal_src/jak3/engine/target/gun/gun-yellow-shot.gc b/goal_src/jak3/engine/target/gun/gun-yellow-shot.gc index b615be1126..f9ab483a3f 100644 --- a/goal_src/jak3/engine/target/gun/gun-yellow-shot.gc +++ b/goal_src/jak3/engine/target/gun/gun-yellow-shot.gc @@ -247,7 +247,7 @@ (set! f0-11 (+ 28.0 f0-11)) ) (if (logtest? (process-mask vehicle civilian) (-> s3-1 mask)) - (set! f0-11 (* 0.25 f0-11)) + (set! f0-11 (/ f0-11 4)) ) (set! (-> sv-1076 sv-1080 value) f0-11) (set! sv-1088 (+ sv-1088 f0-11)) @@ -566,7 +566,8 @@ process (lambda :behavior process ((arg0 handle)) - (suspend-for (seconds 0.2)) + (suspend-for (seconds 0.2) + ) (send-event (handle->process arg0) 'die) ) gp-4 @@ -596,7 +597,8 @@ ) (logior! (-> self draw status) (draw-control-status no-draw)) (transform-post) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (deactivate self) ) :post ja-post @@ -1103,7 +1105,7 @@ (spawn-particles this s3-0) ) (let ((s3-1 (new 'stack-no-clear 'matrix)) - (f30-1 (fmin 1.0 (* 0.000015258789 f30-0))) + (f30-1 (fmin 1.0 (/ f30-0 (meters 16)))) (f28-0 (-> *part-id-table* 267 init-specs 3 initial-valuef)) ) (forward-up->inv-matrix s3-1 gp-1 *up-vector*) @@ -1883,7 +1885,7 @@ (set! (-> this damage) 2.0) (when (logtest? (game-feature feature22) (-> *game-info* features)) (set! (-> this damage) (* 2.0 (-> this damage))) - (set! (-> this vehicle-impulse-factor) (* 0.5 (-> this vehicle-impulse-factor))) + (set! (-> this vehicle-impulse-factor) (/ (-> this vehicle-impulse-factor) 2)) ) (logior! (-> this options) (projectile-options po13)) (set! (-> this muzzle-flash-part) (-> *part-id-table* 275)) @@ -2027,7 +2029,7 @@ (launch-particles (-> *part-id-table* 270) s3-0) ) (let ((s3-1 (new 'stack-no-clear 'matrix)) - (f30-1 (fmin 1.0 (* 0.000015258789 f30-0))) + (f30-1 (fmin 1.0 (/ f30-0 (meters 16)))) (f28-0 (-> *part-id-table* 267 init-specs 3 initial-valuef)) ) (forward-up->inv-matrix s3-1 s4-1 *up-vector*) diff --git a/goal_src/jak3/engine/target/logic-target.gc b/goal_src/jak3/engine/target/logic-target.gc index f516e148f6..ca86601e63 100644 --- a/goal_src/jak3/engine/target/logic-target.gc +++ b/goal_src/jak3/engine/target/logic-target.gc @@ -795,7 +795,7 @@ (set! f2-0 (-> a1-3 a2-6 w)) ) ) - (let ((f1-1 (* 0.0625 f1-0))) + (let ((f1-1 (/ f1-0 16))) (set! (-> self control idx-of-fastest-xz-vel) a0-3) (set! (-> self control average-xz-vel) f1-1) (if (logtest? (-> self control current-surface flags) (surface-flag no-turn-around)) diff --git a/goal_src/jak3/engine/target/mech/mech-part.gc b/goal_src/jak3/engine/target/mech/mech-part.gc index 0ce02fd1bc..305935dff3 100644 --- a/goal_src/jak3/engine/target/mech/mech-part.gc +++ b/goal_src/jak3/engine/target/mech/mech-part.gc @@ -152,7 +152,7 @@ (quaternion-rotate-local-x! s1-0 s1-0 32768.0) (let ((a0-3 s0-0)) (let ((v1-10 arg1)) - (let ((a1-4 (* 0.5 arg4))) + (let ((a1-4 (/ arg4 2))) (.mov vf7 a1-4) ) (.lvf vf5 (&-> arg2 quad)) diff --git a/goal_src/jak3/engine/target/mech/mech-states.gc b/goal_src/jak3/engine/target/mech/mech-states.gc index 08899e3c23..a83f2edd7c 100644 --- a/goal_src/jak3/engine/target/mech/mech-states.gc +++ b/goal_src/jak3/engine/target/mech/mech-states.gc @@ -1002,7 +1002,8 @@ (let ((s4-1 (new-stack-vector0))) (set! (-> s4-1 quad) (-> self control last-trans-on-ground quad)) (ja-channel-set! 0) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (move-to-point! (-> self control) s4-1) ) (set! (-> self control camera-pos quad) (-> self control trans quad)) @@ -1142,7 +1143,9 @@ ) (ja-channel-push! 1 (seconds 0.3)) (ja-no-eval :group! jakb-mech-jump-loop-ja :num! (loop! 0.5) :frame-num 0.0) - (suspend-for (seconds 0.8) (ja :group! jakb-mech-jump-loop-ja :num! (loop! 0.5))) + (suspend-for (seconds 0.8) + (ja :group! jakb-mech-jump-loop-ja :num! (loop! 0.5)) + ) (remove-setting! 'mode-name) ) (else @@ -1244,7 +1247,8 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) ) ) (set! (-> self control transv quad) (the-as uint128 0)) @@ -1268,7 +1272,7 @@ (dotimes (s4-0 1) ((method-of-type sphere new) (the-as symbol (-> s5-0 s4-0)) sphere) ) - (let ((f30-0 (seek (-> self control collide-mode-transition) 1.0 (* 0.1 (-> self clock time-adjust-ratio))))) + (let ((f30-0 (seek (-> self control collide-mode-transition) 1.0 (/ (-> self clock time-adjust-ratio) 10)))) (set! (-> s5-0 0 quad) (-> self control collision-spheres 2 prim-core world-sphere quad)) (set! (-> s5-0 0 r) (lerp-scale (-> *TARGET-bank* body-radius) 11468.8 f30-0 0.0 1.0)) (let ((v1-17 gp-0)) diff --git a/goal_src/jak3/engine/target/surface-h.gc b/goal_src/jak3/engine/target/surface-h.gc index cd5eeb1e0b..6e00c861bb 100644 --- a/goal_src/jak3/engine/target/surface-h.gc +++ b/goal_src/jak3/engine/target/surface-h.gc @@ -121,17 +121,17 @@ on impact, during touch, on exit, etc." (defun calc-terminal-vel ((arg0 float) (arg1 float) (arg2 float)) - (- (* (/ (- (* 0.016666668 arg0) arg1) arg2) (- 1.0 arg2)) arg1) + (- (* (/ (- (/ arg0 60) arg1) arg2) (- 1.0 arg2)) arg1) ) (defun calc-terminal2-vel ((arg0 float) (arg1 float) (arg2 float) (arg3 float)) - (let ((f0-4 (sqrtf (/ (- (* 0.016666668 arg0) arg1) arg2)))) + (let ((f0-4 (sqrtf (/ (- (/ arg0 60) arg1) arg2)))) (- f0-4 (+ arg1 (* arg2 (* f0-4 f0-4)))) ) ) (defun calc-terminal4-vel ((arg0 float) (arg1 float) (arg2 float)) - (let ((f0-5 (sqrtf (sqrtf (/ (- (* 0.016666668 arg0) arg1) arg2))))) + (let ((f0-5 (sqrtf (sqrtf (/ (- (/ arg0 60) arg1) arg2))))) (- f0-5 (+ arg1 (* arg2 (* f0-5 f0-5 f0-5 f0-5)))) ) ) diff --git a/goal_src/jak3/engine/target/target-anim.gc b/goal_src/jak3/engine/target/target-anim.gc index 467551b964..3c150aaf2c 100644 --- a/goal_src/jak3/engine/target/target-anim.gc +++ b/goal_src/jak3/engine/target/target-anim.gc @@ -814,7 +814,7 @@ ) ((lambda :behavior target () - (let ((f30-0 (fmax 0.8 (fmin 1.0 (* 0.000048828126 (-> self control ctrl-xz-vel)))))) + (let ((f30-0 (fmax 0.8 (fmin 1.0 (/ (-> self control ctrl-xz-vel) (meters 5)))))) (cond ((and (rand-vu-percent? 0.3) (and (< 20480.0 (-> self control ctrl-xz-vel)) (zero? (-> self ext-anim)))) (ja-no-eval :group! jakb-attack-from-stance-alt-end-ja :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) @@ -1186,10 +1186,10 @@ ) ) (let ((f0-37 (fabs (- f20-0 f30-0)))) - (set! f30-0 (seek f30-0 f20-0 (fmax 0.05 (fmin 0.2 (* 0.25 f0-37))))) + (set! f30-0 (seek f30-0 f20-0 (fmax 0.05 (fmin 0.2 (/ f0-37 4))))) ) (let ((f0-42 (fabs (- f22-1 f28-0)))) - (set! f28-0 (seek f28-0 f22-1 (fmax 0.05 (fmin 0.2 (* 0.25 f0-42))))) + (set! f28-0 (seek f28-0 f22-1 (fmax 0.05 (fmin 0.2 (/ f0-42 4))))) ) ) (set! (-> self control unknown-float-n12iuh3n1) f30-0) @@ -1767,7 +1767,7 @@ (let ((f0-11 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) - (while (not (or (and (< (fabs (/ f0-11 (* 0.0033333334 f1-1))) 150.0) (< f1-1 0.0)) + (while (not (or (and (< (fabs (/ f0-11 (/ f1-1 300))) 150.0) (< f1-1 0.0)) (time-elapsed? (-> self state-time) (seconds 1.7)) ) ) diff --git a/goal_src/jak3/engine/target/target-darkjak.gc b/goal_src/jak3/engine/target/target-darkjak.gc index 7f48ca9341..052988e876 100644 --- a/goal_src/jak3/engine/target/target-darkjak.gc +++ b/goal_src/jak3/engine/target/target-darkjak.gc @@ -215,12 +215,12 @@ (let ((v1-16 (-> (the-as collide-shape-prim-group (-> arg0 root root-prim)) child 0)) (a0-10 (-> (the-as collide-shape-prim-group (-> arg0 root root-prim)) child 1)) ) - (set! (-> v1-16 local-sphere w) (* 0.1 (-> arg0 root root-prim local-sphere w))) + (set! (-> v1-16 local-sphere w) (/ (-> arg0 root root-prim local-sphere w) 10)) (set! (-> a0-10 local-sphere w) (-> arg0 root root-prim local-sphere w)) ) (let ((s5-0 (new 'stack-no-clear 'collide-query)) (v1-20 (new 'stack-no-clear 'vector)) - (f30-0 (* 0.5 (-> arg0 root root-prim local-sphere w))) + (f30-0 (/ (-> arg0 root root-prim local-sphere w) 2)) ) (set! (-> v1-20 quad) (-> arg0 root trans quad)) (vector+float*! (-> s5-0 start-pos) v1-20 *up-vector* 0.0) @@ -1217,7 +1217,7 @@ (set-setting! 'rapid-tracking #f 0.0 0) ((lambda :behavior target () - (set! (-> self control bend-target) (* 0.5 (-> self control bend-target))) + (set! (-> self control bend-target) (/ (-> self control bend-target) 2)) (if (logtest? (water-flag touch-water) (-> self water flags)) (sound-play "swim-stroke") ) diff --git a/goal_src/jak3/engine/target/target-death.gc b/goal_src/jak3/engine/target/target-death.gc index 24c68da7b5..2d5120f49f 100644 --- a/goal_src/jak3/engine/target/target-death.gc +++ b/goal_src/jak3/engine/target/target-death.gc @@ -57,7 +57,8 @@ (intro-play) ) ((logtest? (-> arg0 flags) (continue-flags warp-gate)) - (suspend-for (seconds 0.05)) + (suspend-for (seconds 0.05) + ) (let ((s5-1 (new 'static 'vector)) (a2-0 (find-nearest-entity (-> arg0 trans) warp-gate)) ) @@ -216,7 +217,8 @@ (go target-grab 'stance) ) (else - (suspend-for (seconds 0.05)) + (suspend-for (seconds 0.05) + ) ) ) 0 @@ -1420,7 +1422,7 @@ (set! (-> sv-32 vector y) (-> sv-32 shove-up)) ) (when (and (focus-test? self dark) (nonzero? (-> self darkjak))) - (set! (-> sv-32 damage) (fmax 1.0 (ceil (* 0.5 (-> sv-32 damage))))) + (set! (-> sv-32 damage) (fmax 1.0 (ceil (/ (-> sv-32 damage) 2)))) 0 ) (set! (-> sv-36 quad) (-> sv-32 vector quad)) @@ -1450,7 +1452,8 @@ (let ((gp-1 (new-stack-vector0))) (set! (-> gp-1 quad) (-> self control last-trans-on-ground quad)) (ja-channel-set! 0) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (move-to-point! (-> self control) gp-1) ) (set! (-> self control camera-pos quad) (-> self control trans quad)) @@ -2278,7 +2281,8 @@ (set! (-> self post-hook) target-no-ja-move-post) (ja-channel-set! 0) (ja-post) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) ) (('grenade 'big-explosion 'explode) (set! (-> self post-hook) target-no-stick-post) @@ -2357,7 +2361,8 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) ) ) ) @@ -2373,7 +2378,8 @@ (set! (-> self post-hook) target-no-ja-move-post) (ja-channel-set! 0) (ja-post) - (suspend-for (seconds 1.2)) + (suspend-for (seconds 1.2) + ) ) ((= v1-61 'endlessfall) ((lambda :behavior target @@ -2411,8 +2417,7 @@ (target-falling-anim 30 (seconds 0.33)) (ja-channel-push! 1 (seconds 0.3)) (ja-no-eval :group! jakb-launch-jump-loop-ja :num! (loop! 0.5) :frame-num 0.0) - (suspend-for - (seconds 0.8) + (suspend-for (seconds 0.8) (when (and (logtest? (-> self control status) (collide-status on-surface)) (!= (-> self control cur-pat event) 2)) (set! v1-24 'target-hit-ground-hard) (goto cfg-17) @@ -2465,7 +2470,8 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) ) (remove-setting! 'mode-name) ) @@ -2630,7 +2636,8 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) ) ((= v1-61 'centipede) (set! (-> self trans-hook) #f) diff --git a/goal_src/jak3/engine/target/target-gun.gc b/goal_src/jak3/engine/target/target-gun.gc index f947e1d67a..89d7b930fe 100644 --- a/goal_src/jak3/engine/target/target-gun.gc +++ b/goal_src/jak3/engine/target/target-gun.gc @@ -2082,7 +2082,7 @@ (dotimes (s4-1 1) ((method-of-type sphere new) (the-as symbol (-> s5-2 s4-1)) sphere) ) - (let ((f30-1 (seek (-> self control collide-mode-transition) 1.0 (* 0.1 (-> self clock time-adjust-ratio))))) + (let ((f30-1 (seek (-> self control collide-mode-transition) 1.0 (/ (-> self clock time-adjust-ratio) 10)))) (set! (-> s5-2 0 quad) (-> self control collision-spheres 2 prim-core world-sphere quad)) (set! (-> s5-2 0 r) (lerp-scale (-> *TARGET-bank* body-radius) 7372.8 f30-1 0.0 1.0)) (let ((v1-214 gp-3)) @@ -2171,7 +2171,7 @@ (let* ((f0-28 (deg-diff (y-angle (-> self control)) (vector-y-angle (-> self control to-target-pt-xz)))) (f0-30 (fmax -5461.3335 (fmin 5461.3335 f0-28))) ) - (seek! (-> self upper-body twist z) f0-30 (fabs (* 0.2 f0-30))) + (seek! (-> self upper-body twist z) f0-30 (fabs (/ f0-30 5))) ) ) ) diff --git a/goal_src/jak3/engine/target/target-invisible.gc b/goal_src/jak3/engine/target/target-invisible.gc index 468be4ddda..a59da774e3 100644 --- a/goal_src/jak3/engine/target/target-invisible.gc +++ b/goal_src/jak3/engine/target/target-invisible.gc @@ -180,8 +180,8 @@ (vector+! s4-0 s4-0 s3-0) ) (set! (-> *part-id-table* 659 init-specs 2 initial-valuef) (-> *invis-joint-list* s5-0 size)) - (set! (-> *part-id-table* 659 init-specs 3 initial-valuef) (* 0.5 (-> *invis-joint-list* s5-0 size))) - (set! (-> *part-id-table* 659 init-specs 4 initial-valuef) (* 0.5 (-> *invis-joint-list* s5-0 size))) + (set! (-> *part-id-table* 659 init-specs 3 initial-valuef) (/ (-> *invis-joint-list* s5-0 size) 2)) + (set! (-> *part-id-table* 659 init-specs 4 initial-valuef) (/ (-> *invis-joint-list* s5-0 size) 2)) (launch-particles (-> *part-id-table* 659) s4-0) ) ) @@ -442,7 +442,8 @@ (set-time! (-> self state-time)) ) :code (behavior () - (suspend-for (seconds 0.66)) + (suspend-for (seconds 0.66) + ) (cond ((logtest? (-> *part-group-id-table* 182 flags) (sp-group-flag sp13)) (set! (-> *launch-matrix* trans quad) (-> self root trans quad)) @@ -469,7 +470,8 @@ ) ) (sound-play "dark-maker") - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) (go-virtual idle) ) :post (behavior () diff --git a/goal_src/jak3/engine/target/target-launch.gc b/goal_src/jak3/engine/target/target-launch.gc index 0b42792e3a..d4c4ea0eac 100644 --- a/goal_src/jak3/engine/target/target-launch.gc +++ b/goal_src/jak3/engine/target/target-launch.gc @@ -54,7 +54,7 @@ (f0-5 (- 1.0 f0-4)) ) (let ((f1-5 (* 1.4 f0-5 (/ f30-0 (* 0.0033333334 (the float (-> self control sliding-start-time))))))) - (* 0.0033333334 f1-5 (the float (- (current-time) (-> self clock old-frame-counter)))) + (* (/ f1-5 300) (the float (- (current-time) (-> self clock old-frame-counter)))) ) (let ((f0-6 (- 1.0 f0-5))) (vector+float*! @@ -63,7 +63,7 @@ (-> self control unknown-vector37) f0-6 ) - (+! (-> self control trans y) (* 0.5 f0-6 f0-6 (the-as float (-> self control unknown-word04)))) + (+! (-> self control trans y) (* (/ f0-6 2) f0-6 (the-as float (-> self control unknown-word04)))) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control transv quad) (-> self control unknown-vector37 quad)) (+! (-> self control transv y) (* f0-6 (the-as float (-> self control unknown-word04)))) diff --git a/goal_src/jak3/engine/target/target-lightjak.gc b/goal_src/jak3/engine/target/target-lightjak.gc index e8aa500cfa..bf0cb35bc0 100644 --- a/goal_src/jak3/engine/target/target-lightjak.gc +++ b/goal_src/jak3/engine/target/target-lightjak.gc @@ -1380,12 +1380,7 @@ (set! (-> self fact shield-attack-id) a0-46) ) (if (not (logtest? (-> self lightjak stage) (lightjak-stage ls1))) - (send-event - self - 'get-pickup - (pickup-type eco-pill-light) - (* -0.33333334 (-> *FACT-bank* lightjak-shield-inc)) - ) + (send-event self 'get-pickup (pickup-type eco-pill-light) (/ (-> *FACT-bank* lightjak-shield-inc) -3)) ) (set-time! (-> self lightjak shield-count-time)) ) @@ -2275,7 +2270,9 @@ (defstate die (freeze-screen) :virtual #t :code (behavior () - (suspend-for (seconds 1) (seek! (-> self transition) 0.0 (seconds-per-frame))) + (suspend-for (seconds 1) + (seek! (-> self transition) 0.0 (seconds-per-frame)) + ) ) ) @@ -2766,7 +2763,7 @@ ) (else (let* ((f1-5 (/ f0-1 (* (-> self control dynam gravity-length) (seconds-per-frame)))) - (f0-6 (* 0.5 f1-5 (seconds-per-frame) f0-1)) + (f0-6 (* (/ f1-5 2) (seconds-per-frame) f0-1)) (v1-25 (new-stack-vector0)) ) (let ((f1-9 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))) diff --git a/goal_src/jak3/engine/target/target-swim.gc b/goal_src/jak3/engine/target/target-swim.gc index c922805e3d..b456775632 100644 --- a/goal_src/jak3/engine/target/target-swim.gc +++ b/goal_src/jak3/engine/target/target-swim.gc @@ -187,10 +187,10 @@ (f24-0 (fmax -1.0 (fmin 1.0 (* 1.6 (-> self control local-slope-x))))) ) (let ((f1-4 (fabs (- f0-10 f28-0)))) - (set! f28-0 (seek f28-0 f0-10 (fmax 0.05 (fmin 0.2 (* 0.25 f1-4))))) + (set! f28-0 (seek f28-0 f0-10 (fmax 0.05 (fmin 0.2 (/ f1-4 4))))) ) (let ((f0-14 (fabs (- f24-0 f26-0)))) - (set! f26-0 (seek f26-0 f24-0 (fmax 0.05 (fmin 0.2 (* 0.25 f0-14))))) + (set! f26-0 (seek f26-0 f24-0 (fmax 0.05 (fmin 0.2 (/ f0-14 4))))) ) ) (ja :chan 3 :group! jakb-walk-down-ja :dist (-> *TARGET-bank* walk-down-cycle-dist)) diff --git a/goal_src/jak3/engine/target/target-tube.gc b/goal_src/jak3/engine/target/target-tube.gc index f55dd610ea..b13a4aafc8 100644 --- a/goal_src/jak3/engine/target/target-tube.gc +++ b/goal_src/jak3/engine/target/target-tube.gc @@ -845,7 +845,7 @@ (f2-0 f1-2) ) (if (< f0-2 0.0) - (set! f0-2 (* 0.5 f0-2)) + (set! f0-2 (/ f0-2 2)) ) (vector+! (-> arg1 vector) diff --git a/goal_src/jak3/engine/target/target-turret-shot.gc b/goal_src/jak3/engine/target/target-turret-shot.gc index 91582cc7a4..5d490db51a 100644 --- a/goal_src/jak3/engine/target/target-turret-shot.gc +++ b/goal_src/jak3/engine/target/target-turret-shot.gc @@ -276,7 +276,7 @@ (launch-particles (-> *part-id-table* 852) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000027126736 f30-0)) + (f26-0 (/ f30-0 (meters 9))) (f30-1 (-> *part-id-table* 1021 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 1021 init-specs 4 initial-valuef)) ) diff --git a/goal_src/jak3/engine/target/target-util.gc b/goal_src/jak3/engine/target/target-util.gc index 873ca181f8..e8485d0d92 100644 --- a/goal_src/jak3/engine/target/target-util.gc +++ b/goal_src/jak3/engine/target/target-util.gc @@ -1253,7 +1253,7 @@ ) ) ) - (* 0.125 f30-0) + (/ f30-0 8) ) ) @@ -1931,10 +1931,10 @@ (f30-0 (fmax -1.0 (fmin 1.0 arg2))) ) (let ((f1-5 (fabs (- f0-1 (-> arg0 blend 1))))) - (seek! (-> arg0 blend 1) f0-1 (fmax (fmin (* f1-5 arg3) (* 0.8 arg3)) (* 0.2 arg3))) + (seek! (-> arg0 blend 1) f0-1 (fmax (fmin (* f1-5 arg3) (* 0.8 arg3)) (/ arg3 5))) ) (let ((f0-9 (fabs (- f30-0 (-> arg0 blend 2))))) - (seek! (-> arg0 blend 2) f30-0 (fmax (fmin (* f0-9 arg3) (* 0.8 arg3)) (* 0.2 arg3))) + (seek! (-> arg0 blend 2) f30-0 (fmax (fmin (* f0-9 arg3) (* 0.8 arg3)) (/ arg3 5))) ) ) (cond @@ -2120,8 +2120,8 @@ (cond ((and (< 0.0 f0-5) (focus-test? this in-air)) (let* ((v0-1 (new 'static 'vector)) - (f0-6 (+ (* 0.0016666667 (-> v1-0 dynam gravity-length)) f0-5)) - (f0-9 (/ (* 0.5 f0-6 f0-6) (-> v1-0 dynam gravity-length))) + (f0-6 (+ (/ (-> v1-0 dynam gravity-length) 600) f0-5)) + (f0-9 (/ (* (/ f0-6 2) f0-6) (-> v1-0 dynam gravity-length))) ) (vector+float*! v0-1 (-> v1-0 trans) (-> v1-0 dynam gravity-normal) f0-9) ) diff --git a/goal_src/jak3/engine/target/target.gc b/goal_src/jak3/engine/target/target.gc index 0890c7ed7f..ff5e0b16ee 100644 --- a/goal_src/jak3/engine/target/target.gc +++ b/goal_src/jak3/engine/target/target.gc @@ -587,11 +587,11 @@ (delete-back-vel) (let* ((f0-0 arg5) (f1-0 0.0) - (f2-2 (+ (* 0.0016666667 (-> self control dynam gravity-length)) + (f2-2 (+ (/ (-> self control dynam gravity-length) 600) (fmax 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) ) - (f0-1 (* f0-0 (fmax f1-0 (/ (* 0.5 f2-2 f2-2) (-> self control dynam gravity-length))))) + (f0-1 (* f0-0 (fmax f1-0 (/ (* (/ f2-2 2) f2-2) (-> self control dynam gravity-length))))) (s5-1 (+ arg0 f0-1)) ) (let ((s2-1 (+ arg1 f0-1))) @@ -2898,7 +2898,7 @@ ) (else (let* ((f1-5 (/ f0-4 (* (-> self control dynam gravity-length) (seconds-per-frame)))) - (f0-9 (* 0.5 f1-5 (seconds-per-frame) f0-4)) + (f0-9 (* (/ f1-5 2) (seconds-per-frame) f0-4)) ) (let ((v1-36 (ja-group))) (if (and v1-36 diff --git a/goal_src/jak3/engine/target/target2.gc b/goal_src/jak3/engine/target/target2.gc index 1fc5ab716c..3ff49c0e3e 100644 --- a/goal_src/jak3/engine/target/target2.gc +++ b/goal_src/jak3/engine/target/target2.gc @@ -47,7 +47,10 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for (seconds 0.3) (suspend) (ja :num! (seek! (ja-aframe 19.0 0) 0.05))) + (suspend-for (seconds 0.3) + (suspend) + (ja :num! (seek! (ja-aframe 19.0 0) 0.05)) + ) (ja-channel-push! 1 (seconds 0.3)) (ja-no-eval :group! jakb-painful-land-ja :num! (seek!) :frame-num (ja-aframe 40.0 0)) (until (ja-done? 0) @@ -824,7 +827,7 @@ (let ((f0-1 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) - (while (not (and (< (fabs (/ f0-1 (* 0.0033333334 f1-1))) 40.0) (and (< f1-1 0.0) (ja-min? 0)))) + (while (not (and (< (fabs (/ f0-1 (/ f1-1 300))) 40.0) (and (< f1-1 0.0) (ja-min? 0)))) (suspend) (ja :num! (loop!)) (set! f0-1 (target-height-above-ground)) @@ -1539,7 +1542,9 @@ (until #f (let ((s5-0 (rand-vu-int-range 30 600))) (ja :group! jakb-wall-hide-head-ja) - (suspend-for s5-0 (gp-0)) + (suspend-for s5-0 + (gp-0) + ) ) (let ((f30-0 (rand-vu-float-range 0.5 1.5))) (cond @@ -1577,7 +1582,9 @@ (ja :num! (seek! max f30-0)) ) (let ((s5-2 (rand-vu-int-range 60 300))) - (suspend-for s5-2 (gp-0)) + (suspend-for s5-2 + (gp-0) + ) ) (ja-no-eval :group! jakb-wall-hide-head-left-ja :num! (seek! 0.0 f30-0) :frame-num max) (until (ja-done? 0) @@ -1594,7 +1601,9 @@ (ja :num! (seek! 0.0 f30-0)) ) (let ((s5-3 (rand-vu-int-range 60 300))) - (suspend-for s5-3 (gp-0)) + (suspend-for s5-3 + (gp-0) + ) ) (ja-no-eval :group! jakb-wall-hide-head-right-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) @@ -1854,7 +1863,8 @@ :trans (behavior () (set-time! (-> self control time-of-last-debug-float)) (cond - ((cpad-hold? (-> self control cpad number) r2) + ;; og:preserve-this no debug hover when paused. + ((and (cpad-hold? (-> self control cpad number) r2) (not *pause-lock*)) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self control trans quad)) (let ((v1-14 (new-stack-vector0)) @@ -1941,8 +1951,7 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for - (the-as time-frame arg0) + (suspend-for (the-as time-frame arg0) (ja-no-eval :group! jakb-blast-recover-loop-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) diff --git a/goal_src/jak3/engine/ui/hud-classes.gc b/goal_src/jak3/engine/ui/hud-classes.gc index 890117bcae..78ce59be75 100644 --- a/goal_src/jak3/engine/ui/hud-classes.gc +++ b/goal_src/jak3/engine/ui/hud-classes.gc @@ -179,7 +179,7 @@ ) ) (set! (-> this sprites 2 color x) (the int (* 0.35 f1-17 f0-27))) - (set! (-> this sprites 2 color y) (the int (* 0.1 f1-17 f0-27))) + (set! (-> this sprites 2 color y) (the int (* (/ f1-17 10) f0-27))) (set! (-> this sprites 2 color z) (the int (* 0.8 f1-17 f0-27))) ) ) diff --git a/goal_src/jak3/engine/ui/hud.gc b/goal_src/jak3/engine/ui/hud.gc index 8c5916f58a..202a30609d 100644 --- a/goal_src/jak3/engine/ui/hud.gc +++ b/goal_src/jak3/engine/ui/hud.gc @@ -1099,7 +1099,7 @@ :code (behavior () (until #f (if (not (logtest? (-> *kernel-context* prevent-from-run) (process-mask pause))) - (seek! (-> self offset) 0.0 (* 0.1 (-> self clock time-adjust-ratio))) + (seek! (-> self offset) 0.0 (/ (-> self clock time-adjust-ratio) 10)) ) (if (>= 0.0 (-> self offset)) (go hud-in) diff --git a/goal_src/jak3/engine/ui/progress/progress-draw.gc b/goal_src/jak3/engine/ui/progress/progress-draw.gc index 335cc7f54b..87efdc2a01 100644 --- a/goal_src/jak3/engine/ui/progress/progress-draw.gc +++ b/goal_src/jak3/engine/ui/progress/progress-draw.gc @@ -577,9 +577,9 @@ (t1-1 s1-0) (f28-0 (sv-48 s0-1 sv-64 sv-80 sv-96 t0-1 t1-1 t2-1 t3-1)) ) - (set! f30-0 (* 0.5 f28-0)) + (set! f30-0 (/ f28-0 2)) (let ((v1-17 arg0)) - (set! (-> v1-17 scale) (* 0.5 (-> arg0 scale))) + (set! (-> v1-17 scale) (/ (-> arg0 scale) 2)) ) (let* ((a0-7 this) (t9-3 (method-of-object a0-7 progress-method-40)) @@ -755,7 +755,7 @@ 0 ) ) - (the int (* 0.5 f30-0)) + (the int (/ f30-0 2)) ) ) ) @@ -1280,7 +1280,7 @@ 0 0 0 - (let* ((gp-0 (the int (* 0.016666668 arg0))) + (let* ((gp-0 (the int (/ arg0 60))) (v1-5 (- arg0 (* 60.0 (the float gp-0)))) (s5-0 (the int v1-5)) (v1-6 (- v1-5 (the float s5-0))) @@ -1302,13 +1302,7 @@ ) (cond ((logtest? (-> v1-3 flags) (highscore-flags hf2)) - (print-game-text - (highscore-time->string this (* 0.0033333334 arg1)) - arg0 - #f - 44 - (bucket-id hud-draw-hud-alpha) - ) + (print-game-text (highscore-time->string this (/ arg1 300)) arg0 #f 44 (bucket-id hud-draw-hud-alpha)) ) ((logtest? (-> v1-3 flags) (highscore-flags hf3)) (let ((s4-1 print-game-text)) @@ -1832,8 +1826,8 @@ (f28-0 (- (-> s0-1 z) (-> s0-1 x))) (s1-2 (init-text! this)) ) - (let* ((f30-0 (* 0.5 f28-0)) - (f28-1 (* 0.5 f28-0)) + (let* ((f30-0 (/ f28-0 2)) + (f28-1 (/ f28-0 2)) (f26-0 (+ sv-16 (-> s0-1 x))) (f24-0 (+ sv-16 (-> s0-1 x) f30-0)) ) @@ -2236,7 +2230,7 @@ (f2-4 (+ (-> s4-0 x) (* 0.5 (- (-> s4-0 z) (-> s4-0 x))))) (f30-1 (+ f2-4 f1-6)) (f28-0 (- f2-4 f1-6)) - (f26-0 (+ -8.0 (* 0.5 f0-7) (-> arg1 origin y))) + (f26-0 (+ -8.0 (/ f0-7 2) (-> arg1 origin y))) ) (let ((f1-10 (+ -15.0 (-> arg1 origin y))) (f24-0 (+ 3.0 f0-7 (-> arg1 origin y))) @@ -2516,7 +2510,7 @@ (let ((a0-23 arg1)) (set! (-> a0-23 color) (font-color font-color-32)) ) - (set! (-> arg1 origin x) (- (-> arg1 origin x) (the float (the int (* 0.5 f30-2))))) + (set! (-> arg1 origin x) (- (-> arg1 origin x) (the float (the int (/ f30-2 2))))) (let ((s5-1 print-game-text)) (format (clear *temp-string*) "~33L~C" 163) (s5-1 *temp-string* arg1 #f 44 (bucket-id hud-draw-hud-alpha)) diff --git a/goal_src/jak3/engine/ui/progress/progress.gc b/goal_src/jak3/engine/ui/progress/progress.gc index 30fbb3bb2d..9308f84288 100644 --- a/goal_src/jak3/engine/ui/progress/progress.gc +++ b/goal_src/jak3/engine/ui/progress/progress.gc @@ -1094,14 +1094,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)) @@ -1144,12 +1144,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)) (= (-> self 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)) (!= (-> self starting-state) 'title)) 0.0 @@ -1159,14 +1159,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 (!= (-> self starting-state) 'title) (seek! (-> self pos-transition) 0.0 f30-0) @@ -1217,9 +1217,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 @@ -1493,9 +1493,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) ) ) ) @@ -1654,8 +1654,7 @@ (-> self current) ) ) - ;; og:preserve-this patched to next instead of current because we save synchronously - (case (-> self next) + (case (-> self current) (('saving) (cond ((= (-> self state-array 0) 'title) @@ -1815,16 +1814,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) @@ -1871,11 +1870,11 @@ (let ((s5-0 (&+ (the-as (pointer float) *setting-control*) (-> this setting-offset))) (s3-0 #f) ) - (let ((f30-0 (* 0.02 (-> pp clock time-adjust-ratio))) + (let ((f30-0 (/ (-> pp clock time-adjust-ratio) 50)) (f28-0 0.0) ) (when (type? this menu-picture-slider-option) - (set! f30-0 (* 0.005 (-> pp clock time-adjust-ratio))) + (set! f30-0 (/ (-> pp clock time-adjust-ratio) 200)) (set! f28-0 0.25) ) (cond diff --git a/goal_src/jak3/engine/ui/text.gc b/goal_src/jak3/engine/ui/text.gc index 3486743541..2ac85517b1 100644 --- a/goal_src/jak3/engine/ui/text.gc +++ b/goal_src/jak3/engine/ui/text.gc @@ -447,7 +447,7 @@ ) (set! sv-64 0) (if (logtest? (-> arg1 flags) (font-flags middle)) - (+! (-> arg1 origin x) (* 0.5 (-> arg1 width))) + (+! (-> arg1 origin x) (/ (-> arg1 width) 2)) ) (set! sv-72 (-> sv-32 0)) (set! sv-80 0) diff --git a/goal_src/jak3/engine/util/smush-control-h.gc b/goal_src/jak3/engine/util/smush-control-h.gc index e40f94fc2d..0c92ade6b9 100644 --- a/goal_src/jak3/engine/util/smush-control-h.gc +++ b/goal_src/jak3/engine/util/smush-control-h.gc @@ -110,7 +110,7 @@ (clock clock) ) "Start the smush with the given parameters." - (when (>= (fabs (* 0.2 (-> this amp))) (fabs (get-no-update this))) + (when (>= (fabs (/ (-> this amp) 5)) (fabs (get-no-update this))) (set! (-> this amp) amplitude) (set! (-> this period) (the float period)) (set! (-> this duration) (the float duration)) diff --git a/goal_src/jak3/engine/util/sync-info.gc b/goal_src/jak3/engine/util/sync-info.gc index d88fc2b22f..10bdef39a7 100644 --- a/goal_src/jak3/engine/util/sync-info.gc +++ b/goal_src/jak3/engine/util/sync-info.gc @@ -409,7 +409,7 @@ (defmethod set-params! ((this delayed-rand-float) (arg0 int) (arg1 int) (arg2 float)) (set! (-> this min-time) arg0) (set! (-> this max-time) arg1) - (set! (-> this max-val) (* 0.5 arg2)) + (set! (-> this max-val) (/ arg2 2)) (set! (-> this start-time) 0) (set! (-> this timer) 0) (set! (-> this value) 0.0) @@ -507,8 +507,8 @@ (defmethod set-params! ((this delayed-rand-vector) (arg0 int) (arg1 int) (arg2 float) (arg3 float)) (set! (-> this min-time) arg0) (set! (-> this max-time) arg1) - (set! (-> this xz-max) (* 0.5 arg2)) - (set! (-> this y-max) (* 0.5 arg3)) + (set! (-> this xz-max) (/ arg2 2)) + (set! (-> this y-max) (/ arg3 2)) (set! (-> this start-time) 0) (set! (-> this timer) 0) (vector-reset! (-> this value)) diff --git a/goal_src/jak3/levels/city/blow-tower/blow-tower-obs.gc b/goal_src/jak3/levels/city/blow-tower/blow-tower-obs.gc index f96c9260c1..ff0347f185 100644 --- a/goal_src/jak3/levels/city/blow-tower/blow-tower-obs.gc +++ b/goal_src/jak3/levels/city/blow-tower/blow-tower-obs.gc @@ -1303,7 +1303,7 @@ (f0-2 (evaluate *curve-linear-up-down* f0-1 (loop-behavior use-default))) (f0-3 (sin (lerp -16384.0 16384.0 f0-2))) (f0-4 (+ 1.0 f0-3)) - (f0-5 (* 0.5 f0-4)) + (f0-5 (/ f0-4 2)) (f0-6 (* 0.8 f0-5)) (f0-7 (+ 0.3 f0-6)) ) @@ -1514,7 +1514,8 @@ (part-tracker-spawn part-tracker :to *entity-pool* :group (-> *part-group-id-table* 1460)) ) ) - (suspend-for (seconds 0.1)) + (suspend-for (seconds 0.1) + ) (let ((v1-46 (-> self root root-prim))) (set! (-> v1-46 prim-core collide-as) (collide-spec)) (set! (-> v1-46 prim-core collide-with) (collide-spec)) @@ -1776,11 +1777,11 @@ (set! (-> v1-4 quad) (-> sv-52 quad)) (set! sv-80 v1-4) ) - (let* ((f30-0 (- (* 0.5 arg2))) + (let* ((f30-0 (- (/ arg2 2))) (v1-6 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-7 (the-as number (logior #x3f800000 v1-6))) ) - (set! sv-84 (+ f30-0 (* (+ -1.0 (the-as float v1-7)) (+ (* 0.5 arg2) (* 0.5 arg2))))) + (set! sv-84 (+ f30-0 (* (+ -1.0 (the-as float v1-7)) (+ (/ arg2 2) (/ arg2 2))))) ) (vector+float*! sv-80 sv-80 (vector-cross! (new 'stack-no-clear 'vector) sv-48 *up-vector*) (* sv-84 arg3)) (bt-barrel-ground-probe sv-80) @@ -1804,10 +1805,10 @@ ) (set! sv-128 sv-48) (let* ((f30-1 arg3) - (f28-0 (- (* 0.25 arg2))) + (f28-0 (- (/ arg2 4))) (v1-30 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-31 (the-as number (logior #x3f800000 v1-30))) - (f0-18 (* f30-1 (+ f28-0 (* (+ -1.0 (the-as float v1-31)) (+ (* 0.25 arg2) (* 0.25 arg2)))))) + (f0-18 (* f30-1 (+ f28-0 (* (+ -1.0 (the-as float v1-31)) (+ (/ arg2 4) (/ arg2 4)))))) ) (vector+float*! s1-1 s0-1 sv-128 f0-18) ) @@ -1875,7 +1876,8 @@ :code (behavior () (until #f (attempt-barrel-spawn) - (suspend-for (seconds 0.3)) + (suspend-for (seconds 0.3) + ) ) #f ) diff --git a/goal_src/jak3/levels/city/blow-tower/blow-tower-obs2.gc b/goal_src/jak3/levels/city/blow-tower/blow-tower-obs2.gc index c6032d6111..701af6949c 100644 --- a/goal_src/jak3/levels/city/blow-tower/blow-tower-obs2.gc +++ b/goal_src/jak3/levels/city/blow-tower/blow-tower-obs2.gc @@ -177,7 +177,7 @@ (f0-6 (+ -1.0 (the-as float v1-35))) ) (cond - ((< f0-6 (* 0.5 f30-0)) + ((< f0-6 (/ f30-0 2)) (set! s5-1 (logior s5-1 2)) ) ((< f0-6 f30-0) @@ -366,7 +366,8 @@ (defbehavior bt-roboguard-turret-code bt-roboguard () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! bt-roboguard-idle-shoot0-loop-ja :num! zero) - (suspend-for (seconds 0.2)) + (suspend-for (seconds 0.2) + ) (let ((gp-1 (lambda ((arg0 bt-roboguard) (arg1 symbol)) (quaternion-rotate-y! (-> arg0 root quat) (-> arg0 root quat) (* 20480.0 (seconds-per-frame) (if arg1 @@ -381,7 +382,8 @@ ) (until #f (when (< (fabs (-> self me-to-focus-angle)) f30-0) - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (while (< (fabs (-> self me-to-focus-angle)) f30-0) (suspend) ) @@ -402,7 +404,8 @@ ) ) (when (< (fabs (-> self me-to-focus-angle)) f30-0) - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (while (< (fabs (-> self me-to-focus-angle)) f30-0) (suspend) ) @@ -730,7 +733,7 @@ (let ((f30-0 0.3)) (set! (-> (new 'stack-no-clear 'vector) quad) (-> this bob-vec quad)) (set! (-> this xz-dir x) (-> this bobbers 0 current-speed)) - (set! (-> this xz-dir z) (* 0.25 (-> this bobbers 2 current-speed))) + (set! (-> this xz-dir z) (/ (-> this bobbers 2 current-speed) 4)) (let ((f26-0 (lerp-scale 0.0 10922.667 (-> this xz-dir z) f30-0 1.0)) (f24-0 (lerp-scale 0.0 -10922.667 (-> this xz-dir z) (- f30-0) -1.0)) (f28-0 (lerp-scale 0.0 -10922.667 (-> this xz-dir x) f30-0 1.0)) @@ -2178,7 +2181,8 @@ ) ) :code (behavior () - (suspend-for (seconds 0.3)) + (suspend-for (seconds 0.3) + ) (until #f (suspend) (when (ragdoll-settled? self) @@ -2186,9 +2190,11 @@ (logior! (-> self skel effect flags) (effect-control-flag ecf1)) ) (do-effect (-> self skel effect) "death-default" 0.0 -1) - (suspend-for (seconds 0.3)) + (suspend-for (seconds 0.3) + ) (logior! (-> self draw status) (draw-control-status no-draw)) - (suspend-for (seconds 0.8)) + (suspend-for (seconds 0.8) + ) (go-virtual dormant) ) ) @@ -2460,9 +2466,9 @@ (let ((s4-4 (new 'stack-no-clear 'quaternion))) (vector-normalize! s3-3 1.0) (+! (-> s3-3 y) 1.0) - (set! (-> s3-3 y) (* 0.5 (-> s3-3 y))) + (set! (-> s3-3 y) (/ (-> s3-3 y) 2)) (+! (-> s3-3 x) 1.0) - (set! (-> s3-3 x) (* 0.5 (-> s3-3 x))) + (set! (-> s3-3 x) (/ (-> s3-3 x) 2)) (quaternion-rotate-x! s4-4 (quaternion-identity! (new 'stack-no-clear 'quaternion)) @@ -2592,6 +2598,7 @@ (none) ) +;; WARN: Return type mismatch symbol vs object. (defmethod ragdoll-settled? ((this bt-grunt)) (local-vars (f0-0 float)) (let ((gp-0 (the-as ragdoll-proc (handle->process (-> this ragdoll-proc))))) @@ -2717,10 +2724,10 @@ (-> arg0 thrust s3-0) (+ (* 0.4 (fmax 0.0 (* (-> v0-6 x) s0-0))) (fmax 0.0 (-> v0-6 y)) - (fabs (* 0.2 (-> v0-6 z))) + (fabs (/ (-> v0-6 z) 5)) (fmax 0.0 (-> s1-1 y)) ) - (* 0.2 f30-0) + (/ f30-0 5) ) ) ) diff --git a/goal_src/jak3/levels/city/blow-tower/cty-blow-tower.gc b/goal_src/jak3/levels/city/blow-tower/cty-blow-tower.gc index e494f2fa97..a243f9d4c7 100644 --- a/goal_src/jak3/levels/city/blow-tower/cty-blow-tower.gc +++ b/goal_src/jak3/levels/city/blow-tower/cty-blow-tower.gc @@ -1049,7 +1049,7 @@ (set! arg0 (-> arg1 control)) ) (let ((f28-0 (* 409.6 arg0)) - (f30-0 (lerp 0.05 1.0 (* 0.2 arg0))) + (f30-0 (lerp 0.05 1.0 (/ arg0 5))) ) (activate! *camera-smush-control* f28-0 45 (the int (* 300.0 f30-0)) 1.0 0.9 (-> *display* camera-clock)) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 204 (the-as time-frame (the int (* 150.0 f30-0)))) @@ -1110,7 +1110,7 @@ ) (let* ((f30-0 5461.3335) (s5-0 (the int (/ 65536.0 f30-0))) - (f28-0 (* 0.5 f30-0)) + (f28-0 (/ f30-0 2)) ) (dotimes (s4-0 s5-0) (vector-rotate-around-y! @@ -1245,7 +1245,7 @@ (matrix->quaternion arg2 a1-16) ) ) - (quaternion-rotate-local-x! arg2 arg2 (* 0.5 (-> this roll-amount))) + (quaternion-rotate-local-x! arg2 arg2 (/ (-> this roll-amount) 2)) ) ) (vector-! s1-0 s2-0 (-> this root trans)) @@ -1735,7 +1735,7 @@ (set! (-> this hud-target angle) 0.0) (set! (-> this hud-target flags) (hud-sprite-flags hsf3)) (set! (-> this hud-target-inner flags) (hud-sprite-flags hsf3)) - (let* ((f0-46 (* 0.03125 (-> this onscreen-targets s5-1 size))) + (let* ((f0-46 (/ (-> this onscreen-targets s5-1 size) 32)) (f0-48 (fmax 0.4 (fmin 2.0 f0-46))) (f0-49 (* 2.0 f0-48)) ) @@ -2135,7 +2135,7 @@ ) (let* ((f0-24 (vector-dot s4-12 s2-2)) (f0-25 (+ 1.0 f0-24)) - (f0-26 (* 0.5 f0-25)) + (f0-26 (/ f0-25 2)) (f0-27 (* f0-26 f0-26)) (f0-28 (lerp 0.0 2.0 f0-27)) (f30-0 (fmax 0.3 (fmin 2.0 f0-28))) @@ -2215,7 +2215,7 @@ (vector-y-angle (vector-z-quaternion! (new 'stack-no-clear 'vector) arg0)) ) ) - (f0-2 (* 0.000061035156 f0-1)) + (f0-2 (/ f0-1 (meters 4))) (f0-3 (+ 0.5 f0-2)) (f0-4 (floor f0-3)) ) @@ -3103,7 +3103,7 @@ ) (let ((f0-38 (-> this path-height-vel))) 0.0 - (let ((f0-41 (fmax -1.0 (fmin 1.0 (* 0.000024414063 f0-38))))) + (let ((f0-41 (fmax -1.0 (fmin 1.0 (/ f0-38 (meters 10)))))) (quaternion-rotate-local-x! s4-2 s4-2 (* -4551.1113 f0-41)) ) ) @@ -3429,7 +3429,7 @@ ) (let ((f0-17 (-> this path-height-vel))) 0.0 - (let ((f0-20 (fmax -1.0 (fmin 1.0 (* 0.000024414063 f0-17))))) + (let ((f0-20 (fmax -1.0 (fmin 1.0 (/ f0-17 (meters 10)))))) (quaternion-rotate-local-x! s4-1 s4-1 (* -4551.1113 f0-20)) ) ) @@ -4568,7 +4568,7 @@ (f0-18 (+ f28-0 (* f26-0 (+ -1.0 (the-as float v1-17))) f30-0)) ) (set! (-> *part-id-table* 4825 init-specs 4 initial-valuef) f0-18) - (set! (-> *part-id-table* 4825 init-specs 3 initial-valuef) (* 0.5 f0-18)) + (set! (-> *part-id-table* 4825 init-specs 3 initial-valuef) (/ f0-18 2)) ) (draw-beam (-> *part-id-table* 4825) diff --git a/goal_src/jak3/levels/city/bombbot/bombbot.gc b/goal_src/jak3/levels/city/bombbot/bombbot.gc index e1d32f8e41..baee2d636e 100644 --- a/goal_src/jak3/levels/city/bombbot/bombbot.gc +++ b/goal_src/jak3/levels/city/bombbot/bombbot.gc @@ -593,7 +593,7 @@ (static-attack-info :mask (vehicle-impulse-factor) ((id (new-attack-id)) (damage 20.0) (vehicle-damage-factor 1.0) - (vehicle-impulse-factor (* 0.000012207031 f30-0)) + (vehicle-impulse-factor (/ f30-0 (meters 20))) (attacker-velocity s4-2) ) ) @@ -1606,7 +1606,7 @@ (set! (-> t0-0 z) 0.0) (set! (-> t0-0 w) 1.0) (let ((v0-6 (t9-6 a0-32 a1-17 a2-23 a3-1 t0-0 (/ f28-0 f30-0)))) - (set! (-> s1-0 delta-y) (* 0.05 (-> v0-6 y) (vector-length (-> s1-0 speed)))) + (set! (-> s1-0 delta-y) (* (/ (-> v0-6 y) 20) (vector-length (-> s1-0 speed)))) ) ) ) @@ -3278,7 +3278,7 @@ ) (set! (-> v1-3 main-y) (- (-> s4-0 feet s0-0 real-position y) (-> s4-0 root trans y))) (set! (-> v1-3 main-y) (-> v1-3 delta-y)) - (+! f30-0 (* 0.25 (-> v1-3 main-y))) + (+! f30-0 (/ (-> v1-3 main-y) 4)) (set! (-> s1-0 quad) (-> v1-3 pos-offset quad)) (set! (-> s1-0 y) (* -2.0 (-> v1-3 main-y))) (new 'stack-no-clear 'vector) diff --git a/goal_src/jak3/levels/city/common/guard-grenade.gc b/goal_src/jak3/levels/city/common/guard-grenade.gc index 6234f27fef..38180c8bed 100644 --- a/goal_src/jak3/levels/city/common/guard-grenade.gc +++ b/goal_src/jak3/levels/city/common/guard-grenade.gc @@ -328,7 +328,7 @@ (set! (-> self reloading-ammo) (the-as handle #f)) ) :trans (behavior () - (when (>= (* 0.5 (-> self grenade-guard-min-player-dist)) (-> self target-self-xz-dist)) + (when (>= (/ (-> self grenade-guard-min-player-dist) 2) (-> self target-self-xz-dist)) (cond ((not (time-elapsed? (-> self state-time) (seconds 1.5))) (+! (-> self num-times-reloading-interrupted) 1) diff --git a/goal_src/jak3/levels/city/common/guard-states.gc b/goal_src/jak3/levels/city/common/guard-states.gc index e93ce08b36..8575345632 100644 --- a/goal_src/jak3/levels/city/common/guard-states.gc +++ b/goal_src/jak3/levels/city/common/guard-states.gc @@ -547,7 +547,7 @@ (.svf (&-> a1-2 quad) vf6) ) (let ((f30-2 (* 0.5 (vector-vector-xz-distance s3-0 s1-0)))) - (vector-normalize! s2-0 (* 0.5 f30-2)) + (vector-normalize! s2-0 (/ f30-2 2)) (vector-normalize! s0-0 (* 2.0 f30-2)) ) (set! sv-144 0) diff --git a/goal_src/jak3/levels/city/common/nav-graph.gc b/goal_src/jak3/levels/city/common/nav-graph.gc index f6d00abd1a..7f1184f7ce 100644 --- a/goal_src/jak3/levels/city/common/nav-graph.gc +++ b/goal_src/jak3/levels/city/common/nav-graph.gc @@ -14,13 +14,13 @@ ) (defmethod set-speed-limit ((this nav-branch) (arg0 float)) - (set! (-> this speed-limit) (the-as uint (max 0 (min 255 (the int (+ 0.5 (* 0.0009765625 arg0))))))) + (set! (-> this speed-limit) (the-as uint (max 0 (min 255 (the int (+ 0.5 (/ arg0 1024))))))) 0 (none) ) (defmethod set-width ((this nav-branch) (arg0 float)) - (set! (-> this width) (the-as uint (max 0 (min 255 (the int (+ 0.5 (* 0.00390625 arg0))))))) + (set! (-> this width) (the-as uint (max 0 (min 255 (the int (+ 0.5 (/ arg0 256))))))) 0 (none) ) @@ -301,7 +301,7 @@ ) (defmethod set-radius ((this nav-node) (arg0 float)) - (set! (-> this radius) (the-as uint (max 0 (min 255 (the int (+ 0.5 (* 0.0009765625 arg0))))))) + (set! (-> this radius) (the-as uint (max 0 (min 255 (the int (+ 0.5 (/ arg0 1024))))))) 0 (none) ) diff --git a/goal_src/jak3/levels/city/common/trail.gc b/goal_src/jak3/levels/city/common/trail.gc index da1d92cb28..a3a5653f6e 100644 --- a/goal_src/jak3/levels/city/common/trail.gc +++ b/goal_src/jak3/levels/city/common/trail.gc @@ -545,7 +545,7 @@ ) 0 (let* ((f0-0 (-> v1-0 cell-width)) - (f1-1 (* 0.5 f0-0)) + (f1-1 (/ (the float f0-0) 2)) ) (let ((f3-0 (- (-> arg0 x) f1-1)) (f2-2 (- (-> arg0 z) f1-1)) diff --git a/goal_src/jak3/levels/city/ctywide-obs.gc b/goal_src/jak3/levels/city/ctywide-obs.gc index 8e335bebf2..1dad0d980d 100644 --- a/goal_src/jak3/levels/city/ctywide-obs.gc +++ b/goal_src/jak3/levels/city/ctywide-obs.gc @@ -499,11 +499,11 @@ ) (vector+! (-> s1-0 trans) arg0 arg1) (vector-float*! (-> s1-0 trans) (-> s1-0 trans) 0.5) - (+! (-> s1-0 trans y) (* 0.5 arg2)) + (+! (-> s1-0 trans y) (/ arg2 2)) (vector-! (-> s2-1 rvec) arg1 arg0) (let ((f30-1 (vector-normalize-ret-len! (-> s2-1 rvec) 1.0))) - (set! (-> s1-0 scale x) (* 0.00024414062 f30-1)) - (set! (-> s1-0 scale y) (* 0.00024414062 arg2)) + (set! (-> s1-0 scale x) (/ f30-1 METER_LENGTH)) + (set! (-> s1-0 scale y) (/ arg2 METER_LENGTH)) (set! (-> s1-0 scale z) 1.0) (set! (-> s2-1 uvec quad) (-> (new 'static 'vector :y 1.0 :w 1.0) quad)) (vector-cross! (-> s2-1 fvec) (-> s2-1 rvec) (-> s2-1 uvec)) @@ -513,7 +513,7 @@ (set! (-> this plane w) (- (vector-dot (-> s2-1 fvec) (-> this root trans)))) (let ((v0-6 (-> this root root-prim local-sphere))) (set! (-> v0-6 x) 0.0) - (set! (-> v0-6 y) (* 0.00024414062 (* 0.5 arg2))) + (set! (-> v0-6 y) (* 0.00024414062 (/ arg2 2))) (set! (-> v0-6 z) 0.0) (let ((f0-20 0.5) (f1-7 (* f30-1 f30-1)) @@ -2456,8 +2456,7 @@ ) (send-event *camera* 'teleport-to-transformq s4-0) ) - (suspend-for - (seconds 3) + (suspend-for (seconds 3) (set! (-> *camera* slave 0 fov) (-> *city-burning-bush-get-on-info* (-> self info index) fov)) ) (set! (-> *camera-combiner* trans quad) (-> s5-0 quad)) diff --git a/goal_src/jak3/levels/city/hijack/cty-hijack.gc b/goal_src/jak3/levels/city/hijack/cty-hijack.gc index a89210c00f..5bc741fc9c 100644 --- a/goal_src/jak3/levels/city/hijack/cty-hijack.gc +++ b/goal_src/jak3/levels/city/hijack/cty-hijack.gc @@ -1218,7 +1218,7 @@ ) 0.0 (let* ((f0-3 (sin (* 65536.0 f0-1))) - (f0-4 (* 0.125 f0-3)) + (f0-4 (/ f0-3 8)) ) (set! (-> self draw color-emissive x) (+ 0.375 f0-4)) ) @@ -1681,7 +1681,8 @@ (until (process-grab? *target* #f) (suspend) ) - (suspend-for (seconds 1.5)) + (suspend-for (seconds 1.5) + ) (send-event (handle->process (-> self hpickup)) 'flight-up) (let ((gp-1 (-> self missiles allocated-length)) (s5-0 0) @@ -1729,7 +1730,8 @@ ) ) (sound-play "hj-missile" :id (-> self missile-sound)) - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (dotimes (gp-3 (-> self missiles length)) (send-event (handle->process (-> self missiles gp-3)) 'begin-moving) ) @@ -1738,9 +1740,11 @@ (send-event (handle->process (-> self missiles gp-4)) 'begin-moving) ) (cty-hijack-manager-method-39 self 1) - (suspend-for (seconds 0.2)) + (suspend-for (seconds 0.2) + ) (remove-setting! 'entity-name) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (until (process-release? *target*) (suspend) ) diff --git a/goal_src/jak3/levels/city/hijack/guide-arrow.gc b/goal_src/jak3/levels/city/hijack/guide-arrow.gc index 285470ef8f..ce48fd977b 100644 --- a/goal_src/jak3/levels/city/hijack/guide-arrow.gc +++ b/goal_src/jak3/levels/city/hijack/guide-arrow.gc @@ -72,7 +72,7 @@ (logior! (-> this draw status) (draw-control-status force-fade)) (let ((f0-8 (vector-vector-distance (-> this root trans) (math-camera-pos)))) 0.0 - (let* ((f1-2 (* 0.0000027126737 f0-8)) + (let* ((f1-2 (/ f0-8 (meters 90))) (f1-4 (fmax 0.0 (fmin 1.0 f1-2))) (f0-11 (- 1.0 (* (- 1.0 f1-4) (- 1.0 f1-4)))) ) diff --git a/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc b/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc index 9e47281360..705d46875a 100644 --- a/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc +++ b/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc @@ -1837,7 +1837,8 @@ process (lambda :behavior process () - (suspend-for (seconds 0.75)) + (suspend-for (seconds 0.75) + ) (let ((a0-0 (ppointer->process (-> self parent)))) (if a0-0 (play-speech (the-as ctyport-attack-manager a0-0) 13) @@ -1987,7 +1988,8 @@ :virtual #t :code (behavior () (sound-stop (-> self hum-sound)) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (disable *screen-filter*) (deactivate self) ) @@ -2173,7 +2175,8 @@ ) ) :code (behavior () - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (let ((gp-1 (new 'stack-no-clear 'event-message-block))) (set! (-> gp-1 from) (process->ppointer self)) (set! (-> gp-1 num-params) 0) @@ -2670,11 +2673,8 @@ (cond ((-> arg0 inout?) (let* ((f0-2 (* 0.0033333334 (the float (- (current-time) (-> this mine-clock))))) - (f1-3 (* 0.0033333334 (-> arg0 period))) - (f0-5 (+ (/ (- f0-2 (* (the float (the int (/ f0-2 f1-3))) f1-3)) (* 0.0033333334 (-> arg0 period))) - (-> arg0 offset) - ) - ) + (f1-3 (/ (-> arg0 period) 300)) + (f0-5 (+ (/ (- f0-2 (* (the float (the int (/ f0-2 f1-3))) f1-3)) (/ (-> arg0 period) 300)) (-> arg0 offset))) (f0-6 (- f0-5 (* (the float (the int (/ f0-5 1.0))) 1.0))) ) (if (< 0.5 f0-6) @@ -2690,7 +2690,7 @@ ) ) (if (-> arg0 spin?) - (+! f30-0 (* 0.0033333334 (-> arg0 spinrate) (the float (- (current-time) (-> this mine-clock))))) + (+! f30-0 (* (/ (-> arg0 spinrate) 300) (the float (- (current-time) (-> this mine-clock))))) ) (vector-rotate-around-y! s4-0 s4-0 f30-0) ) diff --git a/goal_src/jak3/levels/city/port/attack/h-torpedo.gc b/goal_src/jak3/levels/city/port/attack/h-torpedo.gc index d5a92e95ef..f0e9eea023 100644 --- a/goal_src/jak3/levels/city/port/attack/h-torpedo.gc +++ b/goal_src/jak3/levels/city/port/attack/h-torpedo.gc @@ -628,14 +628,14 @@ (when #t (cond ((< 0.0 (-> this down-force)) - (let* ((f1-3 (* 0.0000024414062 (-> this down-force))) + (let* ((f1-3 (/ (-> this down-force) (meters 100))) (f0-7 (fmax 0.0 (fmin 1.0 f1-3))) ) (set! (-> this target-pitch) (lerp 0.0 -7281.778 f0-7)) ) ) (else - (let* ((f1-6 (* -0.0000024414062 (-> this down-force))) + (let* ((f1-6 (/ (-> this down-force) (meters -100))) (f0-11 (fmax 0.0 (fmin 1.0 f1-6))) ) (set! (-> this target-pitch) (lerp 0.0 7281.778 f0-11)) @@ -658,8 +658,8 @@ (vector+float*! v1-16 a0-7 a1-5 a2-3) (set! (-> s4-0 y) 0.0) (vector-normalize! s4-0 1.0) - (let* ((s2-1 (vector+float*! (new 'stack-no-clear 'vector) s3-0 s4-0 (* 0.5 f30-0))) - (s1-1 (vector+float*! (new 'stack-no-clear 'vector) s3-0 s4-0 (* -0.5 f30-0))) + (let* ((s2-1 (vector+float*! (new 'stack-no-clear 'vector) s3-0 s4-0 (/ f30-0 2))) + (s1-1 (vector+float*! (new 'stack-no-clear 'vector) s3-0 s4-0 (/ f30-0 -2))) (f28-0 (probe-ground this s2-1 a2-3)) (f0-24 (probe-ground this s1-1 a2-3)) ) @@ -827,7 +827,7 @@ (when (not (-> this on-water?)) (set! f26-0 10.0) (when (< (-> this down-force) -204800.0) - (let* ((f1-11 (* -0.0000012207031 (-> this down-force))) + (let* ((f1-11 (/ (-> this down-force) (meters -200))) (f24-0 (fmax 0.0 (fmin 1.0 f1-11))) ) (cpad-set-buzz! @@ -870,14 +870,14 @@ ) ) (when (-> this on-water?) - (let ((f0-42 (* -0.0000012207031 (-> this down-force)))) + (let ((f0-42 (/ (-> this down-force) (meters -200)))) (if (< 0.1 f0-42) (set! (-> this spawn-splash?) #t) ) ) ) (when (and (-> this on-water?) (>= (current-time) (-> this next-bob-cam-time))) - (let ((f0-44 (* -0.0000012207031 (-> this down-force)))) + (let ((f0-44 (/ (-> this down-force) (meters -200)))) (cond ((< 0.2 f0-44) (let ((f24-1 (fmax 0.0 (fmin 1.0 f0-44))) @@ -966,7 +966,7 @@ (vector-z-quaternion! s4-0 (the-as quaternion (-> this rbody rot))) (vector-float*! (-> this rbody lin-momentum) s4-0 (* (-> this speed) (-> this info info mass))) ) - (+! (-> this rbody lin-momentum y) (* 0.5 (-> this down-force) (-> this info info mass))) + (+! (-> this rbody lin-momentum y) (* (/ (-> this down-force) 2) (-> this info info mass))) (if (< (-> this rbody position y) -6144.0) (set! (-> this rbody lin-momentum y) (fmax 0.0 (-> this rbody lin-momentum y))) ) @@ -1770,16 +1770,16 @@ (seek! (-> this ground-vol-current) f30-0 (* 5.4 (seconds-per-frame))) ) ) - (let* ((f0-27 (* 0.00000012207032 (-> this rbody lin-momentum y))) + (let* ((f0-27 (/ (-> this rbody lin-momentum y) (meters 2000))) (f0-29 (fmax -1.0 (fmin 1.0 f0-27))) - (f0-30 (* 0.5 f0-29)) + (f0-30 (/ f0-29 2)) ) (if (< f0-30 (-> this pitch-current)) (seek! (-> this pitch-current) f0-30 (* 0.25 (seconds-per-frame))) (seek! (-> this pitch-current) f0-30 (* 4.0 (seconds-per-frame))) ) ) - (let* ((f1-25 (* 0.00000012207032 (-> this rbody lin-momentum y))) + (let* ((f1-25 (/ (-> this rbody lin-momentum y) (meters 2000))) (f30-2 (fmax 0.0 (fmin 1.0 f1-25))) ) (sound-play-by-name diff --git a/goal_src/jak3/levels/city/protect/assault-task.gc b/goal_src/jak3/levels/city/protect/assault-task.gc index aa89205bed..02657784d6 100644 --- a/goal_src/jak3/levels/city/protect/assault-task.gc +++ b/goal_src/jak3/levels/city/protect/assault-task.gc @@ -172,7 +172,7 @@ (let* ((f30-0 (- 1.0 (* (- 1.0 f0-1) (- 1.0 f0-1)))) (f0-2 (sin (lerp -16384.0 16384.0 f0-1))) (f0-3 (+ 1.0 f0-2)) - (f0-4 (* 0.5 f0-3)) + (f0-4 (/ f0-3 2)) ) (set! (-> *display* force-sync) (the-as uint 2)) (when s5-0 @@ -283,7 +283,8 @@ ) ) :code (behavior () - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (send-event self 'ammo-special 15 29) (sleep-code) ) @@ -426,7 +427,8 @@ (set! (-> v1-4 notify-proc) (process->handle self)) (send-event (handle->process (-> self h-player-controller)) 'set-params v1-4) ) - (suspend-for (seconds 0.1)) + (suspend-for (seconds 0.1) + ) (if *target* (logclear! (-> *target* focus-status) (focus-status teleporting)) ) @@ -1368,7 +1370,8 @@ process (lambda :behavior process () - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (dotimes (gp-1 (-> *assault-squad* spawn-records 1 records length)) (send-event (handle->process (-> *assault-squad* spawn-records 1 records data gp-1 proc)) 'traffic-off-force) ) diff --git a/goal_src/jak3/levels/city/protect/flying-turret.gc b/goal_src/jak3/levels/city/protect/flying-turret.gc index 24336d4815..622a71ee3e 100644 --- a/goal_src/jak3/levels/city/protect/flying-turret.gc +++ b/goal_src/jak3/levels/city/protect/flying-turret.gc @@ -412,7 +412,7 @@ ) (vector+float*! (-> this root transv) (-> this root transv) s5-1 (* f28-0 (seconds-per-frame))) (let* ((f0-19 (fmax 61440.0 (* (vector-length s5-1) f28-0))) - (f28-1 (* 0.000008138021 f0-19)) + (f28-1 (/ f0-19 (meters 30))) (f26-0 0.8) (f24-0 0.40000004) (v1-53 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) @@ -426,7 +426,7 @@ ) (else (let* ((f0-30 (fmax 61440.0 (* 3.0 (vector-length (-> this root transv))))) - (f28-2 (* 0.000008138021 f0-30)) + (f28-2 (/ f0-30 (meters 30))) (f26-1 0.8) (f24-1 0.40000004) (v1-68 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) @@ -531,7 +531,7 @@ ) (let ((f0-8 (* (lerp 3072.0 8601.6 f0-6) (-> this thruster-intensity-scalar)))) (set! (-> *part-id-table* 4709 init-specs 4 initial-valuef) f0-8) - (set! (-> *part-id-table* 4709 init-specs 3 initial-valuef) (* 0.5 f0-8)) + (set! (-> *part-id-table* 4709 init-specs 3 initial-valuef) (/ f0-8 2)) ) ) (draw-beam (-> *part-id-table* 4709) gp-0 s5-0 #f) @@ -550,7 +550,7 @@ ) (flying-turret-method-227 this) (let* ((f0-0 (vector-length (-> this root transv))) - (f0-1 (* 0.000016276043 f0-0)) + (f0-1 (/ f0-0 (meters 15))) ) 0.0 0.0 diff --git a/goal_src/jak3/levels/city/protect/protect-gunship.gc b/goal_src/jak3/levels/city/protect/protect-gunship.gc index 76617f3da5..a84be36f9f 100644 --- a/goal_src/jak3/levels/city/protect/protect-gunship.gc +++ b/goal_src/jak3/levels/city/protect/protect-gunship.gc @@ -1616,7 +1616,8 @@ (set! (-> gp-1 pickup-amount) 2.0) (drop-pickup gp-1 #t *entity-pool* gp-1 0 #t) ) - (suspend-for (seconds 5)) + (suspend-for (seconds 5) + ) ) ) @@ -1809,7 +1810,7 @@ (set-time! (-> self state-time)) (let ((gp-2 (vector-! (new 'stack-no-clear 'vector) (-> self dest-pos) (-> self root trans)))) 0.0 - (set! (-> self travel-speed) (/ (vector-normalize-ret-len! gp-2 1.0) (* 0.0033333334 (-> self attack-time)))) + (set! (-> self travel-speed) (/ (vector-normalize-ret-len! gp-2 1.0) (/ (-> self attack-time) 300))) (let ((a1-3 (matrix-f-compose (new 'stack-no-clear 'matrix) gp-2))) (matrix->quaternion (-> self root quat) a1-3) ) @@ -2175,9 +2176,9 @@ (let* ((v1-121 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-122 (the-as number (logior #x3f800000 v1-121))) (f0-35 (- (* (+ -1.0 (the-as float v1-122)) (-> this missile-info probe-angle-shift)))) - (f24-1 (* 0.25 f0-35)) + (f24-1 (/ f0-35 4)) (f0-38 (floor (the float (/ s5-5 3)))) - (f2-0 (* 0.000016276043 f30-3)) + (f2-0 (/ f30-3 (meters 15))) (f1-15 (fmax 0.0 (fmin 1.0 f2-0))) (f1-16 (* f1-15 f1-15)) (f0-39 (* f0-38 (- 1.0 f1-16))) @@ -2376,7 +2377,7 @@ (vector-float*! s5-0 s5-0 0.5) (set! (-> s5-0 y) 0.0) (let* ((f0-11 (vector-normalize-ret-len! s5-0 1.0)) - (f1-6 (* 0.000009765625 f0-11)) + (f1-6 (/ f0-11 (meters 25))) (f0-13 (fmax 0.0 (fmin 1.0 f1-6))) (f0-14 (* f0-13 f0-13)) ) @@ -2493,7 +2494,7 @@ (f0-51 (+ f28-1 (* f26-0 (+ -1.0 (the-as float v1-118))) f30-2)) ) (set! (-> *part-id-table* 4785 init-specs 4 initial-valuef) f0-51) - (set! (-> *part-id-table* 4785 init-specs 3 initial-valuef) (* 0.5 f0-51)) + (set! (-> *part-id-table* 4785 init-specs 3 initial-valuef) (/ f0-51 2)) ) (draw-beam (-> *part-id-table* 4785) @@ -2650,7 +2651,7 @@ (vector-float*! s5-1 s5-1 -1.0) (let ((f30-1 (- (vector-y-angle s4-1) (vector-y-angle s5-1)))) (format 0 "Doing inverse rotate~%") - (set! (-> this rotate-rate) (* 0.25 f30-1)) + (set! (-> this rotate-rate) (/ f30-1 4)) ) ) ) @@ -3395,7 +3396,7 @@ 0.0 0.0 (let* ((f0-6 (vector-length v1-8)) - (f0-7 (* 0.000009765625 f0-6)) + (f0-7 (/ f0-6 (meters 25))) (f1-3 (* f0-7 f0-7 (seconds-per-frame))) (f0-10 (fmax 0.0 (fmin 1.0 f1-3))) ) @@ -3421,7 +3422,7 @@ (set! (-> s5-3 y) 0.0) (let ((f1-6 (vector-normalize-ret-len! s5-3 1.0))) (when (< f1-6 122880.0) - (let* ((f0-21 (* 0.000008138021 f1-6)) + (let* ((f0-21 (/ f1-6 (meters 30))) (f0-22 (- 1.0 f0-21)) (f0-23 (* f0-22 f0-22)) ) diff --git a/goal_src/jak3/levels/city/protect/roboguard-city.gc b/goal_src/jak3/levels/city/protect/roboguard-city.gc index b419386711..845cd4c319 100644 --- a/goal_src/jak3/levels/city/protect/roboguard-city.gc +++ b/goal_src/jak3/levels/city/protect/roboguard-city.gc @@ -439,7 +439,8 @@ (defbehavior roboguard-city-turret-code roboguard-city () (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! roboguard-city-idle-shoot0-loop-ja :num! zero) - (suspend-for (seconds 0.2)) + (suspend-for (seconds 0.2) + ) (let ((gp-1 (lambda :behavior process ((arg0 roboguard-city) (arg1 symbol)) @@ -455,7 +456,8 @@ ) (until #f (when (< (fabs (-> self me-to-focus-angle)) f30-0) - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (while (< (fabs (-> self me-to-focus-angle)) f30-0) (suspend) ) @@ -476,7 +478,8 @@ ) ) (when (< (fabs (-> self me-to-focus-angle)) f30-0) - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (while (< (fabs (-> self me-to-focus-angle)) f30-0) (suspend) ) @@ -932,7 +935,7 @@ (-> self move-dest) self (-> self target-status handle) - (* 0.5 (-> self attack-distance)) + (/ (-> self attack-distance) 2) (-> self random-offset-search) ) (roboguard-city-method-239 self) @@ -1059,7 +1062,7 @@ (-> this move-dest) this (-> this target-status handle) - (* 0.5 (-> this attack-distance)) + (/ (-> this attack-distance) 2) (-> this random-offset-search) ) (roboguard-city-method-239 this) @@ -1079,7 +1082,7 @@ (-> this move-dest) this (-> this target-status handle) - (* 0.5 (-> this attack-distance)) + (/ (-> this attack-distance) 2) (-> this random-offset-search) ) (roboguard-city-method-235 this) @@ -1949,7 +1952,7 @@ (-> this move-dest) this (-> this target-status handle) - (* 0.5 (-> this attack-distance)) + (/ (-> this attack-distance) 2) (-> this random-offset-search) ) (roboguard-city-method-239 this) @@ -1966,7 +1969,7 @@ 0.0 (let* ((f0-8 (vector-dot s5-3 v1-35)) (f0-9 (+ 1.0 f0-8)) - (f0-10 (* 0.5 f0-9)) + (f0-10 (/ f0-9 2)) (f0-11 (lerp -0.2 0.0 f0-10)) ) (sound-play-by-name @@ -2104,7 +2107,7 @@ (f0-21 (+ -1.0 (the-as float v1-61))) ) (cond - ((< f0-21 (* 0.5 f30-1)) + ((< f0-21 (/ f30-1 2)) (set! s5-0 (logior s5-0 2)) ) ((< f0-21 f30-1) diff --git a/goal_src/jak3/levels/city/sniper/cty-sniper-turret.gc b/goal_src/jak3/levels/city/sniper/cty-sniper-turret.gc index 63841c0674..b0d7470a06 100644 --- a/goal_src/jak3/levels/city/sniper/cty-sniper-turret.gc +++ b/goal_src/jak3/levels/city/sniper/cty-sniper-turret.gc @@ -1180,7 +1180,7 @@ (launch-particles (-> *part-id-table* 4846) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f28-1 (* 0.000015258789 f30-0)) + (f28-1 (/ f30-0 (meters 16))) (f30-1 (-> *part-id-table* 4847 init-specs 3 initial-valuef)) ) (-> *part-id-table* 4847 init-specs 4 initial-valuef) @@ -2341,7 +2341,7 @@ ) (quaternion-copy! (-> self gun-shoulder-jmod rotation) (new 'static 'quaternion :x 0.5 :w 0.8660254)) (quaternion-copy! (-> self gun-elbow-jmod rotation) (new 'static 'quaternion :x -0.5 :w 0.8660254)) - (set! (-> self fov-mult) (lerp-clamp 1.3 0.45 (* 0.0000048828124 f30-0))) + (set! (-> self fov-mult) (lerp-clamp 1.3 0.45 (/ f30-0 (meters 50)))) (set-setting! 'fov 'rel (-> self fov-mult) 0) ) ) @@ -2627,7 +2627,8 @@ ) :code (behavior () (logior! (-> self flags) (cty-sniper-turret-flag cst3)) - (suspend-for (seconds 0.49)) + (suspend-for (seconds 0.49) + ) (let ((gp-1 (rand-vu-int-range 3 6))) (dotimes (s5-0 gp-1) (fire-shot self) @@ -2759,8 +2760,7 @@ (when (and (< f30-0 0.0) (not (-> *setting-control* user-current freeze-screen))) (set-setting! 'mode-name 'cam-no-trans 0.0 0) (suspend) - (suspend-for - (seconds 0.5) + (suspend-for (seconds 0.5) (let ((s3-0 (new 'stack-no-clear 'vector))) (set! (-> s3-0 quad) (the-as uint128 0)) (cond @@ -2817,7 +2817,8 @@ #t ) (logior! (-> *target* focus-status) (focus-status ignore)) - (suspend-for (seconds 0.08)) + (suspend-for (seconds 0.08) + ) (send-event self 'pov-cam-on) (send-event (handle->process (-> self reticle)) 'on) (setup @@ -2830,7 +2831,8 @@ #x33001 #t ) - (suspend-for (seconds 0.08)) + (suspend-for (seconds 0.08) + ) (disable *screen-filter*) ) (else @@ -2871,12 +2873,13 @@ ) ) ) - (suspend-for (seconds 1.5) (when (focus-test? *target* grabbed) - (logclear! (-> self flags) (cty-sniper-turret-flag cst11)) - (send-event (handle->process (-> self reticle)) 'unlock) - (goto cfg-44) - ) - ) + (suspend-for (seconds 1.5) + (when (focus-test? *target* grabbed) + (logclear! (-> self flags) (cty-sniper-turret-flag cst11)) + (send-event (handle->process (-> self reticle)) 'unlock) + (goto cfg-44) + ) + ) (if (and (logtest? (-> self flags) (cty-sniper-turret-flag cst7)) (not (cty-sniper-turret-method-39 self))) (go-virtual locked-on) ) @@ -2929,7 +2932,8 @@ (suspend) (set-setting! 'interp-time 'abs 600.0 0) (remove-setting! 'mode-name) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (send-event (handle->process (-> self reticle)) 'die) (let ((v1-71 (-> self root root-prim))) (set! (-> v1-71 prim-core collide-as) (collide-spec)) diff --git a/goal_src/jak3/levels/city/traffic/citizen/citizen-norm.gc b/goal_src/jak3/levels/city/traffic/citizen/citizen-norm.gc index 11942cdac4..1be442fee3 100644 --- a/goal_src/jak3/levels/city/traffic/citizen/citizen-norm.gc +++ b/goal_src/jak3/levels/city/traffic/citizen/citizen-norm.gc @@ -647,7 +647,7 @@ (if (or (= (-> this incoming knocked-type) (knocked-type explode-or-darkjak)) (= (-> this incoming knocked-type) (knocked-type dark-shot)) ) - (set! (-> arg0 anim-speed) (* 0.5 (-> arg0 anim-speed))) + (set! (-> arg0 anim-speed) (/ (-> arg0 anim-speed) 2)) ) (let ((a0-47 (-> this skel root-channel 0))) (set! (-> a0-47 frame-group) (the-as art-joint-anim s4-0)) diff --git a/goal_src/jak3/levels/city/traffic/citizen/citizen.gc b/goal_src/jak3/levels/city/traffic/citizen/citizen.gc index f1263e9eeb..ecf5ff7b9e 100644 --- a/goal_src/jak3/levels/city/traffic/citizen/citizen.gc +++ b/goal_src/jak3/levels/city/traffic/citizen/citizen.gc @@ -752,7 +752,7 @@ s5-1 s5-1 gp-0 - (* (fmax 0.5 (* 0.00024414062 (-> arg0 state speed))) (seconds-per-frame)) + (* (fmax 0.5 (/ (-> arg0 state speed) METER_LENGTH)) (seconds-per-frame)) ) ) 0 diff --git a/goal_src/jak3/levels/city/traffic/citizen/civilian.gc b/goal_src/jak3/levels/city/traffic/citizen/civilian.gc index 24b25a4330..bdb7706041 100644 --- a/goal_src/jak3/levels/city/traffic/citizen/civilian.gc +++ b/goal_src/jak3/levels/city/traffic/citizen/civilian.gc @@ -874,7 +874,7 @@ ) (if (and (-> self allow-dive) (< (vector-length v1-8) (* (-> self dive-reaction) (vector-length (-> self cp-vec)))) - (< (fabs (vector4-dot (-> self root trans) (the-as vector (-> self cp-plane)))) (* 0.5 (-> self cp-sphere r))) + (< (fabs (vector4-dot (-> self root trans) (the-as vector (-> self cp-plane)))) (/ (-> self cp-sphere r) 2)) ) (civilian-method-231 self) ) diff --git a/goal_src/jak3/levels/city/traffic/citizen/metalhead-flitter.gc b/goal_src/jak3/levels/city/traffic/citizen/metalhead-flitter.gc index caf7d0abc9..89805c625f 100644 --- a/goal_src/jak3/levels/city/traffic/citizen/metalhead-flitter.gc +++ b/goal_src/jak3/levels/city/traffic/citizen/metalhead-flitter.gc @@ -337,10 +337,12 @@ ) ) ) - (suspend-for (seconds 0.6)) + (suspend-for (seconds 0.6) + ) (+! (-> self root trans y) -8192.0) (logior! (-> self draw status) (draw-control-status no-draw)) - (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6)))) + (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6))) + ) (logclear! (-> self draw status) (draw-control-status no-draw)) (go-virtual ambush-jumping) ) @@ -480,7 +482,7 @@ (set-time! (-> this last-change-dir)) (set! (-> this change-dir-time) (rand-vu-int-range (seconds 0.5) (seconds 0.7))) (let ((s3-2 (new 'stack-no-clear 'vector)) - (f0-9 (* 0.5 f30-0 (tan (-> this move-angle)))) + (f0-9 (* (/ f30-0 2) (tan (-> this move-angle)))) (s2-0 (new 'stack-no-clear 'vector)) ) (if (-> this heading) diff --git a/goal_src/jak3/levels/city/traffic/citizen/metalhead-predator.gc b/goal_src/jak3/levels/city/traffic/citizen/metalhead-predator.gc index fd4916bd9c..9873e1fe2f 100644 --- a/goal_src/jak3/levels/city/traffic/citizen/metalhead-predator.gc +++ b/goal_src/jak3/levels/city/traffic/citizen/metalhead-predator.gc @@ -712,7 +712,7 @@ (.sub.vf vf6 vf4 vf5 :mask #b111) (.svf (&-> sv-272 quad) vf6) (let* ((f0-5 (vector-length sv-272)) - (f0-6 (* 0.0000018780048 f0-5)) + (f0-6 (/ f0-5 (meters 130))) ) (set! sv-288 (new 'stack-no-clear 'vector)) (let ((s0-0 (new 'stack-no-clear 'vector)) diff --git a/goal_src/jak3/levels/city/traffic/traffic-engine.gc b/goal_src/jak3/levels/city/traffic/traffic-engine.gc index ae8a202efc..48dc268f62 100644 --- a/goal_src/jak3/levels/city/traffic/traffic-engine.gc +++ b/goal_src/jak3/levels/city/traffic/traffic-engine.gc @@ -329,7 +329,7 @@ ) ) (set! (-> s4-0 vec2 y) - (+ (* 0.5 (-> s4-0 vec2 x)) (* (-> this rand) (-> this traffic inv-density-factor) (-> arg1 spawn-spacing))) + (+ (/ (-> s4-0 vec2 x) 2) (* (-> this rand) (-> this traffic inv-density-factor) (-> arg1 spawn-spacing))) ) (vector-float*! (-> s4-0 params velocity) (-> s4-0 vec0) (-> s4-0 vec2 x)) (vector-float*! (-> s4-0 vec1) (-> s4-0 vec0) (-> s4-0 vec2 y)) @@ -975,7 +975,7 @@ (set! f3-0 1.5) ) ) - (set! (-> v1-1 0 decay-rate) (* 0.1 f3-0)) + (set! (-> v1-1 0 decay-rate) (/ f3-0 10)) (when (< (-> v1-1 0 danger-level) f2-0) (set! (-> v1-1 0 danger-level) f2-0) (set! (-> v1-1 0 sphere r) f1-0) diff --git a/goal_src/jak3/levels/city/traffic/vehicle/bike.gc b/goal_src/jak3/levels/city/traffic/vehicle/bike.gc index 193cd282ed..48653e45b8 100644 --- a/goal_src/jak3/levels/city/traffic/vehicle/bike.gc +++ b/goal_src/jak3/levels/city/traffic/vehicle/bike.gc @@ -1618,10 +1618,10 @@ (f26-0 (* -13653.333 (-> this controls brake))) (s5-0 (new 'static 'vector :x 1.0 :w 1.0)) ) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f28-0 (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f28-0) (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-fl rotation) s5-0 (- (* -0.2 f28-0) f30-0)) - (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 (- (* 0.2 f28-0) f30-0)) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f28-0 (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f28-0) (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-fl rotation) s5-0 (- (/ f28-0 -5) f30-0)) + (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 (- (/ f28-0 5) f30-0)) (quaternion-vector-angle! (-> this rudder rotation) s5-0 f30-0) (quaternion-vector-angle! (-> this brake-l rotation) s5-0 f26-0) (quaternion-vector-angle! (-> this brake-r rotation) s5-0 f26-0) @@ -1720,8 +1720,8 @@ (f28-0 (* 13653.333 (-> this controls brake))) (s5-0 (new 'static 'vector :x 1.0 :w 1.0)) ) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (* 0.2 f30-0))) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (/ f30-0 5))) (quaternion-vector-angle! (-> this rudder rotation) s5-0 f30-0) (quaternion-vector-angle! (-> this rudder-f rotation) s5-0 (- f30-0)) (quaternion-vector-angle! (-> this brake-l rotation) s5-0 (- f28-0)) @@ -1831,8 +1831,8 @@ (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 f26-0) (quaternion-vector-angle! (-> this fin2-fl rotation) s5-0 (- f26-0)) (quaternion-vector-angle! (-> this fin2-fr rotation) s5-0 f26-0) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (* 0.2 f30-0))) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (/ f30-0 5))) (quaternion-vector-angle! (-> this rudder rotation) s5-0 f30-0) (quaternion-vector-angle! (-> this brake-l rotation) s5-0 (- f28-0)) (quaternion-vector-angle! (-> this brake-r rotation) s5-0 f28-0) diff --git a/goal_src/jak3/levels/city/traffic/vehicle/car.gc b/goal_src/jak3/levels/city/traffic/vehicle/car.gc index b2068b7edd..af486e2b89 100644 --- a/goal_src/jak3/levels/city/traffic/vehicle/car.gc +++ b/goal_src/jak3/levels/city/traffic/vehicle/car.gc @@ -1945,10 +1945,10 @@ (quaternion-vector-angle! (-> this steering-wheel rotation) s5-0 f0-3) (quaternion-vector-angle! (-> this fin-fl rotation) s5-0 (- f28-0)) (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 f28-0) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ (* 0.8 f28-0) (* -0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (* -0.8 f28-0) (* -0.2 f30-0))) - (quaternion-vector-angle! (-> this fin2-rl rotation) s5-0 (+ (* 0.2 f28-0) (* -0.8 f30-0))) - (quaternion-vector-angle! (-> this fin2-rr rotation) s5-0 (+ (* -0.2 f28-0) (* -0.8 f30-0))) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ (* 0.8 f28-0) (/ f30-0 -5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (* -0.8 f28-0) (/ f30-0 -5))) + (quaternion-vector-angle! (-> this fin2-rl rotation) s5-0 (+ (/ f28-0 5) (* -0.8 f30-0))) + (quaternion-vector-angle! (-> this fin2-rr rotation) s5-0 (+ (/ f28-0 -5) (* -0.8 f30-0))) ) 0 (none) diff --git a/goal_src/jak3/levels/city/traffic/vehicle/vehicle-effects.gc b/goal_src/jak3/levels/city/traffic/vehicle/vehicle-effects.gc index ece2e66243..08bdcb938b 100644 --- a/goal_src/jak3/levels/city/traffic/vehicle/vehicle-effects.gc +++ b/goal_src/jak3/levels/city/traffic/vehicle/vehicle-effects.gc @@ -37,7 +37,7 @@ ;; WARN: Return type mismatch object vs none. (defun calc-fade-vals ((arg0 float)) - (let* ((f1-1 (* 0.00024414062 arg0)) + (let* ((f1-1 (/ arg0 METER_LENGTH)) (f0-3 (- f1-1 (the float (the int f1-1)))) (f1-3 (* 4096.0 (- f1-1 f0-3))) (f1-5 (/ -1.0 (* (- 1.0 f0-3) f1-3))) @@ -228,7 +228,7 @@ (set! (-> *part-id-table* 923 init-specs 9 random-rangef) (* 48.0 f0-40)) ) (set! (-> s5-0 float0) - (* 0.2 (-> this info handling max-engine-thrust) (+ 0.5 (-> this engine-power-factor))) + (* (/ (-> this info handling max-engine-thrust) 5) (+ 0.5 (-> this engine-power-factor))) ) (let ((s4-2 (-> *part-id-table* 923))) (dotimes (s3-0 2) @@ -354,12 +354,12 @@ (set! (-> s5-0 vec4 quad) (-> s5-0 vec0 quad)) (let ((f0-0 (rand-vu-float-range 1.0 1.33))) (set! (-> s5-0 float0) (* f0-0 (-> arg1 length) (-> arg1 thrust))) - (set! (-> s5-0 float1) (fmin (* (-> arg1 width) f0-0) (* 0.5 (-> s5-0 float0)))) + (set! (-> s5-0 float1) (fmin (* (-> arg1 width) f0-0) (/ (-> s5-0 float0) 2))) ) (let ((a1-5 (-> s5-0 vec3))) (let ((v1-4 (-> arg1 trans))) (let ((a0-9 (-> s5-0 vec4))) - (let ((a2-2 (* 0.25 (-> s5-0 float0)))) + (let ((a2-2 (/ (-> s5-0 float0) 4))) (.mov vf7 a2-2) ) (.lvf vf5 (&-> a0-9 quad)) @@ -385,13 +385,13 @@ (let ((f0-13 (* 4.0 (-> s5-0 float1)))) (set! (-> s5-0 glow position w) f0-13) (set! (-> s5-0 glow size-y) f0-13) - (set! (-> s5-0 glow size-probe) (* 0.025 f0-13)) + (set! (-> s5-0 glow size-probe) (/ f0-13 40)) ) (add! *simple-sprite-system* (-> s5-0 glow)) (let ((v1-15 (-> s5-0 vec3))) (let ((a0-14 (-> arg1 trans))) (let ((a1-11 (-> s5-0 vec4))) - (let ((a2-5 (* 0.5 (-> s5-0 float0)))) + (let ((a2-5 (/ (-> s5-0 float0) 2))) (.mov vf7 a2-5) ) (.lvf vf5 (&-> a1-11 quad)) diff --git a/goal_src/jak3/levels/city/traffic/vehicle/vehicle-physics.gc b/goal_src/jak3/levels/city/traffic/vehicle/vehicle-physics.gc index 36b456d781..230a81dddf 100644 --- a/goal_src/jak3/levels/city/traffic/vehicle/vehicle-physics.gc +++ b/goal_src/jak3/levels/city/traffic/vehicle/vehicle-physics.gc @@ -17,7 +17,7 @@ ) 0.0 (let* ((f2-4 (fmax -1.0 (fmin 1.0 (/ (- (-> this water-height) (-> arg0 y)) (-> arg0 w))))) - (f30-0 (+ 0.5 (* -0.25 f2-4 f2-4 f2-4) (* 0.75 f2-4))) + (f30-0 (+ 0.5 (* (/ f2-4 -4) f2-4 f2-4) (* 0.75 f2-4))) ) (set! (-> s5-0 rvec y) (* 0.5 (+ f0-1 f1-3))) (rigid-body-control-method-23 (-> this rbody) (-> s5-0 rvec) (-> s5-0 fvec)) diff --git a/goal_src/jak3/levels/city/traffic/vehicle/vehicle-util.gc b/goal_src/jak3/levels/city/traffic/vehicle/vehicle-util.gc index 9ecd83f3bb..753788bd02 100644 --- a/goal_src/jak3/levels/city/traffic/vehicle/vehicle-util.gc +++ b/goal_src/jak3/levels/city/traffic/vehicle/vehicle-util.gc @@ -572,7 +572,7 @@ (set! arg0 0.0) ) (if (logtest? (game-secrets vehicle-hit-points) (-> *game-info* secrets)) - (set! arg0 (* 0.5 arg0)) + (set! arg0 (/ arg0 2)) ) ) (set! (-> this hit-points) (- (-> this hit-points) (* arg0 (-> this damage-factor)))) diff --git a/goal_src/jak3/levels/city/traffic/vehicle/vehicle.gc b/goal_src/jak3/levels/city/traffic/vehicle/vehicle.gc index 54327da216..989224f3e0 100644 --- a/goal_src/jak3/levels/city/traffic/vehicle/vehicle.gc +++ b/goal_src/jak3/levels/city/traffic/vehicle/vehicle.gc @@ -294,7 +294,7 @@ (set! f1-6 (* f0-23 f0-23)) ) (if (not (logtest? (-> this v-flags) (vehicle-flag riding))) - (set! f1-6 (* 0.5 f1-6)) + (set! f1-6 (/ f1-6 2)) ) ) (+! (-> this power-level) @@ -1105,7 +1105,7 @@ (and (logtest? (penetrate dark-skin) arg3) (logtest? arg3 (penetrate punch spin))) ) (set! f30-0 (* 204800.0 (-> this info info mass))) - (* 0.2 (-> this info damage hit-points)) + (/ (-> this info damage hit-points) 5) ) ((logtest? (penetrate jak-red-shockwave) arg3) (case (-> arg1 mode) diff --git a/goal_src/jak3/levels/city/vinroom/ljkdxvin-texture.gc b/goal_src/jak3/levels/city/vinroom/ljkdxvin-texture.gc index c5de882cf1..8e58ac5960 100644 --- a/goal_src/jak3/levels/city/vinroom/ljkdxvin-texture.gc +++ b/goal_src/jak3/levels/city/vinroom/ljkdxvin-texture.gc @@ -163,8 +163,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) diff --git a/goal_src/jak3/levels/comb/comb-field.gc b/goal_src/jak3/levels/comb/comb-field.gc index 88613fcb66..5b1c3d64d5 100644 --- a/goal_src/jak3/levels/comb/comb-field.gc +++ b/goal_src/jak3/levels/comb/comb-field.gc @@ -296,8 +296,8 @@ (vector-float*! (-> s1-0 trans) (-> s1-0 trans) 0.5) (vector-! (-> s2-2 rvec) s4-0 s3-0) (let ((f30-1 (vector-normalize-ret-len! (-> s2-2 rvec) 1.0))) - (set! (-> s1-0 scale x) (* 0.00024414062 f30-1)) - (set! (-> s1-0 scale y) (* 0.00024414062 arg1)) + (set! (-> s1-0 scale x) (/ f30-1 METER_LENGTH)) + (set! (-> s1-0 scale y) (/ arg1 METER_LENGTH)) (set! (-> s1-0 scale z) 1.0) (set! (-> s2-2 uvec quad) (-> (new 'static 'vector :y 1.0 :w 1.0) quad)) (vector-cross! (-> s2-2 fvec) (-> s2-2 rvec) (-> s2-2 uvec)) @@ -307,7 +307,7 @@ (set! (-> this plane w) (- (vector-dot (-> s2-2 fvec) (-> this root trans)))) (let ((v0-8 (-> this root root-prim local-sphere))) (set! (-> v0-8 x) 0.0) - (set! (-> v0-8 y) (* 0.00024414062 (* 0.5 arg1))) + (set! (-> v0-8 y) (* 0.00024414062 (/ arg1 2))) (set! (-> v0-8 z) 0.0) (let ((f0-18 0.5) (f1-5 (* f30-1 f30-1)) diff --git a/goal_src/jak3/levels/comb/comb-sentry.gc b/goal_src/jak3/levels/comb/comb-sentry.gc index c98ea8d07d..6ab4ef219f 100644 --- a/goal_src/jak3/levels/comb/comb-sentry.gc +++ b/goal_src/jak3/levels/comb/comb-sentry.gc @@ -83,7 +83,7 @@ (launch-particles (-> *part-id-table* 4238) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000027126736 f30-0)) + (f26-0 (/ f30-0 (meters 9))) (f30-1 (-> *part-id-table* 4239 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 4239 init-specs 4 initial-valuef)) ) @@ -727,7 +727,8 @@ :unk 0 ) ) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) (cleanup-for-death self) ) :post #f diff --git a/goal_src/jak3/levels/comb/h-sled.gc b/goal_src/jak3/levels/comb/h-sled.gc index 9896d10477..6801933cc4 100644 --- a/goal_src/jak3/levels/comb/h-sled.gc +++ b/goal_src/jak3/levels/comb/h-sled.gc @@ -229,7 +229,7 @@ (launch-particles (-> *part-id-table* 4232) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix))) - (* 0.000027126736 f30-0) + (/ f30-0 (meters 9)) (-> *part-id-table* 4233 init-specs 3 initial-valuef) (-> *part-id-table* 4233 init-specs 4 initial-valuef) (forward-up->inv-matrix s4-1 s5-1 *up-vector*) @@ -1138,19 +1138,20 @@ (set! (-> gp-0 tmp z) (-> this ai-target-speed)) (set! (-> gp-0 world-pos quad) (-> this ai-target-pos quad)) (vector-! (-> gp-0 lift-dir) (-> gp-0 world-pos) (-> gp-0 mat fvec)) - (set! (-> gp-0 tmp w) (* 0.00036621094 - (- (-> gp-0 tmp z) (-> gp-0 p-body x)) - (-> this info handling ai-throttle-factor) - (-> gp-0 p-body y) - ) + (set! (-> gp-0 tmp w) + (* 0.00036621094 + (- (-> gp-0 tmp z) (-> gp-0 p-body x)) + (-> this info handling ai-throttle-factor) + (-> gp-0 p-body y) + ) ) (set! (-> gp-0 mat rvec y) (fmax 0.0 (fmin 1.0 (+ (-> this controls throttle) (-> gp-0 tmp w))))) - (set! (-> gp-0 mat rvec x) (fmax -1.0 (fmin 1.0 (* 0.000012207031 - (-> this info handling ai-steering-factor) - (vector-dot (-> gp-0 local-pos) (-> gp-0 lift-dir)) - ) - ) - ) + (set! (-> gp-0 mat rvec x) + (fmax -1.0 (fmin 1.0 (* (/ (-> this info handling ai-steering-factor) (meters 20)) + (vector-dot (-> gp-0 local-pos) (-> gp-0 lift-dir)) + ) + ) + ) ) (vehicle-method-92 this (the-as vehicle-controls (-> gp-0 mat))) ) @@ -1261,7 +1262,7 @@ ) (cond ((logtest? (vehicle-flag ignition) (-> this v-flags)) - (let ((f1-4 (+ 0.75 (* 0.25 (-> this controls throttle))))) + (let ((f1-4 (+ 0.75 (/ (-> this controls throttle) 4)))) (if (logtest? (vehicle-flag turbo-boost) (-> this v-flags)) (set! f1-4 (+ 1.0 (* (-> this turbo-boost-factor) (-> this info handling turbo-boost-factor)))) ) @@ -1400,7 +1401,7 @@ (set! (-> s5-1 1 x) (fmax 0.0 (fmin 1.0 (+ -1.0 (-> s5-1 0 x))))) (set! (-> s5-1 1 y) (* 0.0 (-> s5-1 1 x))) (set! (-> s5-1 1 z) (-> s5-1 0 y)) - (set! (-> s5-1 1 w) (* 0.5 (-> s5-1 0 y))) + (set! (-> s5-1 1 w) (/ (-> s5-1 0 y) 2)) (set! (-> s5-1 0 z) (cube-root (-> s5-1 0 z))) (set! (-> s5-1 1 x) (cube-root (-> s5-1 1 x))) (set! (-> s5-1 1 z) (cube-root (-> s5-1 1 z))) @@ -1709,7 +1710,11 @@ ) ) (vector-matrix*! (-> s4-0 world-pos) (-> s4-0 local-pos) (-> s4-0 mat)) - (vector-float*! (-> s4-0 force) (-> this impact-normal) (* -0.5 (-> s2-0 extra gravity) (-> s2-0 info mass))) + (vector-float*! + (-> s4-0 force) + (-> this impact-normal) + (* (/ (-> s2-0 extra gravity) -2) (-> s2-0 info mass)) + ) (rigid-body-control-method-22 s3-0 (-> s4-0 world-pos) (-> s4-0 force)) ) (when (logtest? (-> this v-flags) (vehicle-flag on-ground)) @@ -1796,7 +1801,7 @@ (set! (-> gp-2 spawn-point quad) (-> self root trans quad)) (quaternion-identity! (-> gp-2 spawn-quat)) (set! (-> gp-2 radius) (+ 12288.0 (-> self root root-prim local-sphere w))) - (set! (-> gp-2 scale) (* 0.00008877841 (-> self draw bounds w))) + (set! (-> gp-2 scale) (/ (-> self draw bounds w) 11264)) (set! (-> gp-2 group) (-> *part-group-id-table* (-> self info explosion-part))) (set! (-> gp-2 collide-with) (collide-spec backgnd jak crate civilian enemy obstacle vehicle-sphere hit-by-others-list player-list pusher) diff --git a/goal_src/jak3/levels/comb/railx-mood.gc b/goal_src/jak3/levels/comb/railx-mood.gc index baea16b406..0f2b1efc41 100644 --- a/goal_src/jak3/levels/comb/railx-mood.gc +++ b/goal_src/jak3/levels/comb/railx-mood.gc @@ -81,7 +81,7 @@ (the-as vector (-> gp-0 ambi color)) (the-as vector (-> gp-0 ambi color)) s2-0 - (* 0.5 (-> (the-as railx-states s3-0) yellow brightness)) + (/ (-> (the-as railx-states s3-0) yellow brightness) 2) ) (vector-float*! (the-as vector (-> gp-0 dir0 color)) s4-0 (-> (the-as railx-states s3-0) blue brightness)) (set! (-> gp-0 dir1 color quad) (-> gp-0 ambi color quad)) diff --git a/goal_src/jak3/levels/common-obs/ladder.gc b/goal_src/jak3/levels/common-obs/ladder.gc index 174f0cf650..00b1b8975e 100644 --- a/goal_src/jak3/levels/common-obs/ladder.gc +++ b/goal_src/jak3/levels/common-obs/ladder.gc @@ -109,8 +109,8 @@ (-> self rider-unit) ) (('stance) - (let* ((f0-8 (/ (* 0.5 (-> self meters-per-rung)) (-> self meters-per-unit))) - (f1-12 (* (the float (the int (/ (+ (-> self rider-unit) (* 0.5 f0-8)) f0-8))) f0-8)) + (let* ((f0-8 (/ (/ (-> self meters-per-rung) 2) (-> self meters-per-unit))) + (f1-12 (* (the float (the int (/ (+ (-> self rider-unit) (/ f0-8 2)) f0-8))) f0-8)) ) (+! (-> self rider-unit) (* 0.1 (- f1-12 (-> self rider-unit)))) (set! (-> self rider-unit) (seek (-> self rider-unit) f1-12 (* 2.0 (seconds-per-frame) f0-8))) @@ -217,9 +217,9 @@ (logior! (-> this draw status) (draw-control-status no-draw-bounds)) ) (set! (-> this root scale y) (/ (-> this set-height) (-> this art-height))) - (set! (-> this draw bounds y) (/ (* 0.5 (-> this set-height)) (-> this root scale y))) - (set! (-> this draw bounds w) (+ 2048.0 (* 0.5 (-> this set-height)))) - (set! (-> this root root-prim local-sphere y) (/ (* 0.5 (-> this set-height)) (-> this root scale y))) - (set! (-> this root root-prim local-sphere w) (+ 2048.0 (* 0.5 (-> this set-height)))) + (set! (-> this draw bounds y) (/ (/ (-> this set-height) 2) (-> this root scale y))) + (set! (-> this draw bounds w) (+ 2048.0 (/ (-> this set-height) 2))) + (set! (-> this root root-prim local-sphere y) (/ (/ (-> this set-height) 2) (-> this root scale y))) + (set! (-> this root root-prim local-sphere w) (+ 2048.0 (/ (-> this set-height) 2))) (go (method-of-object this idle)) ) diff --git a/goal_src/jak3/levels/common/elec-gate.gc b/goal_src/jak3/levels/common/elec-gate.gc index 89fab2c02c..94b7871b55 100644 --- a/goal_src/jak3/levels/common/elec-gate.gc +++ b/goal_src/jak3/levels/common/elec-gate.gc @@ -643,7 +643,8 @@ (defstate shutdown-camera (elec-gate) :virtual #t :code (behavior () - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (format 0 "~s~%" (-> self name)) (if (res-lump-struct (-> self entity) 'camera-name structure) (process-spawn @@ -655,7 +656,8 @@ :to *entity-pool* ) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (go-virtual shutdown) ) :post (behavior () @@ -904,7 +906,7 @@ (get-point-in-path! (-> this path-r) (new 'stack-no-clear 'vector) 0.0 'interp) ) ) - (set! (-> this wall-xz) (* 0.5 (-> this wall-xz))) + (set! (-> this wall-xz) (/ (-> this wall-xz) 2)) (+! (-> this wall-xz) 4096.0) (set! (-> this wall-y) (fabs diff --git a/goal_src/jak3/levels/common/enemy/darkprec/dp-bipedal.gc b/goal_src/jak3/levels/common/enemy/darkprec/dp-bipedal.gc index 502fe7a2a0..90b396cd13 100644 --- a/goal_src/jak3/levels/common/enemy/darkprec/dp-bipedal.gc +++ b/goal_src/jak3/levels/common/enemy/darkprec/dp-bipedal.gc @@ -2554,7 +2554,7 @@ (set! (-> s2-0 4 x) (/ (-> s2-0 3 w) (+ (fmax 0.0 (vector-dot arg2 (-> s2-0 5))) arg5))) (vector+float*! arg0 (-> s2-0 0) (-> s2-0 1) (-> s2-0 4 x)) (let ((f1-19 (/ (-> s2-0 2 x) arg5))) - (set! (-> arg0 y) (+ 10240.0 (* 0.25 arg6 (* f1-19 f1-19)) (-> arg3 y))) + (set! (-> arg0 y) (+ 10240.0 (* (/ arg6 4) (* f1-19 f1-19)) (-> arg3 y))) ) #t ) diff --git a/goal_src/jak3/levels/common/enemy/darkprec/neo-wasp.gc b/goal_src/jak3/levels/common/enemy/darkprec/neo-wasp.gc index 2a943e80ce..e0d64babc7 100644 --- a/goal_src/jak3/levels/common/enemy/darkprec/neo-wasp.gc +++ b/goal_src/jak3/levels/common/enemy/darkprec/neo-wasp.gc @@ -657,7 +657,8 @@ 0 (set! (-> self hit-points) 0.0) (do-effect (-> self skel effect) "death-default" 0.0 -1) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (send-event self 'death-end) (cleanup-for-death self) ) @@ -809,10 +810,10 @@ (-> this thrust 0) (+ (* 0.4 (fmax 0.0 (* (-> v1-2 x) f0-0))) (fmax 0.0 (-> v1-2 y)) - (fabs (* 0.2 (-> v1-2 z))) + (fabs (/ (-> v1-2 z) 5)) (fmax 0.0 (-> s5-0 y)) ) - (* 0.2 f30-0) + (/ f30-0 5) ) ) ) diff --git a/goal_src/jak3/levels/common/enemy/flitter.gc b/goal_src/jak3/levels/common/enemy/flitter.gc index 414c5cf6c6..d364c3d319 100644 --- a/goal_src/jak3/levels/common/enemy/flitter.gc +++ b/goal_src/jak3/levels/common/enemy/flitter.gc @@ -699,7 +699,8 @@ (part-tracker-spawn part-tracker :to *entity-pool* :group (-> *part-group-id-table* 1412)) ) ) - (suspend-for (seconds 0.6)) + (suspend-for (seconds 0.6) + ) (+! (-> self root trans y) -8192.0) (update-focus self) (let ((a0-14 (handle->process (-> self focus handle)))) @@ -717,7 +718,8 @@ ) ) ) - (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6)))) + (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6))) + ) (logclear! (-> self draw status) (draw-control-status no-draw)) (go-virtual ambush-jumping) ) @@ -857,7 +859,7 @@ (set-time! (-> this last-change-dir)) (set! (-> this change-dir-time) (rand-vu-int-range (seconds 0.5) (seconds 0.7))) (let ((s3-2 (new 'stack-no-clear 'vector)) - (f0-9 (* 0.5 f30-0 (tan (-> this move-angle)))) + (f0-9 (* (/ f30-0 2) (tan (-> this move-angle)))) (s2-0 (new 'stack-no-clear 'vector)) ) (if (-> this heading) diff --git a/goal_src/jak3/levels/common/enemy/hover/robo-hover.gc b/goal_src/jak3/levels/common/enemy/hover/robo-hover.gc index fc1369c57d..052a8a4c84 100644 --- a/goal_src/jak3/levels/common/enemy/hover/robo-hover.gc +++ b/goal_src/jak3/levels/common/enemy/hover/robo-hover.gc @@ -1289,10 +1289,10 @@ (-> arg0 thrust s3-0) (+ (* 0.4 (fmax 0.0 (* (-> v0-6 x) s0-0))) (fmax 0.0 (-> v0-6 y)) - (fabs (* 0.2 (-> v0-6 z))) + (fabs (/ (-> v0-6 z) 5)) (fmax 0.0 (-> s1-1 y)) ) - (* 0.2 f30-0) + (/ f30-0 5) ) ) ) @@ -1314,7 +1314,7 @@ (set! (-> *part-id-table* 2213 init-specs 0 initial-valuef) (* f24-0 f0-14)) (set! (-> arg0 thrust s3-0) f28-0) (let ((f0-15 (* f26-0 f0-14))) - (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 uvec) (* -0.5 f0-15)) + (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 uvec) (/ f0-15 -2)) ) ) ) @@ -1389,7 +1389,7 @@ ) (set! (-> *part-id-table* 2213 init-specs 0 initial-valuef) f1-0) ) - (let ((v1-29 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 uvec) (* -0.5 f0-0)))) + (let ((v1-29 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 uvec) (/ f0-0 -2)))) (vector+! (-> s5-0 trans) s4-0 v1-29) ) ) diff --git a/goal_src/jak3/levels/common/enemy/mantis.gc b/goal_src/jak3/levels/common/enemy/mantis.gc index d56fb3add5..b4f9cb9c76 100644 --- a/goal_src/jak3/levels/common/enemy/mantis.gc +++ b/goal_src/jak3/levels/common/enemy/mantis.gc @@ -758,9 +758,11 @@ ) ) ) - (suspend-for (seconds 0.3)) + (suspend-for (seconds 0.3) + ) (logior! (-> self draw status) (draw-control-status no-draw)) - (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6)))) + (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6))) + ) (logclear! (-> self draw status) (draw-control-status no-draw)) (let* ((v1-45 (-> self nav)) (a1-7 (-> self root trans)) @@ -892,10 +894,11 @@ (suspend) (ja :num! (seek! max 1.2)) ) - (suspend-for (seconds 1) (if (logtest? (-> self root status) (collide-status on-ground)) - (goto cfg-35) - ) - ) + (suspend-for (seconds 1) + (if (logtest? (-> self root status) (collide-status on-ground)) + (goto cfg-35) + ) + ) (label cfg-35) (go-virtual hostile) ) @@ -1423,7 +1426,7 @@ ((method-of-type sphere new) (the-as symbol (-> s4-0 s3-0)) sphere) ) (set! (-> s4-0 0 quad) (-> this root trans quad)) - (set! (-> s4-0 0 y) (+ (-> this base-height) (* 0.5 (-> this root root-prim prim-core world-sphere w)))) + (set! (-> s4-0 0 y) (+ (-> this base-height) (/ (-> this root root-prim prim-core world-sphere w) 2))) (set! (-> s4-0 0 r) (-> this root root-prim prim-core world-sphere w)) (let ((v1-16 s5-1)) (set! (-> v1-16 best-dist) (the-as float s4-0)) diff --git a/goal_src/jak3/levels/common/enemy/prebot-eco-creature.gc b/goal_src/jak3/levels/common/enemy/prebot-eco-creature.gc index df7ec2c630..a078216717 100644 --- a/goal_src/jak3/levels/common/enemy/prebot-eco-creature.gc +++ b/goal_src/jak3/levels/common/enemy/prebot-eco-creature.gc @@ -799,7 +799,7 @@ ) (set! (-> this old-y-deg) f0-0) ) - (if (< (+ 0.5 (* 0.00024414062 (-> this nav state speed))) (* 0.005493164 (fabs (-> this diff-angle)))) + (if (< (+ 0.5 (/ (-> this nav state speed) METER_LENGTH)) (* 0.005493164 (fabs (-> this diff-angle)))) (logior! (-> this flags) (eco-creature-flag ecf0)) (logclear! (-> this flags) (eco-creature-flag ecf0)) ) @@ -1060,7 +1060,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info hostile-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) (else (prebot-large-eco-creature-method-194 self) @@ -1092,7 +1092,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) (else (prebot-large-eco-creature-method-194 self) @@ -1125,7 +1125,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) (else (prebot-large-eco-creature-method-194 self) @@ -1289,7 +1289,7 @@ (vector-! v1-27 (the-as vector gp-0) (the-as vector s5-0)) (set! (-> v1-27 y) 0.0) (let ((f30-1 (atan (-> v1-27 x) (-> v1-27 z)))) - (quaternion-set! (-> self root quat) 0.0 (sin (* 0.5 f30-1)) 0.0 (cos (* 0.5 f30-1))) + (quaternion-set! (-> self root quat) 0.0 (sin (/ f30-1 2)) 0.0 (cos (/ f30-1 2))) ) ) (set! (-> self which-trajectory) 0) @@ -1367,8 +1367,8 @@ (let ((s5-0 (new 'stack-no-clear 'quaternion)) (gp-0 (new 'stack-no-clear 'quaternion)) ) - (quaternion-set! s5-0 (sin (* 0.5 (-> self x-rotate))) 0.0 0.0 (cos (* 0.5 (-> self x-rotate)))) - (quaternion-set! gp-0 0.0 (sin (* 0.5 (-> self y-rotate))) 0.0 (cos (* 0.5 (-> self y-rotate)))) + (quaternion-set! s5-0 (sin (/ (-> self x-rotate) 2)) 0.0 0.0 (cos (/ (-> self x-rotate) 2))) + (quaternion-set! gp-0 0.0 (sin (/ (-> self y-rotate) 2)) 0.0 (cos (/ (-> self y-rotate) 2))) (quaternion-normalize! (quaternion*! (-> self spin-jm quat) gp-0 s5-0)) ) (cond diff --git a/goal_src/jak3/levels/common/enemy/spyder.gc b/goal_src/jak3/levels/common/enemy/spyder.gc index c7efca2945..1e8561e042 100644 --- a/goal_src/jak3/levels/common/enemy/spyder.gc +++ b/goal_src/jak3/levels/common/enemy/spyder.gc @@ -1036,7 +1036,7 @@ ) ) (let ((v1-17 (-> self nav))) - (set! (-> v1-17 max-rotation-rate) (* 0.05 (-> *spyder-nav-enemy-info* maximum-rotation-rate))) + (set! (-> v1-17 max-rotation-rate) (/ (-> *spyder-nav-enemy-info* maximum-rotation-rate) 20)) ) 0 (ja-channel-push! 2 (seconds 0.2)) @@ -1068,8 +1068,7 @@ (set! (-> self fire-info 0 quad) (-> s3-0 quad)) (set! (-> self fire-info 1 quad) (-> s2-1 quad)) ) - (suspend-for - (seconds 0.2) + (suspend-for (seconds 0.2) (set! f30-0 (seek f30-0 (lerp-scale 0.0 1.0 (the float s4-0) 0.0 8.0) (seconds-per-frame))) (ja :num! (loop!)) (ja :chan 1 :num! (chan 0) :frame-interp0 f30-0 :frame-interp1 f30-0) diff --git a/goal_src/jak3/levels/common/enemy/spydroid-orig.gc b/goal_src/jak3/levels/common/enemy/spydroid-orig.gc index d353525ca9..61705505b8 100644 --- a/goal_src/jak3/levels/common/enemy/spydroid-orig.gc +++ b/goal_src/jak3/levels/common/enemy/spydroid-orig.gc @@ -794,7 +794,7 @@ ) (set! (-> this old-y-deg) f0-5) ) - (if (< (+ 0.5 (* 0.00024414062 (-> this nav state speed))) (* 0.005493164 (fabs (-> this diff-angle)))) + (if (< (+ 0.5 (/ (-> this nav state speed) METER_LENGTH)) (* 0.005493164 (fabs (-> this diff-angle)))) (logior! (-> this flags) (spydroid-orig-flag sof1)) (logclear! (-> this flags) (spydroid-orig-flag sof1)) ) @@ -1123,7 +1123,8 @@ ) (suspend) (ja-channel-set! 0) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (send-event self 'death-end) (let ((gp-1 (-> self child))) (while gp-1 @@ -1304,7 +1305,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info hostile-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) ((< 0.0 (-> self diff-angle)) (let ((v1-44 (ja-group))) @@ -1359,7 +1360,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) ((< 0.0 (-> self diff-angle)) (let ((v1-28 (ja-group))) @@ -1415,7 +1416,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) ((< 0.0 (-> self diff-angle)) (let ((v1-28 (ja-group))) diff --git a/goal_src/jak3/levels/common/enemy/spydroid.gc b/goal_src/jak3/levels/common/enemy/spydroid.gc index 3cb59b5d70..9f2f66ae21 100644 --- a/goal_src/jak3/levels/common/enemy/spydroid.gc +++ b/goal_src/jak3/levels/common/enemy/spydroid.gc @@ -680,7 +680,7 @@ (set! (-> gp-0 quad) (-> (get-trans a0-2 3) quad)) (set! f0-0 (spydroid-method-234 self gp-0)) ) - (set! f28-0 (* 0.00024414062 f0-0)) + (set! f28-0 (/ f0-0 METER_LENGTH)) ) ) (if (logtest? (enemy-flag drawn-mirrored) (-> self enemy-flags)) @@ -888,7 +888,7 @@ (f0-2 (-> s4-1 y)) ) (if (not (logtest? (-> this draw status) (draw-control-status on-screen))) - (set! f30-0 (* 0.1 f30-0)) + (set! f30-0 (/ f30-0 10)) ) (when (< f0-2 40960.0) (set! (-> s4-1 y) 0.0) diff --git a/goal_src/jak3/levels/common/external-player-control.gc b/goal_src/jak3/levels/common/external-player-control.gc index d4ec86c290..2a67108fcb 100644 --- a/goal_src/jak3/levels/common/external-player-control.gc +++ b/goal_src/jak3/levels/common/external-player-control.gc @@ -53,8 +53,8 @@ (set! (-> arg0 stick0-speed) arg2) (+! (-> s5-0 x) 1.0) (+! (-> s5-0 z) 1.0) - (set! (-> s5-0 x) (* 0.5 (-> s5-0 x))) - (set! (-> s5-0 z) (* 0.5 (-> s5-0 z))) + (set! (-> s5-0 x) (/ (-> s5-0 x) 2)) + (set! (-> s5-0 z) (/ (-> s5-0 z) 2)) (set! (-> arg0 leftx) (the-as uint (the int (* 255.0 (-> s5-0 x))))) (if (logtest? (-> *game-info* secrets) (game-secrets hflip-screen)) (set! (-> arg0 leftx) (the-as uint (* (the-as uint -1) (-> arg0 leftx)))) diff --git a/goal_src/jak3/levels/common/hvehicle/squad-control.gc b/goal_src/jak3/levels/common/hvehicle/squad-control.gc index 971eb5d468..6106c3eff4 100644 --- a/goal_src/jak3/levels/common/hvehicle/squad-control.gc +++ b/goal_src/jak3/levels/common/hvehicle/squad-control.gc @@ -485,7 +485,7 @@ (.add.mul.z.vf vf1 vf2 vf1 acc :mask #b1) (.mov v1-40 vf1) (let ((f0-17 v1-40) - (f1-4 (* 0.5 arg3)) + (f1-4 (/ arg3 2)) ) (when (< (* f1-4 f1-4) f0-17) (vector+! s5-0 s5-0 (-> s2-0 vec0)) diff --git a/goal_src/jak3/levels/common/hvehicle/turret-control.gc b/goal_src/jak3/levels/common/hvehicle/turret-control.gc index ec35aa78dd..76ffe93160 100644 --- a/goal_src/jak3/levels/common/hvehicle/turret-control.gc +++ b/goal_src/jak3/levels/common/hvehicle/turret-control.gc @@ -335,7 +335,7 @@ (-> gp-0 vec-12 x) ) ) - (set! (-> this aim-rot-vel s3-1) (* (-> this aim-rot-vel s3-1) (fmax 0.0 (- 1.0 (* 0.1 (-> gp-0 vec-12 x)))))) + (set! (-> this aim-rot-vel s3-1) (* (-> this aim-rot-vel s3-1) (fmax 0.0 (- 1.0 (/ (-> gp-0 vec-12 x) 10))))) (+! (-> this aim-rot s3-1) (* (-> this aim-rot-vel s3-1) (-> gp-0 vec-12 x))) (when (or (zero? s3-1) (not (logtest? (-> this flags) (turret-flag no-rot-y-clamp)))) (let ((f0-31 (-> this info rot-min s3-1))) diff --git a/goal_src/jak3/levels/common/race/race-manager.gc b/goal_src/jak3/levels/common/race/race-manager.gc index c952868fb6..ecaebd7ac0 100644 --- a/goal_src/jak3/levels/common/race/race-manager.gc +++ b/goal_src/jak3/levels/common/race/race-manager.gc @@ -865,7 +865,7 @@ (let ((v1-8 (new 'stack-no-clear 'race-manager-stack-var0))) (set! (-> v1-8 vec1 z) 61440.0) (set! (-> v1-8 word) 1) - (set! (-> v1-8 vec0 z) (* -0.5 (-> v1-8 vec1 z))) + (set! (-> v1-8 vec0 z) (/ (-> v1-8 vec1 z) -2)) (set! (-> v1-8 vec0 w) -20480.0) (set! (-> v1-8 vec1 x) (/ (-> v1-8 vec1 z) (the float (max 1 (+ (-> v1-8 word) -1))))) (set! (-> v1-8 vec1 y) -40960.0) @@ -1212,7 +1212,7 @@ (let ((v1-12 gp-1)) (set! (-> v1-12 height) (the float 70)) ) - (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) + (set! (-> gp-1 origin x) (the float (- 256 (the int (/ (-> gp-1 width) 2))))) (set! (-> gp-1 origin y) 320.0) (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-1 print-game-text)) @@ -1268,7 +1268,7 @@ (let ((v1-12 gp-1)) (set! (-> v1-12 height) (the float 35)) ) - (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) + (set! (-> gp-1 origin x) (the float (- 256 (the int (/ (-> gp-1 width) 2))))) (set! (-> gp-1 origin y) 320.0) (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-1 print-game-text)) diff --git a/goal_src/jak3/levels/common/race/race-mesh.gc b/goal_src/jak3/levels/common/race/race-mesh.gc index 637c294723..77d5b3e4a8 100644 --- a/goal_src/jak3/levels/common/race/race-mesh.gc +++ b/goal_src/jak3/levels/common/race/race-mesh.gc @@ -687,7 +687,7 @@ (set! (-> s3-0 cell-bits 0 quad) (the-as uint128 0)) (set! (-> s3-0 cell-bits 1 quad) (the-as uint128 0)) (let ((f0-1 (/ 1.0 (-> s4-0 cell-length))) - (f1-2 (fmin (-> arg0 search-sphere r) (* 0.5 (-> s4-0 cell-length)))) + (f1-2 (fmin (-> arg0 search-sphere r) (/ (-> s4-0 cell-length) 2))) ) (let ((f3-1 (- (-> arg0 search-sphere x) f1-2)) (f2-4 (- (-> arg0 search-sphere z) f1-2)) @@ -721,7 +721,7 @@ (+! s2-0 1) ) ) - (when (and (= (-> arg0 slice-id) -1) (< (* 0.5 (-> s4-0 cell-length)) (-> arg0 search-sphere r))) + (when (and (= (-> arg0 slice-id) -1) (< (/ (-> s4-0 cell-length) 2) (-> arg0 search-sphere r))) (while (= (-> arg0 slice-id) -1) (set! (-> s3-0 bounds min x) (max 0 (+ (-> s3-0 bounds min x) -1))) (set! (-> s3-0 bounds min z) (max 0 (+ (-> s3-0 bounds min z) -1))) diff --git a/goal_src/jak3/levels/desert/boss/terraformer-setup.gc b/goal_src/jak3/levels/desert/boss/terraformer-setup.gc index 565d049324..54b0b4fc67 100644 --- a/goal_src/jak3/levels/desert/boss/terraformer-setup.gc +++ b/goal_src/jak3/levels/desert/boss/terraformer-setup.gc @@ -758,8 +758,8 @@ (let ((s5-0 (new 'stack-no-clear 'quaternion)) (gp-0 (new 'stack-no-clear 'quaternion)) ) - (quaternion-set! s5-0 (sin (* 0.5 (-> self x-rotate))) 0.0 0.0 (cos (* 0.5 (-> self x-rotate)))) - (quaternion-set! gp-0 0.0 (sin (* 0.5 (-> self y-rotate))) 0.0 (cos (* 0.5 (-> self y-rotate)))) + (quaternion-set! s5-0 (sin (/ (-> self x-rotate) 2)) 0.0 0.0 (cos (/ (-> self x-rotate) 2))) + (quaternion-set! gp-0 0.0 (sin (/ (-> self y-rotate) 2)) 0.0 (cos (/ (-> self y-rotate) 2))) (quaternion-normalize! (quaternion*! (-> self root quat) gp-0 s5-0)) ) (cond diff --git a/goal_src/jak3/levels/desert/des-burning-bush.gc b/goal_src/jak3/levels/desert/des-burning-bush.gc index b49b511da4..d61f3faaec 100644 --- a/goal_src/jak3/levels/desert/des-burning-bush.gc +++ b/goal_src/jak3/levels/desert/des-burning-bush.gc @@ -932,7 +932,8 @@ ) ) ) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (set-time! (-> self state-time)) (while (and (nonzero? (get-status *gui-control* (the-as sound-id (-> self message-id)))) (not (time-elapsed? (-> self state-time) (seconds 60))) @@ -1022,7 +1023,7 @@ ) (else (set! (-> *part-id-table* 1585 init-specs 11 initial-valuef) f0-4) - (set! (-> *part-id-table* 1586 init-specs 11 initial-valuef) (* 0.5 f0-4)) + (set! (-> *part-id-table* 1586 init-specs 11 initial-valuef) (/ f0-4 2)) (spawn-from-cspace (-> this part) (-> this node-list data 4)) (spawn-from-cspace (-> this part) (-> this node-list data 5)) ) @@ -1490,8 +1491,7 @@ (send-event *camera* 'teleport-to-transformq s4-0) ) (set! (-> self update-fov?) #t) - (suspend-for - (seconds 3) + (suspend-for (seconds 3) (set! (-> *camera* slave 0 fov) (-> *burning-bush-get-on-info* (-> self info index) fov)) ) (set! (-> self update-fov?) #f) diff --git a/goal_src/jak3/levels/desert/des-bush.gc b/goal_src/jak3/levels/desert/des-bush.gc index a270ab95ba..cacbaa0bf0 100644 --- a/goal_src/jak3/levels/desert/des-bush.gc +++ b/goal_src/jak3/levels/desert/des-bush.gc @@ -1688,7 +1688,7 @@ (set! (-> this fail-radius) (res-lump-float s5-2 'fail-radius :default 655360.0)) (set! (-> this chase-distance) (res-lump-float s5-2 'chase-distance :default 102400.0)) (set! (-> this start-offset-vel) (res-lump-float s5-2 'start-offset-vel :default 20480.0)) - (format #t "new-vel: ~f~%" (* 0.00024414062 (-> this start-offset-vel))) + (format #t "new-vel: ~f~%" (/ (-> this start-offset-vel) METER_LENGTH)) (set! (-> this entity) (the-as entity-actor s5-2)) (set! sv-16 (new 'static 'res-tag)) (let ((v1-19 (res-lump-data s5-2 'actor-groups pointer :tag-ptr (& sv-16)))) @@ -1707,7 +1707,7 @@ (set-sbanks this) (set! (-> this sound-id) (new 'static 'sound-id)) (set! (-> this current-spirit-vel) (-> this min-spirit-vel)) - (format #t "min-spirit-vel: ~f~%" (* 0.00024414062 (-> this min-spirit-vel))) + (format #t "min-spirit-vel: ~f~%" (/ (-> this min-spirit-vel) METER_LENGTH)) (none) ) diff --git a/goal_src/jak3/levels/desert/des-cactus.gc b/goal_src/jak3/levels/desert/des-cactus.gc index 851fda2bf8..2bc7926736 100644 --- a/goal_src/jak3/levels/desert/des-cactus.gc +++ b/goal_src/jak3/levels/desert/des-cactus.gc @@ -73,8 +73,8 @@ (quaternion-conjugate! (-> s5-0 1) (-> this root quat)) (quaternion->matrix (the-as matrix (-> s5-0 2)) (-> s5-0 1)) (set! (-> s5-0 7 x) 2730.6667) - (set! (-> s5-0 7 z) (sin (* 0.5 (-> s5-0 7 x)))) - (set! (-> s5-0 7 y) (cos (* 0.5 (-> s5-0 7 x)))) + (set! (-> s5-0 7 z) (sin (/ (-> s5-0 7 x) 2))) + (set! (-> s5-0 7 y) (cos (/ (-> s5-0 7 x) 2))) (vector-rotate90-around-y! (the-as vector (-> s5-0 6)) (-> this spring-pos)) (vector-float*! (the-as vector (-> s5-0 6)) (the-as vector (-> s5-0 6)) (* -1.0 (-> s5-0 7 z))) (vector-rotate*! (the-as vector (-> s5-0 6)) (the-as vector (-> s5-0 6)) (the-as matrix (-> s5-0 2))) @@ -361,7 +361,8 @@ ) ) ) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) (cleanup-for-death self) ) :post #f diff --git a/goal_src/jak3/levels/desert/desert-dust-storm.gc b/goal_src/jak3/levels/desert/desert-dust-storm.gc index 1a0840f4df..9ab3df1140 100644 --- a/goal_src/jak3/levels/desert/desert-dust-storm.gc +++ b/goal_src/jak3/levels/desert/desert-dust-storm.gc @@ -428,7 +428,7 @@ (set! f0-44 (+ 65536.0 f0-44)) ) (let* ((f0-46 (+ (* 5.0 f0-44) (* 5.0 (- (-> this current-wind-angle-speed))))) - (f1-23 (* 0.2 f0-46 f28-3)) + (f1-23 (* (/ f0-46 5) f28-3)) ) (+! (-> this current-wind-angle-speed) (* f1-23 (seconds-per-frame))) ) @@ -569,7 +569,7 @@ (vector+float*! s4-0 s4-0 (get-transv *target*) 0.2) ) (vector+float*! s4-0 s4-0 (-> (math-camera-matrix) fvec) 20480.0) - (let ((f30-4 (* 0.000061035156 (-> this stretch-val)))) + (let ((f30-4 (/ (-> this stretch-val) (meters 4)))) (set! (-> *part-id-table* 1421 init-specs 2 initial-valuef) (lerp 20480.0 61440.0 f30-4)) (set! (-> *part-id-table* 1422 init-specs 2 initial-valuef) (lerp 20480.0 61440.0 f30-4)) ) @@ -623,7 +623,7 @@ #t (let* ((f0-12 (vector-dot s5-2 (-> this fog-plane-dir))) (f0-13 (fmax 0.0 f0-12)) - (f1-5 (* 0.000016276043 f0-13)) + (f1-5 (/ f0-13 (meters 15))) (f0-15 (fmax 0.0 (fmin 1.0 f1-5))) ) (set! f28-0 (lerp (fmin 0.8 (-> this intensity)) (-> this intensity) f0-15)) @@ -680,7 +680,7 @@ (send-event *target* 'push-trans - (vector-float*! (new 'stack-no-clear 'vector) *duststorm-wind-vec* (* 0.02 *duststorm-wind-vel*)) + (vector-float*! (new 'stack-no-clear 'vector) *duststorm-wind-vec* (/ (the float *duststorm-wind-vel*) 50)) (seconds 0.11) ) ) diff --git a/goal_src/jak3/levels/desert/hover/des-beast-2.gc b/goal_src/jak3/levels/desert/hover/des-beast-2.gc index 8f8c1cdd5c..80dd08b066 100644 --- a/goal_src/jak3/levels/desert/hover/des-beast-2.gc +++ b/goal_src/jak3/levels/desert/hover/des-beast-2.gc @@ -32,9 +32,9 @@ (let ((v1-1 (the-as object (-> block param 0)))) (let ((a0-4 (-> self entity extra perm))) (logior! (-> a0-4 status) (entity-perm-status bit-5)) - (set! (-> a0-4 user-int16 0) (the int (* 0.00024414062 (-> (the-as vector v1-1) x)))) - (set! (-> a0-4 user-int16 1) (the int (* 0.00024414062 (-> (the-as vector v1-1) y)))) - (set! (-> a0-4 user-int16 2) (the int (* 0.00024414062 (-> (the-as vector v1-1) z)))) + (set! (-> a0-4 user-int16 0) (the int (/ (-> (the-as vector v1-1) x) METER_LENGTH))) + (set! (-> a0-4 user-int16 1) (the int (/ (-> (the-as vector v1-1) y) METER_LENGTH))) + (set! (-> a0-4 user-int16 2) (the int (/ (-> (the-as vector v1-1) z) METER_LENGTH))) ) (set! (-> self root trans quad) (-> (the-as vector v1-1) quad)) ) @@ -665,7 +665,7 @@ (vector+float*! gp-1 (-> s5-1 0) (-> s5-1 1) (-> s5-1 4 x)) 0 ) - (let ((f1-20 (* 0.000008138021 (-> s5-1 2 x)))) + (let ((f1-20 (/ (-> s5-1 2 x) (meters 30)))) (set! (-> gp-1 y) (fmin (+ 327680.0 (-> self root trans y)) (+ 20480.0 (* 9216.0 (* f1-20 f1-20)) (-> gp-1 y))) ) @@ -818,13 +818,15 @@ ) ) :code (behavior () - (suspend-for (seconds 0.1)) + (suspend-for (seconds 0.1) + ) (until (ja-done? 0) (suspend) ) (logior! (-> self skel effect flags) (effect-control-flag ecf1)) (do-effect (-> self skel effect) "death-default" 0.0 -1) - (suspend-for (seconds 3)) + (suspend-for (seconds 3) + ) (go-virtual die) ) :post (behavior () diff --git a/goal_src/jak3/levels/desert/hover/des-beast.gc b/goal_src/jak3/levels/desert/hover/des-beast.gc index fe51b17ed4..c06ad01904 100644 --- a/goal_src/jak3/levels/desert/hover/des-beast.gc +++ b/goal_src/jak3/levels/desert/hover/des-beast.gc @@ -1831,7 +1831,7 @@ (let ((f30-0 (lerp-scale 3276.8 0.0 (vector-vector-distance (camera-pos) (-> this root trans)) 81920.0 573440.0))) (when (!= f30-0 0.0) (activate! *camera-smush-control* f30-0 37 600 1.0 0.1 (-> *display* camera-clock)) - (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 (the int (* 255.0 (* 0.00024414062 f30-0))) (seconds 0.2)) + (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 (the int (* 255.0 (/ f30-0 METER_LENGTH))) (seconds 0.2)) ) ) ) @@ -1956,7 +1956,7 @@ (static-attack-info :mask (vehicle-impulse-factor) ((id (-> this attack-id)) (damage 2.0) (vehicle-damage-factor 0.01) - (vehicle-impulse-factor (* 0.00012207031 f30-2)) + (vehicle-impulse-factor (/ f30-2 (meters 2))) (attacker-velocity s3-4) ) ) diff --git a/goal_src/jak3/levels/desert/hover/deshover-texture.gc b/goal_src/jak3/levels/desert/hover/deshover-texture.gc index a48ea094e2..dd29444a75 100644 --- a/goal_src/jak3/levels/desert/hover/deshover-texture.gc +++ b/goal_src/jak3/levels/desert/hover/deshover-texture.gc @@ -163,8 +163,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) diff --git a/goal_src/jak3/levels/desert/race/turtle-training.gc b/goal_src/jak3/levels/desert/race/turtle-training.gc index 53359bf023..f1ce495284 100644 --- a/goal_src/jak3/levels/desert/race/turtle-training.gc +++ b/goal_src/jak3/levels/desert/race/turtle-training.gc @@ -229,7 +229,7 @@ (let ((v1-3 s5-0)) (set! (-> v1-3 height) (the float 70)) ) - (set! (-> s5-0 origin x) (the float (- 201 (the int (* 0.5 (-> s5-0 width)))))) + (set! (-> s5-0 origin x) (the float (- 201 (the int (/ (-> s5-0 width) 2))))) (set! (-> s5-0 origin y) 290.0) (set! (-> s5-0 flags) (font-flags shadow kerning middle-vert large)) (let ((s4-0 print-game-text)) @@ -289,8 +289,11 @@ (set! (-> gp-0 map-icon) (the-as uint 12)) (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) - (suspend-for (seconds 4) (print-training-text self (text-id text-05e6))) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 4) + (print-training-text self (text-id text-05e6)) + ) + (suspend-for (seconds 0.25) + ) (set! (-> self time-limit) (seconds 30)) (set-time! (-> self start-time)) (until #f @@ -315,7 +318,8 @@ (set! (-> self arrow) (the-as handle #f)) (send-event (handle->process (-> self hud-timer)) 'hide-and-die) (set! (-> self start-time) 0) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (set! (-> self show-message?) #f) (set! (-> self goal-pos quad) (-> self goal-array 1 pos quad)) (let ((gp-5 (new 'stack-no-clear 'task-arrow-params))) @@ -346,7 +350,8 @@ (set! (-> self arrow) (the-as handle #f)) (send-event (handle->process (-> self hud-timer)) 'hide-and-die) (set! (-> self start-time) 0) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (set! (-> self time-limit) (seconds 28)) (set-time! (-> self start-time)) (set-time! (-> self test-time)) @@ -365,7 +370,8 @@ (sound-play "special-pickup") (send-event (handle->process (-> self hud-timer)) 'hide-and-die) (set! (-> self start-time) 0) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (set! (-> self show-message?) #f) (set! (-> self goal-pos quad) (-> self goal-array 2 pos quad)) (let ((gp-10 (new 'stack-no-clear 'task-arrow-params))) @@ -413,7 +419,8 @@ (set! (-> self arrow) (the-as handle #f)) (send-event (handle->process (-> self hud-timer)) 'hide-and-die) (set! (-> self start-time) 0) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (set! (-> self goal-pos quad) (-> self goal-array 3 pos quad)) (let ((gp-13 (new 'stack-no-clear 'task-arrow-params))) (set! (-> gp-13 pos quad) (-> self goal-pos quad)) @@ -442,7 +449,8 @@ (set! (-> self arrow) (the-as handle #f)) (send-event (handle->process (-> self hud-timer)) 'hide-and-die) (set! (-> self start-time) 0) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (set! (-> self goal-pos quad) (-> self goal-array 4 pos quad)) (let ((gp-16 (new 'stack-no-clear 'task-arrow-params))) (set! (-> gp-16 pos quad) (-> self goal-pos quad)) @@ -475,7 +483,8 @@ (set! (-> self arrow) (the-as handle #f)) (send-event (handle->process (-> self hud-timer)) 'hide-and-die) (set! (-> self start-time) 0) - (suspend-for (seconds 0.25)) + (suspend-for (seconds 0.25) + ) (set! (-> self goal-pos quad) (-> self goal-array 5 pos quad)) (let ((gp-19 (new 'stack-no-clear 'task-arrow-params))) (set! (-> gp-19 pos quad) (-> self goal-pos quad)) diff --git a/goal_src/jak3/levels/desert/rescue/desert-rescue.gc b/goal_src/jak3/levels/desert/rescue/desert-rescue.gc index 114d01d13c..80cbede660 100644 --- a/goal_src/jak3/levels/desert/rescue/desert-rescue.gc +++ b/goal_src/jak3/levels/desert/rescue/desert-rescue.gc @@ -1278,8 +1278,8 @@ (vector+float*! s4-0 (-> this root trans) s3-0 0.0) (set! (-> s3-0 y) 0.0) (vector-normalize! s3-0 1.0) - (let* ((s5-1 (vector+float*! (new 'stack-no-clear 'vector) s4-0 s3-0 (* 0.5 f30-0))) - (s2-1 (vector+float*! (new 'stack-no-clear 'vector) s4-0 s3-0 (* -0.5 f30-0))) + (let* ((s5-1 (vector+float*! (new 'stack-no-clear 'vector) s4-0 s3-0 (/ f30-0 2))) + (s2-1 (vector+float*! (new 'stack-no-clear 'vector) s4-0 s3-0 (/ f30-0 -2))) (f28-0 (probe-ground this s5-1)) (f0-6 (probe-ground this s2-1)) ) @@ -1616,7 +1616,7 @@ ) (when (or (logtest? (-> self draw status) (draw-control-status on-screen)) (< f0-0 1024000.0)) 0.0 - (let* ((f0-1 (* 0.0000048828124 f0-0)) + (let* ((f0-1 (/ f0-0 (meters 50))) (f0-3 (fmax 1.0 (+ -2.0 f0-1))) ) (set! (-> self move-speed) (/ 245760.0 f0-3)) @@ -2562,7 +2562,8 @@ ((-> (method-of-type task-manager active) trans)) ) :code (behavior () - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (send-event self 'fail) (sleep-code) ) diff --git a/goal_src/jak3/levels/desert/rescue/neo-satellite.gc b/goal_src/jak3/levels/desert/rescue/neo-satellite.gc index 4bb6d1b4e4..7a41e60951 100644 --- a/goal_src/jak3/levels/desert/rescue/neo-satellite.gc +++ b/goal_src/jak3/levels/desert/rescue/neo-satellite.gc @@ -1770,7 +1770,7 @@ (defmethod neo-sat-method-201 ((this neo-sat)) (when (and (-> this next-state) (= (-> this next-state name) 'neo-sat-drill-prepare)) - (let ((f0-1 (* 0.000010172526 (-> this spin-current)))) + (let ((f0-1 (/ (-> this spin-current) (meters 24)))) (sound-play-by-name (static-sound-name "sat-hover") (-> this snd-hover) @@ -2242,7 +2242,7 @@ (set! (-> s2-3 y) 0.0) (vector-normalize! s2-3 1.0) (let* ((f0-23 (acos (vector-dot s2-3 s3-0))) - (f0-24 (* 0.000030517578 f0-23)) + (f0-24 (/ f0-23 (meters 8))) (f22-0 (- 1.0 f0-24)) (f1-10 (+ (lerp 0.0 0.75 (* f22-0 f22-0)) (lerp -0.25 0.25 f26-1))) (f24-1 (fmax 0.0 (fmin 1.0 f1-10))) @@ -2445,7 +2445,7 @@ (seconds-per-frame) ) ) - (f0-11 (* 0.05 f0-10)) + (f0-11 (/ f0-10 20)) ) (+! (-> this spin-speed) f0-11) ) @@ -2694,7 +2694,7 @@ ) (vector+float*! s1-0 (-> this shockwave-origin) s0-0 f28-1) (set! (-> s1-0 y) (neo-sat-method-218 this s1-0)) - (set! (-> *part-id-table* 1679 init-specs 3 initial-valuef) (lerp 409.6 2457.6 (* 0.0000061035157 f28-1))) + (set! (-> *part-id-table* 1679 init-specs 3 initial-valuef) (lerp 409.6 2457.6 (/ f28-1 (meters 40)))) (let* ((f26-2 (-> *part-id-table* 1679 init-specs 3 initial-valuef)) (f24-1 1.0) (v1-41 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) @@ -3662,11 +3662,11 @@ ) (defmethod neo-sat-method-215 ((this neo-sat) (arg0 float)) - (* 0.000108506945 arg0) + (/ arg0 9216) ) (defmethod neo-sat-method-216 ((this neo-sat) (arg0 float)) - (* 0.000108506945 arg0) + (/ arg0 9216) ) (defmethod neo-sat-method-213 ((this neo-sat) (arg0 float)) diff --git a/goal_src/jak3/levels/desert/wvehicle/was-squad-control.gc b/goal_src/jak3/levels/desert/wvehicle/was-squad-control.gc index 1c492e0290..82ba3db0fe 100644 --- a/goal_src/jak3/levels/desert/wvehicle/was-squad-control.gc +++ b/goal_src/jak3/levels/desert/wvehicle/was-squad-control.gc @@ -231,7 +231,7 @@ (-> s5-1 2 trans) (-> (the-as process-drawable s4-0) root trans) (-> s5-1 2 uvec) - (* 0.5 (-> s5-1 3 uvec y)) + (/ (-> s5-1 3 uvec y) 2) ) ) ) diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-marauder.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-marauder.gc index 4b52e79288..c2af3e02a4 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wcar-marauder.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wcar-marauder.gc @@ -125,7 +125,7 @@ (let ((s5-0 (-> this target-status))) (when (< 122880.0 (vector-vector-distance (-> s5-0 position) (-> this root trans))) (let ((f1-0 (vector-length (-> s5-0 velocity)))) - (set! (-> this turret-control inaccuracy) (* (-> this inaccuracy-factor) (fmax 1.0 (* 0.000012207031 f1-0)))) + (set! (-> this turret-control inaccuracy) (* (-> this inaccuracy-factor) (fmax 1.0 (/ f1-0 (meters 20))))) ) (turret-control-method-11 (-> this turret-control) this (-> s5-0 position) (-> s5-0 velocity)) ) diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc index e33848485d..4e462f44a9 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc @@ -83,7 +83,7 @@ (set! (-> gp-1 vec11 w) (fmax 0.1 (/ (-> gp-1 vec11 x) (fmax 4096.0 (- (-> gp-1 vec11 y)))))) (set! (-> gp-1 vec11 z) (+ (-> gp-1 vec6 y) (* (-> gp-1 vec11 w) (-> gp-1 vec7 y)))) (set! (-> gp-1 vec4 y) (+ (* (/ 1.0 (-> gp-1 vec11 w)) (- (-> gp-1 vec11 z) (-> gp-1 vec0 y))) - (* 0.5 (-> gp-1 vec11 w) (-> gp-1 vec10 w)) + (* (/ (-> gp-1 vec11 w) 2) (-> gp-1 vec10 w)) ) ) (set! (-> gp-1 vec4 y) (* (-> gp-1 vec4 y) (/ 1.0 (fmax 0.1 (-> gp-1 mat0 uvec y))))) diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-projectiles.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-projectiles.gc index 76c1e7989d..42d8094248 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wcar-projectiles.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wcar-projectiles.gc @@ -297,7 +297,7 @@ (launch-particles (-> *part-id-table* 981) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000008138021 f30-0)) + (f26-0 (/ f30-0 (meters 30))) (f30-1 (-> *part-id-table* 982 init-specs 3 initial-valuef)) (f28-0 (-> *part-id-table* 982 init-specs 5 initial-valuef)) ) @@ -506,7 +506,7 @@ (let* ((v1-26 (estimate-light-trail-mem-usage (the-as uint (-> s5-1 max-num-crumbs)) - (the-as uint (= (-> s5-1 appearance lie-mode) 3)) + (the-as uint (= (-> s5-1 appearance lie-mode) (lie-mode use-two-strips))) ) ) (s4-1 (get-process *default-dead-pool* light-trail-tracker-projectile (+ v1-26 8192) 1)) diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc index 30a8ddd17b..690cb94bcd 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc @@ -176,7 +176,7 @@ (not (-> *setting-control* cam-current entity-name)) ) ) - (activate! *camera-smush-control* (fmin 1331.2 (* 0.5 f0-0)) 120 360 1.0 0.9 (-> *display* camera-clock)) + (activate! *camera-smush-control* (fmin 1331.2 (/ f0-0 2)) 120 360 1.0 0.9 (-> *display* camera-clock)) ) ) ((method-of-type wcar-base vehicle-method-94) this) diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc index 28fd4e667b..a232956857 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc @@ -209,7 +209,7 @@ (defmethod vehicle-method-94 ((this v-scorpion)) (let ((f0-0 (vector-length (-> this lin-acceleration)))) (if (and (< 327680.0 f0-0) (not (logtest? (-> this controls flags) (vehicle-controls-flag vcf0)))) - (activate! *camera-smush-control* (fmin 2048.0 (* 0.5 f0-0)) 60 210 1.0 0.9 (-> *display* camera-clock)) + (activate! *camera-smush-control* (fmin 2048.0 (/ f0-0 2)) 60 210 1.0 0.9 (-> *display* camera-clock)) ) ) ((method-of-type wcar-base vehicle-method-94) this) @@ -279,11 +279,11 @@ ) 0 (let ((v1-44 (-> this jmod-shock-mids s4-1))) - (set! (-> v1-44 transform trans y) (* -0.5 (-> s5-1 ground-pos z) (-> s3-0 x-scale))) + (set! (-> v1-44 transform trans y) (* (/ (-> s5-1 ground-pos z) -2) (-> s3-0 x-scale))) ) 0 (let ((v1-48 (-> this jmod-shock-bots s4-1))) - (set! (-> v1-48 transform trans y) (* -1.0 (+ -2048.0 (* 0.5 (-> s5-1 ground-pos z))) (-> s3-0 x-scale))) + (set! (-> v1-48 transform trans y) (* -1.0 (+ -2048.0 (/ (-> s5-1 ground-pos z) 2)) (-> s3-0 x-scale))) ) ) 0 diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-toad.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-toad.gc index 9a68a3744a..6d9be7dffa 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wcar-toad.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wcar-toad.gc @@ -108,7 +108,7 @@ (set! (-> gp-1 vec11 w) (fmax 0.1 (/ (-> gp-1 vec11 x) (fmax 4096.0 (- (-> gp-1 vec11 y)))))) (set! (-> gp-1 vec11 z) (+ (-> gp-1 vec6 y) (* (-> gp-1 vec11 w) (-> gp-1 vec7 y)))) (set! (-> gp-1 vec4 y) (+ (* (/ 1.0 (-> gp-1 vec11 w)) (- (-> gp-1 vec11 z) (-> gp-1 vec0 y))) - (* 0.5 (-> gp-1 vec11 w) (-> gp-1 vec10 w)) + (* (/ (-> gp-1 vec11 w) 2) (-> gp-1 vec10 w)) ) ) (set! (-> gp-1 vec4 y) (* (-> gp-1 vec4 y) (/ 1.0 (fmax 0.1 (-> gp-1 mat0 uvec y))))) @@ -306,7 +306,7 @@ (set! (-> gp-0 wsphere z) 13590.528) (set! (-> gp-0 wsphere r) 0.0) (set! (-> gp-0 friction-coef) - (+ (-> gp-0 wsphere r) (* 2.0 (asin (/ (* 0.5 (-> arg1 travel)) (-> gp-0 wsphere z))))) + (+ (-> gp-0 wsphere r) (* 2.0 (asin (/ (/ (-> arg1 travel) 2) (-> gp-0 wsphere z))))) ) (set! (-> gp-0 steering-axis quad) (-> (new 'static 'vector :x 10649.6 :y 2662.4 :z 7618.56 :w 1.0) quad)) (set-vector! diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc index 4f9a7fa0a7..e25c2cc211 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc @@ -152,7 +152,7 @@ (-> this spring-vel) (-> this spring-vel) (-> s5-1 mat fvec) - (* -0.00024414062 (-> s5-1 mat trans x)) + (/ (-> s5-1 mat trans x) (meters -1)) ) (set! (-> s5-1 mat trans y) 500.0) (set! (-> s5-1 mat trans z) 5.0) @@ -187,8 +187,8 @@ (quaternion-conjugate! (-> s5-2 quat1) (-> this root quat)) (quaternion->matrix (-> s5-2 mat0) (-> s5-2 quat1)) (set! (-> s5-2 float0) 8192.0) - (set! (-> s5-2 float2) (sin (* 0.5 (-> s5-2 float0)))) - (set! (-> s5-2 float1) (cos (* 0.5 (-> s5-2 float0)))) + (set! (-> s5-2 float2) (sin (/ (-> s5-2 float0) 2))) + (set! (-> s5-2 float1) (cos (/ (-> s5-2 float0) 2))) (vector-rotate90-around-y! (-> s5-2 vec0) (-> this spring-pos)) (vector-float*! (-> s5-2 vec0) (-> s5-2 vec0) (* -1.0 (-> s5-2 float2))) (vector-rotate*! (-> s5-2 vec0) (-> s5-2 vec0) (-> s5-2 mat0)) diff --git a/goal_src/jak3/levels/desert/wvehicle/wvehicle-ai.gc b/goal_src/jak3/levels/desert/wvehicle/wvehicle-ai.gc index f3b08c0b83..53859546da 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wvehicle-ai.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wvehicle-ai.gc @@ -165,7 +165,7 @@ (vector-! (-> gp-0 world-normal) (-> gp-0 axis) (-> gp-0 p-body)) (vector-normalize! (-> gp-0 world-normal) 1.0) (vector+float*! (-> gp-0 velocity) (the-as vector (-> gp-0 mat)) (-> gp-0 world-normal) 163840.0) - (set! (-> gp-0 wheel-axis x) (* 0.5 (-> gp-0 wheel-axis x))) + (set! (-> gp-0 wheel-axis x) (/ (-> gp-0 wheel-axis x) 2)) 0 ) ) diff --git a/goal_src/jak3/levels/desert/wvehicle/wvehicle-hud.gc b/goal_src/jak3/levels/desert/wvehicle/wvehicle-hud.gc index 50c3032a42..5511ef28d7 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wvehicle-hud.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wvehicle-hud.gc @@ -30,7 +30,7 @@ ) (else (set! (-> a1-3 tid) (the-as texture-id (-> this tex-off))) - (set! (-> a1-3 color w) (the int (* 0.5 f0-7))) + (set! (-> a1-3 color w) (the int (/ f0-7 2))) ) ) ) diff --git a/goal_src/jak3/levels/desert/wvehicle/wvehicle-physics.gc b/goal_src/jak3/levels/desert/wvehicle/wvehicle-physics.gc index c89936b811..5ba526a4b4 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wvehicle-physics.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wvehicle-physics.gc @@ -305,7 +305,9 @@ ) ) (f1-29 - (/ (* 0.5 (-> s2-1 inertia) (-> s2-1 forward-slip-vel)) (* arg0 (-> arg1 probe-work-array 0 world-normal y))) + (/ (* (/ (-> s2-1 inertia) 2) (-> s2-1 forward-slip-vel)) + (* arg0 (-> arg1 probe-work-array 0 world-normal y)) + ) ) ) (if (logtest? (-> s1-1 flags) (vehicle-wheel-flag vwf0)) @@ -335,7 +337,7 @@ ) ) (if (logtest? (vehicle-flag turbo-boost) (-> this v-flags)) - (set! f0-57 (* 0.05 f0-57)) + (set! f0-57 (/ f0-57 20)) ) (+! (-> arg1 probe-work-array 0 ground-pos y) f0-57) ) @@ -425,7 +427,7 @@ (vector-rotate*! (-> arg1 normal) (-> arg1 normal) (-> sv-16 inv-i-world)) (vector-cross! (-> arg1 normal) (-> arg1 normal) (-> arg1 tmp)) (set! (-> arg1 probe-work-array 0 world-normal z) - (/ (* -0.5 (-> s1-2 side-vel)) + (/ (/ (-> s1-2 side-vel) -2) (* arg0 (+ (-> sv-16 info inv-mass) (vector-dot (the-as vector (-> arg1 probe-work-array)) (-> arg1 normal)))) ) ) @@ -437,7 +439,7 @@ (vector-rotate*! (-> arg1 normal) (-> arg1 normal) (-> sv-16 inv-i-world)) (vector-cross! (-> arg1 normal) (-> arg1 normal) (-> arg1 tmp)) (let ((f0-94 - (/ (* -0.25 (-> s1-2 forward-slip-vel)) + (/ (/ (-> s1-2 forward-slip-vel) -4) (* arg0 (+ (-> sv-16 info inv-mass) (vector-dot (the-as vector (&-> arg1 impulse)) (-> arg1 normal)))) ) ) @@ -616,7 +618,7 @@ ) (vector-matrix*! (-> gp-0 world-pos) (-> gp-0 local-pos) (-> gp-0 mat)) (vector-reset! (-> gp-0 force)) - (set! (-> gp-0 force y) (* -0.5 (-> s4-0 extra gravity) (-> s4-0 info mass))) + (set! (-> gp-0 force y) (* (/ (-> s4-0 extra gravity) -2) (-> s4-0 info mass))) (rigid-body-control-method-22 s5-0 (-> gp-0 world-pos) (-> gp-0 force)) ) ) diff --git a/goal_src/jak3/levels/desert/wvehicle/wvehicle-states.gc b/goal_src/jak3/levels/desert/wvehicle/wvehicle-states.gc index f2fff7a603..e2105d6400 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wvehicle-states.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wvehicle-states.gc @@ -115,7 +115,7 @@ (set! (-> gp-2 spawn-point quad) (-> self root trans quad)) (quaternion-identity! (-> gp-2 spawn-quat)) (set! (-> gp-2 radius) (+ 12288.0 (-> self root root-prim local-sphere w))) - (set! (-> gp-2 scale) (* 0.00008877841 (-> self draw bounds w))) + (set! (-> gp-2 scale) (/ (-> self draw bounds w) 11264)) (set! (-> gp-2 group) (-> *part-group-id-table* (-> self info explosion-part))) (set! (-> gp-2 collide-with) (collide-spec backgnd jak crate civilian enemy obstacle vehicle-sphere hit-by-others-list player-list pusher) @@ -172,7 +172,7 @@ (set! (-> gp-0 spawn-point quad) (-> self root trans quad)) (quaternion-identity! (-> gp-0 spawn-quat)) (set! (-> gp-0 radius) 4096.0) - (set! (-> gp-0 scale) (* 0.00008877841 (-> self draw bounds w))) + (set! (-> gp-0 scale) (/ (-> self draw bounds w) 11264)) (set! (-> gp-0 group) (-> *part-group-id-table* (-> self info explosion-part))) (set! (-> gp-0 collide-with) (collide-spec backgnd jak crate civilian enemy obstacle vehicle-sphere hit-by-others-list player-list pusher) diff --git a/goal_src/jak3/levels/desert/wvehicle/wvehicle.gc b/goal_src/jak3/levels/desert/wvehicle/wvehicle.gc index b358c1b5a1..7ceeae9307 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wvehicle.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wvehicle.gc @@ -738,13 +738,13 @@ (when (< 18.204445 (fabs (-> s5-0 0 fvec z))) (cond ((logtest? (-> s4-0 physics-model rear-wheel flags) (vehicle-wheel-flag vwf4)) - (set! (-> s5-0 1 rvec w) (/ (* 0.5 (-> s5-0 1 uvec z)) (sin (fabs (-> s5-0 0 fvec z))))) + (set! (-> s5-0 1 rvec w) (/ (/ (-> s5-0 1 uvec z) 2) (sin (fabs (-> s5-0 0 fvec z))))) (let ((f0-32 (- (* (-> s5-0 1 rvec w) (cos (fabs (-> s5-0 0 fvec z)))) (* 2.0 (+ (-> s4-0 physics-model rear-wheel local-pos x) (-> s4-0 physics-model rear-wheel susp-arm-length))) ) ) - (f1-22 (* 0.5 (-> s5-0 1 uvec z))) + (f1-22 (/ (-> s5-0 1 uvec z) 2)) ) (set! (-> s5-0 1 rvec z) (sqrtf (+ (* f1-22 f1-22) (* f0-32 f0-32)))) ) @@ -757,7 +757,7 @@ (- (-> s5-0 1 rvec w) (+ (-> s4-0 physics-model front-wheel local-pos x) (-> s4-0 physics-model front-wheel susp-arm-length) - (* -0.5 (-> s5-0 1 uvec y)) + (/ (-> s5-0 1 uvec y) -2) ) ) ) diff --git a/goal_src/jak3/levels/factory/car/hvehicle-physics.gc b/goal_src/jak3/levels/factory/car/hvehicle-physics.gc index fd87d3658d..90cd1d6fb9 100644 --- a/goal_src/jak3/levels/factory/car/hvehicle-physics.gc +++ b/goal_src/jak3/levels/factory/car/hvehicle-physics.gc @@ -187,8 +187,8 @@ (let ((f1-20 (fmax 0.0 f0-38))) (+! (-> this lift-thrust s2-1) f1-20) (when (logtest? (vehicle-flag flight-level-transition) (-> this v-flags)) - (+! (-> this roll-thrust 0) (* 0.05 f1-20)) - (+! (-> this roll-thrust 1) (* 0.05 f1-20)) + (+! (-> this roll-thrust 0) (/ f1-20 20)) + (+! (-> this roll-thrust 1) (/ f1-20 20)) ) ) (vector-reset! (-> arg1 force)) @@ -205,7 +205,7 @@ (and (> (-> this flight-level-index) 0) (< f0-40 0.0) (< (-> arg1 velocity y) 0.0)) ) (vector-reset! (-> arg1 force)) - (let ((f0-43 (* -0.25 (-> this info physics-model inv-lift-thruster-count))) + (let ((f0-43 (/ (-> this info physics-model inv-lift-thruster-count) -4)) (f1-28 arg0) ) (set! (-> arg1 force y) (* f0-43 (/ 1.0 f1-28) (-> this info info mass) (-> arg1 velocity y))) @@ -308,7 +308,7 @@ ) ) ) - (set! (-> arg1 impulse) (/ (* -0.5 (-> arg1 vel-dot-norm)) + (set! (-> arg1 impulse) (/ (/ (-> arg1 vel-dot-norm) -2) (* arg0 (+ (-> s3-0 info inv-mass) (vector-dot (-> arg1 normal) (-> arg1 tmp)))) ) ) diff --git a/goal_src/jak3/levels/factory/car/hvehicle-util.gc b/goal_src/jak3/levels/factory/car/hvehicle-util.gc index 9e9057021e..f2e965deef 100644 --- a/goal_src/jak3/levels/factory/car/hvehicle-util.gc +++ b/goal_src/jak3/levels/factory/car/hvehicle-util.gc @@ -306,7 +306,7 @@ (let* ((v1-1 (-> this rbody lin-velocity)) (f0-4 (sqrtf (+ (* (-> v1-1 x) (-> v1-1 x)) (* (-> v1-1 z) (-> v1-1 z))))) (f0-6 (/ (- arg0 f0-4) arg0)) - (f1-6 (* 0.005 f0-6)) + (f1-6 (/ f0-6 200)) ) (set! (-> this controls throttle) (fmax 0.0 (fmin 1.0 (+ (-> this controls throttle) f1-6)))) ) diff --git a/goal_src/jak3/levels/factory/car/hvehicle.gc b/goal_src/jak3/levels/factory/car/hvehicle.gc index 6913fca869..a9192998fe 100644 --- a/goal_src/jak3/levels/factory/car/hvehicle.gc +++ b/goal_src/jak3/levels/factory/car/hvehicle.gc @@ -896,7 +896,7 @@ (cond ((< f0-9 (* f1-8 f1-8)) (let ((f0-10 (vector-length (-> this root transv)))) - (seek! (-> this engine-power-factor) (* 0.000016276043 f0-10) (* 6.0 (seconds-per-frame))) + (seek! (-> this engine-power-factor) (/ f0-10 (meters 15)) (* 6.0 (seconds-per-frame))) ) (set! (-> this v-flags) (the-as vehicle-flag (logior (vehicle-flag sounds) (-> this v-flags)))) (rigid-body-object-method-38 this) @@ -1045,7 +1045,7 @@ (set! (-> this outgoing-attack-id) a0-18) ) ) - (let ((f0-11 (+ 0.5 (* 0.000024414063 (-> s5-0 mat trans x))))) + (let ((f0-11 (+ 0.5 (/ (-> s5-0 mat trans x) (meters 10))))) (when (send-event arg0 'attack @@ -1239,7 +1239,7 @@ (set! (-> gp-2 spawn-point quad) (-> self root trans quad)) (quaternion-identity! (-> gp-2 spawn-quat)) (set! (-> gp-2 radius) (+ 12288.0 (-> self root root-prim local-sphere w))) - (set! (-> gp-2 scale) (* 0.00008877841 (-> self draw bounds w))) + (set! (-> gp-2 scale) (/ (-> self draw bounds w) 11264)) (set! (-> gp-2 group) (-> *part-group-id-table* (-> self info explosion-part))) (set! (-> gp-2 collide-with) (collide-spec backgnd jak crate civilian enemy obstacle vehicle-sphere hit-by-others-list player-list pusher) diff --git a/goal_src/jak3/levels/factory/fac-robotank-turret.gc b/goal_src/jak3/levels/factory/fac-robotank-turret.gc index f97b970f94..b0d0479e83 100644 --- a/goal_src/jak3/levels/factory/fac-robotank-turret.gc +++ b/goal_src/jak3/levels/factory/fac-robotank-turret.gc @@ -180,7 +180,7 @@ (let ((f0-0 (vector-length (vector-! (new 'stack-no-clear 'vector) gp-0 s5-0))) (gp-1 (-> self sight-scale)) ) - (set! (-> gp-1 z) (* 0.000024414063 f0-0)) + (set! (-> gp-1 z) (/ f0-0 (meters 10))) (let ((f0-1 (lerp-scale 0.1 6.0 f0-0 61440.0 163840.0))) (set! (-> gp-1 x) f0-1) (set! (-> gp-1 y) f0-1) @@ -457,7 +457,7 @@ (let* ((f0-28 (fmax -16384.0 (fmin 16384.0 (- 16384.0 (acos (- (vector-dot gp-2 *y-vector*))))))) (f2-1 (- (-> self gun-elev-cam) f0-28)) (f1-12 (if (< f2-1 0.0) - (fmin 3640.889 (* (fabs (* 0.1 f2-1)) (-> self clock frames-per-second))) + (fmin 3640.889 (* (fabs (/ f2-1 10)) (-> self clock frames-per-second))) 910.2222 ) ) @@ -714,7 +714,8 @@ ) (logior! (-> self flags) (fac-robotank-turret-flag frt3)) (set! (-> self firing-sight-pos quad) (-> self sight-pos quad)) - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (let ((gp-2 (max 2 (min 3 (rand-vu-int-range 0 3))))) 0 (dotimes (s5-2 gp-2) @@ -741,7 +742,8 @@ ) ) (let ((f30-0 (rand-vu-float-range 0.05 0.43))) - (suspend-for (the int (* 300.0 f30-0))) + (suspend-for (the int (* 300.0 f30-0)) + ) ) ) ) @@ -759,7 +761,8 @@ ) ) ) - (suspend-for (the int (* 300.0 f30-1))) + (suspend-for (the int (* 300.0 f30-1)) + ) ) ) #f @@ -776,7 +779,8 @@ ) 0 (logior! (-> self draw status) (draw-control-status no-draw)) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (while (-> self child) (suspend) ) diff --git a/goal_src/jak3/levels/factory/fac-robotank.gc b/goal_src/jak3/levels/factory/fac-robotank.gc index 5c1948eebc..c1fb7c4b63 100644 --- a/goal_src/jak3/levels/factory/fac-robotank.gc +++ b/goal_src/jak3/levels/factory/fac-robotank.gc @@ -311,7 +311,7 @@ (f1-13 (- 1.0 f0-32)) ) 0.0 - (when (and (or (< f0-32 f26-0) (< f26-0 f1-13)) (time-elapsed? (-> self buzz-timer) (the int (* 0.5 f28-1)))) + (when (and (or (< f0-32 f26-0) (< f26-0 f1-13)) (time-elapsed? (-> self buzz-timer) (the int (/ f28-1 2)))) (let* ((gp-1 *target*) (a0-37 (if (type? gp-1 process-focusable) gp-1 @@ -492,7 +492,8 @@ ) :code (behavior () (logclear! (-> self flags) (robotank-flag r2)) - (suspend-for (seconds 0.1)) + (suspend-for (seconds 0.1) + ) (logior! (-> self flags) (robotank-flag r2)) (sleep-code) ) @@ -656,7 +657,8 @@ ) 0 (logior! (-> self draw status) (draw-control-status no-draw)) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) (while (-> self child) (suspend) ) diff --git a/goal_src/jak3/levels/factory/fac-tower.gc b/goal_src/jak3/levels/factory/fac-tower.gc index caefb816b0..c2a89e3c11 100644 --- a/goal_src/jak3/levels/factory/fac-tower.gc +++ b/goal_src/jak3/levels/factory/fac-tower.gc @@ -263,7 +263,8 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) ) :post ja-post ) @@ -820,7 +821,7 @@ (static-sound-name "gtower-openloop") (-> this rotate-sound) 1024 - (the int (* 1524.0 (+ 1.0 (* 0.00001 (-> this yawvel))))) + (the int (* 1524.0 (+ 1.0 (/ (-> this yawvel) 100000)))) 0 (sound-group) (-> this root trans) @@ -828,8 +829,8 @@ (sound-play-by-name (static-sound-name "gtower-blade") (-> this blade-sound) - (the int (* 1024.0 (fmax 0.0 (fmin 0.5 (* 0.00001 (-> this yawvel)))))) - (the int (* 1524.0 (+ 1.3 (* 0.00001 (-> this yawvel))))) + (the int (* 1024.0 (fmax 0.0 (fmin 0.5 (/ (-> this yawvel) 100000))))) + (the int (* 1524.0 (+ 1.3 (/ (-> this yawvel) 100000)))) 0 (sound-group) (-> this root trans) diff --git a/goal_src/jak3/levels/factory/factory-boss-states.gc b/goal_src/jak3/levels/factory/factory-boss-states.gc index 745bbd4c4c..40c00646f1 100644 --- a/goal_src/jak3/levels/factory/factory-boss-states.gc +++ b/goal_src/jak3/levels/factory/factory-boss-states.gc @@ -124,9 +124,9 @@ (quaternion-set! (-> self root quat) 0.0 - (sin (* 0.5 (-> self root-angle))) + (sin (/ (-> self root-angle) 2)) 0.0 - (cos (* 0.5 (-> self root-angle))) + (cos (/ (-> self root-angle) 2)) ) (none) ) diff --git a/goal_src/jak3/levels/factory/factory-manager.gc b/goal_src/jak3/levels/factory/factory-manager.gc index ff38a23a21..1f4f4821f5 100644 --- a/goal_src/jak3/levels/factory/factory-manager.gc +++ b/goal_src/jak3/levels/factory/factory-manager.gc @@ -712,7 +712,7 @@ (vector-normalize! s4-0 1.0) (vector-! s3-0 s2-0 (-> this pvel)) (set! (-> this pvel quad) (-> s2-0 quad)) - (vector-float*! s3-0 s3-0 (* 0.000016276043 f28-0)) + (vector-float*! s3-0 s3-0 (/ f28-0 (meters 15))) (cond ((< 0.0 (-> this blendpath)) (let ((v1-52 (new 'stack-no-clear 'vector))) diff --git a/goal_src/jak3/levels/factory/ffight-projectile.gc b/goal_src/jak3/levels/factory/ffight-projectile.gc index 021ebd67cd..6467ad4664 100644 --- a/goal_src/jak3/levels/factory/ffight-projectile.gc +++ b/goal_src/jak3/levels/factory/ffight-projectile.gc @@ -361,7 +361,7 @@ (launch-particles (-> *part-id-table* 2853) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f28-1 (* 0.000015258789 f30-0)) + (f28-1 (/ f30-0 (meters 16))) (f30-1 (-> *part-id-table* 2854 init-specs 3 initial-valuef)) ) (-> *part-id-table* 2854 init-specs 4 initial-valuef) diff --git a/goal_src/jak3/levels/factory/ftank-projectile.gc b/goal_src/jak3/levels/factory/ftank-projectile.gc index aa3befe9c5..f292474166 100644 --- a/goal_src/jak3/levels/factory/ftank-projectile.gc +++ b/goal_src/jak3/levels/factory/ftank-projectile.gc @@ -291,7 +291,7 @@ (launch-particles (-> *part-id-table* 2868) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f28-1 (* 0.000015258789 f30-0)) + (f28-1 (/ f30-0 (meters 16))) (f30-1 (-> *part-id-table* 2869 init-specs 3 initial-valuef)) ) (-> *part-id-table* 2869 init-specs 4 initial-valuef) diff --git a/goal_src/jak3/levels/factory/fturret-projectile.gc b/goal_src/jak3/levels/factory/fturret-projectile.gc index 0522cd5089..b082f22efd 100644 --- a/goal_src/jak3/levels/factory/fturret-projectile.gc +++ b/goal_src/jak3/levels/factory/fturret-projectile.gc @@ -397,7 +397,7 @@ (launch-particles (-> *part-id-table* 2880) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000027126736 f30-0)) + (f26-0 (/ f30-0 (meters 9))) (f30-1 (-> *part-id-table* 2881 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 2881 init-specs 4 initial-valuef)) ) diff --git a/goal_src/jak3/levels/factory/h-warf.gc b/goal_src/jak3/levels/factory/h-warf.gc index dc1032fe4d..7813833d0d 100644 --- a/goal_src/jak3/levels/factory/h-warf.gc +++ b/goal_src/jak3/levels/factory/h-warf.gc @@ -494,13 +494,13 @@ ) ((< arg0 1638400.0) (let ((f0-15 (- 1.0 (* 0.0000034877232 (- 1638400.0 arg0))))) - (set! (-> v0-0 x) (+ 1.0 (* -0.5 f0-15))) + (set! (-> v0-0 x) (+ 1.0 (/ f0-15 -2))) (set! (-> v0-0 y) (+ 1.0 (* 0.0 f0-15))) ) ) ((< arg0 1761280.0) (let ((f0-20 (- 1.0 (* 0.000008138021 (- 1761280.0 arg0))))) - (set! (-> v0-0 x) (+ 0.5 (* -0.5 f0-20))) + (set! (-> v0-0 x) (+ 0.5 (/ f0-20 -2))) (set! (-> v0-0 y) (+ 1.0 (* 0.0 f0-20))) ) ) @@ -760,7 +760,7 @@ (t9-0 this) ) 0.0 - (let ((f0-2 (+ 1.0 (fmax 0.0 (fmin 1.0 (* 0.0000024414062 (-> this speed))))))) + (let ((f0-2 (+ 1.0 (fmax 0.0 (fmin 1.0 (/ (-> this speed) (meters 100))))))) (sound-play-by-name (static-sound-name "hellcat-engine") (-> this engine-sound) @@ -804,7 +804,7 @@ (static-sound-name "hellcat-bank") (-> this wind-noise-sound) (the int (* 1024.0 (-> this wind))) - (the int (* 1524.0 (+ 0.7 (* 0.25 (-> this wind))))) + (the int (* 1524.0 (+ 0.7 (/ (-> this wind) 4)))) 0 (sound-group) (-> this root trans) @@ -1199,7 +1199,7 @@ (set! (-> s5-0 z) (fabs (-> s5-0 z))) 0.0 (let* ((f1-1 (atan (-> s2-0 x) (- (-> s2-0 z)))) - (f30-0 (fmax -1.0 (fmin 1.0 (* 0.000030517578 f1-1)))) + (f30-0 (fmax -1.0 (fmin 1.0 (/ f1-1 (meters 8))))) ) (matrix-transpose! s3-0 (-> this rbody matrix)) (vector-rotate*! arg0 (-> this forward) s3-0) @@ -1335,7 +1335,7 @@ (set-vector! s3-0 4096.0 0.0 0.0 1.0) 0.0 (let ((s1-2 (new 'stack-no-clear 'matrix))) - (let ((f0-76 (* 16384.0 (fmax -1.0 (fmin 1.0 (* 0.0000000012207031 (-> this rbody ang-velocity y) (fabs f30-1)))))) + (let ((f0-76 (* 16384.0 (fmax -1.0 (fmin 1.0 (* (/ (-> this rbody ang-velocity y) (meters 200000)) (fabs f30-1)))))) ) (matrix-rotate-y! s1-2 f0-76) ) @@ -1588,7 +1588,7 @@ (set! (-> this outgoing-attack-id) a0-18) ) ) - (let ((f0-10 (+ 0.5 (* 0.000024414063 (-> s5-0 impulse))))) + (let ((f0-10 (+ 0.5 (/ (-> s5-0 impulse) (meters 10))))) (when (send-event arg0 'attack diff --git a/goal_src/jak3/levels/factory/missile-bot.gc b/goal_src/jak3/levels/factory/missile-bot.gc index a95b5320c6..9b01d3ac2d 100644 --- a/goal_src/jak3/levels/factory/missile-bot.gc +++ b/goal_src/jak3/levels/factory/missile-bot.gc @@ -546,7 +546,7 @@ ) (vector-! gp-0 gp-0 (-> self root trans)) (let* ((f0-2 (vector-length gp-0)) - (f30-0 (fmin 16384.0 (* 0.2 f0-2))) + (f30-0 (fmin 16384.0 (/ f0-2 5))) (f0-3 (missile-bot-get-kick-time f0-2)) ) (vector+! gp-0 gp-0 (-> self root trans)) diff --git a/goal_src/jak3/levels/factory/warf-projectile.gc b/goal_src/jak3/levels/factory/warf-projectile.gc index 97f3945447..678198d642 100644 --- a/goal_src/jak3/levels/factory/warf-projectile.gc +++ b/goal_src/jak3/levels/factory/warf-projectile.gc @@ -407,7 +407,7 @@ (warf-projectile-method-42 this s3-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix))) - (fmin 1.0 (* 0.0000061035157 f30-0)) + (fmin 1.0 (/ f30-0 (meters 40))) (-> *part-id-table* 2895 init-specs 3 initial-valuef) (forward-up->inv-matrix s4-1 s5-1 *up-vector*) (set! (-> s4-1 trans quad) (-> gp-0 quad)) @@ -1003,7 +1003,7 @@ (launch-part this s3-0) ) (let ((s3-1 (new 'stack-no-clear 'matrix)) - (f30-1 (fmin 1.0 (* 0.000008138021 f30-0))) + (f30-1 (fmin 1.0 (/ f30-0 (meters 30)))) (f28-0 (-> *part-id-table* 2895 init-specs 3 initial-valuef)) ) (forward-up->inv-matrix s3-1 s4-1 *up-vector*) diff --git a/goal_src/jak3/levels/forest/for-turret-shot.gc b/goal_src/jak3/levels/forest/for-turret-shot.gc index c16e115185..b386e83ce6 100644 --- a/goal_src/jak3/levels/forest/for-turret-shot.gc +++ b/goal_src/jak3/levels/forest/for-turret-shot.gc @@ -374,7 +374,7 @@ (launch-particles (-> *part-id-table* 1066) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000008138021 f30-0)) + (f26-0 (/ f30-0 (meters 30))) (f30-1 (-> *part-id-table* 1067 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 1067 init-specs 5 initial-valuef)) ) diff --git a/goal_src/jak3/levels/forest/for-turret.gc b/goal_src/jak3/levels/forest/for-turret.gc index f652170e99..28fafd5f13 100644 --- a/goal_src/jak3/levels/forest/for-turret.gc +++ b/goal_src/jak3/levels/forest/for-turret.gc @@ -285,7 +285,7 @@ ) (vector-cvt.w.s! (the-as vector (-> this sprites 28 color-ptr)) sv-312) (set! (-> this sprites 28 color w) - (the int (* 0.0078125 (-> this fade-interp) (lerp-scale 0.0 128.0 f30-0 1820.4445 3640.889))) + (the int (* (/ (-> this fade-interp) 128) (lerp-scale 0.0 128.0 f30-0 1820.4445 3640.889))) ) ) (let ((s2-6 set-as-offset-from!) diff --git a/goal_src/jak3/levels/forest/foresta-obs.gc b/goal_src/jak3/levels/forest/foresta-obs.gc index 139f16de22..dfb30043ee 100644 --- a/goal_src/jak3/levels/forest/foresta-obs.gc +++ b/goal_src/jak3/levels/forest/foresta-obs.gc @@ -469,7 +469,7 @@ (let ((f0-7 1.0)) (let ((f1-3 (- (-> self extend-height) (-> self root trans y)))) (if (< f1-3 4096.0) - (set! f0-7 (* 0.00024414062 f1-3)) + (set! f0-7 (/ f1-3 METER_LENGTH)) ) ) (sound-play-by-name diff --git a/goal_src/jak3/levels/glider/glider-manager.gc b/goal_src/jak3/levels/glider/glider-manager.gc index 4e1ea1abc0..7a48379f2e 100644 --- a/goal_src/jak3/levels/glider/glider-manager.gc +++ b/goal_src/jak3/levels/glider/glider-manager.gc @@ -1097,7 +1097,7 @@ (b! (not s3-1) cfg-86 :delay (nop!)) (let ((f0-16 (vector-vector-xz-distance (-> s3-1 rbody matrix trans) (-> s5-2 pos)))) (let ((f1-1 (- (-> s3-1 rbody matrix trans y) (-> s5-2 pos y)))) - (if (< (* 0.5 (-> s5-2 hheight)) f1-1) + (if (< (/ (-> s5-2 hheight) 2) f1-1) (set! (-> s5-2 hheight) (* 2.0 f1-1)) ) ) @@ -1107,7 +1107,7 @@ (when (not (cpad-hold? 0 r2)) (vector+! s4-3 (-> s3-1 rbody matrix trans) (-> s5-2 pos)) (vector-float*! (-> s5-2 pos) s4-3 0.5) - (set! (-> s5-2 pos w) (* 0.5 f0-16)) + (set! (-> s5-2 pos w) (/ f0-16 2)) (set! (-> s5-2 thermal-time) (- (current-time) (-> this thermal-start-time))) (set! (-> this creating-thermal?) #f) ) @@ -1220,10 +1220,10 @@ (set! (-> arg0 min-thermal-time) (-> s3-0 thermal-time)) (set! (-> this last-active-thermal) s2-0) ) - (if (< (-> s4-1 y) (- (+ (-> s3-0 pos y) (-> s3-0 hheight)) (* 0.5 (-> s3-0 hheight)))) + (if (< (-> s4-1 y) (- (+ (-> s3-0 pos y) (-> s3-0 hheight)) (/ (-> s3-0 hheight) 2))) (set! (-> arg0 thermal-strength) 1.0) (set! (-> arg0 thermal-strength) - (/ (- (+ (-> s3-0 pos y) (-> s3-0 hheight)) (-> s4-1 y)) (* 0.5 (-> s3-0 hheight))) + (/ (- (+ (-> s3-0 pos y) (-> s3-0 hheight)) (-> s4-1 y)) (/ (-> s3-0 hheight) 2)) ) ) ) diff --git a/goal_src/jak3/levels/glider/h-glider.gc b/goal_src/jak3/levels/glider/h-glider.gc index 9aefd05241..164ca02e6a 100644 --- a/goal_src/jak3/levels/glider/h-glider.gc +++ b/goal_src/jak3/levels/glider/h-glider.gc @@ -982,7 +982,7 @@ (set-vector! s3-0 4096.0 0.0 0.0 1.0) 0.0 (let ((s1-3 (new 'stack-no-clear 'matrix))) - (let ((f0-56 (* 16384.0 (fmax -1.0 (fmin 1.0 (* 0.0000000012207031 (-> this rbody ang-velocity y) (fabs f30-2)))))) + (let ((f0-56 (* 16384.0 (fmax -1.0 (fmin 1.0 (* (/ (-> this rbody ang-velocity y) (meters 200000)) (fabs f30-2)))))) ) (matrix-rotate-y! s1-3 f0-56) ) diff --git a/goal_src/jak3/levels/hiphog/ltnfxhip-texture.gc b/goal_src/jak3/levels/hiphog/ltnfxhip-texture.gc index 530c626bc5..a97a062694 100644 --- a/goal_src/jak3/levels/hiphog/ltnfxhip-texture.gc +++ b/goal_src/jak3/levels/hiphog/ltnfxhip-texture.gc @@ -163,8 +163,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) diff --git a/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc b/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc index 9c7991e8f7..c042cb3c21 100644 --- a/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc +++ b/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc @@ -237,7 +237,8 @@ ) 0 (logior! (-> self draw status) (draw-control-status no-draw)) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (while *scene-player* (suspend) ) @@ -274,7 +275,8 @@ (part-tracker-spawn part-tracker :to *entity-pool* :group (-> *part-group-id-table* 325) :mat-joint gp-1) ) ) - (suspend-for (seconds 0.1)) + (suspend-for (seconds 0.1) + ) (logior! (-> self draw status) (draw-control-status no-draw)) (let ((t0-2 (res-lump-struct (-> self entity) 'camera-name structure))) (if t0-2 @@ -792,7 +794,7 @@ (cspace<-parented-transformq-joint! arg0 arg1) (dotimes (s4-0 (length *dark-eco-tower-waves*)) (let* ((s3-0 (-> *dark-eco-tower-waves* s4-0)) - (f0-2 (- (* 0.000012207031 (-> arg0 bone transform trans y)) + (f0-2 (- (/ (-> arg0 bone transform trans y) (meters 20)) (* 0.0033333334 (the float (current-time)) (-> s3-0 freq)) ) ) diff --git a/goal_src/jak3/levels/mine/gekko.gc b/goal_src/jak3/levels/mine/gekko.gc index 5da6f47688..1a82bb3696 100644 --- a/goal_src/jak3/levels/mine/gekko.gc +++ b/goal_src/jak3/levels/mine/gekko.gc @@ -1673,7 +1673,7 @@ :event enemy-event-handler :enter (behavior () (set! (-> self move-speed) (vector-length (-> self root transv))) - (set! (-> self move-decel) (fmax 163840.0 (* 0.00012207031 (-> self move-speed) (-> self move-speed)))) + (set! (-> self move-decel) (fmax 163840.0 (* (/ (-> self move-speed) (meters 2)) (-> self move-speed)))) (set-time! (-> self state-time)) ) :trans (behavior () @@ -1948,7 +1948,8 @@ (ja-channel-push! 1 (seconds 0.4)) (ja-no-eval :group! gekko-run0-a-ja :num! (seek!) :frame-num 0.0) (enable-ragdoll! (-> (the-as ragdoll-proc (handle->process (-> self ragdoll-proc))) ragdoll) self) - (suspend-for (seconds 0.4)) + (suspend-for (seconds 0.4) + ) (if (enemy-method-109 self) (go-die self) (go-hostile self) @@ -2012,7 +2013,7 @@ ) (set! (-> a0-2 0 quad) (-> s3-0 trans quad)) (set! (-> a0-2 0 w) - (+ 409.6 sv-560 (sqrtf (+ (* 25600.0 (-> gp-0 scale) (-> gp-0 scale)) (* 0.25 f30-0 f30-0)))) + (+ 409.6 sv-560 (sqrtf (+ (* 25600.0 (-> gp-0 scale) (-> gp-0 scale)) (* (/ f30-0 4) f30-0)))) ) (let ((a1-6 s2-0)) (set! (-> a1-6 best-dist) (the-as float a0-2)) @@ -2044,7 +2045,7 @@ ) ) ) - (vector+float*! (-> s2-0 start-pos) sv-1008 v1-28 (* 0.5 f30-0)) + (vector+float*! (-> s2-0 start-pos) sv-1008 v1-28 (/ f30-0 2)) (vector-float*! (-> s2-0 move-dist) v1-28 (- f30-0)) ) (let ((v1-29 s2-0)) @@ -2640,6 +2641,7 @@ ) ) +;; WARN: Return type mismatch symbol vs object. (defmethod ragdoll-settled? ((this gekko)) (local-vars (v1-18 gekko-shadow-spot)) (let ((s5-0 (handle->process (-> this ragdoll-proc)))) diff --git a/goal_src/jak3/levels/mine/manta.gc b/goal_src/jak3/levels/mine/manta.gc index 910922cf37..27c7f541d0 100644 --- a/goal_src/jak3/levels/mine/manta.gc +++ b/goal_src/jak3/levels/mine/manta.gc @@ -1204,7 +1204,7 @@ ) (vector-! (-> this move-matrix trans) (-> this focus-pos) (-> this move-matrix uvec)) (vector-normalize! (-> this move-matrix trans) 24576.0) - (set! (-> this move-matrix trans y) (* -0.5 (-> this move-matrix trans y))) + (set! (-> this move-matrix trans y) (/ (-> this move-matrix trans y) -2)) (matrix*! (-> this curve-matrix) *hermite-matrix* (-> this move-matrix)) 0 (none) diff --git a/goal_src/jak3/levels/mine/mine-obs.gc b/goal_src/jak3/levels/mine/mine-obs.gc index 89bfeef6ec..bad64de41d 100644 --- a/goal_src/jak3/levels/mine/mine-obs.gc +++ b/goal_src/jak3/levels/mine/mine-obs.gc @@ -569,7 +569,8 @@ (suspend) (ja :num! (seek! max 0.03)) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (go-virtual inactive) ) :post (behavior () @@ -616,7 +617,7 @@ (the float (sar (shl - (the int (+ (-> this wheel-angle) (* 182.04445 (seconds-per-frame) (* 0.00024414062 (-> this ang-momentum))))) + (the int (+ (-> this wheel-angle) (* 182.04445 (seconds-per-frame) (/ (-> this ang-momentum) METER_LENGTH)))) 48 ) 48 @@ -1318,7 +1319,8 @@ ) ) :code (behavior () - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (let ((a1-0 (new 'stack-no-clear 'array 'symbol 3))) (set! (-> a1-0 2) 'mine6) (set! (-> a1-0 1) 'mine5) @@ -1634,7 +1636,8 @@ :virtual #t :code (behavior () (sound-play "floor-switch") - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (when (not (task-node-closed? (game-task-node mine-blow-introduction))) (let ((a1-1 (new 'stack-no-clear 'array 'symbol 3))) (set! (-> a1-1 2) 'mine6) diff --git a/goal_src/jak3/levels/mine/prebot-extras.gc b/goal_src/jak3/levels/mine/prebot-extras.gc index 95036467b8..e64214880a 100644 --- a/goal_src/jak3/levels/mine/prebot-extras.gc +++ b/goal_src/jak3/levels/mine/prebot-extras.gc @@ -494,7 +494,7 @@ ) ) ) - (let ((f0-13 (* 0.002 f28-0))) + (let ((f0-13 (/ f28-0 500))) (fmin 0.1 f0-13) ) (let ((f28-4 (+ 0.0 @@ -505,7 +505,7 @@ ) ) (when (-> self use-pos-pitch) - (+! f28-4 (* 0.2 f26-0)) + (+! f28-4 (/ f26-0 5)) (when (and (-> self allow-whoosh) (< (fabs (-> s3-2 x)) (-> self whoosh-lead))) (set! (-> self allow-whoosh) #f) (sound-play "sword-whoosh-by" :position gp-0) diff --git a/goal_src/jak3/levels/mine/prebot-states.gc b/goal_src/jak3/levels/mine/prebot-states.gc index fc0e581337..82fd54f059 100644 --- a/goal_src/jak3/levels/mine/prebot-states.gc +++ b/goal_src/jak3/levels/mine/prebot-states.gc @@ -123,7 +123,6 @@ ) ) -;; WARN: Return type mismatch none vs object. (defbehavior prebot-common prebot () (dotimes (gp-0 20) (cond @@ -1028,7 +1027,7 @@ ) (if (= f30-0 0.0) (prebot-light-pulse-off) - (prebot-light-pulse-on (+ 0.2 (* 0.1 f30-0)) (+ 0.1 (* 0.04 f30-0)) 0.0) + (prebot-light-pulse-on (+ 0.2 (/ f30-0 10)) (+ 0.1 (/ f30-0 25)) 0.0) ) ) (when (>= (-> self num-attacks) (the-as uint (min 5 (-> gp-0 length)))) @@ -2519,6 +2518,7 @@ (none) ) +;; WARN: Return type mismatch connection vs none. (defmethod set-time-limit ((this task-manager-prebot)) (let ((t9-0 (method-of-type task-manager set-time-limit))) (t9-0 this) diff --git a/goal_src/jak3/levels/mine/rat.gc b/goal_src/jak3/levels/mine/rat.gc index 259301b9d4..cfdcfb3bd0 100644 --- a/goal_src/jak3/levels/mine/rat.gc +++ b/goal_src/jak3/levels/mine/rat.gc @@ -961,7 +961,7 @@ (seek-toward-heading-vec! (-> self root) (-> self face-dir) - (* 0.5 (-> self nav max-rotation-rate)) + (/ (-> self nav max-rotation-rate) 2) (seconds 0.02) ) (nav-enemy-simple-post) @@ -1996,7 +1996,8 @@ (logior! (-> self entity extra perm status) (entity-perm-status subtask-complete)) ) :code (behavior () - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (while (-> self child) (suspend) ) diff --git a/goal_src/jak3/levels/nest/egg-spider.gc b/goal_src/jak3/levels/nest/egg-spider.gc index bacb680b75..6af228fd12 100644 --- a/goal_src/jak3/levels/nest/egg-spider.gc +++ b/goal_src/jak3/levels/nest/egg-spider.gc @@ -732,7 +732,7 @@ s5-1 s5-1 gp-0 - (* (fmax 0.5 (* 0.00024414062 (-> arg0 state speed))) (seconds-per-frame)) + (* (fmax 0.5 (/ (-> arg0 state speed) METER_LENGTH)) (seconds-per-frame)) ) ) 0 @@ -841,7 +841,7 @@ (set-time! (-> this last-change-dir)) (set! (-> this change-dir-time) (rand-vu-int-range (seconds 0.5) (seconds 0.7))) (let ((s3-2 (new 'stack-no-clear 'vector)) - (f0-14 (* 0.5 f30-0 (tan (-> this move-angle)))) + (f0-14 (* (/ f30-0 2) (tan (-> this move-angle)))) (s2-1 (new 'stack-no-clear 'vector)) ) (if (-> this heading) @@ -1330,7 +1330,8 @@ (part-tracker-spawn part-tracker :to *entity-pool* :group (-> *part-group-id-table* 639)) ) ) - (suspend-for (seconds 0.6)) + (suspend-for (seconds 0.6) + ) (let ((v1-38 (-> self root root-prim))) (set! (-> v1-38 prim-core collide-as) (-> self root backup-collide-as)) (set! (-> v1-38 prim-core collide-with) (-> self root backup-collide-with)) @@ -1353,7 +1354,8 @@ ) ) ) - (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6)))) + (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6))) + ) (ja-channel-push! 1 0) (ja-no-eval :group! egg-spider-crawl-from-ground-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) diff --git a/goal_src/jak3/levels/nest/mh-centipede.gc b/goal_src/jak3/levels/nest/mh-centipede.gc index f6374f896b..236f8b3a02 100644 --- a/goal_src/jak3/levels/nest/mh-centipede.gc +++ b/goal_src/jak3/levels/nest/mh-centipede.gc @@ -760,10 +760,10 @@ (v1-3 (-> self entity extra perm)) ) (logior! (-> v1-3 status) (entity-perm-status bit-5)) - (set! (-> v1-3 user-int16 0) (the int (* 0.00024414062 (-> (the-as vector a1-1) x)))) - (set! (-> v1-3 user-int16 1) (the int (* 0.00024414062 (-> (the-as vector a1-1) z)))) - (set! (-> v1-3 user-int16 2) (the int (* 0.00024414062 (-> (the-as vector a0-3) x)))) - (set! (-> v1-3 user-int16 3) (the int (* 0.00024414062 (-> (the-as vector a0-3) z)))) + (set! (-> v1-3 user-int16 0) (the int (/ (-> (the-as vector a1-1) x) METER_LENGTH))) + (set! (-> v1-3 user-int16 1) (the int (/ (-> (the-as vector a1-1) z) METER_LENGTH))) + (set! (-> v1-3 user-int16 2) (the int (/ (-> (the-as vector a0-3) x) METER_LENGTH))) + (set! (-> v1-3 user-int16 3) (the int (/ (-> (the-as vector a0-3) z) METER_LENGTH))) ) (logclear! (-> self mask) (process-mask actor-pause)) (go-virtual idle) @@ -1858,7 +1858,7 @@ (set! f0-14 (-> v1-50 damage)) ) (if (and (-> self next-state) (= (-> self next-state name) 'shooting)) - (set! f0-14 (* 0.5 f0-14)) + (set! f0-14 (/ f0-14 2)) ) (if (logtest? (-> *game-info* secrets) (game-secrets hero-mode)) (set! f0-14 (* 0.6666667 f0-14)) @@ -2200,7 +2200,7 @@ (when (nonzero? (-> self breach-part)) (let ((f30-0 (-> *part-id-table* 2499 init-specs 2 initial-valuef))) (set! (-> *part-id-table* 2499 init-specs 2 initial-valuef) - (lerp-scale f30-0 (* 0.1 f30-0) (the float (- (current-time) (-> self state-time))) 0.0 150.0) + (lerp-scale f30-0 (/ f30-0 10) (the float (- (current-time) (-> self state-time))) 0.0 150.0) ) (spawn (-> self breach-part) (-> self launch-position)) (set! (-> *part-id-table* 2499 init-specs 2 initial-valuef) f30-0) @@ -2368,7 +2368,7 @@ (f28-1 (-> *part-id-table* 2508 init-specs 2 initial-valuef)) ) (set! (-> *part-id-table* 2507 init-specs 2 initial-valuef) - (lerp-scale f30-10 (* 0.05 f30-10) (the float (- (current-time) (-> self nose-smack-time))) 0.0 30.0) + (lerp-scale f30-10 (/ f30-10 20) (the float (- (current-time) (-> self nose-smack-time))) 0.0 30.0) ) (set! (-> *part-id-table* 2508 init-specs 2 initial-valuef) (lerp-scale f28-1 (* 0.0 f28-1) (the float (- (current-time) (-> self nose-smack-time))) 0.0 150.0) @@ -2486,7 +2486,7 @@ (when (nonzero? (-> self breach-part)) (let ((f30-1 (-> *part-id-table* 2499 init-specs 2 initial-valuef))) (set! (-> *part-id-table* 2499 init-specs 2 initial-valuef) - (lerp-scale f30-1 (* 0.1 f30-1) (the float (- (current-time) (-> self state-time))) 0.0 150.0) + (lerp-scale f30-1 (/ f30-1 10) (the float (- (current-time) (-> self state-time))) 0.0 150.0) ) (spawn (-> self breach-part) (-> self launch-position)) (set! (-> *part-id-table* 2499 init-specs 2 initial-valuef) f30-1) @@ -2652,7 +2652,7 @@ (f28-1 (-> *part-id-table* 2508 init-specs 2 initial-valuef)) ) (set! (-> *part-id-table* 2507 init-specs 2 initial-valuef) - (lerp-scale f30-11 (* 0.05 f30-11) (the float (- (current-time) (-> self nose-smack-time))) 0.0 30.0) + (lerp-scale f30-11 (/ f30-11 20) (the float (- (current-time) (-> self nose-smack-time))) 0.0 30.0) ) (set! (-> *part-id-table* 2508 init-specs 2 initial-valuef) (lerp-scale f28-1 (* 0.0 f28-1) (the float (- (current-time) (-> self nose-smack-time))) 0.0 150.0) diff --git a/goal_src/jak3/levels/precursor/precura-obs2.gc b/goal_src/jak3/levels/precursor/precura-obs2.gc index adfe87a2e2..8735b4b8ee 100644 --- a/goal_src/jak3/levels/precursor/precura-obs2.gc +++ b/goal_src/jak3/levels/precursor/precura-obs2.gc @@ -367,7 +367,7 @@ ) ) ) - (vector-float*! (-> s4-0 transv) s3-0 (* 0.1 (-> self clock frames-per-second))) + (vector-float*! (-> s4-0 transv) s3-0 (/ (-> self clock frames-per-second) 10)) ) (let ((v1-35 (-> s4-0 root-prim))) (set! (-> v1-35 prim-core collide-as) (-> s4-0 backup-collide-as)) @@ -908,7 +908,7 @@ (set! (-> gp-1 quad) (-> self root transv quad)) (let ((f0-9 32768.0)) (set! (-> gp-1 y) 0.0) - (let* ((f0-11 (* 0.000048828126 f0-9 (vector-length gp-1))) + (let* ((f0-11 (* (/ f0-9 (meters 5)) (vector-length gp-1))) (f30-0 (fmin 32768.0 f0-11)) ) (vector-normalize! gp-1 1.0) @@ -918,7 +918,7 @@ ) ) (quaternion*! (-> self root quat) (-> self spin-quat) (-> self root quat)) - (if (< (* 0.00024414062 (-> self root trans y)) 500.0) + (if (< (/ (-> self root trans y) METER_LENGTH) 500.0) (go-virtual explode) ) ) @@ -1658,7 +1658,8 @@ (let ((gp-0 (res-lump-data (-> self entity) 'actor-groups pointer :tag-ptr (& sv-16)))) (cond ((and gp-0 (nonzero? (-> sv-16 elt-count))) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (set! (-> self actor-group-count) (the-as int (-> sv-16 elt-count))) (set! (-> self actor-group) (the-as (pointer actor-group) gp-0)) (dotimes (gp-1 (length (-> self actor-group 0))) diff --git a/goal_src/jak3/levels/sewer/mh-wasp.gc b/goal_src/jak3/levels/sewer/mh-wasp.gc index 4f7cde4335..1f7173a2ea 100644 --- a/goal_src/jak3/levels/sewer/mh-wasp.gc +++ b/goal_src/jak3/levels/sewer/mh-wasp.gc @@ -830,7 +830,8 @@ 0 (set! (-> self hit-points) 0.0) (do-effect (-> self skel effect) (the-as string 'death-default) 0.0 -1) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (send-event self 'death-end) (cleanup-for-death self) ) @@ -972,10 +973,10 @@ (-> arg0 thrust s3-0) (+ (* 0.4 (fmax 0.0 (* (-> v0-6 x) s0-0))) (fmax 0.0 (-> v0-6 y)) - (fabs (* 0.2 (-> v0-6 z))) + (fabs (/ (-> v0-6 z) 5)) (fmax 0.0 (-> s1-1 y)) ) - (* 0.2 f30-0) + (/ f30-0 5) ) ) ) @@ -999,7 +1000,7 @@ (set! (-> *part-id-table* 5032 init-specs 0 initial-valuef) (* f24-0 f0-15)) (set! (-> arg0 thrust s3-0) f28-0) (let ((f0-16 (* f26-0 f0-15))) - (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 uvec) (* -0.5 f0-16)) + (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 uvec) (/ f0-16 -2)) ) ) ) diff --git a/goal_src/jak3/levels/sewer/saberfish.gc b/goal_src/jak3/levels/sewer/saberfish.gc index 40018d8bb2..9ce24bde58 100644 --- a/goal_src/jak3/levels/sewer/saberfish.gc +++ b/goal_src/jak3/levels/sewer/saberfish.gc @@ -1553,7 +1553,7 @@ ) ) (until #f - (let* ((f0-1 (* 0.000061035156 (-> self swim-final-rotate-deg))) + (let* ((f0-1 (/ (-> self swim-final-rotate-deg) (meters 4))) (f0-2 (fmin 1.0 f0-1)) ) (let ((v1-19 (-> self skel root-channel 0)) @@ -3166,7 +3166,8 @@ ) (ja-channel-push! 1 0) (ja-no-eval :group! saberfish-flip-up-start-ja :num! (seek!) :frame-num 0.0) - (suspend-for (seconds 0.4)) + (suspend-for (seconds 0.4) + ) (ja-channel-push! 1 0) (ja-no-eval :group! saberfish-flip-up-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) @@ -3467,6 +3468,7 @@ ) ) +;; WARN: Return type mismatch symbol vs object. (defmethod ragdoll-settled? ((this saberfish)) (let* ((s5-0 (handle->process (-> this ragdoll-proc))) (v0-0 diff --git a/goal_src/jak3/levels/sewer/sew-laser-turret.gc b/goal_src/jak3/levels/sewer/sew-laser-turret.gc index 9d7dbdcc0a..0e05e2d75e 100644 --- a/goal_src/jak3/levels/sewer/sew-laser-turret.gc +++ b/goal_src/jak3/levels/sewer/sew-laser-turret.gc @@ -514,7 +514,7 @@ (let ((a1-3 (new 'stack-no-clear 'vector))) (-> a0-2 y) (set! (-> a1-3 quad) (-> this node-list data arg1 bone transform fvec quad)) - (set! (-> a1-3 y) (* 0.5 (-> a1-3 y))) + (set! (-> a1-3 y) (/ (-> a1-3 y) 2)) (fire-laser! a0-2 a1-3 (the-as sew-laser-guard this) 491520.0) ) ) @@ -1054,9 +1054,12 @@ (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) (+! (-> gp-1 y) 10240.0) - (suspend-for (seconds 2) (spawn (-> self part) gp-1)) + (suspend-for (seconds 2) + (spawn (-> self part) gp-1) + ) + ) + (suspend-for (seconds 1) ) - (suspend-for (seconds 1)) (send-event self 'death-end) (while (-> self child) (suspend) diff --git a/goal_src/jak3/levels/sewer/sew-whirlpool.gc b/goal_src/jak3/levels/sewer/sew-whirlpool.gc index 74c9e15315..6fe243672b 100644 --- a/goal_src/jak3/levels/sewer/sew-whirlpool.gc +++ b/goal_src/jak3/levels/sewer/sew-whirlpool.gc @@ -32,7 +32,7 @@ (let* ((f26-0 (* 0.000016276043 (- 61440.0 f30-0))) (f24-0 98304.0) (f0-6 (atan (- (-> gp-0 x) (-> self root trans x)) (- (-> gp-0 z) (-> self root trans z)))) - (f28-0 (* 0.5 f26-0 f24-0 (seconds-per-frame))) + (f28-0 (* (/ f26-0 2) f24-0 (seconds-per-frame))) (f22-0 (+ f0-6 f28-0)) (f26-1 (- f30-0 (fmin f30-0 (* 0.16874999 f26-0 (fabs f24-0) (seconds-per-frame))))) (s5-0 (new 'stack-no-clear 'vector)) diff --git a/goal_src/jak3/levels/sewer/sewer-move-turret.gc b/goal_src/jak3/levels/sewer/sewer-move-turret.gc index 0de2b21437..c15d9ded2e 100644 --- a/goal_src/jak3/levels/sewer/sewer-move-turret.gc +++ b/goal_src/jak3/levels/sewer/sewer-move-turret.gc @@ -121,7 +121,7 @@ (let ((f1-1 1228.8)) (cond ((< f0-0 5.0) - (set! f1-1 (* 0.2 f0-0 f1-1)) + (set! f1-1 (* (/ f0-0 5) f1-1)) ) ((< 40.0 f0-0) (set! f1-1 (* 0.2 (- 45.0 f0-0) f1-1)) diff --git a/goal_src/jak3/levels/stadium/dm-mine-spider.gc b/goal_src/jak3/levels/stadium/dm-mine-spider.gc index 8504fa710b..0b9d5186e3 100644 --- a/goal_src/jak3/levels/stadium/dm-mine-spider.gc +++ b/goal_src/jak3/levels/stadium/dm-mine-spider.gc @@ -730,7 +730,7 @@ s5-1 s5-1 gp-0 - (* (fmax 0.5 (* 0.00024414062 (-> arg0 state speed))) (seconds-per-frame)) + (* (fmax 0.5 (/ (-> arg0 state speed) METER_LENGTH)) (seconds-per-frame)) ) ) 0 @@ -1055,14 +1055,16 @@ (set-time! (-> self state-time)) ) :code (behavior () - (suspend-for (seconds 0.6)) + (suspend-for (seconds 0.6) + ) (let ((v1-6 (-> self root root-prim))) (set! (-> v1-6 prim-core collide-as) (-> self root backup-collide-as)) (set! (-> v1-6 prim-core collide-with) (-> self root backup-collide-with)) ) (logclear! (-> self draw status) (draw-control-status no-draw)) (update-focus self) - (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6)))) + (suspend-for (the int (* 300.0 (rnd-float-range self 0.0 0.6))) + ) (ja-channel-push! 1 0) (ja-no-eval :group! dm-mine-spider-climb-start-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) diff --git a/goal_src/jak3/levels/stadium/rubble-part.gc b/goal_src/jak3/levels/stadium/rubble-part.gc index b33968c1fa..9ef4c4ba7c 100644 --- a/goal_src/jak3/levels/stadium/rubble-part.gc +++ b/goal_src/jak3/levels/stadium/rubble-part.gc @@ -256,8 +256,8 @@ ) (defun rub-elec-gate-adjust-particles ((arg0 float) (arg1 float) (arg2 float)) - (* 0.5 arg0) - (set! (-> *part-id-table* 3729 init-specs 3 initial-valuef) (- (* 0.5 arg1))) + (/ arg0 2) + (set! (-> *part-id-table* 3729 init-specs 3 initial-valuef) (- (/ arg1 2))) (set! (-> *part-id-table* 3729 init-specs 4 initial-valuef) arg0) (set! (-> *part-id-table* 3729 init-specs 5 initial-valuef) arg1) (set! (-> *part-id-table* 3729 init-specs 9 initial-valuef) (* 48.0 arg2)) diff --git a/goal_src/jak3/levels/temple/temple-obs.gc b/goal_src/jak3/levels/temple/temple-obs.gc index 4ac33ae7d8..fcab1c11c9 100644 --- a/goal_src/jak3/levels/temple/temple-obs.gc +++ b/goal_src/jak3/levels/temple/temple-obs.gc @@ -921,7 +921,8 @@ (until (process-grab? *target* #f) (suspend) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) ) ) (set-time! (-> self state-time)) @@ -938,11 +939,12 @@ ) (set! (-> self root scale x) (* f0-11 f0-11)) ) - (set! (-> self root scale y) (+ 1.0 (* 0.5 (-> self root scale x)))) + (set! (-> self root scale y) (+ 1.0 (/ (-> self root scale x) 2))) (set! (-> self root scale z) (-> self root scale x)) (when (= (-> self root scale x) 0.0) (send-event (handle->process (-> self perm-part)) 'die) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (until (process-release? *target*) (suspend) ) @@ -1733,24 +1735,27 @@ ) ) :code (behavior () - (suspend-for (the int (-> self cycle-offset))) + (suspend-for (the int (-> self cycle-offset)) + ) (until #f - (suspend-for (the int (-> self cycle-time))) + (suspend-for (the int (-> self cycle-time)) + ) (sound-play "fan-shake" :position (-> self root trans)) - (suspend-for (seconds 0.01) (let ((f0-5 (* 36408.89 (the float (- (current-time) time)))) - (f1-3 (* 0.33333334 (- 3.0 (the float (- (current-time) time))))) - ) - (set! (-> self shudder-angle) (* 0.0018204444 f1-3 (sin f0-5))) - ) - ) + (suspend-for (seconds 0.01) + (let ((f0-5 (* 36408.89 (the float (- (current-time) time)))) + (f1-3 (* 0.33333334 (- 3.0 (the float (- (current-time) time))))) + ) + (set! (-> self shudder-angle) (* 0.0018204444 f1-3 (sin f0-5))) + ) + ) (set! (-> self shudder-angle) 0.0) - (suspend-for (seconds 0.04)) + (suspend-for (seconds 0.04) + ) (sound-play "fan-turn" :position (-> self root trans)) (let* ((f0-9 100.0) (f30-1 (* 16384.0 f0-9)) ) - (suspend-for - (seconds 0.01) + (suspend-for (seconds 0.01) (set! (-> self rot-angle) (the float (sar (shl (the int (+ (-> self rot-angle) (* f30-1 (seconds-per-frame)))) 48) 48)) ) @@ -2122,7 +2127,8 @@ (script-eval (the-as pair gp-0)) ) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (cleanup-for-death self) (deactivate self) ) @@ -2283,7 +2289,8 @@ (script-eval (the-as pair gp-0)) ) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (cleanup-for-death self) (deactivate self) ) diff --git a/goal_src/jak3/levels/temple/temple-obs2.gc b/goal_src/jak3/levels/temple/temple-obs2.gc index f54a99ceca..08bd167b97 100644 --- a/goal_src/jak3/levels/temple/temple-obs2.gc +++ b/goal_src/jak3/levels/temple/temple-obs2.gc @@ -785,7 +785,7 @@ ) ) (v1-10 (vector-! (new 'stack-no-clear 'vector) s3-0 (-> self root trans))) - (f30-0 (* 0.000024414063 f0-0)) + (f30-0 (/ f0-0 (meters 10))) (s2-0 vector-xz-normalize!) (a0-7 v1-10) ) diff --git a/goal_src/jak3/levels/temple/templea-texture.gc b/goal_src/jak3/levels/temple/templea-texture.gc index 2c434d7d7b..bf6830f476 100644 --- a/goal_src/jak3/levels/temple/templea-texture.gc +++ b/goal_src/jak3/levels/temple/templea-texture.gc @@ -309,8 +309,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) @@ -513,8 +513,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) diff --git a/goal_src/jak3/levels/volcano/volcano-obs.gc b/goal_src/jak3/levels/volcano/volcano-obs.gc index dc76babc0f..6e208afc3a 100644 --- a/goal_src/jak3/levels/volcano/volcano-obs.gc +++ b/goal_src/jak3/levels/volcano/volcano-obs.gc @@ -64,7 +64,7 @@ :code sleep-code :post (behavior () (let ((f0-0 (cos (get-scaled-val! (-> self sync) 32768.0 0))) - (f1-1 (* 0.5 (-> self amplitude))) + (f1-1 (/ (-> self amplitude) 2)) ) (set! (-> self root trans y) (- (- (-> self init-y) f1-1) (* f0-0 f1-1))) ) @@ -925,7 +925,8 @@ (set! (-> self stopped-up-by) (the-as handle #f)) ) :code (behavior () - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (let ((a1-0 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-0 from) (process->ppointer self)) (set! (-> a1-0 num-params) 0) @@ -1587,7 +1588,7 @@ (send-event (handle->process (-> self ball)) 'push (* f28-0 f30-1)) (set! (-> *part-id-table* 4612 init-specs 2 initial-valuef) (* 10.0 f30-1 (- 1.0 f28-0))) (set! (-> *part-id-table* 4612 init-specs 13 initial-valuef) - (+ (* 6826.6665 f30-1 f28-0) (* 0.002 (-> self ball-height) f30-1 (- 1.0 f28-0))) + (+ (* 6826.6665 f30-1 f28-0) (* (/ (-> self ball-height) 500) f30-1 (- 1.0 f28-0))) ) ) 0 diff --git a/goal_src/jak3/levels/volcano/volcano-obs2.gc b/goal_src/jak3/levels/volcano/volcano-obs2.gc index 597b85dae1..6828ce3e3c 100644 --- a/goal_src/jak3/levels/volcano/volcano-obs2.gc +++ b/goal_src/jak3/levels/volcano/volcano-obs2.gc @@ -848,7 +848,7 @@ ) ) ) - (set! (-> self player-force y) (* 0.1 (-> self player-force y))) + (set! (-> self player-force y) (/ (-> self player-force y) 10)) (if (and (logtest? (-> self rbody flags) (rigid-body-flag enable-physics)) (< (vector-length (-> self root transv)) 4096.0) (< (* (vector-length (-> self rbody lin-momentum)) (-> self info info inv-mass)) 2457.6) @@ -915,7 +915,7 @@ (set! (-> s4-1 quad) (-> this to-hole-vec quad)) (let ((s3-1 (new 'stack-no-clear 'vector))) (set! (-> s3-1 quad) (-> this rbody position quad)) - (set! (-> s4-1 y) (* -0.1 (-> s4-1 y))) + (set! (-> s4-1 y) (/ (-> s4-1 y) -10)) (vector-float*! s4-1 s4-1 (lerp-scale 0.0 30.0 (-> this hole-dist-xz) 20480.0 4096.0)) (apply-impact! (-> this rbody) s3-1 s4-1) ) diff --git a/goal_src/jak3/levels/volcano/volcano-scenes.gc b/goal_src/jak3/levels/volcano/volcano-scenes.gc index f656207fef..b617462806 100644 --- a/goal_src/jak3/levels/volcano/volcano-scenes.gc +++ b/goal_src/jak3/levels/volcano/volcano-scenes.gc @@ -538,8 +538,8 @@ (vector+! s4-0 s4-0 s3-0) ) (set! (-> *part-id-table* 659 init-specs 2 initial-valuef) (-> *vol-invis-joint-list* s5-0 size)) - (set! (-> *part-id-table* 659 init-specs 3 initial-valuef) (* 0.5 (-> *vol-invis-joint-list* s5-0 size))) - (set! (-> *part-id-table* 659 init-specs 4 initial-valuef) (* 0.5 (-> *vol-invis-joint-list* s5-0 size))) + (set! (-> *part-id-table* 659 init-specs 3 initial-valuef) (/ (-> *vol-invis-joint-list* s5-0 size) 2)) + (set! (-> *part-id-table* 659 init-specs 4 initial-valuef) (/ (-> *vol-invis-joint-list* s5-0 size) 2)) (launch-particles (-> *part-id-table* 659) s4-0) ) ) diff --git a/goal_src/jak3/levels/volcano/volcanox-obs.gc b/goal_src/jak3/levels/volcano/volcanox-obs.gc index 2679466204..1bd802639b 100644 --- a/goal_src/jak3/levels/volcano/volcanox-obs.gc +++ b/goal_src/jak3/levels/volcano/volcanox-obs.gc @@ -360,7 +360,8 @@ (until (process-grab? *target* #f) (suspend) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) ) ) (set-time! (-> self state-time)) @@ -377,11 +378,12 @@ ) (set! (-> self root scale x) (* f0-11 f0-11)) ) - (set! (-> self root scale y) (+ 1.0 (* 0.5 (-> self root scale x)))) + (set! (-> self root scale y) (+ 1.0 (/ (-> self root scale x) 2))) (set! (-> self root scale z) (-> self root scale x)) (when (= (-> self root scale x) 0.0) (send-event (handle->process (-> self perm-part)) 'die) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (until (process-release? *target*) (suspend) ) diff --git a/goal_src/jak3/levels/volcano/volcanox-texture.gc b/goal_src/jak3/levels/volcano/volcanox-texture.gc index 3ccfe378d0..f65591b73f 100644 --- a/goal_src/jak3/levels/volcano/volcanox-texture.gc +++ b/goal_src/jak3/levels/volcano/volcanox-texture.gc @@ -163,8 +163,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) diff --git a/goal_src/jak3/levels/wascity/ctymark-obs.gc b/goal_src/jak3/levels/wascity/ctymark-obs.gc index 090c849536..0e05ddd3cf 100644 --- a/goal_src/jak3/levels/wascity/ctymark-obs.gc +++ b/goal_src/jak3/levels/wascity/ctymark-obs.gc @@ -1172,7 +1172,7 @@ 0.0 0.0 0.0 - (let* ((f28-0 (/ 1.0 (* 0.00024414062 (-> arg1 omega)))) + (let* ((f28-0 (/ 1.0 (/ (-> arg1 omega) METER_LENGTH))) (f26-0 (* (rand-vu-float-range -136.53334 136.53334) f28-0)) (f30-0 (* (rand-vu-float-range 0.0 136.53334) f28-0)) (f0-8 (* (rand-vu-float-range -13.653334 54.613335) f28-0)) diff --git a/goal_src/jak3/levels/wascity/defend/was-pre-game.gc b/goal_src/jak3/levels/wascity/defend/was-pre-game.gc index b62b89a1a9..9700b7c9d8 100644 --- a/goal_src/jak3/levels/wascity/defend/was-pre-game.gc +++ b/goal_src/jak3/levels/wascity/defend/was-pre-game.gc @@ -596,8 +596,8 @@ (let* ((a0-1 (-> arg4 control)) (v1-1 (vector-! (new 'stack-no-clear 'vector) (-> arg2 x-y-z-sx) (-> a0-1 origin trans))) ) - (set! (-> arg1 vel-sxvel x) (* 0.083333336 (-> v1-1 x))) - (set! (-> arg1 vel-sxvel y) (* 0.083333336 (-> v1-1 y))) + (set! (-> arg1 vel-sxvel x) (/ (-> v1-1 x) 12)) + (set! (-> arg1 vel-sxvel y) (/ (-> v1-1 y) 12)) ) 0 (none) @@ -938,9 +938,9 @@ (let* ((a0-1 (-> arg4 control)) (v1-1 (vector-! (new 'stack-no-clear 'vector) (-> arg2 x-y-z-sx) (-> a0-1 origin trans))) ) - (set! (-> arg1 vel-sxvel x) (* -0.008333334 (-> v1-1 x))) - (set! (-> arg1 vel-sxvel y) (* -0.008333334 (-> v1-1 y))) - (set! (-> arg1 vel-sxvel z) (* -0.008333334 (-> v1-1 z))) + (set! (-> arg1 vel-sxvel x) (/ (-> v1-1 x) -120)) + (set! (-> arg1 vel-sxvel y) (/ (-> v1-1 y) -120)) + (set! (-> arg1 vel-sxvel z) (/ (-> v1-1 z) -120)) ) 0 (none) @@ -1807,7 +1807,8 @@ ) ) ) - (suspend-for (-> self start-delay)) + (suspend-for (-> self start-delay) + ) (go-virtual fall) ) :post (behavior () @@ -2073,7 +2074,8 @@ (sound-play "lose-icon") (send-event (ppointer->process (-> self parent)) 'done) (set! (-> self post-hook) #f) - (suspend-for (seconds 0.2)) + (suspend-for (seconds 0.2) + ) ) :post (behavior () (vector-normalize! @@ -3037,19 +3039,19 @@ ) (cond ((zero? a0-7) - (set-vector! v1-6 0.0 (* 90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 1.0) + (set-vector! v1-6 0.0 (* 90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 1.0) ) ((= a0-7 1) - (set-vector! v1-6 (* 90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 0.0 1.0) + (set-vector! v1-6 (* 90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 0.0 1.0) ) ((= a0-7 2) - (set-vector! v1-6 0.0 (* -90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 1.0) + (set-vector! v1-6 0.0 (* -90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 1.0) ) ((= a0-7 2) - (set-vector! v1-6 0.0 (* 90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 1.0) + (set-vector! v1-6 0.0 (* 90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 1.0) ) ((= a0-7 3) - (set-vector! v1-6 (* -90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 0.0 1.0) + (set-vector! v1-6 (* -90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 0.0 1.0) ) ) ) @@ -3099,16 +3101,16 @@ ) (cond ((zero? a0-7) - (set-vector! v1-6 0.0 (* 90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 1.0) + (set-vector! v1-6 0.0 (* 90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 1.0) ) ((= a0-7 1) - (set-vector! v1-6 (* 90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 0.0 1.0) + (set-vector! v1-6 (* 90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 0.0 1.0) ) ((= a0-7 2) - (set-vector! v1-6 0.0 (* -90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 1.0) + (set-vector! v1-6 0.0 (* -90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 1.0) ) ((= a0-7 3) - (set-vector! v1-6 (* -90.0 (+ (-> a1-1 min) (* 0.5 (-> a1-1 size)))) 0.0 0.0 1.0) + (set-vector! v1-6 (* -90.0 (+ (-> a1-1 min) (/ (-> a1-1 size) 2))) 0.0 0.0 1.0) ) ) ) diff --git a/goal_src/jak3/levels/wascity/dm-flyer.gc b/goal_src/jak3/levels/wascity/dm-flyer.gc index af71a88ae0..76f20e0558 100644 --- a/goal_src/jak3/levels/wascity/dm-flyer.gc +++ b/goal_src/jak3/levels/wascity/dm-flyer.gc @@ -330,7 +330,7 @@ ) ((= v1-0 (projectile-options po0 po1)) (let* ((f0-0 (vector-vector-distance (target-pos 0) (-> this root trans))) - (f0-2 (+ 0.3 (* 0.0000012207031 f0-0))) + (f0-2 (+ 0.3 (/ f0-0 (meters 200)))) ) (sound-play-by-name (static-sound-name "missile-travel") diff --git a/goal_src/jak3/levels/wascity/tizard.gc b/goal_src/jak3/levels/wascity/tizard.gc index 3d6406435e..4c6fe8f12c 100644 --- a/goal_src/jak3/levels/wascity/tizard.gc +++ b/goal_src/jak3/levels/wascity/tizard.gc @@ -73,7 +73,8 @@ :code (behavior () (when (-> self first-run?) (let ((gp-0 (the int (* 300.0 (rand-vu-float-range 0.05 0.12))))) - (suspend-for gp-0) + (suspend-for gp-0 + ) ) (set! (-> self path-base-u) (the float (rand-vu-int-count (-> self path curve num-cverts)))) (get-point-in-path! (-> self path) (-> self root trans) (-> self path-base-u) 'interp) @@ -154,7 +155,8 @@ :event tizard-event-handler :code (behavior () (let ((gp-0 (the int (* 300.0 (rand-vu-float-range 1.0 2.0))))) - (suspend-for gp-0) + (suspend-for gp-0 + ) ) (if (< 17294.223 (acos (vector-dot (-> self rotation-matrix fvec) (-> self path-dir)))) (go-virtual turning) @@ -186,7 +188,7 @@ ) (quaternion-normalize! s4-1) (quaternion-normalize! s3-0) - (dotimes (s2-0 (the int (* 0.000061035156 f30-0))) + (dotimes (s2-0 (the int (/ f30-0 (meters 4)))) (cond (s5-0 (ja-no-eval :group! tizard-turn-left0-ja :num! (seek!) :frame-num 0.0) diff --git a/goal_src/jak3/levels/wascity/wascity-turret.gc b/goal_src/jak3/levels/wascity/wascity-turret.gc index bf015c6b78..964274f84c 100644 --- a/goal_src/jak3/levels/wascity/wascity-turret.gc +++ b/goal_src/jak3/levels/wascity/wascity-turret.gc @@ -379,7 +379,7 @@ (if (< (-> s2-0 z) 0.0) (set! f0-6 (- f0-6)) ) - (set! (-> s3-1 x) (* 0.000061035156 f0-6)) + (set! (-> s3-1 x) (/ f0-6 (meters 4))) ) (let ((f0-13 (atan (-> s2-0 y) (sqrtf (+ (* (-> s2-0 x) (-> s2-0 x)) (* (-> s2-0 z) (-> s2-0 z))))))) (set! (-> s3-1 y) (* -0.00014085036 f0-13)) @@ -696,7 +696,8 @@ (set! (-> self facing-ocean) #t) (set! (-> self facing-city) #f) (set! (-> self reset-facing) #f) - (suspend-for (seconds 0.5)) + (suspend-for (seconds 0.5) + ) (sound-play "jump-in-turret") (let* ((v1-9 (-> *game-info* sub-task-list (game-task-node wascity-gungame-resolution))) (a0-4 (handle->process (if (-> v1-9 manager) @@ -1374,7 +1375,7 @@ (set! (-> s0-1 quad) (-> s1-1 quad)) (when (= (-> s2-2 type) skeet) (set! sv-960 s2-2) - (let ((f28-1 (* 0.00000013563368 f28-0))) + (let ((f28-1 (/ f28-0 (meters 1800)))) (if #f (add-debug-sphere #t (bucket-id debug) s1-1 (meters 12) *color-red*) ) @@ -1636,7 +1637,7 @@ (if (< (-> s4-0 z) 0.0) (set! f0-4 (- f0-4)) ) - (set! (-> s5-0 x) (* 0.000061035156 f0-4)) + (set! (-> s5-0 x) (/ f0-4 (meters 4))) ) (let ((f0-11 (atan (-> s4-0 y) (sqrtf (+ (* (-> s4-0 x) (-> s4-0 x)) (* (-> s4-0 z) (-> s4-0 z))))))) (set! (-> s5-0 y) (* -0.00014085036 f0-11)) diff --git a/goal_src/jak3/levels/wascity/wasdef-manager.gc b/goal_src/jak3/levels/wascity/wasdef-manager.gc index 9f67723fcd..fbacf93685 100644 --- a/goal_src/jak3/levels/wascity/wasdef-manager.gc +++ b/goal_src/jak3/levels/wascity/wasdef-manager.gc @@ -1219,7 +1219,7 @@ 0.0 (set-vector! v1-0 6583861.5 0.0 -1960301.9 1.0) (let ((f0-5 (vector-vector-xz-distance v1-0 arg0))) - (- 36864.0 (* 0.1 f0-5)) + (- 36864.0 (/ f0-5 10)) ) ) ) @@ -1629,7 +1629,8 @@ (logior! (-> self minimap flags) (minimap-flag fade-out)) (set! (-> self minimap) #f) ) - (suspend-for (seconds 4)) + (suspend-for (seconds 4) + ) ) :post (behavior () (let ((gp-0 (new 'stack-no-clear 'vector))) @@ -2047,7 +2048,8 @@ :code (behavior () (maker-method-38 self) (set! *maker-num-visible* (+ *maker-num-visible* -1)) - (suspend-for (seconds 3)) + (suspend-for (seconds 3) + ) (if (nonzero? (-> self explosion-sound-id)) (set-action! *gui-control* diff --git a/goal_src/jak3/levels/wascity/wasgun-hud.gc b/goal_src/jak3/levels/wascity/wasgun-hud.gc index 7d296fa864..0c5f7573fa 100644 --- a/goal_src/jak3/levels/wascity/wasgun-hud.gc +++ b/goal_src/jak3/levels/wascity/wasgun-hud.gc @@ -151,7 +151,7 @@ (set! (-> s4-2 y) (+ (the int (-> s3-3 y)) -50)) 1.0 (let ((s2-3 (min 2 (the int (* 3.0 (-> this minfo s5-3 hit-points)))))) - (let ((f0-48 (* 0.00005 (-> s3-3 z)))) + (let ((f0-48 (/ (-> s3-3 z) 20000))) (set! (-> this reticle s2-3 scale-x) f0-48) (set! (-> this reticle s2-3 scale-y) f0-48) ) diff --git a/goal_src/jak3/levels/wascity/wasgun-manager.gc b/goal_src/jak3/levels/wascity/wasgun-manager.gc index 38c31cb4ec..a7a2cde65f 100644 --- a/goal_src/jak3/levels/wascity/wasgun-manager.gc +++ b/goal_src/jak3/levels/wascity/wasgun-manager.gc @@ -1278,7 +1278,8 @@ (logior! (-> self minimap flags) (minimap-flag fade-out)) (set! (-> self minimap) #f) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (sound-play "point-missed" :position (wascity-turret-gun-pos)) (let ((v1-49 (handle->process (-> self mgr)))) (when v1-49 @@ -2296,10 +2297,10 @@ (format #t "((sktpos ~f ~f) ~f ~f)~%" - (* 0.00024414062 (-> arg2 x)) - (* 0.00024414062 (-> arg2 z)) + (/ (-> arg2 x) METER_LENGTH) + (/ (-> arg2 z) METER_LENGTH) (* 0.005493164 arg3) - (* 0.00024414062 s2-1) + (/ s2-1 METER_LENGTH) ) (spawn-skeet arg0 arg1 arg2 arg3 s2-1) ) diff --git a/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc b/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc index 8957996575..eb02d0ec0e 100644 --- a/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc +++ b/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc @@ -1006,7 +1006,7 @@ (let ((v1-6 gp-1)) (set! (-> v1-6 height) (the float 70)) ) - (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) + (set! (-> gp-1 origin x) (the float (- 256 (the int (/ (-> gp-1 width) 2))))) (set! (-> gp-1 origin y) 320.0) (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-0 print-game-text)) @@ -1081,7 +1081,8 @@ ) ) :code (behavior () - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) (set! *arena-trainer-checkpoint-valid* #t) (copy-string<-string (-> *training-fail* fail continue) "wasstada-checkpoint-3") (set-setting! 'death-info *training-fail* 0.0 0) @@ -1299,7 +1300,8 @@ ) (suspend) (ja-channel-set! 0) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (send-event self 'death-end) (while (-> self child) (suspend) diff --git a/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc b/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc index 636137a3d7..eda9b809f9 100644 --- a/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc +++ b/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc @@ -378,7 +378,8 @@ (suspend) (ja :num! (seek!)) ) - (suspend-for (seconds 1)) + (suspend-for (seconds 1) + ) (ja-no-eval :group! wstd-fight-house-a-open-ja :num! (seek! 0.0) :frame-num 5.0) (until (ja-done? 0) (suspend) @@ -774,7 +775,7 @@ (goto cfg-20) ) (let ((f0-2 (lerp-scale 0.0 1.0 (-> self root trans y) 49152.0 40960.0))) - (set-vector! (-> self draw color-mult) (+ 1.0 f0-2) (- 1.0 (* 0.5 f0-2)) (- 1.0 f0-2) 1.0) + (set-vector! (-> self draw color-mult) (+ 1.0 f0-2) (- 1.0 (/ f0-2 2)) (- 1.0 f0-2) 1.0) ) (set! (-> self delta-y) (* (-> self depth) (- (sin f30-0)))) (+! f30-0 (* 3276.8 (seconds-per-frame))) @@ -808,7 +809,7 @@ (set! f30-0 0.0) ) (let ((f0-21 (lerp-scale 0.0 1.0 (-> self root trans y) 49152.0 40960.0))) - (set-vector! (-> self draw color-mult) (+ 1.0 f0-21) (- 1.0 (* 0.5 f0-21)) (- 1.0 f0-21) 1.0) + (set-vector! (-> self draw color-mult) (+ 1.0 f0-21) (- 1.0 (/ f0-21 2)) (- 1.0 f0-21) 1.0) ) (sound-play-by-spec gp-1 (-> self ambient-sound-id) (-> self root trans)) (suspend) @@ -2141,7 +2142,8 @@ ) (let ((gp-1 (-> *game-info* gun-type))) (set-setting! 'change-gun #t 0.0 0) - (suspend-for (seconds 5)) + (suspend-for (seconds 5) + ) (set! (-> self gui-id) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) ) @@ -2156,7 +2158,9 @@ (send-event (-> v1-33 extra process) 'off) ) ) - (suspend-for (seconds 2) (print-text self (-> self text-id))) + (suspend-for (seconds 2) + (print-text self (-> self text-id)) + ) (send-event self 'complete) (until #f (suspend) @@ -2210,7 +2214,8 @@ ) (let ((gp-2 32)) (set-setting! 'change-gun #t 0.0 0) - (suspend-for (seconds 5)) + (suspend-for (seconds 5) + ) (set! (-> self gui-id) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) ) @@ -2224,7 +2229,9 @@ (send-event (-> v1-38 extra process) 'off) ) ) - (suspend-for (seconds 2) (print-text self (-> self text-id))) + (suspend-for (seconds 2) + (print-text self (-> self text-id)) + ) (send-event self 'complete) (until #f (suspend) @@ -2427,7 +2434,8 @@ (send-event (handle->process (-> self arrow-h)) 'leave) (send-event *target* 'end-mode 'darkjak) (send-event *target* 'end-mode 'grab) - (suspend-for (seconds 2)) + (suspend-for (seconds 2) + ) (go-virtual complete) ) ) diff --git a/goal_src/jak3/levels/wascity/wlander-male.gc b/goal_src/jak3/levels/wascity/wlander-male.gc index 80d61a5ead..305e4bfe9e 100644 --- a/goal_src/jak3/levels/wascity/wlander-male.gc +++ b/goal_src/jak3/levels/wascity/wlander-male.gc @@ -377,7 +377,7 @@ s5-0 s5-0 gp-0 - (* (+ 1.0 (* 0.00024414062 (-> this nav state speed))) (seconds-per-frame)) + (* (+ 1.0 (/ (-> this nav state speed) METER_LENGTH)) (seconds-per-frame)) ) ) 0