From e546fce3706f601a5b8dbd4229969559d505c7bb Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Fri, 14 Jul 2023 23:01:09 +0100 Subject: [PATCH] improve `send-event` for jak 2 (#2828) Fixes #2825 --- decompiler/analysis/insert_lets.cpp | 104 ++++++++-- decompiler/config/jak2/all-types.gc | 4 +- goal_src/jak2/engine/camera/cam-debug.gc | 2 +- goal_src/jak2/engine/common_objs/conveyor.gc | 2 +- goal_src/jak2/engine/common_objs/powerups.gc | 4 +- goal_src/jak2/engine/common_objs/voicebox.gc | 6 +- .../jak2/engine/common_objs/water-flow.gc | 11 +- goal_src/jak2/engine/debug/default-menu.gc | 180 ++++++++++-------- goal_src/jak2/engine/game/game-info.gc | 6 +- goal_src/jak2/engine/game/game-save.gc | 4 +- goal_src/jak2/engine/game/main.gc | 14 +- .../jak2/engine/game/task/task-control.gc | 4 +- goal_src/jak2/engine/level/level.gc | 2 +- .../jak2/engine/target/board/board-states.gc | 6 +- .../jak2/engine/target/board/target-board.gc | 2 +- .../engine/target/collide-reaction-target.gc | 2 +- goal_src/jak2/engine/target/logic-target.gc | 2 +- .../jak2/engine/target/mech/mech-states.gc | 2 +- goal_src/jak2/engine/target/mech/mech.gc | 4 +- goal_src/jak2/engine/target/target-darkjak.gc | 67 +++---- goal_src/jak2/engine/target/target-death.gc | 8 +- goal_src/jak2/engine/target/target-gun.gc | 12 +- goal_src/jak2/engine/target/target-h.gc | 1 - goal_src/jak2/engine/target/target-handler.gc | 4 +- goal_src/jak2/engine/target/target-part.gc | 8 +- goal_src/jak2/engine/target/target-util.gc | 2 +- goal_src/jak2/engine/target/target.gc | 2 +- goal_src/jak2/engine/target/target2.gc | 2 +- goal_src/jak2/levels/city/ctywide-obs.gc | 2 +- goal_src/jak2/levels/city/ctywide-tasks.gc | 14 +- .../levels/city/kiddogescort/hal4-course.gc | 24 +-- .../levels/city/meet-brutter/meet-brutter.gc | 6 +- .../levels/city/oracle/oracle-training.gc | 16 +- .../jak2/levels/city/package/delivery-task.gc | 6 +- .../jak2/levels/city/port/portrun/portrun.gc | 4 +- .../jak2/levels/city/port/race/errol-chal.gc | 4 +- goal_src/jak2/levels/city/power/ctypower.gc | 4 +- goal_src/jak2/levels/city/protect/protect.gc | 42 ++-- .../jak2/levels/city/sack/collection-task.gc | 6 +- goal_src/jak2/levels/city/shuttle/shuttle.gc | 8 +- .../jak2/levels/common/race/race-manager.gc | 2 +- .../jak2/levels/common/race/vehicle-racer.gc | 2 +- goal_src/jak2/levels/common/warp-gate.gc | 2 +- goal_src/jak2/levels/demo/demo-obs.gc | 2 +- .../jak2/levels/nest/boss/nestb-scenes.gc | 2 +- .../jak2/levels/palace/boss/squid-extras.gc | 2 +- .../jak2/levels/palace/boss/squid-states.gc | 12 +- goal_src/jak2/levels/sewer/sew-gunturret.gc | 2 +- .../jak2/levels/stadium/skate/skatea-obs.gc | 32 ++-- goal_src/jak2/levels/stadium/stadium-obs.gc | 66 +++---- goal_src/jak2/levels/title/title-obs.gc | 2 +- .../jak2/engine/camera/cam-debug_REF.gc | 2 +- .../jak2/engine/common_objs/conveyor_REF.gc | 2 +- .../jak2/engine/common_objs/powerups_REF.gc | 4 +- .../jak2/engine/common_objs/voicebox_REF.gc | 6 +- .../jak2/engine/common_objs/water-flow_REF.gc | 6 +- .../jak2/engine/debug/default-menu_REF.gc | 114 +++++------ .../jak2/engine/game/game-info_REF.gc | 6 +- .../jak2/engine/game/game-save_REF.gc | 4 +- .../reference/jak2/engine/game/main_REF.gc | 14 +- .../jak2/engine/game/task/task-control_REF.gc | 4 +- .../reference/jak2/engine/level/level_REF.gc | 2 +- .../engine/target/board/board-states_REF.gc | 6 +- .../engine/target/board/target-board_REF.gc | 2 +- .../target/collide-reaction-target_REF.gc | 2 +- .../jak2/engine/target/logic-target_REF.gc | 2 +- .../engine/target/mech/mech-states_REF.gc | 2 +- .../jak2/engine/target/mech/mech_REF.gc | 4 +- .../jak2/engine/target/target-darkjak_REF.gc | 65 +++---- .../jak2/engine/target/target-death_REF.gc | 8 +- .../jak2/engine/target/target-gun_REF.gc | 12 +- .../jak2/engine/target/target-handler_REF.gc | 4 +- .../jak2/engine/target/target-util_REF.gc | 2 +- .../jak2/engine/target/target2_REF.gc | 2 +- .../jak2/engine/target/target_REF.gc | 2 +- .../jak2/levels/city/ctywide-obs_REF.gc | 2 +- .../jak2/levels/city/ctywide-tasks_REF.gc | 18 +- .../city/kiddogescort/hal4-course_REF.gc | 24 +-- .../city/meet-brutter/meet-brutter_REF.gc | 6 +- .../levels/city/oracle/oracle-training_REF.gc | 16 +- .../levels/city/package/delivery-task_REF.gc | 6 +- .../levels/city/port/portrun/portrun_REF.gc | 4 +- .../levels/city/port/race/errol-chal_REF.gc | 4 +- .../jak2/levels/city/power/ctypower_REF.gc | 4 +- .../jak2/levels/city/protect/protect_REF.gc | 42 ++-- .../levels/city/sack/collection-task_REF.gc | 6 +- .../jak2/levels/city/shuttle/shuttle_REF.gc | 8 +- .../levels/common/race/race-manager_REF.gc | 2 +- .../levels/common/race/vehicle-racer_REF.gc | 2 +- .../jak2/levels/common/warp-gate_REF.gc | 2 +- .../jak2/levels/demo/demo-obs_REF.gc | 2 +- .../jak2/levels/nest/boss/nestb-scenes_REF.gc | 2 +- .../levels/palace/boss/squid-extras_REF.gc | 2 +- .../levels/palace/boss/squid-states_REF.gc | 12 +- .../jak2/levels/sewer/sew-gunturret_REF.gc | 2 +- .../levels/stadium/skate/skatea-obs_REF.gc | 32 ++-- .../jak2/levels/stadium/stadium-obs_REF.gc | 66 +++---- .../jak2/levels/title/title-obs_REF.gc | 2 +- 98 files changed, 678 insertions(+), 594 deletions(-) diff --git a/decompiler/analysis/insert_lets.cpp b/decompiler/analysis/insert_lets.cpp index 4b08f90148..98420d5958 100644 --- a/decompiler/analysis/insert_lets.cpp +++ b/decompiler/analysis/insert_lets.cpp @@ -420,6 +420,7 @@ FormElement* rewrite_as_send_event(LetElement* in, return nullptr; } Form* message_name = set_message_mr.maps.forms.at(1); + auto msg_str = message_name->to_string(env); //////////////////////////////////////////////////////// // (set! (-> a1-14 param X) the-param-value) @@ -453,22 +454,99 @@ FormElement* rewrite_as_send_event(LetElement* in, // fancy casting if necessary if (param_val->to_form(env).is_int()) { - auto msg_str = message_name->to_string(env); auto val = param_val->to_form(env).as_int(); - if (val && - ((param_idx == 1 && (msg_str == "'change-state" || msg_str == "'change-state-no-go" || - msg_str == "'art-joint-anim")) || - (param_idx == 0 && (msg_str == "'no-look-around" || msg_str == "'no-load-wait" || - msg_str == "'force-blend")))) { - param_val = pool.form( - GenericOperator::make_function(pool.form("seconds")), - pool.form(seconds_to_string(param_val->to_form(env).as_int()))); - } else if (param_idx == 1) { - auto parm0_str = param_values.at(0)->to_string(env); - if (parm0_str == "'powerup" || parm0_str == "'pickup") { + + auto old_param = param_val; + + if (env.version >= GameVersion::Jak2) { + auto find_int_in_vector = [](const std::vector& vec, int val) { + for (auto v : vec) { + if (v == val) { + return true; + } + } + return false; + }; + + static const std::map> jak2_float_args = { + {"'set-fov", {0}}, {"'joystick", {0, 1}}, + {"'get-pickup", {1}}, {"'dest-clock-ratio-set", {0}}, + {"'ease-in", {0}}, {"'speed", {0}}, + {"'set-target-level", {0}}, {"'set-stretch-vel", {0}}, + }; + static const std::map> jak2_time_frame_args = { + {"'push", {0}}, + {"'drop", {0}}, + {"'target-mech-get-off", {0}}, + {"'push-trans", {1}}, + {"'push-transv", {1}}, + {"'dest-clock-ratio-set", {1}}, + {"'color-effect", {1}}, + {"'set-alert-duration", {0}}, + }; + auto float_arg_settings = jak2_float_args.find(msg_str); + auto time_frame_arg_settings = jak2_time_frame_args.find(msg_str); + if ((float_arg_settings != jak2_float_args.end() && + find_int_in_vector(float_arg_settings->second, param_idx)) + // other hardcoded cases... + || (param_idx == 1 && param_values.at(0)->to_string(env) == "'ratio" && + msg_str == "'change")) { + param_val = try_cast_simplify(param_val, TypeSpec("float"), pool, env); + } else if (time_frame_arg_settings != jak2_time_frame_args.end() && + find_int_in_vector(time_frame_arg_settings->second, param_idx)) { + if (val) { + param_val = pool.form( + GenericOperator::make_function(pool.form("seconds")), + pool.form(seconds_to_string(val))); + } + } else if (param_idx == 0 && (msg_str == "'get-pickup" || msg_str == "'test-pickup")) { auto enum_ts = env.dts->ts.try_enum_lookup("pickup-type"); if (enum_ts) { - param_val = cast_to_int_enum(enum_ts, pool, env, param_val->to_form(env).as_int()); + param_val = cast_to_int_enum(enum_ts, pool, env, val); + } + } else if (param_idx == 1 && + (param_values.at(0)->to_string(env) == "'error" || + param_values.at(0)->to_string(env) == "'done") && + msg_str == "'notify") { + auto enum_ts = env.dts->ts.try_enum_lookup("mc-status-code"); + if (enum_ts) { + param_val = cast_to_int_enum(enum_ts, pool, env, val); + } + } else if (param_idx == 0 && + (msg_str == "'deactivate-by-type" || msg_str == "'set-object-reserve-count" || + msg_str == "'set-object-target-count" || + msg_str == "'set-object-auto-activate" || msg_str == "'end-pursuit-by-type" || + msg_str == "'get-object-remaining-count")) { + auto enum_ts = env.dts->ts.try_enum_lookup("traffic-type"); + if (enum_ts) { + param_val = cast_to_int_enum(enum_ts, pool, env, val); + } + } else if (param_idx == 0 && + (msg_str == "'clear-slave-option" || msg_str == "'set-slave-option" || + msg_str == "'toggle-slave-option")) { + auto enum_ts = env.dts->ts.try_enum_lookup("cam-slave-options"); + if (enum_ts) { + param_val = cast_to_bitfield_enum(enum_ts, pool, env, val); + } + } + } + // if we didn't cast + if (param_val == old_param) { + if (val && + ((param_idx == 1 && (msg_str == "'change-state" || msg_str == "'change-state-no-go" || + msg_str == "'art-joint-anim")) || + (param_idx == 0 && (msg_str == "'no-look-around" || msg_str == "'no-load-wait" || + msg_str == "'force-blend")))) { + param_val = pool.form( + GenericOperator::make_function(pool.form("seconds")), + pool.form(seconds_to_string(val))); + } else if (param_idx == 1) { + auto parm0_str = param_values.at(0)->to_string(env); + if (parm0_str == "'powerup" || parm0_str == "'pickup") { + auto enum_ts = env.dts->ts.try_enum_lookup("pickup-type"); + if (enum_ts) { + param_val = cast_to_int_enum(enum_ts, pool, env, val); + } } } } diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 7b94c4ada0..4fd2fb5af6 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -29131,7 +29131,7 @@ (define-extern process-drawable-burn-effect (function time-frame rgbaf :behavior target)) ;; (define-extern lightning-probe-callback (function lightning-tracker none)) (define-extern process-drawable-shock-effect (function process-drawable lightning-spec (function lightning-tracker none) sparticle-launcher int int float object)) ;; guess -(define-extern process-drawable-shock-wall-effect (function process-drawable lightning-spec (function lightning-tracker none) sparticle-launcher int int float none)) +(define-extern process-drawable-shock-wall-effect (function process-drawable lightning-spec (function lightning-tracker none) sparticle-launcher symbol)) (define-extern process-drawable2-shock-effect (function process-drawable process-drawable lightning-spec (function lightning-tracker none) sparticle-launcher none)) (define-extern process-drawable-shock-skel-effect (function process-drawable lightning-spec (function lightning-tracker none) sparticle-launcher float int int none)) (define-extern *lightning-darkjak-pill* lightning-spec) @@ -32371,7 +32371,7 @@ (define-extern dm-cam-mode-func (function (state camera-slave) debug-menu-msg object)) (define-extern dm-cam-mode-default (function object debug-menu-msg symbol)) (define-extern dm-cam-settings-default (function object debug-menu-msg symbol)) -(define-extern dm-cam-settings-func (function cam-slave-options debug-menu-msg symbol)) +(define-extern dm-cam-settings-func (function int debug-menu-msg symbol)) (define-extern dm-cam-settings-func-int (function int debug-menu-msg int int int)) (define-extern dm-cam-externalize (function symbol debug-menu-msg symbol)) (define-extern dm-cam-setting-float (function float debug-menu-msg float float float)) ;; TODO - omit the last 2 args and set the return type to `none` to get a hang diff --git a/goal_src/jak2/engine/camera/cam-debug.gc b/goal_src/jak2/engine/camera/cam-debug.gc index a76dc2d41e..58ef695bf4 100644 --- a/goal_src/jak2/engine/camera/cam-debug.gc +++ b/goal_src/jak2/engine/camera/cam-debug.gc @@ -1643,7 +1643,7 @@ (set! (-> a1-0 trans w) 1.0) (debug-set-camera-pos-rot! a0-0 a1-0) ) - (send-event *camera* 'set-fov #x46360b61) + (send-event *camera* 'set-fov (degrees 64)) (clear *camera-old-level*) (format *camera-old-level* "dig3a") (set! *camera-old-cpu* 4815) diff --git a/goal_src/jak2/engine/common_objs/conveyor.gc b/goal_src/jak2/engine/common_objs/conveyor.gc index 8d66ab6354..08f0c6e4dc 100644 --- a/goal_src/jak2/engine/common_objs/conveyor.gc +++ b/goal_src/jak2/engine/common_objs/conveyor.gc @@ -155,7 +155,7 @@ and return it as well. Otherwise, set it to `0`" ) (vector-float*! a2-8 (-> section pull-dir) (* f0-10 (-> self clock seconds-per-frame))) ) - (send-event proc-focus 'push-trans a2-8 3000) + (send-event proc-focus 'push-trans a2-8 (seconds 10)) ) ) ) diff --git a/goal_src/jak2/engine/common_objs/powerups.gc b/goal_src/jak2/engine/common_objs/powerups.gc index 9f4f0e3c14..b186bb3ae5 100644 --- a/goal_src/jak2/engine/common_objs/powerups.gc +++ b/goal_src/jak2/engine/common_objs/powerups.gc @@ -965,7 +965,7 @@ ((logtest? (-> self game features) (game-feature unk-game-feature-03)) (when *time-of-day-fast* (set! *time-of-day-fast* #f) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) ) (cond ((cpad-hold? (-> self control cpad number) r1) @@ -995,7 +995,7 @@ ((logtest? (-> self game features) (game-feature unk-game-feature-05)) (when *time-of-day-fast* (set! *time-of-day-fast* #f) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) ) (cond ((cpad-hold? (-> self control cpad number) r1) diff --git a/goal_src/jak2/engine/common_objs/voicebox.gc b/goal_src/jak2/engine/common_objs/voicebox.gc index b8189449d9..b15e6d6181 100644 --- a/goal_src/jak2/engine/common_objs/voicebox.gc +++ b/goal_src/jak2/engine/common_objs/voicebox.gc @@ -199,7 +199,7 @@ ) ) ) - (send-event (ppointer->process (-> self parent)) 'joystick (-> self twist) -1082130432) + (send-event (ppointer->process (-> self parent)) 'joystick (-> self twist) -1.0) ) (set! (-> self root scale x) f30-0) (set! (-> self root scale y) f30-0) @@ -494,7 +494,7 @@ :virtual #t :enter (behavior () (set! (-> self start-time) (-> *display* game-clock frame-counter)) - (send-event *target* 'get-pickup 20 (the float (-> self total-time))) + (send-event *target* 'get-pickup (pickup-type trick-judge) (the float (-> self total-time))) (sound-play "judge-start") (set! (-> self hud-timer) (ppointer->handle (process-spawn hud-timer :init hud-init-by-other :to self))) (none) @@ -513,7 +513,7 @@ ) :code (behavior () (while (let ((a0-2 (handle->process (-> self focus handle)))) - (and a0-2 (!= (send-event a0-2 'test-pickup 20) 0.0)) + (and a0-2 (!= (send-event a0-2 'test-pickup (pickup-type trick-judge)) 0.0)) ) (suspend) (ja :num! (loop!)) diff --git a/goal_src/jak2/engine/common_objs/water-flow.gc b/goal_src/jak2/engine/common_objs/water-flow.gc index b5bf0ee57d..a9b3d6d6ef 100644 --- a/goal_src/jak2/engine/common_objs/water-flow.gc +++ b/goal_src/jak2/engine/common_objs/water-flow.gc @@ -28,6 +28,7 @@ :flag-assert #x900000040 ) + (deftype flow-section-array (inline-array-class) ((data flow-section :inline :dynamic :offset-assert 16) ) @@ -35,6 +36,8 @@ :size-assert #x10 :flag-assert #x900000010 ) + + (set! (-> flow-section-array heap-base) (the-as uint 64)) (deftype flow-control (basic) @@ -57,6 +60,7 @@ ) ) + (defmethod relocate flow-control ((obj flow-control) (arg0 int)) (if (nonzero? (-> obj sections)) (&+! (-> obj sections) arg0) @@ -77,6 +81,7 @@ (none) ) +;; WARN: Function (method 11 flow-control) has a return type of none, but the expression builder found a return statement. (defmethod push-process flow-control ((obj flow-control) (arg0 process-focusable)) (with-pp (rlet ((acc :class vf) @@ -146,7 +151,7 @@ (.svf (&-> a1-15 quad) vf6) ) 0 - (send-event arg0 'push-trans v1-17 3000) + (send-event arg0 'push-trans v1-17 (seconds 10)) ) ) ) @@ -405,7 +410,3 @@ s5-0 ) ) - - - - diff --git a/goal_src/jak2/engine/debug/default-menu.gc b/goal_src/jak2/engine/debug/default-menu.gc index e45dccb9bf..3c14dab7a3 100644 --- a/goal_src/jak2/engine/debug/default-menu.gc +++ b/goal_src/jak2/engine/debug/default-menu.gc @@ -77,52 +77,80 @@ ) ) -(defun dm-cam-settings-func ((arg0 cam-slave-options) (arg1 debug-menu-msg)) +(defun dm-cam-settings-func ((arg0 int) (arg1 debug-menu-msg)) (when (and (= arg1 (debug-menu-msg press)) *camera*) - (case arg0 - (((cam-slave-options JUMP_PITCHES)) - (if (not (setting-control-method-14 *setting-control* 'slave-options)) - (set-setting-by-param *setting-control* 'slave-options 'clear 0 arg0) - (remove-setting-by-arg0 *setting-control* 'slave-options) - ) + (cond + ((zero? arg0) + (send-event *camera* 'toggle-slave-option (cam-slave-options BUTT_CAM)) ) - (((cam-slave-options BUTT_CAM) - (cam-slave-options SAME_SIDE) - (cam-slave-options MOVE_SPHERICAL) - (cam-slave-options ALLOW_Z_ROT) - (cam-slave-options COLLIDE) - (cam-slave-options FIND_HIDDEN_TARGET) - (cam-slave-options DRAG) - (cam-slave-options LINE_OF_SIGHT) - (cam-slave-options STICKY_ANGLE) - (cam-slave-options NO_ROTATE) - ) - (send-event *camera* 'toggle-slave-option arg0) + ((= arg0 1) + (send-event *camera* 'toggle-slave-option (cam-slave-options SAME_SIDE)) + ) + ((= arg0 2) + (send-event *camera* 'toggle-slave-option (cam-slave-options MOVE_SPHERICAL)) + ) + ((= arg0 3) + (send-event *camera* 'toggle-slave-option (cam-slave-options DRAG)) + ) + ((= arg0 4) + (send-event *camera* 'toggle-slave-option (cam-slave-options ALLOW_Z_ROT)) + ) + ((= arg0 6) + (set-setting-by-param *setting-control* 'slave-options 'clear 0 16) + ) + ((= arg0 7) + (send-event *camera* 'toggle-slave-option (cam-slave-options FIND_HIDDEN_TARGET)) + ) + ((= arg0 8) + (send-event *camera* 'toggle-slave-option (cam-slave-options COLLIDE)) + ) + ((= arg0 9) + (send-event *camera* 'toggle-slave-option (cam-slave-options LINE_OF_SIGHT)) + ) + ((= arg0 10) + (send-event *camera* 'toggle-slave-option (cam-slave-options NO_ROTATE)) + ) + ((= arg0 11) + (send-event *camera* 'toggle-slave-option (cam-slave-options STICKY_ANGLE)) ) - (else - (format 0 "Unrecognized camera settings menu item selected: ~I~%" arg0) - ) ) ) (cond (*camera* - (case arg0 - (((cam-slave-options JUMP_PITCHES)) - (not (setting-control-method-14 *setting-control* 'slave-options)) - ) - (((cam-slave-options BUTT_CAM) - (cam-slave-options SAME_SIDE) - (cam-slave-options MOVE_SPHERICAL) - (cam-slave-options ALLOW_Z_ROT) - (cam-slave-options COLLIDE) - (cam-slave-options FIND_HIDDEN_TARGET) - (cam-slave-options DRAG) - (cam-slave-options LINE_OF_SIGHT) - (cam-slave-options STICKY_ANGLE) - (cam-slave-options NO_ROTATE) - ) - (logtest? (-> *camera* slave-options) arg0) - ) + (cond + ((zero? arg0) + (logtest? (-> *camera* slave-options) 1) + ) + ((= arg0 1) + (logtest? (-> *camera* slave-options) 2) + ) + ((= arg0 2) + (logtest? (-> *camera* slave-options) 4) + ) + ((= arg0 3) + (logtest? (-> *camera* slave-options) 128) + ) + ((= arg0 4) + (logtest? (-> *camera* slave-options) 8) + ) + ((= arg0 6) + (not (setting-control-method-14 *setting-control* 'slave-options)) + ) + ((= arg0 7) + (logtest? (-> *camera* slave-options) 64) + ) + ((= arg0 8) + (logtest? (-> *camera* slave-options) 32) + ) + ((= arg0 9) + (logtest? (-> *camera* slave-options) 512) + ) + ((= arg0 10) + (logtest? (-> *camera* slave-options) #x4000) + ) + ((= arg0 11) + (logtest? (-> *camera* slave-options) #x8000) + ) (else #f ) @@ -578,42 +606,42 @@ (when (= arg1 (debug-menu-msg press)) (cond ((zero? (/ (the-as int arg0) 8)) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 7) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 1) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 10) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 2) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 12) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 3) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 14) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 4) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 18) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 5) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 19) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 6) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 23) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 7) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 4) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) @@ -625,11 +653,11 @@ #x42700000 #x3f800000 ) - 600 + (seconds 2) ) ) (else - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (set! (-> *time-of-day-context* mode) (logand (logxor (-> *time-of-day-context* mode) (the-as uint (/ (the-as int arg0) 8))) (time-of-day-palette-id palette-0 palette-1 palette-2 palette-3 palette-4 palette-5 palette-6 palette-7) @@ -666,7 +694,7 @@ #x42700000 #x3f800000 ) - 600 + (seconds 2) ) ) ) @@ -702,7 +730,7 @@ (set! (-> *time-of-day-context* mode) (time-of-day-palette-id palette-7)) ) ) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) ) (cond ((zero? (/ (the-as int arg0) 8)) @@ -1435,37 +1463,37 @@ ) (debug-menu-append-item s4-1 s3-2) ) - (let ((a1-36 (new 'debug 'debug-menu-item-flag "Butt cam" (cam-slave-options BUTT_CAM) dm-cam-settings-func))) + (let ((a1-36 (new 'debug 'debug-menu-item-flag "Butt cam" 0 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-36) ) - (let ((a1-38 (new 'debug 'debug-menu-item-flag "Same side" (cam-slave-options SAME_SIDE) dm-cam-settings-func))) + (let ((a1-38 (new 'debug 'debug-menu-item-flag "Same side" 1 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-38) ) - (let ((a1-40 (new 'debug 'debug-menu-item-flag "Move spherical" (cam-slave-options MOVE_SPHERICAL) dm-cam-settings-func))) + (let ((a1-40 (new 'debug 'debug-menu-item-flag "Move spherical" 2 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-40) ) - (let ((a1-42 (new 'debug 'debug-menu-item-flag "Drag" (cam-slave-options DRAG) dm-cam-settings-func))) + (let ((a1-42 (new 'debug 'debug-menu-item-flag "Drag" 3 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-42) ) - (let ((a1-44 (new 'debug 'debug-menu-item-flag "Allow Z rot" (cam-slave-options ALLOW_Z_ROT) dm-cam-settings-func))) + (let ((a1-44 (new 'debug 'debug-menu-item-flag "Allow Z rot" 4 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-44) ) - (let ((a1-46 (new 'debug 'debug-menu-item-flag "Pitch for jump" (cam-slave-options JUMP_PITCHES) dm-cam-settings-func))) + (let ((a1-46 (new 'debug 'debug-menu-item-flag "Pitch for jump" 6 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-46) ) - (let ((a1-48 (new 'debug 'debug-menu-item-flag "Find hidden target" (cam-slave-options FIND_HIDDEN_TARGET) dm-cam-settings-func))) + (let ((a1-48 (new 'debug 'debug-menu-item-flag "Find hidden target" 7 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-48) ) - (let ((a1-50 (new 'debug 'debug-menu-item-flag "Collide" (cam-slave-options COLLIDE) dm-cam-settings-func))) + (let ((a1-50 (new 'debug 'debug-menu-item-flag "Collide" 8 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-50) ) - (let ((a1-52 (new 'debug 'debug-menu-item-flag "Line of Sight" (cam-slave-options LINE_OF_SIGHT) dm-cam-settings-func))) + (let ((a1-52 (new 'debug 'debug-menu-item-flag "Line of Sight" 9 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-52) ) - (let ((a1-54 (new 'debug 'debug-menu-item-flag "No Rotate" (cam-slave-options NO_ROTATE) dm-cam-settings-func))) + (let ((a1-54 (new 'debug 'debug-menu-item-flag "No Rotate" 10 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-54) ) - (let ((a1-56 (new 'debug 'debug-menu-item-flag "Sticky Angle" (cam-slave-options STICKY_ANGLE) dm-cam-settings-func))) + (let ((a1-56 (new 'debug 'debug-menu-item-flag "Sticky Angle" 11 dm-cam-settings-func))) (debug-menu-append-item s4-1 a1-56) ) (let ((s3-3 (new 'debug 'debug-menu-item-var "Interp Frms" 40 80))) @@ -3935,7 +3963,7 @@ (-> *game-info* debug-features) (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) ) - (send-event *target* 'get-pickup 7 #x42c80000) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0) ) ) (function "manual" #f ,(lambda ((arg0 object) (arg1 debug-menu-msg)) @@ -4024,13 +4052,13 @@ "Full Stuff" #f ,(lambda () - (send-event *target* 'get-pickup 18 #x447a0000) - (send-event *target* 'get-pickup 17 #x447a0000) - (send-event *target* 'get-pickup 13 #x447a0000) - (send-event *target* 'get-pickup 14 #x447a0000) - (send-event *target* 'get-pickup 15 #x447a0000) - (send-event *target* 'get-pickup 16 #x447a0000) - (send-event *target* 'get-pickup 7 #x42c80000) + (send-event *target* 'get-pickup (pickup-type health) 1000.0) + (send-event *target* 'get-pickup (pickup-type shield) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0) (logior! (-> *game-info* features) (game-feature gun gun-yellow gun-red gun-blue gun-dark board darkjak)) (let ((v0-7 (logior (-> *game-info* debug-features) (game-feature gun gun-yellow gun-red gun-blue gun-dark board darkjak)) @@ -4045,14 +4073,14 @@ "Dump Stuff" #f ,(lambda () - (send-event *target* 'get-pickup 17 -998637568) - (send-event *target* 'get-pickup 13 -998637568) - (send-event *target* 'get-pickup 14 -998637568) - (send-event *target* 'get-pickup 15 -998637568) - (send-event *target* 'get-pickup 16 -998637568) + (send-event *target* 'get-pickup (pickup-type shield) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-yellow) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-red) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-blue) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-dark) -1000.0) ) ) - (function "Trick Mode" #f ,(lambda () (send-event *target* 'get-pickup 20 #x468ca000))) + (function "Trick Mode" #f ,(lambda () (send-event *target* 'get-pickup (pickup-type trick-judge) 18000.0))) (function "Reset Trans" #f ,(lambda () (when *target* (position-in-front-of-camera! (target-pos 0) 40960.0 4096.0) (set! (-> *target* control transv quad) (the-as uint128 0)) diff --git a/goal_src/jak2/engine/game/game-info.gc b/goal_src/jak2/engine/game/game-info.gc index 626f8f5012..4b53a7131d 100644 --- a/goal_src/jak2/engine/game/game-info.gc +++ b/goal_src/jak2/engine/game/game-info.gc @@ -792,7 +792,7 @@ ) (sound-play "get-green-eco") ) - (send-event (-> obj process) 'color-effect 'health 60) + (send-event (-> obj process) 'color-effect 'health (seconds 0.2)) (when (handle->process arg2) (set! (-> obj eco-source) arg2) (set! (-> obj eco-source-time) (-> *display* game-clock frame-counter)) @@ -836,7 +836,7 @@ (if (>= (- (-> *display* game-clock frame-counter) (-> obj eco-pill-dark-pickup-time)) (seconds 0.05)) (sound-play "get-dark-eco") ) - (send-event (-> obj process) 'color-effect 'eco-pill-dark 60) + (send-event (-> obj process) 'color-effect 'eco-pill-dark (seconds 0.2)) (cond ((>= (- (-> *display* game-clock frame-counter) (-> (the-as target (-> obj process)) shock-effect-time)) (seconds 0.1) @@ -1011,7 +1011,7 @@ ) ) (if (< 0.0 arg1) - (send-event (-> obj process) 'color-effect ammo-kind 60) + (send-event (-> obj process) 'color-effect ammo-kind (seconds 0.2)) ) (give (-> (the-as target (-> obj process)) game) ammo-kind arg1 arg2) ) diff --git a/goal_src/jak2/engine/game/game-save.gc b/goal_src/jak2/engine/game/game-save.gc index 7af24f3c0e..23f3a4e0db 100644 --- a/goal_src/jak2/engine/game/game-save.gc +++ b/goal_src/jak2/engine/game/game-save.gc @@ -1712,7 +1712,7 @@ auto-save-post (defbehavior auto-save-init-by-other auto-save ((arg0 symbol) (arg1 process) (arg2 int) (arg3 int) (arg4 symbol)) (when (handle->process (-> *game-info* auto-save-proc)) - (send-event arg1 'notify 'error 16) + (send-event arg1 'notify 'error (mc-status-code no-process)) (return #f) ) (set! (-> *game-info* auto-save-proc) (process->handle self)) @@ -2287,7 +2287,7 @@ auto-save-post ) (let ((gp-0 *auto-save-info*)) (mem-copy! (the-as pointer gp-0) (the-as pointer (-> self info)) 300) - (send-event (handle->process (-> self notify)) 'notify 'done 1 gp-0) + (send-event (handle->process (-> self notify)) 'notify 'done (mc-status-code ok) gp-0) ) (none) ) diff --git a/goal_src/jak2/engine/game/main.gc b/goal_src/jak2/engine/game/main.gc index 0f922ec17c..12fdc5a15b 100644 --- a/goal_src/jak2/engine/game/main.gc +++ b/goal_src/jak2/engine/game/main.gc @@ -1072,13 +1072,13 @@ ((lambda () (cond ((cpad-pressed? 1 x) - (send-event *target* 'get-pickup 13 #x447a0000) - (send-event *target* 'get-pickup 14 #x447a0000) - (send-event *target* 'get-pickup 15 #x447a0000) - (send-event *target* 'get-pickup 16 #x447a0000) - (send-event *target* 'get-pickup 7 #x447a0000) - (send-event *target* 'get-pickup 22 #x447a0000) - (send-event *target* 'get-pickup 21 #x447a0000) + (send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 1000.0) + (send-event *target* 'get-pickup (pickup-type skill) 1000.0) + (send-event *target* 'get-pickup (pickup-type gem) 1000.0) (logior! (-> *game-info* features) (game-feature diff --git a/goal_src/jak2/engine/game/task/task-control.gc b/goal_src/jak2/engine/game/task/task-control.gc index 0c267dd5c5..03155be342 100644 --- a/goal_src/jak2/engine/game/task/task-control.gc +++ b/goal_src/jak2/engine/game/task/task-control.gc @@ -472,7 +472,7 @@ (set! (-> *level* play?) #t) (time-of-day-setup #t) (set! *time-of-day-fast* #f) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) (when arg0 (let ((s5-0 (-> *game-info* mode))) (set! (-> *game-info* mode) arg0) @@ -807,7 +807,7 @@ (if (logtest? (-> arg0 flags) (game-task-node-flag close-task)) ((lambda ((arg0 game-task-node-info)) (if *target* - (send-event *target* 'get-pickup 10 (the float (-> arg0 task))) + (send-event *target* 'get-pickup (pickup-type fuel-cell) (the float (-> arg0 task))) (give *game-info* 'fuel-cell (the float (-> arg0 task)) (the-as handle #f)) ) ) diff --git a/goal_src/jak2/engine/level/level.gc b/goal_src/jak2/engine/level/level.gc index 55d685e76f..61d5204d2f 100644 --- a/goal_src/jak2/engine/level/level.gc +++ b/goal_src/jak2/engine/level/level.gc @@ -2201,7 +2201,7 @@ into 7 sections, which might explain the weird sizes in the center. ) (set! *time-of-day-fast* #f) (load-commands-set! *level* '()) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 7) (send-event (ppointer->process *time-of-day*) 'change 'minutes 0) (send-event (ppointer->process *time-of-day*) 'change 'seconds 0) diff --git a/goal_src/jak2/engine/target/board/board-states.gc b/goal_src/jak2/engine/target/board/board-states.gc index f1d2a61801..a0f394fa7f 100644 --- a/goal_src/jak2/engine/target/board/board-states.gc +++ b/goal_src/jak2/engine/target/board/board-states.gc @@ -419,7 +419,7 @@ (quaternion-copy! (-> (the-as board (-> s5-1 0)) root quat) (-> self control quat-for-control)) (send-event (ppointer->process s5-1) 'anim-mode 'play1) (send-event (ppointer->process s5-1) 'anim "idle") - (send-event (ppointer->process s5-1) 'speed #x3fc00000) + (send-event (ppointer->process s5-1) 'speed 1.5) (set-vector! (-> (the-as board (-> s5-1 0)) root scale) 0.2 0.4 0.2 1.0) ) ) @@ -975,7 +975,7 @@ (quaternion-copy! (-> (the-as board (-> s2-2 0)) root quat) (-> self control quat-for-control)) (send-event (ppointer->process s2-2) 'anim-mode 'play1) (send-event (ppointer->process s2-2) 'anim "idle") - (send-event (ppointer->process s2-2) 'speed #x3fc00000) + (send-event (ppointer->process s2-2) 'speed 1.5) (set-vector! (-> (the-as board (-> s2-2 0)) root scale) 0.2 0.4 0.2 1.0) ) ) @@ -3265,7 +3265,7 @@ (('shock 'shock-red 'shockup) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (send-event self 'color-effect 'shock 60) + (send-event self 'color-effect 'shock (seconds 0.2)) (process-drawable-shock-effect self (-> *lightning-spec-id-table* 1) diff --git a/goal_src/jak2/engine/target/board/target-board.gc b/goal_src/jak2/engine/target/board/target-board.gc index 23b1311152..9f682070b2 100644 --- a/goal_src/jak2/engine/target/board/target-board.gc +++ b/goal_src/jak2/engine/target/board/target-board.gc @@ -3036,7 +3036,7 @@ (-> obj trick-list) (-> obj trick-count) ) - (send-event (ppointer->process (-> obj process)) 'get-pickup 19 f30-0) + (send-event (ppointer->process (-> obj process)) 'get-pickup (pickup-type trick-point) f30-0) (sound-play "trick-score") (#when PC_PORT (end-combo! *board-trick-tracker*)) diff --git a/goal_src/jak2/engine/target/collide-reaction-target.gc b/goal_src/jak2/engine/target/collide-reaction-target.gc index cf37f67f08..11b5c5c2ad 100644 --- a/goal_src/jak2/engine/target/collide-reaction-target.gc +++ b/goal_src/jak2/engine/target/collide-reaction-target.gc @@ -590,7 +590,7 @@ (* 81920.0 (-> self clock seconds-per-frame)) ) ) - 90 + (seconds 0.3) ) ) ) diff --git a/goal_src/jak2/engine/target/logic-target.gc b/goal_src/jak2/engine/target/logic-target.gc index 760570193d..0127133765 100644 --- a/goal_src/jak2/engine/target/logic-target.gc +++ b/goal_src/jak2/engine/target/logic-target.gc @@ -2231,7 +2231,7 @@ (vector+! v1-10 s4-1 s3-1) (vector-float*! v1-10 v1-10 0.5) (+! (-> v1-10 y) -6144.0) - (send-event *camera* 'ease-in #x3f000000 v1-10) + (send-event *camera* 'ease-in 0.5 v1-10) ) (vector-segment-distance-point! (-> self control midpoint-of-hands) s4-1 s3-1 s5-0) (if (< (- (current-time) (-> self state-time)) (seconds 0.05)) diff --git a/goal_src/jak2/engine/target/mech/mech-states.gc b/goal_src/jak2/engine/target/mech/mech-states.gc index 56d5b886c8..38f505e3dc 100644 --- a/goal_src/jak2/engine/target/mech/mech-states.gc +++ b/goal_src/jak2/engine/target/mech/mech-states.gc @@ -2189,7 +2189,7 @@ (fill-and-probe-using-spheres *collide-cache* gp-1) ) ) - (send-event self 'push 150) + (send-event self 'push (seconds 0.5)) (send-event self 'drop) ) ) diff --git a/goal_src/jak2/engine/target/mech/mech.gc b/goal_src/jak2/engine/target/mech/mech.gc index 91339e48fd..6a8c62eae4 100644 --- a/goal_src/jak2/engine/target/mech/mech.gc +++ b/goal_src/jak2/engine/target/mech/mech.gc @@ -54,7 +54,7 @@ object (case event-type (('attack 'bonk) - (send-event proc 'target-mech-get-off 90) + (send-event proc 'target-mech-get-off (seconds 0.3)) (let ((a1-3 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-3 from) (process->ppointer self)) (set! (-> a1-3 num-params) 2) @@ -76,7 +76,7 @@ (the-as structure #f) ) (('touch) - (send-event proc 'target-mech-get-off 90) + (send-event proc 'target-mech-get-off (seconds 0.3)) (send-shoves (-> self root) proc (the-as touching-shapes-entry (-> event param 0)) 0.7 6144.0 16384.0) (the-as structure #f) ) diff --git a/goal_src/jak2/engine/target/target-darkjak.gc b/goal_src/jak2/engine/target/target-darkjak.gc index c27d10ac67..4257765dd8 100644 --- a/goal_src/jak2/engine/target/target-darkjak.gc +++ b/goal_src/jak2/engine/target/target-darkjak.gc @@ -9,8 +9,6 @@ ;; DECOMP BEGINS -(format 0 "SKIP: process-drawable-shock-wall-effect in target-darkjak~%") - (defbehavior target-darkjak-setup target ((arg0 symbol)) (when (zero? (-> self darkjak)) (set! (-> self darkjak) (new 'process 'darkjak-info)) @@ -94,9 +92,8 @@ (none) ) -;; ERROR: Function may read a register that is not set: t2 (defbehavior target-darkjak-process target () - (local-vars (t2-0 none) (gp-0 vector)) + (local-vars (gp-0 vector)) (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) (let ((a1-0 'eco-red)) @@ -219,42 +216,34 @@ (s2-0 *launch-matrix*) ) (set! (-> s2-0 trans quad) (-> (process-drawable-random-point! self (new 'stack-no-clear 'vector)) quad)) - (let ((a3-8 #f) - (t0-5 #f) - (t1-0 1.0) - ) - (gp-1 s5-0 s4-0 s2-0 (the-as sparticle-launch-state a3-8) (the-as sparticle-launch-control t0-5) t1-0) - (cond - ((rand-vu-percent? 0.25) - (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) - (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - ;; (process-drawable-shock-wall-effect - ;; self - ;; (-> *lightning-spec-id-table* 8) - ;; lightning-probe-callback - ;; (-> *part-id-table* 179) - ;; (the-as int t0-5) - ;; (the-as int t1-0) - ;; (the-as float t2-0) - ;; ) - ) + (gp-1 s5-0 s4-0 s2-0 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (cond + ((rand-vu-percent? 0.25) + (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) + (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) + (process-drawable-shock-wall-effect + self + (-> *lightning-spec-id-table* 8) + lightning-probe-callback + (-> *part-id-table* 179) ) - ((rand-vu-percent? 0.1) - (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) - (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (process-drawable-shock-effect - self - (-> *lightning-spec-id-table* 6) - lightning-probe-callback - (-> *part-id-table* 179) - 0 - 0 - 40960.0 - ) - ) + ) + ) + ((rand-vu-percent? 0.1) + (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) + (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) + (process-drawable-shock-effect + self + (-> *lightning-spec-id-table* 6) + lightning-probe-callback + (-> *part-id-table* 179) + 0 + 0 + 40960.0 ) - ) - ) + ) + ) ) ) ) @@ -1827,7 +1816,7 @@ ) (set! (-> self darkjak clock-vel) -4.0) (set! (-> self darkjak clock-on) #t) - (send-event *camera* 'joystick -1098907648 #x3f800000) + (send-event *camera* 'joystick -0.25 1.0) (when (>= (- (current-time) sv-72) (seconds 0.1)) (set! sv-72 (current-time)) (target-bomb1-fire-shot sv-60 sv-64 sv-48 (the-as int sv-104)) diff --git a/goal_src/jak2/engine/target/target-death.gc b/goal_src/jak2/engine/target/target-death.gc index b79fec50da..44c29c6edb 100644 --- a/goal_src/jak2/engine/target/target-death.gc +++ b/goal_src/jak2/engine/target/target-death.gc @@ -624,7 +624,7 @@ (('shock 'shockup 'shock-red 'shock-green) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (send-event self 'color-effect 'shock 60) + (send-event self 'color-effect 'shock (seconds 0.2)) (case (-> arg4 mode) (('shock-red) (process-drawable-shock-effect @@ -1191,7 +1191,7 @@ ) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (send-event self 'color-effect 'shock 60) + (send-event self 'color-effect 'shock (seconds 0.2)) (case (-> sv-32 mode) (('shock-red) (process-drawable-shock-effect @@ -1325,7 +1325,7 @@ ) (defbehavior target-death-anim-trans target () - (send-event *camera* 'joystick 0 -1082130432) + (send-event *camera* 'joystick 0.0 -1.0) (compute-alignment! (-> self align)) (let ((gp-0 (new 'stack-no-clear 'vector))) (when (not (logtest? (-> self align flags) (align-flags disabled))) @@ -1456,7 +1456,7 @@ (ja-post) ) (while (not (-> self control unknown-spool-anim00)) - (send-event *camera* 'joystick 0 -1082130432) + (send-event *camera* 'joystick 0.0 -1.0) (suspend) ) ) diff --git a/goal_src/jak2/engine/target/target-gun.gc b/goal_src/jak2/engine/target/target-gun.gc index 4947a0887a..6673ad1c8c 100644 --- a/goal_src/jak2/engine/target/target-gun.gc +++ b/goal_src/jak2/engine/target/target-gun.gc @@ -364,7 +364,7 @@ (when (using-gun? self) (set! (-> self gun fire-pending) 0) (mode-set! (-> self gun hips) (joint-mod-mode flex-blend)) - (send-event *camera* 'clear-slave-option #x58000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE BLOCK_RIGHT_STICK GUN_CAM)) (send-event *camera* 'set-dist #f #f) (send-event *camera* 'yes-follow) (let ((v1-16 (the-as sound-rpc-set-param (get-sound-buffer-entry)))) @@ -1336,7 +1336,7 @@ (let ((s5-2 (handle->process (-> self gun track-target 1 handle)))) (cond ((logtest? (surface-flag gun-strafe) (-> self control current-surface flags)) - (send-event *camera* 'set-slave-option #x8000) + (send-event *camera* 'set-slave-option (cam-slave-options STICKY_ANGLE)) ) ((the-as process-focusable s5-2) (let ((s4-5 (get-trans (the-as process-focusable s5-2) 3))) @@ -1348,20 +1348,20 @@ (let ((a0-91 (abs v1-173))) (cond ((< a0-91 65) - (send-event *camera* 'set-slave-option #x8000) + (send-event *camera* 'set-slave-option (cam-slave-options STICKY_ANGLE)) ) ((let ((a0-95 120)) (set! v1-173 (abs v1-173)) (< a0-95 v1-173) ) - (send-event *camera* 'clear-slave-option #x8000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE)) ) ) ) ) ) (else - (send-event *camera* 'clear-slave-option #x8000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE)) ) ) ) @@ -1371,7 +1371,7 @@ ) ) (else - (send-event *camera* 'clear-slave-option #x8000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE)) ) ) ) diff --git a/goal_src/jak2/engine/target/target-h.gc b/goal_src/jak2/engine/target/target-h.gc index 4895df9615..28fef70b62 100644 --- a/goal_src/jak2/engine/target/target-h.gc +++ b/goal_src/jak2/engine/target/target-h.gc @@ -120,7 +120,6 @@ (define-extern target-darkjak-get-off (state target)) (define-extern set-darkjak-texture-morph! (function float none)) (define-extern process-drawable-random-point! (function process-drawable vector vector)) -(define-extern process-drawable-shock-wall-effect (function process-drawable lightning-spec (function lightning-tracker none) sparticle-launcher int int float none)) (define-extern target-grab (state symbol target)) (define-extern target-darkjak-giant (state target)) (define-extern target-falling-anim-trans (function none :behavior target)) diff --git a/goal_src/jak2/engine/target/target-handler.gc b/goal_src/jak2/engine/target/target-handler.gc index ae56ee3abb..0ab6fa60a7 100644 --- a/goal_src/jak2/engine/target/target-handler.gc +++ b/goal_src/jak2/engine/target/target-handler.gc @@ -349,7 +349,7 @@ (s2-0 s1-0 s0-0 sv-128 (the-as sparticle-launch-state a3-0) (the-as sparticle-launch-control t0-0) t1-0) ) ) - (send-event (ppointer->process gp-0) 'color-effect 'dark 60) + (send-event (ppointer->process gp-0) 'color-effect 'dark (seconds 0.2)) (when (>= (- (current-time) (the-as time-frame s4-0)) (seconds 0.05)) (set! s4-0 (the-as int (current-time))) (cond @@ -363,7 +363,7 @@ ) ) (else - (send-event (handle->process arg0) 'color-effect 'shock 60) + (send-event (handle->process arg0) 'color-effect 'shock (seconds 0.2)) (process-drawable-shock-effect (the-as process-drawable (ppointer->process gp-0)) (-> *lightning-spec-id-table* 9) diff --git a/goal_src/jak2/engine/target/target-part.gc b/goal_src/jak2/engine/target/target-part.gc index 4b0cbd6a83..7d6b82a9eb 100644 --- a/goal_src/jak2/engine/target/target-part.gc +++ b/goal_src/jak2/engine/target/target-part.gc @@ -2551,7 +2551,13 @@ (the-as object 0) ) -;; ERROR: function was not converted to expressions. Cannot decompile. +(defun process-drawable-shock-wall-effect ((arg0 process-drawable) + (arg1 lightning-spec) + (arg2 (function lightning-tracker none)) + (arg3 sparticle-launcher) + ) + ;; this function was stubbed out in the original game, leaving nothing but completely broken and unusable code behind. + #f) (defun process-drawable2-shock-effect ((arg0 process-drawable) (arg1 process-drawable) diff --git a/goal_src/jak2/engine/target/target-util.gc b/goal_src/jak2/engine/target/target-util.gc index f39d9af1b4..47b6974ca5 100644 --- a/goal_src/jak2/engine/target/target-util.gc +++ b/goal_src/jak2/engine/target/target-util.gc @@ -1196,7 +1196,7 @@ (>= (target-height-above-ground) arg1) ) (if (< (- (current-time) (-> self control rider-time)) (the-as time-frame (-> *TARGET-bank* ground-timeout))) - (send-event self 'push-transv (-> self control rider-last-move) #x7530) + (send-event self 'push-transv (-> self control rider-last-move) (seconds 100)) ) (go arg0 #f) ) diff --git a/goal_src/jak2/engine/target/target.gc b/goal_src/jak2/engine/target/target.gc index ba612eaae1..dfcf05218b 100644 --- a/goal_src/jak2/engine/target/target.gc +++ b/goal_src/jak2/engine/target/target.gc @@ -597,7 +597,7 @@ (set! s3-1 (+ s3-1 f0-8)) (set! s2-1 (+ s2-1 f0-8)) ) - (send-event self 'push-transv (-> self control rider-last-move) #x7530) + (send-event self 'push-transv (-> self control rider-last-move) (seconds 100)) ) (set! (-> self control unknown-float36) 0.0) (set! (-> self control unknown-float37) 0.0) diff --git a/goal_src/jak2/engine/target/target2.gc b/goal_src/jak2/engine/target/target2.gc index d40cd260d7..d14454a610 100644 --- a/goal_src/jak2/engine/target/target2.gc +++ b/goal_src/jak2/engine/target/target2.gc @@ -1070,7 +1070,7 @@ (set! (-> self gun surpress-time) (+ (current-time) (seconds 0.2))) (vector-float*! (-> self control transv) (-> self control edge-grab-across-edge-dir) -40960.0) (if (< (- (current-time) (-> self control rider-time)) (seconds 0.2)) - (send-event self 'push-transv (-> self control rider-last-move) #x7530) + (send-event self 'push-transv (-> self control rider-last-move) (seconds 100)) ) (go target-falling 'target-edge-grab) (none) diff --git a/goal_src/jak2/levels/city/ctywide-obs.gc b/goal_src/jak2/levels/city/ctywide-obs.gc index f5f9feee8e..331efdbb24 100644 --- a/goal_src/jak2/levels/city/ctywide-obs.gc +++ b/goal_src/jak2/levels/city/ctywide-obs.gc @@ -299,7 +299,7 @@ ) (when s5-1 (send-event (ppointer->process s5-1) 'anim-mode 'play1) - (send-event (ppointer->process s5-1) 'speed #x3fc00000) + (send-event (ppointer->process s5-1) 'speed 1.5) (send-event (ppointer->process s5-1) 'art-joint-anim "generic-ripples-idle" 0) (set-vector! (-> (the-as process-drawable (-> s5-1 0)) root scale) 1.0 1.0 1.0 1.0) (quaternion-rotate-local-x! (-> (the-as process-drawable (-> s5-1 0)) root quat) (-> self root quat) -16384.0) diff --git a/goal_src/jak2/levels/city/ctywide-tasks.gc b/goal_src/jak2/levels/city/ctywide-tasks.gc index 5231b56fcc..f952ee827f 100644 --- a/goal_src/jak2/levels/city/ctywide-tasks.gc +++ b/goal_src/jak2/levels/city/ctywide-tasks.gc @@ -112,10 +112,10 @@ ) (suspend) (let ((gp-0 *traffic-manager*)) - (send-event gp-0 'deactivate-by-type 6) - (send-event gp-0 'deactivate-by-type 18) - (send-event gp-0 'deactivate-by-type 19) - (send-event gp-0 'deactivate-by-type 20) + (send-event gp-0 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event gp-0 'deactivate-by-type (traffic-type guard-bike)) + (send-event gp-0 'deactivate-by-type (traffic-type hellcat)) + (send-event gp-0 'deactivate-by-type (traffic-type traffic-type-20)) (send-event gp-0 'set-guard-target-level 0) ) (set-setting! 'pilot #f 0.0 0) @@ -452,7 +452,7 @@ (lambda :behavior task-manager () (local-vars (v1-7 symbol)) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (until (or v1-7 (and *target* (focus-test? *target* pilot))) (suspend) (let ((f0-0 122880.0)) @@ -472,7 +472,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (send-event *target* 'end-mode) (set-setting! 'pilot #f 0.0 0) (set! (-> self state-time) (current-time)) @@ -803,7 +803,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'restore-default-settings) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (none) ) ) diff --git a/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc b/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc index 0888a4ea7c..bc6e9c7d09 100644 --- a/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc +++ b/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc @@ -396,8 +396,8 @@ (send-event gp-0 'set-guard-target-count-range 4 0 0) (send-event gp-0 'set-guard-target-count-range 5 0 0) (send-event gp-0 'set-guard-target-count-range 0 6 6) - (send-event gp-0 'set-alert-duration #xa4cb80) - (send-event gp-0 'set-object-reserve-count 6 #x7d00) + (send-event gp-0 'set-alert-duration (seconds 36000)) + (send-event gp-0 'set-object-reserve-count (traffic-type crimson-guard-1) #x7d00) (when arg0 (send-event gp-0 'set-guard-force-visible #t) (let ((s4-1 (new 'stack 'traffic-object-spawn-params))) @@ -1421,9 +1421,9 @@ (send-event s5-0 'set-alert-level 1) (send-event s5-0 'set-max-alert-level 1) (send-event s5-0 'set-guard-target-count-range 4 0 0) - (send-event s5-0 'end-pursuit-by-type 18) + (send-event s5-0 'end-pursuit-by-type (traffic-type guard-bike)) (send-event s5-0 'set-guard-target-count-range 5 0 0) - (send-event s5-0 'end-pursuit-by-type 19) + (send-event s5-0 'end-pursuit-by-type (traffic-type hellcat)) ) (let ((v1-43 (get-task-by-type (-> arg0 ai-ctrl) halt-wait-spot arg0))) (set! (-> v1-43 bytes 5) 1) @@ -1549,7 +1549,7 @@ ) ) (when (not (logtest? (-> arg1 bot-task-bits) 1)) - (send-event *traffic-manager* 'set-alert-duration 300) + (send-event *traffic-manager* 'set-alert-duration (seconds 1)) (logior! (-> arg1 bot-task-bits) 1) ) (when (not (hal-escort-method-230 arg1)) @@ -1589,7 +1589,7 @@ (when (logtest? (-> arg1 bot-task-bits) 1) (let ((s5-1 *traffic-manager*)) (send-event s5-1 'set-alert-level 1) - (send-event s5-1 'set-alert-duration #xa4cb80) + (send-event s5-1 'set-alert-duration (seconds 36000)) ) (logand! (-> arg1 bot-task-bits) -2) ) @@ -1676,10 +1676,10 @@ ) (logior! (-> arg1 waypoint-bits) 2) (let ((s5-0 *traffic-manager*)) - (send-event s5-0 'deactivate-by-type 6) - (send-event s5-0 'deactivate-by-type 18) - (send-event s5-0 'deactivate-by-type 19) - (send-event s5-0 'deactivate-by-type 20) + (send-event s5-0 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event s5-0 'deactivate-by-type (traffic-type guard-bike)) + (send-event s5-0 'deactivate-by-type (traffic-type hellcat)) + (send-event s5-0 'deactivate-by-type (traffic-type traffic-type-20)) ) ) (when (and (not (logtest? (-> arg1 waypoint-bits) 1)) @@ -1757,7 +1757,7 @@ :on-set (lambda ((arg0 hal-escort)) (remove-setting! 'sound-mode) (let ((a0-2 *traffic-manager*)) - (send-event a0-2 'deactivate-by-type 6) + (send-event a0-2 'deactivate-by-type (traffic-type crimson-guard-1)) ) (let ((v1-8 (get-task-by-type (-> arg0 ai-ctrl) halt-wait-spot arg0))) (set! (-> v1-8 bytes 5) 1) @@ -1885,7 +1885,7 @@ (remove-setting! 'music) (remove-setting! 'sound-mode) (let ((a0-3 *traffic-manager*)) - (send-event a0-3 'deactivate-by-type 6) + (send-event a0-3 'deactivate-by-type (traffic-type crimson-guard-1)) ) (set-action! *gui-control* diff --git a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc index 4c850cb8ad..f44881216a 100644 --- a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc +++ b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc @@ -2683,7 +2683,7 @@ () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-lurker :init hud-init-by-other :to self))) (suspend) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) @@ -2706,7 +2706,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (send-event *target* 'end-mode) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 2)) @@ -3249,7 +3249,7 @@ () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-lurker :init hud-init-by-other :to self))) (suspend) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) diff --git a/goal_src/jak2/levels/city/oracle/oracle-training.gc b/goal_src/jak2/levels/city/oracle/oracle-training.gc index 805db73117..9e5ff71544 100644 --- a/goal_src/jak2/levels/city/oracle/oracle-training.gc +++ b/goal_src/jak2/levels/city/oracle/oracle-training.gc @@ -13,7 +13,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -29,7 +29,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! @@ -107,7 +107,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -123,7 +123,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! @@ -201,7 +201,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -218,7 +218,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! @@ -276,7 +276,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -292,7 +292,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! diff --git a/goal_src/jak2/levels/city/package/delivery-task.gc b/goal_src/jak2/levels/city/package/delivery-task.gc index 0496e2c3a2..bedcef68af 100644 --- a/goal_src/jak2/levels/city/package/delivery-task.gc +++ b/goal_src/jak2/levels/city/package/delivery-task.gc @@ -173,7 +173,7 @@ This commonly includes things such as: ) ) ) - (send-event gp-1 'set-target-level #x3f800000) + (send-event gp-1 'set-target-level 1.0) (send-event gp-1 'set-guard-target-count-range 4 0 1) (send-event gp-1 'set-guard-target-count-range 5 0 0) ) @@ -465,7 +465,7 @@ This commonly includes things such as: (send-event *traffic-manager* 'set-guard-target-count-range 4 0 10) (send-event *traffic-manager* 'set-guard-target-count-range 5 0 10) (send-event *traffic-manager* 'set-alert-level 3) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (speech-table-set! *speech-control* (speech-type speech-type-7) (new 'static 'speech-type-info :channel #x1 :priority -2 @@ -516,7 +516,7 @@ This commonly includes things such as: (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (if (and *target* (focus-test? *target* pilot)) (send-event *target* 'change-mode 'normal) ) diff --git a/goal_src/jak2/levels/city/port/portrun/portrun.gc b/goal_src/jak2/levels/city/port/portrun/portrun.gc index 96f56cb6b0..488498dbaf 100644 --- a/goal_src/jak2/levels/city/port/portrun/portrun.gc +++ b/goal_src/jak2/levels/city/port/portrun/portrun.gc @@ -1880,13 +1880,13 @@ TASK_MANAGER_CODE_HOOK (lambda :behavior task-manager () - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) ) (send-event *traffic-manager* 'set-alert-level 1) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) diff --git a/goal_src/jak2/levels/city/port/race/errol-chal.gc b/goal_src/jak2/levels/city/port/race/errol-chal.gc index de6a8baf15..70c7be6cb0 100644 --- a/goal_src/jak2/levels/city/port/race/errol-chal.gc +++ b/goal_src/jak2/levels/city/port/race/errol-chal.gc @@ -1130,7 +1130,7 @@ (set-setting! 'minimap 'clear 0.0 (minimap-flag task-graph)) (set-setting! 'exclusive-task #f 0.0 (-> self node-info task)) (let ((gp-0 *traffic-manager*)) - (send-event gp-0 'set-target-level #x3e800000) + (send-event gp-0 'set-target-level 0.25) (send-event gp-0 'set-guard-target-count-range 0 0 0) (send-event gp-0 'set-guard-target-count-range 1 0 0) (send-event gp-0 'set-guard-target-count-range 2 0 0) @@ -1370,7 +1370,7 @@ (set-setting! 'exclusive-load 'lprtrace 0.0 0) (set-setting! 'airlock #f 0.0 0) (let ((gp-0 *traffic-manager*)) - (send-event gp-0 'set-target-level #x3e800000) + (send-event gp-0 'set-target-level 0.25) (send-event gp-0 'set-guard-target-count-range 0 0 0) (send-event gp-0 'set-guard-target-count-range 1 0 0) (send-event gp-0 'set-guard-target-count-range 2 0 0) diff --git a/goal_src/jak2/levels/city/power/ctypower.gc b/goal_src/jak2/levels/city/power/ctypower.gc index c1cc2c6268..97392d688d 100644 --- a/goal_src/jak2/levels/city/power/ctypower.gc +++ b/goal_src/jak2/levels/city/power/ctypower.gc @@ -152,13 +152,13 @@ (lambda :behavior task-manager () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-turret :init hud-init-by-other :to self))) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) ) (send-event *traffic-manager* 'set-alert-level 1) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) diff --git a/goal_src/jak2/levels/city/protect/protect.gc b/goal_src/jak2/levels/city/protect/protect.gc index f365cc0769..54f758a3a8 100644 --- a/goal_src/jak2/levels/city/protect/protect.gc +++ b/goal_src/jak2/levels/city/protect/protect.gc @@ -310,27 +310,27 @@ This commonly includes things such as: ) (let ((gp-0 *traffic-manager*)) (send-event gp-0 'set-alert-level 2) - (send-event gp-0 'set-alert-duration #xa4cb80) - (send-event gp-0 'deactivate-by-type 6) - (send-event gp-0 'deactivate-by-type 18) - (send-event gp-0 'deactivate-by-type 19) - (send-event gp-0 'deactivate-by-type 20) - (send-event gp-0 'deactivate-by-type 11) - (send-event gp-0 'deactivate-by-type 12) - (send-event gp-0 'deactivate-by-type 13) - (send-event gp-0 'deactivate-by-type 14) - (send-event gp-0 'deactivate-by-type 15) - (send-event gp-0 'deactivate-by-type 16) - (send-event gp-0 'set-object-target-count 6 0) - (send-event gp-0 'set-object-target-count 18 0) - (send-event gp-0 'set-object-target-count 19 0) - (send-event gp-0 'set-object-target-count 11 0) - (send-event gp-0 'set-object-target-count 12 0) - (send-event gp-0 'set-object-target-count 13 0) - (send-event gp-0 'set-object-target-count 14 0) - (send-event gp-0 'set-object-target-count 15 0) - (send-event gp-0 'set-object-target-count 16 0) - (send-event gp-0 'set-object-auto-activate 6 #f) + (send-event gp-0 'set-alert-duration (seconds 36000)) + (send-event gp-0 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event gp-0 'deactivate-by-type (traffic-type guard-bike)) + (send-event gp-0 'deactivate-by-type (traffic-type hellcat)) + (send-event gp-0 'deactivate-by-type (traffic-type traffic-type-20)) + (send-event gp-0 'deactivate-by-type (traffic-type bikea)) + (send-event gp-0 'deactivate-by-type (traffic-type bikeb)) + (send-event gp-0 'deactivate-by-type (traffic-type bikec)) + (send-event gp-0 'deactivate-by-type (traffic-type cara)) + (send-event gp-0 'deactivate-by-type (traffic-type carb)) + (send-event gp-0 'deactivate-by-type (traffic-type carc)) + (send-event gp-0 'set-object-target-count (traffic-type crimson-guard-1) 0) + (send-event gp-0 'set-object-target-count (traffic-type guard-bike) 0) + (send-event gp-0 'set-object-target-count (traffic-type hellcat) 0) + (send-event gp-0 'set-object-target-count (traffic-type bikea) 0) + (send-event gp-0 'set-object-target-count (traffic-type bikeb) 0) + (send-event gp-0 'set-object-target-count (traffic-type bikec) 0) + (send-event gp-0 'set-object-target-count (traffic-type cara) 0) + (send-event gp-0 'set-object-target-count (traffic-type carb) 0) + (send-event gp-0 'set-object-target-count (traffic-type carc) 0) + (send-event gp-0 'set-object-auto-activate (traffic-type crimson-guard-1) #f) (send-event gp-0 'set-guard-target-count-range 0 4 4) (send-event gp-0 'set-guard-target-count-range 1 5 5) (send-event gp-0 'set-guard-target-count-range 4 0 0) diff --git a/goal_src/jak2/levels/city/sack/collection-task.gc b/goal_src/jak2/levels/city/sack/collection-task.gc index d3d3443d7b..46052b4959 100644 --- a/goal_src/jak2/levels/city/sack/collection-task.gc +++ b/goal_src/jak2/levels/city/sack/collection-task.gc @@ -352,13 +352,13 @@ (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-moneybag :init hud-init-by-other :to *target*)) ) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) ) (send-event *traffic-manager* 'set-alert-level 2) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) ) ) @@ -376,7 +376,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 2)) (suspend) diff --git a/goal_src/jak2/levels/city/shuttle/shuttle.gc b/goal_src/jak2/levels/city/shuttle/shuttle.gc index d5e77a6510..d081b54a36 100644 --- a/goal_src/jak2/levels/city/shuttle/shuttle.gc +++ b/goal_src/jak2/levels/city/shuttle/shuttle.gc @@ -1555,7 +1555,7 @@ (lambda :behavior task-manager () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-citizen :init hud-init-by-other :to self))) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (send-event *traffic-manager* 'set-guard-target-count-range 4 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 5 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 0 0 2) @@ -1568,7 +1568,7 @@ (suspend) ) (send-event *traffic-manager* 'set-alert-level 2) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) @@ -1726,7 +1726,7 @@ (lambda :behavior task-manager () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-citizen :init hud-init-by-other :to self))) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (send-event *traffic-manager* 'set-guard-target-count-range 4 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 5 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 0 0 2) @@ -1739,7 +1739,7 @@ (suspend) ) (send-event *traffic-manager* 'set-alert-level 2) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) diff --git a/goal_src/jak2/levels/common/race/race-manager.gc b/goal_src/jak2/levels/common/race/race-manager.gc index 3f1189b128..c56e24561c 100644 --- a/goal_src/jak2/levels/common/race/race-manager.gc +++ b/goal_src/jak2/levels/common/race/race-manager.gc @@ -525,7 +525,7 @@ (set-setting! 'allow-progress #f 0.0 0) (send-event (handle->process (-> obj arrow)) 'leave) (when (logtest? (-> obj info flags) (race-info-flags borrow)) - (send-event *traffic-manager* 'set-target-level 0) + (send-event *traffic-manager* 'set-target-level 0.0) (send-event *traffic-manager* 'set-alert-level 0) ) (send-event (handle->process (-> obj race-signal)) 'ready) diff --git a/goal_src/jak2/levels/common/race/vehicle-racer.gc b/goal_src/jak2/levels/common/race/vehicle-racer.gc index d546ccc303..dda4aededb 100644 --- a/goal_src/jak2/levels/common/race/vehicle-racer.gc +++ b/goal_src/jak2/levels/common/race/vehicle-racer.gc @@ -403,7 +403,7 @@ (sound-play "turbo-pickup") (when (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) (sound-play "turbo-pickup-pl") - (send-event *target* 'color-effect 'eco-pill-dark 60) + (send-event *target* 'color-effect 'eco-pill-dark (seconds 0.2)) ) (+! (-> obj turbo-pickup-count) 1) #t diff --git a/goal_src/jak2/levels/common/warp-gate.gc b/goal_src/jak2/levels/common/warp-gate.gc index 6bf2e76204..0ace4801f9 100644 --- a/goal_src/jak2/levels/common/warp-gate.gc +++ b/goal_src/jak2/levels/common/warp-gate.gc @@ -633,7 +633,7 @@ (none) ) :trans (behavior () - (send-event *camera* 'joystick 0 0) + (send-event *camera* 'joystick 0.0 0.0) (none) ) :code (behavior ((arg0 continue-point)) diff --git a/goal_src/jak2/levels/demo/demo-obs.gc b/goal_src/jak2/levels/demo/demo-obs.gc index 3647047d70..f1284bce26 100644 --- a/goal_src/jak2/levels/demo/demo-obs.gc +++ b/goal_src/jak2/levels/demo/demo-obs.gc @@ -135,7 +135,7 @@ (send-event "jak-demo-logo" 'color-mult 0 0 0 1) (apply ,(lambda () - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 23) (send-event (ppointer->process *time-of-day*) 'change 'minute 0) (send-event (ppointer->process *time-of-day*) 'change 'second 0) diff --git a/goal_src/jak2/levels/nest/boss/nestb-scenes.gc b/goal_src/jak2/levels/nest/boss/nestb-scenes.gc index 7713446ac3..94d0fa866a 100644 --- a/goal_src/jak2/levels/nest/boss/nestb-scenes.gc +++ b/goal_src/jak2/levels/nest/boss/nestb-scenes.gc @@ -31,7 +31,7 @@ (suspend) ) ) - (send-event *target* 'get-pickup 7 f30-0) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) f30-0) ) ) (send-event *target* 'end-mode) diff --git a/goal_src/jak2/levels/palace/boss/squid-extras.gc b/goal_src/jak2/levels/palace/boss/squid-extras.gc index 95fddb2a3a..93fad118db 100644 --- a/goal_src/jak2/levels/palace/boss/squid-extras.gc +++ b/goal_src/jak2/levels/palace/boss/squid-extras.gc @@ -460,7 +460,7 @@ ) ) (let ((s4-0 (process-spawn squid-tentacle (-> arg0 root trans) gp-0 :to arg0))) - (send-event (ppointer->process s4-0) 'set-stretch-vel #x3f428f5c) + (send-event (ppointer->process s4-0) 'set-stretch-vel 0.76) (send-event (ppointer->process s4-0) 'set-fade 128) ) ) diff --git a/goal_src/jak2/levels/palace/boss/squid-states.gc b/goal_src/jak2/levels/palace/boss/squid-states.gc index 05ff99e2a2..5a25966770 100644 --- a/goal_src/jak2/levels/palace/boss/squid-states.gc +++ b/goal_src/jak2/levels/palace/boss/squid-states.gc @@ -1093,14 +1093,14 @@ (set! (-> self traj-timer) 0) (set! (-> self tentacle-base-rotation-speed target) 1.0) (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f428f5c) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.76) ) (none) ) :exit (behavior () (set! (-> self tentacle-base-rotation-speed target) 0.0) (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f333333) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.7) ) (none) ) @@ -1220,13 +1220,13 @@ (set! (-> self stop-shooting) #f) (setup-masks (-> self draw) 30 0) (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f428f5c) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.76) ) (none) ) :exit (behavior () (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f333333) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.7) ) (none) ) @@ -1428,13 +1428,13 @@ (set! (-> self gun-high-to-low) (squid-method-44 self gp-0 s5-0)) ) (dotimes (gp-1 6) - (send-event (handle->process (-> self tentacles gp-1)) 'set-stretch-vel #x3f428f5c) + (send-event (handle->process (-> self tentacles gp-1)) 'set-stretch-vel 0.76) ) (none) ) :exit (behavior () (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f333333) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.7) ) (none) ) diff --git a/goal_src/jak2/levels/sewer/sew-gunturret.gc b/goal_src/jak2/levels/sewer/sew-gunturret.gc index 59a711f83b..2e66c3adbe 100644 --- a/goal_src/jak2/levels/sewer/sew-gunturret.gc +++ b/goal_src/jak2/levels/sewer/sew-gunturret.gc @@ -811,7 +811,7 @@ #f ) (('bonk) - (send-event proc 'target-mech-get-off 90) + (send-event proc 'target-mech-get-off (seconds 0.3)) (let ((evt (new 'stack-no-clear 'event-message-block))) (set! (-> evt from) (process->ppointer pp)) (set! (-> evt num-params) 2) diff --git a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc index 55540e8a82..a596508d90 100644 --- a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc +++ b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc @@ -1381,22 +1381,22 @@ This commonly includes things such as: (add-process *gui-control* obj (gui-channel message) (gui-action play) (-> obj name) 81920.0 0) ) (let ((s5-0 *traffic-manager*)) - (send-event s5-0 'set-object-target-count 11 0) - (send-event s5-0 'set-object-target-count 12 0) - (send-event s5-0 'set-object-target-count 13 0) - (send-event s5-0 'set-object-target-count 14 0) - (send-event s5-0 'set-object-target-count 15 0) - (send-event s5-0 'set-object-target-count 16 0) - (send-event s5-0 'set-object-target-count 0 0) - (send-event s5-0 'set-object-target-count 1 0) - (send-event s5-0 'set-object-target-count 2 0) - (send-event s5-0 'set-object-target-count 6 0) - (send-event s5-0 'set-object-target-count 7 0) - (send-event s5-0 'set-object-target-count 8 0) - (send-event s5-0 'set-object-target-count 9 0) - (send-event s5-0 'set-object-target-count 10 0) - (send-event s5-0 'set-object-target-count 18 0) - (send-event s5-0 'set-object-target-count 19 0) + (send-event s5-0 'set-object-target-count (traffic-type bikea) 0) + (send-event s5-0 'set-object-target-count (traffic-type bikeb) 0) + (send-event s5-0 'set-object-target-count (traffic-type bikec) 0) + (send-event s5-0 'set-object-target-count (traffic-type cara) 0) + (send-event s5-0 'set-object-target-count (traffic-type carb) 0) + (send-event s5-0 'set-object-target-count (traffic-type carc) 0) + (send-event s5-0 'set-object-target-count (traffic-type citizen-norm-1) 0) + (send-event s5-0 'set-object-target-count (traffic-type citizen-chick) 0) + (send-event s5-0 'set-object-target-count (traffic-type citizen-fat) 0) + (send-event s5-0 'set-object-target-count (traffic-type crimson-guard-1) 0) + (send-event s5-0 'set-object-target-count (traffic-type crimson-guard-2) 0) + (send-event s5-0 'set-object-target-count (traffic-type metalhead-grunt) 0) + (send-event s5-0 'set-object-target-count (traffic-type metalhead-flitter) 0) + (send-event s5-0 'set-object-target-count (traffic-type metalhead-predator) 0) + (send-event s5-0 'set-object-target-count (traffic-type guard-bike) 0) + (send-event s5-0 'set-object-target-count (traffic-type hellcat) 0) (send-event s5-0 'set-guard-target-level 0) ) (set-setting! 'allow-continue #f 0.0 0) diff --git a/goal_src/jak2/levels/stadium/stadium-obs.gc b/goal_src/jak2/levels/stadium/stadium-obs.gc index 317f702341..cc43cd535a 100644 --- a/goal_src/jak2/levels/stadium/stadium-obs.gc +++ b/goal_src/jak2/levels/stadium/stadium-obs.gc @@ -2488,7 +2488,7 @@ This commonly includes things such as: (when s4-0 (set! (-> obj ripple) (ppointer->handle s4-0)) (send-event (ppointer->process s4-0) 'anim-mode 'play1) - (send-event (ppointer->process s4-0) 'speed #x3fc00000) + (send-event (ppointer->process s4-0) 'speed 1.5) (send-event (ppointer->process s4-0) 'art-joint-anim "generic-ripples-idle" 0) (set-vector! (-> (the-as process-drawable (-> s4-0 0)) root scale) 1.0 1.0 1.0 1.0) (let ((s2-1 (-> arg0 head))) @@ -3126,38 +3126,38 @@ This commonly includes things such as: (set-setting! 'music 'danger6 0.0 0) (want-force-vis *load-state* 'stadblmp #t) (let ((gp-1 *traffic-manager*)) - (send-event gp-1 'set-object-target-count 11 0) - (send-event gp-1 'set-object-target-count 12 0) - (send-event gp-1 'set-object-target-count 13 0) - (send-event gp-1 'set-object-target-count 14 0) - (send-event gp-1 'set-object-target-count 15 0) - (send-event gp-1 'set-object-target-count 16 0) - (send-event gp-1 'set-object-target-count 0 0) - (send-event gp-1 'set-object-target-count 1 0) - (send-event gp-1 'set-object-target-count 2 0) - (send-event gp-1 'set-object-target-count 6 0) - (send-event gp-1 'set-object-target-count 7 0) - (send-event gp-1 'set-object-target-count 8 0) - (send-event gp-1 'set-object-target-count 9 0) - (send-event gp-1 'set-object-target-count 10 0) - (send-event gp-1 'set-object-target-count 18 0) - (send-event gp-1 'set-object-target-count 19 0) - (send-event gp-1 'deactivate-by-type 11) - (send-event gp-1 'deactivate-by-type 12) - (send-event gp-1 'deactivate-by-type 13) - (send-event gp-1 'deactivate-by-type 14) - (send-event gp-1 'deactivate-by-type 15) - (send-event gp-1 'deactivate-by-type 16) - (send-event gp-1 'deactivate-by-type 0) - (send-event gp-1 'deactivate-by-type 1) - (send-event gp-1 'deactivate-by-type 2) - (send-event gp-1 'deactivate-by-type 6) - (send-event gp-1 'deactivate-by-type 7) - (send-event gp-1 'deactivate-by-type 8) - (send-event gp-1 'deactivate-by-type 9) - (send-event gp-1 'deactivate-by-type 10) - (send-event gp-1 'deactivate-by-type 18) - (send-event gp-1 'deactivate-by-type 19) + (send-event gp-1 'set-object-target-count (traffic-type bikea) 0) + (send-event gp-1 'set-object-target-count (traffic-type bikeb) 0) + (send-event gp-1 'set-object-target-count (traffic-type bikec) 0) + (send-event gp-1 'set-object-target-count (traffic-type cara) 0) + (send-event gp-1 'set-object-target-count (traffic-type carb) 0) + (send-event gp-1 'set-object-target-count (traffic-type carc) 0) + (send-event gp-1 'set-object-target-count (traffic-type citizen-norm-1) 0) + (send-event gp-1 'set-object-target-count (traffic-type citizen-chick) 0) + (send-event gp-1 'set-object-target-count (traffic-type citizen-fat) 0) + (send-event gp-1 'set-object-target-count (traffic-type crimson-guard-1) 0) + (send-event gp-1 'set-object-target-count (traffic-type crimson-guard-2) 0) + (send-event gp-1 'set-object-target-count (traffic-type metalhead-grunt) 0) + (send-event gp-1 'set-object-target-count (traffic-type metalhead-flitter) 0) + (send-event gp-1 'set-object-target-count (traffic-type metalhead-predator) 0) + (send-event gp-1 'set-object-target-count (traffic-type guard-bike) 0) + (send-event gp-1 'set-object-target-count (traffic-type hellcat) 0) + (send-event gp-1 'deactivate-by-type (traffic-type bikea)) + (send-event gp-1 'deactivate-by-type (traffic-type bikeb)) + (send-event gp-1 'deactivate-by-type (traffic-type bikec)) + (send-event gp-1 'deactivate-by-type (traffic-type cara)) + (send-event gp-1 'deactivate-by-type (traffic-type carb)) + (send-event gp-1 'deactivate-by-type (traffic-type carc)) + (send-event gp-1 'deactivate-by-type (traffic-type citizen-norm-1)) + (send-event gp-1 'deactivate-by-type (traffic-type citizen-chick)) + (send-event gp-1 'deactivate-by-type (traffic-type citizen-fat)) + (send-event gp-1 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event gp-1 'deactivate-by-type (traffic-type crimson-guard-2)) + (send-event gp-1 'deactivate-by-type (traffic-type metalhead-grunt)) + (send-event gp-1 'deactivate-by-type (traffic-type metalhead-flitter)) + (send-event gp-1 'deactivate-by-type (traffic-type metalhead-predator)) + (send-event gp-1 'deactivate-by-type (traffic-type guard-bike)) + (send-event gp-1 'deactivate-by-type (traffic-type hellcat)) (send-event gp-1 'set-guard-target-level 0) ) (let ((v1-177 (entity-by-name "parking-spot-48"))) diff --git a/goal_src/jak2/levels/title/title-obs.gc b/goal_src/jak2/levels/title/title-obs.gc index 89bb6fdaab..7dd95e6598 100644 --- a/goal_src/jak2/levels/title/title-obs.gc +++ b/goal_src/jak2/levels/title/title-obs.gc @@ -143,7 +143,7 @@ (setting-unset sound-bank-load) (apply ,(lambda () - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 23) (send-event (ppointer->process *time-of-day*) 'change 'minute 0) (send-event (ppointer->process *time-of-day*) 'change 'second 0) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc index db97ccd260..b14d46430d 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc @@ -1798,7 +1798,7 @@ (set! (-> a1-0 trans w) 1.0) (debug-set-camera-pos-rot! a0-0 a1-0) ) - (send-event *camera* 'set-fov #x46360b61) + (send-event *camera* 'set-fov 11650.845) (clear *camera-old-level*) (format *camera-old-level* "dig3a") (set! *camera-old-cpu* 4815) diff --git a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc index fd7daeabe0..d9bad076f6 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc @@ -210,7 +210,7 @@ and return it as well. Otherwise, set it to `0`" ) (vector-float*! a2-8 (-> section pull-dir) (* f0-10 (-> self clock seconds-per-frame))) ) - (send-event proc-focus 'push-trans a2-8 3000) + (send-event proc-focus 'push-trans a2-8 (seconds 10)) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc index 548fc69870..39376e696e 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc @@ -1000,7 +1000,7 @@ ((logtest? (-> self game features) (game-feature unk-game-feature-03)) (when *time-of-day-fast* (set! *time-of-day-fast* #f) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) ) (cond ((cpad-hold? (-> self control cpad number) r1) @@ -1030,7 +1030,7 @@ ((logtest? (-> self game features) (game-feature unk-game-feature-05)) (when *time-of-day-fast* (set! *time-of-day-fast* #f) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) ) (cond ((cpad-hold? (-> self control cpad number) r1) diff --git a/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc index a4cf75e574..35cbad0f1a 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc @@ -237,7 +237,7 @@ ) ) ) - (send-event (ppointer->process (-> self parent)) 'joystick (-> self twist) -1082130432) + (send-event (ppointer->process (-> self parent)) 'joystick (-> self twist) -1.0) ) (set! (-> self root scale x) f30-0) (set! (-> self root scale y) f30-0) @@ -572,7 +572,7 @@ :virtual #t :enter (behavior () (set! (-> self start-time) (-> *display* game-clock frame-counter)) - (send-event *target* 'get-pickup 20 (the float (-> self total-time))) + (send-event *target* 'get-pickup (pickup-type trick-judge) (the float (-> self total-time))) (sound-play "judge-start") (set! (-> self hud-timer) (ppointer->handle (process-spawn hud-timer :init hud-init-by-other :to self))) (none) @@ -592,7 +592,7 @@ ) :code (behavior () (while (let ((a0-2 (handle->process (-> self focus handle)))) - (and a0-2 (!= (send-event a0-2 'test-pickup 20) 0.0)) + (and a0-2 (!= (send-event a0-2 'test-pickup (pickup-type trick-judge)) 0.0)) ) (suspend) (ja :num! (loop!)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc index 669f4ab320..cad8b885c1 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc @@ -199,7 +199,7 @@ (.svf (&-> a1-15 quad) vf6) ) 0 - (send-event arg0 'push-trans v1-17 3000) + (send-event arg0 'push-trans v1-17 (seconds 10)) ) ) ) @@ -464,7 +464,3 @@ s5-0 ) ) - - - - diff --git a/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc b/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc index 83f5341ff3..c647888442 100644 --- a/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc @@ -41,41 +41,41 @@ ) ;; definition for function dm-cam-settings-func -(defun dm-cam-settings-func ((arg0 cam-slave-options) (arg1 debug-menu-msg)) +(defun dm-cam-settings-func ((arg0 int) (arg1 debug-menu-msg)) (when (and (= arg1 (debug-menu-msg press)) *camera*) (cond ((zero? arg0) - (send-event *camera* 'toggle-slave-option 1) + (send-event *camera* 'toggle-slave-option (cam-slave-options BUTT_CAM)) ) - ((= arg0 (cam-slave-options BUTT_CAM)) - (send-event *camera* 'toggle-slave-option 2) + ((= arg0 1) + (send-event *camera* 'toggle-slave-option (cam-slave-options SAME_SIDE)) ) - ((= arg0 (cam-slave-options SAME_SIDE)) - (send-event *camera* 'toggle-slave-option 4) + ((= arg0 2) + (send-event *camera* 'toggle-slave-option (cam-slave-options MOVE_SPHERICAL)) ) - ((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE)) - (send-event *camera* 'toggle-slave-option 128) + ((= arg0 3) + (send-event *camera* 'toggle-slave-option (cam-slave-options DRAG)) ) - ((= arg0 (cam-slave-options MOVE_SPHERICAL)) - (send-event *camera* 'toggle-slave-option 8) + ((= arg0 4) + (send-event *camera* 'toggle-slave-option (cam-slave-options ALLOW_Z_ROT)) ) - ((= arg0 (cam-slave-options SAME_SIDE MOVE_SPHERICAL)) + ((= arg0 6) (set-setting-by-param *setting-control* 'slave-options 'clear 0 16) ) - ((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE MOVE_SPHERICAL)) - (send-event *camera* 'toggle-slave-option 64) + ((= arg0 7) + (send-event *camera* 'toggle-slave-option (cam-slave-options FIND_HIDDEN_TARGET)) ) - ((= arg0 (cam-slave-options ALLOW_Z_ROT)) - (send-event *camera* 'toggle-slave-option 32) + ((= arg0 8) + (send-event *camera* 'toggle-slave-option (cam-slave-options COLLIDE)) ) - ((= arg0 (cam-slave-options BUTT_CAM ALLOW_Z_ROT)) - (send-event *camera* 'toggle-slave-option 512) + ((= arg0 9) + (send-event *camera* 'toggle-slave-option (cam-slave-options LINE_OF_SIGHT)) ) - ((= arg0 (cam-slave-options SAME_SIDE ALLOW_Z_ROT)) - (send-event *camera* 'toggle-slave-option #x4000) + ((= arg0 10) + (send-event *camera* 'toggle-slave-option (cam-slave-options NO_ROTATE)) ) - ((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE ALLOW_Z_ROT)) - (send-event *camera* 'toggle-slave-option #x8000) + ((= arg0 11) + (send-event *camera* 'toggle-slave-option (cam-slave-options STICKY_ANGLE)) ) ) ) @@ -85,34 +85,34 @@ ((zero? arg0) (logtest? (-> *camera* slave-options) 1) ) - ((= arg0 (cam-slave-options BUTT_CAM)) + ((= arg0 1) (logtest? (-> *camera* slave-options) 2) ) - ((= arg0 (cam-slave-options SAME_SIDE)) + ((= arg0 2) (logtest? (-> *camera* slave-options) 4) ) - ((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE)) + ((= arg0 3) (logtest? (-> *camera* slave-options) 128) ) - ((= arg0 (cam-slave-options MOVE_SPHERICAL)) + ((= arg0 4) (logtest? (-> *camera* slave-options) 8) ) - ((= arg0 (cam-slave-options SAME_SIDE MOVE_SPHERICAL)) + ((= arg0 6) (not (setting-control-method-14 *setting-control* 'slave-options)) ) - ((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE MOVE_SPHERICAL)) + ((= arg0 7) (logtest? (-> *camera* slave-options) 64) ) - ((= arg0 (cam-slave-options ALLOW_Z_ROT)) + ((= arg0 8) (logtest? (-> *camera* slave-options) 32) ) - ((= arg0 (cam-slave-options BUTT_CAM ALLOW_Z_ROT)) + ((= arg0 9) (logtest? (-> *camera* slave-options) 512) ) - ((= arg0 (cam-slave-options SAME_SIDE ALLOW_Z_ROT)) + ((= arg0 10) (logtest? (-> *camera* slave-options) #x4000) ) - ((= arg0 (cam-slave-options BUTT_CAM SAME_SIDE ALLOW_Z_ROT)) + ((= arg0 11) (logtest? (-> *camera* slave-options) #x8000) ) (else @@ -598,42 +598,42 @@ (when (= arg1 (debug-menu-msg press)) (cond ((zero? (/ (the-as int arg0) 8)) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 7) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 1) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 10) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 2) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 12) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 3) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 14) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 4) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 18) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 5) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 19) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 6) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 23) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) ((= (/ (the-as int arg0) 8) 7) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 4) (set! (-> *time-of-day-context* mode) (the-as time-of-day-palette-id (/ (the-as int arg0) 8))) ) @@ -645,11 +645,11 @@ #x42700000 #x3f800000 ) - 600 + (seconds 2) ) ) (else - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (set! (-> *time-of-day-context* mode) (logand (logxor (-> *time-of-day-context* mode) (the-as uint (/ (the-as int arg0) 8))) (time-of-day-palette-id palette-0 palette-1 palette-2 palette-3 palette-4 palette-5 palette-6 palette-7) @@ -687,7 +687,7 @@ #x42700000 #x3f800000 ) - 600 + (seconds 2) ) ) ) @@ -724,7 +724,7 @@ (set! (-> *time-of-day-context* mode) (time-of-day-palette-id palette-7)) ) ) - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) ) (cond ((zero? (/ (the-as int arg0) 8)) @@ -4041,7 +4041,7 @@ (-> *game-info* debug-features) (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) ) - (send-event *target* 'get-pickup 7 #x42c80000) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0) ) ) (function "manual" #f ,(lambda ((arg0 object) (arg1 debug-menu-msg)) @@ -4130,13 +4130,13 @@ "Full Stuff" #f ,(lambda () - (send-event *target* 'get-pickup 18 #x447a0000) - (send-event *target* 'get-pickup 17 #x447a0000) - (send-event *target* 'get-pickup 13 #x447a0000) - (send-event *target* 'get-pickup 14 #x447a0000) - (send-event *target* 'get-pickup 15 #x447a0000) - (send-event *target* 'get-pickup 16 #x447a0000) - (send-event *target* 'get-pickup 7 #x42c80000) + (send-event *target* 'get-pickup (pickup-type health) 1000.0) + (send-event *target* 'get-pickup (pickup-type shield) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0) (logior! (-> *game-info* features) (game-feature gun gun-yellow gun-red gun-blue gun-dark board darkjak)) (let ((v0-7 (logior (-> *game-info* debug-features) (game-feature gun gun-yellow gun-red gun-blue gun-dark board darkjak)) @@ -4151,14 +4151,14 @@ "Dump Stuff" #f ,(lambda () - (send-event *target* 'get-pickup 17 -998637568) - (send-event *target* 'get-pickup 13 -998637568) - (send-event *target* 'get-pickup 14 -998637568) - (send-event *target* 'get-pickup 15 -998637568) - (send-event *target* 'get-pickup 16 -998637568) + (send-event *target* 'get-pickup (pickup-type shield) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-yellow) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-red) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-blue) -1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-dark) -1000.0) ) ) - (function "Trick Mode" #f ,(lambda () (send-event *target* 'get-pickup 20 #x468ca000))) + (function "Trick Mode" #f ,(lambda () (send-event *target* 'get-pickup (pickup-type trick-judge) 18000.0))) (function "Reset Trans" #f ,(lambda () (when *target* (position-in-front-of-camera! (target-pos 0) 40960.0 4096.0) (set! (-> *target* control transv quad) (the-as uint128 0)) diff --git a/test/decompiler/reference/jak2/engine/game/game-info_REF.gc b/test/decompiler/reference/jak2/engine/game/game-info_REF.gc index 6287bafd9b..63613a2c7c 100644 --- a/test/decompiler/reference/jak2/engine/game/game-info_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/game-info_REF.gc @@ -680,7 +680,7 @@ ) (sound-play "get-green-eco") ) - (send-event (-> obj process) 'color-effect 'health 60) + (send-event (-> obj process) 'color-effect 'health (seconds 0.2)) (when (handle->process arg2) (set! (-> obj eco-source) arg2) (set! (-> obj eco-source-time) (-> *display* game-clock frame-counter)) @@ -724,7 +724,7 @@ (if (>= (- (-> *display* game-clock frame-counter) (-> obj eco-pill-dark-pickup-time)) (seconds 0.05)) (sound-play "get-dark-eco") ) - (send-event (-> obj process) 'color-effect 'eco-pill-dark 60) + (send-event (-> obj process) 'color-effect 'eco-pill-dark (seconds 0.2)) (cond ((>= (- (-> *display* game-clock frame-counter) (-> (the-as target (-> obj process)) shock-effect-time)) (seconds 0.1) @@ -899,7 +899,7 @@ ) ) (if (< 0.0 arg1) - (send-event (-> obj process) 'color-effect ammo-kind 60) + (send-event (-> obj process) 'color-effect ammo-kind (seconds 0.2)) ) (give (-> (the-as target (-> obj process)) game) ammo-kind arg1 arg2) ) diff --git a/test/decompiler/reference/jak2/engine/game/game-save_REF.gc b/test/decompiler/reference/jak2/engine/game/game-save_REF.gc index 04a54c7456..9370652e38 100644 --- a/test/decompiler/reference/jak2/engine/game/game-save_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/game-save_REF.gc @@ -1948,7 +1948,7 @@ auto-save-post ;; definition for function auto-save-init-by-other (defbehavior auto-save-init-by-other auto-save ((arg0 symbol) (arg1 process) (arg2 int) (arg3 int) (arg4 symbol)) (when (handle->process (-> *game-info* auto-save-proc)) - (send-event arg1 'notify 'error 16) + (send-event arg1 'notify 'error (mc-status-code no-process)) (return #f) ) (set! (-> *game-info* auto-save-proc) (process->handle self)) @@ -2532,7 +2532,7 @@ auto-save-post ) (let ((gp-0 *auto-save-info*)) (mem-copy! (the-as pointer gp-0) (the-as pointer (-> self info)) 300) - (send-event (handle->process (-> self notify)) 'notify 'done 1 gp-0) + (send-event (handle->process (-> self notify)) 'notify 'done (mc-status-code ok) gp-0) ) (none) ) diff --git a/test/decompiler/reference/jak2/engine/game/main_REF.gc b/test/decompiler/reference/jak2/engine/game/main_REF.gc index 983ca41dd2..ba2a08851e 100644 --- a/test/decompiler/reference/jak2/engine/game/main_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/main_REF.gc @@ -1030,13 +1030,13 @@ ((lambda () (cond ((cpad-pressed? 1 x) - (send-event *target* 'get-pickup 13 #x447a0000) - (send-event *target* 'get-pickup 14 #x447a0000) - (send-event *target* 'get-pickup 15 #x447a0000) - (send-event *target* 'get-pickup 16 #x447a0000) - (send-event *target* 'get-pickup 7 #x447a0000) - (send-event *target* 'get-pickup 22 #x447a0000) - (send-event *target* 'get-pickup 21 #x447a0000) + (send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0) + (send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 1000.0) + (send-event *target* 'get-pickup (pickup-type skill) 1000.0) + (send-event *target* 'get-pickup (pickup-type gem) 1000.0) (logior! (-> *game-info* features) (game-feature diff --git a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc index cbd2b6d6c6..368c691a5d 100644 --- a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc @@ -477,7 +477,7 @@ (set! (-> *level* play?) #t) (time-of-day-setup #t) (set! *time-of-day-fast* #f) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) (when arg0 (let ((s5-0 (-> *game-info* mode))) (set! (-> *game-info* mode) arg0) @@ -731,7 +731,7 @@ (if (logtest? (-> arg0 flags) (game-task-node-flag close-task)) ((lambda ((arg0 game-task-node-info)) (if *target* - (send-event *target* 'get-pickup 10 (the float (-> arg0 task))) + (send-event *target* 'get-pickup (pickup-type fuel-cell) (the float (-> arg0 task))) (give *game-info* 'fuel-cell (the float (-> arg0 task)) (the-as handle #f)) ) ) diff --git a/test/decompiler/reference/jak2/engine/level/level_REF.gc b/test/decompiler/reference/jak2/engine/level/level_REF.gc index f757e3dbc5..97af854d20 100644 --- a/test/decompiler/reference/jak2/engine/level/level_REF.gc +++ b/test/decompiler/reference/jak2/engine/level/level_REF.gc @@ -1781,7 +1781,7 @@ ) (set! *time-of-day-fast* #f) (load-commands-set! *level* '()) - (send-event (ppointer->process *time-of-day*) 'change 'ratio #x3f800000) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 1.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 7) (send-event (ppointer->process *time-of-day*) 'change 'minutes 0) (send-event (ppointer->process *time-of-day*) 'change 'seconds 0) diff --git a/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc b/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc index 665fa30157..e5c376b7e4 100644 --- a/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc @@ -401,7 +401,7 @@ (quaternion-copy! (-> (the-as board (-> s5-1 0)) root quat) (-> self control quat-for-control)) (send-event (ppointer->process s5-1) 'anim-mode 'play1) (send-event (ppointer->process s5-1) 'anim "idle") - (send-event (ppointer->process s5-1) 'speed #x3fc00000) + (send-event (ppointer->process s5-1) 'speed 1.5) (set-vector! (-> (the-as board (-> s5-1 0)) root scale) 0.2 0.4 0.2 1.0) ) ) @@ -964,7 +964,7 @@ (quaternion-copy! (-> (the-as board (-> s2-2 0)) root quat) (-> self control quat-for-control)) (send-event (ppointer->process s2-2) 'anim-mode 'play1) (send-event (ppointer->process s2-2) 'anim "idle") - (send-event (ppointer->process s2-2) 'speed #x3fc00000) + (send-event (ppointer->process s2-2) 'speed 1.5) (set-vector! (-> (the-as board (-> s2-2 0)) root scale) 0.2 0.4 0.2 1.0) ) ) @@ -3271,7 +3271,7 @@ (('shock 'shock-red 'shockup) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (send-event self 'color-effect 'shock 60) + (send-event self 'color-effect 'shock (seconds 0.2)) (process-drawable-shock-effect self (-> *lightning-spec-id-table* 1) diff --git a/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc b/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc index fd2aeb8980..850cdcbb4d 100644 --- a/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc @@ -2979,7 +2979,7 @@ (-> obj trick-list) (-> obj trick-count) ) - (send-event (ppointer->process (-> obj process)) 'get-pickup 19 f30-0) + (send-event (ppointer->process (-> obj process)) 'get-pickup (pickup-type trick-point) f30-0) (sound-play "trick-score") ) ) diff --git a/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc b/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc index 2301aeae01..bb4d36740c 100644 --- a/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc @@ -610,7 +610,7 @@ (* 81920.0 (-> self clock seconds-per-frame)) ) ) - 90 + (seconds 0.3) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc index 236e239b28..17b23dde00 100644 --- a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc @@ -2268,7 +2268,7 @@ (vector+! v1-10 s4-1 s3-1) (vector-float*! v1-10 v1-10 0.5) (+! (-> v1-10 y) -6144.0) - (send-event *camera* 'ease-in #x3f000000 v1-10) + (send-event *camera* 'ease-in 0.5 v1-10) ) (vector-segment-distance-point! (-> self control midpoint-of-hands) s4-1 s3-1 s5-0) (if (< (- (current-time) (-> self state-time)) (seconds 0.05)) diff --git a/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc index 2b01befd0c..f3a3812435 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc @@ -2203,7 +2203,7 @@ (fill-and-probe-using-spheres *collide-cache* gp-1) ) ) - (send-event self 'push 150) + (send-event self 'push (seconds 0.5)) (send-event self 'drop) ) ) diff --git a/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc index 6be5913453..b1d15f5b62 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc @@ -69,7 +69,7 @@ object (case event-type (('attack 'bonk) - (send-event proc 'target-mech-get-off 90) + (send-event proc 'target-mech-get-off (seconds 0.3)) (let ((a1-3 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-3 from) (process->ppointer self)) (set! (-> a1-3 num-params) 2) @@ -91,7 +91,7 @@ (the-as structure #f) ) (('touch) - (send-event proc 'target-mech-get-off 90) + (send-event proc 'target-mech-get-off (seconds 0.3)) (send-shoves (-> self root) proc (the-as touching-shapes-entry (-> event param 0)) 0.7 6144.0 16384.0) (the-as structure #f) ) diff --git a/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc b/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc index 5342e7df77..2dd95bc6fd 100644 --- a/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc @@ -93,9 +93,8 @@ ;; definition for function target-darkjak-process ;; INFO: Used lq/sq ;; WARN: Return type mismatch int vs none. -;; ERROR: Function may read a register that is not set: t2 (defbehavior target-darkjak-process target () - (local-vars (t2-0 none) (gp-0 vector)) + (local-vars (gp-0 vector)) (cond ((and (focus-test? self dark) (nonzero? (-> self darkjak))) (let ((a1-0 'eco-red)) @@ -218,42 +217,34 @@ (s2-0 *launch-matrix*) ) (set! (-> s2-0 trans quad) (-> (process-drawable-random-point! self (new 'stack-no-clear 'vector)) quad)) - (let ((a3-8 #f) - (t0-5 #f) - (t1-0 1.0) - ) - (gp-1 s5-0 s4-0 s2-0 (the-as sparticle-launch-state a3-8) (the-as sparticle-launch-control t0-5) t1-0) - (cond - ((rand-vu-percent? 0.25) - (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) - (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (process-drawable-shock-wall-effect - self - (-> *lightning-spec-id-table* 8) - lightning-probe-callback - (-> *part-id-table* 179) - (the-as int t0-5) - (the-as int t1-0) - (the-as float t2-0) - ) - ) + (gp-1 s5-0 s4-0 s2-0 (the-as sparticle-launch-state #f) (the-as sparticle-launch-control #f) 1.0) + ) + (cond + ((rand-vu-percent? 0.25) + (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) + (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) + (process-drawable-shock-wall-effect + self + (-> *lightning-spec-id-table* 8) + lightning-probe-callback + (-> *part-id-table* 179) ) - ((rand-vu-percent? 0.1) - (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) - (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (process-drawable-shock-effect - self - (-> *lightning-spec-id-table* 6) - lightning-probe-callback - (-> *part-id-table* 179) - 0 - 0 - 40960.0 - ) - ) + ) + ) + ((rand-vu-percent? 0.1) + (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.02)) + (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) + (process-drawable-shock-effect + self + (-> *lightning-spec-id-table* 6) + lightning-probe-callback + (-> *part-id-table* 179) + 0 + 0 + 40960.0 ) - ) - ) + ) + ) ) ) ) @@ -1838,7 +1829,7 @@ ) (set! (-> self darkjak clock-vel) -4.0) (set! (-> self darkjak clock-on) #t) - (send-event *camera* 'joystick -1098907648 #x3f800000) + (send-event *camera* 'joystick -0.25 1.0) (when (>= (- (current-time) sv-72) (seconds 0.1)) (set! sv-72 (current-time)) (target-bomb1-fire-shot sv-60 sv-64 sv-48 (the-as int sv-104)) diff --git a/test/decompiler/reference/jak2/engine/target/target-death_REF.gc b/test/decompiler/reference/jak2/engine/target/target-death_REF.gc index 4d380d34be..d1497f17b2 100644 --- a/test/decompiler/reference/jak2/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-death_REF.gc @@ -625,7 +625,7 @@ (('shock 'shockup 'shock-red 'shock-green) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (send-event self 'color-effect 'shock 60) + (send-event self 'color-effect 'shock (seconds 0.2)) (case (-> arg4 mode) (('shock-red) (process-drawable-shock-effect @@ -1198,7 +1198,7 @@ ) (when (>= (- (-> *display* game-clock frame-counter) (-> self shock-effect-time)) (seconds 0.03)) (set! (-> self shock-effect-time) (-> *display* game-clock frame-counter)) - (send-event self 'color-effect 'shock 60) + (send-event self 'color-effect 'shock (seconds 0.2)) (case (-> sv-32 mode) (('shock-red) (process-drawable-shock-effect @@ -1352,7 +1352,7 @@ ;; definition for function target-death-anim-trans ;; WARN: Return type mismatch int vs none. (defbehavior target-death-anim-trans target () - (send-event *camera* 'joystick 0 -1082130432) + (send-event *camera* 'joystick 0.0 -1.0) (compute-alignment! (-> self align)) (let ((gp-0 (new 'stack-no-clear 'vector))) (when (not (logtest? (-> self align flags) (align-flags disabled))) @@ -1490,7 +1490,7 @@ (ja-post) ) (while (not (-> self control unknown-spool-anim00)) - (send-event *camera* 'joystick 0 -1082130432) + (send-event *camera* 'joystick 0.0 -1.0) (suspend) ) ) diff --git a/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc b/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc index b0858a2661..2b64b987f2 100644 --- a/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc @@ -367,7 +367,7 @@ (when (using-gun? self) (set! (-> self gun fire-pending) 0) (mode-set! (-> self gun hips) (joint-mod-mode flex-blend)) - (send-event *camera* 'clear-slave-option #x58000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE BLOCK_RIGHT_STICK GUN_CAM)) (send-event *camera* 'set-dist #f #f) (send-event *camera* 'yes-follow) (let ((v1-16 (the-as sound-rpc-set-param (get-sound-buffer-entry)))) @@ -1351,7 +1351,7 @@ (let ((s5-2 (handle->process (-> self gun track-target 1 handle)))) (cond ((logtest? (surface-flag gun-strafe) (-> self control current-surface flags)) - (send-event *camera* 'set-slave-option #x8000) + (send-event *camera* 'set-slave-option (cam-slave-options STICKY_ANGLE)) ) ((the-as process-focusable s5-2) (let ((s4-5 (get-trans (the-as process-focusable s5-2) 3))) @@ -1363,20 +1363,20 @@ (let ((a0-91 (abs v1-173))) (cond ((< a0-91 65) - (send-event *camera* 'set-slave-option #x8000) + (send-event *camera* 'set-slave-option (cam-slave-options STICKY_ANGLE)) ) ((let ((a0-95 120)) (set! v1-173 (abs v1-173)) (< a0-95 v1-173) ) - (send-event *camera* 'clear-slave-option #x8000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE)) ) ) ) ) ) (else - (send-event *camera* 'clear-slave-option #x8000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE)) ) ) ) @@ -1386,7 +1386,7 @@ ) ) (else - (send-event *camera* 'clear-slave-option #x8000) + (send-event *camera* 'clear-slave-option (cam-slave-options STICKY_ANGLE)) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/target/target-handler_REF.gc b/test/decompiler/reference/jak2/engine/target/target-handler_REF.gc index b4eb8c73c2..153dd40bcb 100644 --- a/test/decompiler/reference/jak2/engine/target/target-handler_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-handler_REF.gc @@ -354,7 +354,7 @@ (s2-0 s1-0 s0-0 sv-128 (the-as sparticle-launch-state a3-0) (the-as sparticle-launch-control t0-0) t1-0) ) ) - (send-event (ppointer->process gp-0) 'color-effect 'dark 60) + (send-event (ppointer->process gp-0) 'color-effect 'dark (seconds 0.2)) (when (>= (- (current-time) (the-as time-frame s4-0)) (seconds 0.05)) (set! s4-0 (the-as int (current-time))) (cond @@ -368,7 +368,7 @@ ) ) (else - (send-event (handle->process arg0) 'color-effect 'shock 60) + (send-event (handle->process arg0) 'color-effect 'shock (seconds 0.2)) (process-drawable-shock-effect (the-as process-drawable (ppointer->process gp-0)) (-> *lightning-spec-id-table* 9) diff --git a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc index 9aedbe236e..6767e1b7d2 100644 --- a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc @@ -1332,7 +1332,7 @@ (>= (target-height-above-ground) arg1) ) (if (< (- (current-time) (-> self control rider-time)) (the-as time-frame (-> *TARGET-bank* ground-timeout))) - (send-event self 'push-transv (-> self control rider-last-move) #x7530) + (send-event self 'push-transv (-> self control rider-last-move) (seconds 100)) ) (go arg0 #f) ) diff --git a/test/decompiler/reference/jak2/engine/target/target2_REF.gc b/test/decompiler/reference/jak2/engine/target/target2_REF.gc index de78eb3539..28e87f22df 100644 --- a/test/decompiler/reference/jak2/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target2_REF.gc @@ -1076,7 +1076,7 @@ (set! (-> self gun surpress-time) (+ (current-time) (seconds 0.2))) (vector-float*! (-> self control transv) (-> self control edge-grab-across-edge-dir) -40960.0) (if (< (- (current-time) (-> self control rider-time)) (seconds 0.2)) - (send-event self 'push-transv (-> self control rider-last-move) #x7530) + (send-event self 'push-transv (-> self control rider-last-move) (seconds 100)) ) (go target-falling 'target-edge-grab) (none) diff --git a/test/decompiler/reference/jak2/engine/target/target_REF.gc b/test/decompiler/reference/jak2/engine/target/target_REF.gc index e3cd9b42a1..ec38cdc94c 100644 --- a/test/decompiler/reference/jak2/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target_REF.gc @@ -603,7 +603,7 @@ (set! s3-1 (+ s3-1 f0-8)) (set! s2-1 (+ s2-1 f0-8)) ) - (send-event self 'push-transv (-> self control rider-last-move) #x7530) + (send-event self 'push-transv (-> self control rider-last-move) (seconds 100)) ) (set! (-> self control unknown-float36) 0.0) (set! (-> self control unknown-float37) 0.0) diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc index a8a9c49e98..0f05ae73dd 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc @@ -323,7 +323,7 @@ ) (when s5-1 (send-event (ppointer->process s5-1) 'anim-mode 'play1) - (send-event (ppointer->process s5-1) 'speed #x3fc00000) + (send-event (ppointer->process s5-1) 'speed 1.5) (send-event (ppointer->process s5-1) 'art-joint-anim "generic-ripples-idle" 0) (set-vector! (-> (the-as process-drawable (-> s5-1 0)) root scale) 1.0 1.0 1.0 1.0) (quaternion-rotate-local-x! (-> (the-as process-drawable (-> s5-1 0)) root quat) (-> self root quat) -16384.0) diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc index 59d506b192..a5e69e78b9 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc @@ -112,10 +112,10 @@ ) (suspend) (let ((gp-0 *traffic-manager*)) - (send-event gp-0 'deactivate-by-type 6) - (send-event gp-0 'deactivate-by-type 18) - (send-event gp-0 'deactivate-by-type 19) - (send-event gp-0 'deactivate-by-type 20) + (send-event gp-0 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event gp-0 'deactivate-by-type (traffic-type guard-bike)) + (send-event gp-0 'deactivate-by-type (traffic-type hellcat)) + (send-event gp-0 'deactivate-by-type (traffic-type traffic-type-20)) (send-event gp-0 'set-guard-target-level 0) ) (set-setting! 'pilot #f 0.0 0) @@ -466,7 +466,7 @@ (lambda :behavior task-manager () (local-vars (v1-7 symbol)) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (until (or v1-7 (and *target* (focus-test? *target* pilot))) (suspend) (let ((f0-0 122880.0)) @@ -487,7 +487,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (send-event *target* 'end-mode) (set-setting! 'pilot #f 0.0 0) (set! (-> self state-time) (current-time)) @@ -852,7 +852,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'restore-default-settings) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (none) ) ) @@ -874,7 +874,3 @@ (none) ) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc index c9555f49ed..0beba8f408 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc @@ -454,8 +454,8 @@ (send-event gp-0 'set-guard-target-count-range 4 0 0) (send-event gp-0 'set-guard-target-count-range 5 0 0) (send-event gp-0 'set-guard-target-count-range 0 6 6) - (send-event gp-0 'set-alert-duration #xa4cb80) - (send-event gp-0 'set-object-reserve-count 6 #x7d00) + (send-event gp-0 'set-alert-duration (seconds 36000)) + (send-event gp-0 'set-object-reserve-count (traffic-type crimson-guard-1) #x7d00) (when arg0 (send-event gp-0 'set-guard-force-visible #t) (let ((s4-1 (new 'stack 'traffic-object-spawn-params))) @@ -1487,9 +1487,9 @@ (send-event s5-0 'set-alert-level 1) (send-event s5-0 'set-max-alert-level 1) (send-event s5-0 'set-guard-target-count-range 4 0 0) - (send-event s5-0 'end-pursuit-by-type 18) + (send-event s5-0 'end-pursuit-by-type (traffic-type guard-bike)) (send-event s5-0 'set-guard-target-count-range 5 0 0) - (send-event s5-0 'end-pursuit-by-type 19) + (send-event s5-0 'end-pursuit-by-type (traffic-type hellcat)) ) (let ((v1-43 (get-task-by-type (-> arg0 ai-ctrl) halt-wait-spot arg0))) (set! (-> v1-43 bytes 5) 1) @@ -1615,7 +1615,7 @@ ) ) (when (not (logtest? (-> arg1 bot-task-bits) 1)) - (send-event *traffic-manager* 'set-alert-duration 300) + (send-event *traffic-manager* 'set-alert-duration (seconds 1)) (logior! (-> arg1 bot-task-bits) 1) ) (when (not (hal-escort-method-230 arg1)) @@ -1655,7 +1655,7 @@ (when (logtest? (-> arg1 bot-task-bits) 1) (let ((s5-1 *traffic-manager*)) (send-event s5-1 'set-alert-level 1) - (send-event s5-1 'set-alert-duration #xa4cb80) + (send-event s5-1 'set-alert-duration (seconds 36000)) ) (logand! (-> arg1 bot-task-bits) -2) ) @@ -1742,10 +1742,10 @@ ) (logior! (-> arg1 waypoint-bits) 2) (let ((s5-0 *traffic-manager*)) - (send-event s5-0 'deactivate-by-type 6) - (send-event s5-0 'deactivate-by-type 18) - (send-event s5-0 'deactivate-by-type 19) - (send-event s5-0 'deactivate-by-type 20) + (send-event s5-0 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event s5-0 'deactivate-by-type (traffic-type guard-bike)) + (send-event s5-0 'deactivate-by-type (traffic-type hellcat)) + (send-event s5-0 'deactivate-by-type (traffic-type traffic-type-20)) ) ) (when (and (not (logtest? (-> arg1 waypoint-bits) 1)) @@ -1823,7 +1823,7 @@ :on-set (lambda ((arg0 hal-escort)) (remove-setting! 'sound-mode) (let ((a0-2 *traffic-manager*)) - (send-event a0-2 'deactivate-by-type 6) + (send-event a0-2 'deactivate-by-type (traffic-type crimson-guard-1)) ) (let ((v1-8 (get-task-by-type (-> arg0 ai-ctrl) halt-wait-spot arg0))) (set! (-> v1-8 bytes 5) 1) @@ -1951,7 +1951,7 @@ (remove-setting! 'music) (remove-setting! 'sound-mode) (let ((a0-3 *traffic-manager*)) - (send-event a0-3 'deactivate-by-type 6) + (send-event a0-3 'deactivate-by-type (traffic-type crimson-guard-1)) ) (set-action! *gui-control* diff --git a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc index f3e6db8d8e..8c34862e5e 100644 --- a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc @@ -2813,7 +2813,7 @@ () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-lurker :init hud-init-by-other :to self))) (suspend) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) @@ -2838,7 +2838,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (send-event *target* 'end-mode) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 2)) @@ -3405,7 +3405,7 @@ () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-lurker :init hud-init-by-other :to self))) (suspend) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) diff --git a/test/decompiler/reference/jak2/levels/city/oracle/oracle-training_REF.gc b/test/decompiler/reference/jak2/levels/city/oracle/oracle-training_REF.gc index 2e008af78d..cc634be63a 100644 --- a/test/decompiler/reference/jak2/levels/city/oracle/oracle-training_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/oracle/oracle-training_REF.gc @@ -8,7 +8,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -25,7 +25,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! @@ -106,7 +106,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -123,7 +123,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! @@ -204,7 +204,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -222,7 +222,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! @@ -282,7 +282,7 @@ TASK_MANAGER_INIT_HOOK (lambda :behavior task-manager () - (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup 7))) + (set! (-> self data-float 0) (the-as float (send-event *target* 'test-pickup (pickup-type eco-pill-dark)))) (send-event *target* 'change-mode 'darkjak #f 65) (set! (-> self sound-id 0) (add-process *gui-control* self (gui-channel message) (gui-action play) (-> self name) 81920.0 0) @@ -299,7 +299,7 @@ TASK_MANAGER_CLEANUP_HOOK (lambda :behavior task-manager () - (send-event *target* 'get-pickup 7 (-> self data-float 0)) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) (-> self data-float 0)) (send-event *target* 'change-mode 'darkjak #f 128) (send-event *target* 'get-notify #f) (set-action! diff --git a/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc b/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc index fce44bdef1..156391963e 100644 --- a/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc @@ -194,7 +194,7 @@ This commonly includes things such as: ) ) ) - (send-event gp-1 'set-target-level #x3f800000) + (send-event gp-1 'set-target-level 1.0) (send-event gp-1 'set-guard-target-count-range 4 0 1) (send-event gp-1 'set-guard-target-count-range 5 0 0) ) @@ -491,7 +491,7 @@ This commonly includes things such as: (send-event *traffic-manager* 'set-guard-target-count-range 4 0 10) (send-event *traffic-manager* 'set-guard-target-count-range 5 0 10) (send-event *traffic-manager* 'set-alert-level 3) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (speech-table-set! *speech-control* (speech-type speech-type-7) (new 'static 'speech-type-info :channel #x1 :priority -2 @@ -543,7 +543,7 @@ This commonly includes things such as: (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (if (and *target* (focus-test? *target* pilot)) (send-event *target* 'change-mode 'normal) ) diff --git a/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc b/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc index 005562d86d..07c32cbb76 100644 --- a/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/port/portrun/portrun_REF.gc @@ -2014,13 +2014,13 @@ TASK_MANAGER_CODE_HOOK (lambda :behavior task-manager () - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) ) (send-event *traffic-manager* 'set-alert-level 1) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc b/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc index cc6d61f6b6..8e26bdf4e8 100644 --- a/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc @@ -1238,7 +1238,7 @@ (set-setting! 'minimap 'clear 0.0 (minimap-flag task-graph)) (set-setting! 'exclusive-task #f 0.0 (-> self node-info task)) (let ((gp-0 *traffic-manager*)) - (send-event gp-0 'set-target-level #x3e800000) + (send-event gp-0 'set-target-level 0.25) (send-event gp-0 'set-guard-target-count-range 0 0 0) (send-event gp-0 'set-guard-target-count-range 1 0 0) (send-event gp-0 'set-guard-target-count-range 2 0 0) @@ -1487,7 +1487,7 @@ (set-setting! 'exclusive-load 'lprtrace 0.0 0) (set-setting! 'airlock #f 0.0 0) (let ((gp-0 *traffic-manager*)) - (send-event gp-0 'set-target-level #x3e800000) + (send-event gp-0 'set-target-level 0.25) (send-event gp-0 'set-guard-target-count-range 0 0 0) (send-event gp-0 'set-guard-target-count-range 1 0 0) (send-event gp-0 'set-guard-target-count-range 2 0 0) diff --git a/test/decompiler/reference/jak2/levels/city/power/ctypower_REF.gc b/test/decompiler/reference/jak2/levels/city/power/ctypower_REF.gc index 504be7d227..16b00e8e4d 100644 --- a/test/decompiler/reference/jak2/levels/city/power/ctypower_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/power/ctypower_REF.gc @@ -157,13 +157,13 @@ (lambda :behavior task-manager () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-turret :init hud-init-by-other :to self))) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) ) (send-event *traffic-manager* 'set-alert-level 1) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc b/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc index 0a43c5598e..fac69d2780 100644 --- a/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc @@ -351,27 +351,27 @@ This commonly includes things such as: ) (let ((gp-0 *traffic-manager*)) (send-event gp-0 'set-alert-level 2) - (send-event gp-0 'set-alert-duration #xa4cb80) - (send-event gp-0 'deactivate-by-type 6) - (send-event gp-0 'deactivate-by-type 18) - (send-event gp-0 'deactivate-by-type 19) - (send-event gp-0 'deactivate-by-type 20) - (send-event gp-0 'deactivate-by-type 11) - (send-event gp-0 'deactivate-by-type 12) - (send-event gp-0 'deactivate-by-type 13) - (send-event gp-0 'deactivate-by-type 14) - (send-event gp-0 'deactivate-by-type 15) - (send-event gp-0 'deactivate-by-type 16) - (send-event gp-0 'set-object-target-count 6 0) - (send-event gp-0 'set-object-target-count 18 0) - (send-event gp-0 'set-object-target-count 19 0) - (send-event gp-0 'set-object-target-count 11 0) - (send-event gp-0 'set-object-target-count 12 0) - (send-event gp-0 'set-object-target-count 13 0) - (send-event gp-0 'set-object-target-count 14 0) - (send-event gp-0 'set-object-target-count 15 0) - (send-event gp-0 'set-object-target-count 16 0) - (send-event gp-0 'set-object-auto-activate 6 #f) + (send-event gp-0 'set-alert-duration (seconds 36000)) + (send-event gp-0 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event gp-0 'deactivate-by-type (traffic-type guard-bike)) + (send-event gp-0 'deactivate-by-type (traffic-type hellcat)) + (send-event gp-0 'deactivate-by-type (traffic-type traffic-type-20)) + (send-event gp-0 'deactivate-by-type (traffic-type bikea)) + (send-event gp-0 'deactivate-by-type (traffic-type bikeb)) + (send-event gp-0 'deactivate-by-type (traffic-type bikec)) + (send-event gp-0 'deactivate-by-type (traffic-type cara)) + (send-event gp-0 'deactivate-by-type (traffic-type carb)) + (send-event gp-0 'deactivate-by-type (traffic-type carc)) + (send-event gp-0 'set-object-target-count (traffic-type crimson-guard-1) 0) + (send-event gp-0 'set-object-target-count (traffic-type guard-bike) 0) + (send-event gp-0 'set-object-target-count (traffic-type hellcat) 0) + (send-event gp-0 'set-object-target-count (traffic-type bikea) 0) + (send-event gp-0 'set-object-target-count (traffic-type bikeb) 0) + (send-event gp-0 'set-object-target-count (traffic-type bikec) 0) + (send-event gp-0 'set-object-target-count (traffic-type cara) 0) + (send-event gp-0 'set-object-target-count (traffic-type carb) 0) + (send-event gp-0 'set-object-target-count (traffic-type carc) 0) + (send-event gp-0 'set-object-auto-activate (traffic-type crimson-guard-1) #f) (send-event gp-0 'set-guard-target-count-range 0 4 4) (send-event gp-0 'set-guard-target-count-range 1 5 5) (send-event gp-0 'set-guard-target-count-range 4 0 0) diff --git a/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc b/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc index 72d47cf462..29fcf860a3 100644 --- a/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc @@ -377,13 +377,13 @@ (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-moneybag :init hud-init-by-other :to *target*)) ) - (send-event *traffic-manager* 'set-target-level #x3f800000) + (send-event *traffic-manager* 'set-target-level 1.0) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 5)) (suspend) ) (send-event *traffic-manager* 'set-alert-level 2) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) ) ) @@ -403,7 +403,7 @@ (lambda :behavior task-manager () (send-event *traffic-manager* 'decrease-alert-level 0) - (send-event *traffic-manager* 'set-alert-duration 9000) + (send-event *traffic-manager* 'set-alert-duration (seconds 30)) (set! (-> self state-time) (current-time)) (while (< (- (current-time) (-> self state-time)) (seconds 2)) (suspend) diff --git a/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc b/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc index 7e031cf8da..2f62a6e532 100644 --- a/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc @@ -1621,7 +1621,7 @@ (lambda :behavior task-manager () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-citizen :init hud-init-by-other :to self))) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (send-event *traffic-manager* 'set-guard-target-count-range 4 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 5 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 0 0 2) @@ -1634,7 +1634,7 @@ (suspend) ) (send-event *traffic-manager* 'set-alert-level 2) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) @@ -1800,7 +1800,7 @@ (lambda :behavior task-manager () (set! (-> self hud-counter) (ppointer->handle (process-spawn hud-citizen :init hud-init-by-other :to self))) - (send-event *traffic-manager* 'set-target-level #x3f400000) + (send-event *traffic-manager* 'set-target-level 0.75) (send-event *traffic-manager* 'set-guard-target-count-range 4 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 5 0 1) (send-event *traffic-manager* 'set-guard-target-count-range 0 0 2) @@ -1813,7 +1813,7 @@ (suspend) ) (send-event *traffic-manager* 'set-alert-level 2) - (send-event *traffic-manager* 'set-alert-duration #xa4cb80) + (send-event *traffic-manager* 'set-alert-duration (seconds 36000)) (none) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc index c237562028..ca30612b06 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc @@ -538,7 +538,7 @@ (set-setting! 'allow-progress #f 0.0 0) (send-event (handle->process (-> obj arrow)) 'leave) (when (logtest? (-> obj info flags) (race-info-flags borrow)) - (send-event *traffic-manager* 'set-target-level 0) + (send-event *traffic-manager* 'set-target-level 0.0) (send-event *traffic-manager* 'set-alert-level 0) ) (send-event (handle->process (-> obj race-signal)) 'ready) diff --git a/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc b/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc index b66a627c96..a08cb613d3 100644 --- a/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/vehicle-racer_REF.gc @@ -463,7 +463,7 @@ (sound-play "turbo-pickup") (when (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) (sound-play "turbo-pickup-pl") - (send-event *target* 'color-effect 'eco-pill-dark 60) + (send-event *target* 'color-effect 'eco-pill-dark (seconds 0.2)) ) (+! (-> obj turbo-pickup-count) 1) #t diff --git a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc index 61191b6f2f..1ca3278826 100644 --- a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc @@ -681,7 +681,7 @@ (none) ) :trans (behavior () - (send-event *camera* 'joystick 0 0) + (send-event *camera* 'joystick 0.0 0.0) (none) ) :code (behavior ((arg0 continue-point)) diff --git a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc index b60a1ac581..9f586a8358 100644 --- a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc @@ -160,7 +160,7 @@ (send-event "jak-demo-logo" 'color-mult 0 0 0 1) (apply ,(lambda () - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 23) (send-event (ppointer->process *time-of-day*) 'change 'minute 0) (send-event (ppointer->process *time-of-day*) 'change 'second 0) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc index a72b4c853f..6b705ef8ad 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc @@ -26,7 +26,7 @@ (suspend) ) ) - (send-event *target* 'get-pickup 7 f30-0) + (send-event *target* 'get-pickup (pickup-type eco-pill-dark) f30-0) ) ) (send-event *target* 'end-mode) diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc index ee746203e1..bfb97b64b6 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc @@ -474,7 +474,7 @@ ) ) (let ((s4-0 (process-spawn squid-tentacle (-> arg0 root trans) gp-0 :to arg0))) - (send-event (ppointer->process s4-0) 'set-stretch-vel #x3f428f5c) + (send-event (ppointer->process s4-0) 'set-stretch-vel 0.76) (send-event (ppointer->process s4-0) 'set-fade 128) ) ) diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc index c2b2b84430..6d24812563 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc @@ -1104,14 +1104,14 @@ (set! (-> self traj-timer) 0) (set! (-> self tentacle-base-rotation-speed target) 1.0) (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f428f5c) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.76) ) (none) ) :exit (behavior () (set! (-> self tentacle-base-rotation-speed target) 0.0) (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f333333) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.7) ) (none) ) @@ -1234,13 +1234,13 @@ (set! (-> self stop-shooting) #f) (setup-masks (-> self draw) 30 0) (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f428f5c) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.76) ) (none) ) :exit (behavior () (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f333333) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.7) ) (none) ) @@ -1443,13 +1443,13 @@ (set! (-> self gun-high-to-low) (squid-method-44 self gp-0 s5-0)) ) (dotimes (gp-1 6) - (send-event (handle->process (-> self tentacles gp-1)) 'set-stretch-vel #x3f428f5c) + (send-event (handle->process (-> self tentacles gp-1)) 'set-stretch-vel 0.76) ) (none) ) :exit (behavior () (dotimes (gp-0 6) - (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel #x3f333333) + (send-event (handle->process (-> self tentacles gp-0)) 'set-stretch-vel 0.7) ) (none) ) diff --git a/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc index 493bfdf0be..f54f0ca80d 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc @@ -894,7 +894,7 @@ #f ) (('bonk) - (send-event proc 'target-mech-get-off 90) + (send-event proc 'target-mech-get-off (seconds 0.3)) (let ((evt (new 'stack-no-clear 'event-message-block))) (set! (-> evt from) (process->ppointer pp)) (set! (-> evt num-params) 2) diff --git a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc index d83f1f484a..4850d4252c 100644 --- a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc @@ -1431,22 +1431,22 @@ This commonly includes things such as: (add-process *gui-control* obj (gui-channel message) (gui-action play) (-> obj name) 81920.0 0) ) (let ((s5-0 *traffic-manager*)) - (send-event s5-0 'set-object-target-count 11 0) - (send-event s5-0 'set-object-target-count 12 0) - (send-event s5-0 'set-object-target-count 13 0) - (send-event s5-0 'set-object-target-count 14 0) - (send-event s5-0 'set-object-target-count 15 0) - (send-event s5-0 'set-object-target-count 16 0) - (send-event s5-0 'set-object-target-count 0 0) - (send-event s5-0 'set-object-target-count 1 0) - (send-event s5-0 'set-object-target-count 2 0) - (send-event s5-0 'set-object-target-count 6 0) - (send-event s5-0 'set-object-target-count 7 0) - (send-event s5-0 'set-object-target-count 8 0) - (send-event s5-0 'set-object-target-count 9 0) - (send-event s5-0 'set-object-target-count 10 0) - (send-event s5-0 'set-object-target-count 18 0) - (send-event s5-0 'set-object-target-count 19 0) + (send-event s5-0 'set-object-target-count (traffic-type bikea) 0) + (send-event s5-0 'set-object-target-count (traffic-type bikeb) 0) + (send-event s5-0 'set-object-target-count (traffic-type bikec) 0) + (send-event s5-0 'set-object-target-count (traffic-type cara) 0) + (send-event s5-0 'set-object-target-count (traffic-type carb) 0) + (send-event s5-0 'set-object-target-count (traffic-type carc) 0) + (send-event s5-0 'set-object-target-count (traffic-type citizen-norm-1) 0) + (send-event s5-0 'set-object-target-count (traffic-type citizen-chick) 0) + (send-event s5-0 'set-object-target-count (traffic-type citizen-fat) 0) + (send-event s5-0 'set-object-target-count (traffic-type crimson-guard-1) 0) + (send-event s5-0 'set-object-target-count (traffic-type crimson-guard-2) 0) + (send-event s5-0 'set-object-target-count (traffic-type metalhead-grunt) 0) + (send-event s5-0 'set-object-target-count (traffic-type metalhead-flitter) 0) + (send-event s5-0 'set-object-target-count (traffic-type metalhead-predator) 0) + (send-event s5-0 'set-object-target-count (traffic-type guard-bike) 0) + (send-event s5-0 'set-object-target-count (traffic-type hellcat) 0) (send-event s5-0 'set-guard-target-level 0) ) (set-setting! 'allow-continue #f 0.0 0) diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc index 767cb55bdd..6717568d6c 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc @@ -2753,7 +2753,7 @@ This commonly includes things such as: (when s4-0 (set! (-> obj ripple) (ppointer->handle s4-0)) (send-event (ppointer->process s4-0) 'anim-mode 'play1) - (send-event (ppointer->process s4-0) 'speed #x3fc00000) + (send-event (ppointer->process s4-0) 'speed 1.5) (send-event (ppointer->process s4-0) 'art-joint-anim "generic-ripples-idle" 0) (set-vector! (-> (the-as process-drawable (-> s4-0 0)) root scale) 1.0 1.0 1.0 1.0) (let ((s2-1 (-> arg0 head))) @@ -3478,38 +3478,38 @@ This commonly includes things such as: (set-setting! 'music 'danger6 0.0 0) (want-force-vis *load-state* 'stadblmp #t) (let ((gp-1 *traffic-manager*)) - (send-event gp-1 'set-object-target-count 11 0) - (send-event gp-1 'set-object-target-count 12 0) - (send-event gp-1 'set-object-target-count 13 0) - (send-event gp-1 'set-object-target-count 14 0) - (send-event gp-1 'set-object-target-count 15 0) - (send-event gp-1 'set-object-target-count 16 0) - (send-event gp-1 'set-object-target-count 0 0) - (send-event gp-1 'set-object-target-count 1 0) - (send-event gp-1 'set-object-target-count 2 0) - (send-event gp-1 'set-object-target-count 6 0) - (send-event gp-1 'set-object-target-count 7 0) - (send-event gp-1 'set-object-target-count 8 0) - (send-event gp-1 'set-object-target-count 9 0) - (send-event gp-1 'set-object-target-count 10 0) - (send-event gp-1 'set-object-target-count 18 0) - (send-event gp-1 'set-object-target-count 19 0) - (send-event gp-1 'deactivate-by-type 11) - (send-event gp-1 'deactivate-by-type 12) - (send-event gp-1 'deactivate-by-type 13) - (send-event gp-1 'deactivate-by-type 14) - (send-event gp-1 'deactivate-by-type 15) - (send-event gp-1 'deactivate-by-type 16) - (send-event gp-1 'deactivate-by-type 0) - (send-event gp-1 'deactivate-by-type 1) - (send-event gp-1 'deactivate-by-type 2) - (send-event gp-1 'deactivate-by-type 6) - (send-event gp-1 'deactivate-by-type 7) - (send-event gp-1 'deactivate-by-type 8) - (send-event gp-1 'deactivate-by-type 9) - (send-event gp-1 'deactivate-by-type 10) - (send-event gp-1 'deactivate-by-type 18) - (send-event gp-1 'deactivate-by-type 19) + (send-event gp-1 'set-object-target-count (traffic-type bikea) 0) + (send-event gp-1 'set-object-target-count (traffic-type bikeb) 0) + (send-event gp-1 'set-object-target-count (traffic-type bikec) 0) + (send-event gp-1 'set-object-target-count (traffic-type cara) 0) + (send-event gp-1 'set-object-target-count (traffic-type carb) 0) + (send-event gp-1 'set-object-target-count (traffic-type carc) 0) + (send-event gp-1 'set-object-target-count (traffic-type citizen-norm-1) 0) + (send-event gp-1 'set-object-target-count (traffic-type citizen-chick) 0) + (send-event gp-1 'set-object-target-count (traffic-type citizen-fat) 0) + (send-event gp-1 'set-object-target-count (traffic-type crimson-guard-1) 0) + (send-event gp-1 'set-object-target-count (traffic-type crimson-guard-2) 0) + (send-event gp-1 'set-object-target-count (traffic-type metalhead-grunt) 0) + (send-event gp-1 'set-object-target-count (traffic-type metalhead-flitter) 0) + (send-event gp-1 'set-object-target-count (traffic-type metalhead-predator) 0) + (send-event gp-1 'set-object-target-count (traffic-type guard-bike) 0) + (send-event gp-1 'set-object-target-count (traffic-type hellcat) 0) + (send-event gp-1 'deactivate-by-type (traffic-type bikea)) + (send-event gp-1 'deactivate-by-type (traffic-type bikeb)) + (send-event gp-1 'deactivate-by-type (traffic-type bikec)) + (send-event gp-1 'deactivate-by-type (traffic-type cara)) + (send-event gp-1 'deactivate-by-type (traffic-type carb)) + (send-event gp-1 'deactivate-by-type (traffic-type carc)) + (send-event gp-1 'deactivate-by-type (traffic-type citizen-norm-1)) + (send-event gp-1 'deactivate-by-type (traffic-type citizen-chick)) + (send-event gp-1 'deactivate-by-type (traffic-type citizen-fat)) + (send-event gp-1 'deactivate-by-type (traffic-type crimson-guard-1)) + (send-event gp-1 'deactivate-by-type (traffic-type crimson-guard-2)) + (send-event gp-1 'deactivate-by-type (traffic-type metalhead-grunt)) + (send-event gp-1 'deactivate-by-type (traffic-type metalhead-flitter)) + (send-event gp-1 'deactivate-by-type (traffic-type metalhead-predator)) + (send-event gp-1 'deactivate-by-type (traffic-type guard-bike)) + (send-event gp-1 'deactivate-by-type (traffic-type hellcat)) (send-event gp-1 'set-guard-target-level 0) ) (let ((v1-177 (entity-by-name "parking-spot-48"))) diff --git a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc index a0819caf95..e47c2db027 100644 --- a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc @@ -170,7 +170,7 @@ (setting-unset sound-bank-load) (apply ,(lambda () - (send-event (ppointer->process *time-of-day*) 'change 'ratio 0) + (send-event (ppointer->process *time-of-day*) 'change 'ratio 0.0) (send-event (ppointer->process *time-of-day*) 'change 'hour 23) (send-event (ppointer->process *time-of-day*) 'change 'minute 0) (send-event (ppointer->process *time-of-day*) 'change 'second 0)