diff --git a/decompiler/IR2/FormExpressionAnalysis.cpp b/decompiler/IR2/FormExpressionAnalysis.cpp index de154e9596..7ef5891c7d 100644 --- a/decompiler/IR2/FormExpressionAnalysis.cpp +++ b/decompiler/IR2/FormExpressionAnalysis.cpp @@ -2670,16 +2670,16 @@ void SetFormFormElement::push_to_stack(const Env& env, FormPool& pool, FormStack typedef struct { FixedOperatorKind kind; FixedOperatorKind inplace_kind; - int inplace_arg; + std::vector inplace_arg; } InplaceOpInfo; const static InplaceOpInfo in_place_ops[] = { - {FixedOperatorKind::ADDITION, FixedOperatorKind::ADDITION_IN_PLACE, 0}, - {FixedOperatorKind::ADDITION_PTR, FixedOperatorKind::ADDITION_PTR_IN_PLACE, 0}, - {FixedOperatorKind::LOGAND, FixedOperatorKind::LOGAND_IN_PLACE, 0}, - {FixedOperatorKind::LOGIOR, FixedOperatorKind::LOGIOR_IN_PLACE, 0}, - {FixedOperatorKind::LOGCLEAR, FixedOperatorKind::LOGCLEAR_IN_PLACE, 0}, - {FixedOperatorKind::LOGXOR, FixedOperatorKind::LOGXOR_IN_PLACE, 0}}; + {FixedOperatorKind::ADDITION, FixedOperatorKind::ADDITION_IN_PLACE, {0, 1}}, + {FixedOperatorKind::ADDITION_PTR, FixedOperatorKind::ADDITION_PTR_IN_PLACE, {0, 1}}, + {FixedOperatorKind::LOGAND, FixedOperatorKind::LOGAND_IN_PLACE, {0, 1}}, + {FixedOperatorKind::LOGIOR, FixedOperatorKind::LOGIOR_IN_PLACE, {0, 1}}, + {FixedOperatorKind::LOGCLEAR, FixedOperatorKind::LOGCLEAR_IN_PLACE, {0, 1}}, + {FixedOperatorKind::LOGXOR, FixedOperatorKind::LOGXOR_IN_PLACE, {0, 1}}}; typedef struct { std::string orig_name; @@ -2724,12 +2724,18 @@ void SetFormFormElement::push_to_stack(const Env& env, FormPool& pool, FormStack for (const auto& op_info : in_place_ops) { if (src_as_generic->op().is_fixed(op_info.kind)) { auto dst_form = m_dst->to_form(env); - auto add_form_0 = src_as_generic->elts().at(op_info.inplace_arg)->to_form(env); - if (dst_form == add_form_0) { - src_as_generic->op() = GenericOperator::make_fixed(op_info.inplace_kind); - stack.push_form_element(src_as_generic, true); - return; + for (int inplace_arg : op_info.inplace_arg) { + auto add_form_0 = src_as_generic->elts().at(inplace_arg)->to_form(env); + + if (dst_form == add_form_0) { + if (inplace_arg != 0) { + std::swap(src_as_generic->elts().at(0), src_as_generic->elts().at(1)); + } + src_as_generic->op() = GenericOperator::make_fixed(op_info.inplace_kind); + stack.push_form_element(src_as_generic, true); + return; + } } } } diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 3cbc55bd35..7b94c4ada0 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -6747,6 +6747,13 @@ (progress-on #x10e) (progress-off #x10f) (progress-move-dpad #x110) + (text-x111 #x111) + (text-x112 #x112) + (text-x113 #x113) + (text-x114 #x114) + (text-x115 #x115) + (text-x116 #x116) + (text-x117 #x117) (progress-aspect-ratio #x118) (progress-progressive-scan #x119) (progress-video-mode #x11a) @@ -7219,6 +7226,7 @@ (scene-nest-boss-intro #x306) (scene-intro #x307) (scene-outro #x308) + (text-x30b #x30b) (scene-subtitles-hint #x30c) (scene-subtitles-enabled #x30d) (scene-subtitles-disabled #x30e) diff --git a/decompiler/config/jak2/ntsc_v1/label_types.jsonc b/decompiler/config/jak2/ntsc_v1/label_types.jsonc index 951c3aa444..35d3d41aa6 100644 --- a/decompiler/config/jak2/ntsc_v1/label_types.jsonc +++ b/decompiler/config/jak2/ntsc_v1/label_types.jsonc @@ -387,6 +387,15 @@ ["L1025", "uint64", true], ["L1041", "uint64", true] ], + "progress-static": [ + ["L343", "(array text-id)"], + ["L344", "(array text-id)"] + ], + "demo-obs": [ + ["L296", "(array text-id)"], + ["L297", "(array text-id)"], + ["L298", "(array text-id)"] + ], "crates": [ ["L213", "attack-info"], ["L214", "attack-info"], diff --git a/goal_src/jak1/build/all_objs.json b/goal_src/jak1/build/all_objs.json index e050f6e096..1f258c6bb9 100644 --- a/goal_src/jak1/build/all_objs.json +++ b/goal_src/jak1/build/all_objs.json @@ -45,8 +45,8 @@ ["loader-h", "loader-h", 3, ["GAME", "ENGINE"], "engine/load"], ["texture-h", "texture-h", 3, ["GAME", "ENGINE"], "engine/gfx"], ["level-h", "level-h", 3, ["GAME", "ENGINE"], "engine/level"], -["math-camera-h", "math-camera-h", 3, ["GAME", "ENGINE"], "engine/camera"], -["math-camera", "math-camera", 3, ["GAME", "ENGINE"], "engine/camera"], +["math-camera-h", "math-camera-h", 3, ["GAME", "ENGINE"], "engine/gfx"], +["math-camera", "math-camera", 3, ["GAME", "ENGINE"], "engine/gfx"], ["font-h", "font-h", 3, ["GAME", "ENGINE"], "engine/gfx"], ["decomp-h", "decomp-h", 3, ["GAME", "ENGINE"], "engine/gfx"], ["display", "display", 3, ["GAME", "ENGINE"], "engine/gfx/hw"], diff --git a/goal_src/jak1/engine/camera/cam-combiner.gc b/goal_src/jak1/engine/camera/cam-combiner.gc index a01cbfc03a..d069123f3a 100644 --- a/goal_src/jak1/engine/camera/cam-combiner.gc +++ b/goal_src/jak1/engine/camera/cam-combiner.gc @@ -294,7 +294,7 @@ (let ((f28-1 (acos (vector-dot (the-as vector (-> s1-0 vector)) (-> s1-0 vector 1))))) (cond ((logtest? (-> *camera* master-options) 8) - (set! (-> *camera* master-options) (logand -25 (-> *camera* master-options))) + (logand! (-> *camera* master-options) -25) (when (and (< 8192.0 f28-1) (logtest? (-> *camera* master-options) 2)) (vector-! (the-as vector (-> s1-0 vector)) (-> *camera* tpos-curr) s2-0) (vector-! (-> s1-0 vector 1) s0-0 s2-0) diff --git a/goal_src/jak1/engine/camera/cam-master.gc b/goal_src/jak1/engine/camera/cam-master.gc index f952251c06..4ddd4be86b 100644 --- a/goal_src/jak1/engine/camera/cam-master.gc +++ b/goal_src/jak1/engine/camera/cam-master.gc @@ -203,7 +203,7 @@ (!= (-> self drawable-target) #f) (not (handle->process (-> self drawable-target))) ) - (set! (-> self master-options) (logand -3 (-> self master-options))) + (logand! (-> self master-options) -3) (set! (-> self drawable-target) (the-as handle #f)) ) ((and (logtest? (-> self master-options) 2) (handle->process (-> self drawable-target))) @@ -343,7 +343,7 @@ (-> self ease-to) (parameter-ease-sin-clamp (-> self ease-t)) ) - (set! (-> self master-options) (logand -33 (-> self master-options))) + (logand! (-> self master-options) -33) ) (else (vector-lerp! @@ -561,7 +561,7 @@ (defbehavior master-unset-region camera-master () (when (-> self cam-entity) (set! (-> self cam-entity) #f) - (set! (-> self master-options) (logand -65 (-> self master-options))) + (logand! (-> self master-options) -65) (set! (-> self stringMinHeight) (-> *CAMERA-bank* default-string-min-y)) (set! (-> self stringMaxHeight) (-> *CAMERA-bank* default-string-max-y)) (set! (-> self stringMinLength) (-> *CAMERA-bank* default-string-min-z)) @@ -830,49 +830,44 @@ ) (defstate cam-master-active (camera-master) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 object)) (rlet ((vf0 :class vf)) (init-vf0-vector) - (let ((v1-0 arg2)) + (let ((v1-0 event-type)) (cond ((= v1-0 'dist-from-interp-src) - (set! v0-0 (the-as object (cond - ((not *camera-combiner*) - 409600.0 - ) - ((= (-> *camera-combiner* interp-val) 0.0) - 0.0 - ) - (else - (-> *camera-combiner* dist-from-src) - ) - ) - ) + (set! v0-0 (cond + ((not *camera-combiner*) + 409600.0 + ) + ((= (-> *camera-combiner* interp-val) 0.0) + 0.0 + ) + (else + (-> *camera-combiner* dist-from-src) + ) + ) ) ) ((= v1-0 'dist-from-interp-dest) - (set! v0-0 (the-as object (cond - ((not *camera-combiner*) - 0.0 - ) - ((= (-> *camera-combiner* interp-val) 0.0) - 409600.0 - ) - (else - (-> *camera-combiner* dist-from-dest) - ) - ) - ) + (set! v0-0 (cond + ((not *camera-combiner*) + 0.0 + ) + ((= (-> *camera-combiner* interp-val) 0.0) + 409600.0 + ) + (else + (-> *camera-combiner* dist-from-dest) + ) + ) ) ) ((= v1-0 'level-deactivate) - (set! v0-0 (the-as - object - (if (and (-> self cam-entity) (= (-> (get-level (-> self cam-entity)) name) (-> arg3 param 0))) - (master-unset-region) - ) - ) + (set! v0-0 (if (and (-> self cam-entity) (= (-> (get-level (-> self cam-entity)) name) (-> event param 0))) + (master-unset-region) + ) ) ) ((= v1-0 'clear-entity) @@ -884,25 +879,23 @@ ) ((= v1-0 'force-blend) (set! (-> self force-blend) (the-as uint 3)) - (set! v0-0 (-> arg3 param 0)) + (set! v0-0 (-> event param 0)) (set! (-> self force-blend-time) (the-as uint v0-0)) ) ((= v1-0 'teleport-to-transformq) - (set! v0-0 - (the-as object (when (> arg1 0) - (let ((gp-1 (the-as object (-> arg3 param 0)))) - (send-event self 'change-state cam-free-floating 0) - (dotimes (s5-1 (-> self num-slaves)) - (set! (-> self slave s5-1 0 trans quad) (-> (the-as matrix gp-1) vector 0 quad)) - (quaternion->matrix - (the-as matrix (-> self slave s5-1 0 tracking)) - (the-as quaternion (+ (the-as uint gp-1) 16)) - ) - ) - ) - (send-event self 'teleport) - ) - ) + (set! v0-0 (when (> arg1 0) + (let ((gp-1 (the-as object (-> event param 0)))) + (send-event self 'change-state cam-free-floating 0) + (dotimes (s5-1 (-> self num-slaves)) + (set! (-> self slave s5-1 0 trans quad) (-> (the-as matrix gp-1) vector 0 quad)) + (quaternion->matrix + (the-as matrix (-> self slave s5-1 0 tracking)) + (the-as quaternion (+ (the-as uint gp-1) 16)) + ) + ) + ) + (send-event self 'teleport) + ) ) ) ((= v1-0 'teleport-to-other-start-string) @@ -925,68 +918,64 @@ ) ((= v1-0 'teleport-to-vector-start-string) (set! v0-0 - (the-as - object - (when (> arg1 0) - (let ((v1-43 (the-as object (-> arg3 param 0))) - (gp-3 (new 'stack-no-clear 'vector)) - ) - (set! (-> *camera-combiner* trans quad) (-> (the-as vector v1-43) quad)) - (vector-! gp-3 (-> self tpos-curr-adj) (the-as vector v1-43)) - (vector-normalize! gp-3 1.0) - (forward-down->inv-matrix (-> *camera-combiner* inv-camera-rot) gp-3 (new 'static 'vector :y -1.0)) - ) - (send-event self 'change-state cam-free-floating 0) - (send-event self 'change-state *camera-base-mode* 0) + (when (> arg1 0) + (let ((v1-43 (the-as object (-> event param 0))) + (gp-3 (new 'stack-no-clear 'vector)) + ) + (set! (-> *camera-combiner* trans quad) (-> (the-as vector v1-43) quad)) + (vector-! gp-3 (-> self tpos-curr-adj) (the-as vector v1-43)) + (vector-normalize! gp-3 1.0) + (forward-down->inv-matrix (-> *camera-combiner* inv-camera-rot) gp-3 (new 'static 'vector :y -1.0)) ) + (send-event self 'change-state cam-free-floating 0) + (send-event self 'change-state *camera-base-mode* 0) ) ) ) ((= v1-0 'change-pov) - (let ((v1-52 (the-as object (-> arg3 param 0)))) + (let ((v1-52 (the-as object (-> event param 0)))) (cond ((< arg1 2) (set! (-> self pov-bone) 0) 0 ) (else - (set! (-> self pov-bone) (the-as int (-> arg3 param 1))) + (set! (-> self pov-bone) (the-as int (-> event param 1))) ) ) - (set! v0-0 (the-as object (cond - ((not (the-as process v1-52)) - (set! (-> self pov-handle) (the-as handle #f)) - #f - ) - (else - (set! v0-0 (process->handle (the-as process v1-52))) - (set! (-> self pov-handle) (the-as handle v0-0)) - v0-0 - ) - ) - ) + (set! v0-0 (cond + ((not (the-as process v1-52)) + (set! (-> self pov-handle) (the-as handle #f)) + #f + ) + (else + (set! v0-0 (process->handle (the-as process v1-52))) + (set! (-> self pov-handle) (the-as handle v0-0)) + v0-0 + ) + ) ) ) ) ((= v1-0 'change-target-bone) - (set! v0-0 (-> arg3 param 0)) + (set! v0-0 (-> event param 0)) (set! (-> self which-bone) (the-as int v0-0)) ) ((= v1-0 'change-target) - (let ((v1-56 (the-as object (-> arg3 param 0)))) + (let ((v1-56 (the-as object (-> event param 0)))) (cond ((< arg1 2) (set! (-> self which-bone) 0) 0 ) (else - (set! (-> self which-bone) (the-as int (-> arg3 param 1))) + (set! (-> self which-bone) (the-as int (-> event param 1))) ) ) (cond ((not (the-as process v1-56)) (set! (-> self drawable-target) (the-as handle #f)) - (set! (-> self master-options) (logand -3 (-> self master-options))) + (logand! (-> self master-options) -3) ) ((= (the-as process v1-56) *target*) (set! (-> self drawable-target) (the-as handle #f)) @@ -1012,18 +1001,17 @@ (set! v0-0 (matrix-identity! (the-as matrix (-> *camera-combiner* tracking)))) ) ((= v1-0 'set-fov) - (set! (-> *camera-combiner* fov) (the-as float (-> arg3 param 0))) + (set! (-> *camera-combiner* fov) (the-as float (-> event param 0))) (dotimes (v1-86 (-> self num-slaves)) - (set! (-> self slave v1-86 0 fov) (the-as float (-> arg3 param 0))) + (set! (-> self slave v1-86 0 fov) (the-as float (-> event param 0))) ) (set! v0-0 #f) ) ((= v1-0 'query-fov) - (set! v0-0 (the-as object (if (> (-> self num-slaves) 0) - (-> self slave 0 0 fov) - 11650.845 - ) - ) + (set! v0-0 (if (> (-> self num-slaves) 0) + (-> self slave 0 0 fov) + 11650.845 + ) ) ) ((= v1-0 'intro-done?) @@ -1036,22 +1024,19 @@ ) ((= v1-0 'query-state) (let ((v1-95 (+ (-> self num-slaves) -1))) - (while (not (or (< v1-95 0) (= (-> self slave v1-95 0 next-state) (-> arg3 param 0)))) + (while (not (or (< v1-95 0) (= (-> self slave v1-95 0 next-state) (-> event param 0)))) (+! v1-95 -1) ) - (set! v0-0 (the-as object (and (>= v1-95 0) (= (-> self slave v1-95 0 next-state) (-> arg3 param 0))))) + (set! v0-0 (and (>= v1-95 0) (= (-> self slave v1-95 0 next-state) (-> event param 0)))) ) ) ((= v1-0 'change-to-entity-by-name) - (let ((a0-75 (entity-by-name (the-as string (-> arg3 param 0))))) + (let ((a0-75 (entity-by-name (the-as string (-> event param 0))))) (set! v0-0 - (the-as - object - (if a0-75 - (master-switch-to-entity a0-75) - (format 0 "ERROR : camera entity '~S' not found for change-to-entity-by-name~%" (-> arg3 param 0)) - ) - ) + (if a0-75 + (master-switch-to-entity a0-75) + (format 0 "ERROR : camera entity '~S' not found for change-to-entity-by-name~%" (-> event param 0)) + ) ) ) ) @@ -1064,24 +1049,24 @@ (s4-1 (the-as (pointer camera-slave) #f)) ) (let ((t9-22 type-type?) - (v1-101 (-> arg3 param 0)) + (v1-101 (-> event param 0)) ) (cond ((t9-22 (rtype-of v1-101) state) - (set! s1-0 (-> arg3 param 0)) + (set! s1-0 (-> event param 0)) ) ((let ((t9-23 type-type?) - (v1-103 (-> arg3 param 0)) + (v1-103 (-> event param 0)) ) (t9-23 (rtype-of v1-103) camera-slave) ) - (set! s2-0 (process->ppointer (the-as process (-> arg3 param 0)))) + (set! s2-0 (process->ppointer (the-as process (-> event param 0)))) ) (else (let ((t9-24 format) (a0-82 0) (a1-25 "ERROR : invalid type '~A' to *camera* change-state~%") - (v1-106 (-> arg3 param 0)) + (v1-106 (-> event param 0)) ) (t9-24 a0-82 a1-25 (rtype-of v1-106)) ) @@ -1093,7 +1078,7 @@ ) (set! (-> self view-off-param-save) (-> self slave 0 0 view-off-param)) ) - (set! (-> self changer) (the-as uint (process->ppointer arg0))) + (set! (-> self changer) (the-as uint (process->ppointer proc))) (cond ((<= (-> self num-slaves) 0) (cond @@ -1142,7 +1127,7 @@ ) ) ) - ((zero? (-> arg3 param 1)) + ((zero? (-> event param 1)) (if *math-camera* (set! (-> *math-camera* reset) 1) ) @@ -1214,7 +1199,7 @@ ) (when (< 0.0 (-> self slave 0 0 intro-t-step)) (set! (-> self outro-t) (-> self slave 0 0 intro-t)) - (set! (-> self outro-t-step) (/ -5.0 (the float (-> arg3 param 1)))) + (set! (-> self outro-t-step) (/ -5.0 (the float (-> event param 1)))) (set! (-> self outro-exit-value) (-> self slave 0 0 outro-exit-value)) (curve-copy! (-> self outro-curve) (-> self slave 0 0 intro-curve)) ) @@ -1259,7 +1244,7 @@ ) ) (when s2-0 - (send-event *camera-combiner* 'set-interpolation (-> arg3 param 1)) + (send-event *camera-combiner* 'set-interpolation (-> event param 1)) (set! s4-1 (-> self slave 0)) (cond ((zero? (-> self slave 0 0 blend-from-type)) @@ -1361,45 +1346,40 @@ (set! v0-0 #t) ) ((= v1-0 'slave-activated) - (set! v0-0 (the-as - object - (cond - ((< (-> self num-slaves) 2) - (set! (-> self slave (-> self num-slaves)) - (the-as (pointer camera-slave) (process->ppointer (the-as process (-> arg3 param 0)))) - ) - (+! (-> self num-slaves) 1) - (logior! (-> self master-options) 8) - (let ((f0-15 (-> (the-as projectile (-> arg3 param 0)) max-turn))) - (set! (-> *camera-combiner* tracking tilt-adjust target) f0-15) - f0-15 - ) - ) - (else - (format 0 "ERROR: ERROR : Exceeded maximum number of camera slaves!~%") - (the-as object (deactivate (the-as camera-slave (-> arg3 param 0)))) - ) + (set! v0-0 + (cond + ((< (-> self num-slaves) 2) + (set! (-> self slave (-> self num-slaves)) + (the-as (pointer camera-slave) (process->ppointer (the-as process (-> event param 0)))) ) - ) + (+! (-> self num-slaves) 1) + (logior! (-> self master-options) 8) + (set! (-> *camera-combiner* tracking tilt-adjust target) (-> (the-as projectile (-> event param 0)) max-turn)) + ) + (else + (format 0 "ERROR: ERROR : Exceeded maximum number of camera slaves!~%") + (the-as object (deactivate (the-as camera-slave (-> event param 0)))) + ) + ) ) ) ((= v1-0 'ease-in) (cond ((< arg1 1) (set! (-> self ease-t) 0.0) - (set! (-> self master-options) (logand -33 (-> self master-options))) + (logand! (-> self master-options) -33) ) ((< arg1 2) - (if (< (the-as float (-> arg3 param 0)) (-> self ease-t)) - (set! (-> self ease-t) (the-as float (-> arg3 param 0))) + (if (< (the-as float (-> event param 0)) (-> self ease-t)) + (set! (-> self ease-t) (the-as float (-> event param 0))) ) - (set! (-> self master-options) (logand -33 (-> self master-options))) + (logand! (-> self master-options) -33) ) (else - (if (< (the-as float (-> arg3 param 0)) (-> self ease-t)) - (set! (-> self ease-t) (the-as float (-> arg3 param 0))) + (if (< (the-as float (-> event param 0)) (-> self ease-t)) + (set! (-> self ease-t) (the-as float (-> event param 0))) ) - (set! (-> self ease-to quad) (-> (the-as vector (-> arg3 param 1)) quad)) + (set! (-> self ease-to quad) (-> (the-as vector (-> event param 1)) quad)) (logior! (-> self master-options) 32) ) ) @@ -1414,11 +1394,10 @@ ) ) ((= v1-0 'reset-follow) - (set! v0-0 (the-as object (if (handle->process (-> self drawable-target)) - (reset-drawable-follow) - (reset-follow) - ) - ) + (set! v0-0 (if (handle->process (-> self drawable-target)) + (reset-drawable-follow) + (reset-follow) + ) ) ) ((= v1-0 'teleport) @@ -1431,141 +1410,128 @@ ) ) (countdown (gp-6 (-> self num-slaves)) - (send-event (ppointer->process (-> self slave gp-6)) arg2) + (send-event (ppointer->process (-> self slave gp-6)) event-type) ) (let ((a1-54 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-54 from) self) (set! (-> a1-54 num-params) 0) - (set! (-> a1-54 message) arg2) + (set! (-> a1-54 message) event-type) (set! v0-0 (send-event-function *camera-combiner* a1-54)) ) ) ((= v1-0 'toggle-slave-option) - (logxor! (-> self slave-options) (-> arg3 param 0)) + (logxor! (-> self slave-options) (-> event param 0)) (let ((a0-193 (-> self slave 0)) (v1-360 (-> self slave 1)) ) (if a0-193 - (logxor! (-> a0-193 0 options) (-> arg3 param 0)) + (logxor! (-> a0-193 0 options) (-> event param 0)) ) - (set! v0-0 (the-as object (when v1-360 - (set! v0-0 (logxor (-> v1-360 0 options) (-> arg3 param 0))) - (set! (-> v1-360 0 options) (the-as uint v0-0)) - v0-0 - ) - ) + (set! v0-0 (when v1-360 + (set! v0-0 (logxor (-> v1-360 0 options) (-> event param 0))) + (set! (-> v1-360 0 options) (the-as uint v0-0)) + v0-0 + ) ) ) ) (else (set! v0-0 - (the-as - object - (cond - ((= v1-0 'slave-option?) - (the-as object (if (nonzero? (-> self num-slaves)) - (logtest? (-> self slave (+ (-> self num-slaves) -1) 0 options) (-> arg3 param 0)) - ) - ) - ) - ((= v1-0 'set-slave-option) - (the-as object (when (nonzero? (-> self num-slaves)) - (set! v0-0 (logior (-> self slave (+ (-> self num-slaves) -1) 0 options) (-> arg3 param 0))) - (set! (-> self slave (+ (-> self num-slaves) -1) 0 options) (the-as uint v0-0)) - v0-0 - ) - ) - ) - ((= v1-0 'clear-slave-option) - (the-as - object - (when (nonzero? (-> self num-slaves)) - (set! v0-0 (logclear (-> self slave (+ (-> self num-slaves) -1) 0 options) (-> arg3 param 0))) - (set! (-> self slave (+ (-> self num-slaves) -1) 0 options) (the-as uint v0-0)) - v0-0 - ) + (cond + ((= v1-0 'slave-option?) + (if (nonzero? (-> self num-slaves)) + (logtest? (-> self slave (+ (-> self num-slaves) -1) 0 options) (-> event param 0)) ) - ) - ((= v1-0 'no-follow) - (when (nonzero? (-> self num-slaves)) - (set! (-> self slave (+ (-> self num-slaves) -1) 0 tracking no-follow) #t) - (vector-reset! (-> self slave (+ (-> self num-slaves) -1) 0 tracking follow-off)) - ) - (set! (-> *camera-combiner* tracking no-follow) #t) - (set! v0-0 (-> *camera-combiner* tracking follow-off)) - (.svf (&-> (the-as vector v0-0) quad) vf0) + ) + ((= v1-0 'set-slave-option) + (when (nonzero? (-> self num-slaves)) + (set! v0-0 (logior (-> self slave (+ (-> self num-slaves) -1) 0 options) (-> event param 0))) + (set! (-> self slave (+ (-> self num-slaves) -1) 0 options) (the-as uint v0-0)) v0-0 ) - ((= v1-0 'yes-follow) - (if (nonzero? (-> self num-slaves)) - (set! (-> self slave (+ (-> self num-slaves) -1) 0 tracking no-follow) #f) - ) - (set! (-> *camera-combiner* tracking no-follow) #f) - #f + ) + ((= v1-0 'clear-slave-option) + (when (nonzero? (-> self num-slaves)) + (set! v0-0 (logclear (-> self slave (+ (-> self num-slaves) -1) 0 options) (-> event param 0))) + (set! (-> self slave (+ (-> self num-slaves) -1) 0 options) (the-as uint v0-0)) + v0-0 ) - ((= v1-0 'blend-from-as-fixed) - (the-as object (when (nonzero? (-> self num-slaves)) - (set! (-> self slave (+ (-> self num-slaves) -1) 0 blend-from-type) (the-as uint 0)) - 0 - ) - ) + ) + ((= v1-0 'no-follow) + (when (nonzero? (-> self num-slaves)) + (set! (-> self slave (+ (-> self num-slaves) -1) 0 tracking no-follow) #t) + (vector-reset! (-> self slave (+ (-> self num-slaves) -1) 0 tracking follow-off)) ) - ((= v1-0 'point-of-interest) - (when (nonzero? (-> self num-slaves)) - (let ((a1-60 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-60 from) arg0) - (set! (-> a1-60 num-params) arg1) - (set! (-> a1-60 message) arg2) - (set! (-> a1-60 param 0) (-> arg3 param 0)) - (set! (-> a1-60 param 1) (-> arg3 param 1)) - (set! (-> a1-60 param 2) (-> arg3 param 2)) - (set! (-> a1-60 param 3) (-> arg3 param 3)) - (set! (-> a1-60 param 4) (-> arg3 param 4)) - (set! (-> a1-60 param 5) (-> arg3 param 5)) - (set! (-> a1-60 param 6) (-> arg3 param 6)) - (send-event-function (ppointer->process (-> self slave (+ (-> self num-slaves) -1))) a1-60) - ) + (set! (-> *camera-combiner* tracking no-follow) #t) + (set! v0-0 (-> *camera-combiner* tracking follow-off)) + (.svf (&-> (the-as vector v0-0) quad) vf0) + v0-0 + ) + ((= v1-0 'yes-follow) + (if (nonzero? (-> self num-slaves)) + (set! (-> self slave (+ (-> self num-slaves) -1) 0 tracking no-follow) #f) ) - (let ((a1-61 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-61 from) arg0) - (set! (-> a1-61 num-params) arg1) - (set! (-> a1-61 message) arg2) - (set! (-> a1-61 param 0) (-> arg3 param 0)) - (set! (-> a1-61 param 1) (-> arg3 param 1)) - (set! (-> a1-61 param 2) (-> arg3 param 2)) - (set! (-> a1-61 param 3) (-> arg3 param 3)) - (set! (-> a1-61 param 4) (-> arg3 param 4)) - (set! (-> a1-61 param 5) (-> arg3 param 5)) - (set! (-> a1-61 param 6) (-> arg3 param 6)) - (send-event-function *camera-combiner* a1-61) + (set! (-> *camera-combiner* tracking no-follow) #f) + #f + ) + ((= v1-0 'blend-from-as-fixed) + (when (nonzero? (-> self num-slaves)) + (set! (-> self slave (+ (-> self num-slaves) -1) 0 blend-from-type) (the-as uint 0)) + 0 + ) + ) + ((= v1-0 'point-of-interest) + (when (nonzero? (-> self num-slaves)) + (let ((a1-60 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-60 from) proc) + (set! (-> a1-60 num-params) arg1) + (set! (-> a1-60 message) event-type) + (set! (-> a1-60 param 0) (-> event param 0)) + (set! (-> a1-60 param 1) (-> event param 1)) + (set! (-> a1-60 param 2) (-> event param 2)) + (set! (-> a1-60 param 3) (-> event param 3)) + (set! (-> a1-60 param 4) (-> event param 4)) + (set! (-> a1-60 param 5) (-> event param 5)) + (set! (-> a1-60 param 6) (-> event param 6)) + (send-event-function (ppointer->process (-> self slave (+ (-> self num-slaves) -1))) a1-60) ) ) - ((= v1-0 'part-water-drip) - (set! (-> self water-drip-time) (-> *display* base-frame-counter)) - (set! (-> self water-drip-mult) (the-as float (-> arg3 param 0))) - (let ((f0-24 (the-as float (-> arg3 param 1)))) - (set! (-> self water-drip-speed) f0-24) - f0-24 - ) + (let ((a1-61 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-61 from) proc) + (set! (-> a1-61 num-params) arg1) + (set! (-> a1-61 message) event-type) + (set! (-> a1-61 param 0) (-> event param 0)) + (set! (-> a1-61 param 1) (-> event param 1)) + (set! (-> a1-61 param 2) (-> event param 2)) + (set! (-> a1-61 param 3) (-> event param 3)) + (set! (-> a1-61 param 4) (-> event param 4)) + (set! (-> a1-61 param 5) (-> event param 5)) + (set! (-> a1-61 param 6) (-> event param 6)) + (send-event-function *camera-combiner* a1-61) ) - (else - (countdown (s3-1 (-> self num-slaves)) - (let ((a1-62 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-62 from) arg0) - (set! (-> a1-62 num-params) arg1) - (set! (-> a1-62 message) arg2) - (set! (-> a1-62 param 0) (-> arg3 param 0)) - (set! (-> a1-62 param 1) (-> arg3 param 1)) - (set! (-> a1-62 param 2) (-> arg3 param 2)) - (set! (-> a1-62 param 3) (-> arg3 param 3)) - (set! (-> a1-62 param 4) (-> arg3 param 4)) - (set! (-> a1-62 param 5) (-> arg3 param 5)) - (set! (-> a1-62 param 6) (-> arg3 param 6)) - (send-event-function (ppointer->process (-> self slave s3-1)) a1-62) - ) + ) + ((= v1-0 'part-water-drip) + (set! (-> self water-drip-time) (-> *display* base-frame-counter)) + (set! (-> self water-drip-mult) (the-as float (-> event param 0))) + (set! (-> self water-drip-speed) (the-as float (-> event param 1))) + ) + (else + (countdown (s3-1 (-> self num-slaves)) + (let ((a1-62 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-62 from) proc) + (set! (-> a1-62 num-params) arg1) + (set! (-> a1-62 message) event-type) + (set! (-> a1-62 param 0) (-> event param 0)) + (set! (-> a1-62 param 1) (-> event param 1)) + (set! (-> a1-62 param 2) (-> event param 2)) + (set! (-> a1-62 param 3) (-> event param 3)) + (set! (-> a1-62 param 4) (-> event param 4)) + (set! (-> a1-62 param 5) (-> event param 5)) + (set! (-> a1-62 param 6) (-> event param 6)) + (send-event-function (ppointer->process (-> self slave s3-1)) a1-62) ) - #f ) + #f ) ) ) diff --git a/goal_src/jak1/engine/camera/cam-states.gc b/goal_src/jak1/engine/camera/cam-states.gc index f73da2739d..ac576fa321 100644 --- a/goal_src/jak1/engine/camera/cam-states.gc +++ b/goal_src/jak1/engine/camera/cam-states.gc @@ -2285,7 +2285,7 @@ ;; main third-person camera (defbehavior cam-string-joystick camera-slave () - (set! (-> self options) (logand -257 (-> self options))) + (logand! (-> self options) -257) (let ((f28-0 (cam-dist-analog-input (the-as int (-> *cpad-list* cpads 0 righty)) (the-as float 0.05))) (f0-2 (/ (- (vector-length (-> self view-flat)) (-> self string-min-val z)) (- (-> self string-max-val z) (-> self string-min-val z)) @@ -2604,7 +2604,7 @@ ) (cond ((zero? gp-2) - (set! (-> self options) (logand -1025 (-> self options))) + (logand! (-> self options) -1025) (if *display-cam-los-debug* (format *stdcon* "not blocked~%") ) @@ -2674,7 +2674,7 @@ (cam-collision-record-save (-> self string-trans) a1-1 -2 'jump self) ) ) - (set! (-> self options) (logand -4097 (-> self options))) + (logand! (-> self options) -4097) (set! (-> self desired-pos quad) (-> self good-point quad)) (cam-string-move) (vector-! (-> self view-flat) (-> self string-trans) (-> *camera* tpos-curr-adj)) diff --git a/goal_src/jak1/engine/common-obs/basebutton.gc b/goal_src/jak1/engine/common-obs/basebutton.gc index 3e6b318fce..90b3ee0dab 100644 --- a/goal_src/jak1/engine/common-obs/basebutton.gc +++ b/goal_src/jak1/engine/common-obs/basebutton.gc @@ -570,7 +570,7 @@ (set! (-> self control unknown-surface00) *warp-jump-mods*) (set! (-> self control unknown-vector102 quad) (-> arg0 quad)) (set! (-> self control unknown-vector103 quad) (-> arg1 quad)) - (set! (-> self control unknown-vector102 y) (+ -4096.0 (-> self control unknown-vector102 y))) + (+! (-> self control unknown-vector102 y) -4096.0) (set! (-> self control unknown-uint20) (the-as uint #f)) (vector-reset! (-> self control transv)) (logior! (-> self state-flags) (state-flags use-alt-cam-pos)) diff --git a/goal_src/jak1/engine/common-obs/collectables.gc b/goal_src/jak1/engine/common-obs/collectables.gc index 9328a20969..82ddad0cf4 100644 --- a/goal_src/jak1/engine/common-obs/collectables.gc +++ b/goal_src/jak1/engine/common-obs/collectables.gc @@ -60,7 +60,7 @@ (defmethod initialize-params collectable ((obj collectable) (arg0 time-frame) (arg1 float)) (logclear! (-> obj mask) (process-mask crate enemy platform ambient)) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (set! (-> obj flags) (collectable-flags can-collect ignore-blue)) (set! (-> obj bob-amount) arg1) (set! (-> obj bob-offset) (+ (the-as int (-> obj root-override trans x)) @@ -371,7 +371,7 @@ ) ) ((and arg2 (and (< (+ 4096.0 (-> *FACT-bank* suck-bounce-dist)) f0-0) - (zero? (logand (-> self flags) (collectable-flags suck))) + (not (logtest? (-> self flags) (collectable-flags suck))) ) ) (go-virtual wait) @@ -445,65 +445,65 @@ (defstate wait (eco-collectable) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (local-vars (v0-3 none)) - (when (and (or (= arg2 'touch) (= arg2 'attack)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (local-vars (v0-3 object)) + (when (and (or (= event-type 'touch) (= event-type 'attack)) (and (logtest? (-> self flags) (collectable-flags can-collect)) (>= (- (-> *display* base-frame-counter) (-> self birth-time)) (-> self collect-timeout)) (!= (-> self next-state name) 'pickup) - (send-event arg0 'get-pickup (-> self fact pickup-type) (-> self fact pickup-amount)) + (send-event proc 'get-pickup (-> self fact pickup-type) (-> self fact pickup-amount)) ) ) (logclear! (-> self mask) (process-mask actor-pause)) - (go-virtual pickup #f (process->handle arg0)) + (go-virtual pickup #f (process->handle proc)) ) (the-as object (cond - ((= arg2 'eco-blue) - (when (and (zero? (logand (-> self flags) (collectable-flags fading ignore-blue))) + ((= event-type 'eco-blue) + (when (and (not (logtest? (-> self flags) (collectable-flags fading ignore-blue))) (!= (-> self next-state name) 'pickup) - (begin (check-blue-suck (the-as process-drawable arg0)) #t) + (begin (check-blue-suck (the-as process-drawable proc)) #t) (logtest? (-> self flags) (collectable-flags can-collect)) (>= (- (-> *display* base-frame-counter) (-> self birth-time)) (-> self collect-timeout)) ) (logclear! (-> self mask) (process-mask actor-pause)) - (go-virtual notice-blue (process->handle arg0)) + (go-virtual notice-blue (process->handle proc)) ) ) - ((= arg2 'trans) - (set! (-> self root-override trans quad) (-> (the-as vector (-> arg3 param 0)) quad)) + ((= event-type 'trans) + (set! (-> self root-override trans quad) (-> (the-as vector (-> event param 0)) quad)) (update-transforms! (-> self root-override)) - (ja-post) + (the-as object (ja-post)) ) - ((= arg2 'jump) + ((= event-type 'jump) (logclear! (-> self mask) (process-mask actor-pause)) - (set! (-> self jump-pos quad) (-> (the-as vector (-> arg3 param 0)) quad)) + (set! (-> self jump-pos quad) (-> (the-as vector (-> event param 0)) quad)) (go-virtual jump) ) - ((= arg2 'pickup) + ((= event-type 'pickup) (when (!= (-> self next-state name) 'pickup) - (if (and (> arg1 0) (-> arg3 param 0)) - (move-to-point! (-> self root-override) (the-as vector (-> arg3 param 0))) + (if (and (> arg1 0) (-> event param 0)) + (move-to-point! (-> self root-override) (the-as vector (-> event param 0))) ) (logclear! (-> self mask) (process-mask actor-pause)) (go-virtual pickup #f (the-as handle #f)) ) ) - ((= arg2 'die) + ((= event-type 'die) (logclear! (-> self mask) (process-mask actor-pause)) (go-virtual die) ) - ((= arg2 'movie-pos) - (set! v0-3 (the-as none (-> arg3 param 0))) + ((= event-type 'movie-pos) + (set! v0-3 (-> event param 0)) (set! (-> self movie-pos-index) (the-as int v0-3)) v0-3 ) - ((= arg2 'actor-pause) + ((= event-type 'actor-pause) (cond - ((-> arg3 param 0) + ((-> event param 0) (logior! (-> self mask) (process-mask actor-pause)) - (set! v0-3 (the-as none #t)) + (set! v0-3 #t) (set! (-> self actor-pause) (the-as symbol v0-3)) v0-3 ) @@ -514,10 +514,10 @@ ) ) ) - ((= arg2 'fade) + ((= event-type 'fade) (logior! (-> self flags) (collectable-flags fade)) (set! (-> self fadeout-timeout) (seconds 0.1)) - (set! v0-3 (the-as none (-> *display* base-frame-counter))) + (set! v0-3 (-> *display* base-frame-counter)) (set! (-> self birth-time) (the-as time-frame v0-3)) v0-3 ) @@ -557,7 +557,7 @@ ) (set! (-> self base quad) (-> self root-override trans quad)) (if (and (logtest? (-> self fact options) (fact-options can-collect)) - (zero? (logand (-> self flags) (collectable-flags ignore-blue))) + (not (logtest? (-> self flags) (collectable-flags ignore-blue))) ) (go-virtual notice-blue (process->handle *target*)) ) @@ -618,16 +618,16 @@ (defstate notice-blue (eco-collectable) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (when (and (or (= arg2 'touch) (= arg2 'attack)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (when (and (or (= event-type 'touch) (= event-type 'attack)) (and (logtest? (-> self flags) (collectable-flags can-collect)) (>= (- (-> *display* base-frame-counter) (-> self birth-time)) (-> self collect-timeout)) (!= (-> self next-state name) 'pickup) - (send-event arg0 'get-pickup (-> self fact pickup-type) (-> self fact pickup-amount)) + (send-event proc 'get-pickup (-> self fact pickup-type) (-> self fact pickup-amount)) ) ) (logclear! (-> self mask) (process-mask actor-pause)) - (go-virtual pickup #f (process->handle arg0)) + (go-virtual pickup #f (process->handle proc)) ) ) :enter (behavior ((arg0 handle)) @@ -656,7 +656,7 @@ (set! (-> a1-0 message) 'query) (set! (-> a1-0 param 0) (the-as uint 'powerup)) (set! (-> a1-0 param 1) (the-as uint 3)) - (if (and (not (send-event-function *target* a1-0)) (zero? (logand (-> self flags) (collectable-flags suck)))) + (if (and (not (send-event-function *target* a1-0)) (not (logtest? (-> self flags) (collectable-flags suck)))) (go-virtual wait) ) ) @@ -688,42 +688,40 @@ (defstate pickup (eco-collectable) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'set-movie-pos) - (let ((v1-3 (res-lump-struct (-> self entity) 'movie-pos vector :time (the-as float -1000000000.0)))) - (the-as symbol (when v1-3 - (set! (-> v1-3 quad) (-> (the-as vector (-> arg3 param 0)) quad)) - (the-as symbol v1-3) - ) - ) - ) - ) - ((= v1-0 'actor-pause) - (the-as symbol (cond - ((-> arg3 param 0) - (logior! (-> self mask) (process-mask actor-pause)) - (let ((v0-1 #t)) - (set! (-> self actor-pause) v0-1) - v0-1 - ) - ) - (else - (logclear! (-> self mask) (process-mask actor-pause)) - (set! (-> self actor-pause) #f) - #f - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + object + (case event-type + (('set-movie-pos) + (let ((v1-3 (res-lump-struct (-> self entity) 'movie-pos vector :time (the-as float -1000000000.0)))) + (the-as symbol (when v1-3 + (set! (-> v1-3 quad) (-> (the-as vector (-> event param 0)) quad)) + (the-as symbol v1-3) ) ) ) - ((= v1-0 'fade) - (process-entity-status! self (entity-perm-status dead) #t) - (the-as symbol (deactivate self)) - ) - ) + ) + (('actor-pause) + (the-as symbol (cond + ((-> event param 0) + (logior! (-> self mask) (process-mask actor-pause)) + (let ((v0-1 #t)) + (set! (-> self actor-pause) v0-1) + v0-1 + ) + ) + (else + (logclear! (-> self mask) (process-mask actor-pause)) + (set! (-> self actor-pause) #f) + #f + ) + ) + ) + ) + (('fade) + (process-entity-status! self (entity-perm-status dead) #t) + (the-as symbol (deactivate self)) + ) ) ) ) @@ -888,19 +886,17 @@ (defstate die (eco) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'fade) - (process-entity-status! self (entity-perm-status dead) #t) - (deactivate self) - ) - ((= v1-0 'die) - (go-virtual die) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('fade) + (process-entity-status! self (entity-perm-status dead) #t) + (the-as object (deactivate self)) + ) + (('die) + (go-virtual die) + ) + ) + ) ) :exit (behavior () (process-entity-status! self (entity-perm-status bit-3) #f) @@ -1090,7 +1086,7 @@ (defmethod run-logic? money ((obj money)) - (or (zero? (logand (-> obj mask) (process-mask actor-pause))) + (or (not (logtest? (-> obj mask) (process-mask actor-pause))) (or (and (nonzero? (-> obj draw)) (logtest? (-> obj draw status) (draw-status was-drawn)) (>= (+ (-> *ACTOR-bank* pause-dist) (-> obj root-override pause-adjust-distance)) @@ -1433,58 +1429,58 @@ (defstate wait (fuel-cell) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (local-vars (v0-3 none)) - (when (and (or (= arg2 'touch) (= arg2 'attack)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (local-vars (v0-3 object)) + (when (and (or (= event-type 'touch) (= event-type 'attack)) (and (logtest? (-> self flags) (collectable-flags can-collect)) (>= (- (-> *display* base-frame-counter) (-> self birth-time)) (-> self collect-timeout)) (and (not (handle->process (-> *game-info* other-camera-handle))) (not *progress-process*) (!= (-> self next-state name) 'pickup) *target* - (zero? (logand (-> *target* state-flags) (state-flags grabbed dying))) + (not (logtest? (-> *target* state-flags) (state-flags grabbed dying))) ) ) ) (add-setting! 'allow-progress #f 0.0 0) (apply-settings *setting-control*) (logclear! (-> self mask) (process-mask actor-pause)) - (go-virtual pickup #f (process->handle arg0)) + (go-virtual pickup #f (process->handle proc)) ) (the-as object (cond - ((= arg2 'trans) - (set! (-> self root-override trans quad) (-> (the-as vector (-> arg3 param 0)) quad)) + ((= event-type 'trans) + (set! (-> self root-override trans quad) (-> (the-as vector (-> event param 0)) quad)) (set! (-> self base quad) (-> self root-override trans quad)) (update-transforms! (-> self root-override)) ) - ((= arg2 'pickup) + ((= event-type 'pickup) (when (!= (-> self next-state name) 'pickup) - (if (and (> arg1 0) (-> arg3 param 0)) - (move-to-point! (-> self root-override) (the-as vector (-> arg3 param 0))) + (if (and (> arg1 0) (-> event param 0)) + (move-to-point! (-> self root-override) (the-as vector (-> event param 0))) ) (logclear! (-> self mask) (process-mask actor-pause)) (go-virtual pickup #f (process->handle *target*)) ) ) - ((= arg2 'collide-shape) - (if (-> arg3 param 0) - (restore-collide-with-as (-> self root-override)) - (clear-collide-with-as (-> self root-override)) + ((= event-type 'collide-shape) + (if (-> event param 0) + (the-as object (restore-collide-with-as (-> self root-override))) + (the-as object (clear-collide-with-as (-> self root-override))) ) ) - ((= arg2 'movie-pos) - (set! v0-3 (the-as none (-> arg3 param 0))) + ((= event-type 'movie-pos) + (set! v0-3 (-> event param 0)) (set! (-> self movie-pos-index) (the-as int v0-3)) v0-3 ) - ((= arg2 'anim) + ((= event-type 'anim) (cond - ((-> arg3 param 0) - (set! v0-3 (the-as none (logclear (-> self flags) (collectable-flags anim)))) + ((-> event param 0) + (set! v0-3 (logclear (-> self flags) (collectable-flags anim))) (set! (-> self flags) (the-as collectable-flags v0-3)) ) (else - (set! v0-3 (the-as none (logior (-> self flags) (collectable-flags anim)))) + (set! v0-3 (logior (-> self flags) (collectable-flags anim))) (set! (-> self flags) (the-as collectable-flags v0-3)) ) ) @@ -1500,7 +1496,7 @@ (loop (let ((f30-0 (vector-vector-distance (-> self base) (target-pos 0)))) (set! f28-0 - (if (and (< f30-0 (-> *FACT-bank* suck-suck-dist)) (zero? (logand (-> self flags) (collectable-flags anim)))) + (if (and (< f30-0 (-> *FACT-bank* suck-suck-dist)) (not (logtest? (-> self flags) (collectable-flags anim)))) (seek f28-0 (the-as float 16384.0) (* 3072.0 (-> *display* seconds-per-frame))) (seek f28-0 (the-as float 0.0) (* 3072.0 (-> *display* seconds-per-frame))) ) @@ -1775,22 +1771,10 @@ ) ) ((= arg0 (game-task ogre-boss)) - (level-hint-spawn - (text-id ogre-boss-resolution) - "asstvb23" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id ogre-boss-resolution) "asstvb23" (the-as entity #f) *entity-pool* (game-task none)) ) ((= arg0 (game-task ogre-end)) - (level-hint-spawn - (text-id ogre-race-resolution) - "asstvb25" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id ogre-race-resolution) "asstvb25" (the-as entity #f) *entity-pool* (game-task none)) ) ((= arg0 (game-task beach-buzzer)) (level-hint-spawn @@ -2032,18 +2016,18 @@ (cond ((and *debug-segment* (< (-> *fuel-cell-tune-pos* w) 1000000000.0)) (set! (-> self jump-pos quad) (-> *fuel-cell-tune-pos* quad)) - (set! (-> self jump-pos y) (+ 4096.0 (-> self jump-pos y))) + (+! (-> self jump-pos y) 4096.0) (go-virtual jump) ) ((and gp-1 - (zero? (logand (res-lump-value (-> self entity) 'options fact-options :time (the-as float -1000000000.0)) + (not (logtest? (res-lump-value (-> self entity) 'options fact-options :time (the-as float -1000000000.0)) (fact-options skip-jump-anim) ) - ) - (zero? (logand (-> self fact options) (fact-options skip-jump-anim))) + ) + (not (logtest? (-> self fact options) (fact-options skip-jump-anim))) ) (set! (-> self jump-pos quad) (-> (the-as vector gp-1) quad)) - (set! (-> self jump-pos y) (+ 4096.0 (-> self jump-pos y))) + (+! (-> self jump-pos y) 4096.0) (go-virtual jump) ) ) @@ -2054,19 +2038,19 @@ ) (defstate fuel-cell-clone-anim (fuel-cell) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('pickup) (when (!= (-> self next-state name) 'pickup) - (if (and (> arg1 0) (-> arg3 param 0)) - (move-to-point! (-> self root-override) (the-as vector (-> arg3 param 0))) + (if (and (> arg1 0) (-> event param 0)) + (move-to-point! (-> self root-override) (the-as vector (-> event param 0))) ) (logclear! (-> self mask) (process-mask actor-pause)) (go-virtual pickup #f (the-as handle #f)) ) ) (('trans) - (set! (-> self root-override trans quad) (-> (the-as vector (-> arg3 param 0)) quad)) + (set! (-> self root-override trans quad) (-> (the-as vector (-> event param 0)) quad)) (set! (-> self base quad) (-> self root-override trans quad)) (update-transforms! (-> self root-override)) ) @@ -2174,13 +2158,13 @@ (defstate pickup (buzzer) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'notify) - (process-entity-status! self (entity-perm-status dead) #t) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('notify) + (process-entity-status! self (entity-perm-status dead) #t) + ) + ) + ) ) :enter (behavior ((arg0 object) (arg1 handle)) (set! (-> self pickup-handle) arg1) @@ -2193,13 +2177,7 @@ (sound-play "buzzer-pickup") (case (-> (level-get-target-inside *level*) name) (('training) - (level-hint-spawn - (text-id training-buzzer-hint) - "asstvb44" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id training-buzzer-hint) "asstvb44" (the-as entity #f) *entity-pool* (game-task none)) ) (('firecanyon) (level-hint-spawn @@ -2240,9 +2218,7 @@ (and (-> self entity) (not (task-complete? *game-info* (the-as game-task s5-2)))) ) (if (and *target* - (logtest? (-> *target* control root-prim prim-core action) - (collide-action racer snowball tube flut) - ) + (logtest? (-> *target* control root-prim prim-core action) (collide-action racer snowball tube flut)) (not arg0) ) (logior! (-> self fact options) (fact-options instant-collect skip-jump-anim)) @@ -2502,13 +2478,7 @@ v1-34 ) ) - (level-hint-spawn - (text-id misty-eco-red-hint) - "sksp0071" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id misty-eco-red-hint) "sksp0071" (the-as entity #f) *entity-pool* (game-task none)) ) ((= v1-25 (pickup-type eco-blue)) (set! sv-96 (get-process *pickup-dead-pool* eco-blue #x4000)) @@ -2654,7 +2624,7 @@ ) (let ((s2-1 (new 'stack-no-clear 'vector))) (set! (-> s2-1 quad) (-> obj process root trans quad)) - (set! (-> s2-1 y) (+ 12288.0 (-> s2-1 y))) + (+! (-> s2-1 y) 12288.0) (let ((s1-1 (new 'stack-no-clear 'collide-tri-result))) (if (>= (fill-and-probe-using-y-probe *collide-cache* @@ -2672,7 +2642,7 @@ ) ) (if (= s3-0 (pickup-type fuel-cell)) - (set! (-> s2-1 y) (+ 6144.0 (-> s2-1 y))) + (+! (-> s2-1 y) 6144.0) ) (birth-pickup-at-point s2-1 s3-0 f30-0 arg0 arg1 obj) ) @@ -2842,7 +2812,7 @@ (when (-> obj blocker) (logior! (-> obj fact options) (fact-options vent-blocked)) (set! (-> obj block-func) - (lambda ((arg0 vent)) (zero? (logand (-> arg0 blocker extra perm status) (entity-perm-status complete)))) + (lambda ((arg0 vent)) (not (logtest? (-> arg0 blocker extra perm status) (entity-perm-status complete)))) ) ) (set! (-> obj show-particles) #t) @@ -2891,22 +2861,22 @@ ) (defstate vent-wait-for-touch (vent) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (if (and (or (= arg2 'touch) (= arg2 'attack)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (if (and (or (= event-type 'touch) (= event-type 'attack)) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-1 from) self) (set! (-> a1-1 num-params) 2) (set! (-> a1-1 message) 'get-pickup) (set! (-> a1-1 param 0) (the-as uint (-> self fact pickup-type))) (set! (-> a1-1 param 1) (the-as uint (-> self fact pickup-amount))) - (and (= (send-event-function arg0 a1-1) #t) - (or (logtest? (-> self fact options) (fact-options powerup)) (send-event arg0 'powerup)) + (and (= (send-event-function proc a1-1) #t) + (or (logtest? (-> self fact options) (fact-options powerup)) (send-event proc 'powerup)) ) ) ) - (go vent-pickup (process->handle arg0)) + (go vent-pickup (process->handle proc)) ) - (vent-standard-event-handler arg0 arg1 arg2 arg3) + (vent-standard-event-handler proc arg1 event-type event) ) :code (behavior () (loop @@ -2928,8 +2898,8 @@ ) (defstate vent-blocked (vent) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('show) (go vent-wait-for-touch) ) @@ -3053,7 +3023,3 @@ (initialize obj arg0 (pickup-type eco-blue)) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/dark-eco-pool.gc b/goal_src/jak1/engine/common-obs/dark-eco-pool.gc index 2d84391ef3..2e9d666764 100644 --- a/goal_src/jak1/engine/common-obs/dark-eco-pool.gc +++ b/goal_src/jak1/engine/common-obs/dark-eco-pool.gc @@ -89,7 +89,7 @@ (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt24) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt24)) (set! (-> obj attack-event) (the-as symbol ((the-as (function res-lump symbol symbol float structure (pointer res-tag) pointer object) diff --git a/goal_src/jak1/engine/common-obs/generic-obs.gc b/goal_src/jak1/engine/common-obs/generic-obs.gc index bf938d87a5..9aaa46bd9a 100644 --- a/goal_src/jak1/engine/common-obs/generic-obs.gc +++ b/goal_src/jak1/engine/common-obs/generic-obs.gc @@ -927,12 +927,15 @@ (('while) (let ((s3-0 (car s4-0))) (while (eval obj (the-as pair s3-0)) - (let* ((s2-0 (cdr s4-0)) (a1-3 (car s2-0))) (while (not (null? s2-0)) - (set! gp-0 (eval obj (the-as pair a1-3))) - (set! s2-0 (cdr s2-0)) - (set! a1-3 (car s2-0)) - ) - ) + (let* ((s2-0 (cdr s4-0)) + (a1-3 (car s2-0)) + ) + (while (not (null? s2-0)) + (set! gp-0 (eval obj (the-as pair a1-3))) + (set! s2-0 (cdr s2-0)) + (set! a1-3 (car s2-0)) + ) + ) ) ) ) @@ -1366,7 +1369,7 @@ (defmethod init-from-entity! part-spawner ((obj part-spawner) (arg0 entity-actor)) (local-vars (sv-16 res-tag)) (stack-size-set! (-> obj main-thread) 128) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/goal_src/jak1/engine/common-obs/plat-eco.gc b/goal_src/jak1/engine/common-obs/plat-eco.gc index 213bb016ab..0c12b69c56 100644 --- a/goal_src/jak1/engine/common-obs/plat-eco.gc +++ b/goal_src/jak1/engine/common-obs/plat-eco.gc @@ -258,7 +258,7 @@ ) (defmethod init-from-entity! plat-eco ((obj plat-eco) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (set! (-> obj notice-dist) (res-lump-float arg0 'notice-dist :default -1.0)) (set! (-> obj link) (new 'process 'actor-link-info obj)) (baseplat-method-24 obj) diff --git a/goal_src/jak1/engine/common-obs/plat.gc b/goal_src/jak1/engine/common-obs/plat.gc index cd525d516b..0e0bc95aa9 100644 --- a/goal_src/jak1/engine/common-obs/plat.gc +++ b/goal_src/jak1/engine/common-obs/plat.gc @@ -249,7 +249,7 @@ ) (defmethod init-from-entity! plat ((obj plat) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (baseplat-method-24 obj) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj (get-unlit-skel obj) '()) diff --git a/goal_src/jak1/engine/common-obs/rigid-body.gc b/goal_src/jak1/engine/common-obs/rigid-body.gc index 4494614d1a..439a642d4d 100644 --- a/goal_src/jak1/engine/common-obs/rigid-body.gc +++ b/goal_src/jak1/engine/common-obs/rigid-body.gc @@ -769,7 +769,7 @@ ) (defmethod init-from-entity! rigid-body-platform ((obj rigid-body-platform) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/goal_src/jak1/engine/common-obs/sharkey.gc b/goal_src/jak1/engine/common-obs/sharkey.gc index 328e49d552..4a5d10d87d 100644 --- a/goal_src/jak1/engine/common-obs/sharkey.gc +++ b/goal_src/jak1/engine/common-obs/sharkey.gc @@ -15,22 +15,22 @@ :linger-duration (seconds 2.6) :flags (use-local-clock) :bounds (static-bspherem 0 -12 0 14) - :parts ((sp-item 124 :flags (is-3d) :period 900 :length 63) - (sp-item 125 :period 900 :length 15) - (sp-item 126 :flags (is-3d) :period 900 :length 15) - (sp-item 127 :flags (is-3d) :period 900 :length 15) - (sp-item 128 :period 900 :length 10 :binding 129) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) - (sp-item 129 :flags (start-dead) :period 900 :length 120) + :parts ((sp-item 124 :flags (is-3d) :period (seconds 3) :length (seconds 0.21)) + (sp-item 125 :period (seconds 3) :length (seconds 0.05)) + (sp-item 126 :flags (is-3d) :period (seconds 3) :length (seconds 0.05)) + (sp-item 127 :flags (is-3d) :period (seconds 3) :length (seconds 0.05)) + (sp-item 128 :period (seconds 3) :length (seconds 0.035) :binding 129) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) + (sp-item 129 :flags (start-dead) :period (seconds 3) :length (seconds 0.4)) ) ) @@ -409,7 +409,7 @@ nav-enemy-default-event-handler ) ) (send-event *target* 'end-mode) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) ) (sharkey-reset-position) (logior! (-> self draw status) (draw-status hidden)) diff --git a/goal_src/jak1/engine/common-obs/water.gc b/goal_src/jak1/engine/common-obs/water.gc index ae4231adc3..975a4d52f8 100644 --- a/goal_src/jak1/engine/common-obs/water.gc +++ b/goal_src/jak1/engine/common-obs/water.gc @@ -631,7 +631,7 @@ ((and (logtest? (water-flags wt21) (-> obj flags)) (logtest? (-> obj process state-flags) (state-flags grabbed)) ) - (set! (-> obj flags) (logior (water-flags wt16) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt16)) ) ((begin (set! (-> obj top 1 quad) (-> obj top 0 quad)) @@ -1237,7 +1237,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('update) - (update! self) + (the-as symbol (update! self)) ) ) ) @@ -1312,7 +1312,7 @@ ) ) ) - (set! (-> obj flags) (logior (water-flags wt23) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt23)) (cond ((zero? (-> obj flags)) (if (< 0.0 (-> obj wade-height)) diff --git a/goal_src/jak1/engine/debug/anim-tester.gc b/goal_src/jak1/engine/debug/anim-tester.gc index dbd6c815fb..82e089bd37 100644 --- a/goal_src/jak1/engine/debug/anim-tester.gc +++ b/goal_src/jak1/engine/debug/anim-tester.gc @@ -690,7 +690,7 @@ (let ((a0-20 v1-31)) "return the next node in the list" (let ((a0-21 (-> a0-20 next))) - (set! (-> v1-31 flags) (logand -3 (-> v1-31 flags))) + (logand! (-> v1-31 flags) -3) (set! v1-31 (the-as anim-test-sequence a0-21)) ) ) @@ -1131,7 +1131,7 @@ (set! (-> arg1 current-index) (-> arg1 the-index)) (set! (-> (the-as anim-test-obj v1-0) anim-index) (-> arg1 current-index)) (set! (-> (the-as anim-test-obj v1-0) anim-hindex) (-> arg1 highlight-index)) - (set! (-> (the-as anim-test-obj v1-0) flags) (logand -3 (-> (the-as anim-test-obj v1-0) flags))) + (logand! (-> (the-as anim-test-obj v1-0) flags) -3) (send-event (ppointer->process *anim-tester*) 'change-anim #f) ) ((cpad-pressed? 0 square) @@ -1457,7 +1457,7 @@ (let ((s4-0 (new 'debug 'anim-test-seq-item 1 ""))) (anim-test-seq-item-copy! s4-0 arg0) (when (logtest? (-> s4-0 flags) 1) - (set! (-> s4-0 flags) (logand -2 (-> s4-0 flags))) + (logand! (-> s4-0 flags) -2) (logior! (-> s4-0 flags) 4) (let ((v1-8 s4-0)) (set! (-> v1-8 privname) "--blank--") @@ -2474,7 +2474,7 @@ "is this node the end of the list. #t = end" (not (not (-> v1-30 next))) ) - (set! (-> (the-as anim-test-sequence s5-1) flags) (logand -5 (-> (the-as anim-test-sequence s5-1) flags))) + (logand! (-> (the-as anim-test-sequence s5-1) flags) -5) (format gp-2 " ~S \"~S\" ~d~%" @@ -2532,7 +2532,7 @@ (not (not (-> v1-9 next))) ) (when (logtest? (-> (the-as anim-test-obj gp-0) flags) 1) - (set! (-> (the-as anim-test-obj gp-0) flags) (logand -2 (-> (the-as anim-test-obj gp-0) flags))) + (logand! (-> (the-as anim-test-obj gp-0) flags) -2) (anim-tester-save-object-seqs (the-as anim-test-obj gp-0)) ) "return the next node in the list" diff --git a/goal_src/jak1/engine/game/game-info.gc b/goal_src/jak1/engine/game/game-info.gc index c6ef862a23..c2b15aacde 100644 --- a/goal_src/jak1/engine/game/game-info.gc +++ b/goal_src/jak1/engine/game/game-info.gc @@ -30,7 +30,7 @@ ;; add text and vector (add-debug-text-sphere #t (bucket-id debug-no-zbuf) (-> obj trans) 819.2 (symbol->string (-> obj name)) s5-0) - (add-debug-vector #t (bucket-id debug-no-zbuf) (-> obj trans) (-> obj normal) (meters 2.0) s5-0) + (add-debug-vector #t (bucket-id debug-no-zbuf) (-> obj trans) (-> obj normal) (meters 2) s5-0) ) 0 (none) @@ -386,7 +386,7 @@ (set! (-> obj fuel-cell-pickup-time) (-> *display* base-frame-counter)) (set! (-> obj fuel-cell-time s5-1) (-> *display* base-frame-counter)) ;; increment power cells! - (set! (-> obj fuel) (+ 1.0 (-> obj fuel))) + (+! (-> obj fuel) 1.0) ;; mark as completed (logior! (-> obj task-perm-list data s5-1 status) (entity-perm-status real-complete)) ;; unused. @@ -413,8 +413,8 @@ ;; valid fly index ;; increment total if we haven't collected it before - (if (zero? (logand buzz-bits (ash 1 buzz-index))) - (set! (-> obj buzzer-total) (+ 1.0 (-> obj buzzer-total))) + (if (not (logtest? buzz-bits (ash 1 buzz-index))) + (+! (-> obj buzzer-total) 1.0) ) ;; set the updated bits @@ -871,7 +871,7 @@ (bucket-id debug-no-zbuf) (-> obj trans) a3-2 - (meters 2.0) + (meters 2) (new 'static 'rgba :r #xff :g #x80 :a #x80) ) ) diff --git a/goal_src/jak1/engine/game/projectiles.gc b/goal_src/jak1/engine/game/projectiles.gc index 12ac8956f9..78ddbfd78d 100644 --- a/goal_src/jak1/engine/game/projectiles.gc +++ b/goal_src/jak1/engine/game/projectiles.gc @@ -902,7 +902,7 @@ (logior! (-> obj options) 2) (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 quad) (-> obj root-override trans quad)) - (set! (-> obj root-override trans y) (+ -5324.8 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -5324.8) (vector+float*! (-> obj target) (-> obj root-override trans) (-> obj root-override transv) 2.0) (set! (-> obj target-base quad) (-> obj target quad)) (let ((f30-0 (the float (sar (shl (the int (y-angle (-> obj root-override))) 48) 48)))) @@ -946,7 +946,7 @@ ) ) (('finalboss) - (set! (-> obj root-override trans y) (+ 4096.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) 4096.0) (set! (-> obj water) (new 'process 'water-control obj 0 0.0 8192.0 2048.0)) (set! (-> obj water flags) (water-flags wt01 wt04 wt07)) (set! (-> obj water height) 1977958.4) @@ -1073,7 +1073,7 @@ (when s5-0 (set! (-> obj target quad) (-> s5-0 root-override root-prim prim-core world-sphere quad)) (if (= (-> s5-0 type symbol) 'mother-spider) - (set! (-> obj options) (logand -2 (-> obj options))) + (logand! (-> obj options) -2) ) ) ) @@ -1105,7 +1105,7 @@ (set! (-> obj mode) 2) (set! (-> obj max-speed) (-> *TARGET-bank* yellow-projectile-speed)) (set! (-> obj update-velocity) projectile-update-velocity-space-wars) - (set! (-> obj root-override trans y) (+ -5324.8 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -5324.8) (vector+float*! (-> obj target) (-> obj root-override trans) (-> obj root-override transv) 2.0) (set! (-> obj target-base quad) (-> obj target quad)) (set! (-> obj mask) (the-as process-mask (logior (process-mask ambient) (-> obj mask)))) diff --git a/goal_src/jak1/engine/gfx/mood/mood.gc b/goal_src/jak1/engine/gfx/mood/mood.gc index 1dd9fb7596..d731f991f8 100644 --- a/goal_src/jak1/engine/gfx/mood/mood.gc +++ b/goal_src/jak1/engine/gfx/mood/mood.gc @@ -31,12 +31,8 @@ ) ) -;; WARN: Function may read a register that is not set: f31 (defun update-mood-itimes ((arg0 mood-context)) (local-vars - (r0-0 int) - (r0-1 int) - (r0-2 int) (v1-0 uint128) (v1-1 uint128) (v1-2 uint128) @@ -57,7 +53,6 @@ (t2-1 uint128) (t3-0 uint128) (t3-1 uint128) - (f31-0 none) ) ;; pc mood debug (with-pc @@ -133,11 +128,11 @@ (.mov t3-0 vf8) (.pw.sra t1-1 t1-0 6) (.pw.sra t2-1 t2-0 6) - (.mov r0-0 f31-0) + (nop!) (.pw.sra t3-1 t3-0 6) - (.mov r0-1 f31-0) + (nop!) (.ppach v1-2 a1-1 v1-1) - (.mov r0-2 f31-0) + (nop!) (.ppach a1-2 a3-1 a2-1) (set! (-> arg0 itimes 0 quad) v1-2) (.ppach v1-3 t1-1 t0-1) @@ -994,7 +989,7 @@ ) (let ((s5-4 (-> arg0 light-group 5))) (update-light-kit s5-4 (-> arg0 light-group 0 ambi) 0.5) - (set! (-> s5-4 ambi color x) (+ 0.25 (-> s5-4 ambi color x))) + (+! (-> s5-4 ambi color x) 0.25) (set! (-> s5-4 dir0 levels x) 1.0) ) (let ((s5-5 (-> arg0 light-group 6)) @@ -2269,7 +2264,7 @@ (cond ((or (nonzero? *lightning-time2*) (movie?)) (if (not (paused?)) - (set! (-> s4-1 lava-fade) (+ 0.2 (-> s4-1 lava-fade))) + (+! (-> s4-1 lava-fade) 0.2) ) (if (< 1.0 (-> s4-1 lava-fade)) (set! (-> s4-1 lava-fade) 1.0) @@ -2713,7 +2708,7 @@ ) (else (if (not (paused?)) - (set! (-> (the-as (pointer float) s5-1) 2) (+ -0.1 (-> (the-as (pointer float) s5-1) 2))) + (+! (-> (the-as (pointer float) s5-1) 2) -0.1) ) (set! (-> (the-as (pointer float) s5-1) 2) (fmax 0.0 (fmin 1.0 (-> (the-as (pointer float) s5-1) 2)))) ) @@ -2774,7 +2769,3 @@ (update-mood-itimes arg0) (none) ) - - - - diff --git a/goal_src/jak1/engine/gfx/shadow/shadow.gc b/goal_src/jak1/engine/gfx/shadow/shadow.gc index 2778694468..1ceaa5cb51 100644 --- a/goal_src/jak1/engine/gfx/shadow/shadow.gc +++ b/goal_src/jak1/engine/gfx/shadow/shadow.gc @@ -72,7 +72,7 @@ (let ((s0-0 (new 'stack-no-clear 'vector)) (s1-0 (new 'stack-no-clear 'sparticle-cpuinfo)) ) - (set! (-> arg1 y) (+ 40.96 (-> arg1 y))) + (+! (-> arg1 y) 40.96) (set! (-> sv-144 x) (-> sv-96 z)) (set! (-> sv-144 y) 0.0) (set! (-> sv-144 z) (- (-> sv-96 x))) diff --git a/goal_src/jak1/engine/nav/navigate.gc b/goal_src/jak1/engine/nav/navigate.gc index 139c284a5d..a070b973ac 100644 --- a/goal_src/jak1/engine/nav/navigate.gc +++ b/goal_src/jak1/engine/nav/navigate.gc @@ -1167,7 +1167,7 @@ (let ((v1-1 (find-poly-fast obj arg0 arg1))) (when v1-1 (if arg2 - (set! (-> arg2 0) (logior (nav-control-flags navcf20) (-> arg2 0))) + (logior! (-> arg2 0) (nav-control-flags navcf20)) ) (set! s3-1 v1-1) (goto cfg-14) @@ -2458,9 +2458,9 @@ (set! (-> obj blocked-travel quad) (-> obj travel quad)) (let ((f0-0 (vector-xz-length (-> obj travel)))) (when (and (>= f30-0 f0-0) (< f0-0 204.8)) - (set! (-> obj flags) (logior (nav-control-flags navcf17) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf17)) (set! (-> obj block-time) (-> *display* base-frame-counter)) - (set! (-> obj block-count) (+ 1.0 (-> obj block-count))) + (+! (-> obj block-count) 1.0) (if (-> obj block-event) (send-event (the-as process-tree (-> obj process)) (the-as symbol (-> obj block-event)) obj) ) @@ -2496,7 +2496,7 @@ ) (cond ((or (vector= arg2 (-> obj target-pos)) (< (fabs f28-0) 364.0889)) - (set! (-> obj flags) (logior (nav-control-flags navcf21) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf21)) (set! (-> arg0 quad) (-> arg2 quad)) ) (else @@ -2510,7 +2510,7 @@ (logtest? (nav-control-flags navcf17) (-> obj flags)) (not (logtest? (-> obj flags) (nav-control-flags navcf10))) ) - (set! (-> obj flags) (logior (nav-control-flags navcf21) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf21)) (vector-! (-> obj travel) arg2 (-> arg1 trans)) (set! (-> arg0 quad) (-> arg2 quad)) ) @@ -2987,7 +2987,7 @@ ) ) (else - (set! (-> obj flags) (logior (nav-control-flags navcf19) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf19)) ) ) ) diff --git a/goal_src/jak1/engine/target/logic-target.gc b/goal_src/jak1/engine/target/logic-target.gc index 0598dc8347..b8fefd7a58 100644 --- a/goal_src/jak1/engine/target/logic-target.gc +++ b/goal_src/jak1/engine/target/logic-target.gc @@ -17,12 +17,8 @@ ) (or (= (-> self control unknown-surface00 name) 'run) (= (-> self control unknown-surface00 name) 'jump)) ) - (set! (-> self control unknown-surface01 target-speed) - (+ 20480.0 (-> self control unknown-surface01 target-speed)) - ) - (set! (-> self control unknown-surface01 transv-max) - (+ 20480.0 (-> self control unknown-surface01 transv-max)) - ) + (+! (-> self control unknown-surface01 target-speed) 20480.0) + (+! (-> self control unknown-surface01 transv-max) 20480.0) ) (let ((s5-0 (new-stack-vector0))) (vector-z-quaternion! s5-0 (-> self control unknown-quaternion00)) @@ -1033,7 +1029,7 @@ ) (if (and (= (-> self cam-user-mode) 'normal) (logtest? (-> self control unknown-surface00 flags) (surface-flags allow-look-around)) - (not (logtest? (-> self control root-prim prim-core action) + (not (logtest? (-> self control root-prim prim-core action) (collide-action edgegrab-cam swingpole-active racer snowball tube flut) ) ) @@ -1338,7 +1334,7 @@ (let ((v1-8 (new 'stack-no-clear 'vector))) (vector+! v1-8 s3-0 s2-0) (vector-float*! v1-8 v1-8 0.5) - (set! (-> v1-8 y) (+ -6144.0 (-> v1-8 y))) + (+! (-> v1-8 y) -6144.0) (send-event *camera* 'ease-in 0.5 v1-8) ) (vector-segment-distance-point! (-> self control unknown-vector90) s3-0 s2-0 s5-0) @@ -1408,7 +1404,7 @@ (not (logtest? (-> self draw status) (draw-status hidden))) (begin (vector<-cspace! gp-0 (-> self node-list data 3)) - (set! (-> gp-0 y) (+ -5896.192 (-> gp-0 y))) + (+! (-> gp-0 y) -5896.192) (< (fabs (- (-> gp-0 y) (-> self control trans y))) 8192.0) ) ) @@ -2036,7 +2032,7 @@ (set! (-> self water flags) (water-flags wt04 wt05 wt06 wt07 wt22)) (reset-target-state #t) (set! (-> self control unknown-vector52 quad) (-> self control trans quad)) - (set! (-> self control unknown-vector52 y) (+ -819200.0 (-> self control unknown-vector52 y))) + (+! (-> self control unknown-vector52 y) -819200.0) (set! (-> self align) (new 'process 'align-control self)) (set! (-> self sidekick) (process-spawn sidekick :init init-sidekick :from *16k-dead-pool* :to self)) (set! (-> self manipy) (the-as (pointer manipy) #f)) diff --git a/goal_src/jak1/engine/target/target-death.gc b/goal_src/jak1/engine/target/target-death.gc index 2074a1bb3f..087300f601 100644 --- a/goal_src/jak1/engine/target/target-death.gc +++ b/goal_src/jak1/engine/target/target-death.gc @@ -1035,7 +1035,10 @@ (let ((v1-0 event-type)) (the-as object (cond ((= v1-0 'end-mode) - (set! (-> self control unknown-uint20) (the-as uint #t)) + (let ((v0-0 (the-as object #t))) + (set! (-> self control unknown-uint20) (the-as uint v0-0)) + v0-0 + ) ) ((= v1-0 'change-mode) (case (-> event param 0) @@ -1049,7 +1052,7 @@ (case (-> event param 0) (('die 'abort-request) (set! (-> self control unknown-uint20) (the-as uint #t)) - (set-blackout-frames (seconds 0.2)) + (the-as object (set-blackout-frames (seconds 0.2))) ) ) ) @@ -1150,7 +1153,7 @@ (when (if (and (nonzero? s5-1) (type-type? (-> s5-1 type) water-vol)) s5-1 ) - (set! (-> self state-flags) (logior (state-flags falling-into-pool-of-bad) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags falling-into-pool-of-bad)) (set! (-> self alt-cam-pos y) (+ 4096.0 (-> self water height))) ) ) diff --git a/goal_src/jak1/engine/target/target-handler.gc b/goal_src/jak1/engine/target/target-handler.gc index 92a8f5ac27..8cc392bc69 100644 --- a/goal_src/jak1/engine/target/target-handler.gc +++ b/goal_src/jak1/engine/target/target-handler.gc @@ -108,7 +108,7 @@ (case (-> arg3 param 0) (('save) (set! (-> self alt-cam-pos quad) (-> self control trans quad)) - (set! (-> self state-flags) (logior (state-flags has-saved-position) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags has-saved-position)) (mem-copy! (the-as pointer (-> arg3 param 1)) (the-as pointer (-> self control trans)) 48) ) (('restore) @@ -153,7 +153,7 @@ (set! (-> self neck flex-blend) (the-as float (-> arg3 param 0))) (cond ((-> arg3 param 1) - (set! (-> self state-flags) (logior (state-flags looking-at-enemy) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags looking-at-enemy)) (set! (-> self alt-neck-pos quad) (-> (the-as vector (-> arg3 param 1)) quad)) (the-as object (look-at-enemy! (-> self neck) (-> self alt-neck-pos) 'force arg0)) ) diff --git a/goal_src/jak1/engine/target/target-part.gc b/goal_src/jak1/engine/target/target-part.gc index 30845c0e66..93dd6e8118 100644 --- a/goal_src/jak1/engine/target/target-part.gc +++ b/goal_src/jak1/engine/target/target-part.gc @@ -35,7 +35,7 @@ (let ((s3-0 (new 'stack-no-clear 'collide-tri-result)) (s5-0 *target*) ) - (set! (-> a1-1 y) (+ 4096.0 (-> a1-1 y))) + (+! (-> a1-1 y) 4096.0) ;; NOTE : added *target* check here. (when (and s5-0 (>= (fill-and-probe-using-y-probe *collide-cache* diff --git a/goal_src/jak1/engine/target/target.gc b/goal_src/jak1/engine/target/target.gc index 8f899e5de3..6c123c5f18 100644 --- a/goal_src/jak1/engine/target/target.gc +++ b/goal_src/jak1/engine/target/target.gc @@ -1383,36 +1383,12 @@ :event target-jump-event-handler :enter (behavior ((arg0 float) (arg1 float) (arg2 surface)) (when (= (-> self control unknown-symbol40) 'launch) - (level-hint-spawn - (text-id sidekick-launcher1) - "sksp009d" - (the-as entity #f) - *entity-pool* - (game-task none) - ) - (level-hint-spawn - (text-id sidekick-launcher2) - "sksp009e" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id sidekick-launcher1) "sksp009d" (the-as entity #f) *entity-pool* (game-task none)) + (level-hint-spawn (text-id sidekick-launcher2) "sksp009e" (the-as entity #f) *entity-pool* (game-task none)) (case (-> (level-get-target-inside *level*) name) (('citadel) - (level-hint-spawn - (text-id citadel-launcher2) - "sksp0393" - (the-as entity #f) - *entity-pool* - (game-task none) - ) - (level-hint-spawn - (text-id citadel-launcher) - "sksp0388" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id citadel-launcher2) "sksp0393" (the-as entity #f) *entity-pool* (game-task none)) + (level-hint-spawn (text-id citadel-launcher) "sksp0388" (the-as entity #f) *entity-pool* (game-task none)) ) ) enter-state @@ -2939,7 +2915,7 @@ (set-forward-vel (the-as float 0.0)) (set! (-> self control unknown-surface00) *flop-land-mods*) (logclear! (-> *flop-land-mods* flags) (surface-flags allow-edge-grab)) - (set! (-> self state-flags) (logior (state-flags flop-hit-ground) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags flop-hit-ground)) (none) ) :exit target-exit diff --git a/goal_src/jak1/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc index 3157481627..116acacbd8 100644 --- a/goal_src/jak1/engine/target/target2.gc +++ b/goal_src/jak1/engine/target/target2.gc @@ -2466,7 +2466,7 @@ :trans (behavior () (cond ((< (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.5)) - (set! (-> self water flags) (logior (water-flags wt16) (-> self water flags))) + (logior! (-> self water flags) (water-flags wt16)) (logclear! (-> self control status) (cshape-moving-flags onsurf onground tsurf)) ) (else @@ -2487,7 +2487,7 @@ ((-> target-swim-stance exit)) (die-on-next-update! (-> self water bob)) (set! (-> self water align-offset) 0.0) - (set! (-> self water flags) (logior (water-flags wt16) (-> self water flags))) + (logior! (-> self water flags) (water-flags wt16)) (none) ) :code (behavior ((arg0 float) (arg1 float)) diff --git a/goal_src/jak1/engine/ui/progress/progress-draw.gc b/goal_src/jak1/engine/ui/progress/progress-draw.gc index 9b9a2ef1a4..e32ba196f6 100644 --- a/goal_src/jak1/engine/ui/progress/progress-draw.gc +++ b/goal_src/jak1/engine/ui/progress/progress-draw.gc @@ -253,8 +253,8 @@ (let ((v1-26 s4-1)) (set! (-> v1-26 width) (the float 428)) ) - (set! (-> s4-1 origin x) (+ -220.0 (-> s4-1 origin x))) - (set! (-> s4-1 origin y) (+ 40.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin x) -220.0) + (+! (-> s4-1 origin y) 40.0) (set! (-> s4-1 flags) (font-flags shadow kerning middle large)) (print-game-text-scaled (lookup-text! *common-text* (text-id total-collected) #f) @@ -262,7 +262,7 @@ s4-1 (the int (* 128.0 f30-0)) ) - (set! (-> s4-1 origin y) (+ 15.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin y) 15.0) (let ((s5-2 print-game-text-scaled)) (format (clear *temp-string*) "~D/~D" (the int (-> *game-info* money-total)) (-> obj total-nb-of-orbs)) (s5-2 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0))) @@ -330,8 +330,8 @@ (let ((v1-14 s4-1)) (set! (-> v1-14 width) (the float 428)) ) - (set! (-> s4-1 origin x) (+ -220.0 (-> s4-1 origin x))) - (set! (-> s4-1 origin y) (+ 40.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin x) -220.0) + (+! (-> s4-1 origin y) 40.0) (set! (-> s4-1 flags) (font-flags shadow kerning middle large)) (print-game-text-scaled (lookup-text! *common-text* (text-id total-collected) #f) @@ -339,7 +339,7 @@ s4-1 (the int (* 128.0 f30-0)) ) - (set! (-> s4-1 origin y) (+ 15.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin y) 15.0) (let ((s5-2 print-game-text-scaled)) (format (clear *temp-string*) "~D/~D" (the int (-> *game-info* buzzer-total)) (-> obj total-nb-of-buzzers)) (s5-2 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0))) @@ -685,11 +685,10 @@ (print-game-text (lookup-text! *common-text* - (the-as text-id (if (= (-> obj display-state) (progress-screen load-game)) - 321 - 320 - ) - ) + (if (= (-> obj display-state) (progress-screen load-game)) + (text-id select-file-to-load) + (text-id select-file-to-save) + ) #f ) arg0 @@ -748,7 +747,7 @@ (let ((v1-87 arg0)) (set! (-> v1-87 scale) 0.5) ) - (set! (-> arg0 origin y) (+ 16.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 16.0) (set! (-> arg0 flags) (font-flags shadow kerning middle large)) (set! (-> arg0 origin x) (the float (- -73 (-> obj left-x-offset)))) (let ((v1-91 arg0)) @@ -786,7 +785,7 @@ ) (s0-4 *temp-string* arg0 #f s4-1 22) ) - (set! (-> arg0 origin y) (+ 1.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 1.0) (let ((v1-108 arg0)) (set! (-> v1-108 scale) 1.0) ) @@ -805,7 +804,7 @@ (let ((v1-116 arg0)) (set! (-> v1-116 scale) 0.5) ) - (set! (-> arg0 origin y) (+ 9.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 9.0) (set! (-> arg0 flags) (font-flags shadow kerning large)) (set! (-> arg0 origin x) (the float (- 85 (-> obj left-x-offset)))) (let ((s0-6 print-game-text)) @@ -844,10 +843,10 @@ ) (s0-8 *temp-string* arg0 #f s4-1 22) ) - (set! (-> arg0 origin y) (+ 15.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 15.0) ) (else - (set! (-> arg0 origin y) (+ 18.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 18.0) (set! (-> arg0 origin x) (the float (- 28 (-> obj left-x-offset)))) (let ((v1-131 arg0)) (set! (-> v1-131 scale) 0.8) @@ -878,18 +877,18 @@ ) ) (set! (-> obj particles s2-0 init-pos x) -320.0) - (set! (-> arg0 origin y) (+ 23.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 23.0) ) ) ) (else (set! (-> obj particles s2-0 init-pos x) -320.0) - (set! (-> arg0 origin y) (+ 12.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 12.0) (let ((v1-173 arg0)) (set! (-> v1-173 scale) 0.7) ) (print-game-text (lookup-text! *common-text* (text-id empty) #f) arg0 #f s4-1 22) - (set! (-> arg0 origin y) (+ 29.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 29.0) ) ) (+! s2-0 1) @@ -1910,7 +1909,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/engine/ui/progress/progress.gc b/goal_src/jak1/engine/ui/progress/progress.gc index 8491fe0eb5..07a90d7020 100644 --- a/goal_src/jak1/engine/ui/progress/progress.gc +++ b/goal_src/jak1/engine/ui/progress/progress.gc @@ -682,6 +682,7 @@ (defmethod relocate game-count-info ((obj game-count-info) (arg0 int)) "Load in the game-count-info. This is a bit of a hack." (set! *game-counts* obj) + obj ) (defmethod relocate progress ((obj progress) (arg0 int)) @@ -873,16 +874,14 @@ ) (defstate progress-waiting (progress) - :event - (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('go-away) (go progress-gone) ) ) ) - :code - (behavior () + :code (behavior () (loop (when (hud-hidden?) (dotimes (gp-0 (-> self nb-of-particles)) @@ -901,8 +900,7 @@ ) (defstate progress-gone (progress) - :code - (behavior () + :code (behavior () (remove-setting! 'process-mask) (apply-settings *setting-control*) (logior! (-> self mask) (process-mask sleep)) @@ -1344,9 +1342,7 @@ ((>= (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) (+ 1.0 (-> s5-0 (-> obj option-index) param1)) ) - (set! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) - (+ -1.0 (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify)))) - ) + (+! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) -1.0) (set! v1-157 #t) ) ((< (-> s5-0 (-> obj option-index) param1) @@ -1441,9 +1437,7 @@ ((>= (+ -1.0 (-> s5-0 (-> obj option-index) param2)) (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) ) - (set! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) - (+ 1.0 (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify)))) - ) + (+! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) 1.0) (set! v1-263 #t) ) ((< (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) @@ -1722,172 +1716,102 @@ ) (defstate progress-normal (progress) - :event - (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (local-vars (v0-0 none)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'go-away) - (go progress-going-out) - ) - ((= v1-0 'notify) - (cond - ((= (-> arg3 param 0) 'done) - (case (-> self display-state) - (((progress-screen memcard-saving)) - (cond - ((= (-> self display-state-stack 0) (progress-screen title)) - (let ((gp-1 (-> *setting-control* default auto-save))) - (sound-volume-off) - (set! (-> *game-info* mode) 'play) - (cond - ;; Start a new game differently if speedrunning mode is active - ((= (-> *pc-settings* speedrunner-mode?) #t) - (speedrun-start-full-game-run)) - ;; start the game normally - (else - (initialize! *game-info* 'game (the-as game-save #f) "intro-start") - (set! (-> *setting-control* default auto-save) gp-1)))) - (set-master-mode 'game)) - (else - (set! v0-0 (the-as none -1)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - v0-0 - ) - ) - ) - (((progress-screen memcard-formatting)) - (set! (-> self force-transition) #t) - (set! v0-0 (the-as none 15)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - v0-0 - ) - (((progress-screen memcard-creating)) - (cond - ((= (-> self display-state-stack 0) (progress-screen title)) - (set! v0-0 (the-as none 18)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - ) - (else - (set! v0-0 (the-as none 17)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - ) - ) - v0-0 - ) - ) - ) - ((= (-> arg3 param 0) 'error) - (let ((t9-4 format) - (a0-17 #t) - (a1-2 "ERROR NOTIFY: ~S ~D~%") - (v1-13 (-> arg3 param 1)) - ) - (t9-4 - a0-17 - a1-2 - (cond - ((= v1-13 17) - "no-auto-save" - ) - ((= v1-13 16) - "no-process" - ) - ((= v1-13 15) - "bad-version" - ) - ((= v1-13 14) - "no-space" - ) - ((= v1-13 13) - "no-save" - ) - ((= v1-13 12) - "no-file" - ) - ((= v1-13 11) - "no-format" - ) - ((= v1-13 10) - "no-last" - ) - ((= v1-13 9) - "no-card" - ) - ((= v1-13 8) - "no-memory" - ) - ((= v1-13 7) - "new-game" - ) - ((= v1-13 6) - "read-error" - ) - ((= v1-13 5) - "write-error" - ) - ((= v1-13 4) - "internal-error" - ) - ((= v1-13 3) - "format-failed" - ) - ((= v1-13 2) - "bad-handle" - ) - ((= v1-13 1) - "ok" - ) - ((zero? v1-13) - "busy" - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (local-vars (v0-0 object)) + (the-as object (case event-type + (('go-away) + (go progress-going-out) + ) + (('notify) + (cond + ((= (-> event param 0) 'done) + (case (-> self display-state) + (((progress-screen memcard-saving)) + (cond + ((= (-> self display-state-stack 0) (progress-screen title)) + (let ((gp-1 (-> *setting-control* default auto-save))) + (sound-volume-off) + (set! (-> *game-info* mode) 'play) + (initialize! *game-info* 'game (the-as game-save #f) "intro-start") + (cond + ;; Start a new game differently if speedrunning mode is active + ((= (-> *pc-settings* speedrunner-mode?) #t) + (speedrun-start-full-game-run)) + ;; start the game normally (else - "*unknown*" - ) + (initialize! *game-info* 'game (the-as game-save #f) "intro-start") + (set! (-> *setting-control* default auto-save) gp-1))) ) - (-> self display-state) + (the-as object (set-master-mode 'game)) ) - ) - (case (-> arg3 param 1) - ((14) - (set! v0-0 (the-as none 7)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - v0-0 + (else + (set! v0-0 -1) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + v0-0 + ) ) - (else - (case (-> self display-state) - (((progress-screen memcard-formatting)) - (set! v0-0 (the-as none 24)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - v0-0 - ) - (((progress-screen memcard-creating)) - (set! v0-0 (the-as none 25)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - v0-0 - ) - (((progress-screen memcard-saving)) - (set! v0-0 (the-as none 21)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - v0-0 - ) - (((progress-screen memcard-loading)) - (set! v0-0 (the-as none 20)) - (set! (-> self next-display-state) (the-as progress-screen v0-0)) - v0-0 - ) - ) + ) + (((progress-screen memcard-formatting)) + (set! (-> self force-transition) #t) + (set! v0-0 15) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + v0-0 + ) + (((progress-screen memcard-creating)) + (cond + ((= (-> self display-state-stack 0) (progress-screen title)) + (set! v0-0 18) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + ) + (else + (set! v0-0 17) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + ) + ) + v0-0 + ) + ) + ) + ((= (-> event param 0) 'error) + (format #t "ERROR NOTIFY: ~S ~D~%" (enum->string mc-status-code (-> event param 1)) (-> self display-state)) + (case (-> event param 1) + ((14) + (set! v0-0 7) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + v0-0 + ) + (else + (case (-> self display-state) + (((progress-screen memcard-formatting)) + (set! v0-0 24) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + v0-0 + ) + (((progress-screen memcard-creating)) + (set! v0-0 25) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + v0-0 + ) + (((progress-screen memcard-saving)) + (set! v0-0 21) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + v0-0 + ) + (((progress-screen memcard-loading)) + (set! v0-0 20) + (set! (-> self next-display-state) (the-as progress-screen v0-0)) + v0-0 + ) ) ) ) - ) + ) ) - ) - ) - ) + ) + ) + ) ) - :code - (behavior () + :code (behavior () (loop (when (and (cpad-hold? 0 l1) (cpad-hold? 0 r1) *cheat-mode*) (when (and (< (-> self task-index) (-> *level-task-data* (-> self display-level-index) nb-of-tasks)) @@ -2030,161 +1954,161 @@ ) (none) ) - :post - (behavior () + :post (behavior () (let* ((a1-0 (-> self display-level-index)) (gp-0 (-> *level-task-data* a1-0)) - (unk #t) - (s5-0 #f) ) - (case (-> self display-state) - (((progress-screen fuel-cell)) - (set! s5-0 #t) - (draw-fuel-cell-screen self a1-0) - ) - (((progress-screen money)) - (set! s5-0 #t) - (draw-money-screen self a1-0) - ) - (((progress-screen buzzer)) - (set! s5-0 #t) - (draw-buzzer-screen self a1-0) - ) - (((progress-screen game-settings) (progress-screen settings)) - (hide-progress-icons) - (draw-options self 115 30 0.82) - ) - (((progress-screen graphic-settings) - (progress-screen sound-settings) - (progress-screen settings-title) - (progress-screen title) - ) - (hide-progress-icons) - (draw-options self 115 30 0.82) - ) - (((progress-screen memcard-removed) (progress-screen memcard-auto-save-error)) - (draw-notice-screen self) - (draw-options self 192 0 0.82) - ) - (((progress-screen memcard-no-data)) - (draw-notice-screen self) - (draw-options self 165 0 0.82) - ) - (((progress-screen memcard-format)) - (draw-notice-screen self) - (draw-options self 172 0 0.82) - ) - (((progress-screen memcard-no-space) - (progress-screen memcard-not-inserted) - (progress-screen memcard-not-formatted) - ) - (draw-notice-screen self) - (draw-options self 195 0 0.82) - ) - (((progress-screen memcard-error-loading) - (progress-screen memcard-error-saving) - (progress-screen memcard-error-formatting) - (progress-screen memcard-error-creating) - (progress-screen memcard-auto-save-error) - ) - (draw-notice-screen self) - (draw-options self 190 0 0.82) - ) - (((progress-screen pal-change-to-60hz)) - (draw-notice-screen self) - (draw-options self 190 0 0.82) - ) - (((progress-screen pal-now-60hz)) - (when (< (seconds 10) (- (-> *display* real-frame-counter) (-> self video-mode-timeout))) - (set! (-> *progress-state* video-mode-choice) 'pal) - (set! (-> *setting-control* default video-mode) (-> *progress-state* video-mode-choice)) - (set! (-> self next-display-state) (progress-screen invalid)) + #t + (let ((s5-0 #f)) + (case (-> self display-state) + (((progress-screen fuel-cell)) + (set! s5-0 #t) + (draw-fuel-cell-screen self a1-0) ) - (draw-notice-screen self) - (draw-options self 140 0 0.82) - ) - (((progress-screen no-disc) (progress-screen bad-disc)) - (draw-notice-screen self) - (if (is-cd-in?) - (draw-options self 170 0 0.82) + (((progress-screen money)) + (set! s5-0 #t) + (draw-money-screen self a1-0) + ) + (((progress-screen buzzer)) + (set! s5-0 #t) + (draw-buzzer-screen self a1-0) + ) + (((progress-screen game-settings) (progress-screen settings)) + (hide-progress-icons) + (draw-options self 115 30 (the-as float 0.82)) + ) + (((progress-screen graphic-settings) + (progress-screen sound-settings) + (progress-screen settings-title) + (progress-screen title) + ) + (hide-progress-icons) + (draw-options self 115 30 (the-as float 0.82)) + ) + (((progress-screen memcard-removed) (progress-screen memcard-auto-save-error)) + (draw-notice-screen self) + (draw-options self 192 0 (the-as float 0.82)) + ) + (((progress-screen memcard-no-data)) + (draw-notice-screen self) + (draw-options self 165 0 (the-as float 0.82)) + ) + (((progress-screen memcard-format)) + (draw-notice-screen self) + (draw-options self 172 0 (the-as float 0.82)) + ) + (((progress-screen memcard-no-space) + (progress-screen memcard-not-inserted) + (progress-screen memcard-not-formatted) + ) + (draw-notice-screen self) + (draw-options self 195 0 (the-as float 0.82)) + ) + (((progress-screen memcard-error-loading) + (progress-screen memcard-error-saving) + (progress-screen memcard-error-formatting) + (progress-screen memcard-error-creating) + (progress-screen memcard-auto-save-error) + ) + (draw-notice-screen self) + (draw-options self 190 0 (the-as float 0.82)) + ) + (((progress-screen pal-change-to-60hz)) + (draw-notice-screen self) + (draw-options self 190 0 (the-as float 0.82)) + ) + (((progress-screen pal-now-60hz)) + (when (< (seconds 10) (- (-> *display* real-frame-counter) (-> self video-mode-timeout))) + (set! (-> *progress-state* video-mode-choice) 'pal) + (set! (-> *setting-control* default video-mode) (-> *progress-state* video-mode-choice)) + (set! (-> self next-display-state) (progress-screen invalid)) ) - ) - (((progress-screen quit)) - (draw-notice-screen self) - (draw-options self 110 0 0.82) - ) - (((progress-screen auto-save)) - (draw-notice-screen self) - (draw-options self 190 0 0.82) - ) - (((progress-screen memcard-insert)) - (draw-notice-screen self) - (draw-options self 165 0 0.82) - ) - (((progress-screen memcard-data-exists)) - (draw-notice-screen self) - (draw-options self 168 0 0.82) - ) - (((progress-screen memcard-loading) - (progress-screen memcard-saving) - (progress-screen memcard-formatting) - (progress-screen memcard-creating) + (draw-notice-screen self) + (draw-options self 140 0 (the-as float 0.82)) + ) + (((progress-screen no-disc) (progress-screen bad-disc)) + (draw-notice-screen self) + (if (is-cd-in?) + (draw-options self 170 0 (the-as float 0.82)) + ) + ) + (((progress-screen quit)) + (draw-notice-screen self) + (draw-options self 110 0 (the-as float 0.82)) + ) + (((progress-screen auto-save)) + (draw-notice-screen self) + (draw-options self 190 0 (the-as float 0.82)) + ) + (((progress-screen memcard-insert)) + (draw-notice-screen self) + (draw-options self 165 0 (the-as float 0.82)) + ) + (((progress-screen memcard-data-exists)) + (draw-notice-screen self) + (draw-options self 168 0 (the-as float 0.82)) + ) + (((progress-screen memcard-loading) + (progress-screen memcard-saving) + (progress-screen memcard-formatting) + (progress-screen memcard-creating) + ) + (draw-notice-screen self) + ) + (((progress-screen load-game) (progress-screen save-game)) + (draw-notice-screen self) + (draw-options self 190 0 (the-as float 0.82)) + ) + (((progress-screen save-game-title)) + (draw-notice-screen self) + (draw-options self 169 15 (the-as float 0.6)) + ) ) - (draw-notice-screen self) - ) - (((progress-screen load-game) (progress-screen save-game)) - (draw-notice-screen self) - (draw-options self 190 0 0.82) - ) - (((progress-screen save-game-title)) - (draw-notice-screen self) - (draw-options self 169 15 0.6) - ) - ) - (when s5-0 - (let* ((v1-98 (cond - ((-> self stat-transition) - 0 - ) - ((= (-> self level-transition) 1) - (- (-> self transition-offset)) - ) - (else - (-> self transition-offset) + (when s5-0 + (let* ((v1-98 (cond + ((-> self stat-transition) + 0 + ) + ((= (-> self level-transition) 1) + (- (-> self transition-offset)) + ) + (else + (-> self transition-offset) + ) ) ) - ) - (f30-0 (the-as float (if (-> self stat-transition) - 1.0 - (-> self transition-percentage-invert) - ) - ) - ) - (s5-1 - (new - 'stack - 'font-context - *font-default-matrix* - (- 32 (-> self left-x-offset)) - (the int (* (+ 42.0 (the float (/ v1-98 2))) f30-0)) - 8325000.0 - (font-color progress-blue) - (font-flags shadow kerning) + (f30-0 (the-as float (if (-> self stat-transition) + 1.0 + (-> self transition-percentage-invert) + ) + ) + ) + (s5-1 + (new + 'stack + 'font-context + *font-default-matrix* + (- 32 (-> self left-x-offset)) + (the int (* (+ 42.0 (the float (/ v1-98 2))) f30-0)) + (the-as float 8325000.0) + (font-color progress-blue) + (font-flags shadow kerning) + ) ) ) - ) - (let ((v1-103 s5-1)) - (set! (-> v1-103 width) (the float 328)) - ) - (let ((v1-104 s5-1)) - (set! (-> v1-104 height) (the float 45)) - ) - (set! (-> s5-1 flags) (font-flags shadow kerning middle left large)) - (print-game-text-scaled - (lookup-text! *common-text* (-> gp-0 level-name-id) #f) - f30-0 - s5-1 - (the int (* 128.0 f30-0)) + (let ((v1-103 s5-1)) + (set! (-> v1-103 width) (the float 328)) + ) + (let ((v1-104 s5-1)) + (set! (-> v1-104 height) (the float 45)) + ) + (set! (-> s5-1 flags) (font-flags shadow kerning middle left large)) + (print-game-text-scaled + (lookup-text! *common-text* (-> gp-0 level-name-id) #f) + f30-0 + s5-1 + (the int (* 128.0 f30-0)) + ) ) ) ) @@ -2201,21 +2125,18 @@ ) (defstate progress-coming-in (progress) - :event - (-> progress-waiting event) - :enter - (behavior () + :event (-> progress-waiting event) + :enter (behavior () (sound-group-pause (sound-group sfx music dialog sog3 ambient sog5 sog6 sog7)) (logclear! (-> *setting-control* default process-mask) (process-mask pause menu)) - (add-setting! 'process-mask 'set 0.0 16) + (add-setting! 'process-mask 'set 0.0 (process-mask progress)) (apply-settings *setting-control*) (sound-play "select-menu") (set-blackout-frames 0) (set! *pause-lock* #f) (none) ) - :code - (behavior () + :code (behavior () (loop (seekl! (-> self in-out-position) 0 (the int (* 170.0 (-> *display* time-adjust-ratio)))) (when (< (-> self in-out-position) 2867) @@ -2233,13 +2154,11 @@ ) (none) ) - :post - (-> progress-normal post) + :post (-> progress-normal post) ) (defstate progress-going-out (progress) - :enter - (behavior () + :enter (behavior () (sound-play "menu-close") (hide-progress-icons) (set! (-> self particles 3 init-pos x) -320.0) @@ -2251,8 +2170,7 @@ ) (none) ) - :code - (behavior () + :code (behavior () (loop (seekl! (-> self transition-offset) @@ -2270,21 +2188,18 @@ ) (none) ) - :post - (-> progress-normal post) + :post (-> progress-normal post) ) (defstate progress-debug (progress) - :event - (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('go-away) (go progress-going-out) ) ) ) - :code - (behavior () + :code (behavior () (loop (cond ((cpad-pressed? 0 left) @@ -2332,8 +2247,7 @@ ) (none) ) - :post - (behavior () + :post (behavior () (let* ((s5-0 (-> *display* frames (-> *display* on-screen) frame global-buf)) (gp-0 (-> s5-0 base)) ) @@ -2483,4 +2397,3 @@ (none) ) ) - diff --git a/goal_src/jak1/levels/beach/beach-obs.gc b/goal_src/jak1/levels/beach/beach-obs.gc index ca99882a86..df3ff6a486 100644 --- a/goal_src/jak1/levels/beach/beach-obs.gc +++ b/goal_src/jak1/levels/beach/beach-obs.gc @@ -72,7 +72,7 @@ ) (defmethod init-from-entity! windmill-one ((obj windmill-one) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -292,7 +292,7 @@ (+! f30-0 f28-0) ) (set! (-> s3-0 quad) (-> arg0 entity extra trans quad)) - (set! (-> s3-0 y) (+ -4096.0 (-> s3-0 y))) + (+! (-> s3-0 y) -4096.0) (spawn (-> arg0 part) s3-0) (suspend) 0 @@ -678,7 +678,7 @@ ) (defmethod init-from-entity! ecoventrock ((obj ecoventrock) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) @@ -916,7 +916,7 @@ ) (defmethod init-from-entity! bladeassm ((obj bladeassm) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1419,7 +1419,7 @@ ) (defmethod init-from-entity! harvester ((obj harvester) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 5) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind background)) diff --git a/goal_src/jak1/levels/beach/beach-rocks.gc b/goal_src/jak1/levels/beach/beach-rocks.gc index 6bf0773a24..60bf3e89c8 100644 --- a/goal_src/jak1/levels/beach/beach-rocks.gc +++ b/goal_src/jak1/levels/beach/beach-rocks.gc @@ -273,8 +273,8 @@ (defstate idle (beach-rock) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (set! (-> self trigger) #t) (go-virtual falling) @@ -319,8 +319,8 @@ (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root-override trans quad)) (spawn (-> self part) gp-0) - (set! (-> gp-0 x) (+ 122880.0 (-> gp-0 x))) - (set! (-> gp-0 z) (+ 102400.0 (-> gp-0 z))) + (+! (-> gp-0 x) 122880.0) + (+! (-> gp-0 z) 102400.0) (spawn (-> self part) gp-0) ) ) diff --git a/goal_src/jak1/levels/beach/lurkerworm.gc b/goal_src/jak1/levels/beach/lurkerworm.gc index b4a0e471bd..0e8df739a8 100644 --- a/goal_src/jak1/levels/beach/lurkerworm.gc +++ b/goal_src/jak1/levels/beach/lurkerworm.gc @@ -482,7 +482,7 @@ lurkerworm-default-post-behavior ) (defmethod init-from-entity! lurkerworm ((obj lurkerworm) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/beach/pelican.gc b/goal_src/jak1/levels/beach/pelican.gc index de72a10c77..5058edf123 100644 --- a/goal_src/jak1/levels/beach/pelican.gc +++ b/goal_src/jak1/levels/beach/pelican.gc @@ -211,7 +211,7 @@ (set! (-> self state-object) #f) (let ((gp-0 (-> self path-vector))) (eval-path-curve-div! (-> self path-dive0) gp-0 4.5 'interp) - (set! (-> gp-0 y) (+ -4505.6 (-> gp-0 y))) + (+! (-> gp-0 y) -4505.6) (let ((v1-8 (manipy-spawn gp-0 (-> self entity) *fuel-cell-sg* (new 'static 'vector :w 4915.2) :to self))) (set! (-> self fuel-cell) (ppointer->handle v1-8)) (if v1-8 @@ -824,7 +824,7 @@ (let ((a0-7 (handle->process (-> self fuel-cell)))) (when a0-7 (set! (-> gp-2 quad) (-> (the-as process-drawable a0-7) root trans quad)) - (set! (-> gp-2 y) (+ 8192.0 (-> gp-2 y))) + (+! (-> gp-2 y) 8192.0) (deactivate a0-7) ) ) diff --git a/goal_src/jak1/levels/beach/seagull.gc b/goal_src/jak1/levels/beach/seagull.gc index eceb83af6f..0feb726d16 100644 --- a/goal_src/jak1/levels/beach/seagull.gc +++ b/goal_src/jak1/levels/beach/seagull.gc @@ -373,7 +373,7 @@ (none) ) :code (behavior () - (set! (-> self root-override trans y) (+ 20480.0 (-> self root-override trans y))) + (+! (-> self root-override trans y) 20480.0) (move-to-ground (-> self root-override) 40960.0 40960.0 #t (collide-kind background)) (update-transforms! (-> self root-override)) (clear-collide-with-as (-> self root-override)) @@ -1362,7 +1362,7 @@ ) (set! (-> obj squall) (new 'process 'ambient-sound sound-seagull-squall (-> obj trans))) (set! (-> obj teleport-frames) 0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (go seagullflock-idle) (none) ) diff --git a/goal_src/jak1/levels/citadel/citadel-obs.gc b/goal_src/jak1/levels/citadel/citadel-obs.gc index c9e885ec4b..f1a2a448a3 100644 --- a/goal_src/jak1/levels/citadel/citadel-obs.gc +++ b/goal_src/jak1/levels/citadel/citadel-obs.gc @@ -1253,17 +1253,11 @@ (spawn (-> self part-mushroom) (-> self mushroom-pos)) ) (if (not (-> self mushroom)) - (set! (-> *palette-fade-controls* control 3 fade) (+ 0.3333 (-> *palette-fade-controls* control 3 fade))) + (+! (-> *palette-fade-controls* control 3 fade) 0.3333) ) (when (and *target* (>= 32768.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) (if (-> self mushroom) - (level-hint-spawn - (text-id citadel-generator) - "sksp0381" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id citadel-generator) "sksp0381" (the-as entity #f) *entity-pool* (game-task none)) (level-hint-spawn (text-id citadel-generator-no-mushroom) "sksp0384" diff --git a/goal_src/jak1/levels/citadel/citadel-sages.gc b/goal_src/jak1/levels/citadel/citadel-sages.gc index e8fb57b6f9..f81d92ad5c 100644 --- a/goal_src/jak1/levels/citadel/citadel-sages.gc +++ b/goal_src/jak1/levels/citadel/citadel-sages.gc @@ -322,7 +322,7 @@ (set! (-> obj alt-actor) (the-as entity-actor v1-9)) (set! (-> obj spawn-pos quad) (-> obj root-override trans quad)) (set! (-> s5-1 quad) (-> v1-9 extra trans quad)) - (set! (-> s5-1 y) (+ 81920.0 (-> s5-1 y))) + (+! (-> s5-1 y) 81920.0) (vector-! s4-0 (-> obj spawn-pos) s5-1) (set! (-> s4-0 y) 0.0) (vector-normalize! s4-0 1.0) diff --git a/goal_src/jak1/levels/citadel/citb-plat.gc b/goal_src/jak1/levels/citadel/citb-plat.gc index 7f031462f4..bc3121e561 100644 --- a/goal_src/jak1/levels/citadel/citb-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-plat.gc @@ -590,7 +590,7 @@ (set! (-> obj orig-trans quad) (-> obj root-overlay trans quad)) (quaternion-copy! (-> obj orig-quat) (-> obj root-overlay quat)) (set! (-> obj beam-end quad) (-> obj orig-trans quad)) - (set! (-> obj beam-end y) (+ -49152.0 (-> obj beam-end y))) + (+! (-> obj beam-end y) -49152.0) (rigid-body-platform-method-29 obj *citb-chain-plat-constants*) (set! (-> obj idle-offset) 0.0) (set! (-> obj float-offset) (res-lump-float (-> obj entity) 'height-info :default 4096.0)) diff --git a/goal_src/jak1/levels/common/battlecontroller.gc b/goal_src/jak1/levels/common/battlecontroller.gc index 3fe2ec6cee..a9ea5180d6 100644 --- a/goal_src/jak1/levels/common/battlecontroller.gc +++ b/goal_src/jak1/levels/common/battlecontroller.gc @@ -372,13 +372,7 @@ battlecontroller-default-event-handler (defbehavior battlecontroller-battle-end battlecontroller () (case (-> (level-get-target-inside *level*) name) (('citadel) - (level-hint-spawn - (text-id citadel-battle-end) - "sksp0378" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id citadel-battle-end) "sksp0378" (the-as entity #f) *entity-pool* (game-task none)) ) ) (battlecontroller-off) @@ -779,7 +773,7 @@ battlecontroller-default-event-handler ) (defmethod init-from-entity! battlecontroller ((obj battlecontroller) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (battlecontroller-method-27 obj) diff --git a/goal_src/jak1/levels/common/blocking-plane.gc b/goal_src/jak1/levels/common/blocking-plane.gc index 257d6d3935..004453214d 100644 --- a/goal_src/jak1/levels/common/blocking-plane.gc +++ b/goal_src/jak1/levels/common/blocking-plane.gc @@ -66,7 +66,7 @@ (let ((s4-2 (new-stack-matrix0))) (vector+! (-> self root trans) s5-0 gp-0) (vector-float*! (-> self root trans) (-> self root trans) 0.5) - (set! (-> self root trans y) (+ 61440.0 (-> self root trans y))) + (+! (-> self root trans y) 61440.0) (vector-! (the-as vector (-> s4-2 vector)) gp-0 s5-0) (set! (-> self root scale x) (* 0.00024414062 (vector-normalize-ret-len! (the-as vector (-> s4-2 vector)) 1.0)) @@ -120,7 +120,3 @@ (none) ) ) - - - - diff --git a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc index cff663301c..9ce504775c 100644 --- a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc +++ b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc @@ -66,11 +66,11 @@ :neck-joint 5 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 360.0) + :run-rotate-speed (degrees 360) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 3) - :walk-rotate-speed (degrees 360.0) + :walk-rotate-speed (degrees 360) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 3) @@ -471,7 +471,7 @@ (setup-from-to-duration! (-> self traj) (-> self collide-info trans) (-> self appear-dest) 225.0 -9.102222) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self collide-info trans quad)) - (set! (-> gp-0 y) (+ 8192.0 (-> gp-0 y))) + (+! (-> gp-0 y) 8192.0) (process-spawn part-tracker :init part-tracker-init @@ -797,7 +797,7 @@ ) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) - (set! (-> gp-0 y) (+ -16384.0 (-> gp-0 y))) + (+! (-> gp-0 y) -16384.0) (process-spawn green-eco-lurker (-> self entity) self gp-0 :to self) ) (+! (-> self num-spawned) 1) diff --git a/goal_src/jak1/levels/finalboss/robotboss-misc.gc b/goal_src/jak1/levels/finalboss/robotboss-misc.gc index 57191d6c6e..02c440f93f 100644 --- a/goal_src/jak1/levels/finalboss/robotboss-misc.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-misc.gc @@ -188,7 +188,7 @@ ) ) (set! (-> self particles 1 trans quad) (-> self root trans quad)) - (set! (-> self particles 1 trans y) (+ 24576.0 (-> self particles 1 trans y))) + (+! (-> self particles 1 trans y) 24576.0) (let ((s5-1 (-> arg3 param 1))) (set! (-> self particles 2 kind) (the-as basic (if (and (nonzero? s5-1) (type-type? (rtype-of s5-1) sparticle-launch-group)) diff --git a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc index 045e1bea03..a23b037cd1 100644 --- a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc @@ -344,7 +344,7 @@ (-> self root-override trans) :to *entity-pool* ) - (set! (-> self next-tick) (+ -0.06 (-> self next-tick))) + (+! (-> self next-tick) -0.06) (sound-play "robo-warning") ) ) diff --git a/goal_src/jak1/levels/finalboss/robotboss.gc b/goal_src/jak1/levels/finalboss/robotboss.gc index c45e93c8f9..d4dc9fa8f4 100644 --- a/goal_src/jak1/levels/finalboss/robotboss.gc +++ b/goal_src/jak1/levels/finalboss/robotboss.gc @@ -244,7 +244,6 @@ (send-event (handle->process (-> self shot-attractor)) 'draw #f) ) - (defbehavior robotboss-yellow-eco-off robotboss () ;; patches the one frame of ghost yellow eco bug that can ;; occcur under certain conditions when robot-boss-yellow-eco-off is called. @@ -319,10 +318,10 @@ (set! (-> v1-23 quad) (-> (the-as process-drawable a0-16) root trans quad)) (cond ((< (-> v1-23 y) (+ -204.8 f0-10)) - (set! (-> v1-23 y) (+ 20.48 (-> v1-23 y))) + (+! (-> v1-23 y) 20.48) ) ((< (+ 204.8 f0-10) (-> v1-23 y)) - (set! (-> v1-23 y) (+ -20.48 (-> v1-23 y))) + (+! (-> v1-23 y) -20.48) ) ) (send-event a0-16 'move-to v1-23) @@ -647,7 +646,7 @@ (+! (-> self children-spawned) 1) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self entity extra trans quad)) - (set! (-> gp-0 y) (+ 81920.0 (-> gp-0 y))) + (+! (-> gp-0 y) 81920.0) (set! (-> self white-eco) (ppointer->handle (process-spawn light-eco-mother (-> self entity) gp-0 :to self))) ) ) @@ -1404,7 +1403,7 @@ (vector-! s5-0 (-> self entity extra trans) s5-0) (dotimes (v1-53 6) (vector+! (the-as vector (-> arg0 info v1-53)) (the-as vector (-> arg0 info v1-53)) s5-0) - (set! (-> arg0 info v1-53 dest y) (+ 2048.0 (-> arg0 info v1-53 dest y))) + (+! (-> arg0 info v1-53 dest y) 2048.0) ) ) (none) @@ -1908,7 +1907,7 @@ (let ((s2-0 (new 'stack-no-clear 'vector))) (vector<-cspace! gp-0 (-> self node-list data 68)) (set! (-> s2-0 quad) (-> self entity extra trans quad)) - (set! (-> s2-0 y) (+ -40960.0 (-> s2-0 y))) + (+! (-> s2-0 y) -40960.0) (vector+! s2-0 s2-0 arg0) (process-spawn greenshot gp-0 s2-0 arg1 arg2 :to self) ) diff --git a/goal_src/jak1/levels/finalboss/sage-finalboss.gc b/goal_src/jak1/levels/finalboss/sage-finalboss.gc index d6dd81f8bc..3884ebfa83 100644 --- a/goal_src/jak1/levels/finalboss/sage-finalboss.gc +++ b/goal_src/jak1/levels/finalboss/sage-finalboss.gc @@ -558,7 +558,7 @@ ) ) (spawn (-> self part) *zero-vector*) - (set! (-> self credit-fade) (+ -0.008333334 (-> self credit-fade))) + (+! (-> self credit-fade) -0.008333334) ) (none) ) @@ -1041,7 +1041,7 @@ (set! (-> obj particle v1-37 active) #f) ) (set! (-> obj palette-val) 0.0) - (set! (-> obj root-override trans y) (+ 2048.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) 2048.0) (if (not (should-display? obj)) (go (method-of-object obj hidden)) (go (method-of-object obj idle)) diff --git a/goal_src/jak1/levels/flut_common/target-flut.gc b/goal_src/jak1/levels/flut_common/target-flut.gc index 8653457e75..8d6bc7cab5 100644 --- a/goal_src/jak1/levels/flut_common/target-flut.gc +++ b/goal_src/jak1/levels/flut_common/target-flut.gc @@ -2039,7 +2039,7 @@ (rot->dir-targ! (-> self control)) (ja-post) (vector<-cspace! gp-0 (-> self node-list data 3)) - (set! (-> gp-0 y) (+ -5896.192 (-> gp-0 y))) + (+! (-> gp-0 y) -5896.192) (move-to-point! (-> self control) gp-0) ) (send-event *camera* 'ease-in) diff --git a/goal_src/jak1/levels/jungle/darkvine.gc b/goal_src/jak1/levels/jungle/darkvine.gc index 54141811d2..ecd3db735f 100644 --- a/goal_src/jak1/levels/jungle/darkvine.gc +++ b/goal_src/jak1/levels/jungle/darkvine.gc @@ -276,7 +276,7 @@ ) (defmethod init-from-entity! darkvine ((obj darkvine) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 4) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) diff --git a/goal_src/jak1/levels/jungle/fisher.gc b/goal_src/jak1/levels/jungle/fisher.gc index 01d8dced30..51c4b1363d 100644 --- a/goal_src/jak1/levels/jungle/fisher.gc +++ b/goal_src/jak1/levels/jungle/fisher.gc @@ -1059,17 +1059,9 @@ ) (defbehavior fisher-draw-display fisher ((arg0 fisher)) - (let ((s5-0 (new - 'stack - 'font-context - *font-default-matrix* - 435 - 10 - 0.0 - (font-color red) - (font-flags shadow kerning) - ) - ) + (let ((s5-0 + (new 'stack 'font-context *font-default-matrix* 435 10 0.0 (font-color red) (font-flags shadow kerning)) + ) ) (let ((v1-1 s5-0)) (set! (-> v1-1 width) (the float 200)) @@ -1994,7 +1986,7 @@ (let ((s5-0 (eval-path-curve-div! (-> obj path) (-> obj paddle-pos) 6.5 'interp)) (s4-0 (path-control-method-12 (-> obj path) (new-stack-vector0) 6.5)) ) - (set! (-> s5-0 y) (+ 2457.6 (-> s5-0 y))) + (+! (-> s5-0 y) 2457.6) (vector-normalize! (vector-rotate-y! s4-0 s4-0 16384.0) (-> *FISHER-bank* width)) (vector-! (the-as vector (-> obj paddle-end)) s5-0 s4-0) (vector+! (the-as vector (&-> obj stack 288)) s5-0 s4-0) diff --git a/goal_src/jak1/levels/jungle/hopper.gc b/goal_src/jak1/levels/jungle/hopper.gc index 35548bda32..24a2f5de7a 100644 --- a/goal_src/jak1/levels/jungle/hopper.gc +++ b/goal_src/jak1/levels/jungle/hopper.gc @@ -45,7 +45,7 @@ nav-enemy-default-event-handler (f30-0 61440.0) ) (set! (-> s5-0 quad) (-> arg0 quad)) - (set! (-> s5-0 y) (+ 20480.0 (-> s5-0 y))) + (+! (-> s5-0 y) 20480.0) (let ((f0-2 (fill-and-probe-using-y-probe *collide-cache* s5-0 diff --git a/goal_src/jak1/levels/jungle/jungle-mirrors.gc b/goal_src/jak1/levels/jungle/jungle-mirrors.gc index 704a67ba51..f9b5ee2564 100644 --- a/goal_src/jak1/levels/jungle/jungle-mirrors.gc +++ b/goal_src/jak1/levels/jungle/jungle-mirrors.gc @@ -1433,7 +1433,7 @@ (+! (-> self tilt) (-> v1-10 1)) ) (else - (set! (-> self turn) (+ 910.2222 (-> self turn))) + (+! (-> self turn) 910.2222) ) ) ) @@ -1817,7 +1817,7 @@ :code (behavior () (let ((gp-0 (new-stack-vector0))) (set! (-> gp-0 quad) (-> self root-override trans quad)) - (set! (-> gp-0 y) (+ 49152.0 (-> gp-0 y))) + (+! (-> gp-0 y) 49152.0) (loop (draw-power-beam gp-0 (-> self beam-end)) (update! (-> self sound)) diff --git a/goal_src/jak1/levels/jungle/jungle-obs.gc b/goal_src/jak1/levels/jungle/jungle-obs.gc index 76a617e8b1..fcf817e451 100644 --- a/goal_src/jak1/levels/jungle/jungle-obs.gc +++ b/goal_src/jak1/levels/jungle/jungle-obs.gc @@ -84,7 +84,7 @@ ) (defmethod init-from-entity! logtrap ((obj logtrap) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -144,7 +144,7 @@ ) (defmethod init-from-entity! towertop ((obj towertop) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root-override) (new 'process 'trsq)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -207,7 +207,7 @@ ) (defmethod init-from-entity! lurkerm-tall-sail ((obj lurkerm-tall-sail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -299,7 +299,7 @@ ) (defmethod init-from-entity! lurkerm-short-sail ((obj lurkerm-short-sail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -412,7 +412,7 @@ (defmethod init-from-entity! lurkerm-piston ((obj lurkerm-piston) (arg0 entity-actor)) (local-vars (sv-16 res-tag) (sv-32 res-tag)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -722,7 +722,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (loop (if (not (movie?)) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) ) (cond ((and *target* (>= 61440.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) @@ -749,7 +749,7 @@ (defmethod init-from-entity! precurbridge ((obj precurbridge) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1150,7 +1150,7 @@ ) (defmethod init-from-entity! jngpusher ((obj jngpusher) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/jungle/junglesnake.gc b/goal_src/jak1/levels/jungle/junglesnake.gc index 1717defc5a..1947513143 100644 --- a/goal_src/jak1/levels/jungle/junglesnake.gc +++ b/goal_src/jak1/levels/jungle/junglesnake.gc @@ -244,7 +244,7 @@ junglesnake-default-event-handler (set! (-> s4-2 w) 1.0) (let ((s1-2 (new 'stack-no-clear 'vector))) (vector-! s1-2 (target-pos 0) (-> s2-1 vector 3)) - (set! (-> s1-2 y) (+ 9011.2 (-> s1-2 y))) + (+! (-> s1-2 y) 9011.2) (vector-normalize! s1-2 1.0) (let ((s0-2 (new 'stack-no-clear 'vector)) (s3-4 (new 'stack-no-clear 'vector)) @@ -547,7 +547,7 @@ junglesnake-default-event-handler (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root-override trans quad)) (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> s5-0 y) (+ 131072.0 (-> s5-0 y))) + (+! (-> s5-0 y) 131072.0) (ja-no-eval :group! junglesnake-give-up-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (let* ((f0-6 (ja-frame-num 0)) @@ -682,7 +682,7 @@ junglesnake-default-event-handler ) (defmethod init-from-entity! junglesnake ((obj junglesnake) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 9) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) diff --git a/goal_src/jak1/levels/jungleb/plat-flip.gc b/goal_src/jak1/levels/jungleb/plat-flip.gc index 78091f7f59..77e1add645 100644 --- a/goal_src/jak1/levels/jungleb/plat-flip.gc +++ b/goal_src/jak1/levels/jungleb/plat-flip.gc @@ -37,19 +37,17 @@ ) (defstate plat-flip-idle (plat-flip) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'bonk) - (activate! (-> self smush) -1.0 90 300 1.0 1.0) - ) - ((= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 1.5)) - (the-as smush-control #f) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (activate! (-> self smush) -1.0 90 300 1.0 1.0) + ) + (('touch) + (send-event proc 'no-look-around (seconds 1.5)) + (the-as smush-control #f) + ) + ) + ) ) :trans (the-as (function none :behavior plat-flip) rider-trans) :code (behavior () @@ -109,7 +107,7 @@ (defmethod init-from-entity! plat-flip ((obj plat-flip) (arg0 entity-actor)) (local-vars (sv-16 res-tag) (sv-32 res-tag) (sv-48 res-tag)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -183,7 +181,3 @@ (go plat-flip-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/lavatube/lavatube-energy.gc b/goal_src/jak1/levels/lavatube/lavatube-energy.gc index 646b7dbff3..bacfbf846b 100644 --- a/goal_src/jak1/levels/lavatube/lavatube-energy.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-energy.gc @@ -829,7 +829,7 @@ ) (defun energyball-init ((arg0 energyball)) - (set! (-> arg0 mask) (logior (process-mask attackable) (-> arg0 mask))) + (logior! (-> arg0 mask) (process-mask attackable)) (let ((s5-0 (new 'process 'collide-shape-moving arg0 (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1154,10 +1154,10 @@ ) (cond ((< 65536.0 (-> self y-rotation)) - (set! (-> self y-rotation) (+ -65536.0 (-> self y-rotation))) + (+! (-> self y-rotation) -65536.0) ) ((< (-> self y-rotation) 0.0) - (set! (-> self y-rotation) (+ 65536.0 (-> self y-rotation))) + (+! (-> self y-rotation) 65536.0) ) ) (let ((gp-0 (new 'stack-no-clear 'matrix))) diff --git a/goal_src/jak1/levels/lavatube/lavatube-obs.gc b/goal_src/jak1/levels/lavatube/lavatube-obs.gc index 7f5389a0b3..dc7a617da9 100644 --- a/goal_src/jak1/levels/lavatube/lavatube-obs.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-obs.gc @@ -460,7 +460,7 @@ ) (eval-path-curve! (-> self path) (-> self root-override trans) f30-0 'interp) (+! (-> self root-override trans y) (* 4096.0 (-> self y-offset osc value))) - (set! (-> self root-override trans y) (+ -4096.0 (-> self root-override trans y))) + (+! (-> self root-override trans y) -4096.0) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (new 'stack-no-clear 'matrix)) ) @@ -503,7 +503,7 @@ (sound-play "dcrate-break") (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root-override trans quad)) - (set! (-> gp-1 y) (+ -49152.0 (-> gp-1 y))) + (+! (-> gp-1 y) -49152.0) (process-spawn part-tracker :init part-tracker-init @@ -666,7 +666,7 @@ (set-params! (-> self down-tgt) 300 600 0.05 0.9) (darkecobarrel-mover-pos) (logclear! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask attackable) (-> self mask))) + (logior! (-> self mask) (process-mask attackable)) (go darkecobarrel-mover-move) (none) ) @@ -1021,7 +1021,7 @@ (sound-play "dcrate-break") (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root-override trans quad)) - (set! (-> gp-1 y) (+ -73728.0 (-> gp-1 y))) + (+! (-> gp-1 y) -73728.0) (process-spawn part-tracker :init part-tracker-init @@ -1072,7 +1072,7 @@ ) (defmethod init-from-entity! chainmine ((obj chainmine) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1316,7 +1316,7 @@ (set! (-> v1-2 waveform) ripple-for-lavatube-lava) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt25) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt25)) (set! (-> obj attack-event) 'heat) (none) ) diff --git a/goal_src/jak1/levels/maincave/baby-spider.gc b/goal_src/jak1/levels/maincave/baby-spider.gc index dcdf876285..5636ef8465 100644 --- a/goal_src/jak1/levels/maincave/baby-spider.gc +++ b/goal_src/jak1/levels/maincave/baby-spider.gc @@ -268,7 +268,7 @@ baby-spider-default-event-handler (defmethod nav-enemy-method-52 baby-spider ((obj baby-spider) (arg0 vector)) (+! (-> obj wiggle-angle) (* DISPLAY_FPS_RATIO (-> obj delta-wiggle-angle))) ;; changed for high fps (if (< 65536.0 (-> obj wiggle-angle)) - (set! (-> obj wiggle-angle) (+ -65536.0 (-> obj wiggle-angle))) + (+! (-> obj wiggle-angle) -65536.0) ) (let* ((v1-3 (-> obj collide-info trans)) (a1-2 (vector-! (new 'stack-no-clear 'vector) v1-3 arg0)) @@ -717,7 +717,7 @@ baby-spider-default-event-handler (forward-up->quaternion (-> self collide-info quat) arg2 *up-vector*) (vector-float*! (-> self collide-info scale) *identity-vector* 0.63) (vector-float*! (-> self collide-info transv) arg2 8192.0) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self entity) (-> arg0 entity)) (nav-enemy-method-48 self) (set! (-> self enemy-info pickup-type) (the-as pickup-type (-> arg3 pickup))) @@ -751,7 +751,7 @@ baby-spider-default-event-handler (set! (-> obj event-death) #f) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logior! (-> obj mask) (process-mask actor-pause)) (set! (-> obj nav) (new 'process 'nav-control (-> obj collide-info) 24 40960.0)) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) diff --git a/goal_src/jak1/levels/maincave/dark-crystal.gc b/goal_src/jak1/levels/maincave/dark-crystal.gc index a3ae307996..6403834cb1 100644 --- a/goal_src/jak1/levels/maincave/dark-crystal.gc +++ b/goal_src/jak1/levels/maincave/dark-crystal.gc @@ -569,9 +569,9 @@ (s4-0 (new 'stack-no-clear 'vector)) ) (set! (-> s5-0 quad) (-> obj root-override trans quad)) - (set! (-> s5-0 y) (+ 6144.0 (-> s5-0 y))) + (+! (-> s5-0 y) 6144.0) (set! (-> s3-0 quad) (-> (target-pos 0) quad)) - (set! (-> s3-0 y) (+ 6144.0 (-> s3-0 y))) + (+! (-> s3-0 y) 6144.0) (when (>= (-> obj explode-danger-radius) (vector-vector-distance s5-0 s3-0)) (vector-! s4-0 s3-0 s5-0) (let ((t2-0 (new 'stack-no-clear 'collide-tri-result))) @@ -618,7 +618,7 @@ (set-vector! (-> obj unlit-color-emissive) 0.0 0.0 0.0 0.0) (set-vector! (-> obj lit-color-mult) 1.0 1.0 1.0 1.0) (set-vector! (-> obj lit-color-emissive) 1.0 1.0 1.0 0.0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind wall-object)) @@ -635,7 +635,7 @@ ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *dark-crystal-sg* '()) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (set! (-> obj draw color-mult quad) (-> obj unlit-color-mult quad)) (set! (-> obj draw color-emissive quad) (-> obj unlit-color-emissive quad)) (set! (-> obj underwater?) (= (res-lump-value arg0 'mode uint128) 1)) diff --git a/goal_src/jak1/levels/maincave/driller-lurker.gc b/goal_src/jak1/levels/maincave/driller-lurker.gc index e2afdc7962..955d4823e2 100644 --- a/goal_src/jak1/levels/maincave/driller-lurker.gc +++ b/goal_src/jak1/levels/maincave/driller-lurker.gc @@ -409,7 +409,7 @@ ) (when (< 16384.0 (fabs (deg- (-> obj facing-ry) (-> obj path-ry)))) (set! (-> obj path-dir) (- (-> obj path-dir))) - (set! (-> obj path-ry) (+ 32768.0 (-> obj path-ry))) + (+! (-> obj path-ry) 32768.0) ) ) ) @@ -1007,7 +1007,7 @@ (set! (-> obj started-chasing-time) 0) (set! (-> obj player-attack-id) (the-as uint 0)) (set! (-> obj ambient-drilling-u) -1.0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/maincave/gnawer.gc b/goal_src/jak1/levels/maincave/gnawer.gc index 73f5993a59..8a89524aa7 100644 --- a/goal_src/jak1/levels/maincave/gnawer.gc +++ b/goal_src/jak1/levels/maincave/gnawer.gc @@ -135,38 +135,17 @@ (new 'static 'inline-array gnawer-segment-info 10 (new 'static 'gnawer-segment-info :num-joints 8 - :joint-index (new 'static 'array int8 8 4 #x1f #xd #x20 #x21 #x22 #x23 #x24) + :joint-index (new 'static 'array int8 8 4 31 13 32 33 34 35 36) ) - (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 5 #xe #xf 0 0 0 0 0)) - (new 'static 'gnawer-segment-info - :num-joints 3 - :joint-index (new 'static 'array int8 8 #x6 #x10 #x11 0 0 0 0 0) - ) - (new 'static 'gnawer-segment-info - :num-joints 3 - :joint-index (new 'static 'array int8 8 #x7 #x12 #x13 0 0 0 0 0) - ) - (new 'static 'gnawer-segment-info - :num-joints 3 - :joint-index (new 'static 'array int8 8 #x8 #x14 #x15 0 0 0 0 0) - ) - (new 'static 'gnawer-segment-info - :num-joints 3 - :joint-index (new 'static 'array int8 8 #x9 #x16 #x17 0 0 0 0 0) - ) - (new 'static 'gnawer-segment-info - :num-joints 3 - :joint-index (new 'static 'array int8 8 #xa #x18 #x19 0 0 0 0 0) - ) - (new 'static 'gnawer-segment-info - :num-joints 3 - :joint-index (new 'static 'array int8 8 #xb #x1a #x1b 0 0 0 0 0) - ) - (new 'static 'gnawer-segment-info - :num-joints 3 - :joint-index (new 'static 'array int8 8 #xc #x1c #x1d 0 0 0 0 0) - ) - (new 'static 'gnawer-segment-info :num-joints 1 :joint-index (new 'static 'array int8 8 #x1e 0 0 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 5 14 15 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 6 16 17 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 7 18 19 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 8 20 21 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 9 22 23 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 10 24 25 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 11 26 27 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 3 :joint-index (new 'static 'array int8 8 12 28 29 0 0 0 0 0)) + (new 'static 'gnawer-segment-info :num-joints 1 :joint-index (new 'static 'array int8 8 30 0 0 0 0 0 0 0)) ) ) @@ -374,7 +353,7 @@ (defbehavior gnawer-falling-segment-init-by-other gnawer-falling-segment ((arg0 gnawer) (arg1 vector) (arg2 vector)) (set! (-> self entity) (-> arg0 entity)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg1 quad)) (vector-identity! (-> self root scale)) @@ -688,7 +667,7 @@ (dotimes (s5-0 3) (when (> (-> obj hit-points) 0) (+! (-> obj hit-points) -1) - (set! (-> obj speed) (+ 4096.0 (-> obj speed))) + (+! (-> obj speed) 4096.0) (when (> (-> obj hit-points) 0) (set! (-> obj show-damage?) #t) (let ((s4-0 (+ (-> obj hit-points) 2))) @@ -1456,7 +1435,7 @@ (let ((f0-40 (res-lump-float (-> obj entity) 'rotoffset))) (quaternion-rotate-y! (-> obj root-override quat) (-> obj root-override quat) f0-40) ) - (set! (-> obj root-override trans y) (+ -2048.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -2048.0) (set! sv-16 (new 'static 'res-tag)) (let ((v1-81 (res-lump-data arg0 'trans-offset (pointer float) :tag-ptr (& sv-16)))) (when v1-81 diff --git a/goal_src/jak1/levels/maincave/maincave-obs.gc b/goal_src/jak1/levels/maincave/maincave-obs.gc index ffa3326087..03fdf523d0 100644 --- a/goal_src/jak1/levels/maincave/maincave-obs.gc +++ b/goal_src/jak1/levels/maincave/maincave-obs.gc @@ -315,7 +315,7 @@ ) (defmethod init-from-entity! cavetrapdoor ((obj cavetrapdoor) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -701,7 +701,7 @@ ) (defmethod init-from-entity! cavespatula ((obj cavespatula) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -813,7 +813,7 @@ ) (defmethod init-from-entity! cavespatulatwo ((obj cavespatulatwo) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1161,7 +1161,7 @@ (local-vars (v1-43 int) (sv-16 res-tag)) (set! (-> obj prev-frame-num) 10000.0) (set! (-> obj last-update-bounce-time) 0) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/maincave/mother-spider-egg.gc b/goal_src/jak1/levels/maincave/mother-spider-egg.gc index 8ed92ab7dc..dbffe0f3c1 100644 --- a/goal_src/jak1/levels/maincave/mother-spider-egg.gc +++ b/goal_src/jak1/levels/maincave/mother-spider-egg.gc @@ -168,7 +168,7 @@ (a2-1 (new 'stack-no-clear 'vector)) ) (set! (-> a1-1 quad) (-> obj root-override trans quad)) - (set! (-> a1-1 y) (+ 1228.8 (-> a1-1 y))) + (+! (-> a1-1 y) 1228.8) (set-vector! a2-1 0.0 -61440.0 0.0 1.0) (cond ((>= (fill-and-probe-using-line-sphere @@ -501,8 +501,8 @@ (set-vector! (-> self root-override scale) 0.3 0.3 0.3 1.0) (quaternion-copy! (-> self root-override quat) (-> self parent-override 0 root-override quat)) (logior! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) - (set! (-> self mask) (logior (process-mask attackable) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) + (logior! (-> self mask) (process-mask attackable)) (initialize-skeleton self *mother-spider-egg-unbroken-sg* '()) (setup-lods! (-> self broken-look) *mother-spider-egg-broken-sg* (-> self draw art-group) (-> self entity)) (set! (-> self draw shadow-ctrl) (new 'process 'shadow-control 0.0 0.0 614400.0 (the-as float 60) 245760.0)) diff --git a/goal_src/jak1/levels/maincave/mother-spider-proj.gc b/goal_src/jak1/levels/maincave/mother-spider-proj.gc index f2cfad3f80..5368e955af 100644 --- a/goal_src/jak1/levels/maincave/mother-spider-proj.gc +++ b/goal_src/jak1/levels/maincave/mother-spider-proj.gc @@ -316,7 +316,7 @@ (logclear! (-> obj mask) (process-mask enemy)) (logclear! (-> obj mask) (process-mask crate)) (logclear! (-> obj mask) (process-mask attackable)) - (set! (-> obj mask) (logior (process-mask projectile) (-> obj mask))) + (logior! (-> obj mask) (process-mask projectile)) 0 (none) ) @@ -330,7 +330,7 @@ (set! (-> obj attack-mode) 'mother-spider-proj) (set! (-> obj timeout) (seconds 4)) (set! (-> obj target quad) (-> (target-pos 0) quad)) - (set! (-> obj target y) (+ 4915.2 (-> obj target y))) + (+! (-> obj target y) 4915.2) (set! (-> obj target-base quad) (-> obj target quad)) (set! (-> obj sound-id) (sound-play "mother-track")) (sound-play "mother-fire") @@ -346,7 +346,7 @@ ) (let ((gp-0 (-> obj target))) (set! (-> gp-0 quad) (-> (target-pos 0) quad)) - (set! (-> gp-0 y) (+ 4915.2 (-> gp-0 y))) + (+! (-> gp-0 y) 4915.2) (let ((f0-2 (vector-vector-distance gp-0 (-> obj root-override trans))) (a2-0 (new 'stack-no-clear 'vector)) ) diff --git a/goal_src/jak1/levels/maincave/mother-spider.gc b/goal_src/jak1/levels/maincave/mother-spider.gc index 9abcb1e8c2..93a11e9996 100644 --- a/goal_src/jak1/levels/maincave/mother-spider.gc +++ b/goal_src/jak1/levels/maincave/mother-spider.gc @@ -178,7 +178,7 @@ (defbehavior mother-spider-leg-init-by-other mother-spider-leg ((arg0 mother-spider) (arg1 vector) (arg2 vector) (arg3 vector)) (set! (-> self entity) (-> arg0 entity)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg1 quad)) (vector-identity! (-> self root scale)) @@ -253,7 +253,7 @@ ) (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 1.0) - (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) + (+! (-> self thread-vel) -40960.0) (if (mother-spider-method-21 self gp-0 102400.0 #t) (go mother-spider-die) ) @@ -270,7 +270,7 @@ ) (set! (-> gp-1 y) 0.0) (vector-normalize! gp-1 1.0) - (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) + (+! (-> self thread-vel) -40960.0) (if (mother-spider-method-21 self gp-1 102400.0 #t) (go mother-spider-die) ) @@ -292,7 +292,7 @@ ) (set! (-> gp-2 y) 0.0) (vector-normalize! gp-2 1.0) - (set! (-> self thread-vel) (+ -8192.0 (-> self thread-vel))) + (+! (-> self thread-vel) -8192.0) (mother-spider-method-21 self gp-2 40960.0 #f) ) ) @@ -399,7 +399,7 @@ ) (set! (-> a1-0 quad) (-> obj root-override trans quad)) (set-vector! a2-0 0.0 -81920.0 0.0 1.0) - (set! (-> a1-0 y) (+ -8192.0 (-> a1-0 y))) + (+! (-> a1-0 y) -8192.0) (cond ((>= (fill-and-probe-using-line-sphere *collide-cache* @@ -1063,7 +1063,7 @@ (when (sphere-in-view-frustum? (the-as sphere gp-2)) (vector<-cspace! gp-2 (-> self node-list data 21)) (set! (-> s5-2 quad) (-> (target-pos 0) quad)) - (set! (-> s5-2 y) (+ 4915.2 (-> s5-2 y))) + (+! (-> s5-2 y) 4915.2) (cond ((< 24576.0 (vector-vector-distance gp-2 s5-2)) (go mother-spider-spit) @@ -1170,7 +1170,7 @@ ) (vector<-cspace! s4-0 (-> self node-list data 21)) (set! (-> s5-0 quad) (-> (target-pos 0) quad)) - (set! (-> s5-0 y) (+ 4915.2 (-> s5-0 y))) + (+! (-> s5-0 y) 4915.2) (when (< 24576.0 (vector-vector-distance s5-0 s4-0)) (let ((a2-1 (-> self node-list data 19 bone transform))) (set-vector! s2-0 0.0 0.0 1.0 1.0) @@ -1385,7 +1385,7 @@ (s3-2 (new 'stack-no-clear 'collide-tri-result)) ) (set! (-> a1-12 quad) (-> arg0 quad)) - (set! (-> a1-12 y) (+ 8192.0 (-> a1-12 y))) + (+! (-> a1-12 y) 8192.0) (cond ((>= (fill-and-probe-using-line-sphere *collide-cache* @@ -1469,7 +1469,7 @@ (vector-! s2-0 s2-0 s3-0) (vector-normalize! s2-0 1.0) (set! (-> s1-0 quad) (-> s2-0 quad)) - (set! (-> s1-0 y) (+ 0.3 (-> s1-0 y))) + (+! (-> s1-0 y) 0.3) (vector-normalize! s1-0 1.0) (process-spawn mother-spider-leg self s3-0 s2-0 s1-0 :to self) ) @@ -1660,7 +1660,7 @@ (set! (-> obj activate-z-thresh) -12288.0) (set! (-> obj deactivate-z-thresh) 24985.6) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 9) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind mother-spider)) @@ -1788,8 +1788,8 @@ (set! (-> obj deactivate-xz-dist) (-> (the-as (pointer float) v0-31) 7)) ) (else - (set! (-> obj thread-min-trans y) (+ 28672.0 (-> obj thread-min-trans y))) - (set! (-> obj anchor-trans y) (+ 204800.0 (-> obj anchor-trans y))) + (+! (-> obj thread-min-trans y) 28672.0) + (+! (-> obj anchor-trans y) 204800.0) (set! (-> obj max-spit-xz-dist) 81920.0) (set! (-> obj activate-xz-dist) 143360.0) (set! (-> obj deactivate-xz-dist) 163430.4) diff --git a/goal_src/jak1/levels/maincave/spiderwebs.gc b/goal_src/jak1/levels/maincave/spiderwebs.gc index 32e5121704..afce74c590 100644 --- a/goal_src/jak1/levels/maincave/spiderwebs.gc +++ b/goal_src/jak1/levels/maincave/spiderwebs.gc @@ -126,7 +126,7 @@ ) (defmethod init-from-entity! spiderwebs ((obj spiderwebs) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -168,7 +168,3 @@ (go spiderwebs-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/balloonlurker.gc b/goal_src/jak1/levels/misty/balloonlurker.gc index d753000c8a..69cf5d8a09 100644 --- a/goal_src/jak1/levels/misty/balloonlurker.gc +++ b/goal_src/jak1/levels/misty/balloonlurker.gc @@ -931,7 +931,7 @@ ) (defbehavior balloonlurker-pilot-init-by-other balloonlurker-pilot ((arg0 balloonlurker)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (balloonlurker-pilot-method-20 self) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self fact) @@ -1065,7 +1065,7 @@ ;; WARN: Function (method 11 balloonlurker) has a return type of none, but the expression builder found a return statement. (defmethod init-from-entity! balloonlurker ((obj balloonlurker) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/goal_src/jak1/levels/misty/misty-conveyor.gc b/goal_src/jak1/levels/misty/misty-conveyor.gc index f61be681fd..65785ddc6d 100644 --- a/goal_src/jak1/levels/misty/misty-conveyor.gc +++ b/goal_src/jak1/levels/misty/misty-conveyor.gc @@ -582,7 +582,7 @@ ;; WARN: Function (method 11 keg-conveyor) has a return type of none, but the expression builder found a return statement. (defmethod init-from-entity! keg-conveyor ((obj keg-conveyor) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy death) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy death)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *keg-conveyor-sg* '()) diff --git a/goal_src/jak1/levels/misty/misty-obs.gc b/goal_src/jak1/levels/misty/misty-obs.gc index 4afeb6d8bd..dfa9cd0f5f 100644 --- a/goal_src/jak1/levels/misty/misty-obs.gc +++ b/goal_src/jak1/levels/misty/misty-obs.gc @@ -1057,7 +1057,7 @@ ) (defmethod init-from-entity! boatpaddle ((obj boatpaddle) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *boatpaddle-sg* '()) @@ -1116,7 +1116,7 @@ ) (defmethod init-from-entity! windturbine ((obj windturbine) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -1277,7 +1277,7 @@ ) (defmethod init-from-entity! mis-bone-bridge ((obj mis-bone-bridge) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1440,7 +1440,7 @@ ) (defmethod init! breakaway ((obj breakaway) (arg0 res-lump) (arg1 int)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/misty/mistycannon.gc b/goal_src/jak1/levels/misty/mistycannon.gc index 0bbae53c70..50c355efcc 100644 --- a/goal_src/jak1/levels/misty/mistycannon.gc +++ b/goal_src/jak1/levels/misty/mistycannon.gc @@ -48,7 +48,7 @@ (set! (-> arg0 min) arg1) (set! (-> arg0 range) (the float (sar (shl (the int (- arg2 arg1)) 48) 48))) (if (< (-> arg0 range) 0.0) - (set! (-> arg0 range) (+ 65536.0 (-> arg0 range))) + (+! (-> arg0 range) 65536.0) ) (set! (-> arg0 value) (* 0.5 (-> arg0 range))) (set! (-> arg0 speed) arg3) @@ -958,7 +958,7 @@ (defbehavior mistycannon-missile-init-by-other mistycannon-missile ((arg0 mistycannon-init-data) (arg1 entity-actor)) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self entity) arg1) (let ((s5-0 (new 'process 'collide-shape-moving self (collide-list-enum hit-by-player)))) @@ -1687,7 +1687,7 @@ (defmethod init-from-entity! mistycannon ((obj mistycannon) (arg0 entity-actor)) (local-vars (sv-16 res-tag) (sv-32 res-tag) (sv-48 res-tag)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/misty/mud.gc b/goal_src/jak1/levels/misty/mud.gc index ca764dea30..7b8da21c45 100644 --- a/goal_src/jak1/levels/misty/mud.gc +++ b/goal_src/jak1/levels/misty/mud.gc @@ -47,7 +47,7 @@ (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt18) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt18)) (let ((gp-0 (new 'process 'ripple-control))) (set! (-> obj draw ripple) gp-0) (set! (-> gp-0 global-scale) 3072.0) diff --git a/goal_src/jak1/levels/misty/muse.gc b/goal_src/jak1/levels/misty/muse.gc index 46310682d6..1525ad4bb2 100644 --- a/goal_src/jak1/levels/misty/muse.gc +++ b/goal_src/jak1/levels/misty/muse.gc @@ -470,7 +470,7 @@ nav-enemy-default-event-handler (defmethod init-from-entity! muse ((obj muse) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/misty/quicksandlurker.gc b/goal_src/jak1/levels/misty/quicksandlurker.gc index 64c8e034a2..e47978f10f 100644 --- a/goal_src/jak1/levels/misty/quicksandlurker.gc +++ b/goal_src/jak1/levels/misty/quicksandlurker.gc @@ -891,7 +891,7 @@ ) (defmethod init-from-entity! quicksandlurker ((obj quicksandlurker) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) @@ -929,7 +929,7 @@ (set! (-> obj root-override) s4-0) ) (process-drawable-from-entity! obj arg0) - (set! (-> obj root-override trans y) (+ -2048.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -2048.0) (set! (-> obj original-position quad) (-> obj root-override trans quad)) (set! (-> obj theta-angle) (rand-vu-float-range 0.0 65536.0)) (set! (-> obj bob-angle) (rand-vu-float-range 0.0 65536.0)) diff --git a/goal_src/jak1/levels/ogre/flying-lurker.gc b/goal_src/jak1/levels/ogre/flying-lurker.gc index 64c74d0e5a..73ad7c1ffb 100644 --- a/goal_src/jak1/levels/ogre/flying-lurker.gc +++ b/goal_src/jak1/levels/ogre/flying-lurker.gc @@ -352,7 +352,7 @@ (a2-0 (new 'stack-no-clear 'vector)) ) (set! (-> a1-1 quad) (-> obj root trans quad)) - (set! (-> a1-1 y) (+ -8192.0 (-> a1-1 y))) + (+! (-> a1-1 y) -8192.0) (set-vector! a2-0 0.0 -81920.0 0.0 1.0) (when (>= (fill-and-probe-using-line-sphere *collide-cache* @@ -536,7 +536,7 @@ ) ) (+! (-> self root trans y) (-> self y-offset)) - (set! (-> self root trans y) (+ 12288.0 (-> self root trans y))) + (+! (-> self root trans y) 12288.0) (none) ) @@ -736,7 +736,7 @@ (suspend) (when (>= (- (-> *display* base-frame-counter) (-> self last-look-time)) (-> self time-to-next-look)) (ja-channel-push! 1 (seconds 0.2)) - (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) + (ja-no-eval :group! flying-lurker-look-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak1/levels/ogre/ogre-obs.gc b/goal_src/jak1/levels/ogre/ogre-obs.gc index aad6ed4ad6..efa97ab05d 100644 --- a/goal_src/jak1/levels/ogre/ogre-obs.gc +++ b/goal_src/jak1/levels/ogre/ogre-obs.gc @@ -786,7 +786,7 @@ (defmethod rigid-body-platform-method-31 ogre-isle-b ((obj ogre-isle-b)) - (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) + (+! (-> obj root-overlay trans x) -8192.0) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) ((the-as (function ogre-isle none) (find-parent-method ogre-isle-b 31)) obj) @@ -795,7 +795,7 @@ ) (defmethod rigid-body-platform-method-31 ogre-isle-c ((obj ogre-isle-c)) - (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) + (+! (-> obj root-overlay trans x) -8192.0) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) ((the-as (function ogre-isle none) (find-parent-method ogre-isle-c 31)) obj) @@ -804,8 +804,8 @@ ) (defmethod rigid-body-platform-method-31 ogre-isle-d ((obj ogre-isle-d)) - (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) - (set! (-> obj root-overlay trans z) (+ -8192.0 (-> obj root-overlay trans z))) + (+! (-> obj root-overlay trans x) -8192.0) + (+! (-> obj root-overlay trans z) -8192.0) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 22528.0) (initialize-skeleton obj *ogre-isle-d-sg* '()) ((the-as (function ogre-isle none) (find-parent-method ogre-isle-d 31)) obj) @@ -988,7 +988,7 @@ (defmethod init-from-entity! ogre-bridge ((obj ogre-bridge) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1323,7 +1323,7 @@ (set! (-> v1-2 waveform) ripple-for-ogre-lava) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt25) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt25)) (set! (-> obj attack-event) 'lava) (none) ) diff --git a/goal_src/jak1/levels/ogre/ogreboss.gc b/goal_src/jak1/levels/ogre/ogreboss.gc index a95af1fa2e..4df8544bdd 100644 --- a/goal_src/jak1/levels/ogre/ogreboss.gc +++ b/goal_src/jak1/levels/ogre/ogreboss.gc @@ -234,37 +234,37 @@ ) (defstate ogreboss-missile-impact (ogreboss-missile) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touched) (cond (#f (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'explode)))) + ((= (-> proc type) target) + (send-event proc 'attack (-> event param 0) (static-attack-info ((mode 'explode)))) ) (else (let ((a1-2 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-2 from) self) (set! (-> a1-2 num-params) 4) (set! (-> a1-2 message) 'attack) - (set! (-> a1-2 param 0) (-> arg3 param 0)) + (set! (-> a1-2 param 0) (-> event param 0)) (set! (-> a1-2 param 1) (the-as uint 'explode)) (let ((v1-12 (+ *global-attack-id* 1))) (set! *global-attack-id* v1-12) (set! (-> a1-2 param 2) (the-as uint v1-12)) ) (set! (-> a1-2 param 3) (the-as uint 0)) - (send-event-function arg0 a1-2) + (send-event-function proc a1-2) ) ) ) - (if (= (-> arg0 type) target) + (if (= (-> proc type) target) (send-event (ppointer->process (-> self parent-override)) 'victory) ) ) (else - (let* ((s4-0 arg0) + (let* ((s4-0 proc) (t1-0 (if (and (nonzero? s4-0) (type-type? (-> s4-0 type) target)) s4-0 ) @@ -278,7 +278,7 @@ ) 0.0 (set! (-> s4-1 quad) (-> (the-as target t1-0) control trans quad)) - (set! (-> s4-1 y) (+ 4096.0 (-> s4-1 y))) + (+! (-> s4-1 y) 4096.0) (set-vector! s3-0 0.0 (- 118784.0 (-> s4-1 y)) 0.0 1.0) (let ((f30-0 (fill-and-probe-using-line-sphere @@ -302,7 +302,7 @@ (the-as rgba (new 'static 'rgba :g #xff :a #x80)) ) (when (>= f30-0 0.0) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'damage)))) + (send-event proc 'attack (-> event param 0) (static-attack-info ((mode 'damage)))) (send-event (ppointer->process (-> self parent-override)) 'victory) ) ) @@ -311,7 +311,7 @@ (else (let ((v1-37 (new 'stack-no-clear 'vector))) (set-vector! v1-37 0.0 -12288000.0 0.0 1.0) - (send-event arg0 'impulse v1-37) + (send-event proc 'impulse v1-37) ) ) ) @@ -401,7 +401,7 @@ (set! (-> self root-override quat vec quad) (-> self parent-override 0 root quat vec quad)) (vector-identity! (-> self root-override scale)) (initialize-skeleton self *ogreboss-shoot-boulder-sg* '()) - (set! (-> self mask) (logior (process-mask enemy projectile) (-> self mask))) + (logior! (-> self mask) (process-mask enemy projectile)) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self draw shadow-ctrl) *ogreboss-missile-shadow-control*) (if (> (-> arg0 duration) 0) @@ -512,19 +512,13 @@ ) (defstate ogreboss-super-boulder-idle (ogreboss-super-boulder) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('speedup) - (let ((f0-1 (* 1.3 (-> self speed)))) - (set! (-> self speed) f0-1) - f0-1 - ) + (set! (-> self speed) (* 1.3 (-> self speed))) ) (('grow-faster) - (let ((f0-2 1.0)) - (set! (-> self grow-rate) f0-2) - f0-2 - ) + (set! (-> self grow-rate) 1.0) ) (('go-throw) (go ogreboss-super-boulder-throw) @@ -1153,9 +1147,7 @@ (defstate ogreboss-intro (ogreboss) :code (behavior () - (when (and (zero? (-> self try-count)) - (not (and PC_PORT (is-speedrun-category? 'il-ogre))) ;; modified for PC port - skip cutscene in Mountain Pass IL speedrun - ) + (when (zero? (-> self try-count)) (process-drawable-delay-player (seconds 1)) (let ((gp-0 (get-process *default-dead-pool* pov-camera #x4000))) (ppointer->handle (when gp-0 @@ -1456,8 +1448,8 @@ ) (defstate ogreboss-stage1 (ogreboss) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('next-stage) (set! (-> self bridge-assembled) #t) (go ogreboss-stage2) @@ -1478,7 +1470,7 @@ (none) ) :code (behavior () - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (ogreboss-set-stage1-camera) (ogreboss-move-near (seconds 3) (the-as float 1.0)) (cond @@ -1512,7 +1504,7 @@ (ja :num! (seek! max f30-0)) ) (countdown (gp-1 (+ gp-0 -1)) - (let ((s5-0 (pickup-type none))) + (let ((boulder-pickup (pickup-type none))) (let ((f28-0 0.0)) (cond ((>= 1.0 (-> *target* fact-info-target health)) @@ -1536,10 +1528,10 @@ ) ) (if (and *target* (< (rand-vu) f28-0)) - (set! s5-0 (pickup-type eco-green)) + (set! boulder-pickup (pickup-type eco-green)) ) ) - (ogreboss-shoot-boulder s5-0) + (ogreboss-shoot-boulder (the-as pickup-type boulder-pickup)) ) (ja-no-eval :group! ogreboss-attack2-loop-ja :num! (seek! max f30-0) :frame-num 0.0) (until (ja-done? 0) @@ -1639,41 +1631,41 @@ ) (defbehavior ogreboss-attack-event-handler ogreboss ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'attack) - (when (-> self vulnerable) - (if ((method-of-type touching-shapes-entry prims-touching?) - (the-as touching-shapes-entry (-> arg3 param 0)) - (the-as collide-shape-moving (-> self root-override)) - (the-as uint 128) - ) - (ja :chan 1 :group! ogreboss-hit-crotch-ja :num! min :frame-interp 0.0) - (ja :chan 1 :group! ogreboss-hit-chest-ja :num! min :frame-interp 0.0) + (the-as object (case arg2 + (('attack) + (when (-> self vulnerable) + (if ((method-of-type touching-shapes-entry prims-touching?) + (the-as touching-shapes-entry (-> arg3 param 0)) + (the-as collide-shape-moving (-> self root-override)) + (the-as uint 128) ) - (set! (-> self hit-time) (-> *display* base-frame-counter)) - (let ((v1-17 (rand-vu-int-range 0 2))) - (cond - ((zero? v1-17) - (sound-play "ogre-grunt1" :position (the-as symbol (-> self root-override trans))) - ) - ((= v1-17 1) - (sound-play "ogre-grunt2" :position (the-as symbol (-> self root-override trans))) - ) - (else - (sound-play "ogre-grunt3" :position (the-as symbol (-> self root-override trans))) - ) + (ja :chan 1 :group! ogreboss-hit-crotch-ja :num! min :frame-interp 0.0) + (ja :chan 1 :group! ogreboss-hit-chest-ja :num! min :frame-interp 0.0) + ) + (set! (-> self hit-time) (-> *display* base-frame-counter)) + (let ((v1-17 (rand-vu-int-range 0 2))) + (cond + ((zero? v1-17) + (sound-play "ogre-grunt1" :position (the-as symbol (-> self root-override trans))) ) - ) - (+! (-> self hit-count) 1) - (if (>= (-> self hit-count) (-> self max-hit-count)) - (go ogreboss-stage3-hit) + ((= v1-17 1) + (sound-play "ogre-grunt2" :position (the-as symbol (-> self root-override trans))) ) - (send-event (handle->process (-> self boulder)) 'speedup) - ) - #t - ) - ) - ) + (else + (sound-play "ogre-grunt3" :position (the-as symbol (-> self root-override trans))) + ) + ) + ) + (+! (-> self hit-count) 1) + (if (>= (-> self hit-count) (-> self max-hit-count)) + (go ogreboss-stage3-hit) + ) + (send-event (handle->process (-> self boulder)) 'speedup) + ) + #t + ) + ) + ) ) (defstate ogreboss-stage2 (ogreboss) @@ -1891,7 +1883,7 @@ (defstate ogreboss-stage3-hit (ogreboss) :code (behavior () - (set! (-> self level) (+ 1.0 (-> self level))) + (+! (-> self level) 1.0) (if (< 2.0 (-> self level)) (go ogreboss-die) ) @@ -2033,7 +2025,7 @@ ) (defmethod init-from-entity! ogreboss ((obj ogreboss) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 6) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) @@ -2143,7 +2135,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/racer_common/racer-states.gc b/goal_src/jak1/levels/racer_common/racer-states.gc index 6e5b26841c..5aebf51fb7 100644 --- a/goal_src/jak1/levels/racer_common/racer-states.gc +++ b/goal_src/jak1/levels/racer_common/racer-states.gc @@ -1303,7 +1303,7 @@ (rot->dir-targ! (-> self control)) (ja-post) (vector<-cspace! gp-1 (-> self node-list data 3)) - (set! (-> gp-1 y) (+ -5896.192 (-> gp-1 y))) + (+! (-> gp-1 y) -5896.192) (move-to-point! (-> self control) gp-1) ) (send-event *camera* 'ease-in) diff --git a/goal_src/jak1/levels/robocave/spider-egg.gc b/goal_src/jak1/levels/robocave/spider-egg.gc index 0b698c72cb..b011206521 100644 --- a/goal_src/jak1/levels/robocave/spider-egg.gc +++ b/goal_src/jak1/levels/robocave/spider-egg.gc @@ -218,8 +218,8 @@ ) (defmethod init-from-entity! spider-egg ((obj spider-egg) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask attackable)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -245,7 +245,7 @@ (if (not (move-to-ground (-> obj root-override) 12288.0 40960.0 #t (collide-kind background))) (go process-drawable-art-error "no ground") ) - (set! (-> obj root-override trans y) (+ -409.6 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -409.6) (let ((s4-1 (new 'stack-no-clear 'vector))) (set! (-> s4-1 quad) (-> obj root-override surface-normal quad)) (+! (-> s4-1 x) (rand-vu-float-range -0.2 0.2)) diff --git a/goal_src/jak1/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc index 9c91c34334..17e6d8b259 100644 --- a/goal_src/jak1/levels/rolling/rolling-obs.gc +++ b/goal_src/jak1/levels/rolling/rolling-obs.gc @@ -80,7 +80,7 @@ ) (defbehavior pusher-base-init pusher-base () - (set! (-> self mask) (logior (process-mask enemy platform) (-> self mask))) + (logior! (-> self mask) (process-mask enemy platform)) (let ((gp-0 (new 'process 'collide-shape-moving self (collide-list-enum hit-by-others)))) (set! (-> gp-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> gp-0 reaction) default-collision-reaction) @@ -1059,14 +1059,14 @@ (set! (-> gp-0 origin y) (the float (- 10 (-> self timer-pos-offset)))) (set! (-> gp-0 flags) (font-flags shadow kerning right large)) (print-game-text (lookup-text! *common-text* (text-id time) #f) gp-0 #f 128 22) - (set! (-> gp-0 origin x) (+ 10.0 (-> gp-0 origin x))) + (+! (-> gp-0 origin x) 10.0) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text (race-time->string (-> self this-time)) gp-0 #f 128 22) - (set! (-> gp-0 origin x) (+ -10.0 (-> gp-0 origin x))) - (set! (-> gp-0 origin y) (+ 15.0 (-> gp-0 origin y))) + (+! (-> gp-0 origin x) -10.0) + (+! (-> gp-0 origin y) 15.0) (set! (-> gp-0 flags) (font-flags shadow kerning right large)) (print-game-text (lookup-text! *common-text* (text-id record) #f) gp-0 #f 128 22) - (set! (-> gp-0 origin x) (+ 10.0 (-> gp-0 origin x))) + (+! (-> gp-0 origin x) 10.0) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text (race-time->string (-> self record-time)) gp-0 #f 128 22) (cond @@ -1174,17 +1174,9 @@ (send-event (ppointer->process (-> *hud-parts* money)) 'enable) ) (when (< (mod (-> *display* real-frame-counter) 90) 60) - (let ((gp-0 (new - 'stack - 'font-context - *font-default-matrix* - 156 - 80 - 0.0 - (font-color red) - (font-flags shadow kerning) - ) - ) + (let ((gp-0 + (new 'stack 'font-context *font-default-matrix* 156 80 0.0 (font-color red) (font-flags shadow kerning)) + ) ) (let ((v1-20 gp-0)) (set! (-> v1-20 width) (the float 200)) @@ -1367,7 +1359,7 @@ (process-drawable-from-entity! obj arg0) (let ((a0-3 (new 'stack-no-clear 'vector))) (set! (-> a0-3 quad) (-> obj root-override trans quad)) - (set! (-> a0-3 y) (+ -8192.0 (-> a0-3 y))) + (+! (-> a0-3 y) -8192.0) (gorge-init a0-3 (new 'static 'vector :z 1.0) 102400.0 40960.0) ) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) diff --git a/goal_src/jak1/levels/rolling/rolling-race-ring.gc b/goal_src/jak1/levels/rolling/rolling-race-ring.gc index b3b77da9d7..634acbf322 100644 --- a/goal_src/jak1/levels/rolling/rolling-race-ring.gc +++ b/goal_src/jak1/levels/rolling/rolling-race-ring.gc @@ -650,7 +650,7 @@ ) ) (set! (-> self old-hips quad) (-> (target-pos 26) quad)) - (set! (-> self old-hips x) (+ 1.0 (-> self old-hips x))) + (+! (-> self old-hips x) 1.0) (set! (-> self state-time) (-> *display* game-frame-counter)) (none) ) @@ -929,8 +929,8 @@ ) (defstate race-ring-idle (race-ring) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('activate) (logclear! (-> self mask) (process-mask actor-pause)) (go race-ring-active) @@ -996,7 +996,7 @@ (if (< (vector-dot (-> obj face-vec) (new 'static 'vector :x 1.0)) 0.0) (set! (-> obj rot-y) (- (-> obj rot-y))) ) - (set! (-> obj rot-y) (+ 16384.0 (-> obj rot-y))) + (+! (-> obj rot-y) 16384.0) ) ) ) diff --git a/goal_src/jak1/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc index 6e6b8dc52b..cb672ec6ae 100644 --- a/goal_src/jak1/levels/rolling/rolling-robber.gc +++ b/goal_src/jak1/levels/rolling/rolling-robber.gc @@ -42,7 +42,7 @@ ) ) (eval-path-curve! (-> self path) (-> self root-override trans) arg1 'interp) - (set! (-> self root-override trans y) (+ 8192.0 (-> self root-override trans y))) + (+! (-> self root-override trans y) 8192.0) (set! (-> self root-override trans y) (fmax 106496.0 (-> self root-override trans y))) (set! (-> self base quad) (-> self root-override trans quad)) (transform-post) @@ -146,7 +146,7 @@ (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root-override trans quad)) (let ((t2-0 (new 'stack-no-clear 'collide-tri-result))) - (set! (-> gp-0 y) (+ 8192.0 (-> gp-0 y))) + (+! (-> gp-0 y) 8192.0) (let ((f0-2 (fill-and-probe-using-line-sphere *collide-cache* gp-0 @@ -223,10 +223,10 @@ ) (cond ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (eval-path-curve! (-> self path) (-> self root-override trans) (-> self curve-position) 'interp) @@ -302,10 +302,10 @@ ) (cond ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (eval-path-curve! (-> self path) (-> self root-override trans) (-> self curve-position) 'interp) @@ -364,7 +364,7 @@ (logior! (-> self draw status) (draw-status hidden)) (let ((s5-1 (new 'stack-no-clear 'vector))) (eval-path-curve! (-> self path) s5-1 (the-as float (-> v1-3 user-object 0)) 'interp) - (set! (-> s5-1 y) (+ 8192.0 (-> s5-1 y))) + (+! (-> s5-1 y) 8192.0) (birth-pickup-at-point s5-1 (pickup-type fuel-cell) @@ -601,13 +601,7 @@ (if (and *target* (>= 163840.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans))) ) - (level-hint-spawn - (text-id rolling-robbers-hint) - "sksp0116" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id rolling-robbers-hint) "sksp0116" (the-as entity #f) *entity-pool* (game-task none)) ) ) (if (and *target* diff --git a/goal_src/jak1/levels/snow/ice-cube.gc b/goal_src/jak1/levels/snow/ice-cube.gc index 2f722758d3..4e22070d79 100644 --- a/goal_src/jak1/levels/snow/ice-cube.gc +++ b/goal_src/jak1/levels/snow/ice-cube.gc @@ -77,11 +77,11 @@ :neck-joint 5 :player-look-at-joint 5 :run-travel-speed (meters 20) - :run-rotate-speed (degrees 2880.0) + :run-rotate-speed (degrees 2880) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 3) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 3) @@ -371,106 +371,102 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 176] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 194] (defbehavior ice-cube-default-event-handler ice-cube ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (the-as object (case arg2 - (('attack) - (cond - ((and (= (-> arg0 type) target) - (= (-> self cprims-type) 2) - (not (send-event *target* 'query 'powerup (pickup-type eco-red))) - ) - (when (and (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) - ) - (else - (let ((a1-3 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-3 from) self) - (set! (-> a1-3 num-params) 4) - (set! (-> a1-3 message) 'attack) - (set! (-> a1-3 param 0) (-> arg3 param 0)) - (set! (-> a1-3 param 1) (the-as uint #f)) - (let ((v1-20 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-20) - (set! (-> a1-3 param 2) (the-as uint v1-20)) - ) - (set! (-> a1-3 param 3) (the-as uint 0)) - (send-event-function arg0 a1-3) - ) - ) - ) - (= (-> arg0 type) target) - ) - (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) - (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) - (level-hint-spawn - (text-id snow-ice-cube-hint) - "sksp0350" - (the-as entity #f) - *entity-pool* - (game-task none) + (the-as + object + (case arg2 + (('attack) + (cond + ((and (= (-> arg0 type) target) + (= (-> self cprims-type) 2) + (not (send-event *target* 'query 'powerup (pickup-type eco-red))) + ) + (when (and (cond + ((= (-> arg0 type) target) + (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) + ) + (else + (let ((a1-3 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-3 from) self) + (set! (-> a1-3 num-params) 4) + (set! (-> a1-3 message) 'attack) + (set! (-> a1-3 param 0) (-> arg3 param 0)) + (set! (-> a1-3 param 1) (the-as uint #f)) + (let ((v1-20 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-20) + (set! (-> a1-3 param 2) (the-as uint v1-20)) + ) + (set! (-> a1-3 param 3) (the-as uint 0)) + (send-event-function arg0 a1-3) ) ) ) - (else - (nav-enemy-set-hit-from-direction arg0) - (go ice-cube-shatter) - ) - ) - ) - (('touch) - (when (and (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) - ) - (else - (let ((a1-7 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-7 from) self) - (set! (-> a1-7 num-params) 4) - (set! (-> a1-7 message) 'attack) - (set! (-> a1-7 param 0) (-> arg3 param 0)) - (set! (-> a1-7 param 1) (the-as uint #f)) - (let ((v1-38 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-38) - (set! (-> a1-7 param 2) (the-as uint v1-38)) - ) - (set! (-> a1-7 param 3) (the-as uint 0)) - (send-event-function arg0 a1-7) - ) - ) - ) - (= (-> arg0 type) target) - ) - (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) - ;; NOTE fixed decompiler bug - (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) - ) - ) - (('touched) - (when (!= (-> arg0 type) target) - (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode #f)))) - ) - (else - (let ((a1-10 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-10 from) self) - (set! (-> a1-10 num-params) 4) - (set! (-> a1-10 message) 'attack) - (set! (-> a1-10 param 0) (-> arg3 param 0)) - (set! (-> a1-10 param 1) (the-as uint #f)) - (let ((v1-54 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-54) - (set! (-> a1-10 param 2) (the-as uint v1-54)) - ) - (set! (-> a1-10 param 3) (the-as uint 0)) - (send-event-function arg0 a1-10) - ) - ) - ) - ) - ) - ) + (= (-> arg0 type) target) + ) + (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) + (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) + (level-hint-spawn (text-id snow-ice-cube-hint) "sksp0350" (the-as entity #f) *entity-pool* (game-task none)) + ) ) + (else + (nav-enemy-set-hit-from-direction arg0) + (go ice-cube-shatter) + ) + ) + ) + (('touch) + (when (and (cond + ((= (-> arg0 type) target) + (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) + ) + (else + (let ((a1-7 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-7 from) self) + (set! (-> a1-7 num-params) 4) + (set! (-> a1-7 message) 'attack) + (set! (-> a1-7 param 0) (-> arg3 param 0)) + (set! (-> a1-7 param 1) (the-as uint #f)) + (let ((v1-38 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-38) + (set! (-> a1-7 param 2) (the-as uint v1-38)) + ) + (set! (-> a1-7 param 3) (the-as uint 0)) + (send-event-function arg0 a1-7) + ) + ) + ) + (= (-> arg0 type) target) + ) + (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) + ;; NOTE fixed decompiler bug + (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) + ) + ) + (('touched) + (when (!= (-> arg0 type) target) + (cond + ((= (-> arg0 type) target) + (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode #f)))) + ) + (else + (let ((a1-10 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-10 from) self) + (set! (-> a1-10 num-params) 4) + (set! (-> a1-10 message) 'attack) + (set! (-> a1-10 param 0) (-> arg3 param 0)) + (set! (-> a1-10 param 1) (the-as uint #f)) + (let ((v1-54 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-54) + (set! (-> a1-10 param 2) (the-as uint v1-54)) + ) + (set! (-> a1-10 param 3) (the-as uint 0)) + (send-event-function arg0 a1-10) + ) + ) + ) + ) + ) + ) + ) ) (defmethod initialize-collision ice-cube ((obj ice-cube)) @@ -713,7 +709,7 @@ (s3-1 (new 'stack-no-clear 'collide-tri-result)) ) (set! (-> a1-3 quad) (-> arg0 quad)) - (set! (-> a1-3 y) (+ 16384.0 (-> a1-3 y))) + (+! (-> a1-3 y) 16384.0) (if (>= (fill-and-probe-using-line-sphere *collide-cache* a1-3 @@ -736,7 +732,7 @@ ) (else (set-vector! arg1 (rand-vu-float-range -4096.0 4096.0) 0.0 (rand-vu-float-range -4096.0 4096.0) 1.0) - (set! (-> arg1 x) (+ 409.6 (-> arg1 x))) + (+! (-> arg1 x) 409.6) ) ) (vector-normalize! arg1 1.0) @@ -792,7 +788,7 @@ (set! (-> self ground-y) (-> self collide-info trans y)) (spawn (-> self part) (-> self collide-info trans)) (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) - (set! (-> self collide-info trans y) (+ -12288.0 (-> self collide-info trans y))) + (+! (-> self collide-info trans y) -12288.0) (set! (-> self collide-info transv quad) (-> *null-vector* quad)) (set! (-> self collide-info transv y) (rand-vu-float-range 102400.0 114688.0)) (none) @@ -1257,7 +1253,7 @@ (set! (-> self anim-blend) (fmin 1.0 (* 0.000016276043 f30-1))) (vector-normalize! (-> self collide-info transv) f30-1) ) - (set! (-> self collide-info transv y) (+ -36864.0 (-> self collide-info transv y))) + (+! (-> self collide-info transv y) -36864.0) (quaternion-rotate-y-to-vector! (-> self collide-info quat) (-> self collide-info quat) diff --git a/goal_src/jak1/levels/snow/snow-ball.gc b/goal_src/jak1/levels/snow/snow-ball.gc index e57a9986e2..4b9b7abeb8 100644 --- a/goal_src/jak1/levels/snow/snow-ball.gc +++ b/goal_src/jak1/levels/snow/snow-ball.gc @@ -163,7 +163,7 @@ (eval-path-curve! (-> obj path) (-> s5-0 path-pos) (-> obj path-u) 'interp) (let ((f0-1 (-> obj path-coming-out-u))) (when (< (-> obj path-u) f0-1) - (set! (-> s5-0 path-pos y) (+ (- -20480.0 (* -20480.0 (/ (-> obj path-u) f0-1))) (-> s5-0 path-pos y))) + (+! (-> s5-0 path-pos y) (- -20480.0 (* -20480.0 (/ (-> obj path-u) f0-1)))) (set! (-> s5-0 hug-path?) #t) ) ) @@ -214,7 +214,7 @@ (let ((a0-1 (-> self path-info))) (set! (-> a1-0 quad) (-> a0-1 path-pos quad)) ) - (set! (-> a1-0 y) (+ 9216.0 (-> a1-0 y))) + (+! (-> a1-0 y) 9216.0) (cond ((-> self path-info hug-path?) (move-to-point! (-> self root-override) a1-0) diff --git a/goal_src/jak1/levels/snow/snow-bunny.gc b/goal_src/jak1/levels/snow/snow-bunny.gc index d5859aeafd..afab3f30f0 100644 --- a/goal_src/jak1/levels/snow/snow-bunny.gc +++ b/goal_src/jak1/levels/snow/snow-bunny.gc @@ -67,11 +67,11 @@ :neck-joint 5 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 2880.0) + :run-rotate-speed (degrees 2880) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 4) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :shadow-size (meters 2) @@ -393,7 +393,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (snow-bunny-method-76 self #f) - (set! (-> self nav flags) (logior (nav-control-flags navcf19) (-> self nav flags))) + (logior! (-> self nav flags) (nav-control-flags navcf19)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate)) (set! (-> self state-timeout) (seconds 0.1)) diff --git a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc index cae836a9f0..54b6196e7f 100644 --- a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc +++ b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc @@ -468,7 +468,7 @@ ) ) (set! (-> obj appear-trans-bottom quad) (-> obj appear-trans-top quad)) - (set! (-> obj appear-trans-bottom y) (+ -286720.0 (-> obj appear-trans-bottom y))) + (+! (-> obj appear-trans-bottom y) -286720.0) (quaternion-copy! (-> obj appear-quat-top) (-> obj root-override quat)) (let ((v1-33 (res-lump-value (-> obj entity) 'extra-id uint128))) (set! (-> obj rise-time) (the int (* 300.0 (+ 0.6 (* 0.15 (the float v1-33)))))) diff --git a/goal_src/jak1/levels/snow/snow-obs.gc b/goal_src/jak1/levels/snow/snow-obs.gc index 6b84331d0e..463d994a85 100644 --- a/goal_src/jak1/levels/snow/snow-obs.gc +++ b/goal_src/jak1/levels/snow/snow-obs.gc @@ -326,7 +326,7 @@ (cond ((= (-> event param 0) 'die) (if *target* - (set! (-> *target* control trans y) (+ 1024.0 (-> *target* control trans y))) + (+! (-> *target* control trans y) 1024.0) ) (go snow-eggtop-idle-down) ) @@ -466,7 +466,7 @@ (initialize-skeleton obj *snow-eggtop-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj spawn-trans quad) (-> obj root-override trans quad)) - (set! (-> obj root-override trans y) (+ -2662.4 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -2662.4) (update-transforms! (-> obj root-override)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 510) obj)) (set! (-> obj sound) @@ -479,7 +479,7 @@ (else (let ((a0-17 (new 'stack-no-clear 'vector))) (set! (-> a0-17 quad) (-> obj root-override trans quad)) - (set! (-> a0-17 y) (+ 3072.0 (-> a0-17 y))) + (+! (-> a0-17 y) 3072.0) (birth-pickup-at-point a0-17 (pickup-type fuel-cell) @@ -557,7 +557,7 @@ (defmethod init-from-entity! snowpusher ((obj snowpusher) (arg0 entity-actor)) (local-vars (sv-16 res-tag)) - (set! (-> obj mask) (logior (process-mask enemy platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy platform)) (let ((s3-0 0) (s4-0 0) ) @@ -690,7 +690,7 @@ ) (defmethod init-from-entity! snow-spatula ((obj snow-spatula) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -954,8 +954,8 @@ (loop (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self closed-trans quad)) - (set! (-> a1-0 y) (+ -12288.0 (-> a1-0 y))) - (set! (-> a1-0 z) (+ -12288.0 (-> a1-0 z))) + (+! (-> a1-0 y) -12288.0) + (+! (-> a1-0 z) -12288.0) (spawn (-> self part) a1-0) ) (let ((s5-0 (new 'stack-no-clear 'vector))) @@ -965,8 +965,8 @@ (set! gp-0 #t) (let ((a1-2 (new 'stack-no-clear 'vector))) (set! (-> a1-2 quad) (-> self open-trans quad)) - (set! (-> a1-2 y) (+ -26624.0 (-> a1-2 y))) - (set! (-> a1-2 z) (+ -3072.0 (-> a1-2 z))) + (+! (-> a1-2 y) -26624.0) + (+! (-> a1-2 z) -3072.0) (spawn (-> self part2) a1-2) ) ) @@ -981,9 +981,9 @@ ) (let ((a1-7 (new 'stack-no-clear 'vector))) (set! (-> a1-7 quad) (-> self root-override trans quad)) - (set! (-> a1-7 x) (+ 20480.0 (-> a1-7 x))) - (set! (-> a1-7 y) (+ 106496.0 (-> a1-7 y))) - (set! (-> a1-7 z) (+ -32768.0 (-> a1-7 z))) + (+! (-> a1-7 x) 20480.0) + (+! (-> a1-7 y) 106496.0) + (+! (-> a1-7 z) -32768.0) (spawn (-> self part3) a1-7) ) (update! (-> self sound)) @@ -1056,8 +1056,8 @@ (set! (-> obj part3) (create-launch-control (-> *part-group-id-table* 514) obj)) (set! (-> obj open-trans quad) (-> obj root-override trans quad)) (set! (-> obj closed-trans quad) (-> obj open-trans quad)) - (set! (-> obj open-trans y) (+ -141312.0 (-> obj open-trans y))) - (set! (-> obj open-trans z) (+ 32768.0 (-> obj open-trans z))) + (+! (-> obj open-trans y) -141312.0) + (+! (-> obj open-trans z) 32768.0) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "lodge-door-mov" :fo-max 80) (-> obj open-trans)) ) @@ -1175,7 +1175,7 @@ (defmethod snow-gears-method-20 snow-gears ((obj snow-gears)) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> obj root trans quad)) - (set! (-> a1-0 y) (+ 61440.0 (-> a1-0 y))) + (+! (-> a1-0 y) 61440.0) (spawn (-> obj part) a1-0) ) (none) @@ -1421,7 +1421,7 @@ :code (behavior () (set! (-> self pressed?) #t) (set! (-> self root-override trans quad) (-> self orig-trans quad)) - (set! (-> self root-override trans y) (+ -1433.6 (-> self root-override trans y))) + (+! (-> self root-override trans y) -1433.6) (transform-post) (loop (logior! (-> self mask) (process-mask sleep-code)) @@ -1474,7 +1474,7 @@ (when (not s5-2) (let ((a0-17 (new 'stack-no-clear 'vector))) (set! (-> a0-17 quad) (-> obj orig-trans quad)) - (set! (-> a0-17 y) (+ 12288.0 (-> a0-17 y))) + (+! (-> a0-17 y) 12288.0) (set! (-> obj fcell-handle) (ppointer->handle (birth-pickup-at-point a0-17 (pickup-type fuel-cell) @@ -1677,8 +1677,8 @@ (initialize-skeleton obj *snow-log-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (logior! (-> obj draw status) (draw-status hidden)) - (set! (-> obj root-override trans x) (+ -1024.0 (-> obj root-override trans x))) - (set! (-> obj root-override trans y) (+ -4915.2 (-> obj root-override trans y))) + (+! (-> obj root-override trans x) -1024.0) + (+! (-> obj root-override trans y) -4915.2) (set-vector! (-> obj root-override scale) 1.5 1.0 1.5 1.0) (nav-mesh-connect obj (-> obj root-override) (the-as nav-control #f)) (set! (-> obj master) (entity-actor-lookup arg0 'alt-actor 0)) @@ -1794,7 +1794,7 @@ :event snow-log-button-event-handler :code (behavior () (set! (-> self root-override trans quad) (-> self orig-trans quad)) - (set! (-> self root-override trans y) (+ -1433.6 (-> self root-override trans y))) + (+! (-> self root-override trans y) -1433.6) (transform-post) (loop (logior! (-> self mask) (process-mask sleep-code)) diff --git a/goal_src/jak1/levels/snow/snow-ram-boss.gc b/goal_src/jak1/levels/snow/snow-ram-boss.gc index 87319167b0..795bd8085b 100644 --- a/goal_src/jak1/levels/snow/snow-ram-boss.gc +++ b/goal_src/jak1/levels/snow/snow-ram-boss.gc @@ -94,11 +94,11 @@ :neck-joint 6 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 2880.0) + :run-rotate-speed (degrees 2880) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 4) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 2) @@ -147,11 +147,11 @@ :neck-joint 6 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 2880.0) + :run-rotate-speed (degrees 2880) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 4) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 2) @@ -612,7 +612,7 @@ ) (let ((gp-0 (-> obj target))) (set! (-> gp-0 quad) (-> (target-pos 0) quad)) - (set! (-> gp-0 y) (+ 4915.2 (-> gp-0 y))) + (+! (-> gp-0 y) 4915.2) (let ((f0-2 (vector-vector-distance gp-0 (-> obj root-override trans))) (a2-0 (new 'stack-no-clear 'vector)) ) @@ -694,7 +694,7 @@ (set! (-> self launch-time) (-> *display* base-frame-counter)) (vector-float*! (-> self root-override transv) (-> self parent-override 0 proj-launch-vec) 40960.0) (set! (-> self target quad) (-> (target-pos 0) quad)) - (set! (-> self target y) (+ 4915.2 (-> self target y))) + (+! (-> self target y) 4915.2) (set! (-> self target-base quad) (-> self target quad)) (go-virtual projectile-moving) (none) @@ -1167,9 +1167,9 @@ (s4-0 (new 'stack-no-clear 'vector)) ) (set! (-> s5-0 quad) (-> obj collide-info trans quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) (set! (-> s4-0 quad) (-> (target-pos 0) quad)) - (set! (-> s4-0 y) (+ 4915.2 (-> s4-0 y))) + (+! (-> s4-0 y) 4915.2) (vector-! s4-0 s4-0 s5-0) (let* ((t2-0 (new 'stack-no-clear 'collide-tri-result)) (v0-0 (< (fill-and-probe-using-line-sphere @@ -1624,7 +1624,7 @@ ) (nav-enemy-method-54 self s5-2) (set! (-> gp-2 quad) (-> (target-pos 0) quad)) - (set! (-> gp-2 y) (+ 4915.2 (-> gp-2 y))) + (+! (-> gp-2 y) 4915.2) (vector-! (-> self proj-launch-vec) gp-2 s5-2) ) (vector-normalize! (-> self proj-launch-vec) 1.0) diff --git a/goal_src/jak1/levels/snow/yeti.gc b/goal_src/jak1/levels/snow/yeti.gc index d6bebaa68e..d599eebed5 100644 --- a/goal_src/jak1/levels/snow/yeti.gc +++ b/goal_src/jak1/levels/snow/yeti.gc @@ -73,11 +73,11 @@ :neck-joint 5 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 2880.0) + :run-rotate-speed (degrees 2880) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 3) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 3) @@ -226,7 +226,7 @@ (set! (-> self state-timeout) (seconds 1)) (set! (-> self ground-y) (-> self collide-info trans y)) (spawn (-> self part) (-> self collide-info trans)) - (set! (-> self collide-info trans y) (+ -12288.0 (-> self collide-info trans y))) + (+! (-> self collide-info trans y) -12288.0) (set! (-> self collide-info transv quad) (-> *null-vector* quad)) (set! (-> self collide-info transv y) (rand-vu-float-range 102400.0 114688.0)) (none) @@ -610,7 +610,7 @@ ) (else (set-vector! arg1 (rand-vu-float-range -4096.0 4096.0) 0.0 (rand-vu-float-range -4096.0 4096.0) 1.0) - (set! (-> arg1 x) (+ 409.6 (-> arg1 x))) + (+! (-> arg1 x) 409.6) ) ) (vector-normalize! arg1 1.0) diff --git a/goal_src/jak1/levels/sunken/bully.gc b/goal_src/jak1/levels/sunken/bully.gc index 184c2e0ccd..d3194fda02 100644 --- a/goal_src/jak1/levels/sunken/bully.gc +++ b/goal_src/jak1/levels/sunken/bully.gc @@ -768,7 +768,7 @@ (set! (-> obj bounce-volume) 100) (set! (-> obj spin-vel) 0.0) (set! (-> obj travel-speed) 0.0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/sunken/double-lurker.gc b/goal_src/jak1/levels/sunken/double-lurker.gc index 4194ae3f07..536a3bffa0 100644 --- a/goal_src/jak1/levels/sunken/double-lurker.gc +++ b/goal_src/jak1/levels/sunken/double-lurker.gc @@ -90,11 +90,11 @@ :neck-joint -1 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 2880.0) + :run-rotate-speed (degrees 2880) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 3) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 3) @@ -144,11 +144,11 @@ :neck-joint 5 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 720.0) + :run-rotate-speed (degrees 720) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 3.8) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 3) @@ -198,11 +198,11 @@ :neck-joint 5 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 720.0) + :run-rotate-speed (degrees 720) :run-acceleration (meters 1) :run-turn-time (seconds 0.1) :walk-travel-speed (meters 3.8) - :walk-rotate-speed (degrees 720.0) + :walk-rotate-speed (degrees 720) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 3) @@ -746,7 +746,7 @@ ) ) ) - (set! (-> self collide-info transv y) (+ -36864.0 (-> self collide-info transv y))) + (+! (-> self collide-info transv y) -36864.0) (integrate-for-enemy-with-move-to-ground! (-> self collide-info) (-> self collide-info transv) @@ -786,7 +786,7 @@ (s4-0 (new 'stack-no-clear 'collide-tri-result)) ) (set! (-> a1-5 quad) (-> arg0 quad)) - (set! (-> a1-5 y) (+ 8192.0 (-> a1-5 y))) + (+! (-> a1-5 y) 8192.0) (when (>= (fill-and-probe-using-line-sphere *collide-cache* a1-5 @@ -893,7 +893,7 @@ ) ) ) - (set! (-> self collide-info transv y) (+ -36864.0 (-> self collide-info transv y))) + (+! (-> self collide-info transv y) -36864.0) (integrate-for-enemy-with-move-to-ground! (-> self collide-info) (-> self collide-info transv) diff --git a/goal_src/jak1/levels/sunken/floating-launcher.gc b/goal_src/jak1/levels/sunken/floating-launcher.gc index 3837b26df9..dc90f07577 100644 --- a/goal_src/jak1/levels/sunken/floating-launcher.gc +++ b/goal_src/jak1/levels/sunken/floating-launcher.gc @@ -93,7 +93,7 @@ ) (defmethod init-from-entity! floating-launcher ((obj floating-launcher) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/sunken/helix-water.gc b/goal_src/jak1/levels/sunken/helix-water.gc index 5f3e3ac69a..3d3bdb5642 100644 --- a/goal_src/jak1/levels/sunken/helix-water.gc +++ b/goal_src/jak1/levels/sunken/helix-water.gc @@ -222,7 +222,7 @@ (when (not (task-complete? *game-info* (game-task sunken-slide))) (let ((a0-1 (new 'stack-no-clear 'vector))) (set! (-> a0-1 quad) (-> self root-override trans quad)) - (set! (-> a0-1 y) (+ 30720.0 (-> a0-1 y))) + (+! (-> a0-1 y) 30720.0) (let ((v1-7 (birth-pickup-at-point a0-1 (pickup-type fuel-cell) @@ -336,13 +336,7 @@ (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1.5)) (suspend) ) - (level-hint-spawn - (text-id sunken-helix-hint) - "sksp0124" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id sunken-helix-hint) "sksp0124" (the-as entity #f) *entity-pool* (game-task none)) (send-event *target* 'play-anim 'shock-in) (sound-play "prec-button8") (set! (-> self root-override transv quad) (the-as uint128 0)) @@ -557,7 +551,7 @@ (set! (-> s5-1 frame-num) 0.0) ) (set! (-> obj spawn-trans quad) (-> obj root-override trans quad)) - (set! (-> obj root-override trans y) (+ -26624.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -26624.0) (set! (-> obj down-y) (+ -6553.6 (-> obj root-override trans y))) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) diff --git a/goal_src/jak1/levels/sunken/orbit-plat.gc b/goal_src/jak1/levels/sunken/orbit-plat.gc index a45cbd53bc..3c819cf1ad 100644 --- a/goal_src/jak1/levels/sunken/orbit-plat.gc +++ b/goal_src/jak1/levels/sunken/orbit-plat.gc @@ -161,7 +161,7 @@ :code (behavior () (loop (set! (-> self root trans quad) (-> self parent-override 0 root-override trans quad)) - (set! (-> self root trans y) (+ -5324.8 (-> self root trans y))) + (+! (-> self root trans y) -5324.8) (spawn (-> self part2) (-> self root trans)) (let* ((a0-6 (-> self parent-override 0 other)) (v1-9 (if a0-6 @@ -207,9 +207,9 @@ ) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 y) (+ -2048.0 (-> gp-1 y))) + (+! (-> gp-1 y) -2048.0) (set! (-> s5-0 quad) (-> (the-as orbit-plat v1-32) root-override trans quad)) - (set! (-> s5-0 y) (+ -7372.8 (-> s5-0 y))) + (+! (-> s5-0 y) -7372.8) (vector-! s4-0 s5-0 gp-1) (vector-normalize! s4-0 1.0) (vector+*! s5-0 gp-1 s4-0 26624.0) @@ -249,12 +249,12 @@ (defbehavior orbit-plat-bottom-init-by-other orbit-plat-bottom ((arg0 entity-actor) (arg1 orbit-plat)) (set! (-> self entity) arg0) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg1 root-override trans quad)) (quaternion-copy! (-> self root quat) (-> arg1 root-override quat)) (set! (-> self root scale quad) (-> arg1 root-override scale quad)) - (set! (-> self root trans y) (+ -5324.8 (-> self root trans y))) + (+! (-> self root trans y) -5324.8) (set! (-> self part) (create-launch-control (-> *part-group-id-table* 440) self)) (set! (-> self part2) (create-launch-control (-> *part-group-id-table* 107) self)) (initialize-skeleton self *orbit-plat-bottom-sg* '()) @@ -775,7 +775,7 @@ (defmethod init-from-entity! orbit-plat ((obj orbit-plat) (arg0 entity-actor)) (set! (-> obj plat-status) (the-as uint 0)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/sunken/puffer.gc b/goal_src/jak1/levels/sunken/puffer.gc index 284f67df55..fda058b99f 100644 --- a/goal_src/jak1/levels/sunken/puffer.gc +++ b/goal_src/jak1/levels/sunken/puffer.gc @@ -1094,7 +1094,7 @@ (initialize-skeleton obj *puffer-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (setup-lods! (-> obj nice-look) *puffer-sg* (-> obj draw art-group) (-> obj entity)) (setup-lods! (-> obj mean-look) *puffer-mean-sg* (-> obj draw art-group) (-> obj entity)) (load-params! (-> obj sync) obj (the-as uint 2400) 0.0 0.15 0.15) diff --git a/goal_src/jak1/levels/sunken/qbert-plat.gc b/goal_src/jak1/levels/sunken/qbert-plat.gc index e345c5d642..f5ba60bd5b 100644 --- a/goal_src/jak1/levels/sunken/qbert-plat.gc +++ b/goal_src/jak1/levels/sunken/qbert-plat.gc @@ -144,7 +144,7 @@ (defbehavior qbert-plat-on-init-by-other qbert-plat ((arg0 entity-actor) (arg1 qbert-plat)) (set! (-> self entity) arg0) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self root-overlay) (the-as collide-shape-moving (new 'process 'trsqv))) (set! (-> self root-overlay trans quad) (-> arg1 root-overlay trans quad)) (quaternion-copy! (-> self root-overlay quat) (-> arg1 root-overlay quat)) @@ -362,7 +362,7 @@ ) (defmethod init-from-entity! qbert-plat ((obj qbert-plat) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/goal_src/jak1/levels/sunken/square-platform.gc b/goal_src/jak1/levels/sunken/square-platform.gc index 96f8cb0de5..14a43b52ff 100644 --- a/goal_src/jak1/levels/sunken/square-platform.gc +++ b/goal_src/jak1/levels/sunken/square-platform.gc @@ -180,7 +180,7 @@ (local-vars (v0-3 sound-id) (sv-48 int)) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 quad) (-> obj root-override trans quad)) - (set! (-> s4-0 y) (+ -20480.0 (-> s4-0 y))) + (+! (-> s4-0 y) -20480.0) (let* ((v1-1 (-> obj water-entity)) (a0-4 (if v1-1 (-> v1-1 extra process) diff --git a/goal_src/jak1/levels/sunken/steam-cap.gc b/goal_src/jak1/levels/sunken/steam-cap.gc index 69f6a38bc9..a52b17ff7d 100644 --- a/goal_src/jak1/levels/sunken/steam-cap.gc +++ b/goal_src/jak1/levels/sunken/steam-cap.gc @@ -494,7 +494,7 @@ (spawn (-> obj part2) (-> obj down)) (let ((a1-8 (new 'stack-no-clear 'vector))) (set! (-> a1-8 quad) (-> obj root-override trans quad)) - (set! (-> a1-8 y) (+ -3072.0 (-> a1-8 y))) + (+! (-> a1-8 y) -3072.0) (spawn (-> obj part3) a1-8) ) ) @@ -672,7 +672,7 @@ (defmethod init-from-entity! steam-cap ((obj steam-cap) (arg0 entity-actor)) (local-vars (sv-16 res-tag)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -738,7 +738,7 @@ ) (set! (-> obj down quad) (-> obj root-override trans quad)) (set! (-> obj up quad) (-> obj root-override trans quad)) - (set! (-> obj up y) (+ 40960.0 (-> obj up y))) + (+! (-> obj up y) 40960.0) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 441) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 442) obj)) (set! (-> obj part3) (create-launch-control (-> *part-group-id-table* 443) obj)) diff --git a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc index 6f641d64cd..0151dee2dd 100644 --- a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc +++ b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc @@ -301,7 +301,7 @@ (set! (-> self root trans quad) (-> arg1 root trans quad)) (quaternion-copy! (-> self root quat) (-> arg1 root quat)) (set! (-> self root scale quad) (-> arg1 root scale quad)) - (set! (-> self root trans y) (+ 14069.76 (-> self root trans y))) + (+! (-> self root trans y) 14069.76) (set! (-> self rest-pos quad) (-> self root trans quad)) (initialize-skeleton self *blue-eco-charger-orb-sg* '()) (ja-channel-set! 1) @@ -597,7 +597,7 @@ (vector-! s5-0 (-> obj last-pos) (-> obj root-override trans)) (set! (-> obj draw bounds quad) (-> s5-0 quad)) ) - (set! (-> obj draw bounds y) (+ 16384.0 (-> obj draw bounds y))) + (+! (-> obj draw bounds y) 16384.0) (set! (-> obj draw bounds w) 67584.0) (let ((s5-1 (new 'stack-no-clear 'exit-chamber-items))) (exit-chamber-method-21 obj s5-1) @@ -607,7 +607,7 @@ (when (and *target* (-> obj move-player?)) (let ((a1-6 (new 'stack-no-clear 'vector))) (set! (-> a1-6 quad) (-> s5-1 button-pos quad)) - (set! (-> a1-6 y) (+ 2662.4 (-> a1-6 y))) + (+! (-> a1-6 y) 2662.4) (move-to-point! (-> *target* control) a1-6) ) (vector-reset! (-> *target* control transv)) @@ -842,7 +842,7 @@ ) (let ((a0-36 (new 'stack-no-clear 'vector))) (set! (-> a0-36 quad) (-> self last-pos quad)) - (set! (-> a0-36 y) (+ 51814.4 (-> a0-36 y))) + (+! (-> a0-36 y) 51814.4) (when (>= (-> a0-36 y) (ocean-get-height a0-36)) (if (not gp-2) (set! gp-2 #t) @@ -914,7 +914,7 @@ ) ) :enter (behavior ((arg0 symbol)) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self state-time) (-> *display* base-frame-counter)) (none) ) @@ -1024,7 +1024,7 @@ (when (+ (-> *display* base-frame-counter) (seconds -0.1)) (let ((a0-9 (new 'stack-no-clear 'vector))) (set! (-> a0-9 quad) (-> self last-pos quad)) - (set! (-> a0-9 y) (+ 64102.4 (-> a0-9 y))) + (+! (-> a0-9 y) 64102.4) (when (< (-> a0-9 y) (+ 12288.0 (ocean-get-height a0-9))) (if (not s5-0) (set! s5-0 #t) diff --git a/goal_src/jak1/levels/sunken/sunken-pipegame.gc b/goal_src/jak1/levels/sunken/sunken-pipegame.gc index e0ba5a91f0..515a81afde 100644 --- a/goal_src/jak1/levels/sunken/sunken-pipegame.gc +++ b/goal_src/jak1/levels/sunken/sunken-pipegame.gc @@ -762,7 +762,7 @@ (a0-109 (new 'stack-no-clear 'vector)) ) (set! (-> a0-109 quad) (-> v1-184 jar-pos quad)) - (set! (-> a0-109 y) (+ 40960.0 (-> a0-109 y))) + (+! (-> a0-109 y) 40960.0) (send-event (handle->process (-> v1-184 actor-handle)) 'trans a0-109) ) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -951,9 +951,9 @@ (set! (-> s0-0 sucked-up-jar-part-pos quad) (-> s0-0 jar-pos quad)) (set! (-> s0-0 sucked-up-far-part-pos quad) (-> s0-0 far-pos quad)) (set! (-> s0-0 blown-out-jar-part-pos quad) (-> s0-0 jar-pos quad)) - (set! (-> s0-0 blown-out-jar-part-pos y) (+ 24576.0 (-> s0-0 blown-out-jar-part-pos y))) + (+! (-> s0-0 blown-out-jar-part-pos y) 24576.0) (set! (-> s0-0 blown-out-far-part-pos quad) (-> s0-0 far-pos quad)) - (set! (-> s0-0 blown-out-far-part-pos y) (+ 28672.0 (-> s0-0 blown-out-far-part-pos y))) + (+! (-> s0-0 blown-out-far-part-pos y) 28672.0) (let ((v1-30 s2-0)) (cond ((zero? v1-30) @@ -963,8 +963,8 @@ (set-vector! s4-0 -30720.0 1146.88 5120.0 1.0) (set! (-> s0-0 sucked-up-part) (create-launch-control (-> *part-group-id-table* 448) obj)) (set! (-> s0-0 blown-out-part) (create-launch-control (-> *part-group-id-table* 451) obj)) - (set! (-> s0-0 jar-pos y) (+ 11673.6 (-> s0-0 jar-pos y))) - (set! (-> s0-0 far-pos y) (+ 11673.6 (-> s0-0 far-pos y))) + (+! (-> s0-0 jar-pos y) 11673.6) + (+! (-> s0-0 far-pos y) 11673.6) (when (not s1-1) (set! (-> s0-0 actor-handle) (ppointer->handle @@ -985,9 +985,9 @@ (set-vector! s4-0 0.0 1146.88 5120.0 1.0) (set! (-> s0-0 sucked-up-part) (create-launch-control (-> *part-group-id-table* 449) obj)) (set! (-> s0-0 blown-out-part) (create-launch-control (-> *part-group-id-table* 452) obj)) - (set! (-> s0-0 jar-pos y) (+ 7168.0 (-> s0-0 jar-pos y))) - (set! (-> s0-0 far-pos y) (+ 7168.0 (-> s0-0 far-pos y))) - (set! (-> s0-0 blown-out-far-part-pos y) (+ 4096.0 (-> s0-0 blown-out-far-part-pos y))) + (+! (-> s0-0 jar-pos y) 7168.0) + (+! (-> s0-0 far-pos y) 7168.0) + (+! (-> s0-0 blown-out-far-part-pos y) 4096.0) (when (not s1-1) (set! (-> s0-0 actor-handle) (ppointer->handle @@ -1009,9 +1009,9 @@ (set-vector! s4-0 30720.0 1146.88 5120.0 1.0) (set! (-> s0-0 sucked-up-part) (create-launch-control (-> *part-group-id-table* 450) obj)) (set! (-> s0-0 blown-out-part) (create-launch-control (-> *part-group-id-table* 453) obj)) - (set! (-> s0-0 jar-pos y) (+ 7168.0 (-> s0-0 jar-pos y))) - (set! (-> s0-0 far-pos y) (+ 7168.0 (-> s0-0 far-pos y))) - (set! (-> s0-0 blown-out-far-part-pos y) (+ 4096.0 (-> s0-0 blown-out-far-part-pos y))) + (+! (-> s0-0 jar-pos y) 7168.0) + (+! (-> s0-0 far-pos y) 7168.0) + (+! (-> s0-0 blown-out-far-part-pos y) 4096.0) (when (not s1-1) (set! (-> s0-0 actor-handle) (ppointer->handle diff --git a/goal_src/jak1/levels/sunken/sunken-water.gc b/goal_src/jak1/levels/sunken/sunken-water.gc index 79685fcf6a..7116aef42d 100644 --- a/goal_src/jak1/levels/sunken/sunken-water.gc +++ b/goal_src/jak1/levels/sunken/sunken-water.gc @@ -122,7 +122,7 @@ ) (set! (-> self draw color-mult w) 0.5) (if (= f30-0 1.0) - (set! (-> self flags) (logior (water-flags wt19) (-> self flags))) + (logior! (-> self flags) (water-flags wt19)) ) ) ) @@ -207,7 +207,7 @@ (when (and s5-0 (or (= f0-16 0.0) (= f0-16 1.0))) (set! s5-0 #f) (if (= f0-16 0.0) - (set! (-> obj flags) (logior (water-flags wt19) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt19)) (logclear! (-> obj flags) (water-flags wt19)) ) ) diff --git a/goal_src/jak1/levels/sunken/wall-plat.gc b/goal_src/jak1/levels/sunken/wall-plat.gc index d7077813f7..b634b5d4d8 100644 --- a/goal_src/jak1/levels/sunken/wall-plat.gc +++ b/goal_src/jak1/levels/sunken/wall-plat.gc @@ -39,8 +39,8 @@ ) (defstate wall-plat-retracted (wall-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (go wall-plat-extending) ) @@ -60,14 +60,14 @@ ) (defstate wall-plat-extending (wall-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 1.5)) - #f - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('touch) + (send-event proc 'no-look-around (seconds 1.5)) + #f + ) + ) + ) ) :enter (behavior () (sound-play "wall-plat") @@ -94,8 +94,8 @@ ) (defstate wall-plat-extended (wall-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('untrigger) (go wall-plat-retracting) ) @@ -114,14 +114,14 @@ ) (defstate wall-plat-retracting (wall-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 1.5)) - #f - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('touch) + (send-event proc 'no-look-around (seconds 1.5)) + #f + ) + ) + ) ) :enter (behavior () (sound-play "wall-plat") @@ -147,14 +147,14 @@ ) (defstate wall-plat-sync-idle (wall-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 1.5)) - #f - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('touch) + (send-event proc 'no-look-around (seconds 1.5)) + #f + ) + ) + ) ) :enter (behavior () (logclear! (-> self mask) (process-mask actor-pause)) @@ -201,7 +201,7 @@ (defmethod init-from-entity! wall-plat ((obj wall-plat) (arg0 entity-actor)) (set! (-> obj extended-amount) 0.0) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -258,7 +258,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/wedge-plats.gc b/goal_src/jak1/levels/sunken/wedge-plats.gc index 7df82f02e0..3e820dc468 100644 --- a/goal_src/jak1/levels/sunken/wedge-plats.gc +++ b/goal_src/jak1/levels/sunken/wedge-plats.gc @@ -50,9 +50,9 @@ ) (defmethod init-from-entity! wedge-plat-master ((obj wedge-plat-master) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (set! (-> obj center quad) (-> arg0 extra trans quad)) - (set! (-> obj center y) (+ 819.2 (-> obj center y))) + (+! (-> obj center y) 819.2) (set! (-> obj rotspeed) (res-lump-float arg0 'rotspeed)) (set! (-> obj rotate-inner) 0.0) (set! (-> obj rotate-outer) 0.0) @@ -197,7 +197,7 @@ ) (defmethod init-from-entity! wedge-plat ((obj wedge-plat) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -360,7 +360,7 @@ ) (defmethod init-from-entity! wedge-plat-outer ((obj wedge-plat-outer) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/sunken/whirlpool.gc b/goal_src/jak1/levels/sunken/whirlpool.gc index 5b5a191fe5..1e5cdbef98 100644 --- a/goal_src/jak1/levels/sunken/whirlpool.gc +++ b/goal_src/jak1/levels/sunken/whirlpool.gc @@ -327,7 +327,7 @@ (when (>= (fabs f30-0) 45511.11) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self root-override trans quad)) - (set! (-> a1-0 y) (+ -8192.0 (-> a1-0 y))) + (+! (-> a1-0 y) -8192.0) (spawn (-> self part) a1-0) ) ) diff --git a/goal_src/jak1/levels/swamp/billy.gc b/goal_src/jak1/levels/swamp/billy.gc index c56356e3d3..5b7dec170b 100644 --- a/goal_src/jak1/levels/swamp/billy.gc +++ b/goal_src/jak1/levels/swamp/billy.gc @@ -312,8 +312,8 @@ (let ((s5-1 (new 'stack-no-clear 'vector))) (dotimes (s4-0 (+ (the int (the float (+ (-> obj path-snacks curve num-cverts) -1))) 1)) (eval-path-curve-div! (-> obj path-snacks) s5-1 (the float s4-0) 'exact) - (set! (-> s5-1 x) (+ -40960.0 (-> s5-1 x))) - (set! (-> s5-1 z) (+ 20480.0 (-> s5-1 z))) + (+! (-> s5-1 x) -40960.0) + (+! (-> s5-1 z) 20480.0) (manipy-spawn s5-1 (-> obj entity) *farthy-snack-sg* #f :to obj) ) ) diff --git a/goal_src/jak1/levels/swamp/kermit.gc b/goal_src/jak1/levels/swamp/kermit.gc index e64daeb33a..2e93dff31f 100644 --- a/goal_src/jak1/levels/swamp/kermit.gc +++ b/goal_src/jak1/levels/swamp/kermit.gc @@ -577,7 +577,7 @@ (defbehavior kermit-pulse-init-by-other kermit-pulse ((arg0 vector) (arg1 entity-actor)) (logclear! (-> self mask) (process-mask enemy attackable)) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (set! (-> self entity) arg1) (let ((s5-0 (new 'process 'collide-shape-moving self (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) @@ -1330,11 +1330,11 @@ nav-enemy-default-event-handler :neck-joint 8 :player-look-at-joint 5 :run-travel-speed (meters 6) - :run-rotate-speed (degrees 10000.0) + :run-rotate-speed (degrees 10000) :run-acceleration (meters 1) :run-turn-time (seconds 0.05) :walk-travel-speed (meters 3) - :walk-rotate-speed (degrees 10000.0) + :walk-rotate-speed (degrees 10000) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.05) :attack-shove-back (meters 3) @@ -1370,7 +1370,7 @@ nav-enemy-default-event-handler ) (defmethod init-from-entity! kermit ((obj kermit) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/swamp/swamp-bat.gc b/goal_src/jak1/levels/swamp/swamp-bat.gc index dff03b04b0..3bd50b4a68 100644 --- a/goal_src/jak1/levels/swamp/swamp-bat.gc +++ b/goal_src/jak1/levels/swamp/swamp-bat.gc @@ -109,13 +109,7 @@ (go swamp-bat-slave-die (process->handle arg0)) ) (('touch) - (level-hint-spawn - (text-id swamp-bat-duck-hint) - "sksp0156" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id swamp-bat-duck-hint) "sksp0156" (the-as entity #f) *entity-pool* (game-task none)) (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) ) (('launch) @@ -386,7 +380,7 @@ swamp-bat-slave-event-handler (vector-! gp-0 (-> self root-override trans) (-> (the-as swamp-bat v1-1) root-override trans)) ) ) - (set! (-> gp-0 y) (+ -6144.0 (-> gp-0 y))) + (+! (-> gp-0 y) -6144.0) (vector-normalize! gp-0 98304.0) (ja :group! swamp-bat-die-ja) (until (ja-done? 0) @@ -402,7 +396,7 @@ swamp-bat-slave-event-handler ) (defbehavior swamp-bat-slave-init-by-other swamp-bat-slave ((arg0 swamp-bat-slave) (arg1 int)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving self (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -602,7 +596,7 @@ swamp-bat-slave-event-handler ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj vol) (new 'process 'vol-control obj)) (logior! (-> obj vol flags) 3) (set! (-> obj path-list 0) (new 'process 'curve-control obj 'path -1000000000.0)) diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index e9320111ce..990555476e 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -482,7 +482,7 @@ (defmethod init-from-entity! balance-plat ((obj balance-plat) (arg0 entity-actor)) ;; PAL patch here. usually-hit-by-player -> hit-by-others - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -655,7 +655,7 @@ ) (defmethod init-from-entity! swamp-rock ((obj swamp-rock) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (let ((f30-0 (res-lump-float arg0 'scale-factor :default 1.0))) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) @@ -682,7 +682,7 @@ ) (defbehavior swamp-rock-init-by-other swamp-rock ((arg0 vector)) - (set! (-> self mask) (logior (process-mask attackable) (-> self mask))) + (logior! (-> self mask) (process-mask attackable)) (let ((s5-0 (new 'process 'collide-shape-moving self (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc index defc77ffbe..e1567b3f1a 100644 --- a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc @@ -789,11 +789,11 @@ (defbehavior swamp-rat-nest-dummy-init-by-other swamp-rat-nest-dummy ((arg0 swamp-rat-nest-dummy)) (let ((gp-0 (-> arg0 entity))) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (swamp-rat-nest-dummy-method-20 self) (process-drawable-from-entity! self gp-0) (set! (-> self top-sphere quad) (-> self root-override trans quad)) - (set! (-> self top-sphere y) (+ 24576.0 (-> self top-sphere y))) + (+! (-> self top-sphere y) 24576.0) (set! (-> self top-sphere w) 18432.0) (set! (-> self entity) gp-0) ) @@ -1033,7 +1033,7 @@ swamp-rat-nest-default-event-handler ) (defmethod init-from-entity! swamp-rat-nest ((obj swamp-rat-nest) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (set! (-> obj fact-override) diff --git a/goal_src/jak1/levels/swamp/swamp-rat.gc b/goal_src/jak1/levels/swamp/swamp-rat.gc index ac6fc2df85..c463ee891a 100644 --- a/goal_src/jak1/levels/swamp/swamp-rat.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat.gc @@ -175,7 +175,7 @@ swamp-rat-default-event-handler (defbehavior swamp-rat-update-wiggle-target swamp-rat ((arg0 vector)) (+! (-> self wiggle-angle) (* DISPLAY_FPS_RATIO (-> self delta-wiggle-angle))) ;; changed for high fps (if (< 65536.0 (-> self wiggle-angle)) - (set! (-> self wiggle-angle) (+ -65536.0 (-> self wiggle-angle))) + (+! (-> self wiggle-angle) -65536.0) ) (let* ((v1-3 (-> self collide-info trans)) (a1-1 (vector-! (new 'stack-no-clear 'vector) v1-3 arg0)) diff --git a/goal_src/jak1/levels/training/training-obs.gc b/goal_src/jak1/levels/training/training-obs.gc index b302450220..1832f2219d 100644 --- a/goal_src/jak1/levels/training/training-obs.gc +++ b/goal_src/jak1/levels/training/training-obs.gc @@ -239,7 +239,7 @@ (defmethod init-from-entity! tra-pontoon ((obj tra-pontoon) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/goal_src/jak1/levels/village1/fishermans-boat.gc b/goal_src/jak1/levels/village1/fishermans-boat.gc index 2224506b6b..e125c81cb3 100644 --- a/goal_src/jak1/levels/village1/fishermans-boat.gc +++ b/goal_src/jak1/levels/village1/fishermans-boat.gc @@ -1401,7 +1401,7 @@ (defmethod init-from-entity! fishermans-boat ((obj fishermans-boat) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/goal_src/jak1/levels/village1/village-obs.gc b/goal_src/jak1/levels/village1/village-obs.gc index b6efe939a0..88ac245cae 100644 --- a/goal_src/jak1/levels/village1/village-obs.gc +++ b/goal_src/jak1/levels/village1/village-obs.gc @@ -317,7 +317,7 @@ ) (defmethod init-from-entity! windmill-sail ((obj windmill-sail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (load-params! (-> obj sync) obj (the-as uint 4800) 0.0 0.15 0.15) (set! (-> obj root-override) (new 'process 'trsq)) (process-drawable-from-entity! obj arg0) @@ -375,7 +375,7 @@ ) (defmethod init-from-entity! sagesail ((obj sagesail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (load-params! (-> obj sync) obj (the-as uint 3000) 0.0 0.15 0.15) (set! (-> obj root-override) (new 'process 'trsq)) (process-drawable-from-entity! obj arg0) @@ -465,7 +465,7 @@ ) (defmethod init-from-entity! windspinner ((obj windspinner) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj angle) 0.0) (set! (-> obj angle-vel) 145.63556) (set! (-> obj root) (the-as trsqv (new 'process 'trsq))) @@ -512,7 +512,7 @@ ) (defmethod init-from-entity! mayorgears ((obj mayorgears) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *mayorgears-sg* '()) @@ -701,7 +701,7 @@ (defstate starfish-patrol (starfish) :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (set! (-> self nav flags) (logior (nav-control-flags navcf19) (-> self nav flags))) + (logior! (-> self nav flags) (nav-control-flags navcf19)) (none) ) :trans (behavior () @@ -744,11 +744,11 @@ :neck-joint -1 :player-look-at-joint 5 :run-travel-speed (meters 1) - :run-rotate-speed (degrees 70.0) + :run-rotate-speed (degrees 70) :run-acceleration (meters 1) :run-turn-time (seconds 0.5) :walk-travel-speed (meters 1) - :walk-rotate-speed (degrees 70.0) + :walk-rotate-speed (degrees 70) :walk-acceleration (meters 1) :walk-turn-time (seconds 0.5) :attack-shove-back (meters 3) @@ -783,7 +783,7 @@ ) (defmethod initialize-collision starfish ((obj starfish)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/village2/swamp-blimp.gc b/goal_src/jak1/levels/village2/swamp-blimp.gc index 2a1de85221..0822d72560 100644 --- a/goal_src/jak1/levels/village2/swamp-blimp.gc +++ b/goal_src/jak1/levels/village2/swamp-blimp.gc @@ -882,7 +882,7 @@ ) (defmethod init-from-entity! swamp-tetherrock ((obj swamp-tetherrock) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (process-entity-status! obj (entity-perm-status bit-7) #t) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) @@ -1233,7 +1233,7 @@ ) :post (behavior () (set! (-> self other-pos quad) (-> self root trans quad)) - (set! (-> self other-pos y) (+ -245760.0 (-> self other-pos y))) + (+! (-> self other-pos y) -245760.0) (swamp-rope-post) (none) ) @@ -1442,13 +1442,13 @@ ) (quaternion*! (-> self rot-at-init) (-> self rot-at-init) gp-0) (if (< (-> self pos-oscillator target x) 409600.0) - (set! (-> self pos-oscillator target x) (+ 40.96 (-> self pos-oscillator target x))) + (+! (-> self pos-oscillator target x) 40.96) ) (if (< (-> self pos-oscillator target y) 4096000.0) - (set! (-> self pos-oscillator target y) (+ 819.2 (-> self pos-oscillator target y))) + (+! (-> self pos-oscillator target y) 819.2) ) (if (< (-> self pos-oscillator target z) 4096000.0) - (set! (-> self pos-oscillator target z) (+ 1228.8 (-> self pos-oscillator target z))) + (+! (-> self pos-oscillator target z) 1228.8) ) (suspend) ) diff --git a/goal_src/jak1/levels/village2/village2-obs.gc b/goal_src/jak1/levels/village2/village2-obs.gc index b9aabf1589..d635f26931 100644 --- a/goal_src/jak1/levels/village2/village2-obs.gc +++ b/goal_src/jak1/levels/village2/village2-obs.gc @@ -176,7 +176,7 @@ ) (defmethod init-from-entity! pontoon ((obj pontoon) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) @@ -922,7 +922,7 @@ (when (and (not (task-complete? *game-info* (game-task sunken-room))) (not (-> self child))) (let ((a0-3 (new 'stack-no-clear 'vector))) (set! (-> a0-3 quad) (-> self root trans quad)) - (set! (-> a0-3 y) (+ 67584.0 (-> a0-3 y))) + (+! (-> a0-3 y) 67584.0) (let ((v1-12 (birth-pickup-at-point a0-3 (pickup-type fuel-cell) 47.0 #f self (the-as fact-info #f)))) (set! (-> self fcell-handle) (ppointer->handle v1-12)) (send-event (ppointer->process v1-12) 'collide-shape #f) @@ -952,7 +952,7 @@ (when a0-7 (let ((v1-14 (new 'stack-no-clear 'vector))) (set! (-> v1-14 quad) (-> self root trans quad)) - (set! (-> v1-14 y) (+ 67584.0 (-> v1-14 y))) + (+! (-> v1-14 y) 67584.0) (send-event a0-7 'trans v1-14) ) ) @@ -976,7 +976,7 @@ (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj root trans y) (+ 24576.0 (-> obj root trans y))) + (+! (-> obj root trans y) 24576.0) (set! (-> obj orig-trans quad) (-> obj root trans quad)) (initialize-skeleton obj *exit-chamber-dummy-sg* '()) (ja-channel-set! 1) @@ -1202,7 +1202,7 @@ (when (>= (ja-aframe-num 0) 82.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1227,7 +1227,7 @@ (when (>= (ja-aframe-num 0) 120.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1252,7 +1252,7 @@ (when (>= (ja-aframe-num 0) 82.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker @@ -1277,7 +1277,7 @@ (when (>= (ja-aframe-num 0) 131.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1302,7 +1302,7 @@ (when (>= (ja-aframe-num 0) 80.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker @@ -1327,7 +1327,7 @@ (when (>= (ja-aframe-num 0) 152.4) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1352,7 +1352,7 @@ (when (>= (ja-aframe-num 0) 116.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker @@ -1377,7 +1377,7 @@ (when (>= (ja-aframe-num 0) 74.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker diff --git a/goal_src/jak1/levels/village3/village3-obs.gc b/goal_src/jak1/levels/village3/village3-obs.gc index 74be8f2882..e4644e720b 100644 --- a/goal_src/jak1/levels/village3/village3-obs.gc +++ b/goal_src/jak1/levels/village3/village3-obs.gc @@ -70,7 +70,7 @@ (set! (-> v1-2 waveform) ripple-for-villagec-lava) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt25) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt25)) (set! (-> obj attack-event) 'lava) (none) ) @@ -171,22 +171,10 @@ ((not (or s4-1 (task-closed? (game-task village3-button) (task-status need-hint)))) ) ((and (< (the int (-> *game-info* fuel)) (+ s3-0 2)) (< (the int (-> *game-info* fuel)) 71) (not s4-1)) - (level-hint-spawn - (text-id gondola-need-cells) - "asstvb75" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id gondola-need-cells) "asstvb75" (the-as entity #f) *entity-pool* (game-task none)) ) (else - (level-hint-spawn - (text-id gondola-enough-cells) - "asstvb76" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (text-id gondola-enough-cells) "asstvb76" (the-as entity #f) *entity-pool* (game-task none)) (let ((s4-3 (new 'stack-no-clear 'event-message-block))) (set! (-> s4-3 from) self) (set! (-> s4-3 num-params) 0) diff --git a/goal_src/jak1/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc index 9115b17e6a..022dc54bcf 100644 --- a/goal_src/jak1/levels/village_common/villagep-obs.gc +++ b/goal_src/jak1/levels/village_common/villagep-obs.gc @@ -110,7 +110,7 @@ (and (>= (-> self level-slot) 0) (not (movie?)) (not (level-hint-displayed?)) - (not (logtest? (-> *target* control root-prim prim-core action) + (not (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam swingpole-active racer snowball tube flut) ) ) @@ -318,7 +318,7 @@ ) (set! (-> s1-3 flags) (font-flags shadow kerning middle left large)) (print-game-text (lookup-text! *common-text* (text-id warp-gate-use-dpad) #f) s1-3 #f 128 22) - (set! (-> s1-3 origin y) (+ 35.0 (-> s1-3 origin y))) + (+! (-> s1-3 origin y) 35.0) (let ((v1-43 s1-3)) (set! (-> v1-43 height) (the float 40)) ) @@ -385,9 +385,9 @@ ) ) (print-level-name gp-0 s1-3 s2-0 (the-as int s4-0)) - (set! (-> s1-3 origin y) (+ 20.0 (-> s1-3 origin y))) + (+! (-> s1-3 origin y) 20.0) (print-game-text (lookup-text! *common-text* (text-id press-to-warp) #f) s1-3 #f 128 22) - (set! (-> s1-3 origin y) (+ 15.0 (-> s1-3 origin y))) + (+! (-> s1-3 origin y) 15.0) (print-game-text (lookup-text! *common-text* (text-id press-to-exit) #f) s1-3 #f 128 22) ) (suspend) diff --git a/goal_src/jak2/engine/ai/enemy.gc b/goal_src/jak2/engine/ai/enemy.gc index ee87b3133d..a5b71be58f 100644 --- a/goal_src/jak2/engine/ai/enemy.gc +++ b/goal_src/jak2/engine/ai/enemy.gc @@ -210,7 +210,7 @@ (water-info-init! s4-0 s5-0 (collide-action solid semi-solid)) (let ((s3-0 (-> s5-0 flags))) (when (logtest? (water-flags touch-water) s3-0) - (set! (-> obj enemy-flags) (logior (enemy-flag directed-ready) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag directed-ready)) (set! (-> obj water-surface-height) (-> s5-0 trans y)) (when (not (focus-test? obj touch-water under-water)) (let ((s2-0 (new 'stack-no-clear 'vector))) @@ -1036,7 +1036,7 @@ ) (set! (-> obj enemy-flags) (the-as enemy-flag (logior (enemy-flag dislike-combo) (-> obj enemy-flags)))) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logior! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag notice)) (set-enemy-info! obj arg0) @@ -1151,7 +1151,7 @@ ) (set! (-> obj enemy-flags) v1-80) ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (if (and (-> obj enemy-info move-to-ground) (not (logtest? (enemy-flag vulnerable-backup) (-> obj enemy-flags))) (not (logtest? (enemy-option ambush) (-> obj fact enemy-options))) @@ -1172,7 +1172,7 @@ ) ) (if (-> arg1 scale y) - (set! (-> self enemy-flags) (logior (enemy-flag alert) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag alert)) ) (if (-> arg1 scale z) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag vulnerable-backup) (-> self enemy-flags)))) @@ -1757,7 +1757,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (kill-prefer-falling obj) @@ -1775,7 +1775,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (when (zero? (-> obj hit-points)) @@ -1799,7 +1799,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (if (zero? (-> obj hit-points)) @@ -1814,7 +1814,7 @@ This commonly includes things such as: ) (let ((v1-162 (logtest? (enemy-flag alert) (-> obj enemy-flags)))) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (cond (v1-162 @@ -1899,7 +1899,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (kill-prefer-falling obj) ) ) @@ -2130,7 +2130,7 @@ This commonly includes things such as: ) (defbehavior enemy-falling-post enemy () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (cond ((focus-test? self under-water) @@ -2168,7 +2168,7 @@ This commonly includes things such as: ) (defbehavior enemy-die-falling-post enemy () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (if (focus-test? self under-water) (enemy-method-47 self (-> gp-0 transv)) @@ -2257,7 +2257,7 @@ This commonly includes things such as: (logior! (-> self draw status) (draw-control-status no-draw)) (set! (-> self draw origin quad) (-> self root trans quad)) (if (logtest? (enemy-flag alert) (-> self enemy-flags)) - (set! (-> self enemy-flags) (logior (enemy-flag victory) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag victory)) ) (logior! (-> self focus-status) (focus-status disable)) (none) @@ -2667,7 +2667,7 @@ This commonly includes things such as: (defmethod enemy-method-91 enemy ((obj enemy) (arg0 int) (arg1 enemy-jump-info)) (case arg0 ((2 3) - (set! (-> obj enemy-flags) (logior (enemy-flag directed) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag directed)) (let ((f30-0 (the float (-> arg1 hang-time)))) (let ((a1-3 (compute-trans-at-time (-> arg1 traj) f30-0 (new 'stack-no-clear 'vector)))) (move-to-point! (-> obj root) a1-3) @@ -2979,7 +2979,7 @@ This commonly includes things such as: ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) @@ -3000,7 +3000,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch collide-spec vs none. (defmethod enemy-method-101 enemy ((obj enemy)) (when (not (logtest? (enemy-flag use-trigger) (-> obj enemy-flags))) - (set! (-> obj enemy-flags) (logior (enemy-flag use-trigger) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag use-trigger)) (logclear! (-> obj enemy-flags) (enemy-flag directed)) (enemy-method-124 obj) ) @@ -3323,7 +3323,7 @@ This commonly includes things such as: :enter (behavior () (set! (-> self state-time) (current-time)) (stop-looking-at-target! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logclear! (-> self mask) (process-mask actor-pause)) (let* ((v1-8 *game-info*) (a0-4 (+ (-> v1-8 attack-id) 1)) @@ -3333,7 +3333,7 @@ This commonly includes things such as: ) (enemy-method-103 self) (if (logtest? (enemy-option knocked-into-water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup)) ) (let ((v1-16 (-> self root))) (logclear! (-> v1-16 status) (collide-status @@ -3406,7 +3406,7 @@ This commonly includes things such as: ) (set! (-> self enemy-flags) v1-15) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-22 (-> self enemy-flags))) @@ -3525,7 +3525,7 @@ This commonly includes things such as: (logtest? (-> *game-info* secrets) (game-secrets hero-mode)) ) ) - (set! (-> obj enemy-flags) (logior (enemy-flag cam-attack-mode) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag cam-attack-mode)) (remove-from-process *part-engine* obj) (setup-masks (-> obj draw) @@ -3623,7 +3623,7 @@ This commonly includes things such as: 0 (set! (-> self hit-points) 0) (if (logtest? (enemy-option knocked-into-water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup)) ) (enemy-method-103 self) (none) @@ -3672,7 +3672,7 @@ This commonly includes things such as: :virtual #t :event enemy-event-handler :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag victory) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag victory)) ((-> (method-of-type enemy idle) enter)) (none) ) diff --git a/goal_src/jak2/engine/camera/cam-states.gc b/goal_src/jak2/engine/camera/cam-states.gc index f217814e00..9b041c187c 100644 --- a/goal_src/jak2/engine/camera/cam-states.gc +++ b/goal_src/jak2/engine/camera/cam-states.gc @@ -2583,7 +2583,7 @@ (let ((v1-283 (handle->process (-> *camera* settings butt-handle)))) (cond (v1-283 - (set! (-> self options) (logior (cam-slave-options-u32 HAVE_BUTT_HANDLE) (-> self options))) + (logior! (-> self options) (cam-slave-options-u32 HAVE_BUTT_HANDLE)) (let* ((s3-1 (quaternion->matrix (new 'stack-no-clear 'matrix) (-> (the-as process-drawable v1-283) root quat))) (a2-18 (matrix-axis-angle! (new 'stack-no-clear 'matrix) diff --git a/goal_src/jak2/engine/collide/collide-debug.gc b/goal_src/jak2/engine/collide/collide-debug.gc index 19a995013b..07f3af7560 100644 --- a/goal_src/jak2/engine/collide/collide-debug.gc +++ b/goal_src/jak2/engine/collide/collide-debug.gc @@ -246,7 +246,7 @@ ) (else (if (logtest? s5-1 8192) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :nolineofsight #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :nolineofsight #x1)) ) (if (logtest? s5-1 1024) (set! (-> a1-17 show-pat-set noentity) 1) @@ -270,16 +270,16 @@ (set! (-> a1-17 show-pat-set nopilot) 1) ) (if (logtest? s5-1 512) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :noendlessfall #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :noendlessfall #x1)) ) (if (logtest? s5-1 #x4000) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :nomech #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :nomech #x1)) ) (if (logtest? #x10000 s5-1) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :noproj #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :noproj #x1)) ) (if (logtest? #x40000 s5-1) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :probe #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :probe #x1)) ) (if (logtest? #x20000 s5-1) (logior! (-> a1-17 event-mask) 64) diff --git a/goal_src/jak2/engine/common_objs/collectables.gc b/goal_src/jak2/engine/common_objs/collectables.gc index 0986f43b74..bd887b57b6 100644 --- a/goal_src/jak2/engine/common_objs/collectables.gc +++ b/goal_src/jak2/engine/common_objs/collectables.gc @@ -127,7 +127,7 @@ (defmethod initialize-options collectable ((obj collectable) (arg0 int) (arg1 float) (arg2 fact-info)) (logclear! (-> obj mask) (process-mask crate enemy platform ambient)) - (set! (-> obj mask) (logior (process-mask bit18) (-> obj mask))) + (logior! (-> obj mask) (process-mask bit18)) (set! (-> obj flags) (collectable-flag pickup no-eco-blue)) (set! (-> obj bob-amount) arg1) (set! (-> obj bob-offset) @@ -2718,7 +2718,7 @@ This commonly includes things such as: (let ((s3-1 (new 'stack-no-clear 'collide-query))) (set! (-> s3-1 start-pos quad) (-> (the-as process-drawable (-> obj process)) root trans quad)) (set-vector! (-> s3-1 move-dist) 0.0 -81920.0 0.0 1.0) - (set! (-> s3-1 start-pos y) (+ 12288.0 (-> s3-1 start-pos y))) + (+! (-> s3-1 start-pos y) 12288.0) (let ((v1-75 s3-1)) (set! (-> v1-75 radius) 40.96) (set! (-> v1-75 collide-with) (collide-spec backgnd)) @@ -2732,7 +2732,7 @@ This commonly includes things such as: (set! (-> s3-1 start-pos quad) (-> (the-as process-drawable (-> obj process)) root trans quad)) ) (if (= s2-0 (pickup-type fuel-cell)) - (set! (-> s3-1 start-pos y) (+ 6144.0 (-> s3-1 start-pos y))) + (+! (-> s3-1 start-pos y) 6144.0) ) (birth-pickup-at-point (-> s3-1 start-pos) s2-0 f30-0 arg0 arg1 obj) ) diff --git a/goal_src/jak2/engine/common_objs/crates.gc b/goal_src/jak2/engine/common_objs/crates.gc index 88be35723d..6ea104d3ca 100644 --- a/goal_src/jak2/engine/common_objs/crates.gc +++ b/goal_src/jak2/engine/common_objs/crates.gc @@ -713,11 +713,10 @@ ) (set! (-> self root status) (collide-status)) (set! (-> self root root-prim local-sphere w) (-> self carry carry-radius)) - (set! (-> self root root-prim prim-core collide-with) - (logior (collide-spec backgnd crate obstacle hit-by-others-list pusher) - (-> self root root-prim prim-core collide-with) - ) - ) + (logior! + (-> self root root-prim prim-core collide-with) + (collide-spec backgnd crate obstacle hit-by-others-list pusher) + ) (none) ) :trans (behavior () @@ -1186,7 +1185,7 @@ This commonly includes things such as: (defmethod crate-init! crate ((obj crate) (arg0 entity-actor)) "Initialize the [[crate]] with the specified [[entity-actor]]." (stack-size-set! (-> obj main-thread) 128) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) cshape-reaction-default) diff --git a/goal_src/jak2/engine/common_objs/elevator.gc b/goal_src/jak2/engine/common_objs/elevator.gc index c4fa258e7b..33a59c2913 100644 --- a/goal_src/jak2/engine/common_objs/elevator.gc +++ b/goal_src/jak2/engine/common_objs/elevator.gc @@ -141,7 +141,7 @@ (s5-0 (new 'stack-no-clear 'collide-query)) ) (set! (-> s5-0 start-pos quad) (-> s4-0 prim-core world-sphere quad)) - (set! (-> s5-0 start-pos y) (+ 8192.0 (-> s5-0 start-pos y))) + (+! (-> s5-0 start-pos y) 8192.0) (set! (-> s5-0 start-pos w) 1.0) (vector-reset! (-> s5-0 move-dist)) (set! (-> s5-0 move-dist y) -90112.0) diff --git a/goal_src/jak2/engine/common_objs/generic-obs.gc b/goal_src/jak2/engine/common_objs/generic-obs.gc index e40532c4f8..9d30bae7e8 100644 --- a/goal_src/jak2/engine/common_objs/generic-obs.gc +++ b/goal_src/jak2/engine/common_objs/generic-obs.gc @@ -1856,7 +1856,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 string)) (stack-size-set! (-> obj main-thread) 128) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj clock) (-> *display* part-clock)) (set! (-> obj root) (new 'process 'trsqv)) (set! (-> obj root trans quad) (-> arg0 extra trans quad)) diff --git a/goal_src/jak2/engine/common_objs/plat.gc b/goal_src/jak2/engine/common_objs/plat.gc index eb8a096fa7..79bbd7aa00 100644 --- a/goal_src/jak2/engine/common_objs/plat.gc +++ b/goal_src/jak2/engine/common_objs/plat.gc @@ -159,7 +159,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (init-plat-collision! obj) (process-drawable-from-entity! obj entity) (initialize-skeleton obj (the-as skeleton-group (get-art-group obj)) (the-as pair 0)) diff --git a/goal_src/jak2/engine/common_objs/powerups.gc b/goal_src/jak2/engine/common_objs/powerups.gc index a3e87567a1..9f4f0e3c14 100644 --- a/goal_src/jak2/engine/common_objs/powerups.gc +++ b/goal_src/jak2/engine/common_objs/powerups.gc @@ -833,12 +833,11 @@ 0 (none) ) + (defbehavior target-powerup-process target () (let ((f30-0 (-> self control collision-spheres 0 prim-core world-sphere w))) (if (focus-test? self board) - (set! (-> self control collision-spheres 0 prim-core world-sphere w) - (+ 4096.0 (-> self control collision-spheres 0 prim-core world-sphere w)) - ) + (+! (-> self control collision-spheres 0 prim-core world-sphere w) 4096.0) ) (water-control-method-10 (-> self water)) (set! (-> self control collision-spheres 0 prim-core world-sphere w) f30-0) @@ -1078,7 +1077,7 @@ ) (logior! (-> self focus-status) (focus-status in-air)) (if (logtest? (surface-flag super) (-> self control current-surface flags)) - (set! (-> self focus-status) (logior (focus-status super) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status super)) ) ) (else @@ -1086,7 +1085,7 @@ ) ) (if (using-gun? self) - (set! (-> self focus-status) (logior (focus-status gun) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status gun)) (logclear! (-> self focus-status) (focus-status gun)) ) (if (or (logtest? (water-flags touch-water) (-> self water flags)) @@ -1106,11 +1105,11 @@ (logclear! (-> self focus-status) (focus-status under-water)) ) (if (= (-> self control ground-pat material) (pat-material ice)) - (set! (-> self focus-status) (logior (focus-status ice) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status ice)) (logclear! (-> self focus-status) (focus-status ice)) ) (if (< (- (current-time) (-> self gun fire-time)) (seconds 0.1)) - (set! (-> self focus-status) (logior (focus-status shooting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status shooting)) (logclear! (-> self focus-status) (focus-status shooting)) ) 0 diff --git a/goal_src/jak2/engine/common_objs/projectile.gc b/goal_src/jak2/engine/common_objs/projectile.gc index a5476dff96..c02016a540 100644 --- a/goal_src/jak2/engine/common_objs/projectile.gc +++ b/goal_src/jak2/engine/common_objs/projectile.gc @@ -63,11 +63,11 @@ ) (when (logtest? (-> obj options) (projectile-options account-for-target-velocity)) (set! (-> v1-1 attacker-velocity quad) (-> obj pre-move-transv quad)) - (set! (-> v1-1 mask) (logior (attack-info-mask attacker-velocity) (-> v1-1 mask))) + (logior! (-> v1-1 mask) (attack-info-mask attacker-velocity)) ) (when (logtest? (-> obj options) (projectile-options deal-damage)) (set! (-> v1-1 damage) (-> obj damage)) - (set! (-> v1-1 mask) (logior (attack-info-mask damage) (-> v1-1 mask))) + (logior! (-> v1-1 mask) (attack-info-mask damage)) ) (when (logtest? (projectile-options respect-invinc-time) (-> obj options)) (set! (-> v1-1 invinc-time) (-> obj invinc-time)) @@ -480,7 +480,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p (set! (-> self root dynam gravity-length) 1228800.0) (set! (-> self root dynam gravity-max) 1228800.0) ) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (logclear! (-> self mask) (process-mask enemy)) (set! (-> s5-0 trans quad) (-> arg0 pos quad)) (set! (-> self starting-pos quad) (-> arg0 pos quad)) diff --git a/goal_src/jak2/engine/common_objs/rigid-body-plat.gc b/goal_src/jak2/engine/common_objs/rigid-body-plat.gc index 78e6cb5386..35b976f9ce 100644 --- a/goal_src/jak2/engine/common_objs/rigid-body-plat.gc +++ b/goal_src/jak2/engine/common_objs/rigid-body-plat.gc @@ -459,7 +459,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (allocate-and-init-cshape obj) (process-drawable-from-entity! obj arg0) (init-skel-and-rigid-body obj) diff --git a/goal_src/jak2/engine/common_objs/voicebox.gc b/goal_src/jak2/engine/common_objs/voicebox.gc index df01af14c6..b8189449d9 100644 --- a/goal_src/jak2/engine/common_objs/voicebox.gc +++ b/goal_src/jak2/engine/common_objs/voicebox.gc @@ -555,7 +555,7 @@ This commonly includes things such as: (setup-collision obj) (init obj) (process-drawable-from-entity! obj arg0) - (set! (-> obj root trans y) (+ 4096.0 (-> obj root trans y))) + (+! (-> obj root trans y) 4096.0) (set! (-> obj base-trans quad) (-> obj root trans quad)) (set! (-> obj total-time) (seconds 90)) (go (method-of-object obj wait)) diff --git a/goal_src/jak2/engine/common_objs/water-anim.gc b/goal_src/jak2/engine/common_objs/water-anim.gc index 71092ff787..6e1f4d1e42 100644 --- a/goal_src/jak2/engine/common_objs/water-anim.gc +++ b/goal_src/jak2/engine/common_objs/water-anim.gc @@ -589,7 +589,7 @@ ) ) ) - (set! (-> obj flags) (logior (water-flags part-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags part-water)) (if (logtest? (-> obj flags) (water-flags flow)) (set! (-> obj flow) (new 'process 'flow-control obj (the-as res-lump #f))) ) diff --git a/goal_src/jak2/engine/common_objs/water.gc b/goal_src/jak2/engine/common_objs/water.gc index 5974c86512..74d660afed 100644 --- a/goal_src/jak2/engine/common_objs/water.gc +++ b/goal_src/jak2/engine/common_objs/water.gc @@ -707,7 +707,7 @@ ((and (logtest? (-> obj flags) (water-flags no-grab-ground)) (logtest? (-> obj process focus-status) (focus-status grabbed)) ) - (set! (-> obj flags) (logior (water-flags jump-out) (-> obj flags))) + (logior! (-> obj flags) (water-flags jump-out)) (logclear! (-> obj flags) (water-flags break-surface)) ) ((begin @@ -766,7 +766,7 @@ ) (enter-water obj) ) - (set! (-> obj flags) (logior (water-flags touch-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags touch-water)) (cond ((>= (-> obj top 0 y) (-> obj height)) (let ((s3-0 (new 'stack-no-clear 'vector))) @@ -774,7 +774,7 @@ (let ((v1-79 (-> obj process control transv))) (sqrtf (+ (* (-> v1-79 x) (-> v1-79 x)) (* (-> v1-79 z) (-> v1-79 z)))) ) - (set! (-> obj flags) (logior (water-flags break-surface) (-> obj flags))) + (logior! (-> obj flags) (water-flags break-surface)) (set! (-> s3-0 y) (+ 40.96 (-> obj surface-height))) (when (and (not (handle->process (-> obj ripple))) (>= (+ (current-time) (seconds -1.5)) (-> obj enter-water-time))) (let* ((s1-0 (get-process *default-dead-pool* manipy #x4000)) @@ -888,7 +888,7 @@ ) ) (else - (set! (-> obj flags) (logior (water-flags head-under-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags head-under-water)) ) ) (when (and (logtest? (water-flags part-splash) (-> obj flags)) (logtest? (water-flags part-water) (-> obj flags))) @@ -981,7 +981,7 @@ ) (set! (-> obj swim-time) (current-time)) (send-event (-> obj process) 'swim) - (set! (-> obj flags) (logior (water-flags swimming) (-> obj flags))) + (logior! (-> obj flags) (water-flags swimming)) (if (not (logtest? (water-flags swimming) s4-0)) (set! (-> obj enter-swim-time) (current-time)) ) @@ -1025,7 +1025,7 @@ ) (set! (-> obj wade-time) (current-time)) (send-event (-> obj process) 'wade) - (set! (-> obj flags) (logior (water-flags wading) (-> obj flags))) + (logior! (-> obj flags) (water-flags wading)) ) ((and (< (-> obj bottom 0 y) f30-1) (not (logtest? (water-flags jump-out) (-> obj flags)))) (logior! (-> obj flags) (water-flags under-water)) @@ -1036,7 +1036,7 @@ (< (-> obj bottom 1 y) f30-1) (and (< f30-1 (-> obj bottom 0 y)) (logtest? s4-0 (water-flags under-water))) ) - (set! (-> obj flags) (logior (water-flags swimming) (-> obj flags))) + (logior! (-> obj flags) (water-flags swimming)) (let ((a1-47 (new 'stack-no-clear 'vector))) (set! (-> a1-47 quad) (-> obj bottom 0 quad)) (let ((s4-1 (the-as collide-shape-moving (-> obj process control)))) @@ -1175,7 +1175,7 @@ ) (set! (-> obj drip-joint-index) s5-1) (set! (-> obj drip-old-pos quad) (-> v0-38 quad)) - (set! (-> obj flags) (logior (water-flags spawn-drip) (-> obj flags))) + (logior! (-> obj flags) (water-flags spawn-drip)) ) ) ) @@ -1280,7 +1280,7 @@ (defmethod enter-water water-control ((obj water-control)) (with-pp - (set! (-> obj flags) (logior (water-flags touch-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags touch-water)) (logclear! (-> obj flags) (water-flags jump-out)) (set! (-> obj enter-water-time) (current-time)) (set-vector! (-> obj enter-water-pos) (-> obj bottom 0 x) (-> obj surface-height) (-> obj bottom 0 z) 1.0) @@ -1520,7 +1520,7 @@ (logior! (-> arg0 flags) (water-flags can-wade can-ground)) ) ((= v1-39 'event) - (set! (-> arg0 flags) (logior (water-flags event) (-> arg0 flags))) + (logior! (-> arg0 flags) (water-flags event)) ) ((= v1-39 'tar) (logior! (-> arg0 flags) (water-flags tar)) @@ -1559,11 +1559,11 @@ (set! (-> (scratchpad-object region-prim-area) pos quad) (-> s2-2 prim-core world-sphere quad)) (if (and (within-area? arg1 (scratchpad-object region-prim-area)) (begin - (set! (-> arg0 flags) (logior (water-flags over-water) (-> arg0 flags))) + (logior! (-> arg0 flags) (water-flags over-water)) (>= (-> arg0 trans y) (- (-> s2-2 prim-core world-sphere y) (-> s2-2 prim-core world-sphere w))) ) ) - (set! (-> arg0 flags) (logior (water-flags touch-water) (-> arg0 flags))) + (logior! (-> arg0 flags) (water-flags touch-water)) ) ) (&+! s2-2 80) diff --git a/goal_src/jak2/engine/debug/default-menu.gc b/goal_src/jak2/engine/debug/default-menu.gc index 8f29cf30e5..e45dccb9bf 100644 --- a/goal_src/jak2/engine/debug/default-menu.gc +++ b/goal_src/jak2/engine/debug/default-menu.gc @@ -493,7 +493,7 @@ (let ((v1-0 *col-rend*)) (when (= arg1 (debug-menu-msg press)) (logxor! (-> v1-0 show-only) arg0) - (set! (-> v1-0 show-only) (logand -57 (-> v1-0 show-only))) + (logand! (-> v1-0 show-only) -57) ) (logtest? (-> v1-0 show-only) arg0) ) @@ -3927,16 +3927,14 @@ "get all" #f ,(lambda ((arg0 object) (arg1 debug-menu-msg)) - (set! (-> *game-info* features) - (logior (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) - (-> *game-info* features) - ) - ) - (set! (-> *game-info* debug-features) - (logior (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) - (-> *game-info* debug-features) - ) - ) + (logior! + (-> *game-info* features) + (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) + ) + (logior! + (-> *game-info* debug-features) + (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) + ) (send-event *target* 'get-pickup 7 #x42c80000) ) ) diff --git a/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc b/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc index 249a85ea97..6e0350edc0 100644 --- a/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc +++ b/goal_src/jak2/engine/debug/nav/mysql-nav-graph.gc @@ -248,7 +248,6 @@ (set! (-> gp-0 visnode-array length) 0) (let ((s4-0 (clear *temp-string*))) (format *temp-string* "select nav_graph_id from nav_graph where name='~S'" arg0) - (format 0 "HERE B~%") (let ((a2-6 (sql-query s4-0))) (when (!= (-> a2-6 error) 'select) (format 0 "ERROR: sql: select error ~A for ~A~%" a2-6 gp-0) @@ -335,11 +334,10 @@ if none exist, return `-1`" (else (let ((v1-3 (indexof-visnode obj edge-id node-id))) (when (>= v1-3 0) - (set! (-> (the-as mysql-nav-visnode (+ (the-as uint (-> obj visnode-array)) (* v1-3 32))) nav_visnode_id) - (logand -3 - (-> (the-as mysql-nav-visnode (+ (the-as uint (-> obj visnode-array)) (* v1-3 32))) nav_visnode_id) - ) - ) + (logand! + (-> (the-as mysql-nav-visnode (+ (the-as uint (-> obj visnode-array)) (* v1-3 32))) nav_visnode_id) + -3 + ) (return v1-3) ) ) @@ -758,7 +756,6 @@ returns `-1` if none is found" (set! (-> obj visnode-array length) 0) (let ((s3-0 (clear *temp-string*))) (format s3-0 "select nav_graph_id from nav_graph where name='~S'" arg0) - (format 0 "HERE A~%") (let ((a2-2 (sql-query s3-0))) (when (!= (-> a2-2 error) 'select) (format 0 "ERROR: sql: select error ~A for ~A~%" a2-2 obj) diff --git a/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc b/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc index 7ba500f4bd..bfe6557907 100644 --- a/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc +++ b/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc @@ -1485,8 +1485,8 @@ (go-virtual move-plane) ) (when (and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> self selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -5 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -5 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -5) + (logand! (-> *mouse* button0-rel 0) -5) (set! (-> self plane-height) (-> self nav-graph node-array data (-> self selected-index) position y)) ) (nav-graph-editor-method-41 self) @@ -1558,13 +1558,11 @@ ) (cond ((and (logtest? (-> *mouse* button0-rel 0) 1) - (begin - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (let ((v1-20 (logand -2 (-> *mouse* button0-rel 0)))) - (set! (-> *mouse* button0-rel 0) v1-20) - (and v1-20 (!= (-> obj selected-index) (-> obj edge-src))) - ) - ) + (begin (logand! (-> *mouse* button0-abs 0) -2) (let ((v1-20 (logand -2 (-> *mouse* button0-rel 0)))) + (set! (-> *mouse* button0-rel 0) v1-20) + (and v1-20 (!= (-> obj selected-index) (-> obj edge-src))) + ) + ) ) (cond ((>= (-> obj selected-index) 0) @@ -1587,8 +1585,8 @@ (if (= (-> obj edge-dst) -2) (nav-graph-editor-method-58 obj) ) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go (method-of-object obj create)) ) ) @@ -1632,8 +1630,8 @@ (nav-graph-editor-method-32 obj (-> obj selected-node-edge?) (-> obj selected-index)) (cond ((logtest? (-> *mouse* button0-rel 0) 1) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (go (method-of-object obj create-edge)) ) ((and (logtest? (-> *mouse* button0-rel 0) 2) @@ -1686,18 +1684,18 @@ (nav-graph-editor-method-32 self (-> self selected-node-edge?) (-> self selected-index)) (cond ((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> self selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (nav-graph-editor-method-53 self (-> self edge-visibility) (-> self selected-index)) ) ((and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> self selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -5 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -5 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -5) + (logand! (-> *mouse* button0-rel 0) -5) (nav-graph-editor-method-57 self (-> self edge-visibility) (-> self selected-index)) ) ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go-virtual adjust-minimap) ) ) @@ -1897,13 +1895,13 @@ ) (cond ((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> obj selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (go (method-of-object obj adjust-edge-visibility)) ) ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go (method-of-object obj draw-closest-minimap)) ) (else @@ -1975,8 +1973,8 @@ ) (cond ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go-virtual adjust-minimap) ) (else @@ -1996,18 +1994,18 @@ (nav-graph-editor-method-32 obj (-> obj selected-node-edge?) (-> obj selected-index)) (cond ((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> obj selected-index) 0) (-> obj selected-node-edge?)) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (go (method-of-object obj move-node)) ) ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go (method-of-object obj create-edge)) ) ((and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> obj selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -5 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -5 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -5) + (logand! (-> *mouse* button0-rel 0) -5) (if (-> obj selected-node-edge?) (nav-graph-editor-method-55 obj (-> obj selected-index)) (nav-graph-editor-method-56 obj (-> obj selected-index)) diff --git a/goal_src/jak2/engine/game/fact-h.gc b/goal_src/jak2/engine/game/fact-h.gc index 409e9a45bb..d8db487d3a 100644 --- a/goal_src/jak2/engine/game/fact-h.gc +++ b/goal_src/jak2/engine/game/fact-h.gc @@ -495,7 +495,7 @@ (set! sv-16 (new 'static 'res-tag)) (let ((v1-11 (res-lump-data s5-0 'trigger pointer :tag-ptr (& sv-16)))) (when v1-11 - (set! (-> gp-0 enemy-options) (logior (enemy-option has-trigger) (-> gp-0 enemy-options))) + (logior! (-> gp-0 enemy-options) (enemy-option has-trigger)) (let ((a0-13 0)) (dotimes (a1-11 (the-as int (-> sv-16 elt-count))) (let ((a2-12 (-> (the-as (pointer uint32) (&+ v1-11 (* a1-11 4)))))) diff --git a/goal_src/jak2/engine/game/game-info.gc b/goal_src/jak2/engine/game/game-info.gc index 60954cd88a..626f8f5012 100644 --- a/goal_src/jak2/engine/game/game-info.gc +++ b/goal_src/jak2/engine/game/game-info.gc @@ -628,7 +628,7 @@ (set! (-> obj task-deaths) 0) (set! (-> obj task-pickup-time) (-> *display* game-clock frame-counter)) (set! (-> obj unknown-array1 task) (-> *display* game-clock frame-counter)) - (set! (-> obj fuel) (+ 1.0 (-> obj fuel))) + (+! (-> obj fuel) 1.0) (logior! (-> obj task-perm-list data task status) (entity-perm-status complete)) (task-resolution-close! (the-as game-task task)) ) diff --git a/goal_src/jak2/engine/game/main.gc b/goal_src/jak2/engine/game/main.gc index 158c9d47c4..0f922ec17c 100644 --- a/goal_src/jak2/engine/game/main.gc +++ b/goal_src/jak2/engine/game/main.gc @@ -90,24 +90,10 @@ "Draw blackout over the whole screen. This isn't used - instead they adjust some GS setting to fade the whole screen to black, which is much faster than drawing over the entire screen." - (let* ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf)) - (gp-0 (-> s5-0 base)) - ) + (with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf)) + (bucket-id debug-no-zbuf2) + ) (draw-sprite2d-xy-absolute s5-0 0 0 512 416 (new 'static 'rgba :a #x80)) - (let ((a3-1 (-> s5-0 base))) - (let ((v1-6 (the-as object (-> s5-0 base)))) - (set! (-> (the-as dma-packet v1-6) dma) (new 'static 'dma-tag :id (dma-tag-id next))) - (set! (-> (the-as dma-packet v1-6) vif0) (new 'static 'vif-tag)) - (set! (-> (the-as dma-packet v1-6) vif1) (new 'static 'vif-tag)) - (set! (-> s5-0 base) (&+ (the-as pointer v1-6) 16)) - ) - (dma-bucket-insert-tag - (-> *display* frames (-> *display* on-screen) bucket-group) - (bucket-id debug-no-zbuf2) - gp-0 - (the-as (pointer dma-tag) a3-1) - ) - ) ) (none) ) @@ -1093,23 +1079,22 @@ (send-event *target* 'get-pickup 7 #x447a0000) (send-event *target* 'get-pickup 22 #x447a0000) (send-event *target* 'get-pickup 21 #x447a0000) - (set! (-> *game-info* features) - (logior (game-feature - gun - gun-yellow - gun-red - gun-blue - gun-dark - board - darkjak - darkjak-bomb0 - darkjak-bomb1 - darkjak-invinc - darkjak-giant - ) - (-> *game-info* features) - ) - ) + (logior! + (-> *game-info* features) + (game-feature + gun + gun-yellow + gun-red + gun-blue + gun-dark + board + darkjak + darkjak-bomb0 + darkjak-bomb1 + darkjak-invinc + darkjak-giant + ) + ) (logior! (-> *game-info* debug-features) (game-feature gun gun-yellow gun-red gun-blue gun-dark board darkjak) @@ -1221,24 +1206,23 @@ (else (when (process-spawn-function process - (lambda ((arg0 time-frame)) (with-pp - (set-blackout-frames (seconds 100)) - (set! (-> *setting-control* user-default allow-pause) #f) - (set! (-> *setting-control* user-default allow-progress) #f) - (apply-settings *setting-control*) - (set! (-> *setting-control* user-default sfx-volume) 0.0) - (set! (-> *setting-control* user-default music-volume) 0.0) - (set! (-> *setting-control* user-default dialog-volume) 0.0) - (set! (-> *setting-control* user-default ambient-volume) 0.0) - (let ((s5-0 (current-time))) - (until (>= (- (current-time) s5-0) (seconds 0.1)) - (suspend) - ) - ) - (kernel-shutdown) - (none) - ) - ) + (lambda ((arg0 time-frame)) + (set-blackout-frames (seconds 100)) + (set! (-> *setting-control* user-default allow-pause) #f) + (set! (-> *setting-control* user-default allow-progress) #f) + (apply-settings *setting-control*) + (set! (-> *setting-control* user-default sfx-volume) 0.0) + (set! (-> *setting-control* user-default music-volume) 0.0) + (set! (-> *setting-control* user-default dialog-volume) 0.0) + (set! (-> *setting-control* user-default ambient-volume) 0.0) + (let ((s5-0 (current-time))) + (until (>= (- (current-time) s5-0) (seconds 0.1)) + (suspend) + ) + ) + (kernel-shutdown) + (none) + ) (if (= *master-exit* 'movie) 2 1 @@ -1712,12 +1696,9 @@ (set! *teleport* #t) (update *setting-control*) (init-time-of-day-context *time-of-day-context*) - (format 0 "about to display-sync~%") (display-sync gp-1) - (format 0 "about to swap-display~%") (swap-display gp-1) - (format 0 "about to install-handler~%") - (install-handler 3 vblank-handler) ;; TODO: this never gets called. + (install-handler 3 vblank-handler) (free-nodes *touching-list*) (prepare *collide-rider-pool*) (update-actor-hash) @@ -1767,7 +1748,6 @@ ) ) ) - (format 0 "SKIP: level activation in on~%") (cond ((or (level-get-with-status *level* 'loaded) (level-get-with-status *level* 'alive) diff --git a/goal_src/jak2/engine/game/settings.gc b/goal_src/jak2/engine/game/settings.gc index ba9f44a470..41dbe0f489 100644 --- a/goal_src/jak2/engine/game/settings.gc +++ b/goal_src/jak2/engine/game/settings.gc @@ -666,15 +666,13 @@ ) ) (('rapid-tracking) - (set! (-> obj slave-options) (logior (cam-slave-options RAPID_TRACKING) (-> obj slave-options))) + (logior! (-> obj slave-options) (cam-slave-options RAPID_TRACKING)) ) (('bike-mode) (logior! (-> obj slave-options) (cam-slave-options BIKE_MODE)) ) (('vertical-follow-matches-camera) - (set! (-> obj slave-options) - (logior (cam-slave-options VERTICAL_FOLLOW_MATCHES_CAMERA) (-> obj slave-options)) - ) + (logior! (-> obj slave-options) (cam-slave-options VERTICAL_FOLLOW_MATCHES_CAMERA)) ) (('matrix-blend-max-angle) (set! (-> obj matrix-blend-max-angle) arg2) @@ -1031,7 +1029,7 @@ ) (if (-> s5-0 double-jump) (logclear! (-> *target* state-flags) (state-flags prevent-double-jump)) - (set! (-> *target* state-flags) (logior (state-flags prevent-double-jump) (-> *target* state-flags))) + (logior! (-> *target* state-flags) (state-flags prevent-double-jump)) ) (if (-> s5-0 attack) (logclear! (-> *target* state-flags) (state-flags prevent-attack)) @@ -1039,11 +1037,11 @@ ) (if (-> s5-0 board) (logclear! (-> *target* state-flags) (state-flags prevent-board)) - (set! (-> *target* state-flags) (logior (state-flags prevent-board) (-> *target* state-flags))) + (logior! (-> *target* state-flags) (state-flags prevent-board)) ) (if (-> s5-0 gun) (logclear! (-> *target* state-flags) (state-flags prevent-gun)) - (set! (-> *target* state-flags) (logior (state-flags prevent-gun) (-> *target* state-flags))) + (logior! (-> *target* state-flags) (state-flags prevent-gun)) ) ) ) diff --git a/goal_src/jak2/engine/game/task/task-arrow.gc b/goal_src/jak2/engine/game/task/task-arrow.gc index bce6a073c6..b9fdd2016f 100644 --- a/goal_src/jak2/engine/game/task/task-arrow.gc +++ b/goal_src/jak2/engine/game/task/task-arrow.gc @@ -85,7 +85,7 @@ or collectable items on the ground (jetboard / weapon upgrades / etc)" (let ((s5-0 (new 'stack-no-clear 'collide-query-with-vec))) (set! (-> s5-0 vec quad) (-> arg0 quad)) (set! (-> s5-0 cquery start-pos quad) (-> s5-0 vec quad)) - (set! (-> s5-0 cquery start-pos y) (+ 20480.0 (-> s5-0 cquery start-pos y))) + (+! (-> s5-0 cquery start-pos y) 20480.0) (set-vector! (-> s5-0 cquery move-dist) 0.0 -81920.0 0.0 1.0) (let ((v1-4 (-> s5-0 cquery))) (set! (-> v1-4 radius) 1024.0) diff --git a/goal_src/jak2/engine/game/task/task-control.gc b/goal_src/jak2/engine/game/task/task-control.gc index 0ef00e749c..0c267dd5c5 100644 --- a/goal_src/jak2/engine/game/task/task-control.gc +++ b/goal_src/jak2/engine/game/task/task-control.gc @@ -993,7 +993,7 @@ (logior! (-> *game-info* features) (game-feature board)) ) (((game-task-node-command add-board-training)) - (set! (-> *game-info* features) (logior (game-feature board-training) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature board-training)) ) (((game-task-node-command sub-board)) (logclear! (-> *game-info* features) (game-feature board)) @@ -1017,34 +1017,34 @@ (logior! (-> *game-info* features) (game-feature gun gun-upgrade-ammo)) ) (((game-task-node-command add-gun-up-3)) - (set! (-> *game-info* features) (logior (game-feature gun gun-upgrade-damage) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature gun gun-upgrade-damage)) ) (((game-task-node-command add-pass-red)) - (set! (-> *game-info* features) (logior (game-feature pass-red) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-red)) ) (((game-task-node-command add-pass-green)) - (set! (-> *game-info* features) (logior (game-feature pass-green) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-green)) ) (((game-task-node-command add-pass-yellow)) - (set! (-> *game-info* features) (logior (game-feature pass-yellow) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-yellow)) ) (((game-task-node-command add-pass-blue)) - (set! (-> *game-info* features) (logior (game-feature pass-blue) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-blue)) ) (((game-task-node-command add-darkjak)) (logior! (-> *game-info* features) (game-feature darkjak)) ) (((game-task-node-command add-darkjak-0)) - (set! (-> *game-info* features) (logior (game-feature darkjak-bomb0) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-bomb0)) ) (((game-task-node-command add-darkjak-1)) - (set! (-> *game-info* features) (logior (game-feature darkjak-bomb1) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-bomb1)) ) (((game-task-node-command add-darkjak-2)) - (set! (-> *game-info* features) (logior (game-feature darkjak-invinc) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-invinc)) ) (((game-task-node-command add-darkjak-3)) - (set! (-> *game-info* features) (logior (game-feature darkjak-giant) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-giant)) ) ) 0 diff --git a/goal_src/jak2/engine/gfx/background/prototype.gc b/goal_src/jak2/engine/gfx/background/prototype.gc index eb1d6477d3..bc976b7bc5 100644 --- a/goal_src/jak2/engine/gfx/background/prototype.gc +++ b/goal_src/jak2/engine/gfx/background/prototype.gc @@ -13,7 +13,7 @@ (let ((shrub (-> obj data shrub-idx))) (when (and *debug-segment* (-> *screen-shot-work* highres-enable)) (dotimes (shrub-i 4) - (set! (-> shrub dists data shrub-i) (+ 40960000.0 (-> shrub dists data shrub-i))) + (+! (-> shrub dists data shrub-i) 40960000.0) (set! (-> shrub rdists data shrub-i) (/ 1.0 (-> shrub dists data shrub-i))) ) ) diff --git a/goal_src/jak2/engine/gfx/foreground/shadow-cpu.gc b/goal_src/jak2/engine/gfx/foreground/shadow-cpu.gc index a89b1424b0..5f32373f3c 100644 --- a/goal_src/jak2/engine/gfx/foreground/shadow-cpu.gc +++ b/goal_src/jak2/engine/gfx/foreground/shadow-cpu.gc @@ -795,7 +795,7 @@ (let ((s4-0 (new 'stack-no-clear 'collide-query))) (let ((v1-0 pp)) (set! (-> s4-0 start-pos quad) (-> arg0 quad)) - (set! (-> s4-0 start-pos y) (+ 4096.0 (-> s4-0 start-pos y))) + (+! (-> s4-0 start-pos y) 4096.0) (set-vector! (-> s4-0 move-dist) 0.0 (- arg3) 0.0 1.0) (let ((a0-4 s4-0)) (set! (-> a0-4 radius) 8192.0) diff --git a/goal_src/jak2/engine/gfx/math-camera.gc b/goal_src/jak2/engine/gfx/math-camera.gc index ae172c583b..bafc7f4573 100644 --- a/goal_src/jak2/engine/gfx/math-camera.gc +++ b/goal_src/jak2/engine/gfx/math-camera.gc @@ -388,22 +388,22 @@ renderers that want a single matrix. ) (set! (-> arg0 trans w) 1.0) (if (cpad-hold? arg1 r1) - (set! (-> arg0 trans y) (+ 80.0 (-> arg0 trans y))) + (+! (-> arg0 trans y) 80.0) ) (if (cpad-hold? arg1 r2) - (set! (-> arg0 trans y) (+ -80.0 (-> arg0 trans y))) + (+! (-> arg0 trans y) -80.0) ) (if (cpad-hold? arg1 x) - (set! (-> arg0 rot x) (+ 546.13336 (-> arg0 rot x))) + (+! (-> arg0 rot x) 546.13336) ) (if (cpad-hold? arg1 triangle) - (set! (-> arg0 rot x) (+ -546.13336 (-> arg0 rot x))) + (+! (-> arg0 rot x) -546.13336) ) (if (cpad-hold? arg1 left) - (set! (-> arg0 rot y) (+ 546.13336 (-> arg0 rot y))) + (+! (-> arg0 rot y) 546.13336) ) (if (cpad-hold? arg1 right) - (set! (-> arg0 rot y) (+ -546.13336 (-> arg0 rot y))) + (+! (-> arg0 rot y) -546.13336) ) arg0 ) diff --git a/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc b/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc index 47de9942a9..d5c2a42994 100644 --- a/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc +++ b/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc @@ -459,7 +459,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ 393216.0 (-> v1-0 x))) + (+! (-> v1-0 x) 393216.0) (let ((t0-7 v1-0) (t1-3 a0-2) ) @@ -475,7 +475,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 z) (+ 393216.0 (-> v1-0 z))) + (+! (-> v1-0 z) 393216.0) (let ((t0-12 v1-0) (t1-4 a0-2) ) @@ -491,7 +491,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ -393216.0 (-> v1-0 x))) + (+! (-> v1-0 x) -393216.0) (.lvf vf2 (&-> v1-0 quad)) (.lvf vf3 (&-> a0-2 quad)) ) diff --git a/goal_src/jak2/engine/gfx/ocean/ocean-texture.gc b/goal_src/jak2/engine/gfx/ocean/ocean-texture.gc index 2ca68694bf..1128f58228 100644 --- a/goal_src/jak2/engine/gfx/ocean/ocean-texture.gc +++ b/goal_src/jak2/engine/gfx/ocean/ocean-texture.gc @@ -299,10 +299,10 @@ (+! (-> obj st-scroll x) (* 8.0 (-> pp clock seconds-per-frame))) (set! (-> obj st-scroll y) (- (-> obj st-scroll y) (* 8.0 (-> pp clock seconds-per-frame)))) (if (< 128.0 (-> obj st-scroll x)) - (set! (-> obj st-scroll x) (+ -128.0 (-> obj st-scroll x))) + (+! (-> obj st-scroll x) -128.0) ) (if (< (-> obj st-scroll y) 0.0) - (set! (-> obj st-scroll y) (+ 128.0 (-> obj st-scroll y))) + (+! (-> obj st-scroll y) 128.0) ) ) (set! (-> obj uv-scroll-0 x) (the int (* 16.0 (-> obj st-scroll x)))) diff --git a/goal_src/jak2/engine/gfx/ocean/ocean-transition.gc b/goal_src/jak2/engine/gfx/ocean/ocean-transition.gc index b2f0e183d7..d8df0eed68 100644 --- a/goal_src/jak2/engine/gfx/ocean/ocean-transition.gc +++ b/goal_src/jak2/engine/gfx/ocean/ocean-transition.gc @@ -434,7 +434,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (goto cfg-24) ) - (set! (-> v1-0 x) (+ 98304.0 (-> v1-0 x))) + (+! (-> v1-0 x) 98304.0) (let ((t0-7 v1-0) (t1-3 a0-2) ) @@ -450,7 +450,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (goto cfg-24) ) - (set! (-> v1-0 z) (+ 98304.0 (-> v1-0 z))) + (+! (-> v1-0 z) 98304.0) (let ((t0-12 v1-0) (t1-4 a0-2) ) @@ -466,7 +466,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (goto cfg-24) ) - (set! (-> v1-0 x) (+ -98304.0 (-> v1-0 x))) + (+! (-> v1-0 x) -98304.0) (.lvf vf2 (&-> v1-0 quad)) (.lvf vf3 (&-> a0-2 quad)) ) diff --git a/goal_src/jak2/engine/gfx/sky/sky-data.gc b/goal_src/jak2/engine/gfx/sky/sky-data.gc index 5f4dbc268c..3e8553f7b6 100644 --- a/goal_src/jak2/engine/gfx/sky/sky-data.gc +++ b/goal_src/jak2/engine/gfx/sky/sky-data.gc @@ -266,7 +266,7 @@ ) (set-vector! (-> s3-0 stq) (* 0.25 (the float (+ s4-0 -4))) (* 0.25 (the float (+ s5-0 -4))) 1.0 1.0) (set! (-> s3-0 nrm quad) (-> s3-0 pos quad)) - (set! (-> s3-0 nrm y) (+ 1.0 (-> s3-0 nrm y))) + (+! (-> s3-0 nrm y) 1.0) (vector-normalize! (-> s3-0 nrm) 1.0) (vector-negate! (-> s3-0 nrm2) (-> s3-0 nrm)) (cond @@ -304,7 +304,7 @@ (set! (-> s4-0 pos z) (* 9.0 (cos (* 182.04445 (* 10.0 (the float s5-0)))))) (set! (-> s4-0 pos y) 0.0) (set! (-> (the-as cloud-vertex (-> s4-0 nrm)) pos quad) (-> (the-as cloud-vertex (-> s4-0 pos)) pos quad)) - (set! (-> s4-0 nrm y) (+ 1.0 (-> s4-0 nrm y))) + (+! (-> s4-0 nrm y) 1.0) (vector-normalize! (-> s4-0 nrm) 1.0) ) ) diff --git a/goal_src/jak2/engine/nav/nav-enemy.gc b/goal_src/jak2/engine/nav/nav-enemy.gc index 4e49e31afe..851b0809b2 100644 --- a/goal_src/jak2/engine/nav/nav-enemy.gc +++ b/goal_src/jak2/engine/nav/nav-enemy.gc @@ -305,7 +305,7 @@ (nav-enemy-method-177 obj) (cond ((nav-enemy-method-174 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag directed) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag directed)) (let ((s5-0 (-> obj nav))) (when (logtest? (-> s5-0 state flags) (nav-state-flag at-gap)) (let ((s4-0 (new 'stack-no-clear 'nav-gap-info))) @@ -1078,7 +1078,7 @@ ) (set! (-> obj enemy-flags) (the-as enemy-flag (logior (enemy-flag dislike-combo) (-> obj enemy-flags)))) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logior! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag notice)) (set! (-> obj nav-radius-backup) (-> obj root nav-radius)) @@ -1229,7 +1229,7 @@ ) (set! (-> obj enemy-flags) v1-114) ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (do-navigation-to-destination (-> obj nav state) (-> obj root trans)) (if (and (-> obj enemy-info move-to-ground) (not (logtest? (enemy-flag vulnerable-backup) (-> obj enemy-flags))) @@ -2567,7 +2567,7 @@ This commonly includes things such as: ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) @@ -2850,7 +2850,7 @@ This commonly includes things such as: :virtual #t :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag victory) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag victory)) ((-> (method-of-type nav-enemy idle) enter)) (none) ) diff --git a/goal_src/jak2/engine/nav/nav-mesh.gc b/goal_src/jak2/engine/nav/nav-mesh.gc index 68f84fd31f..3ffeb2e839 100644 --- a/goal_src/jak2/engine/nav/nav-mesh.gc +++ b/goal_src/jak2/engine/nav/nav-mesh.gc @@ -518,7 +518,7 @@ (let ((gp-0 (new 'stack-no-clear 'inline-array 'vector 3))) (set! (-> gp-0 0 quad) (-> obj bounds quad)) (if (logtest? (-> arg0 pat) 7) - (set! (-> gp-0 0 y) (+ 409.6 (-> gp-0 0 y))) + (+! (-> gp-0 0 y) 409.6) ) (let ((v1-7 (the-as int (+ (-> arg0 vertex-count) -1)))) (dotimes (s2-0 (the-as int (-> arg0 vertex-count))) diff --git a/goal_src/jak2/engine/scene/scene.gc b/goal_src/jak2/engine/scene/scene.gc index 28a6f44bc0..9ac808876a 100644 --- a/goal_src/jak2/engine/scene/scene.gc +++ b/goal_src/jak2/engine/scene/scene.gc @@ -713,11 +713,11 @@ ) ) (set! (-> s2-0 flags) (font-flags kerning middle left large)) - (set! (-> s2-0 origin x) (+ -1.0 (-> s2-0 origin x))) - (set! (-> s2-0 origin y) (+ -1.0 (-> s2-0 origin y))) + (+! (-> s2-0 origin x) -1.0) + (+! (-> s2-0 origin y) -1.0) (set! (-> s2-0 color) (font-color font-color-39)) - (set! (-> s2-0 origin x) (+ 1.0 (-> s2-0 origin x))) - (set! (-> s2-0 origin y) (+ 1.0 (-> s2-0 origin y))) + (+! (-> s2-0 origin x) 1.0) + (+! (-> s2-0 origin y) 1.0) (set! (-> s2-0 color) (font-color default)) (set! (-> s2-0 flags) (font-flags shadow kerning middle left large)) (#if PC_PORT diff --git a/goal_src/jak2/engine/target/board/board-h.gc b/goal_src/jak2/engine/target/board/board-h.gc index 8ddaa1df2a..a977d13fb6 100644 --- a/goal_src/jak2/engine/target/board/board-h.gc +++ b/goal_src/jak2/engine/target/board/board-h.gc @@ -292,14 +292,14 @@ (set! (-> v1-51 y) (-> self water height)) ) (set! (-> s5-0 0 quad) (-> v1-51 quad)) - (set! (-> s5-0 0 y) (+ 8192.0 (-> s5-0 0 y))) + (+! (-> s5-0 0 y) 8192.0) (set! (-> s5-0 0 r) 2867.2) (set! (-> s5-0 1 quad) (-> v1-51 quad)) - (set! (-> s5-0 1 y) (+ 12288.0 (-> s5-0 1 y))) + (+! (-> s5-0 1 y) 12288.0) (set! (-> s5-0 1 r) 2867.2) (set! (-> s5-0 2 quad) (-> v1-51 quad)) ) - (set! (-> s5-0 2 y) (+ 16384.0 (-> s5-0 2 y))) + (+! (-> s5-0 2 y) 16384.0) (set! (-> s5-0 2 r) 2867.2) (let ((v1-55 gp-0)) (set! (-> v1-55 best-dist) (the-as float s5-0)) diff --git a/goal_src/jak2/engine/target/board/board-states.gc b/goal_src/jak2/engine/target/board/board-states.gc index 3d2c174ba8..f1d2a61801 100644 --- a/goal_src/jak2/engine/target/board/board-states.gc +++ b/goal_src/jak2/engine/target/board/board-states.gc @@ -302,7 +302,7 @@ ) ) (vector-normalize! gp-0 8192.0) - (set! (-> gp-0 y) (+ 40960.0 (-> gp-0 y))) + (+! (-> gp-0 y) 40960.0) (vector+! gp-0 gp-0 (get-trans self 6)) (vector-! gp-0 gp-0 (get-trans self 0)) (send-event *camera* 'relative-position gp-0) @@ -372,7 +372,7 @@ (when (not (logtest? (-> self control old-status) (collide-status on-surface))) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self control trans quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (let ((s5-0 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-0 (let ((t9-10 (method-of-type part-tracker activate))) @@ -910,7 +910,7 @@ ) (let ((s3-2 (new 'stack-no-clear 'vector))) (set! (-> s3-2 quad) (-> self control trans quad)) - (set! (-> s3-2 y) (+ 2048.0 (-> s3-2 y))) + (+! (-> s3-2 y) 2048.0) (let ((s2-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s2-1 (let ((t9-5 (method-of-type part-tracker activate))) @@ -1162,7 +1162,7 @@ ) ) :enter (behavior () - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (set! (-> self state-time) (current-time)) (logior! (-> self control root-prim prim-core action) (collide-action no-normal-reset)) (set! (-> self control mod-surface) *board-halfpipe-mods*) @@ -1549,7 +1549,7 @@ (set! (-> self state-time) (current-time)) (cond ((= arg2 'halfpipe) - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (target-board-halfpipe-trans) ) (else @@ -1731,7 +1731,7 @@ (set! (-> self board unknown-time-frame04) (current-time)) (cond ((= arg2 'halfpipe) - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (target-board-halfpipe-trans) ) (else @@ -2203,7 +2203,7 @@ ) :enter (behavior ((arg0 symbol) (arg1 object) (arg2 object) (arg3 float)) (set! (-> self state-time) (current-time)) - (set! (-> self focus-status) (logior (focus-status rail) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status rail)) (logior! (-> self control root-prim prim-core action) (collide-action can-ride)) (set! (-> self control mod-surface) *board-ride-mods*) (set! (-> self board mods-backup) (-> self control mod-surface)) @@ -2316,7 +2316,7 @@ (add-to-trick-list (-> self board) (board-tricks board-rail) (* 100.0 (the float v1-15))) ) ) - (set! (-> self control trans y) (+ 1228.8 (-> self control trans y))) + (+! (-> self control trans y) 1228.8) (go target-board-jump (-> *TARGET_BOARD-bank* jump-height-min) @@ -2445,7 +2445,7 @@ ) ) :enter (behavior ((arg0 handle)) - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (set! (-> self control unknown-handle02) arg0) (set! (-> self state-time) (current-time)) (logior! (-> self control root-prim prim-core action) (collide-action no-normal-reset)) @@ -2742,7 +2742,7 @@ ) (when s4-1 (set! (-> self control unknown-vector38 quad) (-> (get-trans (the-as process-focusable s4-1) 0) quad)) - (set! (-> self control unknown-vector38 y) (+ 4096.0 (-> self control unknown-vector38 y))) + (+! (-> self control unknown-vector38 y) 4096.0) (set! (-> self control unknown-vector40 quad) (-> (get-quat (the-as process-focusable s4-1) 0) quad)) ) (let ((f28-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 30.0)))) @@ -3102,7 +3102,7 @@ (logior! (-> self focus-status) (focus-status hit)) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (target-board-exit) (none) ) diff --git a/goal_src/jak2/engine/target/board/target-board.gc b/goal_src/jak2/engine/target/board/target-board.gc index e12880487c..23b1311152 100644 --- a/goal_src/jak2/engine/target/board/target-board.gc +++ b/goal_src/jak2/engine/target/board/target-board.gc @@ -883,7 +883,7 @@ (set! (-> self board ride-rot-old) -1.0) (set! (-> self control reaction) target-collision-reaction) (set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :noboard #x1 :probe #x1)) - (set! (-> self focus-status) (logior (focus-status board) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status board)) (logclear! (-> self control root-prim prim-core action) (collide-action can-ride)) (set! (-> self control bend-target) 1.0) (let ((v1-82 (-> self node-list data))) @@ -892,7 +892,7 @@ (set! (-> v1-82 0 param2) (the-as basic (-> self control cspace-offset))) ) (target-collide-set! 'board 0.0) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (set! (-> self board thrust-scale) 1.0) (set! (-> self board turn-anim-targ) 0.0) (set! (-> self board turn-anim-frame) 0.0) @@ -2250,11 +2250,11 @@ (let ((v1-69 (logtest? (-> s4-0 status) 2))) (if (logtest? (-> s4-0 status) 1) (logior! (-> s4-0 status) 2) - (set! (-> s4-0 status) (logand -3 (-> s4-0 status))) + (logand! (-> s4-0 status) -3) ) (if v1-69 (logior! (-> s4-0 status) 1) - (set! (-> s4-0 status) (logand -2 (-> s4-0 status))) + (logand! (-> s4-0 status) -2) ) ) ) @@ -2336,7 +2336,7 @@ ) ) (if (probe-test (-> self control) s3-5 (new 'static 'pat-surface :noentity #x1 :noboard #x1 :probe #x1)) - (set! (-> self control status) (logior (collide-status probe-hit) (-> self control status))) + (logior! (-> self control status) (collide-status probe-hit)) (move-by-vector! (-> self control) s3-5) ) ) @@ -2769,7 +2769,7 @@ (vector-! (new 'stack-no-clear 'vector) s3-2 (-> self control trans)) (new 'static 'pat-surface :noentity #x1 :noboard #x1 :probe #x1) ) - (set! (-> self control status) (logior (collide-status probe-hit) (-> self control status))) + (logior! (-> self control status) (collide-status probe-hit)) ) (if (and (-> self board ride-lock-on) (not (logtest? (collide-status probe-hit) (-> self control status)))) (move-to-point! (-> self control) s3-2) diff --git a/goal_src/jak2/engine/target/gun/gun-red-shot.gc b/goal_src/jak2/engine/target/gun/gun-red-shot.gc index f58c31066e..730d7c6008 100644 --- a/goal_src/jak2/engine/target/gun/gun-red-shot.gc +++ b/goal_src/jak2/engine/target/gun/gun-red-shot.gc @@ -548,7 +548,7 @@ ) (update-transforms (-> self root)) (set! (-> self event-hook) gun-red-shot-event-handler) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (logclear! (-> self mask) (process-mask enemy)) (gun-red-shot-method-27 self) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 204 (seconds 0.1)) diff --git a/goal_src/jak2/engine/target/gun/gun-states.gc b/goal_src/jak2/engine/target/gun/gun-states.gc index e3374ec196..8047699e3c 100644 --- a/goal_src/jak2/engine/target/gun/gun-states.gc +++ b/goal_src/jak2/engine/target/gun/gun-states.gc @@ -45,7 +45,7 @@ ) ) :enter (behavior () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (set! (-> self control mod-surface) *gun-walk-mods*) (set! (-> self control unknown-word04) (the-as uint #f)) (set! (-> self state-time) (current-time)) diff --git a/goal_src/jak2/engine/target/gun/gun-util.gc b/goal_src/jak2/engine/target/gun/gun-util.gc index c3bfba0e8d..03ad2b51ce 100644 --- a/goal_src/jak2/engine/target/gun/gun-util.gc +++ b/goal_src/jak2/engine/target/gun/gun-util.gc @@ -340,7 +340,7 @@ ) (vector<-cspace! s3-0 (-> self mag gp-1 joint)) (vector-normalize-copy! s4-1 (-> self mag gp-1 joint bone transform vector 1) 40960.0) - (set! (-> s4-1 y) (+ 81920.0 (-> s4-1 y))) + (+! (-> s4-1 y) 81920.0) (set! (-> s5-2 ent) (-> self entity)) (set! (-> s5-2 charge) 1.0) (set! (-> s5-2 options) (projectile-options)) @@ -874,7 +874,7 @@ (vector-z-quaternion! (new 'stack-no-clear 'vector) (-> (the-as target (-> self parent 0)) control quat)) -20480.0 ) - (set! (-> s5-0 y) (+ 81920.0 (-> s5-0 y))) + (+! (-> s5-0 y) 81920.0) (set! (-> gp-0 ent) (-> self entity)) (set! (-> gp-0 charge) 1.0) (set! (-> gp-0 options) (projectile-options)) diff --git a/goal_src/jak2/engine/target/logic-target.gc b/goal_src/jak2/engine/target/logic-target.gc index a976022bd8..760570193d 100644 --- a/goal_src/jak2/engine/target/logic-target.gc +++ b/goal_src/jak2/engine/target/logic-target.gc @@ -39,10 +39,8 @@ ) (or (= (-> self control mod-surface name) 'run) (= (-> self control mod-surface name) 'jump)) ) - (set! (-> self control current-surface target-speed) - (+ 20480.0 (-> self control current-surface target-speed)) - ) - (set! (-> self control current-surface transv-max) (+ 20480.0 (-> self control current-surface transv-max))) + (+! (-> self control current-surface target-speed) 20480.0) + (+! (-> self control current-surface transv-max) 20480.0) ) (when (and (and (focus-test? self dark) (nonzero? (-> self darkjak))) (or (= (-> self control mod-surface name) 'run) @@ -2232,7 +2230,7 @@ (let ((v1-10 (new 'stack-no-clear 'vector))) (vector+! v1-10 s4-1 s3-1) (vector-float*! v1-10 v1-10 0.5) - (set! (-> v1-10 y) (+ -6144.0 (-> v1-10 y))) + (+! (-> v1-10 y) -6144.0) (send-event *camera* 'ease-in #x3f000000 v1-10) ) (vector-segment-distance-point! (-> self control midpoint-of-hands) s4-1 s3-1 s5-0) @@ -2305,7 +2303,7 @@ (and (not (logtest? (-> self draw status) (draw-control-status no-draw))) (begin (vector<-cspace! s5-0 (-> self node-list data 3)) - (set! (-> s5-0 y) (+ -5896.192 (-> s5-0 y))) + (+! (-> s5-0 y) -5896.192) (< (fabs (- (-> s5-0 y) (-> self control trans y))) 8192.0) ) ) @@ -3287,7 +3285,7 @@ (set! (-> obj water flags) (water-flags swim-ground part-splash part-drip part-rings part-water find-water)) (reset-target-state #t) (set! (-> obj control last-trans-any-surf quad) (-> obj control trans quad)) - (set! (-> obj control last-trans-any-surf y) (+ -819200.0 (-> obj control last-trans-any-surf y))) + (+! (-> obj control last-trans-any-surf y) -819200.0) (set! (-> obj align) (new 'process 'align-control obj)) (set! (-> obj manipy) (the-as (pointer manipy) #f)) (set! (-> obj event-hook) target-generic-event-handler) @@ -3305,7 +3303,7 @@ (defbehavior target-init target ((arg0 continue-point)) (init-target self arg0 #f) (set! (-> self event-hook) (-> target-continue event)) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (go target-continue arg0) (none) ) diff --git a/goal_src/jak2/engine/target/mech/grunt-mech.gc b/goal_src/jak2/engine/target/mech/grunt-mech.gc index 19110425f4..5b02942fe5 100644 --- a/goal_src/jak2/engine/target/mech/grunt-mech.gc +++ b/goal_src/jak2/engine/target/mech/grunt-mech.gc @@ -229,6 +229,7 @@ ;; (.mula.s f0-2 f3-0) ;; (.madda.s f1-0 f4-0) ;; (.madd.s f0-3 f2-0 f5-0) + (set! f0-3 (vector-dot sv-592 s0-0)) ) ) (when (>= f0-3 0.0) @@ -257,7 +258,7 @@ ) (let ((a1-9 (new 'stack-no-clear 'collide-query))) (set! (-> a1-9 start-pos quad) (-> obj root trans quad)) - (set! (-> a1-9 start-pos y) (+ 6144.0 (-> a1-9 start-pos y))) + (+! (-> a1-9 start-pos y) 6144.0) (vector-! (-> a1-9 move-dist) (the-as vector (+ (the-as uint (-> s4-0 holds 0 world-mat trans)) (* 192 gp-0))) @@ -338,7 +339,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag37)))) ) @@ -566,7 +567,7 @@ :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self root root-prim prim-core collide-as) (collide-spec)) (stop-looking-at-target! self) (set! (-> self state-timeout) (+ (current-time) (get-rand-int-range self 450 900))) diff --git a/goal_src/jak2/engine/target/mech/mech-states.gc b/goal_src/jak2/engine/target/mech/mech-states.gc index b56d162671..56d5b886c8 100644 --- a/goal_src/jak2/engine/target/mech/mech-states.gc +++ b/goal_src/jak2/engine/target/mech/mech-states.gc @@ -1192,9 +1192,7 @@ ) (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) (set-setting! 'mode-name 'cam-endlessfall 0.0 0) - (set! (-> self control pat-ignore-mask) - (logior (new 'static 'pat-surface :noendlessfall #x1) (-> self control pat-ignore-mask)) - ) + (logior! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noendlessfall #x1)) (logclear! (-> self water flags) (water-flags swim-ground)) (let ((f0-2 (fmin -4096.0 (- (-> self control ground-impact-vel))))) (set! (-> self control unknown-word04) (the-as uint f0-2)) @@ -1432,7 +1430,7 @@ ) (defbehavior target-mech-carry-post target () - (set! (-> self focus-status) (logior (focus-status carry) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status carry)) (target-mech-post) (target-mech-carry-update) (none) @@ -2728,7 +2726,7 @@ (ja-post) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector<-cspace! gp-1 (-> self node-list data 3)) - (set! (-> gp-1 y) (+ -9011.2 (-> gp-1 y))) + (+! (-> gp-1 y) -9011.2) (move-to-point! (-> self control) gp-1) ) (send-event *camera* 'ease-in) diff --git a/goal_src/jak2/engine/target/sidekick.gc b/goal_src/jak2/engine/target/sidekick.gc index d29c61b2e9..317dedbc5b 100644 --- a/goal_src/jak2/engine/target/sidekick.gc +++ b/goal_src/jak2/engine/target/sidekick.gc @@ -466,7 +466,7 @@ ;; WARN: Return type mismatch object vs none. (defbehavior init-sidekick sidekick () - (set! (-> self mask) (logior (process-mask sidekick) (-> self mask))) + (logior! (-> self mask) (process-mask sidekick)) (set! (-> self root) (new 'process 'trsqv)) (vector-identity! (-> self root scale)) (quaternion-identity! (-> self root quat)) diff --git a/goal_src/jak2/engine/target/target-anim.gc b/goal_src/jak2/engine/target/target-anim.gc index 500b0777e5..f9a417da61 100644 --- a/goal_src/jak2/engine/target/target-anim.gc +++ b/goal_src/jak2/engine/target/target-anim.gc @@ -237,14 +237,13 @@ (set! gp-0 0) ) ((let ((v1-125 (ja-group))) - (and v1-125 - (or (= v1-125 (-> self draw art-group data 48)) - (= v1-125 (-> self draw art-group data 402)) - (= v1-125 (-> self draw art-group data 409)) - (= v1-125 (-> self draw art-group data 404)) - (= v1-125 (-> self draw art-group data 406)) - (= v1-125 (-> self draw art-group data 413)) - ) + (and v1-125 (or (= v1-125 (-> self draw art-group data 48)) + (= v1-125 (-> self draw art-group data 402)) + (= v1-125 (-> self draw art-group data 409)) + (= v1-125 (-> self draw art-group data 404)) + (= v1-125 (-> self draw art-group data 406)) + (= v1-125 (-> self draw art-group data 413)) + ) ) ) ((lambda :behavior target @@ -254,32 +253,32 @@ (let* ((v1-5 (ja-group)) (a1-0 (cond ((and v1-5 (= v1-5 (-> self draw art-group data 402))) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 403) ) ((let ((v1-14 (ja-group))) (and v1-14 (= v1-14 (-> self draw art-group data 409))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 410) ) ((let ((v1-23 (ja-group))) (and v1-23 (= v1-23 (-> self draw art-group data 404))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 405) ) ((let ((v1-32 (ja-group))) (and v1-32 (= v1-32 (-> self draw art-group data 406))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 407) ) (else (let ((v1-41 (ja-group))) (cond ((and v1-41 (= v1-41 (-> self draw art-group data 413))) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 414) ) ((rand-vu-percent? 0.3) @@ -453,7 +452,7 @@ (suspend) (ja :num! (seek! (ja-aframe 142.0 0))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) :frame-num (ja-aframe 142.0 0) @@ -482,7 +481,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (if (and (focus-test? self dark) (nonzero? (-> self darkjak))) (ja :group! (-> self draw art-group data 396)) (ja :group! (-> self draw art-group data 5)) @@ -1152,7 +1151,7 @@ (set! (-> v1-211 channel-offset) 0) ) 0 - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) ) ) (let ((f0-37 (fabs (- f20-0 f30-0)))) @@ -1397,7 +1396,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.02)) (let ((a1-4 (target-land-anim))) (ja-no-eval :group! a1-4 @@ -1430,7 +1429,7 @@ (not (using-gun? self)) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-set! 1) (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) @@ -1459,7 +1458,7 @@ ) ((lambda :behavior target () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-set! 1) (cond ((using-gun? self) @@ -1536,7 +1535,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let* ((v1-142 (ja-group)) (f30-0 (if (and v1-142 (= v1-142 (-> self draw art-group data 67))) 24576.0 @@ -1581,7 +1580,7 @@ ) ((lambda :behavior target () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.04)) (cond ((using-gun? self) @@ -1648,7 +1647,7 @@ ((let ((v1-201 (ja-group))) (and v1-201 (or (= v1-201 (-> self draw art-group data 321)) (= v1-201 (-> self draw art-group data 322)))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.04)) (ja-no-eval :group! (-> self draw art-group data 323) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 323)) frames num-frames) -1))) @@ -1669,7 +1668,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) (suspend) @@ -1684,7 +1683,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.017)) (ja-no-eval :group! (-> self draw art-group data 331) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 331)) frames num-frames) -1))) @@ -1698,7 +1697,7 @@ ((let ((v1-279 (ja-group))) (and v1-279 (or (= v1-279 (-> self draw art-group data 340)) (= v1-279 (-> self draw art-group data 341)))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let ((v1-286 (ja-group))) (if (and v1-286 (= v1-286 (-> self draw art-group data 341))) (ja-channel-set! 1) diff --git a/goal_src/jak2/engine/target/target-carry.gc b/goal_src/jak2/engine/target/target-carry.gc index 40b823d377..81dac77415 100644 --- a/goal_src/jak2/engine/target/target-carry.gc +++ b/goal_src/jak2/engine/target/target-carry.gc @@ -109,7 +109,7 @@ (defbehavior target-carry-post target () (target-post) (target-carry-update) - (set! (-> self focus-status) (logior (focus-status carry) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status carry)) (none) ) diff --git a/goal_src/jak2/engine/target/target-darkjak.gc b/goal_src/jak2/engine/target/target-darkjak.gc index 03f8814796..c27d10ac67 100644 --- a/goal_src/jak2/engine/target/target-darkjak.gc +++ b/goal_src/jak2/engine/target/target-darkjak.gc @@ -316,7 +316,7 @@ (set! (-> self darkjak attack-count) (the-as uint 0)) (set! (-> self darkjak-giant-interp) 1.0) (set-setting! 'sound-flava #f 30.0 4) - (set! (-> self focus-status) (logior (focus-status dark) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status dark)) (set! (-> (the-as fact-info-target (-> self fact)) darkjak-start-time) (current-time)) (set! (-> (the-as fact-info-target (-> self fact)) darkjak-effect-time) (seconds 20)) (if (logtest? (-> self darkjak stage) 16) @@ -420,7 +420,7 @@ ) ) :enter (behavior () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (set! (-> self neck flex-blend) 0.0) (set! (-> self control mod-surface) *darkjak-trans-mods*) (kill-persister *setting-control* (the-as engine-pers 'bg-a-speed) 'bg-a-speed) @@ -1880,7 +1880,7 @@ (set! (-> self darkjak-interp) 1.0) (set! (-> self darkjak-giant-interp) (the-as float (-> self control unknown-word04))) (when (= (the-as float (-> self control unknown-word04)) 1.0) - (set! (-> self darkjak stage) (logand -33 (-> self darkjak stage))) + (logand! (-> self darkjak stage) -33) (set! (-> self darkjak want-stage) (-> self darkjak stage)) ) (none) @@ -1900,7 +1900,7 @@ ((method-of-type sphere new) (the-as symbol (-> s5-1 s4-0)) sphere) ) (set! (-> s5-1 0 quad) (-> self control trans quad)) - (set! (-> s5-1 0 y) (+ 12697.6 (-> s5-1 0 y))) + (+! (-> s5-1 0 y) 12697.6) (set! (-> s5-1 0 r) 11878.4) (let ((v1-29 gp-1)) (set! (-> v1-29 best-dist) (the-as float s5-1)) diff --git a/goal_src/jak2/engine/target/target-death.gc b/goal_src/jak2/engine/target/target-death.gc index 89a615819e..b79fec50da 100644 --- a/goal_src/jak2/engine/target/target-death.gc +++ b/goal_src/jak2/engine/target/target-death.gc @@ -106,7 +106,7 @@ (set! *spawn-actors* #f) (set! (-> self control unknown-word04) (the-as uint #f)) (set! (-> self state-time) (current-time)) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (let ((a0-3 (get-continue-by-name (-> self game) (-> arg0 name)))) (cond (a0-3 @@ -155,7 +155,7 @@ (apply-settings *setting-control*) (reset-target-state #t) (target-exit) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (ja-channel-set! 0) (quaternion-copy! (-> self control quat-for-control) (the-as quaternion (-> arg0 quat))) (move-to-point! (-> self control) (-> arg0 trans)) @@ -338,7 +338,7 @@ ) (when a2-26 (set! (-> s5-8 quad) (-> a2-26 extra trans quad)) - (set! (-> s5-8 y) (+ 9011.2 (-> s5-8 y))) + (+! (-> s5-8 y) 9011.2) (go target-warp-in s5-8 (-> arg0 trans) (the-as target a2-26)) ) ) @@ -352,7 +352,7 @@ (start-sig-recorder) ) ((logtest? (continue-flags pilot pilot-dax) (-> arg0 flags)) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (while (not (-> self mode-cache)) (suspend) ) @@ -1339,7 +1339,7 @@ (defbehavior target-death-anim target ((arg0 spool-anim)) (set! (-> self control mod-surface) *neutral-mods*) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data 69) :num! (seek! (ja-aframe 30.0 0)) :frame-num 0.0) (until (ja-done? 0) @@ -1560,9 +1560,7 @@ (the-as float (send-event (handle->process (-> self attack-info attacker)) 'target 'die arg0)) ) (set! (-> self neck flex-blend) 0.0) - (set! (-> self control pat-ignore-mask) - (logior (new 'static 'pat-surface :noendlessfall #x1) (-> self control pat-ignore-mask)) - ) + (logior! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noendlessfall #x1)) (target-timed-invulnerable-off self 0) (case arg0 (('bot 'centipede) @@ -1595,7 +1593,7 @@ (apply-settings *setting-control*) (set! (-> self control transv quad) (the-as uint128 0)) (logior! (-> self focus-status) (focus-status dead)) - (set! (-> self state-flags) (logior (state-flags disable-attacks) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags disable-attacks)) (let ((v1-50 arg0)) (b! (not (or (= v1-50 'none) (= v1-50 'instant-death))) cfg-52 :delay (nop!)) (b! #t cfg-167 :delay (nop!)) diff --git a/goal_src/jak2/engine/target/target-gun.gc b/goal_src/jak2/engine/target/target-gun.gc index df5ef842ee..4947a0887a 100644 --- a/goal_src/jak2/engine/target/target-gun.gc +++ b/goal_src/jak2/engine/target/target-gun.gc @@ -1152,7 +1152,7 @@ ) (vector-flatten! s4-0 s4-0 (-> self control c-R-w vector 1)) (vector-normalize! s4-0 1.0) - (set! (-> gp-0 y) (+ 6144.0 (-> gp-0 y))) + (+! (-> gp-0 y) 6144.0) (vector+float*! gp-0 gp-0 s4-0 -32768.0) (vector+float*! s5-0 gp-0 s4-0 (+ 32768.0 (-> self gun track-find-range))) ) @@ -1173,7 +1173,7 @@ (defbehavior target-gun-find-track target () (if (logtest? (-> self gun upper-body track-mode) (track-mode lock-on)) (logior! (-> self gun track?) 8) - (set! (-> self gun track?) (logand -9 (-> self gun track?))) + (logand! (-> self gun track?) -9) ) (let ((gp-0 (the-as basic #f))) (when (and (or (< (- (current-time) (-> self control time-of-last-nonzero-input)) (seconds 0.2)) @@ -1188,7 +1188,7 @@ ) (target-gun-build-track-list) (let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 8)))) - (set! (-> t2-0 y) (+ 2048.0 (-> t2-0 y))) + (+! (-> t2-0 y) 2048.0) (cond ((logtest? (surface-flag gun-strafe) (-> self control current-surface flags)) (set! gp-0 (find-nearest-focusable @@ -1320,7 +1320,7 @@ ((and (not (send-event-function (the-as process-focusable s5-1) a1-21)) (zero? (-> self gun track-target-hold-time)) ) - (set! (-> self gun track?) (logand -5 (-> self gun track?))) + (logand! (-> self gun track?) -5) (set! (-> self gun track-trans quad) (-> (get-trans (the-as process-focusable s5-1) 3) quad)) ) (else @@ -1748,13 +1748,13 @@ (set! (-> gp-6 quad) (-> self gun top-anim-look-at quad)) (case (-> self gun gun-type) (((pickup-type eco-yellow)) - (set! (-> gp-6 y) (+ -409.6 (-> gp-6 y))) + (+! (-> gp-6 y) -409.6) ) (((pickup-type eco-blue)) - (set! (-> gp-6 y) (+ 2457.6 (-> gp-6 y))) + (+! (-> gp-6 y) 2457.6) ) (else - (set! (-> gp-6 y) (+ -1638.4 (-> gp-6 y))) + (+! (-> gp-6 y) -1638.4) ) ) (if (not (logtest? (surface-flag gun-no-twist) (-> self control current-surface flags))) diff --git a/goal_src/jak2/engine/target/target-handler.gc b/goal_src/jak2/engine/target/target-handler.gc index 0610be85d4..ae56ee3abb 100644 --- a/goal_src/jak2/engine/target/target-handler.gc +++ b/goal_src/jak2/engine/target/target-handler.gc @@ -200,7 +200,7 @@ ) ) (logior! (-> self focus-status) (focus-status dead)) - (set! (-> self state-flags) (logior (state-flags disable-attacks) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags disable-attacks)) ) (go arg4 arg0 (-> self attack-info-rec)) ) @@ -759,7 +759,7 @@ v0-0 ) (('continue) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (go target-continue (the-as continue-point (-> arg3 param 0))) ) (('query) @@ -1252,7 +1252,7 @@ (go target-darkjak-get-on (the-as int (-> arg3 param 2))) ) ((logtest? (-> arg3 param 2) 128) - (set! (-> self darkjak stage) (logand -2 (-> self darkjak stage))) + (logand! (-> self darkjak stage) -2) (set! v0-0 (+ (- (seconds 20) (-> self fact darkjak-start-time)) (current-time))) (set! (-> self fact darkjak-effect-time) (the-as time-frame v0-0)) v0-0 diff --git a/goal_src/jak2/engine/target/target-part.gc b/goal_src/jak2/engine/target/target-part.gc index 41a522ba45..4b0cbd6a83 100644 --- a/goal_src/jak2/engine/target/target-part.gc +++ b/goal_src/jak2/engine/target/target-part.gc @@ -35,7 +35,7 @@ ) (set! (-> s4-0 start-pos quad) (-> arg2 launchrot quad)) (set-vector! (-> s4-0 move-dist) 0.0 -20480.0 0.0 1.0) - (set! (-> s4-0 start-pos y) (+ 4096.0 (-> s4-0 start-pos y))) + (+! (-> s4-0 start-pos y) 4096.0) (let ((v1-3 s4-0)) (set! (-> v1-3 radius) 40.96) (set! (-> v1-3 collide-with) (collide-spec diff --git a/goal_src/jak2/engine/target/target-swim.gc b/goal_src/jak2/engine/target/target-swim.gc index f484ecb596..3e9ea61646 100644 --- a/goal_src/jak2/engine/target/target-swim.gc +++ b/goal_src/jak2/engine/target/target-swim.gc @@ -382,7 +382,7 @@ (set! (-> self state-time) (current-time)) (set! (-> self control mod-surface) *swim-mods*) (logior! (-> self water flags) (water-flags swim-ground)) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (none) ) :exit (behavior () @@ -536,7 +536,7 @@ ((-> target-swim-stance enter)) (die-on-next-update! (-> self water bob)) (set! (-> self control unknown-word04) (the-as uint (current-time))) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (none) ) :exit (-> target-swim-stance exit) @@ -696,7 +696,7 @@ ) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (logclear! (-> self water flags) (water-flags swim-ground)) (set! (-> self control mod-surface) *dive-mods*) (set! (-> self control dynam gravity-max) 16384.0) @@ -1024,7 +1024,7 @@ :trans (behavior () (cond ((< (- (current-time) (-> self state-time)) (seconds 0.5)) - (set! (-> self water flags) (logior (water-flags jump-out) (-> self water flags))) + (logior! (-> self water flags) (water-flags jump-out)) (logclear! (-> self control status) (collide-status on-surface on-ground touch-surface)) ) (else @@ -1045,7 +1045,7 @@ ((-> target-swim-stance exit)) (die-on-next-update! (-> self water bob)) (set! (-> self water align-offset) 0.0) - (set! (-> self water flags) (logior (water-flags jump-out) (-> self water flags))) + (logior! (-> self water flags) (water-flags jump-out)) (none) ) :code (behavior ((arg0 float) (arg1 float)) diff --git a/goal_src/jak2/engine/target/target-tube.gc b/goal_src/jak2/engine/target/target-tube.gc index 3a5de17817..eec4926a87 100644 --- a/goal_src/jak2/engine/target/target-tube.gc +++ b/goal_src/jak2/engine/target/target-tube.gc @@ -591,7 +591,7 @@ (target-collide-set! 'tube 0.0) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control ctrl-xz-vel) 0.0) - (set! (-> self focus-status) (logior (focus-status tube) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status tube)) (remove-exit) (cond ((< (the-as diff --git a/goal_src/jak2/engine/target/target-turret.gc b/goal_src/jak2/engine/target/target-turret.gc index f84dd0ce2f..3d052ebea4 100644 --- a/goal_src/jak2/engine/target/target-turret.gc +++ b/goal_src/jak2/engine/target/target-turret.gc @@ -1576,7 +1576,7 @@ ) (let ((gp-3 (new 'stack-no-clear 'vector))) (set! (-> gp-3 quad) (-> self root trans quad)) - (set! (-> gp-3 y) (+ 8192.0 (-> gp-3 y))) + (+! (-> gp-3 y) 8192.0) (let ((s5-2 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-2 (let ((t9-13 (method-of-type part-tracker activate))) @@ -1877,7 +1877,7 @@ (vector-rotate-y! s3-0 s3-0 f30-0) (set! (-> s2-0 start-pos quad) (-> s5-0 quad)) (set-vector! (-> s2-0 move-dist) 0.0 -24576.0 0.0 0.0) - (set! (-> s2-0 start-pos y) (+ 2048.0 (-> s2-0 start-pos y))) + (+! (-> s2-0 start-pos y) 2048.0) (let ((v1-9 s2-0)) (set! (-> v1-9 radius) 409.6) (set! (-> v1-9 collide-with) (collide-spec backgnd)) @@ -2497,7 +2497,7 @@ This commonly includes things such as: (ja-post) (let ((gp-4 (new 'stack-no-clear 'vector))) (vector<-cspace! gp-4 (-> self node-list data 3)) - (set! (-> gp-4 y) (+ -9011.2 (-> gp-4 y))) + (+! (-> gp-4 y) -9011.2) (move-to-point! (-> self control) gp-4) ) (send-event *camera* 'ease-in) diff --git a/goal_src/jak2/engine/target/target-util.gc b/goal_src/jak2/engine/target/target-util.gc index 1197916d58..f39d9af1b4 100644 --- a/goal_src/jak2/engine/target/target-util.gc +++ b/goal_src/jak2/engine/target/target-util.gc @@ -462,7 +462,7 @@ ) (set! (-> self control penetrate-using) (penetrate touch punch)) (if (and (focus-test? self dark) (nonzero? (-> self darkjak)) (logtest? (-> self darkjak stage) 2)) - (set! (-> self control penetrate-using) (logior (penetrate dark-punch) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate dark-punch)) ) ) (('uppercut) @@ -606,9 +606,9 @@ ) ) (when (and (focus-test? self dark) (nonzero? (-> self darkjak))) - (set! (-> self control penetrate-using) (logior (penetrate dark-skin) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate dark-skin)) (when (and (focus-test? self dark) (nonzero? (-> self darkjak)) (logtest? (-> self darkjak stage) 32)) - (set! (-> self control penetrate-using) (logior (penetrate dark-giant) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate dark-giant)) (let ((f0-46 (lerp-scale 1.0 (-> self darkjak-giant-interp) (-> self darkjak-interp) 0.0 1.0))) (set! (-> self control root-prim local-sphere w) (* (-> self control root-prim local-sphere w) f0-46)) (set! (-> self control root-prim local-sphere y) (* (-> self control root-prim local-sphere y) f0-46)) @@ -624,13 +624,13 @@ ) (case (-> self fact eco-type) ((1) - (set! (-> self control penetrate-using) (logior (penetrate eco-yellow) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate eco-yellow)) ) ((2) - (set! (-> self control penetrate-using) (logior (penetrate eco-red) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate eco-red)) ) ((3) - (set! (-> self control penetrate-using) (logior (penetrate eco-blue) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate eco-blue)) ) ((5) (set! (-> self control penetrate-using) @@ -1415,7 +1415,7 @@ (set! (-> arg1 control invul1-off-time) arg0) ) ((2) - (set! (-> arg1 state-flags) (logior (state-flags tinvul2) (-> arg1 state-flags))) + (logior! (-> arg1 state-flags) (state-flags tinvul2)) (set! (-> arg1 control invul2-on-time) (current-time)) (set! (-> arg1 control invul2-off-time) arg0) ) diff --git a/goal_src/jak2/engine/target/target.gc b/goal_src/jak2/engine/target/target.gc index 5cc7bb586a..ba612eaae1 100644 --- a/goal_src/jak2/engine/target/target.gc +++ b/goal_src/jak2/engine/target/target.gc @@ -1040,7 +1040,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (until #f (if (= (-> self skel root-channel 0) (-> self skel channel)) (set! (-> self control mod-surface) *duck-mods*) diff --git a/goal_src/jak2/engine/ui/progress/progress-draw.gc b/goal_src/jak2/engine/ui/progress/progress-draw.gc index 0f33bb340a..688bbf3f4d 100644 --- a/goal_src/jak2/engine/ui/progress/progress-draw.gc +++ b/goal_src/jak2/engine/ui/progress/progress-draw.gc @@ -623,12 +623,12 @@ (set! a0-8 (cond (arg3 - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-1 arg1)) (set! (-> a0-1 color) (font-color progress-force-selected)) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond ((-> s3-0 0) (format @@ -682,12 +682,12 @@ (set! a0-8 (cond (arg3 - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-1 arg1)) (set! (-> a0-1 color) (font-color progress-force-selected)) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond ((-> s3-0 0) (format @@ -737,23 +737,23 @@ ) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ 43.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 43.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 52.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 52.0) ) ) (cond ((and (= (-> *progress-state* graphic-options-item-selected) 3) (-> *progress-state* graphic-options-item-picked) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-6 arg1)) (set! (-> a0-6 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 44 f28-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (cond ((= (-> s3-0 0) 'pal) (format @@ -793,9 +793,9 @@ ) ) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (cond ((= (-> s3-0 0) 'pal) (format @@ -852,7 +852,7 @@ 32 ) ) - (set! (-> arg1 origin y) (+ 8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 8.0) (cond ((= (-> obj name) (text-id progress-main-secrets-scrapbook)) (cond @@ -2043,7 +2043,7 @@ (set! (-> arg1 origin y) 80.0) (set! (-> arg1 height) 52.0) (+! (-> arg1 origin y) (the float (* 42 (+ arg2 1)))) - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -100.0) ) (else (case (get-aspect-ratio) @@ -2051,13 +2051,13 @@ (set! (-> arg1 origin y) 74.0) (set! (-> arg1 height) 42.0) (+! (-> arg1 origin y) (the float (* 60 (+ arg2 1)))) - (set! (-> arg1 origin x) (+ -90.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -90.0) ) (('aspect4x3) (set! (-> arg1 origin y) 74.0) (set! (-> arg1 height) 42.0) (+! (-> arg1 origin y) (the float (* 54 (+ arg2 1)))) - (set! (-> arg1 origin x) (+ -90.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -90.0) ) ) ) @@ -2306,8 +2306,8 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-8 (-> *level* default-level)) ) - (set! (-> arg1 origin y) (+ 1.0 (-> arg1 origin y))) - (set! (-> arg1 origin x) (+ 28.0 (-> arg1 origin x))) + (+! (-> arg1 origin y) 1.0) + (+! (-> arg1 origin x) 28.0) (let* ((v1-272 (-> *progress-save-info* file arg2 game-time0)) (v1-273 (logior (shl (-> *progress-save-info* file arg2 game-time1) 32) v1-272)) (s2-11 (/ (the-as int v1-273) #x107ac0)) @@ -2325,7 +2325,7 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-10 (-> *level* default-level)) ) - (set! (-> arg1 origin x) (+ 100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 100.0) (let ((s2-13 print-game-text)) (format (clear *temp-string*) "~D%" (the int (-> *progress-save-info* file arg2 completion-percentage))) (s2-13 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -2337,7 +2337,7 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-12 (-> *level* default-level)) ) - (set! (-> arg1 origin y) (+ 28.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 28.0) (let ((s2-15 print-game-text)) (format (clear *temp-string*) "~D" (the int (-> *progress-save-info* file arg2 skill-count))) (s2-15 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -2351,7 +2351,7 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-14 (-> *level* default-level)) ) - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -100.0) (let ((s2-17 print-game-text)) (format (clear *temp-string*) "~D" (the int (-> *progress-save-info* file arg2 gem-count))) (s2-17 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -2452,7 +2452,7 @@ (print-game-text (lookup-text! *common-text* (the-as text-id a1-1) #f) arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (let ((v1-25 arg1)) (set! (-> v1-25 height) (the float 160)) ) @@ -2501,7 +2501,7 @@ (s3-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 80.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 80.0) (let ((v1-17 arg1)) (set! (-> v1-17 height) (the float 50)) ) @@ -2516,7 +2516,7 @@ ) (s4-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 55.0) (let ((v1-22 arg1)) (set! (-> v1-22 height) (the float 90)) ) @@ -2531,7 +2531,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (let ((s5-2 arg1)) (set! (-> s5-2 color) (progress-selected 0)) ) @@ -2548,7 +2548,7 @@ (let ((s4-2 arg1)) (set! (-> s4-2 color) (progress-selected 0)) ) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (draw-highlight (the int (+ 30.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-continue-retry arg0 arg1) ) @@ -2584,7 +2584,7 @@ (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 140.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 140.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 30)) ) @@ -2630,7 +2630,7 @@ ) (s5-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 115.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 60)) ) @@ -2685,7 +2685,7 @@ (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 105)) ) @@ -2697,7 +2697,7 @@ ) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 115.0) (let ((v1-19 arg1)) (set! (-> v1-19 height) (the float 45)) ) @@ -2742,7 +2742,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 60)) ) @@ -2750,7 +2750,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-check) #f) 1) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 45)) ) @@ -2761,7 +2761,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 95)) ) @@ -2772,7 +2772,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 90.0) (let ((v1-19 arg1)) (set! (-> v1-19 height) (the float 25)) ) @@ -2814,7 +2814,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-was-removed) #f) 1) (s5-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 65.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 65.0) (print-game-text (lookup-text! *common-text* (text-id progress-autosave-disabled) #f) arg1 @@ -2822,7 +2822,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 65.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 65.0) (let ((v1-12 arg1)) (set! (-> v1-12 height) (the float 90)) ) @@ -2833,7 +2833,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 85.0) (let ((v1-15 arg1)) (set! (-> v1-15 height) (the float 35)) ) @@ -2878,7 +2878,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 85)) ) @@ -2890,7 +2890,7 @@ (bucket-id progress) ) (when (is-cd-in?) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-14 arg1)) (set! (-> v1-14 height) (the float 50)) ) @@ -2936,7 +2936,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 55.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 85)) ) @@ -2947,7 +2947,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 105.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 50)) ) @@ -3010,7 +3010,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 115.0) (let ((v1-31 arg1)) (set! (-> v1-31 height) (the float 95)) ) @@ -3021,7 +3021,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 90.0) (let ((v1-34 arg1)) (set! (-> v1-34 height) (the float 50)) ) @@ -3063,7 +3063,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-unformatted) #f) 1) (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 85)) ) @@ -3074,7 +3074,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 25)) ) @@ -3086,7 +3086,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (draw-yes-no arg0 arg1) 0 (none) @@ -3118,7 +3118,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 105.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 45)) ) @@ -3129,7 +3129,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (draw-highlight (the int (+ 8.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3159,7 +3159,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-no-jak2-found) #f) 1) (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 60)) ) @@ -3170,7 +3170,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (draw-highlight (the int (+ 18.0 (-> arg1 origin y))) 22 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3203,7 +3203,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 95)) ) @@ -3214,7 +3214,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 85.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 55)) ) @@ -3225,7 +3225,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 30)) ) @@ -3236,7 +3236,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (draw-highlight (the int (-> arg1 origin y)) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3269,7 +3269,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 50)) ) @@ -3280,7 +3280,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (draw-highlight (the int (+ 12.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3313,7 +3313,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 90)) ) @@ -3324,7 +3324,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 85.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 75)) ) @@ -3335,7 +3335,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 30)) ) @@ -3346,7 +3346,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (draw-highlight (the int (-> arg1 origin y)) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3379,7 +3379,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 100.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 100.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 75)) ) @@ -3390,7 +3390,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (draw-highlight (the int (+ 20.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3423,7 +3423,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (draw-highlight (the int (+ 17.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -4006,7 +4006,7 @@ (let ((a0-27 arg1)) (set! (-> a0-27 flags) (font-flags kerning large)) ) - (set! (-> arg1 origin x) (+ 20.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 20.0) (case (get-aspect-ratio) (('aspect16x9) (set! (-> arg1 origin y) 80.0) @@ -4122,14 +4122,14 @@ (s3-6 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin x) (+ 20.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 20.0) (let ((f30-3 3.0) (s4-7 print-game-text) ) (format (clear *temp-string*) "~S" s5-1) (set! f0-50 (+ f30-3 (s4-7 *temp-string* arg1 #f 44 (bucket-id progress)))) ) - (set! (-> arg1 origin x) (+ -20.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -20.0) f0-50 ) (else @@ -4179,10 +4179,10 @@ ((not (-> arg0 can-toggle)) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg2 origin x) (+ -25.0 (-> arg2 origin x))) + (+! (-> arg2 origin x) -25.0) ) (('aspect16x9) - (set! (-> arg2 origin x) (+ -10.0 (-> arg2 origin x))) + (+! (-> arg2 origin x) -10.0) ) ) (when (= (-> *setting-control* user-default language) (language-enum german)) @@ -4702,7 +4702,7 @@ (let ((v1-18 sv-16)) (set! (-> v1-18 scale) 0.5) ) - (set! (-> sv-16 origin y) (+ 23.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 23.0) (let ((gp-3 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-2nd) #f)) (gp-3 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -4722,7 +4722,7 @@ (let ((v1-31 sv-16)) (set! (-> v1-31 scale) 0.4) ) - (set! (-> sv-16 origin y) (+ 20.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 20.0) (let ((gp-5 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-3rd) #f)) (gp-5 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -4742,7 +4742,7 @@ (let ((v1-44 sv-16)) (set! (-> v1-44 scale) 0.3) ) - (set! (-> sv-16 origin y) (+ 15.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 15.0) (let ((gp-7 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-4th) #f)) (gp-7 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -4759,7 +4759,7 @@ ) ) ((= v1-8 4) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-9 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-5th) #f)) (gp-9 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -4776,7 +4776,7 @@ ) ) ((= v1-8 5) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-11 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-6th) #f)) (gp-11 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -4793,7 +4793,7 @@ ) ) ((= v1-8 6) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-13 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-7th) #f)) (gp-13 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -4810,7 +4810,7 @@ ) ) ((= v1-8 7) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-15 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-8th) #f)) (gp-15 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -5417,7 +5417,7 @@ (let ((v1-40 sv-140)) (set! (-> v1-40 height) 185.0) ) - (set! (-> sv-140 origin y) (+ 46.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 46.0) (set! (-> sv-140 origin x) 65.0) (let ((v1-46 sv-140)) (set! (-> v1-46 width) (the float 367)) @@ -5455,7 +5455,7 @@ ) (gp-1 *temp-string* sv-140 #f 44 (bucket-id progress)) ) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (let ((v1-68 sv-140)) (set! (-> v1-68 scale) 0.6) ) @@ -5475,7 +5475,7 @@ (gp-2 *temp-string* sv-140 #f 44 (bucket-id progress)) ) (set! (-> sv-140 origin x) (- (-> sv-140 origin x) (+ 20.0 sv-120))) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (draw-highscore-icon sv-144 (get-highscore-icon (-> sv-144 page-index)) @@ -5530,7 +5530,7 @@ (let ((v1-128 sv-140)) (set! (-> v1-128 height) 185.0) ) - (set! (-> sv-140 origin y) (+ 46.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 46.0) (set! (-> sv-140 origin x) 80.0) (set! (-> sv-144 sprites 0 pos z) #xffffff) (let ((v1-135 sv-140)) @@ -5569,7 +5569,7 @@ ) (gp-6 *temp-string* sv-140 #f 44 (bucket-id progress)) ) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (let ((v1-157 sv-140)) (set! (-> v1-157 scale) 0.6) ) @@ -5589,7 +5589,7 @@ (gp-7 *temp-string* sv-140 #f 44 (bucket-id progress)) ) (set! (-> sv-140 origin x) (- (-> sv-140 origin x) (+ 20.0 sv-124))) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (draw-highscore-icon sv-144 (get-highscore-icon (-> sv-144 prev-page-index)) @@ -5652,17 +5652,17 @@ (let ((v1-4 arg1)) (set! (-> v1-4 scale) 0.65) ) - (set! (-> arg1 origin y) (+ 15.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 15.0) (let ((s3-0 (-> *progress-state* game-options-vibrations))) (cond ((and (zero? (-> *progress-state* game-options-item-selected)) (-> *progress-state* game-options-item-picked)) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-2 arg1)) (set! (-> a0-2 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -5685,7 +5685,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (cond ((zero? (-> *progress-state* game-options-item-selected)) (let ((s2-3 arg1)) @@ -5700,7 +5700,7 @@ ) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -5740,17 +5740,17 @@ (let ((v1-4 arg1)) (set! (-> v1-4 scale) 0.65) ) - (set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 22.0) (let ((s3-0 (-> *progress-state* game-options-subtitles))) (cond ((and (= (-> *progress-state* game-options-item-selected) 1) (-> *progress-state* game-options-item-picked)) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-3 arg1)) (set! (-> a0-3 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -5773,7 +5773,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (cond ((= (-> *progress-state* game-options-item-selected) 1) (let ((s2-3 arg1)) @@ -5788,7 +5788,7 @@ ) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -5826,10 +5826,10 @@ ) (case arg2 ((2) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) ) ((3) - (set! (-> arg1 origin y) (+ 32.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 32.0) ) ) (if (< f30-0 0.0) @@ -5847,7 +5847,7 @@ ) (draw-highlight (the int (-> arg1 origin y)) 44 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (-> obj language-selection) (let ((s4-1 (-> s4-0 0))) 7 @@ -5870,18 +5870,18 @@ (let ((a0-14 arg1)) (set! (-> a0-14 color) (font-color progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-1 print-game-text)) (format (clear *temp-string*) "~33L~C" 163) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 70.0) + (+! (-> arg1 origin x) 70.0) (let ((s5-2 print-game-text)) (format (clear *temp-string*) "~33L~C" 161) (s5-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-3 arg1)) (set! (-> s5-3 color) (progress-selected 0)) ) @@ -5924,7 +5924,7 @@ (let ((a0-36 arg1)) (set! (-> a0-36 color) (font-color progress)) ) - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (let ((a0-37 arg1)) (set! (-> a0-37 flags) (font-flags kerning middle large)) ) @@ -5959,10 +5959,10 @@ ) (case arg2 ((2) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) ) ((3) - (set! (-> arg1 origin y) (+ 32.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 32.0) ) ) (if (< f30-0 0.0) @@ -5983,7 +5983,7 @@ (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> obj name) #f)) (s3-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (-> obj language-selection) (let ((s4-1 (-> s4-0 0))) 7 @@ -6006,18 +6006,18 @@ (let ((a0-16 arg1)) (set! (-> a0-16 color) (font-color progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-1 print-game-text)) (format (clear *temp-string*) "~33L~C" 163) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 70.0) + (+! (-> arg1 origin x) 70.0) (let ((s5-2 print-game-text)) (format (clear *temp-string*) "~33L~C" 161) (s5-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-3 arg1)) (set! (-> s5-3 color) (progress-selected 0)) ) @@ -6065,7 +6065,7 @@ ) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *language-name-remap* (-> s4-0 0)) #f)) *temp-string* - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (let ((a0-44 arg1)) (set! (-> a0-44 flags) (font-flags kerning middle large)) ) @@ -6127,19 +6127,19 @@ (set! (-> v1-5 scale) 0.75) ) (set! (-> arg1 height) 35.0) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (let ((s3-0 (-> *progress-state* graphic-options-aspect-ratio))) (cond ((and (= (-> *progress-state* graphic-options-item-selected) 1) (-> *progress-state* graphic-options-item-picked) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-4 arg1)) (set! (-> a0-4 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 23.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 23.0) (cond ((= s3-0 'aspect4x3) (format @@ -6162,7 +6162,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (when (not (and (zero? (-> *progress-state* graphic-options-item-selected)) (-> *progress-state* graphic-options-item-picked) ) @@ -6182,7 +6182,7 @@ ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 23.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 23.0) (cond ((= s3-0 'aspect4x3) (format @@ -6234,19 +6234,19 @@ (set! (-> v1-4 scale) 0.75) ) (set! (-> arg1 height) 35.0) - (set! (-> arg1 origin y) (+ 35.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 35.0) (let ((s3-0 (-> *progress-state* graphic-options-progressive-scan))) (cond ((and (= (-> *progress-state* graphic-options-item-selected) 2) (-> *progress-state* graphic-options-item-picked) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-3 arg1)) (set! (-> a0-3 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -6269,7 +6269,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (when (not (and (zero? (-> *progress-state* graphic-options-item-selected)) (-> *progress-state* graphic-options-item-picked) ) @@ -6289,7 +6289,7 @@ ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -6349,10 +6349,10 @@ (set! (-> arg1 origin x) 80.0) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ 5.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 5.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 30.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 30.0) ) ) (when (= (-> *setting-control* user-default language) (language-enum french)) @@ -6364,7 +6364,7 @@ (format (clear *temp-string*) "~33L~C" 160) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 21.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 21.0) (let ((s5-2 print-game-text)) (format (clear *temp-string*) @@ -6375,7 +6375,7 @@ ) (s5-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 21.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 21.0) (let ((s5-3 print-game-text)) (format (clear *temp-string*) "~33L~C" 162) (s5-3 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -6389,10 +6389,10 @@ ) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ -3.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -3.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 10.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 10.0) ) ) (let ((v1-37 arg1)) @@ -6407,7 +6407,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ 5.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 5.0) (cond ((zero? (-> *progress-state* graphic-options-item-selected)) (let ((s4-3 arg1)) @@ -6440,7 +6440,7 @@ (set! (-> v1-4 scale) 0.75) ) (set! (-> arg1 height) 35.0) - (set! (-> arg1 origin y) (+ 5.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 5.0) (let ((s4-0 (&-> *progress-state* yes-no-choice))) (set! a0-11 (cond @@ -6450,7 +6450,7 @@ ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f0-1) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (let ((v1-17 arg1)) (set! (-> v1-17 scale) 0.6) ) @@ -6502,7 +6502,7 @@ (let ((v1-4 arg1)) (set! (-> v1-4 scale) 0.75) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (set! (-> arg1 height) 35.0) (let ((s4-0 (&-> *progress-state* yes-no-choice))) (set! a0-12 @@ -6513,7 +6513,7 @@ ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (let ((v1-18 arg1)) (set! (-> v1-18 scale) 0.6) ) @@ -6618,22 +6618,22 @@ (let ((v1-13 s5-0)) (set! (-> v1-13 scale) 0.6) ) - (set! (-> s5-0 origin y) (+ 20.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 20.0) (case (get-aspect-ratio) (('aspect4x3) (set! s2-0 157) (let ((v1-17 gp-0)) (cond ((zero? v1-17) - (set! (-> s5-0 origin y) (+ -24.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -24.0) (+! s2-0 -9) ) ((= v1-17 1) - (set! (-> s5-0 origin y) (+ -9.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -9.0) (+! s2-0 43) ) ((= v1-17 2) - (set! (-> s5-0 origin y) (+ 6.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 6.0) (+! s2-0 96) ) ) @@ -6647,15 +6647,15 @@ (let ((v1-28 gp-0)) (cond ((zero? v1-28) - (set! (-> s5-0 origin y) (+ -20.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -20.0) (+! s2-0 -20) ) ((= v1-28 1) - (set! (-> s5-0 origin y) (+ 2.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 2.0) (+! s2-0 40) ) ((= v1-28 2) - (set! (-> s5-0 origin y) (+ 30.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 30.0) (+! s2-0 105) ) ) @@ -6669,7 +6669,7 @@ (cond (sv-32 (set! sv-128 (-> obj value-to-modify)) - (set! (-> s5-0 origin y) (+ -8.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -8.0) (let ((a0-12 s5-0)) (set! (-> a0-12 color) (font-color progress-force-selected)) ) @@ -6679,7 +6679,7 @@ (a1-3 s5-0) (a2-3 #f) (a3-1 44) - (t0-1 (bucket-id progress)) + (t0-1 320) ) (sv-144 a0-15 a1-3 a2-3 a3-1 (the-as bucket-id t0-1)) ) @@ -6794,7 +6794,7 @@ ) (else (set! sv-208 (-> obj value-to-modify)) - (set! (-> s5-0 origin y) (+ -8.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -8.0) (when (or (= (-> *setting-control* user-default language) (language-enum german)) (= (-> *setting-control* user-default language) (language-enum french)) ) @@ -6810,7 +6810,7 @@ (a1-21 s5-0) (a2-18 #f) (a3-8 44) - (t0-4 (bucket-id progress)) + (t0-4 320) ) (sv-224 a0-81 a1-21 a2-18 a3-8 (the-as bucket-id t0-4)) ) @@ -6957,10 +6957,10 @@ ((begin (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ 32.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 32.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) ) ) (set! s5-0 (-> *setting-control* user-default stereo-mode)) @@ -6974,7 +6974,7 @@ (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> obj name) #f)) (s3-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 22.0) (let ((a0-13 arg1)) (set! (-> a0-13 color) (font-color progress)) ) @@ -6984,18 +6984,18 @@ (let ((a0-15 arg1)) (set! (-> a0-15 color) (font-color progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s4-1 print-game-text)) (format (clear *temp-string*) "~33L~C" 163) (s4-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 70.0) + (+! (-> arg1 origin x) 70.0) (let ((s4-2 print-game-text)) (format (clear *temp-string*) "~33L~C" 161) (s4-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s4-3 arg1)) (set! (-> s4-3 color) (progress-selected 0)) ) @@ -7029,7 +7029,7 @@ ) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *stereo-mode-name-remap* s5-0) #f)) (let ((a0-37 *temp-string*)) - (set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 22.0) (let ((a1-19 arg1)) (set! (-> a1-19 flags) (font-flags kerning middle large)) ) @@ -7068,13 +7068,13 @@ (set! s1-0 36) (+! s2-0 -8) (when (memcard-unlocked-secrets? #f) - (set! (-> arg1 origin y) (+ -35.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -35.0) (set! s1-0 36) (+! s2-0 -34) ) ) ((= *options* (-> arg0 current-options)) - (set! (-> arg1 origin y) (+ -20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -20.0) (let ((v1-16 arg1)) (set! (-> v1-16 scale) 0.85) ) @@ -7129,7 +7129,7 @@ ) ) ) - (set! (-> arg1 origin y) (+ -120.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -120.0) (set! (-> arg1 origin x) (- (-> arg1 origin x) (the float (if (= (get-aspect-ratio) 'aspect4x3) 10 5 @@ -7215,14 +7215,14 @@ ) ) (else - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -100.0) (set! (-> arg1 origin y) (+ -35.0 (-> arg1 origin y))) ) ) ) ((= *load-save-options* (-> arg0 current-options)) - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) - (set! (-> arg1 origin y) (+ -25.0 (-> arg1 origin y))) + (+! (-> arg1 origin x) -100.0) + (+! (-> arg1 origin y) -25.0) (print-menu-text (lookup-text! *common-text* (-> obj name) #f) (-> obj scale) arg1 arg0) ) ((and (= *title* (-> arg0 current-options)) diff --git a/goal_src/jak2/engine/ui/progress/progress-static.gc b/goal_src/jak2/engine/ui/progress/progress-static.gc index 92b13a6862..48b3304a12 100644 --- a/goal_src/jak2/engine/ui/progress/progress-static.gc +++ b/goal_src/jak2/engine/ui/progress/progress-static.gc @@ -806,15 +806,24 @@ ) ) -(define *language-name-remap* - (the-as (array text-id) - (new 'static 'boxed-array :type uint32 #x111 #x112 #x113 #x114 #x115 #x117 #x116 #x30b) - ) - ) +(define *language-name-remap* (new 'static 'boxed-array :type text-id + (text-id text-x111) + (text-id text-x112) + (text-id text-x113) + (text-id text-x114) + (text-id text-x115) + (text-id text-x117) + (text-id text-x116) + (text-id text-x30b) + ) + ) -(define *stereo-mode-name-remap* - (the-as (array text-id) (new 'static 'boxed-array :type uint32 #x104 #x105 #x106)) - ) +(define *stereo-mode-name-remap* (new 'static 'boxed-array :type text-id + (text-id progress-sound-mono) + (text-id progress-sound-stereo) + (text-id progress-sound-surround) + ) + ) (define *hud-ring-graphic-remap* (new 'static 'boxed-array :type uint64 #x80 #x40 #x10 #x4 #x8 #x400 #x20 #x100 #x200 #x2) diff --git a/goal_src/jak2/engine/ui/progress/progress.gc b/goal_src/jak2/engine/ui/progress/progress.gc index 3e046ed55c..b620c15045 100644 --- a/goal_src/jak2/engine/ui/progress/progress.gc +++ b/goal_src/jak2/engine/ui/progress/progress.gc @@ -409,7 +409,7 @@ (s4-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) ) - (set! (-> s3-0 y) (+ -8.0 (-> s3-0 y))) + (+! (-> s3-0 y) -8.0) (case (get-aspect-ratio) (('aspect4x3) (position-in-front-of-screen! s4-0 12288.0 s3-0) @@ -1216,8 +1216,8 @@ (let ((f0-54 (- (-> self ring-want-angle) (-> self ring-angle)))) (when (< 32768.0 (fabs f0-54)) (if (< 0.0 f0-54) - (set! (-> self ring-angle) (+ 65536.0 (-> self ring-angle))) - (set! (-> self ring-angle) (+ -65536.0 (-> self ring-angle))) + (+! (-> self ring-angle) 65536.0) + (+! (-> self ring-angle) -65536.0) ) ) ) diff --git a/goal_src/jak2/engine/ui/text-id-h.gc b/goal_src/jak2/engine/ui/text-id-h.gc index f1b30d7ba9..b4a28ffd58 100644 --- a/goal_src/jak2/engine/ui/text-id-h.gc +++ b/goal_src/jak2/engine/ui/text-id-h.gc @@ -83,6 +83,13 @@ (progress-on #x10e) (progress-off #x10f) (progress-move-dpad #x110) + (text-x111 #x111) + (text-x112 #x112) + (text-x113 #x113) + (text-x114 #x114) + (text-x115 #x115) + (text-x116 #x116) + (text-x117 #x117) (progress-aspect-ratio #x118) (progress-progressive-scan #x119) (progress-video-mode #x11a) @@ -555,6 +562,7 @@ (scene-nest-boss-intro #x306) (scene-intro #x307) (scene-outro #x308) + (text-x30b #x30b) (scene-subtitles-hint #x30c) (scene-subtitles-enabled #x30d) (scene-subtitles-disabled #x30e) diff --git a/goal_src/jak2/levels/atoll/ash1-course.gc b/goal_src/jak2/levels/atoll/ash1-course.gc index 4b9c2f0770..d3677fbb61 100644 --- a/goal_src/jak2/levels/atoll/ash1-course.gc +++ b/goal_src/jak2/levels/atoll/ash1-course.gc @@ -137,7 +137,7 @@ (set! (-> (the-as asht-wait-spot v1-1) check-done) (lambda ((arg0 asht-wait-spot) (arg1 ashelin-battle)) (when (scene-release? arg1) - (set! (-> arg1 bot-flags) (logior (bot-flags bf20) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf20)) (let ((s5-0 (-> arg1 ash-course spots))) (vector-! (the-as vector (-> arg1 frontline)) (the-as vector (-> s5-0 2)) (the-as vector (-> s5-0 1))) (vector-normalize! (-> arg1 frontline) 1.0) diff --git a/goal_src/jak2/levels/atoll/atoll-obs.gc b/goal_src/jak2/levels/atoll/atoll-obs.gc index 042b333dfe..64e9dd78b5 100644 --- a/goal_src/jak2/levels/atoll/atoll-obs.gc +++ b/goal_src/jak2/levels/atoll/atoll-obs.gc @@ -155,7 +155,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (set! (-> obj sound-trans quad) (-> obj root trans quad)) - (set! (-> obj root trans y) (+ 53248.0 (-> obj root trans y))) + (+! (-> obj root trans y) 53248.0) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-piston" (the-as (pointer uint32) #f))) @@ -200,7 +200,7 @@ This commonly includes things such as: (set! (-> obj range-top) (* 4096.0 f30-0)) ) (set! (-> obj init-height) (-> obj root trans y)) - (set! (-> obj root trans y) (+ -40960.0 (-> obj root trans y))) + (+! (-> obj root trans y) -40960.0) (cond ((logtest? (actor-option user18) (-> obj fact options)) (set! (-> obj looping-id) (new-sound-id)) @@ -331,7 +331,7 @@ This commonly includes things such as: (set! (-> obj root) s4-0) ) (process-drawable-from-entity! obj arg0) - (set! (-> obj root trans y) (+ 73728.0 (-> obj root trans y))) + (+! (-> obj root trans y) 73728.0) (logclear! (-> obj mask) (process-mask actor-pause)) (initialize-skeleton obj @@ -510,7 +510,7 @@ This commonly includes things such as: ) ) ) - (set! (-> obj root trans y) (+ 55558.145 (-> obj root trans y))) + (+! (-> obj root trans y) 55558.145) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-liftcat" (the-as (pointer uint32) #f))) @@ -518,7 +518,7 @@ This commonly includes things such as: ) (let ((v1-24 (-> obj root))) (set! (-> obj down-y) (-> v1-24 trans y)) - (set! (-> v1-24 trans y) (+ 28672.0 (-> v1-24 trans y))) + (+! (-> v1-24 trans y) 28672.0) (set! (-> obj up-y) (-> v1-24 trans y)) (vector-reset! (-> v1-24 transv)) ) @@ -1034,7 +1034,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((a1-1 (new 'stack-no-clear 'sync-info-params))) (let ((v1-2 0)) (if #f @@ -1107,7 +1107,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -1152,7 +1152,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/goal_src/jak2/levels/atoll/atoll-tank.gc b/goal_src/jak2/levels/atoll/atoll-tank.gc index c718346864..46c99ef552 100644 --- a/goal_src/jak2/levels/atoll/atoll-tank.gc +++ b/goal_src/jak2/levels/atoll/atoll-tank.gc @@ -1622,7 +1622,7 @@ ((3 2) (let ((v0-0 (new 'static 'vector :w 1.0))) (set! (-> v0-0 quad) (-> v1-0 trans quad)) - (set! (-> v0-0 y) (+ 12288.0 (-> v0-0 y))) + (+! (-> v0-0 y) 12288.0) v0-0 ) ) diff --git a/goal_src/jak2/levels/atoll/juicer.gc b/goal_src/jak2/levels/atoll/juicer.gc index 725367acf8..6307def098 100644 --- a/goal_src/jak2/levels/atoll/juicer.gc +++ b/goal_src/jak2/levels/atoll/juicer.gc @@ -771,7 +771,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (juicer-method-180 obj) @@ -800,7 +800,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (if (zero? (-> obj hit-points)) @@ -828,7 +828,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (juicer-method-180 obj) @@ -1301,7 +1301,7 @@ ) 0 (set! (-> self torso-track-player) (the-as basic #t)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self hit-focus) #f) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-9 *game-info*) @@ -1530,7 +1530,7 @@ ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) diff --git a/goal_src/jak2/levels/atoll/sig0-course.gc b/goal_src/jak2/levels/atoll/sig0-course.gc index 0c483137cb..bc778e7a95 100644 --- a/goal_src/jak2/levels/atoll/sig0-course.gc +++ b/goal_src/jak2/levels/atoll/sig0-course.gc @@ -755,7 +755,7 @@ (when (and (not (logtest? (-> arg1 waypoint-bits) 4)) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) ) - (set! (-> arg1 waypoint-bits) (logand -5 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -5) (when (not (logtest? (-> arg1 waypoint-bits) 1)) (let ((a1-2 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-2 from) (process->ppointer pp)) @@ -847,7 +847,7 @@ ((and (logtest? (-> arg0 waypoint-bits) 2) (outside-spot-radius? arg0 (the-as bot-spot #f) (the-as vector #f) #f) ) - (set! (-> arg0 waypoint-bits) (logand -3 (-> arg0 waypoint-bits))) + (logand! (-> arg0 waypoint-bits) -3) (let ((f0-0 98304.0)) (if (>= (* f0-0 f0-0) (vector-vector-xz-distance-squared (target-pos 0) (-> arg0 root trans))) (play-speech arg0 34) @@ -859,7 +859,7 @@ (>= (* f0-3 f0-3) (vector-vector-xz-distance-squared (target-pos 0) (-> arg0 root trans))) ) ) - (set! (-> arg0 waypoint-bits) (logand -3 (-> arg0 waypoint-bits))) + (logand! (-> arg0 waypoint-bits) -3) (play-speech arg0 34) ) (else @@ -888,7 +888,7 @@ (>= (- (current-time) (-> arg0 waypoint-time0)) (seconds 1)) (logtest? (-> arg0 waypoint-bits) 16) ) - (set! (-> arg0 waypoint-bits) (logand -17 (-> arg0 waypoint-bits))) + (logand! (-> arg0 waypoint-bits) -17) (talker-spawn-func (-> *talker-speech* 80) *entity-pool* (target-pos 0) (the-as region #f)) ) (when (or (not (logtest? (-> arg0 waypoint-bits) 8)) (>= (- (current-time) (-> arg0 waypoint-time0)) (seconds 8))) @@ -1105,7 +1105,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -1533,7 +1533,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -1935,7 +1935,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -2285,7 +2285,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -2496,7 +2496,7 @@ ) (else (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf20) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf20)) (logclear! (-> arg1 bot-flags) (bot-flags bf20)) ) #f @@ -2597,7 +2597,7 @@ ) (>= (- (current-time) (-> arg0 waypoint-time0)) (seconds 10)) ) - (set! (-> arg0 bot-flags) (logior (bot-flags bf21) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf21)) (logior! (-> arg0 waypoint-bits) 2) ) (else @@ -2924,7 +2924,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -2982,7 +2982,7 @@ (logclear! (-> arg0 enemy-flags) (enemy-flag use-notice-distance)) (logclear! (-> arg0 bot-flags) (bot-flags bf06)) (bot-method-196 arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf22) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf22)) (if (demo?) (send-event *target* 'continue (get-continue-by-name *game-info* "demo-restart")) ) diff --git a/goal_src/jak2/levels/castle/boss/castle-baron.gc b/goal_src/jak2/levels/castle/boss/castle-baron.gc index 785168b46d..c860df54f7 100644 --- a/goal_src/jak2/levels/castle/boss/castle-baron.gc +++ b/goal_src/jak2/levels/castle/boss/castle-baron.gc @@ -915,7 +915,7 @@ For example for an elevator pre-compute the distance between the first and last (none) ) :post (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (let ((a1-0 (new-stack-vector0))) (vector-v++! (-> gp-0 transv) (compute-acc-due-to-gravity gp-0 a1-0 (-> self enemy-info slip-factor))) @@ -1085,7 +1085,7 @@ For example for an elevator pre-compute the distance between the first and last (init-vf0-vector) (+! (-> obj wiggle-angle) (-> obj delta-wiggle-angle)) (if (< 65536.0 (-> obj wiggle-angle)) - (set! (-> obj wiggle-angle) (+ -65536.0 (-> obj wiggle-angle))) + (+! (-> obj wiggle-angle) -65536.0) ) (let* ((v1-5 (-> obj root trans)) (a1-2 (vector-! (new 'stack-no-clear 'vector) v1-5 arg0)) @@ -2150,7 +2150,7 @@ For example for an elevator pre-compute the distance between the first and last (none) ) :post (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (cond ((and (>= 1449984.0 (-> gp-0 trans y)) (< (-> gp-0 transv y) 0.0)) diff --git a/goal_src/jak2/levels/castle/castle-obs.gc b/goal_src/jak2/levels/castle/castle-obs.gc index e159da5be3..798b8eb17c 100644 --- a/goal_src/jak2/levels/castle/castle-obs.gc +++ b/goal_src/jak2/levels/castle/castle-obs.gc @@ -403,7 +403,7 @@ This commonly includes things such as: ) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc)) ) @@ -556,7 +556,7 @@ This commonly includes things such as: (vector-rotate-x! s5-0 s5-0 (* 182.04445 (rand-vu-float-range 0.0 140.0))) (vector-rotate-y! s5-0 s5-0 (* 182.04445 (rand-vu-float-range 0.0 360.0))) (set! (-> gp-0 start-pos quad) (-> self root trans quad)) - (set! (-> gp-0 start-pos y) (+ 15400.96 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 15400.96) (vector-normalize-copy! (-> gp-0 move-dist) s5-0 40960.0) (let ((v1-9 gp-0)) (set! (-> v1-9 radius) 409.6) @@ -650,7 +650,7 @@ This commonly includes things such as: ) (let ((s5-4 (new 'stack-no-clear 'vector))) (set! (-> s5-4 quad) (-> self root trans quad)) - (set! (-> s5-4 y) (+ 15400.96 (-> s5-4 y))) + (+! (-> s5-4 y) 15400.96) (process-spawn lightning-tracker :init lightning-tracker-init @@ -1393,7 +1393,7 @@ This commonly includes things such as: (let ((v1-30 (-> obj index))) (cond ((zero? v1-30) - (set! (-> obj root trans x) (+ 5734.4 (-> obj root trans x))) + (+! (-> obj root trans x) 5734.4) (let ((s5-2 (-> obj skel root-channel 0))) (joint-control-channel-group! s5-2 (the-as art-joint-anim (-> obj draw art-group data 6)) num-func-identity) (set! (-> s5-2 frame-num) 0.0) @@ -1736,7 +1736,7 @@ This commonly includes things such as: ) (when a0-3 (set! (-> gp-1 fountain-rand-transv-lo quad) (-> (get-trans a0-3 0) quad)) - (set! (-> gp-1 fountain-rand-transv-lo y) (+ -16384.0 (-> gp-1 fountain-rand-transv-lo y))) + (+! (-> gp-1 fountain-rand-transv-lo y) -16384.0) ) ) (set! (-> gp-1 fountain-rand-transv-hi x) 24576.0) @@ -1907,7 +1907,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-cas-chain-plat" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (go (method-of-object obj idle)) (none) ) diff --git a/goal_src/jak2/levels/castle/roboguard-level.gc b/goal_src/jak2/levels/castle/roboguard-level.gc index 788ce85957..9708cfb3bc 100644 --- a/goal_src/jak2/levels/castle/roboguard-level.gc +++ b/goal_src/jak2/levels/castle/roboguard-level.gc @@ -339,7 +339,7 @@ ((the-as (function none) t9-1)) ) ) - (set! (-> self flags) (logand -9 (-> self flags))) + (logand! (-> self flags) -9) (logior! (-> self flags) 4) (logior! (-> self nav flags) (nav-control-flag output-sphere-hash)) (let ((a1-1 (new 'stack-no-clear 'collide-query))) @@ -526,7 +526,7 @@ :enter (behavior () (logior! (-> self flags) 4) (roboguard-level-method-185 self (the-as symbol 1)) - (set! (-> self flags) (logand -9 (-> self flags))) + (logand! (-> self flags) -9) (none) ) :code (behavior () @@ -620,10 +620,10 @@ (logior! (-> self flags) 32) ) (else - (set! (-> self flags) (logand -33 (-> self flags))) + (logand! (-> self flags) -33) ) ) - (set! (-> self flags) (logand -65 (-> self flags))) + (logand! (-> self flags) -65) (seek! (-> self speed) 81920.0 (* 1228800.0 (-> self clock seconds-per-frame))) (seek! (-> self turning-acc) 4096.0 (* 1228800.0 (-> self clock seconds-per-frame))) (let ((v1-20 (-> self nav))) @@ -734,7 +734,7 @@ ) (until (ja-done? 0) (when (< 17.0 (ja-aframe-num 0)) - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (roboguard-level-method-185 self (the-as symbol 0)) ) (suspend) @@ -763,7 +763,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (roboguard-level-method-185 self (the-as symbol 0)) (none) ) diff --git a/goal_src/jak2/levels/city/bombbot/bombbot.gc b/goal_src/jak2/levels/city/bombbot/bombbot.gc index 106560de94..7f12510b16 100644 --- a/goal_src/jak2/levels/city/bombbot/bombbot.gc +++ b/goal_src/jak2/levels/city/bombbot/bombbot.gc @@ -1212,7 +1212,7 @@ gp-1 ) (vector-! *particle-vel* s5-3 (matrix->trans gp-1 (new 'stack-no-clear 'vector))) - (set! (-> *particle-vel* y) (+ 4096.0 (-> *particle-vel* y))) + (+! (-> *particle-vel* y) 4096.0) (vector-float*! *particle-vel* *particle-vel* 0.0033333334) (when (and sv-20 (< (rand-vu) 0.005)) (let ((t9-14 sp-launch-particles-var) @@ -1842,8 +1842,8 @@ (t9-0) ) ) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) - (set! (-> self shield-hit-points) (+ -1.0 (-> self shield-hit-points))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) + (+! (-> self shield-hit-points) -1.0) (none) ) :exit (behavior () @@ -2163,7 +2163,7 @@ ) (let ((v1-23 (new 'stack-no-clear 'vector))) (set! (-> v1-23 quad) (-> self root trans quad)) - (set! (-> v1-23 y) (+ 2048.0 (-> v1-23 y))) + (+! (-> v1-23 y) 2048.0) ) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self node-list data 3 bone transform trans quad)) @@ -3011,7 +3011,7 @@ (set! (-> self shot-count) (the-as uint 5)) (set! (-> self last-trans quad) (-> self root trans quad)) (set! (-> self minimap) (add-icon! *minimap* self (the-as uint 15) (the-as int #f) (the-as vector #t) 0)) - (set! (-> self mask) (logior (process-mask enemy guard) (-> self mask))) + (logior! (-> self mask) (process-mask enemy guard)) (go-virtual hostile) (none) ) diff --git a/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc b/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc index c5594592a3..cd2de0fa8d 100644 --- a/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc +++ b/goal_src/jak2/levels/city/burning-bush/ctywide-bbush.gc @@ -430,7 +430,7 @@ ) 0.0 ) - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) (sound-play "ring-pickup") (go-virtual die) ) @@ -484,7 +484,7 @@ (defbehavior race-ring-init-by-other race-ring ((arg0 city-race-ring-info)) (race-ring-method-22 self) (set! (-> self root trans quad) (-> arg0 pos quad)) - (set! (-> self root trans y) (+ 10240.0 (-> self root trans y))) + (+! (-> self root trans y) 10240.0) (quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (-> arg0 pos w)) (set-vector! (-> self root scale) 3.0 3.0 3.0 1.0) (race-ring-method-23 self) @@ -1781,7 +1781,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior bush-collect-init-by-other bush-collect ((arg0 vector)) - (set! (-> self mask) (logior (process-mask bit18) (-> self mask))) + (logior! (-> self mask) (process-mask bit18)) (stack-size-set! (-> self main-thread) 16) (bush-collect-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) @@ -1794,7 +1794,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior bush-collect-dark-eco-init-by-other bush-collect ((arg0 vector)) - (set! (-> self mask) (logior (process-mask bit18) (-> self mask))) + (logior! (-> self mask) (process-mask bit18)) (stack-size-set! (-> self main-thread) 16) (bush-collect-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) @@ -1808,7 +1808,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior bush-collect-homing-beacon-init-by-other bush-collect ((arg0 vector)) (set! (-> self level) (level-get *level* 'lbbush)) - (set! (-> self mask) (logior (process-mask bit18) (-> self mask))) + (logior! (-> self mask) (process-mask bit18)) (stack-size-set! (-> self main-thread) 16) (bush-collect-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) @@ -2592,7 +2592,7 @@ This commonly includes things such as: (let ((t1-3 (new 'stack 'fact-info self (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc))) ) (new 'stack-no-clear 'vector) - (set! (-> t1-3 options) (logior (actor-option fade-out no-distance-check-fadeout) (-> t1-3 options))) + (logior! (-> t1-3 options) (actor-option fade-out no-distance-check-fadeout)) (set! (-> t1-3 fade-time) (-> gp-0 time)) (set! (-> gp-0 colls s5-3 handle) (ppointer->handle @@ -2614,7 +2614,7 @@ This commonly includes things such as: (let ((t1-5 (new 'stack 'fact-info self (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc))) ) (new 'stack-no-clear 'vector) - (set! (-> t1-5 options) (logior (actor-option fade-out no-distance-check-fadeout) (-> t1-5 options))) + (logior! (-> t1-5 options) (actor-option fade-out no-distance-check-fadeout)) (set! (-> t1-5 fade-time) (-> gp-0 time)) (set! (-> gp-0 colls s5-3 handle) (ppointer->handle @@ -2897,7 +2897,7 @@ This commonly includes things such as: (the-as time-frame (the int (-> *burning-bush-get-on-info* (-> self info index) time))) ) (set! (-> a0-3 quad) (-> *burning-bush-get-on-info* (-> self info index) trans quad)) - (set! (-> a0-3 y) (+ 4096.0 (-> a0-3 y))) + (+! (-> a0-3 y) 4096.0) (set! (-> self slave 0) (ppointer->handle (birth-pickup-at-point a0-3 (pickup-type skill) (-> *FACT-bank* super-skill-inc) #t self t1-1) diff --git a/goal_src/jak2/levels/city/common/pilot-states.gc b/goal_src/jak2/levels/city/common/pilot-states.gc index 1a18add7b6..416f3cd71f 100644 --- a/goal_src/jak2/levels/city/common/pilot-states.gc +++ b/goal_src/jak2/levels/city/common/pilot-states.gc @@ -562,7 +562,7 @@ (none) ) :code (behavior () - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (logior! (-> self state-flags) (state-flags sf6)) (set! (-> self alt-cam-pos quad) (-> self control camera-pos quad)) (let ((gp-0 (if (zero? (-> self pilot stance)) diff --git a/goal_src/jak2/levels/city/common/target-pilot.gc b/goal_src/jak2/levels/city/common/target-pilot.gc index d584c046e4..84f9a64f79 100644 --- a/goal_src/jak2/levels/city/common/target-pilot.gc +++ b/goal_src/jak2/levels/city/common/target-pilot.gc @@ -261,9 +261,7 @@ ) (when (not (-> s5-0 gun?)) (if arg1 - (set! (-> self control current-surface flags) - (logior (surface-flag gun-fast-exit) (-> self control current-surface flags)) - ) + (logior! (-> self control current-surface flags) (surface-flag gun-fast-exit)) ) (target-gun-end-mode arg1) ) @@ -272,7 +270,7 @@ (set! (-> self control reaction) target-collision-reaction) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control ctrl-xz-vel) 0.0) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (set! (-> self control bend-target) 0.0) (let ((v1-73 (-> self node-list data))) (set! (-> v1-73 0 param0) (the-as (function cspace transformq none) cspace<-transformq+world-trans!)) diff --git a/goal_src/jak2/levels/city/common/trail.gc b/goal_src/jak2/levels/city/common/trail.gc index 43fdb5832a..600897b4d2 100644 --- a/goal_src/jak2/levels/city/common/trail.gc +++ b/goal_src/jak2/levels/city/common/trail.gc @@ -130,13 +130,13 @@ (let ((s1-1 (-> obj conn (-> s5-0 conn-ids (+ s2-1 (-> s4-0 first-conn)))))) (get-position (-> obj node (-> s1-1 head-id)) (-> s3-0 0)) (set! (-> s3-0 0 y) 53248.0) - (set! (-> s3-0 0 x) (+ -2048.0 (-> s3-0 0 x))) - (set! (-> s3-0 0 z) (+ -2048.0 (-> s3-0 0 z))) + (+! (-> s3-0 0 x) -2048.0) + (+! (-> s3-0 0 z) -2048.0) (get-position (-> obj node (-> s1-1 tail-id)) (-> s3-0 1)) ) (set! (-> s3-0 1 y) 53248.0) - (set! (-> s3-0 1 x) (+ -2048.0 (-> s3-0 1 x))) - (set! (-> s3-0 1 z) (+ -2048.0 (-> s3-0 1 z))) + (+! (-> s3-0 1 x) -2048.0) + (+! (-> s3-0 1 z) -2048.0) (add-debug-line #t (bucket-id debug2) (-> s3-0 0) (-> s3-0 1) *color-white* #f (the-as rgba -1)) ) ) diff --git a/goal_src/jak2/levels/city/ctyport-obs.gc b/goal_src/jak2/levels/city/ctyport-obs.gc index 540c60cba7..b198c608bf 100644 --- a/goal_src/jak2/levels/city/ctyport-obs.gc +++ b/goal_src/jak2/levels/city/ctyport-obs.gc @@ -428,7 +428,7 @@ (set! (-> s5-2 quad) (-> a1-24 target-post quad)) ) (when (< (vector-vector-xz-distance (-> obj root trans) s5-2) 163840.0) - (set! (-> obj path-index) (+ 0.01 (-> obj path-index))) + (+! (-> obj path-index) 0.01) (let ((f0-22 (-> obj path-index))) (set! (-> obj path-index) (- f0-22 (* (the float (the int (/ f0-22 1.0))) 1.0))) ) @@ -558,9 +558,7 @@ 0 (set! (-> obj path-num) (-> arg0 user-data)) (set! (-> obj path-index) (+ 0.05 (-> arg0 position w))) - (set! (-> obj root root-prim prim-core collide-as) - (logior (collide-spec pusher) (-> obj root root-prim prim-core collide-as)) - ) + (logior! (-> obj root root-prim prim-core collide-as) (collide-spec pusher)) (let ((v1-21 (-> obj root root-prim))) (set! (-> obj root backup-collide-as) (-> v1-21 prim-core collide-as)) (set! (-> obj root backup-collide-with) (-> v1-21 prim-core collide-with)) diff --git a/goal_src/jak2/levels/city/ctywide-obs.gc b/goal_src/jak2/levels/city/ctywide-obs.gc index bd3161b342..f5f9feee8e 100644 --- a/goal_src/jak2/levels/city/ctywide-obs.gc +++ b/goal_src/jak2/levels/city/ctywide-obs.gc @@ -951,7 +951,7 @@ This commonly includes things such as: (s4-0 (-> *sp-particle-system-2d* cpuinfo-table (-> self sparts-index gp-0))) ) (set! (-> s5-0 start-pos quad) (-> self sparts-pos gp-0 quad)) - (set! (-> s5-0 start-pos y) (+ 4096.0 (-> s5-0 start-pos y))) + (+! (-> s5-0 start-pos y) 4096.0) (set-vector! (-> s5-0 move-dist) 0.0 -40960.0 0.0 1.0) (let ((v1-5 s5-0)) (set! (-> v1-5 radius) (-> s4-0 omega)) @@ -1012,7 +1012,7 @@ This commonly includes things such as: ) (defmethod fruit-stand-method-29 fruit-stand ((obj fruit-stand)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 185) obj)) 0 (none) @@ -1574,7 +1574,7 @@ This commonly includes things such as: (until (>= (- (current-time) gp-0) (seconds 2)) (let ((a1-1 (new 'stack-no-clear 'vector))) (set! (-> a1-1 quad) (-> self root trans quad)) - (set! (-> a1-1 y) (+ 10240.0 (-> a1-1 y))) + (+! (-> a1-1 y) 10240.0) (spawn (-> self part) a1-1) ) (suspend) @@ -1608,7 +1608,7 @@ This commonly includes things such as: (until (ja-done? 0) (let ((a1-4 (new 'stack-no-clear 'vector))) (set! (-> a1-4 quad) (-> self root trans quad)) - (set! (-> a1-4 y) (+ 10240.0 (-> a1-4 y))) + (+! (-> a1-4 y) 10240.0) (spawn (-> self part) a1-4) ) (suspend) @@ -2170,7 +2170,7 @@ This commonly includes things such as: ) (defmethod cty-guard-turret-method-33 cty-guard-turret ((obj cty-guard-turret)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) 0 (none) ) @@ -2373,7 +2373,7 @@ This commonly includes things such as: (let ((s4-0 (new 'stack 'traffic-object-spawn-params))) (set! (-> s4-0 position quad) (-> obj root trans quad)) (mem-copy! (the-as pointer (-> s4-0 rotation)) (the-as pointer (-> obj root quat)) 16) - (set! (-> s4-0 position y) (+ 14336.0 (-> s4-0 position y))) + (+! (-> s4-0 position y) 14336.0) (set! (-> s4-0 behavior) (the-as uint 0)) (set! (-> s4-0 object-type) (the-as traffic-type arg0)) (set! (-> s4-0 id) (the-as uint 0)) @@ -2911,7 +2911,7 @@ This commonly includes things such as: ) (defmethod propa-method-30 propa ((obj propa)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 170) obj)) 0 (none) @@ -4208,7 +4208,7 @@ This commonly includes things such as: ) (defmethod lurker-pipe-lid-method-29 lurker-pipe-lid ((obj lurker-pipe-lid)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -4369,7 +4369,7 @@ This commonly includes things such as: ) (defmethod ctyn-lamp-method-30 ctyn-lamp ((obj ctyn-lamp)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) diff --git a/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc b/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc index b200fa4dcc..98825b14fa 100644 --- a/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc +++ b/goal_src/jak2/levels/city/farm/ctyfarm-obs.gc @@ -1210,7 +1210,7 @@ ) (defmethod farm-marrow-method-30 farm-marrow ((obj farm-marrow)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -1461,7 +1461,7 @@ This commonly includes things such as: ) (defmethod farm-beetree-method-30 farm-beetree ((obj farm-beetree)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -1708,7 +1708,7 @@ This commonly includes things such as: ) (defmethod farm-cabbage-method-30 farm-cabbage ((obj farm-cabbage)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -1942,7 +1942,7 @@ This commonly includes things such as: ) (defmethod farm-small-cabbage-method-30 farm-small-cabbage ((obj farm-small-cabbage)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -2220,7 +2220,7 @@ This commonly includes things such as: ) (defmethod farm-chilirots-method-30 farm-chilirots ((obj farm-chilirots)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -2332,7 +2332,7 @@ This commonly includes things such as: ) (defmethod farm-sprinkler-barrels-method-29 farm-sprinkler-barrels ((obj farm-sprinkler-barrels)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) diff --git a/goal_src/jak2/levels/city/generic/neon-praxis-part.gc b/goal_src/jak2/levels/city/generic/neon-praxis-part.gc index 54d67f4018..6bc624de82 100644 --- a/goal_src/jak2/levels/city/generic/neon-praxis-part.gc +++ b/goal_src/jak2/levels/city/generic/neon-praxis-part.gc @@ -1165,7 +1165,7 @@ This commonly includes things such as: (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause enemy)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj master-enable) (the-as uint -1)) (set! (-> obj praxis-mode) (the-as uint (rand-vu-int-count 5))) (set! (-> obj back-mode) (the-as uint (rand-vu-int-count 8))) diff --git a/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc b/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc index b409cbc9e8..1363cf4192 100644 --- a/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc +++ b/goal_src/jak2/levels/city/kiddogescort/crocesc-states.gc @@ -411,7 +411,7 @@ ) ) ) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-active)) (logior! (-> self focus-status) (focus-status disable)) (logclear! (-> self focus-status) (focus-status arrestable)) @@ -545,7 +545,7 @@ (ja :num! (seek! (ja-aframe 12.0 0) 0.5)) ) ) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) (none) ) @@ -575,7 +575,7 @@ (logclear! (-> v1-11 shape nav-flags) (nav-flags has-extra-sphere)) ) 0 - (set! (-> self focus-status) (logior (focus-status disable pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status disable pilot-riding pilot)) (set! (-> self anim-speed) 0.0) (none) ) @@ -891,7 +891,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -1005,7 +1005,7 @@ :trans (behavior () (when (>= (- (current-time) (-> self state-time)) (seconds 0.1)) (when (not (logtest? (bot-flags bf19) (-> self bot-flags))) - (set! (-> self bot-flags) (logior (bot-flags bf19) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf19)) (fail-mission! self) ) (fail-falling self) diff --git a/goal_src/jak2/levels/city/kiddogescort/crocesc.gc b/goal_src/jak2/levels/city/kiddogescort/crocesc.gc index 9d8d308e98..952d1938ce 100644 --- a/goal_src/jak2/levels/city/kiddogescort/crocesc.gc +++ b/goal_src/jak2/levels/city/kiddogescort/crocesc.gc @@ -490,7 +490,7 @@ This commonly includes things such as: (when (focus-test? obj pilot) (let ((v1-4 (handle->process (-> obj vehicle-handle)))) (when (or (not v1-4) (logtest? (-> (the-as vehicle v1-4) flags) (rigid-body-object-flag dead))) - (set! (-> obj bot-flags) (logior (bot-flags bf17) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf17)) (logclear! (-> obj bot-flags) (bot-flags bf15)) (logclear! (-> obj focus-status) (focus-status pilot-riding pilot)) (set! (-> obj vehicle-seat-index) -1) diff --git a/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc b/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc index a94dca402a..0888a4ea7c 100644 --- a/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc +++ b/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc @@ -1591,7 +1591,7 @@ (send-event s5-1 'set-alert-level 1) (send-event s5-1 'set-alert-duration #xa4cb80) ) - (set! (-> arg1 bot-task-bits) (logand -2 (-> arg1 bot-task-bits))) + (logand! (-> arg1 bot-task-bits) -2) ) ) ) diff --git a/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc b/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc index c68de9533a..2eefc886b3 100644 --- a/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc +++ b/goal_src/jak2/levels/city/kiddogescort/kidesc-states.gc @@ -332,7 +332,7 @@ ) (put-rider-in-seat (the-as vehicle gp-0) (-> self vehicle-seat-index) self) ) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-active)) (logior! (-> self focus-status) (focus-status disable)) (logclear! (-> self focus-status) (focus-status arrestable)) @@ -456,7 +456,7 @@ (ja :num! (seek! (ja-aframe 12.0 0) 0.25)) ) ) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) (none) ) @@ -483,7 +483,7 @@ (logclear! (-> v1-11 shape nav-flags) (nav-flags has-extra-sphere)) ) 0 - (set! (-> self focus-status) (logior (focus-status disable pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status disable pilot-riding pilot)) (logclear! (-> self focus-status) (focus-status arrestable)) (none) ) @@ -812,7 +812,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -860,7 +860,7 @@ (vector-reset! (-> self root transv)) (stop-looking-at-target! self) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logclear! (-> self focus-status) (focus-status disable)) (if (logtest? (bot-flags bf19) (-> self bot-flags)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-active checking-water)) @@ -992,7 +992,7 @@ ) ) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logclear! (-> self focus-status) (focus-status disable)) (none) ) @@ -1043,7 +1043,7 @@ ) ) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logclear! (-> self focus-status) (focus-status disable)) (none) ) @@ -1075,7 +1075,7 @@ (logclear! (-> self enemy-flags) (enemy-flag look-at-move-dest)) (logclear! (-> self mask) (process-mask actor-pause)) (logclear! (-> self enemy-flags) (enemy-flag notice)) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logior! (-> self focus-status) (focus-status disable)) (set! (-> self travel-anim-interp) 0.0) (none) diff --git a/goal_src/jak2/levels/city/kiddogescort/kidesc.gc b/goal_src/jak2/levels/city/kiddogescort/kidesc.gc index 6886533847..cc4fc8257c 100644 --- a/goal_src/jak2/levels/city/kiddogescort/kidesc.gc +++ b/goal_src/jak2/levels/city/kiddogescort/kidesc.gc @@ -205,7 +205,7 @@ #t ) (('instant-arrest) - (set! (-> obj bot-flags) (logior (bot-flags bf19) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf19)) (let ((s5-1 (the-as crimson-guard (-> arg3 param 0)))) (set! (-> obj arrestor-handle) (process->handle s5-1)) (set! (-> obj arrest-attempt-time) (current-time)) @@ -697,7 +697,7 @@ This commonly includes things such as: (when (focus-test? obj pilot) (let ((s5-0 (handle->process (-> obj vehicle-handle)))) (when (or (not s5-0) (logtest? (-> (the-as vehicle s5-0) flags) (rigid-body-object-flag dead))) - (set! (-> obj bot-flags) (logior (bot-flags bf17) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf17)) (logclear! (-> obj bot-flags) (bot-flags bf15)) (logclear! (-> obj focus-status) (focus-status pilot-riding pilot)) (if (the-as vehicle s5-0) diff --git a/goal_src/jak2/levels/city/kiddogescort/kidesc4-course.gc b/goal_src/jak2/levels/city/kiddogescort/kidesc4-course.gc index 4e6df5eec5..55d18bbebf 100644 --- a/goal_src/jak2/levels/city/kiddogescort/kidesc4-course.gc +++ b/goal_src/jak2/levels/city/kiddogescort/kidesc4-course.gc @@ -96,7 +96,7 @@ (set! (-> v1-3 prim-core collide-with) (-> arg0 root backup-collide-with)) ) (logclear! (-> arg0 focus-status) (focus-status disable)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) (let ((v1-9 (get-task-by-type (-> arg0 ai-ctrl) kidesct-wait-spot arg0))) (set! (-> v1-9 bytes 5) 1) (set! (-> v1-9 bytes 6) 1) @@ -237,7 +237,7 @@ :skip-to -1 :on-set (lambda ((arg0 kid-escort)) (logior! (-> arg0 focus-status) (focus-status disable)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) kidesct-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 1) @@ -285,7 +285,7 @@ :skip-to -1 :on-set (lambda ((arg0 kid-escort)) (logclear! (-> arg0 focus-status) (focus-status disable)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) kidesct-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 1) diff --git a/goal_src/jak2/levels/city/market/ashelin/ash4-course.gc b/goal_src/jak2/levels/city/market/ashelin/ash4-course.gc index 11114759c7..5529c0eb7d 100644 --- a/goal_src/jak2/levels/city/market/ashelin/ash4-course.gc +++ b/goal_src/jak2/levels/city/market/ashelin/ash4-course.gc @@ -257,7 +257,7 @@ (set-setting! 'music 'danger9 0.0 0) (set! (-> arg0 notice-enemy-dist) 245760.0) (logior! (-> arg0 bot-flags) (bot-flags bf06)) - (set! (-> arg0 bot-task-bits) (logand -3 (-> arg0 bot-task-bits))) + (logand! (-> arg0 bot-task-bits) -3) (let ((a1-3 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-3 from) (process->ppointer pp)) (set! (-> a1-3 num-params) 0) diff --git a/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc b/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc index 842423b669..a7d2f728c7 100644 --- a/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc +++ b/goal_src/jak2/levels/city/market/ashelin/ctyasha-obs.gc @@ -880,7 +880,7 @@ (forward-up->quaternion (-> obj root quat) s4-0 *up-vector*) ) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag chase-startup)) (set-vector! (-> obj root scale) 1.0 1.0 1.0 1.0) @@ -985,7 +985,7 @@ (forward-up->quaternion (-> obj root quat) s4-0 *up-vector*) ) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag chase-startup)) (set-vector! (-> obj root scale) 1.0 1.0 1.0 1.0) diff --git a/goal_src/jak2/levels/city/market/ctymark-obs.gc b/goal_src/jak2/levels/city/market/ctymark-obs.gc index bc52e9b50d..40d0e28f42 100644 --- a/goal_src/jak2/levels/city/market/ctymark-obs.gc +++ b/goal_src/jak2/levels/city/market/ctymark-obs.gc @@ -1123,7 +1123,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-basket-a" (the-as (pointer uint32) #f))) @@ -1204,7 +1204,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-basket-b" (the-as (pointer uint32) #f))) @@ -1285,7 +1285,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-crate" (the-as (pointer uint32) #f))) @@ -1366,7 +1366,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-sack-a" (the-as (pointer uint32) #f))) @@ -1447,7 +1447,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-sack-b" (the-as (pointer uint32) #f))) 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 42325feef9..4c850cb8ad 100644 --- a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc +++ b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc @@ -497,7 +497,7 @@ (logior! (-> obj controller flags) (vehicle-controller-flag ignore-others)) (set! (-> obj controller target-speed-offset) 81920.0) (set! (-> obj pursuit-target) (process->handle arg0)) - (set! (-> obj flags) (logior (rigid-body-object-flag alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag alert)) (if (task-node-open? (game-task-node city-save-lurkers-save-lurkers)) (vehicle-method-111 obj 1 (the-as target arg0)) (vehicle-method-111 obj 2 (the-as target arg0)) @@ -1197,7 +1197,7 @@ (citizen-nav-init! self) (set! (-> self gnd-height) (-> self root gspot-pos y)) (logior! (-> self flags) (citizen-flag persistent)) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self state-time) (current-time)) (let ((v1-31 (-> self root root-prim))) (set! (-> v1-31 prim-core collide-as) (collide-spec)) @@ -1851,7 +1851,7 @@ (set! (-> v1-13 enemy-flags) (the-as enemy-flag (logclear (-> v1-13 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self coming-from-pw) #t) (none) ) diff --git a/goal_src/jak2/levels/city/package/delivery-task.gc b/goal_src/jak2/levels/city/package/delivery-task.gc index 95edc75868..0496e2c3a2 100644 --- a/goal_src/jak2/levels/city/package/delivery-task.gc +++ b/goal_src/jak2/levels/city/package/delivery-task.gc @@ -105,7 +105,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior krew-package-init-by-other krew-package ((arg0 process-drawable)) (stack-size-set! (-> self main-thread) 16) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (logclear! (-> self mask) (process-mask actor-pause movie)) (krew-package-method-22 self) (set! (-> self attach-object) (process->handle arg0)) @@ -407,7 +407,7 @@ This commonly includes things such as: (.mov a0-32 vf1) (when (>= f0-3 a0-32) (set! (-> v1-59 0 quad) (-> (the-as process-drawable gp-0) root trans quad)) - (set! (-> v1-59 0 y) (+ -14336.0 (-> v1-59 0 y))) + (+! (-> v1-59 0 y) -14336.0) (send-event (handle->process (-> self arrow)) 'set-position (-> v1-59 0)) ) ) diff --git a/goal_src/jak2/levels/city/port/ctyport-part.gc b/goal_src/jak2/levels/city/port/ctyport-part.gc index 571f6924e3..1b9c4c2a55 100644 --- a/goal_src/jak2/levels/city/port/ctyport-part.gc +++ b/goal_src/jak2/levels/city/port/ctyport-part.gc @@ -3476,7 +3476,7 @@ This commonly includes things such as: (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause enemy)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj master-enable) (the-as uint -1)) (set! (-> obj mode) (the-as uint (rand-vu-int-count 8))) (let ((s5-1 (if (task-node-closed? (game-task-node nest-boss-resolution)) diff --git a/goal_src/jak2/levels/city/port/portrun/portrun.gc b/goal_src/jak2/levels/city/port/portrun/portrun.gc index db59207011..96f56cb6b0 100644 --- a/goal_src/jak2/levels/city/port/portrun/portrun.gc +++ b/goal_src/jak2/levels/city/port/portrun/portrun.gc @@ -1169,7 +1169,7 @@ (set! (-> self info) arg0) (set! (-> arg0 handle) (process->handle self)) (logior! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (set-vector! (-> self root trans) (-> arg0 pos1-x) (-> arg0 pos1-y) (-> arg0 pos1-z) 1.0) (quaternion-copy! (-> self root quat) *unity-quaternion*) (vector-identity! (-> self root scale)) @@ -1276,7 +1276,7 @@ (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg0 quad)) (set-vector! (-> self root scale) 1.0 1.0 1.0 1.0) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (initialize-skeleton self (the-as skeleton-group (art-group-get-by-name *level* "skel-ctyport-spy" (the-as (pointer uint32) #f))) @@ -1585,7 +1585,7 @@ (set! (-> self root trans quad) (-> arg0 quad)) (set-vector! (-> self root scale) 1.0 1.0 1.0 1.0) (set! (-> self minimap) (add-icon! *minimap* self (the-as uint 16) (the-as int #f) (the-as vector #t) 0)) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (initialize-skeleton self (the-as skeleton-group (art-group-get-by-name *level* "skel-ctyport-cargo" (the-as (pointer uint32) #f))) 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 fd17227d68..de6a8baf15 100644 --- a/goal_src/jak2/levels/city/port/race/errol-chal.gc +++ b/goal_src/jak2/levels/city/port/race/errol-chal.gc @@ -884,7 +884,7 @@ (defbehavior turbo-ring-init-by-other turbo-ring ((arg0 city-race-ring-info) (arg1 int) (arg2 symbol)) (turbo-ring-method-22 self) (set! (-> self root trans quad) (-> arg0 pos quad)) - (set! (-> self root trans y) (+ 10240.0 (-> self root trans y))) + (+! (-> self root trans y) 10240.0) (quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (-> arg0 pos w)) (set! (-> self boost) (-> arg0 boost)) (set! (-> self id) arg1) diff --git a/goal_src/jak2/levels/city/protect/protect.gc b/goal_src/jak2/levels/city/protect/protect.gc index cbf5c0f185..f365cc0769 100644 --- a/goal_src/jak2/levels/city/protect/protect.gc +++ b/goal_src/jak2/levels/city/protect/protect.gc @@ -85,7 +85,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior seal-of-mar-init-by-other seal-of-mar ((arg0 vector) (arg1 vector) (arg2 vector)) (stack-size-set! (-> self main-thread) 16) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (logclear! (-> self mask) (process-mask actor-pause movie)) (seal-of-mar-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) diff --git a/goal_src/jak2/levels/city/sack/collection-task.gc b/goal_src/jak2/levels/city/sack/collection-task.gc index 3f924b4185..d3d3443d7b 100644 --- a/goal_src/jak2/levels/city/sack/collection-task.gc +++ b/goal_src/jak2/levels/city/sack/collection-task.gc @@ -88,7 +88,7 @@ (when (>= dist 0.0) (vector+float*! (-> query vec) (-> query cquery start-pos) (-> query cquery move-dist) dist) (set! (-> query vec2 quad) (-> query cquery best-other-tri normal quad)) - (set! (-> query vec y) (+ 4915.2 (-> query vec y))) + (+! (-> query vec y) 4915.2) (set! on-ground? #t) (format #t "krew-collection-item::find-ground: ground y ~M~%" (-> query vec y)) ) @@ -119,7 +119,7 @@ ) (when (>= (* pickup-dist pickup-dist) dist-from-target) (sound-play "skill-pickup") - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) (go-virtual die) ) ) @@ -131,7 +131,7 @@ (let ((beam-params (new 'stack-no-clear 'task-arrow-params))) (let ((beam-location (new 'stack-no-clear 'vector))) (set! (-> beam-location quad) (-> self root trans quad)) - (set! (-> beam-location y) (+ -6144.0 (-> beam-location y))) + (+! (-> beam-location y) -6144.0) (set! (-> beam-params pos quad) (-> beam-location quad)) ) (quaternion-identity! (-> beam-params quat)) diff --git a/goal_src/jak2/levels/city/shuttle/shuttle.gc b/goal_src/jak2/levels/city/shuttle/shuttle.gc index 814f33cb92..d5e77a6510 100644 --- a/goal_src/jak2/levels/city/shuttle/shuttle.gc +++ b/goal_src/jak2/levels/city/shuttle/shuttle.gc @@ -405,7 +405,7 @@ (citizen-nav-init! self) (set! (-> self gnd-height) (-> self root gspot-pos y)) (logior! (-> self flags) (citizen-flag persistent)) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self state-time) (current-time)) (let ((v1-31 (-> self root root-prim))) (set! (-> v1-31 prim-core collide-as) (collide-spec)) @@ -1504,7 +1504,7 @@ (('task-done) (format #t "task-done~%") (set! (-> self sub-state) (+ (-> arg0 index) 2)) - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) ) ) (none) @@ -1676,7 +1676,7 @@ (('task-done) (format #t "task-done~%") (set! (-> self sub-state) (+ (-> arg0 index) 2)) - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) ) ) (none) diff --git a/goal_src/jak2/levels/city/slums/kor/kid-states.gc b/goal_src/jak2/levels/city/slums/kor/kid-states.gc index 4df7be0655..550de6834b 100644 --- a/goal_src/jak2/levels/city/slums/kor/kid-states.gc +++ b/goal_src/jak2/levels/city/slums/kor/kid-states.gc @@ -498,7 +498,7 @@ ) (set! (-> self enemy-flags) v1-31) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-38 (-> self enemy-flags))) @@ -631,7 +631,7 @@ (defstate failed (kid) :virtual #t :enter (behavior () - (set! (-> self bot-flags) (logior (bot-flags bf20) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf20)) ((-> (method-of-type kid arrested) enter)) (none) ) diff --git a/goal_src/jak2/levels/city/slums/kor/kid.gc b/goal_src/jak2/levels/city/slums/kor/kid.gc index f15a6e6764..0aea2ab6a2 100644 --- a/goal_src/jak2/levels/city/slums/kor/kid.gc +++ b/goal_src/jak2/levels/city/slums/kor/kid.gc @@ -203,7 +203,7 @@ #t ) (('instant-arrest) - (set! (-> obj bot-flags) (logior (bot-flags bf20) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf20)) (let ((v1-18 (the-as object (-> arg3 param 0)))) (set! (-> obj arrestor-handle) (process->handle (the-as process v1-18))) (set! (-> obj arrest-attempt-time) (current-time)) diff --git a/goal_src/jak2/levels/city/slums/kor/kid3-course.gc b/goal_src/jak2/levels/city/slums/kor/kid3-course.gc index bcb66b0025..9594f8c5c9 100644 --- a/goal_src/jak2/levels/city/slums/kor/kid3-course.gc +++ b/goal_src/jak2/levels/city/slums/kor/kid3-course.gc @@ -120,8 +120,8 @@ :waypoint-id 5 :skip-to -1 :on-set (lambda ((arg0 kid)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 notice-enemy-dist) 122880.0) (let ((v1-6 (get-task-by-type (-> arg0 ai-ctrl) kidt-wait-spot arg0))) (set! (-> v1-6 bytes 5) 1) diff --git a/goal_src/jak2/levels/city/slums/kor/kor-states.gc b/goal_src/jak2/levels/city/slums/kor/kor-states.gc index 817ba3f18c..200e9c342b 100644 --- a/goal_src/jak2/levels/city/slums/kor/kor-states.gc +++ b/goal_src/jak2/levels/city/slums/kor/kor-states.gc @@ -507,7 +507,7 @@ ) (set! (-> self enemy-flags) v1-31) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-38 (-> self enemy-flags))) @@ -655,7 +655,7 @@ (defstate failed (kor) :virtual #t :enter (behavior () - (set! (-> self bot-flags) (logior (bot-flags bf20) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf20)) ((-> (method-of-type kor arrested) enter)) (none) ) diff --git a/goal_src/jak2/levels/city/slums/kor/kor.gc b/goal_src/jak2/levels/city/slums/kor/kor.gc index 49472dbbd6..10a013176f 100644 --- a/goal_src/jak2/levels/city/slums/kor/kor.gc +++ b/goal_src/jak2/levels/city/slums/kor/kor.gc @@ -212,7 +212,7 @@ #t ) (('instant-arrest) - (set! (-> obj bot-flags) (logior (bot-flags bf20) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf20)) (let ((v1-18 (the-as object (-> arg3 param 0)))) (set! (-> obj arrestor-handle) (process->handle (the-as process v1-18))) (set! (-> obj arrest-attempt-time) (current-time)) diff --git a/goal_src/jak2/levels/city/slums/kor/kor3-course.gc b/goal_src/jak2/levels/city/slums/kor/kor3-course.gc index 5f6b5f19c9..bc75bab842 100644 --- a/goal_src/jak2/levels/city/slums/kor/kor3-course.gc +++ b/goal_src/jak2/levels/city/slums/kor/kor3-course.gc @@ -120,8 +120,8 @@ :waypoint-id 5 :skip-to -1 :on-set (lambda ((arg0 kor)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 notice-enemy-dist) 122880.0) (let ((v1-6 (get-task-by-type (-> arg0 ai-ctrl) kort-wait-spot arg0))) (set! (-> v1-6 bytes 5) 1) diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc index 54f6948471..532e80f13f 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen-enemy.gc @@ -272,7 +272,7 @@ (if (-> obj skel effect) (logior! (-> obj skel effect flags) (effect-control-flag ecf0)) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (reset-to-collide-spec (-> obj focus) (collide-spec jak civilian player-list bot-targetable jak-vehicle)) (let ((v1-12 (-> obj nav))) (set! (-> v1-12 sphere-mask) (the-as uint #x800e8)) @@ -289,11 +289,9 @@ (logior! (-> obj enemy-flags) (enemy-flag enable-on-active checking-water)) (logior! (-> obj focus-status) (focus-status dangerous)) (logior! (-> obj enemy-flags) (enemy-flag check-water)) - (set! (-> obj enemy-flags) - (logior (enemy-flag check-water-backup no-initial-move-to-ground) (-> obj enemy-flags)) - ) + (logior! (-> obj enemy-flags) (enemy-flag check-water-backup no-initial-move-to-ground)) (logclear! (-> obj focus-status) (focus-status dead)) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (logior! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (if (not (-> obj minimap)) (set! (-> obj minimap) (add-icon! *minimap* obj (the-as uint 70) (the-as int #f) (the-as vector #t) 0)) diff --git a/goal_src/jak2/levels/city/traffic/citizen/citizen.gc b/goal_src/jak2/levels/city/traffic/citizen/citizen.gc index ac74180ddf..18de844c99 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/citizen.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/citizen.gc @@ -40,7 +40,7 @@ (defmethod citizen-init! citizen ((obj citizen)) "Initialize [[citizen]] defaults." - (set! (-> obj fact enemy-options) (logior (enemy-option knocked-into-water) (-> obj fact enemy-options))) + (logior! (-> obj fact enemy-options) (enemy-option knocked-into-water)) (if (-> obj skel effect) (logclear! (-> obj skel effect flags) (effect-control-flag ecf2)) ) @@ -60,32 +60,29 @@ (set! (-> v1-28 prim-core collide-as) (-> obj root backup-collide-as)) (set! (-> v1-28 prim-core collide-with) (-> obj root backup-collide-with)) ) - (set! (-> obj root penetrated-by) - (penetrate - generic-attack - lunge - flop - punch - spin - roll - uppercut - bonk - tube - vehicle - flut-attack - board - mech-punch - dark-punch - dark-giant - ) + (set! (-> obj root penetrated-by) (penetrate + generic-attack + lunge + flop + punch + spin + roll + uppercut + bonk + tube + vehicle + flut-attack + board + mech-punch + dark-punch + dark-giant + ) ) (logior! (-> obj enemy-flags) (enemy-flag enable-on-active checking-water)) (logior! (-> obj focus-status) (focus-status dangerous)) (logior! (-> obj enemy-flags) (enemy-flag check-water)) - (set! (-> obj enemy-flags) - (logior (enemy-flag check-water-backup no-initial-move-to-ground) (-> obj enemy-flags)) - ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj enemy-flags) (enemy-flag check-water-backup no-initial-move-to-ground)) + (logior! (-> obj mask) (process-mask collectable)) (logior! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (set! (-> obj hit-points) (-> obj enemy-info default-hit-points)) (set! (-> obj fated-time) 0) diff --git a/goal_src/jak2/levels/city/traffic/citizen/civilian.gc b/goal_src/jak2/levels/city/traffic/citizen/civilian.gc index d0646485b3..055454f153 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/civilian.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/civilian.gc @@ -134,11 +134,9 @@ (logior! (-> obj enemy-flags) (enemy-flag enable-on-active checking-water)) (logior! (-> obj focus-status) (focus-status dangerous)) (logior! (-> obj enemy-flags) (enemy-flag check-water)) - (set! (-> obj enemy-flags) - (logior (enemy-flag check-water-backup no-initial-move-to-ground) (-> obj enemy-flags)) - ) + (logior! (-> obj enemy-flags) (enemy-flag check-water-backup no-initial-move-to-ground)) (logclear! (-> obj focus-status) (focus-status dead)) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (logior! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (if (zero? (-> obj hit-face)) (go (method-of-object obj get-up-front)) @@ -1432,7 +1430,7 @@ ) (defbehavior civilian-falling-post civilian () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (cond ((focus-test? self under-water) @@ -1982,7 +1980,7 @@ (set! (-> v1-10 enemy-flags) (the-as enemy-flag (logclear (-> v1-10 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (none) ) :exit (behavior () @@ -2047,7 +2045,7 @@ (citizen-nav-init! self) (set! (-> self gnd-height) (-> self root gspot-pos y)) (logior! (-> self flags) (citizen-flag persistent)) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self state-time) (current-time)) (let ((v1-28 (-> self root root-prim))) (set! (-> v1-28 prim-core collide-as) (collide-spec)) diff --git a/goal_src/jak2/levels/city/traffic/citizen/guard.gc b/goal_src/jak2/levels/city/traffic/citizen/guard.gc index 1cd121b7a7..941f92ab96 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/guard.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/guard.gc @@ -1535,7 +1535,7 @@ (init-vf0-vector) (cond ((logtest? (-> obj controller traffic alert-state flags) (traffic-alert-flag guard-multi-focus)) - (set! (-> obj enemy-flags) (logior (enemy-flag trackable) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag trackable)) (when (not (logtest? (enemy-flag actor-pause-backup) (-> obj enemy-flags))) (let ((a0-4 (find-closest-to-with-collide-lists (-> obj controller traffic) obj (-> obj focus collide-with)))) (if a0-4 @@ -1563,7 +1563,7 @@ ) (let ((a1-3 (new 'stack-no-clear 'vector))) (set! (-> a1-3 quad) (-> obj root trans quad)) - (set! (-> a1-3 y) (+ 8192.0 (-> a1-3 y))) + (+! (-> a1-3 y) 8192.0) (let ((s5-1 (traffic-engine-method-49 (-> obj controller traffic) a1-3 (-> obj traffic-id) (-> obj traffic-target-status)) ) @@ -2044,7 +2044,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-4 enemy-flags))) @@ -2116,7 +2116,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self other-side) (if (< (rand-vu) 0.5) #t #f @@ -2566,7 +2566,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -2666,7 +2666,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -3144,7 +3144,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self joint-enable) #t) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-5 self)) @@ -3986,7 +3986,7 @@ 0 (set! (-> obj joint-enable) #f) (logclear! (-> obj mask) (process-mask enemy)) - (set! (-> obj mask) (logior (process-mask guard) (-> obj mask))) + (logior! (-> obj mask) (process-mask guard)) (set! (-> obj fact pickup-type) (pickup-type ammo-random)) (set! (-> obj fact pickup-amount) 10.0) (set! (-> obj fact pickup-spawn-amount) 1.0) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc index 4db451fba4..d1b62c8707 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc @@ -392,7 +392,7 @@ (suspend) ) ) - (set! (-> self root trans y) (+ -8192.0 (-> self root trans y))) + (+! (-> self root trans y) -8192.0) (logior! (-> self draw status) (draw-control-status no-draw)) (let ((gp-3 (current-time))) (until (>= (- (current-time) gp-3) (the int (* 300.0 (get-rand-float-range self 0.0 0.6)))) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc index 9460965aec..f970aca8d7 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc @@ -269,7 +269,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -765,7 +765,7 @@ (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) @@ -877,7 +877,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) @@ -1173,7 +1173,7 @@ (joint-control-channel-group! a0-16 (the-as art-joint-anim s4-0) num-func-seek!) ) ) - (set! (-> obj grunt-flags) (logand -3 (-> obj grunt-flags))) + (logand! (-> obj grunt-flags) -3) #t ) ) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc index 79cef68437..9d6964231e 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc @@ -894,7 +894,7 @@ (set! (-> self attack-id) a0-1) ) (traffic-danger-init! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (none) ) :exit (behavior () @@ -971,7 +971,7 @@ ) :enter (behavior () (traffic-danger-init! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/bike.gc b/goal_src/jak2/levels/city/traffic/vehicle/bike.gc index 67d404b249..d0f9db04d4 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/bike.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/bike.gc @@ -1469,10 +1469,10 @@ (defmethod start-jump guard-bike ((obj guard-bike)) (when (not (logtest? (rigid-body-object-flag jump-sound) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag jump-sound) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump-sound)) (sound-play "bike-hop") ) - (set! (-> obj flags) (logior (rigid-body-object-flag jump) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump)) 0 (none) ) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/transport.gc b/goal_src/jak2/levels/city/traffic/vehicle/transport.gc index ba76847090..538187b78c 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/transport.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/transport.gc @@ -440,7 +440,7 @@ (set! (-> s5-0 guard-type) (the-as uint 7)) (vector-reset! (-> s5-0 velocity)) (set! (-> s5-0 position quad) (-> obj root trans quad)) - (set! (-> s5-0 position y) (+ 8192.0 (-> s5-0 position y))) + (+! (-> s5-0 position y) 8192.0) (quaternion-rotate-local-y! (-> s5-0 rotation) (-> obj root quat) 32768.0) (send-event *traffic-manager* 'activate-object s5-0) (when (-> s5-0 proc) @@ -536,7 +536,7 @@ ) (transport-method-32 self) (set! (-> self y-dest) (-> self root trans y)) - (set! (-> self root trans y) (+ 163840.0 (-> self root trans y))) + (+! (-> self root trans y) 163840.0) (set! (-> self spawn?) #t) (set! (-> self leave-time) 0) (if (-> arg0 turret?) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc index 203ec96a36..b6dea4b53c 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-guard.gc @@ -636,7 +636,7 @@ (set! (-> arg0 svel quad) (-> obj root transv quad)) (vector-normalize-copy! (-> arg0 tdir) (-> arg0 tvel) 1.0) (vector-normalize-copy! (-> arg0 sdir) (-> arg0 svel) 1.0) - (set! (-> arg0 tpos y) (+ 4096.0 (-> arg0 tpos y))) + (+! (-> arg0 tpos y) 4096.0) (vector-! (-> arg0 to-target) (-> arg0 tpos) (-> arg0 spos)) (let* ((f0-2 (vector-length (-> arg0 to-target))) (f1-2 (/ 1.0 f0-2)) @@ -838,7 +838,7 @@ (defmethod vehicle-method-134 vehicle-guard ((obj vehicle-guard) (arg0 process)) "Stubbed" (set! (-> obj pursuit-target) (process->handle arg0)) - (set! (-> obj flags) (logior (rigid-body-object-flag alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag alert)) (vehicle-method-111 obj 2 (the-as target arg0)) 0 (none) @@ -887,7 +887,7 @@ (logtest? (rigid-body-object-flag ai-driving) (-> obj flags)) (>= (the-as uint (get-alert-level (-> obj controller traffic))) (the-as uint 2)) ) - (set! (-> obj flags) (logior (rigid-body-object-flag alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag alert)) (let ((v0-4 (the-as object (process->handle (the-as process (-> arg3 param 0)))))) (set! (-> obj pursuit-target) (the-as handle v0-4)) v0-4 @@ -972,7 +972,7 @@ (let ((t9-0 (method-of-type vehicle alloc-and-init-rigid-body-control))) (t9-0 obj arg0) ) - (set! (-> obj mask) (logior (process-mask enemy guard) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy guard)) (set! (-> obj pursuit-target) (the-as handle #f)) (set! (-> obj minimap) #f) (set! (-> obj lod2) (the-as symbol (-> obj draw lod-set lod 2 geo))) @@ -1022,7 +1022,7 @@ (case (-> arg0 behavior) ((9) (vehicle-method-128 obj) - (set! (-> obj flags) (logior (rigid-body-object-flag persistent alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag persistent alert)) (set! (-> obj pursuit-target) (-> arg0 handle)) (go (method-of-object obj waiting-ambush)) ) @@ -1396,7 +1396,7 @@ vehicle-event-handler ) :enter (behavior () - (set! (-> self flags) (logior (rigid-body-object-flag riding ignition ai-driving) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag riding ignition ai-driving)) (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) (none) ) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc index 13b1ec7cab..b44ba2a1b6 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc @@ -45,7 +45,7 @@ ) ) ) - (set! (-> obj flags) (logand -5 (-> obj flags))) + (logand! (-> obj flags) -5) (if (and s5-0 (nonzero? (vehicle-method-72 s5-0))) (logior! (-> obj flags) 4) ) @@ -100,7 +100,7 @@ (when a0-1 (+! (-> obj anim-t) (* 41870.223 (-> obj anim-speed) (-> pp clock seconds-per-frame))) (if (< 65536.0 (-> obj anim-t)) - (set! (-> obj anim-t) (+ -65536.0 (-> obj anim-t))) + (+! (-> obj anim-t) -65536.0) ) (let* ((f0-5 (vehicle-method-75 a0-1)) (f0-9 (+ (* 5.0 (- 1.0 f0-5)) (sin (-> obj anim-t)))) @@ -127,7 +127,7 @@ ) ) (('traffic-off) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) (vehicle-rider-method-35 self) ) (('knocked-off) @@ -153,7 +153,7 @@ (quaternion-copy! (-> gp-0 rotation) (-> self root quat)) (send-event *traffic-manager* 'activate-object gp-0) ) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) (vehicle-rider-method-35 self) ) (('race-pass 'taunt) @@ -175,7 +175,7 @@ ) ) (('rider-off) - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (vehicle-rider-method-35 self) ) ) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc index 63c63fefee..ea8d62b094 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-states.gc @@ -61,7 +61,7 @@ :enter (behavior () (set! (-> self state-time) (current-time)) (vehicle-method-139 self) - (set! (-> self flags) (logior (rigid-body-object-flag riding ai-driving) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag riding ai-driving)) (vehicle-method-142 self) (set! (-> self flight-level-index) 1) (none) @@ -151,19 +151,16 @@ ) ) (vehicle-method-139 self) - (set! (-> self flags) - (the-as - rigid-body-object-flag - (logior (rigid-body-object-flag riding player-driving nav-spheres) (-> self flags)) - ) + (set! (-> self flags) (the-as + rigid-body-object-flag + (logior (rigid-body-object-flag riding player-driving nav-spheres) (-> self flags)) + ) ) (set! (-> self max-time-step) 0.02) (rigid-body-object-method-38 self) (vehicle-method-102 self) (vehicle-method-87 self) - (set! (-> self root penetrated-by) - (logior (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot) (-> self root penetrated-by)) - ) + (logior! (-> self root penetrated-by) (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot)) (set! (-> self damage-factor) (* 0.7518797 (-> self damage-factor))) 0 (none) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc index f4fabb4ce6..082ab1295c 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc @@ -196,7 +196,7 @@ This commonly includes things such as: (set! (-> s5-0 floats 4) (* 1.5 (-> s5-0 floats 4))) ) (set! (-> s5-0 matrices 0 vector 1 quad) (-> (target-pos 0) quad)) - (set! (-> s5-0 matrices 0 vector 1 y) (+ 8192.0 (-> s5-0 matrices 0 vector 1 y))) + (+! (-> s5-0 matrices 0 vector 1 y) 8192.0) (let* ((v1-14 (-> s5-0 matrices 1)) (a3-0 (-> obj node-list data 0 bone transform)) (a0-5 (-> a3-0 quad 0)) @@ -438,10 +438,10 @@ This commonly includes things such as: (defmethod start-jump vehicle ((obj vehicle)) (when (logtest? (-> obj info flags) 16) (when (not (logtest? (rigid-body-object-flag jump-sound) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag jump-sound) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump-sound)) (sound-play "bike-hop") ) - (set! (-> obj flags) (logior (rigid-body-object-flag jump) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump)) ) 0 (none) @@ -750,9 +750,7 @@ This commonly includes things such as: (defmethod vehicle-method-78 vehicle ((obj vehicle) (arg0 int)) (set! (-> obj flight-level-index-prev) (-> obj flight-level-index)) (set! (-> obj flight-level-index) arg0) - (set! (-> obj flags) - (logior (rigid-body-object-flag flight-level-transition camera-rapid-track-mode) (-> obj flags)) - ) + (logior! (-> obj flags) (rigid-body-object-flag flight-level-transition camera-rapid-track-mode)) (logclear! (-> obj flags) (rigid-body-object-flag flight-level-transition-ending)) (set! (-> obj transition-time) (current-time)) (vehicle-method-91 obj) @@ -762,7 +760,7 @@ This commonly includes things such as: (defmethod vehicle-method-79 vehicle ((obj vehicle)) (logclear! (-> obj flags) (rigid-body-object-flag flight-level-transition)) - (set! (-> obj flags) (logior (rigid-body-object-flag flight-level-transition-ending) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag flight-level-transition-ending)) (set! (-> obj transition-end-time) (current-time)) 0 (none) @@ -791,7 +789,7 @@ This commonly includes things such as: (defmethod vehicle-method-139 vehicle ((obj vehicle)) (when (not (logtest? (rigid-body-object-flag ignition) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag ignition) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag ignition)) (sound-play "vehicl-ignition") (let ((s5-1 (-> obj node-list data 0 bone transform)) (s4-1 (new 'stack-no-clear 'merc-matrix)) @@ -897,7 +895,7 @@ This commonly includes things such as: (defmethod vehicle-method-87 vehicle ((obj vehicle)) (when (not (logtest? (rigid-body-object-flag camera) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag camera) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag camera)) (set! (-> obj cam-speed-interp) 0.0) (set-setting! 'string-min-height 'abs (-> obj info camera-string-min-height) 0) (set-setting! 'string-max-height 'abs (-> obj info camera-string-max-height) 0) @@ -961,7 +959,7 @@ This commonly includes things such as: (defmethod vehicle-method-89 vehicle ((obj vehicle)) (when (not (logtest? (rigid-body-object-flag camera-bike-mode) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag camera-bike-mode) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag camera-bike-mode)) (set-setting! 'bike-mode #f 0.0 0) ) 0 @@ -979,7 +977,7 @@ This commonly includes things such as: (defmethod vehicle-method-91 vehicle ((obj vehicle)) (when (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) - (set! (-> obj flags) (logior (rigid-body-object-flag camera-rapid-track-mode) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag camera-rapid-track-mode)) (set-setting! 'rapid-tracking #f 0.0 0) ) 0 @@ -1237,7 +1235,7 @@ This commonly includes things such as: (defmethod vehicle-method-128 vehicle ((obj vehicle)) (vehicle-method-82 obj) (set! (-> obj root trans y) (-> obj flight-level)) - (set! (-> obj flags) (logior (rigid-body-object-flag ignition ai-driving) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag ignition ai-driving)) (let ((gp-1 (-> obj child))) (while gp-1 (send-event (ppointer->process gp-1) 'traffic-on) @@ -1365,7 +1363,7 @@ This commonly includes things such as: (label cfg-1) (let ((v1-7 (find-best-segment (-> obj controller traffic) (-> s5-0 local-pos) (-> s5-0 normal) 0))) (when (and (not v1-7) (< s4-0 3)) - (set! (-> s5-0 local-pos w) (+ 40960.0 (-> s5-0 local-pos w))) + (+! (-> s5-0 local-pos w) 40960.0) (+! s4-0 1) (goto cfg-1) ) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle.gc index c376700156..71634eaff0 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle.gc @@ -304,7 +304,7 @@ (logclear! (-> obj flags) (rigid-body-object-flag reverse-gear)) (when (< 0.0 f30-0) (set! f30-0 0.25) - (set! (-> obj flags) (logior (rigid-body-object-flag slide) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag slide)) ) f30-0 ) @@ -336,7 +336,7 @@ (f2-8 8192.0) ) (if (< f1-10 (* f2-8 f2-8)) - (set! (-> obj flags) (logior (rigid-body-object-flag reverse-gear) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag reverse-gear)) ) ) f30-0 @@ -533,7 +533,7 @@ (not (logtest? (-> obj flags) (rigid-body-object-flag in-air))) (logtest? (-> obj vehicle-jkhn1b23jn1) 1024) ) - (set! (-> obj flags) (logior (rigid-body-object-flag hard-turn) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag hard-turn)) (set! (-> obj turn-time) (current-time)) ) (if (or (not (logtest? (rigid-body-object-flag jump) (-> obj flags))) @@ -1431,7 +1431,7 @@ (logior! (-> obj rbody state flags) (rigid-body-flag enable-collision)) (set! (-> obj root max-iteration-count) (the-as uint 8)) (set! (-> obj max-time-step) 0.033333335) - (set! (-> obj mask) (logior (process-mask vehicle) (-> obj mask))) + (logior! (-> obj mask) (process-mask vehicle)) (logclear! (-> obj mask) (process-mask actor-pause movie)) (logclear! (-> obj skel status) (joint-control-status sync-math)) (process-entity-status! obj (entity-perm-status no-kill) #t) @@ -1795,7 +1795,7 @@ ) ((= v1-19 'traffic-activate) (set! (-> obj controller traffic) (the-as traffic-engine (-> arg3 param 1))) - (set! (-> obj flags) (logior (rigid-body-object-flag traffic-managed) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag traffic-managed)) (let ((s5-1 (the-as traffic-object-spawn-params (-> arg3 param 0)))) (set! (-> obj root trans quad) (-> s5-1 position quad)) (quaternion-copy! (-> obj root quat) (-> s5-1 rotation)) @@ -1829,7 +1829,7 @@ (set! (-> obj turbo-boost-factor) (the-as float (-> arg3 param 0))) (set! (-> obj turbo-boost-time) (current-time)) (set! (-> obj turbo-boost-duration) (the-as uint 75)) - (set! (-> obj flags) (logior (rigid-body-object-flag turbo-boost) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag turbo-boost)) (if (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) (sound-play "boost-ring") ) @@ -1887,7 +1887,7 @@ (defbehavior vehicle-init-by-other vehicle ((arg0 traffic-object-spawn-params)) (stack-size-set! (-> self main-thread) 16) - (set! (-> self mask) (logior (process-mask vehicle) (-> self mask))) + (logior! (-> self mask) (process-mask vehicle)) (allocate-and-init-cshape self) (set! (-> self root trans quad) (-> arg0 position quad)) (quaternion-copy! (-> self root quat) (-> arg0 rotation)) diff --git a/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc b/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc index 803bbf9f51..9543adbddb 100644 --- a/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc +++ b/goal_src/jak2/levels/common/ai/ashelin/ash-states.gc @@ -487,7 +487,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (if (not (handle->process (-> self focus handle))) (react-to-focus self) ) @@ -1035,7 +1035,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -1066,7 +1066,7 @@ (when (and (nonzero? (-> self hit-points)) (zero? (-> self fated-time))) (if (logtest? (-> self bot-flags) (bot-flags bf04)) (logior! (-> self bot-flags) (bot-flags bf12)) - (set! (-> self bot-flags) (logior (bot-flags bf23) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf23)) ) ) (none) diff --git a/goal_src/jak2/levels/common/ai/ashelin/ash.gc b/goal_src/jak2/levels/common/ai/ashelin/ash.gc index 44bb512a02..ddc06754bc 100644 --- a/goal_src/jak2/levels/common/ai/ashelin/ash.gc +++ b/goal_src/jak2/levels/common/ai/ashelin/ash.gc @@ -225,7 +225,7 @@ ;; WARN: Return type mismatch penetrate vs none. (defmethod ashelin-method-250 ashelin ((obj ashelin) (arg0 symbol)) (if arg0 - (set! (-> obj bot-flags) (logior (bot-flags bf22) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf22)) (logclear! (-> obj bot-flags) (bot-flags bf22)) ) (set! (-> obj root penetrated-by) (get-penetrate-info obj)) @@ -240,7 +240,7 @@ (if (logtest? (bot-flags bf22) (-> obj bot-flags)) (set! v0-0 #t) ) - (set! (-> obj bot-flags) (logior (bot-flags bf21) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf21)) ) v0-0 ) @@ -798,7 +798,7 @@ (set! (-> v1-27 dist) 43690.68) (set! (-> v1-27 frame-group) (the-as art-joint-anim (-> obj draw art-group data 6))) ) - (set! (-> obj bot-flags) (logior (bot-flags bf19) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf19)) f0-4 ) (else @@ -871,7 +871,7 @@ (set! (-> a0-29 param 0) 0.0) (joint-control-channel-group! a0-29 (the-as art-joint-anim (-> obj draw art-group data 6)) num-func-chan) ) - (set! (-> obj bot-flags) (logior (bot-flags bf19) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf19)) ) ) ) diff --git a/goal_src/jak2/levels/common/ai/bot-h.gc b/goal_src/jak2/levels/common/ai/bot-h.gc index 7f060c6cff..d82aa0b234 100644 --- a/goal_src/jak2/levels/common/ai/bot-h.gc +++ b/goal_src/jak2/levels/common/ai/bot-h.gc @@ -564,7 +564,7 @@ (defmethod reset-index bot-speech-list ((obj bot-speech-list) (arg0 symbol)) (if arg0 - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) (set! (-> obj last-local-index) -1) (none) diff --git a/goal_src/jak2/levels/common/ai/bot-states.gc b/goal_src/jak2/levels/common/ai/bot-states.gc index 33ed80813f..cbfb549cde 100644 --- a/goal_src/jak2/levels/common/ai/bot-states.gc +++ b/goal_src/jak2/levels/common/ai/bot-states.gc @@ -61,7 +61,7 @@ ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) diff --git a/goal_src/jak2/levels/common/ai/bot.gc b/goal_src/jak2/levels/common/ai/bot.gc index 1664c48eb9..038472687e 100644 --- a/goal_src/jak2/levels/common/ai/bot.gc +++ b/goal_src/jak2/levels/common/ai/bot.gc @@ -825,7 +825,7 @@ ) (cond (v1-43 - (set! (-> obj bot-flags) (logior (bot-flags bf16) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf16)) (when (and (>= (the-as int s5-1) 0) (!= s5-1 (-> obj nav-mesh-index))) (change-to (nav-mesh-from-res-tag (-> obj entity) 'nav-mesh-actor (the-as int s5-1)) obj) (set! (-> obj nav-mesh-index) (the-as int s5-1)) @@ -1467,8 +1467,8 @@ If the player is too far, play a warning speech." (process-entity-status! obj (entity-perm-status bit-4) #t) (set! (-> obj ai-ctrl) (new 'process 'ai-task-control *bot-task-pool*)) (logclear! (-> obj mask) (process-mask enemy)) - (set! (-> obj mask) (logior (process-mask bot) (-> obj mask))) - (set! (-> obj enemy-flags) (logior (enemy-flag use-notice-distance multi-focus) (-> obj enemy-flags))) + (logior! (-> obj mask) (process-mask bot)) + (logior! (-> obj enemy-flags) (enemy-flag use-notice-distance multi-focus)) (logclear! (-> obj mask) (process-mask collectable)) (logclear! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (logior! (-> obj focus-status) (focus-status disable)) @@ -1548,7 +1548,7 @@ If the player is too far, play a warning speech." (when (and arg0 focus-proc (zero? (-> focus los))) (let ((cquery (new 'stack-no-clear 'collide-query))) (set! (-> cquery start-pos quad) (-> obj root trans quad)) - (set! (-> cquery start-pos y) (+ 8192.0 (-> cquery start-pos y))) + (+! (-> cquery start-pos y) 8192.0) (vector-! (-> cquery move-dist) (-> focus bullseye) (-> cquery start-pos)) (let ((f0-19 (fmax 1.0 (+ -1638.4 (vector-length (-> cquery move-dist)))))) (cond @@ -1699,7 +1699,7 @@ If the player is too far, play a warning speech." (s5-0 (new 'stack-no-clear 'vector)) ) (set! (-> v1-0 quad) (-> obj root trans quad)) - (set! (-> v1-0 y) (+ 9216.0 (-> v1-0 y))) + (+! (-> v1-0 y) 9216.0) (vector-! s1-0 arg0 v1-0) (vector-normalize! s1-0 1.0) (vector-z-quaternion! s2-0 (-> obj root quat)) diff --git a/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc b/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc index 5ba3713615..fe537971be 100644 --- a/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc +++ b/goal_src/jak2/levels/common/ai/ruffian/ruf-states.gc @@ -376,7 +376,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-11 *game-info*) (a0-6 (+ (-> v1-11 attack-id) 1)) @@ -418,7 +418,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (if (not (handle->process (-> self focus handle))) (react-to-focus self) ) @@ -478,7 +478,7 @@ (when (and (nonzero? (-> self hit-points)) (zero? (-> self fated-time))) (if (logtest? (-> self bot-flags) (bot-flags bf04)) (logior! (-> self bot-flags) (bot-flags bf12)) - (set! (-> self bot-flags) (logior (bot-flags bf24) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf24)) ) ) (set! (-> self travel-anim-interp) 0.0) diff --git a/goal_src/jak2/levels/common/ai/ruffian/ruf-task.gc b/goal_src/jak2/levels/common/ai/ruffian/ruf-task.gc index 1d450ad828..7c1803a94c 100644 --- a/goal_src/jak2/levels/common/ai/ruffian/ruf-task.gc +++ b/goal_src/jak2/levels/common/ai/ruffian/ruf-task.gc @@ -211,7 +211,7 @@ (not (logtest? (bot-flags bf21) (-> arg0 bot-flags))) ) ) - (set! (-> arg0 bot-flags) (logior (bot-flags bf20) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf20)) (logclear! (-> arg0 bot-flags) (bot-flags bf20)) ) (when (logtest? *display-bot-marks* (bot-marks-controls bmc16)) diff --git a/goal_src/jak2/levels/common/ai/sig/sig-states.gc b/goal_src/jak2/levels/common/ai/sig/sig-states.gc index 761efb330d..7925480bf8 100644 --- a/goal_src/jak2/levels/common/ai/sig/sig-states.gc +++ b/goal_src/jak2/levels/common/ai/sig/sig-states.gc @@ -632,7 +632,7 @@ ) (sound-play "sig-gun-jam") (logclear! (-> self bot-flags) (bot-flags bf20)) - (set! (-> self bot-flags) (logior (bot-flags bf19) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf19)) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) (suspend) @@ -1191,7 +1191,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-11 *game-info*) (a0-6 (+ (-> v1-11 attack-id) 1)) @@ -1276,7 +1276,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (if (not (handle->process (-> self focus handle))) (react-to-focus self) ) @@ -1407,7 +1407,7 @@ (if (not (handle->process (-> self focus handle))) (go-virtual traveling) ) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (none) ) :exit (behavior () @@ -1518,7 +1518,7 @@ ) (set! (-> self enemy-flags) v1-31) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-38 (-> self enemy-flags))) @@ -1704,7 +1704,7 @@ (look-at-target! self (enemy-flag lock-focus)) (set! (-> self skel top-anim interp) 0.0) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self bot-flags) (logior (bot-flags bf24) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf24)) (none) ) :trans (behavior () @@ -1845,7 +1845,7 @@ (look-at-target! self (enemy-flag lock-focus)) (set! (-> self skel top-anim interp) 0.0) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self bot-flags) (logior (bot-flags bf24) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf24)) (logclear! (-> self bot-flags) (bot-flags bf25)) (none) ) @@ -1891,7 +1891,7 @@ (if (and (not (logtest? (bot-flags bf25) (-> self bot-flags))) (and (< 5.0 (ja-aframe-num 0)) (sig-method-250 self)) ) - (set! (-> self bot-flags) (logior (bot-flags bf25) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf25)) ) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak2/levels/common/ai/sig/sig.gc b/goal_src/jak2/levels/common/ai/sig/sig.gc index 10ab79858e..e0dcead7ff 100644 --- a/goal_src/jak2/levels/common/ai/sig/sig.gc +++ b/goal_src/jak2/levels/common/ai/sig/sig.gc @@ -970,7 +970,7 @@ (f1-4 (cond ((or (not (and v1-6 (= v1-6 (-> obj draw art-group data 3)))) (or (= (-> obj jump-why) 4) (>= f2-1 8192.0))) - (set! (-> obj bot-flags) (logior (bot-flags bf23) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf23)) (let ((f2-3 (fmax 12288.0 (* 0.5 f1-0))) (f1-3 (fmax (-> arg0 start-pos y) (-> arg0 dest-pos y))) ) diff --git a/goal_src/jak2/levels/common/battle.gc b/goal_src/jak2/levels/common/battle.gc index 3e2ee24315..20b6f05c30 100644 --- a/goal_src/jak2/levels/common/battle.gc +++ b/goal_src/jak2/levels/common/battle.gc @@ -840,11 +840,6 @@ ) (dotimes (s5-1 (-> obj spawners length)) (let ((s4-1 (-> obj spawners data s5-1))) - (#when PC_PORT - ;; added. a battle may have enemies from an unloaded level in its ally list (e.g. atoll battle has atollext enemies). - (if (not (valid? (-> s4-1 entity) entity-actor "battle spawners" #f *stdcon*)) - (deactivate obj)) - ) (let ((a0-6 (-> s4-1 intro-path))) (if a0-6 (debug-draw a0-6) @@ -1421,12 +1416,6 @@ (let ((v1-0 (-> obj allies)) (gp-0 (-> obj allies length)) ) - (#when PC_PORT - ;; added. a battle may have enemies from an unloaded level in its ally list (e.g. atoll battle has atollext enemies). - (dotimes (i gp-0) - (if (not (valid? (-> v1-0 data i entity) entity-actor "battle allies" #f *stdcon*)) - (deactivate self))) - ) (when (> gp-0 0) (let* ((a1-4 (mod (the-as int (-> self clock integral-frame-counter)) gp-0)) (a3-0 (-> v1-0 data a1-4)) @@ -1866,7 +1855,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'trsqv))) (set! (-> obj root) s4-0) (set! (-> s4-0 trans quad) (-> arg0 extra trans quad)) diff --git a/goal_src/jak2/levels/common/elec-gate.gc b/goal_src/jak2/levels/common/elec-gate.gc index 6465896e46..c0cace53b2 100644 --- a/goal_src/jak2/levels/common/elec-gate.gc +++ b/goal_src/jak2/levels/common/elec-gate.gc @@ -868,7 +868,7 @@ This commonly includes things such as: ) ) (set! (-> obj wall-xz) (* 0.5 (-> obj wall-xz))) - (set! (-> obj wall-xz) (+ 4096.0 (-> obj wall-xz))) + (+! (-> obj wall-xz) 4096.0) (set! (-> obj wall-y) (fabs (- (-> (get-point-in-path! (-> obj path) (new 'stack-no-clear 'vector) (get-num-segments (-> obj path)) 'interp) @@ -878,7 +878,7 @@ This commonly includes things such as: ) ) ) - (set! (-> obj wall-y) (+ 4096.0 (-> obj wall-y))) + (+! (-> obj wall-y) 4096.0) (set! (-> obj quality-enabled?) #t) (set! (-> obj lightning-quality) 1.0) (set! (-> obj sound) diff --git a/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc b/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc index b6251f7dd5..d89eef6e1d 100644 --- a/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc +++ b/goal_src/jak2/levels/common/enemy/amphibian/amphibian.gc @@ -277,7 +277,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (when (= (-> obj incoming knocked-type) (knocked-type knocked-type-4)) @@ -917,7 +917,7 @@ ) (if s4-0 (logior! (-> obj flags) 1) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) (cond @@ -940,7 +940,7 @@ ) (set! (-> s5-3 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) (else @@ -962,7 +962,7 @@ ) (set! (-> s5-4 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) (else @@ -976,7 +976,7 @@ ) (set! (-> s5-5 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) ) @@ -1001,7 +1001,7 @@ ) (set! (-> s5-6 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) ) @@ -1197,7 +1197,7 @@ (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-8 (-> self nav))) (set! (-> v1-8 turning-acceleration) 204800.0) ) @@ -1381,7 +1381,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) @@ -1450,7 +1450,7 @@ (set! (-> v1-3 turning-acceleration) 204800.0) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-7 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-7 enemy-flags))) (set! (-> v1-7 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag38) (-> v1-7 enemy-flags)))) @@ -1512,7 +1512,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -1553,7 +1553,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) @@ -1674,7 +1674,7 @@ (nav-enemy-method-167 self) (set! (-> self tongue-scale) 0.0) (set! (-> self tongue-mode) (the-as uint 0)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (sound-play "tongue-warn") (let ((gp-1 (new 'stack-no-clear 'amphibian-tongue-attack-info))) (amphibian-method-185 self gp-1) diff --git a/goal_src/jak2/levels/common/enemy/flitter.gc b/goal_src/jak2/levels/common/enemy/flitter.gc index d619dc904f..ec319387c0 100644 --- a/goal_src/jak2/levels/common/enemy/flitter.gc +++ b/goal_src/jak2/levels/common/enemy/flitter.gc @@ -703,7 +703,7 @@ (suspend) ) ) - (set! (-> self root trans y) (+ -8192.0 (-> self root trans y))) + (+! (-> self root trans y) -8192.0) (enemy-method-129 self) (let ((a0-5 (handle->process (-> self focus handle)))) (when a0-5 diff --git a/goal_src/jak2/levels/common/enemy/grenadier.gc b/goal_src/jak2/levels/common/enemy/grenadier.gc index 881eef511e..582eec0c1b 100644 --- a/goal_src/jak2/levels/common/enemy/grenadier.gc +++ b/goal_src/jak2/levels/common/enemy/grenadier.gc @@ -513,7 +513,7 @@ ) (grenadier-method-181 self) (look-at-target! self (enemy-flag death-start)) - (set! (-> self status-flags) (logand -2 (-> self status-flags))) + (logand! (-> self status-flags) -2) (none) ) :trans (behavior () @@ -881,7 +881,7 @@ (logior! (-> self nav flags) (nav-control-flag update-heading-from-facing)) (logclear! (-> self nav flags) (nav-control-flag update-heading-from-facing)) ) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (if (logtest? (-> self enemy-flags) (enemy-flag check-water)) (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) @@ -918,7 +918,7 @@ (ja :num! (seek! max f30-0)) ) (ja-channel-push! 1 (seconds 0.067)) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (if (logtest? (enemy-flag enemy-flag43) (-> self enemy-flags)) (logior! (-> self nav flags) (nav-control-flag update-heading-from-facing)) (logclear! (-> self nav flags) (nav-control-flag update-heading-from-facing)) @@ -941,7 +941,7 @@ (suspend) (ja :num! (seek! max f30-0)) ) - (set! (-> self status-flags) (logand -2 (-> self status-flags))) + (logand! (-> self status-flags) -2) ) (else (when (not (enemy-method-96 self 1820.4445 #t)) @@ -1080,7 +1080,7 @@ ) (set! (-> self enemy-flags) v1-44) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-51 (-> self enemy-flags))) diff --git a/goal_src/jak2/levels/common/enemy/grunt.gc b/goal_src/jak2/levels/common/enemy/grunt.gc index 4bcade1a26..d05e6c7e6f 100644 --- a/goal_src/jak2/levels/common/enemy/grunt.gc +++ b/goal_src/jak2/levels/common/enemy/grunt.gc @@ -352,7 +352,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -851,7 +851,7 @@ (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) @@ -949,7 +949,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) diff --git a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc index 5e34752cfc..0de2caecab 100644 --- a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc +++ b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc @@ -1980,7 +1980,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -2206,7 +2206,7 @@ (cond ((logtest? (-> self flags) 4) (if (< (-> self target-vel) 40.96) - (set! (-> self miss-amount) (+ -12288.0 (-> self miss-amount))) + (+! (-> self miss-amount) -12288.0) ) ) ((logtest? (-> self draw status) (draw-control-status on-screen)) @@ -2706,7 +2706,7 @@ (let ((v1-3 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) (logior! (-> v1-3 prim-core action) (collide-action deadly)) ) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-8 *game-info*) (a0-4 (+ (-> v1-8 attack-id) 1)) @@ -2810,7 +2810,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag37)))) @@ -2901,7 +2901,7 @@ ) :enter (behavior () (set! (-> self joint-enable) #t) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-5 *game-info*) (a0-2 (+ (-> v1-5 attack-id) 1)) diff --git a/goal_src/jak2/levels/common/enemy/guards/transport-level.gc b/goal_src/jak2/levels/common/enemy/guards/transport-level.gc index 140f4d7e86..f919870112 100644 --- a/goal_src/jak2/levels/common/enemy/guards/transport-level.gc +++ b/goal_src/jak2/levels/common/enemy/guards/transport-level.gc @@ -269,7 +269,7 @@ (set! (-> s5-0 transport-side) (-> obj spawn-side)) (set! (-> s5-0 nav-mesh) (-> obj nav-mesh)) (set! (-> s5-0 pos quad) (-> obj root trans quad)) - (set! (-> s5-0 pos y) (+ 8192.0 (-> s5-0 pos y))) + (+! (-> s5-0 pos y) 8192.0) (quaternion-rotate-local-y! (-> s5-0 quat) (-> obj root quat) 32768.0) (set! (-> s5-0 handle) (the-as uint (process->handle obj))) (set! (-> s5-0 weapon) 1) @@ -366,9 +366,9 @@ This commonly includes things such as: (set! (-> obj guards v1-11) (the-as handle #f)) ) (set! (-> obj spawn-time) (seconds 4)) - (set! (-> obj root trans y) (+ 40960.0 (-> obj root trans y))) + (+! (-> obj root trans y) 40960.0) (set! (-> obj y-dest) (-> obj root trans y)) - (set! (-> obj root trans y) (+ 163840.0 (-> obj root trans y))) + (+! (-> obj root trans y) 163840.0) (go (method-of-object obj come-down)) (none) ) diff --git a/goal_src/jak2/levels/common/enemy/hopper.gc b/goal_src/jak2/levels/common/enemy/hopper.gc index e20e73fe6e..91a47b9779 100644 --- a/goal_src/jak2/levels/common/enemy/hopper.gc +++ b/goal_src/jak2/levels/common/enemy/hopper.gc @@ -883,7 +883,7 @@ (let ((s4-0 (new 'stack-no-clear 'vector))) 0.0 (get-point-in-path! (-> self path-intro) s5-0 0.0 'exact) - (set! (-> s5-0 y) (+ -16384.0 (-> s5-0 y))) + (+! (-> s5-0 y) -16384.0) (get-point-in-path! (-> self path-intro) s4-0 1.0 'exact) (let ((f0-3 (deg-diff (quaternion-y-angle (-> gp-1 quat)) diff --git a/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc b/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc index 44204856f3..4253decac4 100644 --- a/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc +++ b/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc @@ -832,7 +832,7 @@ ) (set! (-> gp-0 quad) (-> (get-trans (the-as process-focusable a0-6) 0) quad)) ) - (set! (-> gp-0 y) (+ -20480.0 (-> gp-0 y))) + (+! (-> gp-0 y) -20480.0) (hover-nav-control-method-11 (-> self hover) gp-0) ) (hover-enemy-dest-post) @@ -990,7 +990,7 @@ ) (set! (-> self enemy-flags) v1-35) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-42 (-> self enemy-flags))) diff --git a/goal_src/jak2/levels/common/enemy/hover/flamer.gc b/goal_src/jak2/levels/common/enemy/hover/flamer.gc index 5105bcf2a0..8667c93229 100644 --- a/goal_src/jak2/levels/common/enemy/hover/flamer.gc +++ b/goal_src/jak2/levels/common/enemy/hover/flamer.gc @@ -231,7 +231,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (go (method-of-object obj knocked)) @@ -1313,7 +1313,7 @@ 0 (set! (-> self hit-points) 0) (if (logtest? (enemy-option knocked-into-water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup)) ) (let ((v1-8 self)) (set! (-> v1-8 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag37) (-> v1-8 enemy-flags)))) @@ -1468,7 +1468,7 @@ (set! (-> obj root dynam gravity-max) 225280.0) (let ((v1-25 (-> obj root trans))) (set! (-> obj base-pos quad) (-> v1-25 quad)) - (set! (-> v1-25 y) (+ 22528.0 (-> v1-25 y))) + (+! (-> v1-25 y) 22528.0) (set! (-> obj idle-pos quad) (-> v1-25 quad)) ) (set! (-> obj flit-joint) (the-as joint-mod (new 'process 'joint-mod-set-local obj 3 #t #f #f))) @@ -1491,7 +1491,7 @@ (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "flamer-loop" :fo-max 80) (-> obj root trans)) ) - (set! (-> obj enemy-flags) (logior (enemy-flag multi-focus) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag multi-focus)) (let ((v1-45 (-> obj nav))) (set! (-> v1-45 sphere-mask) (the-as uint 0)) ) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc b/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc index f598a3de69..06dc72af58 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc @@ -29,7 +29,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -692,7 +692,7 @@ ) (set! (-> self enemy-flags) v1-38) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-45 (-> self enemy-flags))) @@ -726,7 +726,7 @@ (set! (-> self state-time) (current-time)) (dispose! self) (stop-looking-at-target! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logclear! (-> self mask) (process-mask actor-pause)) (logclear! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self enemy-flags) (enemy-flag check-water-backup)) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc b/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc index 31ffcd87f6..c27d4acdaa 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc @@ -191,7 +191,7 @@ ) (if (not (handle->process (-> obj control-handle))) (set! (-> obj control-handle) - (process->handle (the-as process (ppointer->process (process-spawn nav-network-control obj arg0)))) + (process->handle (ppointer->process (process-spawn nav-network-control obj arg0))) ) ) 0 @@ -1216,7 +1216,7 @@ (defmethod hover-nav-control-method-20 hover-nav-control ((obj hover-nav-control)) (hover-nav-control-method-21 obj) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) 0 (none) ) @@ -1295,7 +1295,7 @@ ) (else (set! (-> obj los-last-clear-time) (current-time)) - (set! (-> obj flags) (logand -3 (-> obj flags))) + (logand! (-> obj flags) -3) ) ) ) diff --git a/goal_src/jak2/levels/common/enemy/hover/wasp.gc b/goal_src/jak2/levels/common/enemy/hover/wasp.gc index 5288f92e48..8aad0d1fbe 100644 --- a/goal_src/jak2/levels/common/enemy/hover/wasp.gc +++ b/goal_src/jak2/levels/common/enemy/hover/wasp.gc @@ -455,7 +455,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (if (zero? (-> obj hit-points)) @@ -707,7 +707,7 @@ ((< a0-0 (-> v1-0 length)) (let ((a1-1 (-> v1-0 data a0-0 actor extra trans))) (set! (-> self plat-pos quad) (-> a1-1 quad)) - (set! (-> self plat-pos y) (+ -8192.0 (-> self plat-pos y))) + (+! (-> self plat-pos y) -8192.0) (set! (-> self focus-pos quad) (-> self plat-pos quad)) (when (< (vector-vector-distance (-> self root trans) a1-1) (- 327680.0 (* 81920.0 (the float (-> self bridge-index)))) @@ -728,8 +728,8 @@ :post (behavior () (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self focus-pos quad)) - (set! (-> a1-0 z) (+ 81920.0 (-> a1-0 z))) - (set! (-> a1-0 y) (+ 40960.0 (-> a1-0 y))) + (+! (-> a1-0 z) 81920.0) + (+! (-> a1-0 y) 40960.0) (hover-nav-control-method-11 (-> self hover) a1-0) ) (hover-enemy-dest-post) @@ -814,8 +814,8 @@ ) (let ((a1-8 (new 'stack-no-clear 'vector))) (set! (-> a1-8 quad) (-> self focus-pos quad)) - (set! (-> a1-8 z) (+ 81920.0 (-> a1-8 z))) - (set! (-> a1-8 y) (+ 40960.0 (-> a1-8 y))) + (+! (-> a1-8 z) 81920.0) + (+! (-> a1-8 y) 40960.0) (hover-nav-control-method-11 (-> self hover) a1-8) ) (hover-enemy-dest-post) @@ -1011,7 +1011,7 @@ ) (set! (-> self enemy-flags) v1-35) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-42 (-> self enemy-flags))) diff --git a/goal_src/jak2/levels/common/enemy/metalmonk.gc b/goal_src/jak2/levels/common/enemy/metalmonk.gc index 5a27862765..0ff6e292de 100644 --- a/goal_src/jak2/levels/common/enemy/metalmonk.gc +++ b/goal_src/jak2/levels/common/enemy/metalmonk.gc @@ -395,7 +395,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -732,7 +732,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior metalmonk) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (metalmonk-method-180 self #t) (nav-enemy-method-169 self 6144.0 #f) (let ((v1-6 (-> self nav))) diff --git a/goal_src/jak2/levels/common/enemy/spyder.gc b/goal_src/jak2/levels/common/enemy/spyder.gc index 14169105f4..01918e19e7 100644 --- a/goal_src/jak2/levels/common/enemy/spyder.gc +++ b/goal_src/jak2/levels/common/enemy/spyder.gc @@ -274,7 +274,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (when (zero? (-> obj hit-points)) @@ -611,7 +611,7 @@ (cond ((logtest? (-> obj status-flags) 8) (vector-! s4-1 (-> obj face-pos) (-> obj root trans)) - (set! (-> obj status-flags) (logand -9 (-> obj status-flags))) + (logand! (-> obj status-flags) -9) ) (else (set! (-> s4-1 quad) (-> s3-0 quad)) @@ -672,7 +672,7 @@ (let ((t9-6 (method-of-type nav-enemy track-target!))) (t9-6 obj) ) - (set! (-> obj status-flags) (logand -2 (-> obj status-flags))) + (logand! (-> obj status-flags) -2) (if (logtest? (-> obj status-flags) 32) (los-control-method-9 (-> obj los) (the-as process-focusable #f) (the-as vector #f) 2048.0) ) @@ -862,7 +862,7 @@ ) (spyder-method-181 self) (look-at-target! self (enemy-flag death-start)) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (when (!= (-> self dest-fade) 128.0) (set! (-> self shock-effect-end) (+ (current-time) (seconds 1))) (set! (-> self dest-fade) 128.0) @@ -876,7 +876,7 @@ (t9-0) ) ) - (set! (-> self status-flags) (logand -33 (-> self status-flags))) + (logand! (-> self status-flags) -33) (look-at-target! self (enemy-flag lock-focus)) (none) ) @@ -1027,7 +1027,7 @@ ) 0 (look-at-target! self (enemy-flag lock-focus)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (none) ) :exit (behavior () @@ -1166,7 +1166,7 @@ (t9-0) ) ) - (set! (-> self status-flags) (logand -5 (-> self status-flags))) + (logand! (-> self status-flags) -5) (dotimes (gp-0 4) (enable-set! (-> self joint-ik gp-0) #f) ) diff --git a/goal_src/jak2/levels/common/entities/gun-buoy.gc b/goal_src/jak2/levels/common/entities/gun-buoy.gc index ca19a0b5a3..d6c680c472 100644 --- a/goal_src/jak2/levels/common/entities/gun-buoy.gc +++ b/goal_src/jak2/levels/common/entities/gun-buoy.gc @@ -53,7 +53,7 @@ (when a0-2 (let ((s1-1 (new 'stack-no-clear 'vector))) (set! (-> s1-1 quad) (-> (get-trans a0-2 0) quad)) - (set! (-> s1-1 y) (+ 8192.0 (-> s1-1 y))) + (+! (-> s1-1 y) 8192.0) (vector-! s4-0 s1-1 (-> s5-0 trans)) ) (vector-normalize! s4-0 f30-0) @@ -161,7 +161,7 @@ (set! (-> obj move) gun-buoy-shot-move) (set! (-> obj timeout) (seconds 2.78)) (set! (-> obj damage) 1024.0) - (set! (-> obj options) (logior (projectile-options deal-damage ignore-impact) (-> obj options))) + (logior! (-> obj options) (projectile-options deal-damage ignore-impact)) (set-gravity-length (-> obj root dynam) 573440.0) (none) ) @@ -360,7 +360,7 @@ ) (let ((s4-1 (new 'stack-no-clear 'vector))) (set! (-> s3-0 quad) (-> self root trans quad)) - (set! (-> s3-0 y) (+ 4096.0 (-> s3-0 y))) + (+! (-> s3-0 y) 4096.0) (vector-! s4-1 (get-trans (the-as process-focusable gp-0) 3) s3-0) (vector-normalize! s4-1 1.0) (vector-lerp! s5-1 s5-1 s4-1 0.99) @@ -399,8 +399,8 @@ ) :enter (behavior () (set! (-> self root trans quad) (-> self start-pos quad)) - (set! (-> self flags) (logand -3 (-> self flags))) - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -3) + (logand! (-> self flags) -5) (none) ) :trans (behavior () @@ -435,7 +435,7 @@ 0 (nav-enemy-method-166 self) (logior! (-> self flags) 1) - (set! (-> self water flags) (logior (water-flags touch-water) (-> self water flags))) + (logior! (-> self water flags) (water-flags touch-water)) (let* ((gp-0 *target*) (s3-0 (if (type? gp-0 process-focusable) gp-0 @@ -539,7 +539,7 @@ (defstate exit-ambush (gun-buoy) :virtual #t :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :exit (behavior () @@ -1084,7 +1084,7 @@ ) (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 quad) (-> (get-trans arg0 0) quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) (set! (-> s4-0 ent) (-> obj entity)) (set! (-> s4-0 charge) 1.0) (set! (-> s4-0 options) (projectile-options)) diff --git a/goal_src/jak2/levels/common/entities/spydroid.gc b/goal_src/jak2/levels/common/entities/spydroid.gc index 497570b05a..69c53ee0be 100644 --- a/goal_src/jak2/levels/common/entities/spydroid.gc +++ b/goal_src/jak2/levels/common/entities/spydroid.gc @@ -698,10 +698,10 @@ (set! (-> obj diff-angle) (- (-> obj old-y-deg) f0-5)) (cond ((< 32768.0 (-> obj diff-angle)) - (set! (-> obj diff-angle) (+ -65536.0 (-> obj diff-angle))) + (+! (-> obj diff-angle) -65536.0) ) ((< (-> obj diff-angle) -32768.0) - (set! (-> obj diff-angle) (+ 65536.0 (-> obj diff-angle))) + (+! (-> obj diff-angle) 65536.0) ) ) (set! (-> obj old-y-deg) f0-5) @@ -926,7 +926,7 @@ :event (the-as (function process int symbol event-message-block object :behavior spydroid) enemy-event-handler) :enter (behavior () (set! (-> self hit-target) #f) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 (-> self nav))) (set! (-> v1-2 target-speed) (+ 8192.0 (-> self enemy-info run-travel-speed))) ) diff --git a/goal_src/jak2/levels/common/race/race-manager.gc b/goal_src/jak2/levels/common/race/race-manager.gc index ef43a8fa03..ced710f286 100644 --- a/goal_src/jak2/levels/common/race/race-manager.gc +++ b/goal_src/jak2/levels/common/race/race-manager.gc @@ -69,9 +69,9 @@ (when gp-0 (let ((s4-0 (-> gp-0 edges 0))) (vector-average! (-> obj start-sphere) (-> s4-0 left) (-> s4-0 right)) - (set! (-> obj start-sphere y) (+ 40960.0 (-> obj start-sphere y))) + (+! (-> obj start-sphere y) 40960.0) (race-find-ground (-> obj start-sphere) (-> obj start-sphere)) - (set! (-> obj start-sphere y) (+ 8192.0 (-> obj start-sphere y))) + (+! (-> obj start-sphere y) 8192.0) (set! (-> obj start-sphere r) (* 0.5 (vector-vector-distance (-> s4-0 left) (-> s4-0 right)))) (let ((v1-6 (new 'stack-no-clear 'vector))) (vector-! v1-6 (-> s4-0 right) (-> s4-0 left)) @@ -777,7 +777,7 @@ (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) (.svf (&-> a0-7 0 quad) vf6) ) - (set! (-> s4-0 vector 0 y) (+ 22528.0 (-> s4-0 vector 0 y))) + (+! (-> s4-0 vector 0 y) 22528.0) (set! (-> obj race-signal) (process->handle (race-signal-spawn s5-1 (the-as vector (-> s4-0 vector)) (the-as quaternion (-> s4-0 vector 1))) @@ -1017,7 +1017,7 @@ (set! (-> gp-0 i-player) 0) (set! (-> s4-0 params position quad) (-> *target* control trans quad)) (quaternion-copy! (-> s4-0 params rotation) (-> *target* control quat)) - (set! (-> s4-0 params position y) (+ 12288.0 (-> s4-0 params position y))) + (+! (-> s4-0 params position y) 12288.0) (set! (-> s4-0 params behavior) (the-as uint 4)) (logclear! (-> s4-0 params flags) (traffic-spawn-flags trsflags-01)) (let ((s5-1 (vehicle-spawn obj (type-from-race-vehicle-type (-> s2-0 vehicle)) (-> s4-0 params)))) @@ -1063,7 +1063,7 @@ (set! (-> gp-0 arrow) (process->handle (t9-11 sv-352 (the-as task-arrow a1-17)))) ) (set! (-> s4-0 params position quad) (-> gp-0 info player-intro-pos quad)) - (set! (-> s4-0 params position y) (+ 12288.0 (-> s4-0 params position y))) + (+! (-> s4-0 params position y) 12288.0) ) (logclear! (-> s4-0 params flags) (traffic-spawn-flags trsflags-01)) (set! sv-416 37) @@ -1272,7 +1272,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1) (s5-0 *temp-string* gp-1 #f 44 (bucket-id progress)) ) - (set! (-> gp-1 origin y) (+ 35.0 (-> gp-1 origin y))) + (+! (-> gp-1 origin y) 35.0) (let ((s5-1 print-game-text)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1) (s5-1 *temp-string* gp-1 #f 44 (bucket-id progress)) diff --git a/goal_src/jak2/levels/common/race/race-obs.gc b/goal_src/jak2/levels/common/race/race-obs.gc index 58f8bf3195..d2f7df0696 100644 --- a/goal_src/jak2/levels/common/race/race-obs.gc +++ b/goal_src/jak2/levels/common/race/race-obs.gc @@ -264,7 +264,7 @@ (set! (-> v1-8 trans y) 204800.0) (set! (-> v1-8 vector 0 quad) (-> self pos quad)) (set! (-> v1-8 vector 1 quad) (-> self pos quad)) - (set! (-> v1-8 vector 1 y) (+ 204800.0 (-> v1-8 vector 1 y))) + (+! (-> v1-8 vector 1 y) 204800.0) (cubic-curve-method-9 (-> self curve) (the-as vector (-> v1-8 vector)) @@ -682,7 +682,7 @@ (when (>= f0-6 0.0) (vector+float*! (-> gp-0 push-vel) (-> gp-0 cquery start-pos) (-> gp-0 cquery move-dist) f0-6) (set! (-> gp-0 vec33 quad) (-> gp-0 cquery best-other-tri normal quad)) - (set! (-> gp-0 push-vel y) (+ 4915.2 (-> gp-0 push-vel y))) + (+! (-> gp-0 push-vel y) 4915.2) (set! s4-0 #t) (format #t "turbo-pickup::find-ground: ground y ~M~%" (-> gp-0 push-vel y)) ) diff --git a/goal_src/jak2/levels/common/race/vehicle-racer.gc b/goal_src/jak2/levels/common/race/vehicle-racer.gc index 32f2372e59..d546ccc303 100644 --- a/goal_src/jak2/levels/common/race/vehicle-racer.gc +++ b/goal_src/jak2/levels/common/race/vehicle-racer.gc @@ -268,7 +268,7 @@ (set! (-> obj turbo-boost-time) (current-time)) (set! (-> obj turbo-boost-factor) 1.0) (set! (-> obj turbo-boost-duration) (the-as uint 150)) - (set! (-> obj flags) (logior (rigid-body-object-flag turbo-boost) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag turbo-boost)) (if (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) (sound-play "turbo-boost") ) @@ -296,7 +296,7 @@ (race-control-method-9 (-> obj race) (-> obj traffic-priority-id) (-> obj root trans)) (cond ((logtest? (-> arg0 flags) (traffic-spawn-flags trsflags-01)) - (set! (-> obj flags) (logior (rigid-body-object-flag riding ai-driving) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag riding ai-driving)) (cond ((-> obj race path) (go (method-of-object obj waiting-for-start)) @@ -918,7 +918,7 @@ ) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self flags) (logior (rigid-body-object-flag ignition) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag ignition)) (set! (-> self controls throttle) 0.0) (set! (-> self controls brake) 0.0) (set! (-> self controls steering) 0.0) @@ -984,7 +984,7 @@ (set! (-> self state-time) (current-time)) (set! (-> self damage-factor) (-> self info damage-factor)) (vehicle-method-143 self) - (set! (-> self flags) (logior (rigid-body-object-flag ignition) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag ignition)) (none) ) :code (the-as (function none :behavior vehicle-racer) sleep-code) @@ -1011,7 +1011,7 @@ ) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self flags) (logior (rigid-body-object-flag riding ignition) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag riding ignition)) (set! (-> self controls throttle) 0.0) (set! (-> self controls brake) 0.0) (set! (-> self controls steering) 0.0) diff --git a/goal_src/jak2/levels/common/warp-gate.gc b/goal_src/jak2/levels/common/warp-gate.gc index 021516b1d9..6bf2e76204 100644 --- a/goal_src/jak2/levels/common/warp-gate.gc +++ b/goal_src/jak2/levels/common/warp-gate.gc @@ -750,7 +750,7 @@ (set! (-> obj on-close) #f) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 130) obj)) (set! (-> obj center quad) (-> obj root trans quad)) - (set! (-> obj center y) (+ 13516.8 (-> obj center y))) + (+! (-> obj center y) 13516.8) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "warpgate" :fo-max 30) (-> obj root trans)) ) @@ -849,7 +849,7 @@ This commonly includes things such as: (set! (-> self control mod-surface) *warp-jump-mods*) (set! (-> self control unknown-vector37 quad) (-> arg0 quad)) (set! (-> self control unknown-vector38 quad) (-> arg1 quad)) - (set! (-> self control unknown-vector37 y) (+ -4096.0 (-> self control unknown-vector37 y))) + (+! (-> self control unknown-vector37 y) -4096.0) (set! (-> self control unknown-word04) (the-as uint #f)) (set! (-> self control unknown-handle02) (the-as handle arg2)) (vector-reset! (-> self control transv)) diff --git a/goal_src/jak2/levels/demo/demo-obs.gc b/goal_src/jak2/levels/demo/demo-obs.gc index 42d2be0668..3647047d70 100644 --- a/goal_src/jak2/levels/demo/demo-obs.gc +++ b/goal_src/jak2/levels/demo/demo-obs.gc @@ -489,13 +489,21 @@ (sound-play "dmenu-hit") (let ((gp-1 (cond ((= *kernel-boot-message* 'demo-shared) - (new 'static 'boxed-array :type uint32 #x24f #x250 #x123) + (new 'static 'boxed-array :type text-id + (text-id atoll-unknown) + (text-id strip-unknown) + (text-id progress-demo-exit) + ) ) ((= (scf-get-territory) 1) - (new 'static 'boxed-array :type uint32 #x24f #x250) + (new 'static 'boxed-array :type text-id (text-id atoll-unknown) (text-id strip-unknown)) ) (else - (new 'static 'boxed-array :type uint32 #x24f #x250 #x251) + (new 'static 'boxed-array :type text-id + (text-id atoll-unknown) + (text-id strip-unknown) + (text-id watch-trailer) + ) ) ) ) @@ -532,14 +540,8 @@ (set! (-> sv-112 color) (font-color progress-old-selected)) (set! (-> sv-112 color) (font-color white)) ) - (print-game-text - (lookup-text! *common-text* (the-as text-id (-> gp-1 s5-4)) #f) - sv-112 - #f - 44 - (bucket-id progress) - ) - (set! (-> sv-112 origin y) (+ 22.0 (-> sv-112 origin y))) + (print-game-text (lookup-text! *common-text* (-> gp-1 s5-4) #f) sv-112 #f 44 (bucket-id progress)) + (+! (-> sv-112 origin y) 22.0) ) ) (suspend) diff --git a/goal_src/jak2/levels/dig/dig-digger.gc b/goal_src/jak2/levels/dig/dig-digger.gc index e3e69528ed..cc9659f105 100644 --- a/goal_src/jak2/levels/dig/dig-digger.gc +++ b/goal_src/jak2/levels/dig/dig-digger.gc @@ -202,7 +202,7 @@ ) (let ((s2-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 start-pos quad) (-> (the-as process-drawable s3-0) root trans quad)) - (set! (-> s4-0 start-pos y) (+ 61440.0 (-> s4-0 start-pos y))) + (+! (-> s4-0 start-pos y) 61440.0) (set! (-> s2-0 x) (-> arg1 vel-sxvel x)) (set! (-> s2-0 z) (-> arg1 vel-sxvel z)) (vector-normalize! s2-0 1.0) @@ -936,7 +936,7 @@ This commonly includes things such as: (let ((v1-23 (-> sv-144 position quad))) (set! (-> sv-160 quad) v1-23) ) - (set! (-> sv-160 y) (+ -2048.0 (-> sv-160 y))) + (+! (-> sv-160 y) -2048.0) (vector+float*! sv-160 sv-160 (the-as vector s2-0) f28-0) (set! f28-0 (fmin 1.0 (+ 0.2 f28-0))) (when (< s0-0 7) diff --git a/goal_src/jak2/levels/dig/dig-obs.gc b/goal_src/jak2/levels/dig/dig-obs.gc index 69ce8a13f2..3f130249f1 100644 --- a/goal_src/jak2/levels/dig/dig-obs.gc +++ b/goal_src/jak2/levels/dig/dig-obs.gc @@ -214,7 +214,7 @@ (else (let ((v1-5 (new 'stack-no-clear 'vector))) (set! (-> v1-5 quad) (-> arg0 quad)) - (set! (-> v1-5 y) (+ -8192.0 (-> v1-5 y))) + (+! (-> v1-5 y) -8192.0) (let ((a0-16 (-> obj rbody)) (a2-2 (-> obj root quat)) ) diff --git a/goal_src/jak2/levels/dig/dig1-obs.gc b/goal_src/jak2/levels/dig/dig1-obs.gc index 8263d627f6..991042a78c 100644 --- a/goal_src/jak2/levels/dig/dig1-obs.gc +++ b/goal_src/jak2/levels/dig/dig1-obs.gc @@ -773,7 +773,7 @@ (set! (-> self root trans quad) (-> arg0 pos quad)) (quaternion-copy! (-> self root quat) (-> arg0 quat)) (init-skel-and-rigid-body self) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (vector-float*! (-> self rbody state lin-momentum) (-> arg0 vel) (-> self info info mass)) (vector-float*! (-> self rbody state ang-momentum) (-> arg0 avel) (-> self info info mass)) (go-virtual idle) @@ -935,7 +935,7 @@ ) (when a0-5 (set! (-> gp-1 fountain-rand-transv-lo quad) (-> (get-trans a0-5 0) quad)) - (set! (-> gp-1 fountain-rand-transv-lo y) (+ -16384.0 (-> gp-1 fountain-rand-transv-lo y))) + (+! (-> gp-1 fountain-rand-transv-lo y) -16384.0) ) ) (set! (-> gp-1 fountain-rand-transv-hi x) 24576.0) @@ -1012,7 +1012,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-dig-bomb-crate" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (transform-post) (go (method-of-object obj idle)) (none) diff --git a/goal_src/jak2/levels/dig/dig2-obs.gc b/goal_src/jak2/levels/dig/dig2-obs.gc index ea09e07446..c4afc0c87c 100644 --- a/goal_src/jak2/levels/dig/dig2-obs.gc +++ b/goal_src/jak2/levels/dig/dig2-obs.gc @@ -50,7 +50,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s4-0 (art-group-get-by-name *level* "skel-dig-breakable-door" (the-as (pointer uint32) #f)))) (let ((s3-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((v1-7 (new 'process 'collide-shape-prim-mesh s3-0 (the-as uint 0) (the-as uint 0)))) diff --git a/goal_src/jak2/levels/dig/dig3-obs.gc b/goal_src/jak2/levels/dig/dig3-obs.gc index 894c4199a0..9b33711573 100644 --- a/goal_src/jak2/levels/dig/dig3-obs.gc +++ b/goal_src/jak2/levels/dig/dig3-obs.gc @@ -1170,7 +1170,7 @@ This commonly includes things such as: ) (+! (-> self bob-counter) (* 3.0 (-> self clock time-adjust-ratio))) (if (< 360.0 (-> self bob-counter)) - (set! (-> self bob-counter) (+ -360.0 (-> self bob-counter))) + (+! (-> self bob-counter) -360.0) ) (if (not (!= (-> self smush amp) 0.0)) (set! (-> self bouncing) #f) @@ -1731,15 +1731,9 @@ This commonly includes things such as: ) (countdown (a0-16 (-> a0-15 num-tris)) (when (= (-> (the-as collide-cache-tri v1-6) pat event) (pat-event endlessfall)) - (set! (-> (the-as collide-cache-tri v1-6) vertex 0 y) - (+ 409600.0 (-> (the-as collide-cache-tri v1-6) vertex 0 y)) - ) - (set! (-> (the-as collide-cache-tri v1-6) vertex 1 y) - (+ 409600.0 (-> (the-as collide-cache-tri v1-6) vertex 1 y)) - ) - (set! (-> (the-as collide-cache-tri v1-6) vertex 2 y) - (+ 409600.0 (-> (the-as collide-cache-tri v1-6) vertex 2 y)) - ) + (+! (-> (the-as collide-cache-tri v1-6) vertex 0 y) 409600.0) + (+! (-> (the-as collide-cache-tri v1-6) vertex 1 y) 409600.0) + (+! (-> (the-as collide-cache-tri v1-6) vertex 2 y) 409600.0) ) (set! v1-6 (-> (the-as (inline-array collide-cache-tri) v1-6) 1)) ) @@ -1875,7 +1869,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior dig-stomp-block-init-by-other dig-stomp-block ((arg0 vector)) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (allocate-and-init-cshape self) (set! (-> self root trans quad) (-> arg0 quad)) (set-vector! (-> self root quat) 0.0 1.0 0.0 0.0) diff --git a/goal_src/jak2/levels/drill/drill-baron.gc b/goal_src/jak2/levels/drill/drill-baron.gc index 22f6dd77b2..9a210da7c4 100644 --- a/goal_src/jak2/levels/drill/drill-baron.gc +++ b/goal_src/jak2/levels/drill/drill-baron.gc @@ -1695,7 +1695,7 @@ This commonly includes things such as: (set! (-> self info next-to-shoot) #f) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 z) (+ 81920.0 (-> gp-1 z))) + (+! (-> gp-1 z) 81920.0) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-1 (let ((t9-3 (method-of-type part-tracker activate))) diff --git a/goal_src/jak2/levels/drill/drill-obs.gc b/goal_src/jak2/levels/drill/drill-obs.gc index ba22c3ff50..eb4054d8d7 100644 --- a/goal_src/jak2/levels/drill/drill-obs.gc +++ b/goal_src/jak2/levels/drill/drill-obs.gc @@ -1348,7 +1348,7 @@ This commonly includes things such as: (logior! (-> obj button-status) (button-status pressed)) (logclear! (-> obj button-status) (button-status pressed)) ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (logclear! (-> obj mask) (process-mask no-track)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 451) obj)) (set! (-> obj green-part) (create-launch-control (-> *part-group-id-table* 452) obj)) diff --git a/goal_src/jak2/levels/drill/drill-obs2.gc b/goal_src/jak2/levels/drill/drill-obs2.gc index da1c1440e6..bfc487fa5c 100644 --- a/goal_src/jak2/levels/drill/drill-obs2.gc +++ b/goal_src/jak2/levels/drill/drill-obs2.gc @@ -823,7 +823,7 @@ This commonly includes things such as: (sound-play "mhead-egg-break" :position (-> self root trans)) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 y) (+ 8192.0 (-> gp-1 y))) + (+! (-> gp-1 y) 8192.0) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-1 (let ((t9-3 (method-of-type part-tracker activate))) diff --git a/goal_src/jak2/levels/drill/drill-panel.gc b/goal_src/jak2/levels/drill/drill-panel.gc index 1caa1e9741..3f08dd318e 100644 --- a/goal_src/jak2/levels/drill/drill-panel.gc +++ b/goal_src/jak2/levels/drill/drill-panel.gc @@ -720,7 +720,7 @@ (defmethod init-panel drill-control-panel ((obj drill-control-panel)) "Init some parameters for the panel." (set! (-> obj idle-sound-id) (new-sound-id)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj id) (res-lump-value (-> obj entity) 'extra-id int :time -1000000000.0)) 0 (none) diff --git a/goal_src/jak2/levels/drill/drill-spool.gc b/goal_src/jak2/levels/drill/drill-spool.gc index f7408dc037..b44c9ee4d9 100644 --- a/goal_src/jak2/levels/drill/drill-spool.gc +++ b/goal_src/jak2/levels/drill/drill-spool.gc @@ -870,7 +870,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 res-tag)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 ((method-of-type res-lump get-property-struct) (-> obj entity) 'art-name @@ -1149,7 +1149,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 res-tag) (sv-32 res-tag)) (stack-size-set! (-> obj main-thread) 2048) ;; increased from 512 - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 "drill-crane-break") (s4-0 (art-group-get-by-name *level* "skel-drill-crane" (the-as (pointer uint32) #f))) ) diff --git a/goal_src/jak2/levels/drill/ginsu.gc b/goal_src/jak2/levels/drill/ginsu.gc index 021a9d7fa5..64a20f2870 100644 --- a/goal_src/jak2/levels/drill/ginsu.gc +++ b/goal_src/jak2/levels/drill/ginsu.gc @@ -687,7 +687,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 (-> self nav))) (set! (-> v1-4 target-speed) 8192.0) @@ -752,7 +752,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (ginsu-method-183 self #t) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) diff --git a/goal_src/jak2/levels/forest/forest-obs.gc b/goal_src/jak2/levels/forest/forest-obs.gc index 9e5fb13f9e..5395e81efa 100644 --- a/goal_src/jak2/levels/forest/forest-obs.gc +++ b/goal_src/jak2/levels/forest/forest-obs.gc @@ -209,7 +209,7 @@ This commonly includes things such as: ) ) ) - (set! (-> self hit-points) (+ -1.0 (-> self hit-points))) + (+! (-> self hit-points) -1.0) (if (>= 0.0 (-> self hit-points)) (go-virtual die) (go-virtual hit) @@ -490,7 +490,7 @@ This commonly includes things such as: (process-entity-status! obj (entity-perm-status no-kill) #t) (set! (-> obj desired-pos quad) (-> obj root trans quad)) (quaternion-copy! (-> obj init-quat) (-> obj root quat)) - (set! (-> obj desired-pos y) (+ 8192.0 (-> obj desired-pos y))) + (+! (-> obj desired-pos y) 8192.0) (vector-reset! (-> obj hit-dir)) (set! (-> obj hit-points) 9.0) (set! (-> obj incoming-attack-id) (the-as uint -1)) diff --git a/goal_src/jak2/levels/forest/pegasus.gc b/goal_src/jak2/levels/forest/pegasus.gc index 24eaa68f32..9f6a713824 100644 --- a/goal_src/jak2/levels/forest/pegasus.gc +++ b/goal_src/jak2/levels/forest/pegasus.gc @@ -223,7 +223,7 @@ For pegasus, it will call [[enemy::57]] only if the [[pegasus]] has been targett ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action proc) (send-event proc 'get-attack-count 1) (kill-prefer-falling obj) @@ -403,10 +403,10 @@ In practice, this is never called" (set! (-> self curve-position) 0.0) ) ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (none) @@ -729,10 +729,10 @@ The faster it's moving the fast it flaps it's wings, etc ) (cond ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (get-point-at-percent-along-path! diff --git a/goal_src/jak2/levels/forest/predator.gc b/goal_src/jak2/levels/forest/predator.gc index e04b16fb3a..028de361bf 100644 --- a/goal_src/jak2/levels/forest/predator.gc +++ b/goal_src/jak2/levels/forest/predator.gc @@ -994,7 +994,7 @@ :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) :enter (behavior () (set-dangerous! self #t) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-6 *game-info*) (a0-3 (+ (-> v1-6 attack-id) 1)) @@ -1562,7 +1562,7 @@ This commonly includes things such as: (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "pred-hum" :fo-min 2 :fo-max 30) (-> obj root trans)) ) - (set! (-> obj enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) (add-icon! *minimap* obj (the-as uint 16) (the-as int #f) (the-as vector #t) 0) 0 (none) @@ -1764,7 +1764,7 @@ This commonly includes things such as: ) ) ) - (set! (-> obj predator-h (-> obj predator-count)) (process->handle (the-as process s2-2))) + (set! (-> obj predator-h (-> obj predator-count)) (process->handle s2-2)) (+! (-> obj predator-count) 1) (when v1-66 (change-to (-> v1-66 nav-mesh) (the-as process-drawable s2-2)) diff --git a/goal_src/jak2/levels/forest/wren.gc b/goal_src/jak2/levels/forest/wren.gc index 71fe15e464..a7c9fed660 100644 --- a/goal_src/jak2/levels/forest/wren.gc +++ b/goal_src/jak2/levels/forest/wren.gc @@ -132,7 +132,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (when (< (vector-vector-xz-distance (-> self root trans) (-> self move-dest)) 2048.0) (cond ((logtest? (-> self flags) 4) - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (set! (-> self fly-index) (the-as uint 0)) (go-virtual fly) ) @@ -189,7 +189,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self peck-timer) (the-as uint (the int (* 300.0 (rand-vu-float-range 1.4 4.3))))) - (set! (-> self flags) (logand -7 (-> self flags))) + (logand! (-> self flags) -7) (none) ) :trans (behavior () @@ -201,7 +201,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ) (when (logtest? (-> self flags) 2) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) (when (spooked? self) (get-point-in-path! (-> self fly-curve 0) (-> self move-dest) 0.0 'interp) (set-yaw-angle-clear-roll-pitch! @@ -217,7 +217,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" :code (behavior () (local-vars (v1-34 symbol)) (until #f - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (let ((f0-0 (rand-vu-float-range 0.0 (get-num-segments (-> self path))))) (get-point-in-path! (-> self path) (-> self move-dest) f0-0 'interp) ) @@ -400,7 +400,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (none) ) :code (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 (current-time)) (s5-0 (the int (* 300.0 (rand-vu-float-range 4.2 16.8)))) diff --git a/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc b/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc index 1a25ef3508..1888ff8a42 100644 --- a/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc +++ b/goal_src/jak2/levels/fortress/dump/fordumpa-obs.gc @@ -105,7 +105,7 @@ (logior! (-> self draw status) (draw-control-status no-draw)) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) - (set! (-> gp-0 y) (+ 8192.0 (-> gp-0 y))) + (+! (-> gp-0 y) 8192.0) (let ((s5-0 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-0 (let ((t9-1 (method-of-type part-tracker activate))) @@ -319,8 +319,8 @@ This commonly includes things such as: ) (set! (-> a0-20 quad) (-> obj root trans quad)) (set! (-> v1-26 quad) (-> obj root trans quad)) - (set! (-> a0-20 y) (+ 4915.2 (-> a0-20 y))) - (set! (-> v1-26 y) (+ 17203.2 (-> v1-26 y))) + (+! (-> a0-20 y) 4915.2) + (+! (-> v1-26 y) 17203.2) (set! (-> obj l-bolt state meet data 0 quad) (-> a0-20 quad)) (let ((a0-22 (-> obj l-bolt))) (set! (-> a0-22 state meet data (+ (-> a0-22 state points-to-draw) -1) quad) (-> v1-26 quad)) diff --git a/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc b/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc index 858ab2e904..ad99c4adc6 100644 --- a/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc +++ b/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc @@ -102,7 +102,7 @@ (sound-play "fort-bomb") (let ((gp-1 (new 'stack-no-clear 'matrix))) (set! (-> gp-1 quad 0) (-> self root trans quad)) - (set! (-> gp-1 vector 0 y) (+ 8192.0 (-> gp-1 vector 0 y))) + (+! (-> gp-1 vector 0 y) 8192.0) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-1 (let ((t9-3 (method-of-type part-tracker activate))) diff --git a/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc b/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc index 0ccd4bdcad..d3fd7430ff 100644 --- a/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc +++ b/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc @@ -874,7 +874,7 @@ (vector-float*! s5-2 s5-2 (* 0.8 (-> self clock frames-per-second))) (set! (-> s5-2 y) 0.0) (vector+! s5-2 (-> self aim-pos-2) s5-2) - (set! (-> s5-2 y) (+ 8192.0 (-> s5-2 y))) + (+! (-> s5-2 y) 8192.0) (vector+! s4-0 s4-0 v1-31) ) (vector-float*! s4-0 s4-0 0.5) @@ -976,7 +976,7 @@ ((logtest? (-> self flags) 64) (sound-play "robotank-turret" :id (-> self turn-sound-id) :position (-> self root trans)) (when (< (fabs (-> self rotate-rate)) 728.1778) - (set! (-> self flags) (logand -65 (-> self flags))) + (logand! (-> self flags) -65) (sound-stop (-> self turn-sound-id)) (sound-play "robo-turret-end") ) @@ -1063,7 +1063,7 @@ (set! (-> v1-33 prim-core collide-with) (collide-spec)) ) 0 - (set! (-> self flags) (logand -129 (-> self flags))) + (logand! (-> self flags) -129) (remove-setting! 'fov) (send-event (handle->process (-> self screen)) 'untrigger) ) @@ -1180,7 +1180,7 @@ (and (logtest? (-> self flags) 512) (not (logtest? (-> self flags) 8)) (skip-check-los? (-> self los) 0)) (logtest? (-> self flags) 16) ) - (set! (-> self flags) (logand -257 (-> self flags))) + (logand! (-> self flags) -257) (go-virtual ready) ) ) @@ -1240,7 +1240,7 @@ ) ) (label cfg-26) - (set! (-> self flags) (logand -9 (-> self flags))) + (logand! (-> self flags) -9) (send-event (handle->process (-> self reticle)) 'unlock) (until (fort-robotank-turret-method-34 self (-> self aim-pos-1) 2730.6667) (suspend) @@ -1284,7 +1284,7 @@ ) (defmethod deactivate fort-robotank-turret ((obj fort-robotank-turret)) - (set! (-> obj flags) (logand -65 (-> obj flags))) + (logand! (-> obj flags) -65) (sound-stop (-> obj turn-sound-id)) (let ((a0-4 (handle->process (-> obj screen)))) (if a0-4 @@ -1390,8 +1390,8 @@ (set! (-> self gun-index) 0) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 z) (+ 40960.0 (-> gp-1 z))) - (set! (-> gp-1 y) (+ 32768.0 (-> gp-1 y))) + (+! (-> gp-1 z) 40960.0) + (+! (-> gp-1 y) 32768.0) (set! (-> self reticle) (ppointer->handle (process-spawn fort-robotank-reticle gp-1 :to self))) ) (let ((gp-2 (new 'stack-no-clear 'vector)) diff --git a/goal_src/jak2/levels/fortress/dump/fort-robotank.gc b/goal_src/jak2/levels/fortress/dump/fort-robotank.gc index 0b2dc6fc17..18be808c35 100644 --- a/goal_src/jak2/levels/fortress/dump/fort-robotank.gc +++ b/goal_src/jak2/levels/fortress/dump/fort-robotank.gc @@ -308,7 +308,7 @@ (s5-0 (new 'stack-no-clear 'matrix)) ) (set! (-> s4-0 random-rangef) (lerp-scale 1.0 6.0 (-> self roller-jmod twist y) 8192.0 65536.0)) - (set! (-> gp-0 y) (+ -6144.0 (-> gp-0 y))) + (+! (-> gp-0 y) -6144.0) (quaternion->matrix s5-0 (-> self root quat)) (set! (-> s5-0 trans quad) (-> gp-0 quad)) (spawn-with-matrix (-> self barrel-part) s5-0) @@ -331,7 +331,7 @@ ) (let ((a1-14 (forward-up-nopitch->inv-matrix (new 'stack-no-clear 'matrix) s2-0 *up-vector*))) (set! (-> a1-14 trans quad) (-> s4-1 quad)) - (set! (-> a1-14 trans y) (+ -2498.56 (-> a1-14 trans y))) + (+! (-> a1-14 trans y) -2498.56) (spawn-with-matrix (-> self part) a1-14) ) ) @@ -610,7 +610,7 @@ (remove-setting! 'target-height) (remove-setting! 'pov-offset) (send-event (handle->process (-> obj turret)) 'pov-cam-off) - (set! (-> obj flags) (logand -129 (-> obj flags))) + (logand! (-> obj flags) -129) (let ((v1-57 (-> (the-as collide-shape-prim-group (-> obj root root-prim)) child 2))) (set! (-> v1-57 prim-core collide-as) (collide-spec)) (set! (-> v1-57 prim-core collide-with) (collide-spec)) @@ -680,7 +680,7 @@ (logior! (-> self flags) 32) ) (when (logtest? (-> self flags) 32) - (set! (-> self flags) (logand -33 (-> self flags))) + (logand! (-> self flags) -33) (set-setting! 'music 'danger11 0.0 0) (set-setting! 'music-volume 'rel 0.9 0) (go-virtual moving) @@ -739,7 +739,7 @@ (none) ) :exit (behavior () - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (none) ) :trans (behavior () @@ -795,7 +795,7 @@ (none) ) :code (behavior () - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (let ((gp-0 (current-time))) (until (>= (- (current-time) gp-0) (seconds 0.1)) (suspend) @@ -828,7 +828,7 @@ (s1-0 (-> self root)) ) (get-point-at-percent-along-path! s4-0 (-> s1-0 trans) f30-0 'interp) - (set! (-> s1-0 trans y) (+ 1024.0 (-> s1-0 trans y))) + (+! (-> s1-0 trans y) 1024.0) (displacement-between-points-at-percent-normalized! s4-0 s0-0 f30-0) (displacement-between-points-at-percent-scaled! s4-0 s2-0 f30-0 (-> gp-1 du-final)) (seek-toward-heading-vec! s1-0 s0-0 16384.0 (seconds 0.02)) @@ -912,7 +912,7 @@ ) :trans (behavior () (when (logtest? (-> self flags) 32) - (set! (-> self flags) (logand -33 (-> self flags))) + (logand! (-> self flags) -33) (go-virtual moving) ) (none) @@ -1111,7 +1111,7 @@ This commonly includes things such as: (let ((s5-3 (new 'stack-no-clear 'vector))) (let ((s4-3 (-> obj path-info data 0 path))) (get-point-in-path! s4-3 (-> obj root trans) 0.0 'interp) - (set! (-> obj root trans y) (+ 1024.0 (-> obj root trans y))) + (+! (-> obj root trans y) 1024.0) (displacement-between-points-at-percent-normalized! s4-3 s5-3 0.0) ) (set-heading-vec! (-> obj root) s5-3) diff --git a/goal_src/jak2/levels/fortress/fort-turret.gc b/goal_src/jak2/levels/fortress/fort-turret.gc index 3fba36229a..752ea6d05e 100644 --- a/goal_src/jak2/levels/fortress/fort-turret.gc +++ b/goal_src/jak2/levels/fortress/fort-turret.gc @@ -666,7 +666,7 @@ (+ 2.0 (* 0.00024414062 (vector-length (vector-! (new 'stack-no-clear 'vector) s3-3 a0-21)))) ) (if (= (-> obj beam-intersect) 'wall) - (set! (-> v1-23 z) (+ -5.0 (-> v1-23 z))) + (+! (-> v1-23 z) -5.0) ) ) ) diff --git a/goal_src/jak2/levels/fortress/fortress-obs.gc b/goal_src/jak2/levels/fortress/fortress-obs.gc index 23ba35c5e9..4dce6e3113 100644 --- a/goal_src/jak2/levels/fortress/fortress-obs.gc +++ b/goal_src/jak2/levels/fortress/fortress-obs.gc @@ -114,9 +114,7 @@ ) (when target-proc (set! (-> exploder-tuning fountain-rand-transv-lo quad) (-> (get-trans target-proc 0) quad)) - (set! (-> exploder-tuning fountain-rand-transv-lo y) - (+ -16384.0 (-> exploder-tuning fountain-rand-transv-lo y)) - ) + (+! (-> exploder-tuning fountain-rand-transv-lo y) -16384.0) ) ) (set! (-> exploder-tuning fountain-rand-transv-hi x) 24576.0) diff --git a/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc b/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc index 9d098d1977..b3afce6fc6 100644 --- a/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc +++ b/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc @@ -223,7 +223,7 @@ This commonly includes things such as: (let ((t2-0 (new 'stack-no-clear 'vector))) (vector+! t2-0 s3-0 s2-0) (vector-float*! t2-0 t2-0 0.5) - (set! (-> t2-0 y) (+ -20480.0 (-> t2-0 y))) + (+! (-> t2-0 y) -20480.0) (sound-play "sliding-laser" :id (-> self sound-id) :position t2-0) ) (let* ((v0-4 (vector-normalize! (vector-! (new 'stack-no-clear 'vector) s2-0 s3-0) 1.0)) diff --git a/goal_src/jak2/levels/gungame/gun-dummy.gc b/goal_src/jak2/levels/gungame/gun-dummy.gc index 3bad6ee978..5ee3243214 100644 --- a/goal_src/jak2/levels/gungame/gun-dummy.gc +++ b/goal_src/jak2/levels/gungame/gun-dummy.gc @@ -2166,7 +2166,7 @@ ((3 2) (let ((vec (new 'static 'vector :w 1.0))) (set! (-> vec quad) (-> root trans quad)) - (set! (-> vec y) (+ 8192.0 (-> vec y))) + (+! (-> vec y) 8192.0) vec ) ) @@ -2378,11 +2378,11 @@ This commonly includes things such as: (defmethod init-tpath-info! gun-dummy ((obj gun-dummy) (arg0 tpath-info)) "Given a [[tpath-info]] use it to initialize the dummy with any relevant data or flags" - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask collectable)) (vector-identity! (-> obj root scale)) (quaternion-copy! (-> obj quat) (-> obj root quat)) - (set! (-> obj root trans y) (+ -16384.0 (-> obj root trans y))) + (+! (-> obj root trans y) -16384.0) (if (not (logtest? (-> arg0 flags) (tpath-flags tpath-rand))) (set! *tpath-rand* (the-as uint (rand-vu-int-count 16))) ) diff --git a/goal_src/jak2/levels/gungame/gungame-obs.gc b/goal_src/jak2/levels/gungame/gungame-obs.gc index 76ba37a686..b4adda2867 100644 --- a/goal_src/jak2/levels/gungame/gungame-obs.gc +++ b/goal_src/jak2/levels/gungame/gungame-obs.gc @@ -2009,9 +2009,9 @@ This commonly includes things such as: (set! (-> s3-0 quad) (-> *entrance-gungame-crates-pos* s0-0 pos quad)) (set! (-> s3-0 w) 1.0) (vector-rotate-around-y! s3-0 s3-0 -4460.999) - (set! (-> s3-0 x) (+ 1667072.0 (-> s3-0 x))) - (set! (-> s3-0 y) (+ 40960.0 (-> s3-0 y))) - (set! (-> s3-0 z) (+ 5025792.0 (-> s3-0 z))) + (+! (-> s3-0 x) 1667072.0) + (+! (-> s3-0 y) 40960.0) + (+! (-> s3-0 z) 5025792.0) (training-manager-method-29 obj s3-0) (when arg0 (set! (-> s2-0 quad) (-> s3-0 quad)) @@ -2090,9 +2090,9 @@ This commonly includes things such as: (set! (-> s4-0 quad) (-> arg0 s2-0 pos quad)) (set! (-> s4-0 w) 1.0) (vector-rotate-around-y! s4-0 s4-0 -4460.999) - (set! (-> s4-0 x) (+ 1667072.0 (-> s4-0 x))) - (set! (-> s4-0 y) (+ 40960.0 (-> s4-0 y))) - (set! (-> s4-0 z) (+ 5025792.0 (-> s4-0 z))) + (+! (-> s4-0 x) 1667072.0) + (+! (-> s4-0 y) 40960.0) + (+! (-> s4-0 z) 5025792.0) (training-manager-method-29 obj s4-0) (set! (-> s3-0 pickup-type) (-> arg0 s2-0 ammo)) (set! (-> s3-0 pickup-spawn-amount) (the float (-> arg0 s2-0 num))) diff --git a/goal_src/jak2/levels/hideout/hideout-obs.gc b/goal_src/jak2/levels/hideout/hideout-obs.gc index b32a5114b0..db08cb931e 100644 --- a/goal_src/jak2/levels/hideout/hideout-obs.gc +++ b/goal_src/jak2/levels/hideout/hideout-obs.gc @@ -163,7 +163,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/goal_src/jak2/levels/hiphog/whack.gc b/goal_src/jak2/levels/hiphog/whack.gc index b02e49336a..9b96269aec 100644 --- a/goal_src/jak2/levels/hiphog/whack.gc +++ b/goal_src/jak2/levels/hiphog/whack.gc @@ -2548,7 +2548,7 @@ gp-0 :to *entity-pool* ) - (set! (-> self score) (+ 50.0 (-> self score))) + (+! (-> self score) 50.0) ) (else (when (>= (- (current-time) (-> self speech-time)) (seconds 12)) @@ -2578,7 +2578,7 @@ gp-0 :to *entity-pool* ) - (set! (-> self score) (+ 10.0 (-> self score))) + (+! (-> self score) 10.0) (if (>= (-> self score) 300.0) (send-event (handle->process (-> self hud-goal)) 'hide-and-die) ) diff --git a/goal_src/jak2/levels/mountain/canyon/canyon-scenes.gc b/goal_src/jak2/levels/mountain/canyon/canyon-scenes.gc index 2a70f4fd24..ecfd7d0c7e 100644 --- a/goal_src/jak2/levels/mountain/canyon/canyon-scenes.gc +++ b/goal_src/jak2/levels/mountain/canyon/canyon-scenes.gc @@ -1390,7 +1390,7 @@ (s4-0 (the-as process-drawable (command-get-process "ctypal-baron-statue-break" *target*))) ) (vector-matrix*! s5-0 (new 'static 'vector :w 1.0) (-> s3-0 node-list data 8 bone transform)) - (set! (-> s5-0 y) (+ 28672.0 (-> s5-0 y))) + (+! (-> s5-0 y) 28672.0) (canyon-draw-beam-lens s5-0 gp-0) (vector-matrix*! gp-0 (new 'static 'vector :w 1.0) (-> s4-0 node-list data 34 bone transform)) ) diff --git a/goal_src/jak2/levels/mountain/mountain-obs.gc b/goal_src/jak2/levels/mountain/mountain-obs.gc index a55caf50a7..ffc7333d33 100644 --- a/goal_src/jak2/levels/mountain/mountain-obs.gc +++ b/goal_src/jak2/levels/mountain/mountain-obs.gc @@ -374,7 +374,7 @@ (matrix-rotate-xyz! (-> self face-matrix gp-0) (-> *dice-angle-array* gp-0)) (set! (-> self face-matrix gp-0 trans quad) (-> *dice-position-array* gp-0 quad)) (vector+! (-> self face-matrix gp-0 trans) (-> self face-matrix gp-0 trans) (-> self root trans)) - (set! (-> self face-matrix gp-0 trans y) (+ 8192.0 (-> self face-matrix gp-0 trans y))) + (+! (-> self face-matrix gp-0 trans y) 8192.0) (let* ((v1-40 (-> self face-matrix-back gp-0)) (a3-0 (-> self face-matrix gp-0)) (a0-18 (-> a3-0 quad 0)) @@ -582,7 +582,7 @@ (vector-negate-in-place! s1-0) ) ) - (set! (-> s4-1 y) (+ -8192.0 (-> s4-1 y))) + (+! (-> s4-1 y) -8192.0) (set! (-> s2-0 y) 1.0) (vector-cross! s3-1 s2-0 s1-0) (vector-normalize! s3-1 1.0) @@ -899,7 +899,7 @@ ) (when (> *dice-back-way-num* 0) (set! (-> *dice-last-safe-position* quad) (-> *dice-back-way* (+ *dice-back-way-num* -1) quad)) - (set! (-> *dice-last-safe-position* y) (+ 8192.0 (-> *dice-last-safe-position* y))) + (+! (-> *dice-last-safe-position* y) 8192.0) ) (when (not (dice-wrong-way?)) (set! (-> *dice-back-way* *dice-back-way-num* quad) (-> self root trans quad)) @@ -1103,7 +1103,7 @@ (when (and (= (-> gp-0 active) 1) (not (logtest? (-> *dice-blocked-array* s0-0) (ash 1 (- 15 sv-544))))) (when (> *dice-back-way-num* 0) (set! (-> *dice-last-safe-position* quad) (-> *dice-back-way* (+ *dice-back-way-num* -1) quad)) - (set! (-> *dice-last-safe-position* y) (+ 8192.0 (-> *dice-last-safe-position* y))) + (+! (-> *dice-last-safe-position* y) 8192.0) ) (when (not (dice-wrong-way?)) (set! (-> *dice-back-way* *dice-back-way-num* quad) (-> s1-0 trans quad)) @@ -1174,9 +1174,9 @@ ) (set! (-> sv-640 quad) (-> sv-560 quad)) (set! (-> sv-576 quad) (-> sv-560 quad)) - (set! (-> sv-576 x) (+ 8192.0 (-> sv-576 x))) + (+! (-> sv-576 x) 8192.0) (set! (-> sv-608 quad) (-> sv-560 quad)) - (set! (-> sv-608 z) (+ 8192.0 (-> sv-608 z))) + (+! (-> sv-608 z) 8192.0) (set! (-> sv-560 y) (get-ripple-height s0-1 sv-560)) (set! (-> sv-576 y) (get-ripple-height s0-1 sv-576)) (set! (-> sv-608 y) (get-ripple-height s0-1 sv-608)) @@ -1206,7 +1206,7 @@ (matrix*! (the-as matrix sv-688) sv-656 sv-672) (matrix*! s1-0 s1-0 (the-as matrix sv-688)) (+! (-> s1-0 trans y) (* 0.5 (- (-> sv-560 y) (-> s0-1 water-height)))) - (set! (-> s1-0 trans y) (+ 8192.0 (-> s1-0 trans y))) + (+! (-> s1-0 trans y) 8192.0) (set! (-> s4-0 x) (fmin (-> s4-0 x) (-> s1-0 trans x))) (set! (-> s4-0 y) (fmin (-> s4-0 y) (-> s1-0 trans y))) (set! (-> s4-0 z) (fmin (-> s4-0 z) (-> s1-0 trans z))) @@ -1414,7 +1414,7 @@ This commonly includes things such as: (matrix-rotate-xyz! (-> obj face-matrix s4-2) (-> *dice-angle-array* s4-2)) (set! (-> obj face-matrix s4-2 trans quad) (-> *dice-position-array* s4-2 quad)) (vector+! (-> obj face-matrix s4-2 trans) (-> obj face-matrix s4-2 trans) (-> obj root trans)) - (set! (-> obj face-matrix s4-2 trans y) (+ 8192.0 (-> obj face-matrix s4-2 trans y))) + (+! (-> obj face-matrix s4-2 trans y) 8192.0) ) (mem-set32! (the-as pointer *dice-blocked-array*) 13 0) (set! (-> *dice-blocked-array* 1) (the-as uint 256)) @@ -2078,7 +2078,7 @@ This commonly includes things such as: ((< (vector-vector-distance (math-camera-pos) (-> self root trans)) (-> gp-0 settings fade-dist)) (let ((s5-2 (new 'stack-no-clear 'collide-query))) (set! (-> s5-2 start-pos quad) (-> self root trans quad)) - (set! (-> s5-2 start-pos z) (+ -8192.0 (-> s5-2 start-pos z))) + (+! (-> s5-2 start-pos z) -8192.0) (set-vector! (-> s5-2 move-dist) 0.0 -81920.0 0.0 1.0) (let ((v1-13 s5-2)) (set! (-> v1-13 radius) 819.2) @@ -2328,7 +2328,7 @@ This commonly includes things such as: (let* ((a1-3 (-> self node-list data gp-0)) (s5-0 (vector<-cspace! (new 'stack-no-clear 'vector) a1-3)) ) - (set! (-> s5-0 y) (+ -4096.0 (-> s5-0 y))) + (+! (-> s5-0 y) -4096.0) (set! sv-48 (* (- (-> s5-0 y) (-> sv-16 data gp-0 x)) (-> self clock frames-per-second))) (set! sv-52 (the-as symbol #f)) (when (and (< (-> sv-16 data gp-0 y) -24576.0) (< (* 0.45 (-> sv-16 data gp-0 y)) sv-48)) @@ -2591,7 +2591,7 @@ This commonly includes things such as: (none) ) :trans (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (plat-trans) (if (not (logtest? (-> self flags) 1)) (set! (-> self ride-timer) (current-time)) diff --git a/goal_src/jak2/levels/mountain/mountain-obs2.gc b/goal_src/jak2/levels/mountain/mountain-obs2.gc index 68640cbb1b..c0828eccfe 100644 --- a/goal_src/jak2/levels/mountain/mountain-obs2.gc +++ b/goal_src/jak2/levels/mountain/mountain-obs2.gc @@ -166,7 +166,7 @@ This commonly includes things such as: "Does any necessary initial platform setup. For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound." (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set-vector! (-> obj axe-flip) 1.0 0.0 0.0 1.0) (set! (-> obj angle-flip) 180.0) (set! (-> obj time-flip) (the float (the int (* 300.0 (res-lump-float (-> obj entity) 'delay :default 4.0))))) diff --git a/goal_src/jak2/levels/mountain/rhino-wall.gc b/goal_src/jak2/levels/mountain/rhino-wall.gc index b44caa8e50..59f98183c7 100644 --- a/goal_src/jak2/levels/mountain/rhino-wall.gc +++ b/goal_src/jak2/levels/mountain/rhino-wall.gc @@ -142,7 +142,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 (res-lump-struct (-> obj entity) 'art-name structure)) (s4-0 (art-group-get-by-name *level* "skel-rhino-wall-1" (the-as (pointer uint32) #f))) ) diff --git a/goal_src/jak2/levels/mountain/rhino.gc b/goal_src/jak2/levels/mountain/rhino.gc index 5724ab7559..a97ef7b47c 100644 --- a/goal_src/jak2/levels/mountain/rhino.gc +++ b/goal_src/jak2/levels/mountain/rhino.gc @@ -730,7 +730,7 @@ ) (set! (-> self enemy-flags) v1-67) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-74 (-> self enemy-flags))) @@ -1248,7 +1248,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-4 *game-info*) (a0-2 (+ (-> v1-4 attack-id) 1)) diff --git a/goal_src/jak2/levels/nest/boss/metalkor-extras.gc b/goal_src/jak2/levels/nest/boss/metalkor-extras.gc index bf1230d234..fef5bace0e 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-extras.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-extras.gc @@ -475,7 +475,7 @@ (set! (-> v0-0 quad) (-> (the-as collide-shape-prim-group (-> obj root root-prim)) child 0 prim-core world-sphere quad) ) - (set! (-> v0-0 y) (+ 32768.0 (-> v0-0 y))) + (+! (-> v0-0 y) 32768.0) v0-0 ) ) @@ -772,7 +772,7 @@ ) (vector-normalize! s5-0 (* 81920.0 (cos 10922.667))) (+! (-> s5-0 y) (* 81920.0 (sin 10922.667))) - (set! (-> s5-0 y) (+ 12288.0 (-> s5-0 y))) + (+! (-> s5-0 y) 12288.0) (vector+! s5-0 s5-0 (-> self entity trans)) (set! (-> self spinners arg0) (ppointer->handle @@ -1549,7 +1549,7 @@ ) ) ) - (set! (-> obj enemy-flags) (logior (enemy-flag cam-attack-mode) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag cam-attack-mode)) (remove-from-process *part-engine* obj) (setup-masks (-> obj draw) @@ -1594,7 +1594,7 @@ ) ) ) - (set! (-> obj enemy-flags) (logior (enemy-flag cam-attack-mode) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag cam-attack-mode)) (remove-from-process *part-engine* obj) (setup-masks (-> obj draw) @@ -2453,7 +2453,7 @@ This commonly includes things such as: ) ) (set! (-> gp-0 start-pos quad) (-> s4-0 quad)) - (set! (-> gp-0 start-pos y) (+ 81920.0 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 81920.0) (set! (-> gp-0 move-dist quad) (-> (new 'static 'vector :y -163840.0) quad)) (let ((v1-17 gp-0)) (set! (-> v1-17 radius) 4096.0) diff --git a/goal_src/jak2/levels/nest/boss/metalkor-setup.gc b/goal_src/jak2/levels/nest/boss/metalkor-setup.gc index 03d512cbaf..94420d3a22 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-setup.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-setup.gc @@ -735,7 +735,7 @@ This commonly includes things such as: (set! (-> obj root) s4-0) ) (process-drawable-from-entity! obj arg0) - (set! (-> obj root trans y) (+ -36864.0 (-> obj root trans y))) + (+! (-> obj root trans y) -36864.0) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-nestb-tail-bound" (the-as (pointer uint32) #f))) @@ -832,7 +832,7 @@ This commonly includes things such as: (defbehavior metalkor-kid-init-by-other metalkor-kid ((arg0 vector)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg0 quad)) - (set! (-> self root trans y) (+ 61440.0 (-> self root trans y))) + (+! (-> self root trans y) 61440.0) (initialize-skeleton self (the-as skeleton-group (art-group-get-by-name *level* "skel-metalkor-kid" (the-as (pointer uint32) #f))) @@ -1056,7 +1056,7 @@ This commonly includes things such as: ) ) (logclear! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set-vector! (-> self last-hit-normal) 0.0 1.0 0.0 1.0) (set! (-> self sticky-time) 0) (set! (-> self flitter-slot) arg2) @@ -1280,7 +1280,7 @@ This commonly includes things such as: ) ) ) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self trackable) #f) (set! (-> self event-hook) (-> (method-of-object self idle) event)) (dotimes (gp-2 6) @@ -1617,7 +1617,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-metalkor" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj draw light-index) (the-as uint 10)) (set! (-> obj lowtorso) (the-as handle #f)) (set! (-> obj trackable) #f) diff --git a/goal_src/jak2/levels/nest/boss/metalkor-states.gc b/goal_src/jak2/levels/nest/boss/metalkor-states.gc index bbb01f96b2..93a3f4d10b 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-states.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-states.gc @@ -38,7 +38,7 @@ ) (vector-normalize! s5-0 (* 81920.0 (cos 10922.667))) (+! (-> s5-0 y) (* 81920.0 (sin 10922.667))) - (set! (-> s5-0 y) (+ 12288.0 (-> s5-0 y))) + (+! (-> s5-0 y) 12288.0) (vector+! s5-0 s5-0 (-> self entity trans)) (let ((v0-0 (ppointer->handle (process-spawn metalkor-spinner s5-0 (-> *metalkor-spinner-setup* arg0 joint-index) :to self) @@ -270,7 +270,7 @@ (set! (-> self trackable) #t) (let ((t0-2 (new 'static 'vector))) (set! (-> t0-2 quad) (-> self root trans quad)) - (set! (-> t0-2 y) (+ 16384.0 (-> t0-2 y))) + (+! (-> t0-2 y) 16384.0) (set-setting! 'point-of-interest 'abs t0-2 0) ) (set! (-> self live-flitters) 0) @@ -337,7 +337,7 @@ ) (else (set! (-> s5-0 quad) (-> obj root trans quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) ) ) (when (< 0.0 (-> obj ring-cam-pos value)) @@ -345,7 +345,7 @@ (a2-0 (new 'stack-no-clear 'vector)) ) (set! (-> a2-0 quad) (-> a0-15 trans quad)) - (set! (-> a2-0 y) (+ -65536.0 (-> a2-0 y))) + (+! (-> a2-0 y) -65536.0) (vector-lerp! s5-0 s5-0 a2-0 (-> obj ring-cam-pos value)) ) ) @@ -453,8 +453,8 @@ ) (let ((v1-106 (new 'stack-no-clear 'vector))) (set! (-> v1-106 quad) (-> self entity trans quad)) - (set! (-> v1-106 x) (+ 90112.0 (-> v1-106 x))) - (set! (-> v1-106 z) (+ -90112.0 (-> v1-106 z))) + (+! (-> v1-106 x) 90112.0) + (+! (-> v1-106 z) -90112.0) (set! (-> self root trans quad) (-> v1-106 quad)) ) (when (not (handle->process (-> self hud))) @@ -1631,7 +1631,7 @@ (cond (a0-6 (set! (-> self hit-ring-trans quad) (-> a0-6 trans quad)) - (set! (-> self hit-ring-trans y) (+ -110592.0 (-> self hit-ring-trans y))) + (+! (-> self hit-ring-trans y) -110592.0) (vector-! (-> self hit-ring-offset) (-> self hit-ring-trans) (-> self entity trans)) (set! (-> self hit-ring-offset y) 0.0) (vector-normalize! (-> self hit-ring-offset) 1.0) @@ -1711,7 +1711,7 @@ (else (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self entity trans quad)) - (set! (-> gp-1 y) (+ -61440.0 (-> gp-1 y))) + (+! (-> gp-1 y) -61440.0) (vector-seek-3d-smooth! (-> self root trans) gp-1 (* 3072.0 (-> self flying-speed value)) 0.5) (let ((f0-10 (vector-vector-distance-squared (-> self root trans) gp-1)) (f1-9 12288.0) diff --git a/goal_src/jak2/levels/nest/flying-spider.gc b/goal_src/jak2/levels/nest/flying-spider.gc index 07060b3b7d..5cd03a1322 100644 --- a/goal_src/jak2/levels/nest/flying-spider.gc +++ b/goal_src/jak2/levels/nest/flying-spider.gc @@ -613,7 +613,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -683,7 +683,7 @@ (when (>= (- (current-time) (-> obj gspot-timer)) (seconds 0.2)) (let ((a1-2 (new 'stack-no-clear 'collide-query))) (set! (-> a1-2 start-pos quad) (-> obj root gspot-pos quad)) - (set! (-> a1-2 start-pos y) (+ 2048.0 (-> a1-2 start-pos y))) + (+! (-> a1-2 start-pos y) 2048.0) (set-vector! (-> a1-2 move-dist) 0.0 -6144.0 0.0 0.0) (let ((v1-10 a1-2)) (set! (-> v1-10 radius) 4915.2) diff --git a/goal_src/jak2/levels/nest/mammoth.gc b/goal_src/jak2/levels/nest/mammoth.gc index fae8690391..e3e44bde2c 100644 --- a/goal_src/jak2/levels/nest/mammoth.gc +++ b/goal_src/jak2/levels/nest/mammoth.gc @@ -752,7 +752,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) ) @@ -778,7 +778,7 @@ (vector-! s2-0 s1-0 arg0) (set! (-> s2-0 y) 0.0) (vector-xz-normalize! s2-0 49152.0) - (set! (-> s2-0 y) (+ -81920.0 (-> s2-0 y))) + (+! (-> s2-0 y) -81920.0) (vector+! s2-0 s2-0 s4-1) ) (let ((s3-1 (new 'stack-no-clear 'collide-query)) @@ -1427,7 +1427,7 @@ (when (not (logtest? (ash 1 s4-0) (-> obj old-foot-flags))) (set! (-> s2-0 start-pos quad) (-> s3-0 quad)) (vector-reset! (-> s2-0 move-dist)) - (set! (-> s2-0 start-pos y) (+ 8192.0 (-> s2-0 start-pos y))) + (+! (-> s2-0 start-pos y) 8192.0) (set! (-> s2-0 move-dist y) -40960.0) (let ((v1-27 s2-0)) (set! (-> v1-27 radius) 2048.0) diff --git a/goal_src/jak2/levels/nest/mantis.gc b/goal_src/jak2/levels/nest/mantis.gc index 8fb4cab0a2..d4b324ac43 100644 --- a/goal_src/jak2/levels/nest/mantis.gc +++ b/goal_src/jak2/levels/nest/mantis.gc @@ -506,7 +506,7 @@ :code (behavior () (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) - (set! (-> gp-0 y) (+ -18841.6 (-> gp-0 y))) + (+! (-> gp-0 y) -18841.6) (let ((s5-0 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-0 (let ((t9-1 (method-of-type part-tracker activate))) @@ -1301,7 +1301,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -1430,7 +1430,7 @@ (when (>= (- (current-time) (-> obj gspot-timer)) (seconds 0.2)) (let ((a1-2 (new 'stack-no-clear 'collide-query))) (set! (-> a1-2 start-pos quad) (-> obj root gspot-pos quad)) - (set! (-> a1-2 start-pos y) (+ 2048.0 (-> a1-2 start-pos y))) + (+! (-> a1-2 start-pos y) 2048.0) (set-vector! (-> a1-2 move-dist) 0.0 -6144.0 0.0 0.0) (let ((v1-10 a1-2)) (set! (-> v1-10 radius) 4915.2) diff --git a/goal_src/jak2/levels/nest/nest-obs.gc b/goal_src/jak2/levels/nest/nest-obs.gc index 0448ddb01a..2a17536aea 100644 --- a/goal_src/jak2/levels/nest/nest-obs.gc +++ b/goal_src/jak2/levels/nest/nest-obs.gc @@ -265,7 +265,7 @@ This commonly includes things such as: (the-as pair 0) ) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj root trans y) (+ 8192.0 (-> obj root trans y))) + (+! (-> obj root trans y) 8192.0) (set! (-> obj y-level) (-> obj root trans y)) (set! (-> obj y-offset) 0.0) (transform-post) diff --git a/goal_src/jak2/levels/palace/boss/squid-extras.gc b/goal_src/jak2/levels/palace/boss/squid-extras.gc index 2947f8e9bc..95fddb2a3a 100644 --- a/goal_src/jak2/levels/palace/boss/squid-extras.gc +++ b/goal_src/jak2/levels/palace/boss/squid-extras.gc @@ -400,7 +400,7 @@ (set! (-> self whirl-sound-playing) #t) (let ((a1-2 (new 'stack-no-clear 'vector))) (set! (-> a1-2 quad) (-> self root trans quad)) - (set! (-> a1-2 y) (+ 2048.0 (-> a1-2 y))) + (+! (-> a1-2 y) 2048.0) (spawn (-> self part) a1-2) ) (when (or (>= (- (current-time) (-> self state-time)) (-> self duration)) diff --git a/goal_src/jak2/levels/palace/boss/squid-setup.gc b/goal_src/jak2/levels/palace/boss/squid-setup.gc index 9067a79078..8060906339 100644 --- a/goal_src/jak2/levels/palace/boss/squid-setup.gc +++ b/goal_src/jak2/levels/palace/boss/squid-setup.gc @@ -727,7 +727,7 @@ ) (cond ((-> obj wrap) - (set! (-> sv-1904 y) (+ -409.6 (-> sv-1904 y))) + (+! (-> sv-1904 y) -409.6) (set! sv-1472 (new 'stack-no-clear 'vector)) (let ((v1-25 sv-1904) (a0-10 (-> obj center)) @@ -794,7 +794,7 @@ (vector+! sv-1904 s1-0 s4-1) (let ((v0-15 (vector<-cspace! (new 'stack-no-clear 'vector) (-> obj node-list data 3)))) (set! sv-1616 (new 'stack-no-clear 'vector)) - (set! (-> v0-15 y) (+ 31744.0 (-> v0-15 y))) + (+! (-> v0-15 y) 31744.0) (vector-! sv-1616 sv-1904 v0-15) ) (let ((f0-27 (vector-normalize-ret-len! sv-1616 1.0))) @@ -1800,7 +1800,7 @@ This commonly includes things such as: ) (set! (-> obj draw light-index) (the-as uint 10)) (logior! (-> obj skel status) (joint-control-status sync-math)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj trans quad) (-> obj root trans quad)) (set! (-> obj force-onto-mesh) #t) @@ -1987,7 +1987,7 @@ This commonly includes things such as: (s0-0 0) ) (set! sv-672 (squid-method-42 obj (new 'stack-no-clear 'vector))) - (set! (-> sv-672 y) (+ 8192.0 (-> sv-672 y))) + (+! (-> sv-672 y) 8192.0) (set! (-> s3-0 quad) (-> arg0 quad)) (set! (-> s3-0 y) (-> obj nav state mesh bounds y)) (set! (-> obj current-nav-poly) (cloest-point-on-mesh (-> obj nav) s3-0 s3-0 (-> obj current-nav-poly))) @@ -2063,7 +2063,7 @@ This commonly includes things such as: (.svf (&-> v1-54 quad) vf6) ) 0 - (set! (-> s1-0 y) (+ 32768.0 (-> s1-0 y))) + (+! (-> s1-0 y) 32768.0) ) (set! f30-0 f28-0) ) @@ -2096,7 +2096,7 @@ This commonly includes things such as: (.svf (&-> v1-68 quad) vf6) ) 0 - (set! (-> s5-0 s0-0 y) (+ 32768.0 (-> s5-0 s0-0 y))) + (+! (-> s5-0 s0-0 y) 32768.0) ) (+! s0-0 1) ) @@ -2616,7 +2616,7 @@ This commonly includes things such as: (sound-play "sqd-shield-brk") (let ((s4-10 (new 'stack 'joint-exploder-tuning (the-as uint 1)))) (set! (-> s4-10 fountain-rand-transv-lo quad) (-> obj root trans quad)) - (set! (-> s4-10 fountain-rand-transv-lo y) (+ -12288.0 (-> s4-10 fountain-rand-transv-lo y))) + (+! (-> s4-10 fountain-rand-transv-lo y) -12288.0) (set! (-> s4-10 fountain-rand-transv-hi x) 16424.96) (set! (-> s4-10 fountain-rand-transv-hi y) 32808.96) (set! (-> s4-10 fountain-rand-transv-hi z) -32808.96) @@ -2837,7 +2837,7 @@ This commonly includes things such as: (set! (-> obj timeout) (seconds 0.417)) (logior! (-> obj options) (projectile-options account-for-target-velocity)) (set-gravity-length (-> obj root dynam) 573440.0) - (set! (-> obj options) (logior (projectile-options respect-invinc-time) (-> obj options))) + (logior! (-> obj options) (projectile-options respect-invinc-time)) (set! (-> obj invinc-time) (seconds 3.5)) (none) ) diff --git a/goal_src/jak2/levels/palace/boss/squid-states.gc b/goal_src/jak2/levels/palace/boss/squid-states.gc index b7ecc7c336..05ff99e2a2 100644 --- a/goal_src/jak2/levels/palace/boss/squid-states.gc +++ b/goal_src/jak2/levels/palace/boss/squid-states.gc @@ -433,7 +433,7 @@ ) (let ((a3-6 (new 'stack-no-clear 'vector))) (set! (-> a3-6 quad) (-> self nav state mesh bounds quad)) - (set! (-> a3-6 y) (+ 16384.0 (-> a3-6 y))) + (+! (-> a3-6 y) 16384.0) (set-traj-towards-vec self (-> self trans) (-> self trans) a3-6) ) (set! (-> self gate-intact) #t) @@ -1050,7 +1050,7 @@ (vector+! s3-1 s3-1 (-> s2-1 state mesh bounds)) ) 0 - (set! (-> s5-1 y) (+ 20480.0 (-> s5-1 y))) + (+! (-> s5-1 y) 20480.0) (set! (-> self trans y) (lerp (-> self trans y) (-> s5-1 y) (* 0.4 f30-1))) ) (set! (-> self trans y) (fmax (-> self trans y) (fmin (-> s5-1 y) (-> gp-3 y)))) @@ -1170,7 +1170,7 @@ (vector+! s4-2 s4-2 (-> s3-0 state mesh bounds)) ) 0 - (set! (-> s5-0 y) (+ 409.6 (-> s5-0 y))) + (+! (-> s5-0 y) 409.6) (set! (-> gp-0 target-position y) (-> s5-0 y)) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (set! (-> gp-0 marker) @@ -1424,7 +1424,7 @@ ) (set! (-> gp-0 y) (+ 8192.0 (-> self nav state mesh bounds y))) (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> s5-0 y) (+ -40960.0 (-> s5-0 y))) + (+! (-> s5-0 y) -40960.0) (set! (-> self gun-high-to-low) (squid-method-44 self gp-0 s5-0)) ) (dotimes (gp-1 6) diff --git a/goal_src/jak2/levels/palace/cable/palcab-obs.gc b/goal_src/jak2/levels/palace/cable/palcab-obs.gc index 006bc765c5..21f45e9555 100644 --- a/goal_src/jak2/levels/palace/cable/palcab-obs.gc +++ b/goal_src/jak2/levels/palace/cable/palcab-obs.gc @@ -1046,7 +1046,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/goal_src/jak2/levels/palace/pal-obs.gc b/goal_src/jak2/levels/palace/pal-obs.gc index 5507540870..bc77588753 100644 --- a/goal_src/jak2/levels/palace/pal-obs.gc +++ b/goal_src/jak2/levels/palace/pal-obs.gc @@ -388,8 +388,8 @@ This commonly includes things such as: ) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask collectable)) (go (method-of-object obj idle)) (none) ) @@ -568,8 +568,8 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-pal-grind-ring" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask collectable)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 1131) obj)) (process-spawn pal-grind-ring-center arg0 :to obj) (go (method-of-object obj idle)) @@ -716,7 +716,7 @@ This commonly includes things such as: ) (defmethod pal-ent-glass-method-30 pal-ent-glass ((obj pal-ent-glass)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -1076,7 +1076,7 @@ This commonly includes things such as: ) (defmethod pal-breakable-window-method-30 pal-breakable-window ((obj pal-breakable-window)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) diff --git a/goal_src/jak2/levels/palace/roof/palroof-obs.gc b/goal_src/jak2/levels/palace/roof/palroof-obs.gc index 10384d96b2..ceae29416c 100644 --- a/goal_src/jak2/levels/palace/roof/palroof-obs.gc +++ b/goal_src/jak2/levels/palace/roof/palroof-obs.gc @@ -232,7 +232,7 @@ This commonly includes things such as: :trans (behavior () (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self root trans quad)) - (set! (-> a1-0 y) (+ 36864.0 (-> a1-0 y))) + (+! (-> a1-0 y) 36864.0) (spawn (-> self part) a1-0) ) (none) diff --git a/goal_src/jak2/levels/ruins/breakable-wall.gc b/goal_src/jak2/levels/ruins/breakable-wall.gc index 80b56020d0..d974db1d15 100644 --- a/goal_src/jak2/levels/ruins/breakable-wall.gc +++ b/goal_src/jak2/levels/ruins/breakable-wall.gc @@ -430,7 +430,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (set! (-> obj side) #f) (set! (-> obj nav-mesh) #f) (let ((v1-5 (res-lump-value (-> obj entity) 'extra-id uint128 :time -1000000000.0))) diff --git a/goal_src/jak2/levels/ruins/pillar-collapse.gc b/goal_src/jak2/levels/ruins/pillar-collapse.gc index bb08435bea..b62e9db7d7 100644 --- a/goal_src/jak2/levels/ruins/pillar-collapse.gc +++ b/goal_src/jak2/levels/ruins/pillar-collapse.gc @@ -261,7 +261,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 collide-shape-prim-mesh) (sv-32 symbol) (sv-48 type) (sv-64 collide-shape-moving)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (dotimes (v1-3 3) (set! (-> obj mesh-trans v1-3) (the-as uint v1-3)) ) diff --git a/goal_src/jak2/levels/ruins/rapid-gunner.gc b/goal_src/jak2/levels/ruins/rapid-gunner.gc index e50468c9da..13f393e87d 100644 --- a/goal_src/jak2/levels/ruins/rapid-gunner.gc +++ b/goal_src/jak2/levels/ruins/rapid-gunner.gc @@ -245,7 +245,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (go (method-of-object obj knocked)) @@ -707,7 +707,7 @@ ) (when (logtest? (-> self status-flags) 2) (set! (-> self spin-up-timer) (+ (current-time) (seconds 2))) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) ) (if (zero? (rand-vu-int-range 0 3)) (set! (-> self shoot-anim-index) 15) @@ -1165,7 +1165,7 @@ (cond ((handle->process (-> self focus handle)) (if (check-los? (-> self los) 0) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (logior! (-> self status-flags) 2) ) ) @@ -1524,7 +1524,7 @@ ) (set! (-> obj shots-fired) (the-as uint 0)) (set! (-> obj spin-up-timer) 0) - (set! (-> obj status-flags) (logand -2 (-> obj status-flags))) + (logand! (-> obj status-flags) -2) (logior! (-> obj status-flags) 2) (let ((f30-0 3640.889)) (set! sv-48 0) diff --git a/goal_src/jak2/levels/sewer/escort/jinx-states.gc b/goal_src/jak2/levels/sewer/escort/jinx-states.gc index 49443efd40..7a5a10e3a7 100644 --- a/goal_src/jak2/levels/sewer/escort/jinx-states.gc +++ b/goal_src/jak2/levels/sewer/escort/jinx-states.gc @@ -582,7 +582,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -637,7 +637,7 @@ :virtual #t :exit (behavior () (if (logtest? (bot-flags bf21) (-> self bot-flags)) - (set! (-> self bot-flags) (logior (bot-flags bf22) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf22)) ) (none) ) @@ -671,7 +671,7 @@ ) ) (send-event (handle->process (-> self master-handle)) 'notify 'jinx-bomb) - (set! (-> self bot-flags) (logior (bot-flags bf21) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf21)) (setup-masks (-> self draw) 0 4096) (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) diff --git a/goal_src/jak2/levels/sewer/escort/mog.gc b/goal_src/jak2/levels/sewer/escort/mog.gc index 0bf210cf2e..e0da0c6678 100644 --- a/goal_src/jak2/levels/sewer/escort/mog.gc +++ b/goal_src/jak2/levels/sewer/escort/mog.gc @@ -182,16 +182,16 @@ (defun mog-prebind-function ((arg0 joint-anim-frame) (arg1 int) (arg2 joint-control)) (let ((v1-0 (-> arg0 data))) (let ((a0-1 (-> v1-0 2))) - (set! (-> a0-1 trans y) (+ -663.552 (-> a0-1 trans y))) + (+! (-> a0-1 trans y) -663.552) ) (let ((a0-3 (-> v1-0 5))) - (set! (-> a0-3 trans x) (+ 409.6 (-> a0-3 trans x))) + (+! (-> a0-3 trans x) 409.6) ) (let ((a0-5 (-> v1-0 21))) - (set! (-> a0-5 trans x) (+ 409.6 (-> a0-5 trans x))) + (+! (-> a0-5 trans x) 409.6) ) (let ((v1-1 (-> v1-0 8))) - (set! (-> v1-1 trans x) (+ -409.6 (-> v1-1 trans x))) + (+! (-> v1-1 trans x) -409.6) ) ) 0 diff --git a/goal_src/jak2/levels/sewer/gator.gc b/goal_src/jak2/levels/sewer/gator.gc index 1280bda086..5b5dd1fe79 100644 --- a/goal_src/jak2/levels/sewer/gator.gc +++ b/goal_src/jak2/levels/sewer/gator.gc @@ -372,7 +372,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior gator) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((_self self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> _self enemy-flags))) (set! (-> _self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag38) (-> _self enemy-flags)))) diff --git a/goal_src/jak2/levels/sewer/grim2-course.gc b/goal_src/jak2/levels/sewer/grim2-course.gc index e649d8ec9c..c2f6c58974 100644 --- a/goal_src/jak2/levels/sewer/grim2-course.gc +++ b/goal_src/jak2/levels/sewer/grim2-course.gc @@ -421,7 +421,7 @@ :skip-to -1 :on-set (lambda ((arg0 grim-sewer)) (set! (-> arg0 waypoint-time0) (current-time)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (clear-poi-and-focus! arg0) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) @@ -620,7 +620,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 grim-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 min-speed) 40960.0) (set! (-> arg0 max-speed) 40960.0) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) @@ -770,7 +770,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 grim-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 491520.0) (set! (-> arg0 min-speed) 40960.0) @@ -1057,8 +1057,8 @@ :nav-mesh-index -1 :skip-to 54 :on-set (lambda ((arg0 grim-sewer)) - (set! (-> arg0 enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> arg0 enemy-flags))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) @@ -1130,7 +1130,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 grim-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 44) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1225,7 +1225,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 grim-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 48) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1405,7 +1405,7 @@ :on-set (lambda ((arg0 grim-sewer)) (set! (-> arg0 focus-mode) 0) (clear-poi-and-focus! arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 42) diff --git a/goal_src/jak2/levels/sewer/hal2-course.gc b/goal_src/jak2/levels/sewer/hal2-course.gc index 1f363ccd23..5d94c08fd8 100644 --- a/goal_src/jak2/levels/sewer/hal2-course.gc +++ b/goal_src/jak2/levels/sewer/hal2-course.gc @@ -207,7 +207,7 @@ (when (and arg0 arg1) (let ((gp-0 (new 'stack-no-clear 'collide-query))) (set! (-> gp-0 start-pos quad) (-> arg0 root trans quad)) - (set! (-> gp-0 start-pos y) (+ 8192.0 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 8192.0) (vector-! (-> gp-0 move-dist) (get-trans arg1 3) (-> gp-0 start-pos)) (let ((v1-5 gp-0)) (set! (-> v1-5 radius) 2048.0) @@ -325,7 +325,7 @@ ) ) (logclear! (-> obj bot-flags) (bot-flags bf22)) - (set! (-> obj bot-flags) (logior (bot-flags bf23) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf23)) ) ) ) @@ -374,7 +374,7 @@ ) ) ) - (set! (-> obj bot-flags) (logior (bot-flags bf22) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf22)) ) ) ) @@ -3008,7 +3008,7 @@ (play-speech arg1 (-> a1-14 v1-55)) ) (else - (set! (-> arg1 bot-flags) (logior (bot-flags bf24) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf24)) ) ) ) @@ -3229,7 +3229,7 @@ ) (else (if (>= (- (current-time) (-> arg1 waypoint-time0)) (seconds 20)) - (set! (-> arg1 bot-flags) (logior (bot-flags bf24) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf24)) ) ) ) @@ -3301,7 +3301,7 @@ ) ) (when (and (logtest? (-> arg1 waypoint-bits) 1) (>= (- (current-time) (-> arg1 waypoint-time0)) (seconds 0.25))) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-1 from) (process->ppointer pp)) (set! (-> a1-1 num-params) 0) @@ -3688,7 +3688,7 @@ ) (if (>= a1-8 0) (play-speech arg1 a1-8) - (set! (-> arg1 bot-flags) (logior (bot-flags bf24) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf24)) ) ) ) diff --git a/goal_src/jak2/levels/sewer/hosehead.gc b/goal_src/jak2/levels/sewer/hosehead.gc index 9f8849016f..e8aa13e60c 100644 --- a/goal_src/jak2/levels/sewer/hosehead.gc +++ b/goal_src/jak2/levels/sewer/hosehead.gc @@ -565,7 +565,7 @@ (when a0-2 (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 quad) (-> (get-trans (the-as process-focusable a0-2) 1) quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) (set! (-> obj target-pos quad) (-> s5-0 quad)) ) ) @@ -799,14 +799,14 @@ (cond ((-> obj on-wall?) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (go (method-of-object obj notice-wall)) ) ((-> obj sentry?) (when (and (-> obj next-state) (= (-> obj next-state name) 'idle-sentry)) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (go (method-of-object obj hostile-sentry)) ) @@ -857,8 +857,8 @@ (.svf (&-> s2-0 quad) vf6) ) (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> gp-0 y) (+ -8192.0 (-> gp-0 y))) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> gp-0 y) -8192.0) + (+! (-> s5-0 y) 8192.0) (set! (-> s3-0 start-pos quad) (-> gp-0 quad)) (vector-float*! (-> s3-0 move-dist) @@ -977,7 +977,7 @@ ) ) (when (not (-> self sentry?)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable)) (set! (-> self focus collide-with) (collide-spec jak bot player-list jak-vehicle)) (let ((gp-1 (-> self on-stop-sentry))) (if gp-1 @@ -1048,7 +1048,7 @@ (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) (.svf (&-> gp-0 quad) vf6) ) - (set! (-> self target-pos y) (+ 2867.2 (-> self target-pos y))) + (+! (-> self target-pos y) 2867.2) (let ((f0-5 (* (-> self angle-sentry) (+ -0.5 (get-norm! (-> self sync) 0))))) (if (logtest? (enemy-flag dislike-combo) (-> self enemy-flags)) (set! f0-5 (- f0-5)) @@ -1066,7 +1066,7 @@ ) ) (when (not (-> self sentry?)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable)) (set! (-> self focus collide-with) (collide-spec jak bot player-list jak-vehicle)) (let ((gp-2 (-> self on-stop-sentry))) (if gp-2 @@ -1264,7 +1264,7 @@ (else (set! (-> arg1 quad) (-> obj root trans quad)) (set! (-> arg0 quad) (-> arg1 quad)) - (set! (-> arg0 y) (+ 81920.0 (-> arg0 y))) + (+! (-> arg0 y) 81920.0) ) ) (none) @@ -1352,7 +1352,7 @@ (set! (-> self attack-id) a0-22) ) (if (logtest? (enemy-option water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) ) (logclear! (-> self draw status) (draw-control-status no-draw)) (none) @@ -1699,7 +1699,7 @@ :virtual #t :enter (behavior () (if (logtest? (enemy-option water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) ) (let ((t9-0 (-> (method-of-type nav-enemy knocked) enter))) (if t9-0 @@ -1714,7 +1714,7 @@ :virtual #t :enter (behavior () (if (logtest? (enemy-option water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) ) (let ((t9-0 (-> (method-of-type nav-enemy jump) enter))) (if t9-0 diff --git a/goal_src/jak2/levels/sewer/jinx2-course.gc b/goal_src/jak2/levels/sewer/jinx2-course.gc index 11dc925be1..9e564db78e 100644 --- a/goal_src/jak2/levels/sewer/jinx2-course.gc +++ b/goal_src/jak2/levels/sewer/jinx2-course.gc @@ -480,7 +480,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) (set! (-> arg0 min-speed) 49152.0) @@ -524,7 +524,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) (set! (-> arg0 min-speed) 49152.0) @@ -687,7 +687,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 min-speed) 49152.0) (set! (-> arg0 max-speed) 49152.0) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) @@ -719,7 +719,7 @@ :skip-to 34 :on-set (lambda ((arg0 jinx-sewer)) (logclear! (-> arg0 bot-flags) (bot-flags bf19)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf23) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf23)) (set! (-> arg0 min-speed) 32768.0) (set! (-> arg0 max-speed) 32768.0) (set! (-> arg0 bomb-func) jinx2-bomb1-callback) @@ -837,7 +837,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 491520.0) (set! (-> arg0 min-speed) 49152.0) @@ -1126,8 +1126,8 @@ :nav-mesh-index -1 :skip-to 54 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> arg0 enemy-flags))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) @@ -1199,7 +1199,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 jinx-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 44) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1294,7 +1294,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 jinx-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 48) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1538,7 +1538,7 @@ :on-set (lambda ((arg0 jinx-sewer)) (set! (-> arg0 focus-mode) 0) (clear-poi-and-focus! arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 54) diff --git a/goal_src/jak2/levels/sewer/mog2-course.gc b/goal_src/jak2/levels/sewer/mog2-course.gc index 982d055fae..8bae83ebe2 100644 --- a/goal_src/jak2/levels/sewer/mog2-course.gc +++ b/goal_src/jak2/levels/sewer/mog2-course.gc @@ -429,7 +429,7 @@ :skip-to -1 :on-set (lambda ((arg0 mog-sewer)) (set! (-> arg0 waypoint-time0) (current-time)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (clear-poi-and-focus! arg0) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) @@ -629,7 +629,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 mog-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 min-speed) 32768.0) (set! (-> arg0 max-speed) 32768.0) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) @@ -779,7 +779,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 mog-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 491520.0) (set! (-> arg0 min-speed) 24576.0) @@ -1068,8 +1068,8 @@ :nav-mesh-index -1 :skip-to 54 :on-set (lambda ((arg0 mog-sewer)) - (set! (-> arg0 enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> arg0 enemy-flags))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) @@ -1201,7 +1201,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 mog-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 44) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1296,7 +1296,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 mog-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 48) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1505,7 +1505,7 @@ :on-set (lambda ((arg0 mog-sewer)) (set! (-> arg0 focus-mode) 0) (clear-poi-and-focus! arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 45) diff --git a/goal_src/jak2/levels/sewer/sew-gunturret.gc b/goal_src/jak2/levels/sewer/sew-gunturret.gc index 2faee49543..59a711f83b 100644 --- a/goal_src/jak2/levels/sewer/sew-gunturret.gc +++ b/goal_src/jak2/levels/sewer/sew-gunturret.gc @@ -873,7 +873,7 @@ (ja-channel-set! 0) (let ((vec (new 'stack-no-clear 'vector))) (set! (-> vec quad) (-> self root trans quad)) - (set! (-> vec y) (+ 10240.0 (-> vec y))) + (+! (-> vec y) 10240.0) (let ((frame-counter (current-time))) (until (>= (- (current-time) frame-counter) (seconds 2)) (spawn (-> self part) vec) diff --git a/goal_src/jak2/levels/sewer/sewer-obs.gc b/goal_src/jak2/levels/sewer/sewer-obs.gc index 37b43b7ea1..27e2ad1a10 100644 --- a/goal_src/jak2/levels/sewer/sewer-obs.gc +++ b/goal_src/jak2/levels/sewer/sewer-obs.gc @@ -142,7 +142,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -338,7 +338,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -489,7 +489,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -621,7 +621,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -785,7 +785,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) diff --git a/goal_src/jak2/levels/sewer/sewer-obs2.gc b/goal_src/jak2/levels/sewer/sewer-obs2.gc index 4e81b3704f..dc64433795 100644 --- a/goal_src/jak2/levels/sewer/sewer-obs2.gc +++ b/goal_src/jak2/levels/sewer/sewer-obs2.gc @@ -384,7 +384,7 @@ This commonly includes things such as: ) ) (format #t "~S water-height: ~m~%" (-> obj name) (-> obj water-height)) - (set! (-> obj water-height) (+ -216498.17 (-> obj water-height))) + (+! (-> obj water-height) -216498.17) (go (method-of-object obj idle)) (none) ) @@ -1064,7 +1064,7 @@ This commonly includes things such as: (set! (-> obj time-skew) (the-as uint (the int (* 300.0 (rand-vu-float-range 0.1 1.4))))) (set! (-> obj period) (* 300.0 (rand-vu-float-range 1.2 1.8))) (set! (-> obj center quad) (-> obj root trans quad)) - (set! (-> obj base-height) (+ -216498.17 (-> obj base-height))) + (+! (-> obj base-height) -216498.17) (set! (-> obj root pause-adjust-distance) 532480.0) (go (method-of-object obj idle)) (none) @@ -1110,7 +1110,7 @@ This commonly includes things such as: (when (and (>= deadly-radius dist-from-wall) (>= dist-from-wall (+ -4096.0 prev-deadly-radius))) (let ((cquery (new 'stack-no-clear 'collide-query))) (set! (-> cquery start-pos quad) (-> obj root trans quad)) - (set! (-> cquery start-pos y) (+ 12288.0 (-> cquery start-pos y))) + (+! (-> cquery start-pos y) 12288.0) (vector-! (-> cquery move-dist) (get-trans target 3) (-> cquery start-pos)) (let ((v1-9 cquery)) (set! (-> v1-9 radius) 819.2) @@ -1265,7 +1265,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((data ((method-of-type res-lump get-property-struct) (-> obj entity) 'art-name @@ -1341,7 +1341,7 @@ This commonly includes things such as: (set! (-> obj anim) (new 'static 'spool-anim :name "sew-wall-2" :anim-name "2-break" :parts 1 :command-list '()) ) - (set! (-> obj root trans z) (+ 26624.0 (-> obj root trans z))) + (+! (-> obj root trans z) 26624.0) (set! (-> obj first-wall?) #f) ) (else @@ -1836,6 +1836,6 @@ This commonly includes things such as: (let ((func (method-of-type grunt init-enemy!))) (func obj) ) - (set! (-> obj root trans y) (+ -3276.8 (-> obj root trans y))) + (+! (-> obj root trans y) -3276.8) (none) ) diff --git a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc index d9318727f9..55540e8a82 100644 --- a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc +++ b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc @@ -1917,7 +1917,7 @@ This commonly includes things such as: ) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj pos-y) (-> obj root trans y)) (set! (-> obj offset) (rand-vu)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 539) obj)) diff --git a/goal_src/jak2/levels/stadium/stadium-obs.gc b/goal_src/jak2/levels/stadium/stadium-obs.gc index 01a9ebe0e5..317f702341 100644 --- a/goal_src/jak2/levels/stadium/stadium-obs.gc +++ b/goal_src/jak2/levels/stadium/stadium-obs.gc @@ -240,9 +240,7 @@ This commonly includes things such as: ) (let ((v1-24 (-> s4-0 root-prim))) (dotimes (a0-10 (the-as int (-> v1-24 specific 0))) - (set! (-> (the-as collide-shape-prim-group v1-24) child a0-10 local-sphere y) - (+ -14336.0 (-> (the-as collide-shape-prim-group v1-24) child a0-10 local-sphere y)) - ) + (+! (-> (the-as collide-shape-prim-group v1-24) child a0-10 local-sphere y) -14336.0) ) ) (set! (-> obj root) s4-0) @@ -433,7 +431,7 @@ This commonly includes things such as: (let ((v1-4 (new 'stack-no-clear 'vector))) (set! (-> v1-4 quad) (-> self dest-pos quad)) (let ((s5-0 (new 'stack-no-clear 'vector))) - (set! (-> v1-4 y) (+ 49152.0 (-> v1-4 y))) + (+! (-> v1-4 y) 49152.0) (vector-! s5-0 v1-4 (-> gp-0 trans)) (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) (process->ppointer self)) @@ -2029,21 +2027,18 @@ This commonly includes things such as: (dotimes (s4-0 4) (set! (-> obj lightning s4-0) (process->handle - (the-as - process - (ppointer->process (process-spawn - lightning-tracker - :init lightning-tracker-init - (-> *lightning-spec-id-table* 25) - 0 - #f - s5-0 - (-> *stad-samos-lightning-joint-tbl* (+ s4-0 (-> obj rift-rider-joint-offset))) - (-> obj hand-joint) - :to obj - ) + (ppointer->process (process-spawn + lightning-tracker + :init lightning-tracker-init + (-> *lightning-spec-id-table* 25) + 0 + #f + s5-0 + (-> *stad-samos-lightning-joint-tbl* (+ s4-0 (-> obj rift-rider-joint-offset))) + (-> obj hand-joint) + :to obj ) - ) + ) ) ) ) @@ -2745,7 +2740,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-stad-force-field" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj field) (the-as handle #f)) (set! (-> obj ripple) (the-as handle #f)) (transform-post) @@ -2782,7 +2777,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-stad-c-force-field" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj field) (the-as handle #f)) (set! (-> obj ripple) (the-as handle #f)) (transform-post) @@ -2819,7 +2814,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-stad-d-force-field" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj field) (the-as handle #f)) (set! (-> obj ripple) (the-as handle #f)) (transform-post) @@ -3175,12 +3170,8 @@ This commonly includes things such as: (logior! (-> v1-179 extra perm status) (entity-perm-status bit-9)) ) ) - (set! (-> self slave 0) - (process->handle (the-as process (ppointer->process (process-spawn stad-keira :to self)))) - ) - (set! (-> self slave 1) - (process->handle (the-as process (ppointer->process (process-spawn stad-brutter :to self)))) - ) + (set! (-> self slave 0) (process->handle (ppointer->process (process-spawn stad-keira :to self)))) + (set! (-> self slave 1) (process->handle (ppointer->process (process-spawn stad-brutter :to self)))) (none) ) ) diff --git a/goal_src/jak2/levels/strip/strip-drop.gc b/goal_src/jak2/levels/strip/strip-drop.gc index d5e3538a68..da1babc44b 100644 --- a/goal_src/jak2/levels/strip/strip-drop.gc +++ b/goal_src/jak2/levels/strip/strip-drop.gc @@ -555,7 +555,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-cranecrate" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj root trans y) (+ -163348.48 (-> obj root trans y))) + (+! (-> obj root trans y) -163348.48) (when (or (demo?) (and (= *kernel-boot-message* 'kiosk) (task-node-open? (game-task-node strip-drop-resolution)))) (let ((s5-2 (new 'stack-no-clear 'task-arrow-params))) (set! (-> s5-2 pos quad) (-> (new 'static 'vector :x 9920120.0 :y 288036.03 :z -179639.1 :w 1.0) quad)) diff --git a/goal_src/jak2/levels/strip/strip-obs.gc b/goal_src/jak2/levels/strip/strip-obs.gc index 7a5f3f4121..45dcdc80ee 100644 --- a/goal_src/jak2/levels/strip/strip-obs.gc +++ b/goal_src/jak2/levels/strip/strip-obs.gc @@ -1404,7 +1404,7 @@ This commonly includes things such as: ) (logclear! (-> obj options) (projectile-options proj-options-4)) (vector-normalize! (-> obj root transv) 1.0) - (set! (-> obj root transv y) (+ 1.0 (-> obj root transv y))) + (+! (-> obj root transv y) 1.0) (vector-normalize! (-> obj root transv) 184320.0) (set! (-> obj attack-mode) 'eco-yellow) (set! (-> obj blast-radius) 20480.0) @@ -1757,7 +1757,7 @@ This commonly includes things such as: (logclear! (-> obj mask) (process-mask actor-pause)) (let ((a3-5 (new 'stack-no-clear 'vector))) (set! (-> a3-5 quad) (-> obj root trans quad)) - (set! (-> a3-5 x) (+ 57344.0 (-> a3-5 x))) + (+! (-> a3-5 x) 57344.0) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "drill-plat-a" :fo-max 90) a3-5)) ) (ja-post) diff --git a/goal_src/jak2/levels/title/title-obs.gc b/goal_src/jak2/levels/title/title-obs.gc index ffa6a152c8..89bb6fdaab 100644 --- a/goal_src/jak2/levels/title/title-obs.gc +++ b/goal_src/jak2/levels/title/title-obs.gc @@ -545,7 +545,7 @@ 44 (bucket-id progress) ) - (set! (-> sv-112 origin y) (+ 22.0 (-> sv-112 origin y))) + (+! (-> sv-112 origin y) 22.0) ) ) ) diff --git a/goal_src/jak2/levels/tomb/target-indax.gc b/goal_src/jak2/levels/tomb/target-indax.gc index 1aa5784fff..ecf7ac159f 100644 --- a/goal_src/jak2/levels/tomb/target-indax.gc +++ b/goal_src/jak2/levels/tomb/target-indax.gc @@ -262,9 +262,7 @@ ;; WARN: Return type mismatch object vs none. (defbehavior target-indax-init target () - (set! (-> self control current-surface flags) - (logior (surface-flag gun-fast-exit) (-> self control current-surface flags)) - ) + (logior! (-> self control current-surface flags) (surface-flag gun-fast-exit)) (target-gun-end-mode #t) (target-exit) (logior! (-> self game features) (game-feature sidekick)) @@ -275,7 +273,7 @@ (set! (-> self control reaction) target-collision-reaction) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control ctrl-xz-vel) 0.0) - (set! (-> self focus-status) (logior (focus-status indax) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status indax)) (set! (-> self control bend-target) 0.0) (target-collide-set! 'indax 0.0) (set! (-> self fact health) (-> self fact health-max)) @@ -1460,9 +1458,7 @@ (add-process *gui-control* *target* (gui-channel daxter) (gui-action play) "ds175" -99.0 0) ) (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) - (set! (-> self control pat-ignore-mask) - (logior (new 'static 'pat-surface :noendlessfall #x1) (-> self control pat-ignore-mask)) - ) + (logior! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noendlessfall #x1)) (logclear! (-> self water flags) (water-flags swim-ground)) (set! (-> self post-hook) target-no-move-post) (let ((f30-0 (if (rand-vu-percent? 0.2) diff --git a/goal_src/jak2/levels/tomb/tomb-baby-spider.gc b/goal_src/jak2/levels/tomb/tomb-baby-spider.gc index 484a5eff16..e70dd7ebc9 100644 --- a/goal_src/jak2/levels/tomb/tomb-baby-spider.gc +++ b/goal_src/jak2/levels/tomb/tomb-baby-spider.gc @@ -319,7 +319,7 @@ ) :enter (behavior () (nav-enemy-method-166 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-9 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 1))) (set! (-> v1-9 local-sphere w) 4915.2) diff --git a/goal_src/jak2/levels/tomb/tomb-beetle.gc b/goal_src/jak2/levels/tomb/tomb-beetle.gc index 5e11a1b5ec..093a694143 100644 --- a/goal_src/jak2/levels/tomb/tomb-beetle.gc +++ b/goal_src/jak2/levels/tomb/tomb-beetle.gc @@ -559,7 +559,7 @@ ) (set! (-> s5-0 0 dst quad) (the-as uint128 (the-as vector (-> self root trans quad)))) (set! (-> gp-0 0 dst quad) (-> self entity extra trans quad)) - (set! (-> gp-0 0 dst y) (+ 106496.0 (-> gp-0 0 dst y))) + (+! (-> gp-0 0 dst y) 106496.0) (vector-! (-> self fly-away-dir) (the-as vector (-> gp-0 0)) (the-as vector (-> s5-0 0))) (vector-normalize! (-> self fly-away-dir) 1.0) (quaternion-copy! (-> s5-0 0 dst-quat) (-> self root quat)) @@ -855,7 +855,7 @@ ) (else (set! (-> (the-as vector (-> gp-0 0)) quad) (-> self root trans quad)) - (set! (-> gp-0 0 dst y) (+ 16384.0 (-> gp-0 0 dst y))) + (+! (-> gp-0 0 dst y) 16384.0) ) ) (let ((s4-2 (vector-! (new 'stack-no-clear 'vector) (the-as vector (-> gp-0 0)) (-> self root trans)))) diff --git a/goal_src/jak2/levels/tomb/tomb-obs.gc b/goal_src/jak2/levels/tomb/tomb-obs.gc index 8549b593aa..b5527270bc 100644 --- a/goal_src/jak2/levels/tomb/tomb-obs.gc +++ b/goal_src/jak2/levels/tomb/tomb-obs.gc @@ -144,7 +144,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (init-plat-collision! obj) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj (the-as skeleton-group (get-art-group obj)) (the-as pair 0)) @@ -403,7 +403,7 @@ This commonly includes things such as: (when (and v1-1 (< (the-as uint arg0) (-> sv-16 elt-count)) (-> v1-1 arg0) (> (-> v1-1 0 length) 0)) (let ((a0-12 (new 'stack-no-clear 'vector))) (set! (-> a0-12 quad) (-> v1-1 arg0 data 0 actor trans quad)) - (set! (-> a0-12 y) (+ -163840.0 (-> a0-12 y))) + (+! (-> a0-12 y) -163840.0) (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) (process->ppointer self)) (set! (-> a1-4 num-params) 1) @@ -1521,7 +1521,7 @@ This commonly includes things such as: (none) ) :trans (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (plat-trans) (if (not (logtest? (-> self flags) 1)) (set! (-> self ride-timer) (current-time)) diff --git a/goal_src/jak2/levels/tomb/tomb-water.gc b/goal_src/jak2/levels/tomb/tomb-water.gc index 959d5ffb36..36cfa882bd 100644 --- a/goal_src/jak2/levels/tomb/tomb-water.gc +++ b/goal_src/jak2/levels/tomb/tomb-water.gc @@ -487,7 +487,7 @@ This commonly includes things such as: "Sets `event-going-down` to `'trigger`" (logior! (-> obj button-status) (button-status button-status-4)) (set! (-> obj event-going-down) 'cue-chase) - (set! (-> obj root trans y) (+ 204.8 (-> obj root trans y))) + (+! (-> obj root trans y) 204.8) (none) ) @@ -1536,10 +1536,10 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior tomb-simon-block-init-by-other tomb-simon-block ((arg0 vector) (arg1 int) (arg2 int) (arg3 int) (arg4 int)) (init-plat-collision! self) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self root trans quad) (-> arg0 quad)) (set! (-> self base-height) (-> self root trans y)) - (set! (-> self root trans y) (+ -122880.0 (-> self root trans y))) + (+! (-> self root trans y) -122880.0) (quaternion-copy! (-> self root quat) *unity-quaternion*) (vector-identity! (-> self root scale)) (initialize-skeleton self (the-as skeleton-group (get-art-group self)) (the-as pair 0)) @@ -1992,7 +1992,7 @@ This commonly includes things such as: (< 184320.0 (vector-vector-distance (-> self root trans) (get-trans gp-0 0))) ) (remove-setting! 'sound-mode) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) ) ) ) @@ -2219,7 +2219,7 @@ This commonly includes things such as: ) (set! (-> obj entity) arg0) (set! (-> obj spawn-pos quad) (-> obj root trans quad)) - (set! (-> obj spawn-pos y) (+ 81.92 (-> obj spawn-pos y))) + (+! (-> obj spawn-pos y) 81.92) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc)) ) @@ -2605,7 +2605,7 @@ This commonly includes things such as: ) ) (get-bounding-sphere (-> obj bbox) s5-1) - (set! (-> s5-1 r) (+ 81920.0 (-> s5-1 r))) + (+! (-> s5-1 r) 81920.0) (set-from-sphere! (-> obj run-bbox) s5-1) ) (let* ((v1-29 *game-info*) diff --git a/goal_src/jak2/levels/tomb/widow-extras.gc b/goal_src/jak2/levels/tomb/widow-extras.gc index 265376a959..0aa0fbe6aa 100644 --- a/goal_src/jak2/levels/tomb/widow-extras.gc +++ b/goal_src/jak2/levels/tomb/widow-extras.gc @@ -768,8 +768,8 @@ This commonly includes things such as: (if (and (nonzero? (-> self fizzle-timer)) (>= (- (current-time) (-> self fizzle-timer)) (seconds 3))) (go-virtual explode) ) - (set! (-> self x-rotate) (+ 1092.2667 (-> self x-rotate))) - (set! (-> self y-rotate) (+ 728.1778 (-> self y-rotate))) + (+! (-> self x-rotate) 1092.2667) + (+! (-> self y-rotate) 728.1778) (widow-bomb-method-34 self) (spawn-with-cspace (-> self part) (-> self node-list data 3)) (cond @@ -820,8 +820,8 @@ This commonly includes things such as: (if (and (nonzero? (-> self fizzle-timer)) (>= (- (current-time) (-> self fizzle-timer)) (seconds 3))) (go-virtual explode) ) - (set! (-> self x-rotate) (+ 4369.067 (-> self x-rotate))) - (set! (-> self y-rotate) (+ 3458.8445 (-> self y-rotate))) + (+! (-> self x-rotate) 4369.067) + (+! (-> self y-rotate) 3458.8445) (widow-bomb-method-34 self) (cond ((>= (- (current-time) (-> self state-time)) (the int (-> self traj time))) @@ -913,7 +913,7 @@ This commonly includes things such as: ((< (- (current-time) (-> self state-time)) (seconds 2)) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self root trans quad)) - (set! (-> a1-0 y) (+ 2048.0 (-> a1-0 y))) + (+! (-> a1-0 y) 2048.0) (spawn (-> self explode-part) a1-0) ) ) @@ -1089,11 +1089,11 @@ This commonly includes things such as: (let ((v1-0 (-> self which-trajectory))) (cond ((zero? v1-0) - (set! (-> self x-rotate) (+ 4369.067 (-> self x-rotate))) - (set! (-> self y-rotate) (+ 3458.8445 (-> self y-rotate))) + (+! (-> self x-rotate) 4369.067) + (+! (-> self y-rotate) 3458.8445) ) ((= v1-0 1) - (set! (-> self x-rotate) (+ 7281.778 (-> self x-rotate))) + (+! (-> self x-rotate) 7281.778) (set! (-> self y-rotate) 0.0) ) (else @@ -1102,10 +1102,10 @@ This commonly includes things such as: ) ) (if (< 65536.0 (-> self x-rotate)) - (set! (-> self x-rotate) (+ -65536.0 (-> self x-rotate))) + (+! (-> self x-rotate) -65536.0) ) (if (< 65536.0 (-> self y-rotate)) - (set! (-> self y-rotate) (+ -65536.0 (-> self y-rotate))) + (+! (-> self y-rotate) -65536.0) ) (widow-bomb-method-34 self) (when (< (-> self root scale x) 1.0) diff --git a/goal_src/jak2/levels/tomb/widow-more-extras.gc b/goal_src/jak2/levels/tomb/widow-more-extras.gc index 2a1811e0e9..db0b26c76f 100644 --- a/goal_src/jak2/levels/tomb/widow-more-extras.gc +++ b/goal_src/jak2/levels/tomb/widow-more-extras.gc @@ -466,7 +466,7 @@ (when (>= (- (current-time) (-> self state-time)) 0) (let ((gp-0 (new 'stack-no-clear 'vector))) (cavein-get-random-point gp-0) - (set! (-> gp-0 y) (+ 327680.0 (-> gp-0 y))) + (+! (-> gp-0 y) 327680.0) (process-spawn tomb-boss-debris gp-0 (rand-vu-int-count 8) :to self) ) (set! (-> self state-time) (+ (current-time) (the int (* 300.0 (rand-vu-float-range 0.1 0.5))))) @@ -502,7 +502,7 @@ This commonly includes things such as: (if (-> obj path) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) ) - (set! (-> obj root trans y) (+ 327680.0 (-> obj root trans y))) + (+! (-> obj root trans y) 327680.0) (logclear! (-> obj mask) (process-mask actor-pause)) (dotimes (v1-12 100) (set! (-> obj prev-points v1-12) 0) diff --git a/goal_src/jak2/levels/tomb/widow-part.gc b/goal_src/jak2/levels/tomb/widow-part.gc index e723af9e10..c63339fc93 100644 --- a/goal_src/jak2/levels/tomb/widow-part.gc +++ b/goal_src/jak2/levels/tomb/widow-part.gc @@ -2174,7 +2174,7 @@ (birth-func-texture-group arg0 arg1 arg2) (let ((s5-0 (new 'stack-no-clear 'collide-query))) (set! (-> s5-0 start-pos quad) (-> arg2 launchrot quad)) - (set! (-> s5-0 start-pos y) (+ -143360.0 (-> s5-0 start-pos y))) + (+! (-> s5-0 start-pos y) -143360.0) (set-vector! (-> s5-0 move-dist) 0.0 -81920.0 0.0 1.0) (let ((s4-0 (new 'stack-no-clear 'vector))) (.svf (&-> s4-0 quad) vf30) diff --git a/goal_src/jak2/levels/tomb/widow2.gc b/goal_src/jak2/levels/tomb/widow2.gc index cc72ecc9f4..96ac93c98b 100644 --- a/goal_src/jak2/levels/tomb/widow2.gc +++ b/goal_src/jak2/levels/tomb/widow2.gc @@ -244,8 +244,8 @@ This commonly includes things such as: 0 (let ((s3-2 (new 'stack-no-clear 'vector))) (set! (-> s3-2 quad) (-> arg0 extra trans quad)) - (set! (-> s3-2 y) (+ -32768.0 (-> s3-2 y))) - (set! (-> s3-2 z) (+ 42475.52 (-> s3-2 z))) + (+! (-> s3-2 y) -32768.0) + (+! (-> s3-2 z) 42475.52) (dotimes (s5-1 8) (cond ((not (logtest? (the-as int (-> s4-2 user-object 1)) (ash 1 s5-1))) @@ -275,7 +275,7 @@ This commonly includes things such as: (set! (-> obj flying) #f) (set! (-> obj previous-anim) 0) (set! (-> obj circle-center quad) (-> obj root trans quad)) - (set! (-> obj circle-center z) (+ 40960.0 (-> obj circle-center z))) + (+! (-> obj circle-center z) 40960.0) (init (-> obj theta) 0.0 0.01 91.022224 0.9) (init (-> obj tilt) 0.0 0.01 91.022224 0.9) (set! (-> obj left-cover-jm) (new 'process 'joint-mod (joint-mod-mode joint-set*) obj 90)) diff --git a/goal_src/jak2/levels/under/centipede.gc b/goal_src/jak2/levels/under/centipede.gc index 60b94a3178..9027d776a8 100644 --- a/goal_src/jak2/levels/under/centipede.gc +++ b/goal_src/jak2/levels/under/centipede.gc @@ -808,7 +808,7 @@ (let ((v1-13 *camera*)) (when (and v1-13 (-> v1-13 slave)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> self enemy-flags) (logior (enemy-flag dangerous-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> self mask) (process-mask actor-pause)) (go-hostile self) ) @@ -1091,7 +1091,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self grabbed-focus?) #f) (vector-reset! (-> self root transv)) (set! (-> self desired-talking-volume) 0.0) @@ -1343,7 +1343,7 @@ (set! (-> obj focus-gnd-height) -40959590.0) (set! (-> obj bobbing-intensity) 1.0) (set-vector! (-> obj root scale) 0.75 0.75 0.75 1.0) - (set! (-> obj root trans y) (+ 4096.0 (-> obj root trans y))) + (+! (-> obj root trans y) 4096.0) (case (-> obj id) ((1) (let ((v1-10 (-> obj root))) @@ -1370,7 +1370,7 @@ (set! (-> obj skel generate-frame-function) create-interpolated2-joint-animation-frame) (init-enemy-behaviour-and-stats! obj *centipede-nav-enemy-info*) (logclear! (-> obj mask) (process-mask enemy)) - (set! (-> obj mask) (logior (process-mask bot) (-> obj mask))) + (logior! (-> obj mask) (process-mask bot)) (let ((v1-31 (-> obj nav))) (set! (-> v1-31 sphere-mask) (the-as uint 64)) ) diff --git a/goal_src/jak2/levels/under/jellyfish.gc b/goal_src/jak2/levels/under/jellyfish.gc index c75d9df78d..f393dc207c 100644 --- a/goal_src/jak2/levels/under/jellyfish.gc +++ b/goal_src/jak2/levels/under/jellyfish.gc @@ -410,10 +410,10 @@ ) ) (jellyfish-method-161 self (-> self stare-pos) (-> self path-stare-u)) - (set! (-> self stare-pos y) (+ -32768.0 (-> self stare-pos y))) + (+! (-> self stare-pos y) -32768.0) (let ((gp-0 (new 'stack-no-clear 'collide-query))) (set! (-> gp-0 start-pos quad) (-> self stare-pos quad)) - (set! (-> gp-0 start-pos y) (+ 8192.0 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 8192.0) (set-vector! (-> gp-0 move-dist) 0.0 -81920.0 0.0 0.0) (let ((v1-8 gp-0)) (set! (-> v1-8 radius) 819.2) @@ -887,7 +887,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (go (method-of-object obj die)) diff --git a/goal_src/jak2/levels/under/sig5-course.gc b/goal_src/jak2/levels/under/sig5-course.gc index 33a2e8a1f2..ff2616d04b 100644 --- a/goal_src/jak2/levels/under/sig5-course.gc +++ b/goal_src/jak2/levels/under/sig5-course.gc @@ -357,10 +357,8 @@ (nav-enemy-method-167 self) (set! (-> self skel top-anim interp) 0.0) (set! (-> self focus-mode) 1) - (set! (-> self bot-flags) (logior (bot-flags bf11 bf18) (-> self bot-flags))) - (set! (-> self root penetrated-by) - (logior (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot) (-> self root penetrated-by)) - ) + (logior! (-> self bot-flags) (bot-flags bf11 bf18)) + (logior! (-> self root penetrated-by) (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot)) (look-at-target! self (enemy-flag lock-focus)) (none) ) @@ -439,7 +437,7 @@ ) ) (label cfg-27) - (set! (-> self bot-flags) (logior (bot-flags bf18) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf18)) ) #f (none) @@ -604,7 +602,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 sig-under)) - (set! (-> arg0 bot-task-bits) (logand -5 (-> arg0 bot-task-bits))) + (logand! (-> arg0 bot-task-bits) -5) (logior! (-> arg0 bot-flags) (bot-flags bf06)) (logior! (-> arg0 enemy-flags) (enemy-flag enable-on-active checking-water)) (set! (-> arg0 notice-enemy-dist) 122880.0) @@ -1263,7 +1261,7 @@ (set! (-> arg0 notice-enemy-dist) 0.0) (logclear! (-> arg0 enemy-flags) (enemy-flag enable-on-active checking-water)) (clear-focused (-> arg0 focus)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf26) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf26)) (when (and (process-grab? arg0 #t) (process-grab? *target* #t)) (process-grab? arg0 #f) (process-grab? *target* #f) @@ -1500,7 +1498,7 @@ :on-set (lambda ((arg0 sig-under)) (stop-speech arg0 (the-as uint 0) #f) (set-setting! 'music 'danger7 0.0 0) - (set! (-> arg0 bot-task-bits) (logand -9 (-> arg0 bot-task-bits))) + (logand! (-> arg0 bot-task-bits) -9) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) sigt-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) (set! (-> v1-7 bytes 6) 23) diff --git a/goal_src/jak2/levels/under/under-obs.gc b/goal_src/jak2/levels/under/under-obs.gc index 6cdd687a00..2b3867a96f 100644 --- a/goal_src/jak2/levels/under/under-obs.gc +++ b/goal_src/jak2/levels/under/under-obs.gc @@ -472,7 +472,7 @@ This commonly includes things such as: (let* ((a0-1 (target-pos 0)) (v1-6 (vector-! (new 'stack-no-clear 'vector) (-> self root trans) a0-1)) ) - (set! (-> v1-6 y) (+ 58000.0 (-> v1-6 y))) + (+! (-> v1-6 y) 58000.0) (if (< (-> self down-threshold) (-> v1-6 y)) (go-virtual going-down) ) @@ -556,7 +556,7 @@ This commonly includes things such as: (let* ((a0-4 (target-pos 0)) (v1-19 (vector-! (new 'stack-no-clear 'vector) (-> self root trans) a0-4)) ) - (set! (-> v1-19 y) (+ 58000.0 (-> v1-19 y))) + (+! (-> v1-19 y) 58000.0) (if (< (-> v1-19 y) (-> self up-threshold)) (go-virtual going-up) ) @@ -710,7 +710,7 @@ This commonly includes things such as: :trans (behavior () (when (-> self release) (ja :num-func num-func-identity :frame-num (-> self open-anim-frame)) - (set! (-> self open-anim-frame) (+ 0.2 (-> self open-anim-frame))) + (+! (-> self open-anim-frame) 0.2) (if (< 17.0 (-> self open-anim-frame)) (go-virtual opened) ) @@ -1113,7 +1113,7 @@ This commonly includes things such as: ((>= arg1 (the-as int (+ (-> obj num-joints) -1))) (set! v1-7 (new 'stack-no-clear 'vector)) (set! (-> v1-7 quad) (-> arg2 entity trans quad)) - (set! (-> v1-7 y) (+ 8192.0 (-> v1-7 y))) + (+! (-> v1-7 y) 8192.0) ) (else (set! v1-7 (new 'stack-no-clear 'vector)) @@ -1172,7 +1172,7 @@ This commonly includes things such as: (let ((v1-0 (new 'stack-no-clear 'vector))) (set! (-> v1-0 quad) (-> arg3 entity trans quad)) (let ((s5-0 (new 'stack-no-clear 'vector))) - (set! (-> v1-0 y) (+ -19660.8 (-> v1-0 y))) + (+! (-> v1-0 y) -19660.8) (vector-! s5-0 arg0 v1-0) (let ((f0-2 (vector-normalize-ret-len! s5-0 1.0))) (if (< f0-2 20480.0) @@ -1332,14 +1332,14 @@ This commonly includes things such as: (cond (*target* (set! (-> s5-0 quad) (-> (get-trans *target* 3) quad)) - (set! (-> s5-0 y) (+ -28672.0 (-> s5-0 y))) + (+! (-> s5-0 y) -28672.0) ) (else (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> s5-0 y) (+ -1024.0 (-> s5-0 y))) + (+! (-> s5-0 y) -1024.0) ) ) - (set! (-> gp-0 y) (+ -28672.0 (-> gp-0 y))) + (+! (-> gp-0 y) -28672.0) (vector-seek-3d-smooth! (-> self root trans) s5-0 (* 204.8 (-> self clock time-adjust-ratio)) 0.25) ) (let ((v1-21 (vector-! (new 'stack-no-clear 'vector) (-> self root trans) gp-0))) @@ -1765,7 +1765,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 ((method-of-type res-lump get-property-struct) (-> obj entity) 'art-name diff --git a/goal_src/jak2/levels/under/under-shoot-block.gc b/goal_src/jak2/levels/under/under-shoot-block.gc index 60a940e07c..13dd25f97b 100644 --- a/goal_src/jak2/levels/under/under-shoot-block.gc +++ b/goal_src/jak2/levels/under/under-shoot-block.gc @@ -746,7 +746,7 @@ (set! (-> self move-dir-x) s5-1) (set! (-> self move-dir-z) gp-1) (under-block-method-48 self (+ (-> self col) s5-1) (+ (-> self row) gp-1)) - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (if (zero? (-> self activated-time)) (under-block-method-42 self) ) @@ -755,7 +755,7 @@ ((under-block-method-49 self s5-1 gp-1) (set! (-> self move-dir-x) s5-1) (set! (-> self move-dir-z) gp-1) - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (go-virtual rock) ) ((and (-> self next-state) (= (-> self next-state name) 'idle)) @@ -918,7 +918,7 @@ ) ) (else - (set! (-> obj flags) (logand -3 (-> obj flags))) + (logand! (-> obj flags) -3) (set-vector! (-> obj draw color-mult) 1.0 1.0 1.0 1.0) (set-vector! (-> obj draw color-emissive) 0.0 0.0 0.0 1.0) ) @@ -1228,7 +1228,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :code (the-as (function none :behavior under-block) sleep-code) @@ -1239,7 +1239,7 @@ :event under-block-event-handler :trans (the-as (function none :behavior under-block) rider-trans) :code (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (while (not (under-block-method-48 self (-> self col) (-> self row))) (suspend) ) @@ -1249,7 +1249,7 @@ (let ((gp-1 (new 'stack-no-clear 'matrix))) (set! (-> gp-1 vector 0 quad) (-> self root trans quad)) (set! (-> gp-1 vector 1 quad) (-> gp-1 vector 0 quad)) - (set! (-> gp-1 vector 1 y) (+ 16384.0 (-> gp-1 vector 1 y))) + (+! (-> gp-1 vector 1 y) 16384.0) (until (>= 409.6 (fabs (- (-> gp-1 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1273,12 +1273,12 @@ :event under-block-event-handler :trans (the-as (function none :behavior under-block) rider-trans) :code (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (set! (-> self state-time) (current-time)) (let ((gp-0 (new 'stack-no-clear 'matrix))) (set! (-> gp-0 vector 0 quad) (-> self root trans quad)) (set! (-> gp-0 vector 1 quad) (-> gp-0 vector 0 quad)) - (set! (-> gp-0 vector 1 y) (+ 16384.0 (-> gp-0 vector 1 y))) + (+! (-> gp-0 vector 1 y) 16384.0) (until (>= 409.6 (fabs (- (-> gp-0 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1318,7 +1318,7 @@ (none) ) :exit (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :trans (behavior () @@ -1524,7 +1524,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :trans (behavior () @@ -1537,7 +1537,7 @@ (let ((gp-1 (new 'stack-no-clear 'matrix))) (set! (-> gp-1 vector 0 quad) (-> self root trans quad)) (set! (-> gp-1 vector 1 quad) (-> gp-1 vector 0 quad)) - (set! (-> gp-1 vector 1 y) (+ -1228.8 (-> gp-1 vector 1 y))) + (+! (-> gp-1 vector 1 y) -1228.8) (until (>= 40.96 (fabs (- (-> gp-1 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1578,7 +1578,7 @@ (set! (-> gp-1 vector 0 quad) (-> self root trans quad)) (set! (-> gp-1 vector 1 quad) (-> gp-1 vector 0 quad)) (set! (-> gp-1 vector 1 y) (-> self puzzle origin y)) - (set! (-> gp-1 vector 1 y) (+ -8192.0 (-> gp-1 vector 1 y))) + (+! (-> gp-1 vector 1 y) -8192.0) (until (>= 40.96 (fabs (- (-> gp-1 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1599,7 +1599,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (under-block-method-41 self 'beaten) (none) ) @@ -1610,7 +1610,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (logclear! (-> self mask) (process-mask actor-pause)) (under-block-method-41 self 'fall) (none) @@ -1663,7 +1663,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (under-block-method-46 self (-> self col) (-> self row)) (let ((v1-4 (-> self puzzle))) (countdown (a0-3 (-> v1-4 slots length)) @@ -1794,10 +1794,10 @@ (vector-matrix*! (-> s5-1 trans) (-> s5-1 trans) (-> self puzzle local-to-world)) (case arg2 (('waiting 'beaten) - (set! (-> s5-1 trans y) (+ -16384.0 (-> s5-1 trans y))) + (+! (-> s5-1 trans y) -16384.0) ) (('follow) - (set! (-> s5-1 trans y) (+ -32768.0 (-> s5-1 trans y))) + (+! (-> s5-1 trans y) -32768.0) ) ) (matrix->quaternion (-> s5-1 quat) (-> self puzzle local-to-world)) @@ -1809,7 +1809,7 @@ (the-as pair 0) ) (transform-post) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self draw light-index) (the-as uint 30)) (cond ((= arg2 'idle) diff --git a/goal_src/jak2/levels/under/under-sig-obs.gc b/goal_src/jak2/levels/under/under-sig-obs.gc index db2dfad902..0fcc787a84 100644 --- a/goal_src/jak2/levels/under/under-sig-obs.gc +++ b/goal_src/jak2/levels/under/under-sig-obs.gc @@ -113,7 +113,7 @@ "Does any necessary initial platform setup. For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound." (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set-vector! (-> obj axe-flip) 1.0 0.0 0.0 1.0) (set! (-> obj angle-flip) 180.0) (set! (-> obj time-flip) (the-as uint 570)) @@ -1216,7 +1216,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (set! (-> obj extended-amount) 0.0) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (set! (-> obj clock) (-> *display* user0-clock)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) diff --git a/scripts/gsrc/update-gsrc-via-refs.py b/scripts/gsrc/update-gsrc-via-refs.py index de1523032a..532bb34f9e 100644 --- a/scripts/gsrc/update-gsrc-via-refs.py +++ b/scripts/gsrc/update-gsrc-via-refs.py @@ -55,7 +55,7 @@ subprocess.run( "--version", args.version, "--config-override", - '{{"allowed_objects": {}}}'.format(all_names), + '{{"levels_extract": false, "process_art_groups": false, "decompile_code": true, "allowed_objects": {}}}'.format(all_names), ] ) diff --git a/test/decompiler/reference/jak1/engine/common-obs/joint-exploder_REF.gc b/test/decompiler/reference/jak1/engine/anim/joint-exploder_REF.gc similarity index 99% rename from test/decompiler/reference/jak1/engine/common-obs/joint-exploder_REF.gc rename to test/decompiler/reference/jak1/engine/anim/joint-exploder_REF.gc index 2c6cf4150c..733ff9e6fa 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/joint-exploder_REF.gc +++ b/test/decompiler/reference/jak1/engine/anim/joint-exploder_REF.gc @@ -745,7 +745,7 @@ (set! (-> a0-6 pre-moved?) #f) ) ) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> self parent-override 0 root trans quad)) (quaternion-copy! (-> self root quat) (-> self parent-override 0 root quat)) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc index d695fb1167..d8f63bedd2 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc @@ -289,7 +289,7 @@ (let ((f28-1 (acos (vector-dot (the-as vector (-> s1-0 vector)) (-> s1-0 vector 1))))) (cond ((logtest? (-> *camera* master-options) 8) - (set! (-> *camera* master-options) (logand -25 (-> *camera* master-options))) + (logand! (-> *camera* master-options) -25) (when (and (< 8192.0 f28-1) (logtest? (-> *camera* master-options) 2)) (vector-! (the-as vector (-> s1-0 vector)) (-> *camera* tpos-curr) s2-0) (vector-! (-> s1-0 vector 1) s0-0 s2-0) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc index 9359e2a453..37c24cf979 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc @@ -220,7 +220,7 @@ (!= (-> self drawable-target) #f) (not (handle->process (-> self drawable-target))) ) - (set! (-> self master-options) (logand -3 (-> self master-options))) + (logand! (-> self master-options) -3) (set! (-> self drawable-target) (the-as handle #f)) ) ((and (logtest? (-> self master-options) 2) (handle->process (-> self drawable-target))) @@ -360,7 +360,7 @@ (-> self ease-to) (parameter-ease-sin-clamp (-> self ease-t)) ) - (set! (-> self master-options) (logand -33 (-> self master-options))) + (logand! (-> self master-options) -33) ) (else (vector-lerp! @@ -581,7 +581,7 @@ (defbehavior master-unset-region camera-master () (when (-> self cam-entity) (set! (-> self cam-entity) #f) - (set! (-> self master-options) (logand -65 (-> self master-options))) + (logand! (-> self master-options) -65) (set! (-> self stringMinHeight) (-> *CAMERA-bank* default-string-min-y)) (set! (-> self stringMaxHeight) (-> *CAMERA-bank* default-string-max-y)) (set! (-> self stringMinLength) (-> *CAMERA-bank* default-string-min-z)) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc index 35c84e19a1..e3f2b281dd 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc @@ -2381,7 +2381,7 @@ ;; definition for function cam-string-joystick ;; INFO: Used lq/sq (defbehavior cam-string-joystick camera-slave () - (set! (-> self options) (logand -257 (-> self options))) + (logand! (-> self options) -257) (let ((f28-0 (cam-dist-analog-input (the-as int (-> *cpad-list* cpads 0 righty)) (the-as float 0.05))) (f0-2 (/ (- (vector-length (-> self view-flat)) (-> self string-min-val z)) (- (-> self string-max-val z) (-> self string-min-val z)) @@ -2704,7 +2704,7 @@ ) (cond ((zero? gp-2) - (set! (-> self options) (logand -1025 (-> self options))) + (logand! (-> self options) -1025) (if *display-cam-los-debug* (format *stdcon* "not blocked~%") ) @@ -2776,7 +2776,7 @@ (cam-collision-record-save (-> self string-trans) a1-1 -2 'jump self) ) ) - (set! (-> self options) (logand -4097 (-> self options))) + (logand! (-> self options) -4097) (set! (-> self desired-pos quad) (-> self good-point quad)) (cam-string-move) (vector-! (-> self view-flat) (-> self string-trans) (-> *camera* tpos-curr-adj)) diff --git a/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc index b8698bf574..ed37189869 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/basebutton_REF.gc @@ -611,7 +611,7 @@ (set! (-> self control unknown-surface00) *warp-jump-mods*) (set! (-> self control unknown-vector102 quad) (-> arg0 quad)) (set! (-> self control unknown-vector103 quad) (-> arg1 quad)) - (set! (-> self control unknown-vector102 y) (+ -4096.0 (-> self control unknown-vector102 y))) + (+! (-> self control unknown-vector102 y) -4096.0) (set! (-> self control unknown-uint20) (the-as uint #f)) (vector-reset! (-> self control transv)) (logior! (-> self state-flags) (state-flags use-alt-cam-pos)) diff --git a/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc index 2d72c6255c..f4814d4207 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc @@ -66,7 +66,7 @@ ;; INFO: Return type mismatch collectable vs none. (defmethod initialize-params collectable ((obj collectable) (arg0 time-frame) (arg1 float)) (logclear! (-> obj mask) (process-mask crate enemy platform ambient)) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (set! (-> obj flags) (collectable-flags can-collect ignore-blue)) (set! (-> obj bob-amount) arg1) (set! (-> obj bob-offset) (+ (the-as int (-> obj root-override trans x)) @@ -2163,7 +2163,7 @@ (cond ((and *debug-segment* (< (-> *fuel-cell-tune-pos* w) 1000000000.0)) (set! (-> self jump-pos quad) (-> *fuel-cell-tune-pos* quad)) - (set! (-> self jump-pos y) (+ 4096.0 (-> self jump-pos y))) + (+! (-> self jump-pos y) 4096.0) (go-virtual jump) ) ((and gp-1 @@ -2174,7 +2174,7 @@ (not (logtest? (-> self fact options) (fact-options skip-jump-anim))) ) (set! (-> self jump-pos quad) (-> (the-as vector gp-1) quad)) - (set! (-> self jump-pos y) (+ 4096.0 (-> self jump-pos y))) + (+! (-> self jump-pos y) 4096.0) (go-virtual jump) ) ) @@ -2799,7 +2799,7 @@ ) (let ((s2-1 (new 'stack-no-clear 'vector))) (set! (-> s2-1 quad) (-> obj process root trans quad)) - (set! (-> s2-1 y) (+ 12288.0 (-> s2-1 y))) + (+! (-> s2-1 y) 12288.0) (let ((s1-1 (new 'stack-no-clear 'collide-tri-result))) (if (>= (fill-and-probe-using-y-probe *collide-cache* @@ -2817,7 +2817,7 @@ ) ) (if (= (the-as int s3-0) 6) - (set! (-> s2-1 y) (+ 6144.0 (-> s2-1 y))) + (+! (-> s2-1 y) 6144.0) ) (birth-pickup-at-point s2-1 (the-as pickup-type s3-0) f30-0 arg0 arg1 obj) ) diff --git a/test/decompiler/reference/jak1/engine/common-obs/dark-eco-pool_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/dark-eco-pool_REF.gc index fc13de809e..f316f3038d 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/dark-eco-pool_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/dark-eco-pool_REF.gc @@ -98,7 +98,7 @@ (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt24) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt24)) (set! (-> obj attack-event) (the-as symbol ((the-as (function res-lump symbol symbol float structure (pointer res-tag) pointer object) diff --git a/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc index ee01683e06..f1f440a8e5 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/generic-obs_REF.gc @@ -1466,7 +1466,7 @@ (defmethod init-from-entity! part-spawner ((obj part-spawner) (arg0 entity-actor)) (local-vars (sv-16 res-tag)) (stack-size-set! (-> obj main-thread) 128) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -2530,7 +2530,3 @@ 0 (none) ) - - - - diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc index c98fd01c52..65fe3aa414 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat-eco_REF.gc @@ -278,7 +278,7 @@ ;; definition for method 11 of type plat-eco ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! plat-eco ((obj plat-eco) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (set! (-> obj notice-dist) (res-lump-float arg0 'notice-dist :default -1.0)) (set! (-> obj link) (new 'process 'actor-link-info obj)) (baseplat-method-24 obj) diff --git a/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc index 6613db4e26..e4cc1d4842 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/plat_REF.gc @@ -272,7 +272,7 @@ ;; definition for method 11 of type plat ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! plat ((obj plat) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (baseplat-method-24 obj) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj (get-unlit-skel obj) '()) diff --git a/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc index 015c27e657..8d618d0f26 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/rigid-body_REF.gc @@ -889,7 +889,7 @@ ;; definition for method 11 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. (defmethod init-from-entity! rigid-body-platform ((obj rigid-body-platform) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc index 28d3758d73..9848f4e339 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/sharkey_REF.gc @@ -457,7 +457,7 @@ nav-enemy-default-event-handler ) ) (send-event *target* 'end-mode) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) ) (sharkey-reset-position) (logior! (-> self draw status) (draw-status hidden)) diff --git a/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc index a9b3762535..f3738d065e 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/water_REF.gc @@ -685,7 +685,7 @@ ((and (logtest? (water-flags wt21) (-> obj flags)) (logtest? (-> obj process state-flags) (state-flags grabbed)) ) - (set! (-> obj flags) (logior (water-flags wt16) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt16)) ) ((begin (set! (-> obj top 1 quad) (-> obj top 0 quad)) @@ -1441,7 +1441,7 @@ ) ) ) - (set! (-> obj flags) (logior (water-flags wt23) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt23)) (cond ((zero? (-> obj flags)) (if (< 0.0 (-> obj wade-height)) @@ -1488,7 +1488,3 @@ (go (method-of-object obj water-vol-startup)) (none) ) - - - - diff --git a/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc b/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc index 0da9323786..848b5f5bc3 100644 --- a/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc @@ -924,7 +924,7 @@ (let ((a0-20 v1-31)) "return the next node in the list" (let ((a0-21 (-> a0-20 next))) - (set! (-> v1-31 flags) (logand -3 (-> v1-31 flags))) + (logand! (-> v1-31 flags) -3) (set! v1-31 (the-as anim-test-sequence a0-21)) ) ) @@ -1370,7 +1370,7 @@ (set! (-> arg1 current-index) (-> arg1 the-index)) (set! (-> (the-as anim-test-obj v1-0) anim-index) (-> arg1 current-index)) (set! (-> (the-as anim-test-obj v1-0) anim-hindex) (-> arg1 highlight-index)) - (set! (-> (the-as anim-test-obj v1-0) flags) (logand -3 (-> (the-as anim-test-obj v1-0) flags))) + (logand! (-> (the-as anim-test-obj v1-0) flags) -3) (send-event (ppointer->process *anim-tester*) 'change-anim #f) ) ((cpad-pressed? 0 square) @@ -1706,7 +1706,7 @@ (let ((s4-0 (new 'debug 'anim-test-seq-item 1 ""))) (anim-test-seq-item-copy! s4-0 arg0) (when (logtest? (-> s4-0 flags) 1) - (set! (-> s4-0 flags) (logand -2 (-> s4-0 flags))) + (logand! (-> s4-0 flags) -2) (logior! (-> s4-0 flags) 4) (let ((v1-8 s4-0)) (set! (-> v1-8 privname) "--blank--") @@ -2738,7 +2738,7 @@ "is this node the end of the list. #t = end" (not (not (-> v1-30 next))) ) - (set! (-> (the-as anim-test-sequence s5-1) flags) (logand -5 (-> (the-as anim-test-sequence s5-1) flags))) + (logand! (-> (the-as anim-test-sequence s5-1) flags) -5) (format gp-2 " ~S \"~S\" ~d~%" @@ -2798,7 +2798,7 @@ (not (not (-> v1-9 next))) ) (when (logtest? (-> (the-as anim-test-obj gp-0) flags) 1) - (set! (-> (the-as anim-test-obj gp-0) flags) (logand -2 (-> (the-as anim-test-obj gp-0) flags))) + (logand! (-> (the-as anim-test-obj gp-0) flags) -2) (anim-tester-save-object-seqs (the-as anim-test-obj gp-0)) ) "return the next node in the list" diff --git a/test/decompiler/reference/jak1/engine/game/game-info_REF.gc b/test/decompiler/reference/jak1/engine/game/game-info_REF.gc index ff42058c5a..eab437f156 100644 --- a/test/decompiler/reference/jak1/engine/game/game-info_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/game-info_REF.gc @@ -332,7 +332,7 @@ (set! (-> obj fuel-cell-deaths) 0) (set! (-> obj fuel-cell-pickup-time) (-> *display* base-frame-counter)) (set! (-> obj fuel-cell-time s5-1) (-> *display* base-frame-counter)) - (set! (-> obj fuel) (+ 1.0 (-> obj fuel))) + (+! (-> obj fuel) 1.0) (logior! (-> obj task-perm-list data s5-1 status) (entity-perm-status real-complete)) (get-task-control (the-as game-task s5-1)) (close-specific-task! (the-as game-task s5-1) (task-status need-resolution)) @@ -351,7 +351,7 @@ ) (when (and (>= buzz-index 0) (< buzz-index (the int (-> *FACT-bank* buzzer-max-default)))) (if (not (logtest? buzz-bits (ash 1 buzz-index))) - (set! (-> obj buzzer-total) (+ 1.0 (-> obj buzzer-total))) + (+! (-> obj buzzer-total) 1.0) ) (let ((t9-10 (method-of-object ctrl save-reminder))) (set! buzz-bits (logior buzz-bits (ash 1 buzz-index))) diff --git a/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc b/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc index 0afa44ad71..fa77f607cd 100644 --- a/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc @@ -962,7 +962,7 @@ (logior! (-> obj options) 2) (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 quad) (-> obj root-override trans quad)) - (set! (-> obj root-override trans y) (+ -5324.8 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -5324.8) (vector+float*! (-> obj target) (-> obj root-override trans) (-> obj root-override transv) 2.0) (set! (-> obj target-base quad) (-> obj target quad)) (let ((f30-0 (the float (sar (shl (the int (y-angle (-> obj root-override))) 48) 48)))) @@ -1006,7 +1006,7 @@ ) ) (('finalboss) - (set! (-> obj root-override trans y) (+ 4096.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) 4096.0) (set! (-> obj water) (new 'process 'water-control obj 0 0.0 8192.0 2048.0)) (set! (-> obj water flags) (water-flags wt01 wt04 wt07)) (set! (-> obj water height) 1977958.4) @@ -1140,7 +1140,7 @@ (when s5-0 (set! (-> obj target quad) (-> s5-0 root-override root-prim prim-core world-sphere quad)) (if (= (-> s5-0 type symbol) 'mother-spider) - (set! (-> obj options) (logand -2 (-> obj options))) + (logand! (-> obj options) -2) ) ) ) @@ -1175,7 +1175,7 @@ (set! (-> obj mode) 2) (set! (-> obj max-speed) (-> *TARGET-bank* yellow-projectile-speed)) (set! (-> obj update-velocity) projectile-update-velocity-space-wars) - (set! (-> obj root-override trans y) (+ -5324.8 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -5324.8) (vector+float*! (-> obj target) (-> obj root-override trans) (-> obj root-override transv) 2.0) (set! (-> obj target-base quad) (-> obj target quad)) (set! (-> obj mask) (the-as process-mask (logior (process-mask ambient) (-> obj mask)))) diff --git a/test/decompiler/reference/jak1/engine/gfx/math-camera_REF.gc b/test/decompiler/reference/jak1/engine/gfx/math-camera_REF.gc index 9283f66da9..38697e719d 100644 --- a/test/decompiler/reference/jak1/engine/gfx/math-camera_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/math-camera_REF.gc @@ -287,22 +287,22 @@ ) (set! (-> trans trans w) 1.0) (if (cpad-hold? pad-idx r1) - (set! (-> trans trans y) (+ 80.0 (-> trans trans y))) + (+! (-> trans trans y) 80.0) ) (if (cpad-hold? pad-idx r2) - (set! (-> trans trans y) (+ -80.0 (-> trans trans y))) + (+! (-> trans trans y) -80.0) ) (if (cpad-hold? pad-idx x) - (set! (-> trans rot x) (+ 546.13336 (-> trans rot x))) + (+! (-> trans rot x) 546.13336) ) (if (cpad-hold? pad-idx triangle) - (set! (-> trans rot x) (+ -546.13336 (-> trans rot x))) + (+! (-> trans rot x) -546.13336) ) (if (cpad-hold? pad-idx left) - (set! (-> trans rot y) (+ 546.13336 (-> trans rot y))) + (+! (-> trans rot y) 546.13336) ) (if (cpad-hold? pad-idx right) - (set! (-> trans rot y) (+ -546.13336 (-> trans rot y))) + (+! (-> trans rot y) -546.13336) ) trans ) diff --git a/test/decompiler/reference/jak1/engine/gfx/mood/mood_REF.gc b/test/decompiler/reference/jak1/engine/gfx/mood/mood_REF.gc index 4e288d09e5..e2898c41f1 100644 --- a/test/decompiler/reference/jak1/engine/gfx/mood/mood_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/mood/mood_REF.gc @@ -1086,7 +1086,7 @@ ) (let ((s5-4 (-> arg0 light-group 5))) (update-light-kit s5-4 (-> arg0 light-group 0 ambi) 0.5) - (set! (-> s5-4 ambi color x) (+ 0.25 (-> s5-4 ambi color x))) + (+! (-> s5-4 ambi color x) 0.25) (set! (-> s5-4 dir0 levels x) 1.0) ) (let ((s5-5 (-> arg0 light-group 6)) @@ -2511,7 +2511,7 @@ (cond ((or (nonzero? *lightning-time2*) (movie?)) (if (not (paused?)) - (set! (-> s4-1 lava-fade) (+ 0.2 (-> s4-1 lava-fade))) + (+! (-> s4-1 lava-fade) 0.2) ) (if (< 1.0 (-> s4-1 lava-fade)) (set! (-> s4-1 lava-fade) 1.0) @@ -2979,7 +2979,7 @@ ) (else (if (not (paused?)) - (set! (-> (the-as (pointer float) s5-1) 2) (+ -0.1 (-> (the-as (pointer float) s5-1) 2))) + (+! (-> (the-as (pointer float) s5-1) 2) -0.1) ) (set! (-> (the-as (pointer float) s5-1) 2) (fmax 0.0 (fmin 1.0 (-> (the-as (pointer float) s5-1) 2)))) ) diff --git a/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-mid_REF.gc b/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-mid_REF.gc index 40e4e88c88..aed11ed747 100644 --- a/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-mid_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-mid_REF.gc @@ -431,7 +431,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ 393216.0 (-> v1-0 x))) + (+! (-> v1-0 x) 393216.0) (let ((a3-5 v1-0) (t1-1 t0-1) ) @@ -447,7 +447,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 z) (+ 393216.0 (-> v1-0 z))) + (+! (-> v1-0 z) 393216.0) (let ((a3-9 v1-0) (t1-2 t0-1) ) @@ -463,7 +463,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ -393216.0 (-> v1-0 x))) + (+! (-> v1-0 x) -393216.0) (.lvf vf2 (&-> v1-0 quad)) (.lvf vf3 (&-> t0-1 quad)) ) diff --git a/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-transition_REF.gc b/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-transition_REF.gc index 31c0ed42f2..ea834cc354 100644 --- a/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-transition_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/ocean/ocean-transition_REF.gc @@ -440,7 +440,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ 98304.0 (-> v1-0 x))) + (+! (-> v1-0 x) 98304.0) (let ((a3-5 v1-0) (t1-1 t0-1) ) @@ -456,7 +456,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 z) (+ 98304.0 (-> v1-0 z))) + (+! (-> v1-0 z) 98304.0) (let ((a3-9 v1-0) (t1-2 t0-1) ) @@ -472,7 +472,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ -98304.0 (-> v1-0 x))) + (+! (-> v1-0 x) -98304.0) (.lvf vf2 (&-> v1-0 quad)) (.lvf vf3 (&-> t0-1 quad)) ) diff --git a/test/decompiler/reference/jak1/engine/gfx/shadow/shadow_REF.gc b/test/decompiler/reference/jak1/engine/gfx/shadow/shadow_REF.gc index eac46bf0ac..9a5d11f4d2 100644 --- a/test/decompiler/reference/jak1/engine/gfx/shadow/shadow_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/shadow/shadow_REF.gc @@ -75,7 +75,7 @@ (let ((s0-0 (new 'stack-no-clear 'vector)) (s1-0 (new 'stack-no-clear 'sparticle-cpuinfo)) ) - (set! (-> arg1 y) (+ 40.96 (-> arg1 y))) + (+! (-> arg1 y) 40.96) (set! (-> sv-144 x) (-> sv-96 z)) (set! (-> sv-144 y) 0.0) (set! (-> sv-144 z) (- (-> sv-96 x))) diff --git a/test/decompiler/reference/jak1/engine/level/level_REF.gc b/test/decompiler/reference/jak1/engine/level/level_REF.gc index 1ec341cda6..6fa2b85445 100644 --- a/test/decompiler/reference/jak1/engine/level/level_REF.gc +++ b/test/decompiler/reference/jak1/engine/level/level_REF.gc @@ -147,7 +147,7 @@ (when (zero? (-> obj vis-info (-> obj vis-self-index) ramdisk)) (let ((v1-10 (-> obj other vis-info (-> obj other vis-self-index)))) (when (and v1-10 (nonzero? (-> v1-10 ramdisk))) - (set! (-> v1-10 flags) (logand -1073741825 (-> v1-10 flags))) + (logand! (-> v1-10 flags) -1073741825) (set! (-> v1-10 ramdisk) (the-as uint 0)) 0 ) @@ -192,8 +192,8 @@ (set! (-> s5-0 current-vis-string) (the-as uint -1)) (set! (-> s5-0 from-bsp) (-> obj bsp)) (set! (-> s5-0 vis-bits) (-> obj vis-bits)) - (set! (-> s5-0 flags) (logand (the-as uint #xffffffff3fffffff) (-> s5-0 flags))) - (set! (-> s5-0 flags) (logior #x20000000 (-> s5-0 flags))) + (logand! (-> s5-0 flags) (the-as uint #xffffffff3fffffff)) + (logior! (-> s5-0 flags) #x20000000) (set! (-> s5-0 ramdisk) (the-as uint 0)) (set! (-> s5-0 string-block) (the-as uint #f)) (set! *vis-boot* #t) @@ -213,7 +213,7 @@ (set! (-> s4-0 current-vis-string) (the-as uint -1)) (set! (-> s4-0 from-bsp) #f) (set! (-> s4-0 vis-bits) (-> obj vis-bits)) - (set! (-> s4-0 flags) (logand (the-as uint #xffffffff1fffffff) (-> s4-0 flags))) + (logand! (-> s4-0 flags) (the-as uint #xffffffff1fffffff)) (set! *vis-boot* #t) ) (else @@ -730,7 +730,7 @@ ) ;; definition for method 12 of type level -;; WARN: Failed load: (set! v1-52 (l.wu (+ a0-29 -4))) at op 146 +;; ERROR: Failed load: (set! v1-52 (l.wu (+ a0-29 -4))) at op 146 (defmethod unload! level ((obj level)) (deactivate obj) (when (!= (-> obj status) 'inactive) @@ -1127,7 +1127,7 @@ ) ;; definition for function bg -;; WARN: Failed load: (set! v1-4 (l.wu (+ a0-8 -4))) at op 32 +;; ERROR: Failed load: (set! v1-4 (l.wu (+ a0-8 -4))) at op 32 (defun bg ((arg0 symbol)) (set! *cheat-mode* (if *debug-segment* 'debug @@ -1622,7 +1622,7 @@ (dotimes (a1-17 8) (let ((a2-18 (-> a0-44 vis-info a1-17))) (when a2-18 - (set! (-> a2-18 flags) (logand (the-as uint #xffffffff7fffffff) (-> a2-18 flags))) + (logand! (-> a2-18 flags) (the-as uint #xffffffff7fffffff)) (cond ((= a1-17 (-> a0-44 vis-self-index)) (set! (-> a2-18 from-bsp) (-> a0-44 bsp)) diff --git a/test/decompiler/reference/jak1/engine/load/decomp_REF.gc b/test/decompiler/reference/jak1/engine/load/decomp_REF.gc index 5ad632b717..13c25fd6f4 100644 --- a/test/decompiler/reference/jak1/engine/load/decomp_REF.gc +++ b/test/decompiler/reference/jak1/engine/load/decomp_REF.gc @@ -122,7 +122,7 @@ (if (check-busy *ramdisk-rpc*) (return #f) ) - (set! (-> vis-info flags) (logand -1073741825 (-> vis-info flags))) + (logand! (-> vis-info flags) -1073741825) (set! vis-buffer (-> obj vis-buffer)) (b! #t cfg-27 :delay (nop!)) (label cfg-6) @@ -132,7 +132,7 @@ (if (check-busy *ramdisk-rpc*) (return #f) ) - (set! (-> vis-info flags) (logand -1073741825 (-> vis-info flags))) + (logand! (-> vis-info flags) -1073741825) ) (set! (-> vis-info current-vis-string) desired-vis-str) (b! (logtest? #x20000000 (-> vis-info flags)) cfg-15 :delay (empty-form)) @@ -164,7 +164,7 @@ ) (return #f) ) - (set! (-> vis-info flags) (logior #x40000000 (-> vis-info flags))) + (logior! (-> vis-info flags) #x40000000) (ramdisk-load (the-as int vis-load-result) desired-vis-str (the-as uint 2048) (-> obj vis-buffer)) (set! result #f) (b! #t cfg-55 :delay (nop!)) diff --git a/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc b/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc index 25f86338a0..f2a6092a28 100644 --- a/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc +++ b/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc @@ -1254,7 +1254,7 @@ (let ((v1-1 (find-poly-fast obj arg0 arg1))) (when v1-1 (if arg2 - (set! (-> arg2 0) (logior (nav-control-flags navcf20) (-> arg2 0))) + (logior! (-> arg2 0) (nav-control-flags navcf20)) ) (set! s3-1 v1-1) (goto cfg-14) @@ -2645,9 +2645,9 @@ (set! (-> obj blocked-travel quad) (-> obj travel quad)) (let ((f0-0 (vector-xz-length (-> obj travel)))) (when (and (>= f30-0 f0-0) (< f0-0 204.8)) - (set! (-> obj flags) (logior (nav-control-flags navcf17) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf17)) (set! (-> obj block-time) (-> *display* base-frame-counter)) - (set! (-> obj block-count) (+ 1.0 (-> obj block-count))) + (+! (-> obj block-count) 1.0) (if (-> obj block-event) (send-event (the-as process-tree (-> obj process)) (the-as symbol (-> obj block-event)) obj) ) @@ -2692,7 +2692,7 @@ ) (cond ((or (vector= arg2 (-> obj target-pos)) (< (fabs f28-0) 364.0889)) - (set! (-> obj flags) (logior (nav-control-flags navcf21) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf21)) (set! (-> arg0 quad) (-> arg2 quad)) ) (else @@ -2706,7 +2706,7 @@ (logtest? (nav-control-flags navcf17) (-> obj flags)) (not (logtest? (-> obj flags) (nav-control-flags navcf10))) ) - (set! (-> obj flags) (logior (nav-control-flags navcf21) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf21)) (vector-! (-> obj travel) arg2 (-> arg1 trans)) (set! (-> arg0 quad) (-> arg2 quad)) ) @@ -3251,7 +3251,7 @@ ) ) (else - (set! (-> obj flags) (logior (nav-control-flags navcf19) (-> obj flags))) + (logior! (-> obj flags) (nav-control-flags navcf19)) ) ) ) diff --git a/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc b/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc index fac60516f0..49eddf5caf 100644 --- a/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc @@ -10,12 +10,8 @@ ) (or (= (-> self control unknown-surface00 name) 'run) (= (-> self control unknown-surface00 name) 'jump)) ) - (set! (-> self control unknown-surface01 target-speed) - (+ 20480.0 (-> self control unknown-surface01 target-speed)) - ) - (set! (-> self control unknown-surface01 transv-max) - (+ 20480.0 (-> self control unknown-surface01 transv-max)) - ) + (+! (-> self control unknown-surface01 target-speed) 20480.0) + (+! (-> self control unknown-surface01 transv-max) 20480.0) ) (let ((s5-0 (new-stack-vector0))) (vector-z-quaternion! s5-0 (-> self control unknown-quaternion00)) @@ -1378,7 +1374,7 @@ (let ((v1-8 (new 'stack-no-clear 'vector))) (vector+! v1-8 s3-0 s2-0) (vector-float*! v1-8 v1-8 0.5) - (set! (-> v1-8 y) (+ -6144.0 (-> v1-8 y))) + (+! (-> v1-8 y) -6144.0) (send-event *camera* 'ease-in 0.5 v1-8) ) (vector-segment-distance-point! (-> self control unknown-vector90) s3-0 s2-0 s5-0) @@ -1451,7 +1447,7 @@ (not (logtest? (-> self draw status) (draw-status hidden))) (begin (vector<-cspace! gp-0 (-> self node-list data 3)) - (set! (-> gp-0 y) (+ -5896.192 (-> gp-0 y))) + (+! (-> gp-0 y) -5896.192) (< (fabs (- (-> gp-0 y) (-> self control trans y))) 8192.0) ) ) @@ -2096,7 +2092,7 @@ (set! (-> self water flags) (water-flags wt04 wt05 wt06 wt07 wt22)) (reset-target-state #t) (set! (-> self control unknown-vector52 quad) (-> self control trans quad)) - (set! (-> self control unknown-vector52 y) (+ -819200.0 (-> self control unknown-vector52 y))) + (+! (-> self control unknown-vector52 y) -819200.0) (set! (-> self align) (new 'process 'align-control self)) (set! (-> self sidekick) (process-spawn sidekick :init init-sidekick :from *16k-dead-pool* :to self)) (set! (-> self manipy) (the-as (pointer manipy) #f)) diff --git a/test/decompiler/reference/jak1/engine/target/target-death_REF.gc b/test/decompiler/reference/jak1/engine/target/target-death_REF.gc index f3b7902f7b..b3cd9c811b 100644 --- a/test/decompiler/reference/jak1/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-death_REF.gc @@ -1107,7 +1107,7 @@ (when (if (and (nonzero? s5-1) (type-type? (-> s5-1 type) water-vol)) s5-1 ) - (set! (-> self state-flags) (logior (state-flags falling-into-pool-of-bad) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags falling-into-pool-of-bad)) (set! (-> self alt-cam-pos y) (+ 4096.0 (-> self water height))) ) ) diff --git a/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc b/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc index 992e0458d6..6fb17194c7 100644 --- a/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc @@ -103,7 +103,7 @@ (case (-> arg3 param 0) (('save) (set! (-> self alt-cam-pos quad) (-> self control trans quad)) - (set! (-> self state-flags) (logior (state-flags has-saved-position) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags has-saved-position)) (mem-copy! (the-as pointer (-> arg3 param 1)) (the-as pointer (-> self control trans)) 48) ) (('restore) @@ -148,7 +148,7 @@ (set! (-> self neck flex-blend) (the-as float (-> arg3 param 0))) (cond ((-> arg3 param 1) - (set! (-> self state-flags) (logior (state-flags looking-at-enemy) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags looking-at-enemy)) (set! (-> self alt-neck-pos quad) (-> (the-as vector (-> arg3 param 1)) quad)) (the-as object (look-at-enemy! (-> self neck) (-> self alt-neck-pos) 'force arg0)) ) diff --git a/test/decompiler/reference/jak1/engine/target/target-part_REF.gc b/test/decompiler/reference/jak1/engine/target/target-part_REF.gc index e01044cca2..c58f29a04a 100644 --- a/test/decompiler/reference/jak1/engine/target/target-part_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-part_REF.gc @@ -35,7 +35,7 @@ (let ((s3-0 (new 'stack-no-clear 'collide-tri-result)) (s5-0 *target*) ) - (set! (-> a1-1 y) (+ 4096.0 (-> a1-1 y))) + (+! (-> a1-1 y) 4096.0) (when (>= (fill-and-probe-using-y-probe *collide-cache* a1-1 diff --git a/test/decompiler/reference/jak1/engine/target/target2_REF.gc b/test/decompiler/reference/jak1/engine/target/target2_REF.gc index 8964d0eecd..6159b5565f 100644 --- a/test/decompiler/reference/jak1/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target2_REF.gc @@ -2516,7 +2516,7 @@ :trans (behavior () (cond ((< (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.5)) - (set! (-> self water flags) (logior (water-flags wt16) (-> self water flags))) + (logior! (-> self water flags) (water-flags wt16)) (logclear! (-> self control status) (cshape-moving-flags onsurf onground tsurf)) ) (else @@ -2538,7 +2538,7 @@ ((-> target-swim-stance exit)) (die-on-next-update! (-> self water bob)) (set! (-> self water align-offset) 0.0) - (set! (-> self water flags) (logior (water-flags wt16) (-> self water flags))) + (logior! (-> self water flags) (water-flags wt16)) (none) ) :code (behavior ((arg0 float) (arg1 float)) diff --git a/test/decompiler/reference/jak1/engine/target/target_REF.gc b/test/decompiler/reference/jak1/engine/target/target_REF.gc index 90ee5e5a2f..3c59404e32 100644 --- a/test/decompiler/reference/jak1/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target_REF.gc @@ -2868,7 +2868,7 @@ (set-forward-vel (the-as float 0.0)) (set! (-> self control unknown-surface00) *flop-land-mods*) (logclear! (-> *flop-land-mods* flags) (surface-flags allow-edge-grab)) - (set! (-> self state-flags) (logior (state-flags flop-hit-ground) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags flop-hit-ground)) (none) ) :exit target-exit diff --git a/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc b/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc index 3cd061f647..526feb579e 100644 --- a/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc @@ -253,8 +253,8 @@ (let ((v1-26 s4-1)) (set! (-> v1-26 width) (the float 428)) ) - (set! (-> s4-1 origin x) (+ -220.0 (-> s4-1 origin x))) - (set! (-> s4-1 origin y) (+ 40.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin x) -220.0) + (+! (-> s4-1 origin y) 40.0) (set! (-> s4-1 flags) (font-flags shadow kerning middle large)) (print-game-text-scaled (lookup-text! *common-text* (text-id total-collected) #f) @@ -262,7 +262,7 @@ s4-1 (the int (* 128.0 f30-0)) ) - (set! (-> s4-1 origin y) (+ 15.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin y) 15.0) (let ((s5-2 print-game-text-scaled)) (format (clear *temp-string*) "~D/~D" (the int (-> *game-info* money-total)) (-> obj total-nb-of-orbs)) (s5-2 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0))) @@ -332,8 +332,8 @@ (let ((v1-14 s4-1)) (set! (-> v1-14 width) (the float 428)) ) - (set! (-> s4-1 origin x) (+ -220.0 (-> s4-1 origin x))) - (set! (-> s4-1 origin y) (+ 40.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin x) -220.0) + (+! (-> s4-1 origin y) 40.0) (set! (-> s4-1 flags) (font-flags shadow kerning middle large)) (print-game-text-scaled (lookup-text! *common-text* (text-id total-collected) #f) @@ -341,7 +341,7 @@ s4-1 (the int (* 128.0 f30-0)) ) - (set! (-> s4-1 origin y) (+ 15.0 (-> s4-1 origin y))) + (+! (-> s4-1 origin y) 15.0) (let ((s5-2 print-game-text-scaled)) (format (clear *temp-string*) "~D/~D" (the int (-> *game-info* buzzer-total)) (-> obj total-nb-of-buzzers)) (s5-2 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0))) @@ -753,7 +753,7 @@ (let ((v1-87 arg0)) (set! (-> v1-87 scale) 0.5) ) - (set! (-> arg0 origin y) (+ 16.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 16.0) (set! (-> arg0 flags) (font-flags shadow kerning middle large)) (set! (-> arg0 origin x) (the float (- -73 (-> obj left-x-offset)))) (let ((v1-91 arg0)) @@ -791,7 +791,7 @@ ) (s0-4 *temp-string* arg0 #f s4-1 22) ) - (set! (-> arg0 origin y) (+ 1.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 1.0) (let ((v1-108 arg0)) (set! (-> v1-108 scale) 1.0) ) @@ -810,7 +810,7 @@ (let ((v1-116 arg0)) (set! (-> v1-116 scale) 0.5) ) - (set! (-> arg0 origin y) (+ 9.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 9.0) (set! (-> arg0 flags) (font-flags shadow kerning large)) (set! (-> arg0 origin x) (the float (- 85 (-> obj left-x-offset)))) (let ((s0-6 print-game-text)) @@ -849,10 +849,10 @@ ) (s0-8 *temp-string* arg0 #f s4-1 22) ) - (set! (-> arg0 origin y) (+ 15.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 15.0) ) (else - (set! (-> arg0 origin y) (+ 18.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 18.0) (set! (-> arg0 origin x) (the float (- 28 (-> obj left-x-offset)))) (let ((v1-131 arg0)) (set! (-> v1-131 scale) 0.8) @@ -896,18 +896,18 @@ ) ) (set! (-> obj particles s2-0 init-pos x) -320.0) - (set! (-> arg0 origin y) (+ 23.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 23.0) ) ) ) (else (set! (-> obj particles s2-0 init-pos x) -320.0) - (set! (-> arg0 origin y) (+ 12.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 12.0) (let ((v1-173 arg0)) (set! (-> v1-173 scale) 0.7) ) (print-game-text (lookup-text! *common-text* (text-id empty) #f) arg0 #f s4-1 22) - (set! (-> arg0 origin y) (+ 29.0 (-> arg0 origin y))) + (+! (-> arg0 origin y) 29.0) ) ) (+! s2-0 1) diff --git a/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc index 9597eefaf7..70557fc853 100644 --- a/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc @@ -1558,9 +1558,7 @@ ((>= (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) (+ 1.0 (-> s5-0 (-> obj option-index) param1)) ) - (set! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) - (+ -1.0 (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify)))) - ) + (+! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) -1.0) (set! v1-157 #t) ) ((< (-> s5-0 (-> obj option-index) param1) @@ -1655,9 +1653,7 @@ ((>= (+ -1.0 (-> s5-0 (-> obj option-index) param2)) (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) ) - (set! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) - (+ 1.0 (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify)))) - ) + (+! (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) 1.0) (set! v1-263 #t) ) ((< (-> (the-as (pointer float) (-> s5-0 (-> obj option-index) value-to-modify))) diff --git a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc index 5be7d2ced9..cb32d3c25e 100644 --- a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc @@ -78,7 +78,7 @@ ;; definition for method 11 of type windmill-one ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! windmill-one ((obj windmill-one) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -321,7 +321,7 @@ (+! f30-0 f28-0) ) (set! (-> s3-0 quad) (-> arg0 entity extra trans quad)) - (set! (-> s3-0 y) (+ -4096.0 (-> s3-0 y))) + (+! (-> s3-0 y) -4096.0) (spawn (-> arg0 part) s3-0) (suspend) 0 @@ -734,7 +734,7 @@ ;; definition for method 11 of type ecoventrock ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! ecoventrock ((obj ecoventrock) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) @@ -1004,7 +1004,7 @@ ;; definition for method 11 of type bladeassm ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! bladeassm ((obj bladeassm) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1553,7 +1553,7 @@ ;; definition for method 11 of type harvester ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! harvester ((obj harvester) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 5) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind background)) diff --git a/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc b/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc index 5eaa9ae51d..a01a94884a 100644 --- a/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc @@ -343,8 +343,8 @@ (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root-override trans quad)) (spawn (-> self part) gp-0) - (set! (-> gp-0 x) (+ 122880.0 (-> gp-0 x))) - (set! (-> gp-0 z) (+ 102400.0 (-> gp-0 z))) + (+! (-> gp-0 x) 122880.0) + (+! (-> gp-0 z) 102400.0) (spawn (-> self part) gp-0) ) ) diff --git a/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc b/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc index 9443361bab..e224916441 100644 --- a/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc @@ -553,7 +553,7 @@ lurkerworm-default-post-behavior ;; definition for method 11 of type lurkerworm ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! lurkerworm ((obj lurkerworm) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc b/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc index 1da657a1de..a4ba35edac 100644 --- a/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc @@ -260,7 +260,7 @@ (set! (-> self state-object) #f) (let ((gp-0 (-> self path-vector))) (eval-path-curve-div! (-> self path-dive0) gp-0 4.5 'interp) - (set! (-> gp-0 y) (+ -4505.6 (-> gp-0 y))) + (+! (-> gp-0 y) -4505.6) (let ((v1-8 (manipy-spawn gp-0 (-> self entity) *fuel-cell-sg* (new 'static 'vector :w 4915.2) :to self))) (set! (-> self fuel-cell) (ppointer->handle v1-8)) (if v1-8 @@ -881,7 +881,7 @@ (let ((a0-7 (handle->process (-> self fuel-cell)))) (when a0-7 (set! (-> gp-2 quad) (-> (the-as process-drawable a0-7) root trans quad)) - (set! (-> gp-2 y) (+ 8192.0 (-> gp-2 y))) + (+! (-> gp-2 y) 8192.0) (deactivate a0-7) ) ) diff --git a/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc b/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc index 507f6644a0..b5fcb74343 100644 --- a/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc @@ -421,7 +421,7 @@ (none) ) :code (behavior () - (set! (-> self root-override trans y) (+ 20480.0 (-> self root-override trans y))) + (+! (-> self root-override trans y) 20480.0) (move-to-ground (-> self root-override) 40960.0 40960.0 #t (collide-kind background)) (update-transforms! (-> self root-override)) (clear-collide-with-as (-> self root-override)) @@ -1437,7 +1437,7 @@ ) (set! (-> obj squall) (new 'process 'ambient-sound sound-seagull-squall (-> obj trans))) (set! (-> obj teleport-frames) 0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (go seagullflock-idle) (none) ) diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc index 37a4921d1c..47c3ca8345 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc @@ -1567,7 +1567,7 @@ (spawn (-> self part-mushroom) (-> self mushroom-pos)) ) (if (not (-> self mushroom)) - (set! (-> *palette-fade-controls* control 3 fade) (+ 0.3333 (-> *palette-fade-controls* control 3 fade))) + (+! (-> *palette-fade-controls* control 3 fade) 0.3333) ) (when (and *target* (>= 32768.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) (if (-> self mushroom) diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc index c51f59c76a..2cf0a6ffd8 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc @@ -378,7 +378,7 @@ (set! (-> obj alt-actor) (the-as entity-actor v1-9)) (set! (-> obj spawn-pos quad) (-> obj root-override trans quad)) (set! (-> s5-1 quad) (-> v1-9 extra trans quad)) - (set! (-> s5-1 y) (+ 81920.0 (-> s5-1 y))) + (+! (-> s5-1 y) 81920.0) (vector-! s4-0 (-> obj spawn-pos) s5-1) (set! (-> s4-0 y) 0.0) (vector-normalize! s4-0 1.0) diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc index b9bb04e48d..7779161e09 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc @@ -681,7 +681,7 @@ (set! (-> obj orig-trans quad) (-> obj root-overlay trans quad)) (quaternion-copy! (-> obj orig-quat) (-> obj root-overlay quat)) (set! (-> obj beam-end quad) (-> obj orig-trans quad)) - (set! (-> obj beam-end y) (+ -49152.0 (-> obj beam-end y))) + (+! (-> obj beam-end y) -49152.0) (rigid-body-platform-method-29 obj *citb-chain-plat-constants*) (set! (-> obj idle-offset) 0.0) (set! (-> obj float-offset) (res-lump-float (-> obj entity) 'height-info :default 4096.0)) diff --git a/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc b/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc index 45e20d1973..b2d46f51be 100644 --- a/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc @@ -867,7 +867,7 @@ battlecontroller-default-event-handler ;; definition for method 11 of type battlecontroller (defmethod init-from-entity! battlecontroller ((obj battlecontroller) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (battlecontroller-method-27 obj) diff --git a/test/decompiler/reference/jak1/levels/common/blocking-plane_REF.gc b/test/decompiler/reference/jak1/levels/common/blocking-plane_REF.gc index 99a314653c..c625cafabe 100644 --- a/test/decompiler/reference/jak1/levels/common/blocking-plane_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/blocking-plane_REF.gc @@ -73,7 +73,7 @@ (let ((s4-2 (new-stack-matrix0))) (vector+! (-> self root trans) s5-0 gp-0) (vector-float*! (-> self root trans) (-> self root trans) 0.5) - (set! (-> self root trans y) (+ 61440.0 (-> self root trans y))) + (+! (-> self root trans y) 61440.0) (vector-! (the-as vector (-> s4-2 vector)) gp-0 s5-0) (set! (-> self root scale x) (* 0.00024414062 (vector-normalize-ret-len! (the-as vector (-> s4-2 vector)) 1.0)) diff --git a/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc index 49f6728938..bee3dfb357 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc @@ -511,7 +511,7 @@ (setup-from-to-duration! (-> self traj) (-> self collide-info trans) (-> self appear-dest) 225.0 -9.102222) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self collide-info trans quad)) - (set! (-> gp-0 y) (+ 8192.0 (-> gp-0 y))) + (+! (-> gp-0 y) 8192.0) (process-spawn part-tracker :init part-tracker-init @@ -850,7 +850,7 @@ ) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) - (set! (-> gp-0 y) (+ -16384.0 (-> gp-0 y))) + (+! (-> gp-0 y) -16384.0) (process-spawn green-eco-lurker (-> self entity) self gp-0 :to self) ) (+! (-> self num-spawned) 1) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc index eb36169cb7..b3849c5409 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc @@ -204,7 +204,7 @@ ) ) (set! (-> self particles 1 trans quad) (-> self root trans quad)) - (set! (-> self particles 1 trans y) (+ 24576.0 (-> self particles 1 trans y))) + (+! (-> self particles 1 trans y) 24576.0) (let ((s5-1 (-> arg3 param 1))) (set! (-> self particles 2 kind) (the-as basic (if (and (nonzero? s5-1) (type-type? (rtype-of s5-1) sparticle-launch-group)) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc index 082be5c93a..0b454b0065 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc @@ -397,7 +397,7 @@ (-> self root-override trans) :to *entity-pool* ) - (set! (-> self next-tick) (+ -0.06 (-> self next-tick))) + (+! (-> self next-tick) -0.06) (sound-play "robo-warning") ) ) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc index cea84e7bf9..e054ed5fb6 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc @@ -324,10 +324,10 @@ (set! (-> v1-23 quad) (-> (the-as process-drawable a0-16) root trans quad)) (cond ((< (-> v1-23 y) (+ -204.8 f0-10)) - (set! (-> v1-23 y) (+ 20.48 (-> v1-23 y))) + (+! (-> v1-23 y) 20.48) ) ((< (+ 204.8 f0-10) (-> v1-23 y)) - (set! (-> v1-23 y) (+ -20.48 (-> v1-23 y))) + (+! (-> v1-23 y) -20.48) ) ) (send-event a0-16 'move-to v1-23) @@ -661,7 +661,7 @@ (+! (-> self children-spawned) 1) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self entity extra trans quad)) - (set! (-> gp-0 y) (+ 81920.0 (-> gp-0 y))) + (+! (-> gp-0 y) 81920.0) (set! (-> self white-eco) (ppointer->handle (process-spawn light-eco-mother (-> self entity) gp-0 :to self))) ) ) @@ -1442,7 +1442,7 @@ (vector-! s5-0 (-> self entity extra trans) s5-0) (dotimes (v1-53 6) (vector+! (the-as vector (-> arg0 info v1-53)) (the-as vector (-> arg0 info v1-53)) s5-0) - (set! (-> arg0 info v1-53 dest y) (+ 2048.0 (-> arg0 info v1-53 dest y))) + (+! (-> arg0 info v1-53 dest y) 2048.0) ) ) (none) @@ -1955,7 +1955,7 @@ (let ((s2-0 (new 'stack-no-clear 'vector))) (vector<-cspace! gp-0 (-> self node-list data 68)) (set! (-> s2-0 quad) (-> self entity extra trans quad)) - (set! (-> s2-0 y) (+ -40960.0 (-> s2-0 y))) + (+! (-> s2-0 y) -40960.0) (vector+! s2-0 s2-0 arg0) (process-spawn greenshot gp-0 s2-0 arg1 arg2 :to self) ) diff --git a/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc index 4b5145f0b9..68331a295d 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc @@ -621,7 +621,7 @@ ) ) (spawn (-> self part) *zero-vector*) - (set! (-> self credit-fade) (+ -0.008333334 (-> self credit-fade))) + (+! (-> self credit-fade) -0.008333334) ) (none) ) @@ -1115,7 +1115,7 @@ (set! (-> obj particle v1-37 active) #f) ) (set! (-> obj palette-val) 0.0) - (set! (-> obj root-override trans y) (+ 2048.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) 2048.0) (if (not (should-display? obj)) (go (method-of-object obj hidden)) (go (method-of-object obj idle)) diff --git a/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc b/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc index a205f99f18..3313e151ed 100644 --- a/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc +++ b/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc @@ -2089,7 +2089,7 @@ (rot->dir-targ! (-> self control)) (ja-post) (vector<-cspace! gp-0 (-> self node-list data 3)) - (set! (-> gp-0 y) (+ -5896.192 (-> gp-0 y))) + (+! (-> gp-0 y) -5896.192) (move-to-point! (-> self control) gp-0) ) (send-event *camera* 'ease-in) diff --git a/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc b/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc index 25c5da41f3..91e53f35eb 100644 --- a/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/darkvine_REF.gc @@ -300,7 +300,7 @@ ;; definition for method 11 of type darkvine ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! darkvine ((obj darkvine) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 4) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) diff --git a/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc b/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc index d158c4220a..6d8392365b 100644 --- a/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc @@ -2098,7 +2098,7 @@ (let ((s5-0 (eval-path-curve-div! (-> obj path) (-> obj paddle-pos) 6.5 'interp)) (s4-0 (path-control-method-12 (-> obj path) (new-stack-vector0) 6.5)) ) - (set! (-> s5-0 y) (+ 2457.6 (-> s5-0 y))) + (+! (-> s5-0 y) 2457.6) (vector-normalize! (vector-rotate-y! s4-0 s4-0 16384.0) (-> *FISHER-bank* width)) (vector-! (the-as vector (-> obj paddle-end)) s5-0 s4-0) (vector+! (the-as vector (&-> obj stack 288)) s5-0 s4-0) diff --git a/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc b/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc index aa0408327f..a365e37c38 100644 --- a/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc @@ -56,7 +56,7 @@ nav-enemy-default-event-handler (f30-0 61440.0) ) (set! (-> s5-0 quad) (-> arg0 quad)) - (set! (-> s5-0 y) (+ 20480.0 (-> s5-0 y))) + (+! (-> s5-0 y) 20480.0) (let ((f0-2 (fill-and-probe-using-y-probe *collide-cache* s5-0 diff --git a/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc b/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc index 129da0715a..68d00f448b 100644 --- a/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc @@ -1565,7 +1565,7 @@ (+! (-> self tilt) (-> v1-10 1)) ) (else - (set! (-> self turn) (+ 910.2222 (-> self turn))) + (+! (-> self turn) 910.2222) ) ) ) @@ -1961,7 +1961,7 @@ :code (behavior () (let ((gp-0 (new-stack-vector0))) (set! (-> gp-0 quad) (-> self root-override trans quad)) - (set! (-> gp-0 y) (+ 49152.0 (-> gp-0 y))) + (+! (-> gp-0 y) 49152.0) (loop (draw-power-beam gp-0 (-> self beam-end)) (update! (-> self sound)) diff --git a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc index 94196749d7..135ace7e73 100644 --- a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc @@ -92,7 +92,7 @@ ;; definition for method 11 of type logtrap ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! logtrap ((obj logtrap) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -164,7 +164,7 @@ ;; definition for method 11 of type towertop ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! towertop ((obj towertop) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root-override) (new 'process 'trsq)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -241,7 +241,7 @@ ;; definition for method 11 of type lurkerm-tall-sail ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! lurkerm-tall-sail ((obj lurkerm-tall-sail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -347,7 +347,7 @@ ;; definition for method 11 of type lurkerm-short-sail ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! lurkerm-short-sail ((obj lurkerm-short-sail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -478,7 +478,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! lurkerm-piston ((obj lurkerm-piston) (arg0 entity-actor)) (local-vars (sv-16 res-tag) (sv-32 res-tag)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -866,7 +866,7 @@ (logior! (-> self mask) (process-mask actor-pause)) (loop (if (not (movie?)) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) ) (cond ((and *target* (>= 61440.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) @@ -896,7 +896,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! precurbridge ((obj precurbridge) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1340,7 +1340,7 @@ ;; definition for method 11 of type jngpusher ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! jngpusher ((obj jngpusher) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc b/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc index 87935aaa02..edda439173 100644 --- a/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc @@ -284,7 +284,7 @@ junglesnake-default-event-handler (set! (-> s4-2 w) 1.0) (let ((s1-2 (new 'stack-no-clear 'vector))) (vector-! s1-2 (target-pos 0) (-> s2-1 vector 3)) - (set! (-> s1-2 y) (+ 9011.2 (-> s1-2 y))) + (+! (-> s1-2 y) 9011.2) (vector-normalize! s1-2 1.0) (let ((s0-2 (new 'stack-no-clear 'vector)) (s3-4 (new 'stack-no-clear 'vector)) @@ -592,7 +592,7 @@ junglesnake-default-event-handler (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root-override trans quad)) (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> s5-0 y) (+ 131072.0 (-> s5-0 y))) + (+! (-> s5-0 y) 131072.0) (ja-no-eval :group! junglesnake-give-up-ja :num! (seek! max 0.5) :frame-num 0.0) (until (ja-done? 0) (let* ((f0-6 (ja-frame-num 0)) @@ -737,7 +737,7 @@ junglesnake-default-event-handler ;; definition for method 11 of type junglesnake ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! junglesnake ((obj junglesnake) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 9) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) diff --git a/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc index d956db13c7..bfe4a4b348 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/plat-flip_REF.gc @@ -123,7 +123,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! plat-flip ((obj plat-flip) (arg0 entity-actor)) (local-vars (sv-16 res-tag) (sv-32 res-tag) (sv-48 res-tag)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc b/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc index b76d52e047..62b62ea62c 100644 --- a/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc +++ b/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc @@ -924,7 +924,7 @@ ;; definition for function energyball-init (defun energyball-init ((arg0 energyball)) - (set! (-> arg0 mask) (logior (process-mask attackable) (-> arg0 mask))) + (logior! (-> arg0 mask) (process-mask attackable)) (let ((s5-0 (new 'process 'collide-shape-moving arg0 (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1264,10 +1264,10 @@ ) (cond ((< 65536.0 (-> self y-rotation)) - (set! (-> self y-rotation) (+ -65536.0 (-> self y-rotation))) + (+! (-> self y-rotation) -65536.0) ) ((< (-> self y-rotation) 0.0) - (set! (-> self y-rotation) (+ 65536.0 (-> self y-rotation))) + (+! (-> self y-rotation) 65536.0) ) ) (let ((gp-0 (new 'stack-no-clear 'matrix))) diff --git a/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc b/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc index c15d0d71c9..7614ab1de6 100644 --- a/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc @@ -552,7 +552,7 @@ ) (eval-path-curve! (-> self path) (-> self root-override trans) f30-0 'interp) (+! (-> self root-override trans y) (* 4096.0 (-> self y-offset osc value))) - (set! (-> self root-override trans y) (+ -4096.0 (-> self root-override trans y))) + (+! (-> self root-override trans y) -4096.0) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (new 'stack-no-clear 'matrix)) ) @@ -596,7 +596,7 @@ (sound-play "dcrate-break") (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root-override trans quad)) - (set! (-> gp-1 y) (+ -49152.0 (-> gp-1 y))) + (+! (-> gp-1 y) -49152.0) (process-spawn part-tracker :init part-tracker-init @@ -762,7 +762,7 @@ (set-params! (-> self down-tgt) 300 600 0.05 0.9) (darkecobarrel-mover-pos) (logclear! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask attackable) (-> self mask))) + (logior! (-> self mask) (process-mask attackable)) (go darkecobarrel-mover-move) (none) ) @@ -1167,7 +1167,7 @@ (sound-play "dcrate-break") (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root-override trans quad)) - (set! (-> gp-1 y) (+ -73728.0 (-> gp-1 y))) + (+! (-> gp-1 y) -73728.0) (process-spawn part-tracker :init part-tracker-init @@ -1221,7 +1221,7 @@ ;; definition for method 11 of type chainmine ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! chainmine ((obj chainmine) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1495,7 +1495,7 @@ (set! (-> v1-2 waveform) ripple-for-lavatube-lava) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt25) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt25)) (set! (-> obj attack-event) 'heat) (none) ) diff --git a/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc b/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc index e85e61bd5f..ca5eaed0f1 100644 --- a/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc @@ -315,7 +315,7 @@ baby-spider-default-event-handler (defmethod nav-enemy-method-52 baby-spider ((obj baby-spider) (arg0 vector)) (+! (-> obj wiggle-angle) (-> obj delta-wiggle-angle)) (if (< 65536.0 (-> obj wiggle-angle)) - (set! (-> obj wiggle-angle) (+ -65536.0 (-> obj wiggle-angle))) + (+! (-> obj wiggle-angle) -65536.0) ) (let* ((v1-3 (-> obj collide-info trans)) (a1-2 (vector-! (new 'stack-no-clear 'vector) v1-3 arg0)) @@ -786,7 +786,7 @@ baby-spider-default-event-handler (forward-up->quaternion (-> self collide-info quat) arg2 *up-vector*) (vector-float*! (-> self collide-info scale) *identity-vector* 0.63) (vector-float*! (-> self collide-info transv) arg2 8192.0) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self entity) (-> arg0 entity)) (nav-enemy-method-48 self) (set! (-> self enemy-info pickup-type) (the-as pickup-type (-> arg3 pickup))) @@ -822,7 +822,7 @@ baby-spider-default-event-handler (set! (-> obj event-death) #f) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logior! (-> obj mask) (process-mask actor-pause)) (set! (-> obj nav) (new 'process 'nav-control (-> obj collide-info) 24 40960.0)) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) diff --git a/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc b/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc index a1bb5f5999..24f2dfd030 100644 --- a/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc @@ -603,9 +603,9 @@ (s4-0 (new 'stack-no-clear 'vector)) ) (set! (-> s5-0 quad) (-> obj root-override trans quad)) - (set! (-> s5-0 y) (+ 6144.0 (-> s5-0 y))) + (+! (-> s5-0 y) 6144.0) (set! (-> s3-0 quad) (-> (target-pos 0) quad)) - (set! (-> s3-0 y) (+ 6144.0 (-> s3-0 y))) + (+! (-> s3-0 y) 6144.0) (when (>= (-> obj explode-danger-radius) (vector-vector-distance s5-0 s3-0)) (vector-! s4-0 s3-0 s5-0) (let ((t2-0 (new 'stack-no-clear 'collide-tri-result))) @@ -656,7 +656,7 @@ (set-vector! (-> obj unlit-color-emissive) 0.0 0.0 0.0 0.0) (set-vector! (-> obj lit-color-mult) 1.0 1.0 1.0 1.0) (set-vector! (-> obj lit-color-emissive) 1.0 1.0 1.0 0.0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s3-0 prim-core collide-as) (collide-kind wall-object)) @@ -673,7 +673,7 @@ ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *dark-crystal-sg* '()) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (set! (-> obj draw color-mult quad) (-> obj unlit-color-mult quad)) (set! (-> obj draw color-emissive quad) (-> obj unlit-color-emissive quad)) (set! (-> obj underwater?) (= (res-lump-value arg0 'mode uint128) 1)) diff --git a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc index 04ac230f2d..1851b71fc0 100644 --- a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc @@ -435,7 +435,7 @@ ) (when (< 16384.0 (fabs (deg- (-> obj facing-ry) (-> obj path-ry)))) (set! (-> obj path-dir) (- (-> obj path-dir))) - (set! (-> obj path-ry) (+ 32768.0 (-> obj path-ry))) + (+! (-> obj path-ry) 32768.0) ) ) ) @@ -1052,7 +1052,7 @@ (set! (-> obj started-chasing-time) 0) (set! (-> obj player-attack-id) (the-as uint 0)) (set! (-> obj ambient-drilling-u) -1.0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc b/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc index b8703dc83f..1aca3df9b9 100644 --- a/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc @@ -426,7 +426,7 @@ ;; INFO: Return type mismatch object vs none. (defbehavior gnawer-falling-segment-init-by-other gnawer-falling-segment ((arg0 gnawer) (arg1 vector) (arg2 vector)) (set! (-> self entity) (-> arg0 entity)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg1 quad)) (vector-identity! (-> self root scale)) @@ -755,7 +755,7 @@ (dotimes (s5-0 3) (when (> (-> obj hit-points) 0) (+! (-> obj hit-points) -1) - (set! (-> obj speed) (+ 4096.0 (-> obj speed))) + (+! (-> obj speed) 4096.0) (when (> (-> obj hit-points) 0) (set! (-> obj show-damage?) #t) (let ((s4-0 (+ (-> obj hit-points) 2))) @@ -1546,7 +1546,7 @@ (let ((f0-40 (res-lump-float (-> obj entity) 'rotoffset))) (quaternion-rotate-y! (-> obj root-override quat) (-> obj root-override quat) f0-40) ) - (set! (-> obj root-override trans y) (+ -2048.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -2048.0) (set! sv-16 (new 'static 'res-tag)) (let ((v1-81 (res-lump-data arg0 'trans-offset (pointer float) :tag-ptr (& sv-16)))) (when v1-81 diff --git a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc index c42f07826c..22e58b9fbc 100644 --- a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc @@ -358,7 +358,7 @@ ;; definition for method 11 of type cavetrapdoor ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! cavetrapdoor ((obj cavetrapdoor) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -793,7 +793,7 @@ ;; definition for method 11 of type cavespatula ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! cavespatula ((obj cavespatula) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -918,7 +918,7 @@ ;; definition for method 11 of type cavespatulatwo ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! cavespatulatwo ((obj cavespatulatwo) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1300,7 +1300,7 @@ (local-vars (v1-43 int) (sv-16 res-tag)) (set! (-> obj prev-frame-num) 10000.0) (set! (-> obj last-update-bounce-time) 0) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc index 1f4da7a609..3282f0756f 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc @@ -188,7 +188,7 @@ (a2-1 (new 'stack-no-clear 'vector)) ) (set! (-> a1-1 quad) (-> obj root-override trans quad)) - (set! (-> a1-1 y) (+ 1228.8 (-> a1-1 y))) + (+! (-> a1-1 y) 1228.8) (set-vector! a2-1 0.0 -61440.0 0.0 1.0) (cond ((>= (fill-and-probe-using-line-sphere @@ -530,8 +530,8 @@ (set-vector! (-> self root-override scale) 0.3 0.3 0.3 1.0) (quaternion-copy! (-> self root-override quat) (-> self parent-override 0 root-override quat)) (logior! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) - (set! (-> self mask) (logior (process-mask attackable) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) + (logior! (-> self mask) (process-mask attackable)) (initialize-skeleton self *mother-spider-egg-unbroken-sg* '()) (setup-lods! (-> self broken-look) *mother-spider-egg-broken-sg* (-> self draw art-group) (-> self entity)) (set! (-> self draw shadow-ctrl) (new 'process 'shadow-control 0.0 0.0 614400.0 (the-as float 60) 245760.0)) diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc index 9cc69e59ac..b1705eb100 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc @@ -334,7 +334,7 @@ (logclear! (-> obj mask) (process-mask enemy)) (logclear! (-> obj mask) (process-mask crate)) (logclear! (-> obj mask) (process-mask attackable)) - (set! (-> obj mask) (logior (process-mask projectile) (-> obj mask))) + (logior! (-> obj mask) (process-mask projectile)) 0 (none) ) @@ -351,7 +351,7 @@ (set! (-> obj attack-mode) 'mother-spider-proj) (set! (-> obj timeout) (seconds 4)) (set! (-> obj target quad) (-> (target-pos 0) quad)) - (set! (-> obj target y) (+ 4915.2 (-> obj target y))) + (+! (-> obj target y) 4915.2) (set! (-> obj target-base quad) (-> obj target quad)) (set! (-> obj sound-id) (sound-play "mother-track")) (sound-play "mother-fire") @@ -370,7 +370,7 @@ ) (let ((gp-0 (-> obj target))) (set! (-> gp-0 quad) (-> (target-pos 0) quad)) - (set! (-> gp-0 y) (+ 4915.2 (-> gp-0 y))) + (+! (-> gp-0 y) 4915.2) (let ((f0-2 (vector-vector-distance gp-0 (-> obj root-override trans))) (a2-0 (new 'stack-no-clear 'vector)) ) diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc index 439f7f9035..6498e1e2b4 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc @@ -180,7 +180,7 @@ ;; INFO: Return type mismatch object vs none. (defbehavior mother-spider-leg-init-by-other mother-spider-leg ((arg0 mother-spider) (arg1 vector) (arg2 vector) (arg3 vector)) (set! (-> self entity) (-> arg0 entity)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg1 quad)) (vector-identity! (-> self root scale)) @@ -258,7 +258,7 @@ ) (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 1.0) - (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) + (+! (-> self thread-vel) -40960.0) (if (mother-spider-method-21 self gp-0 102400.0 #t) (go mother-spider-die) ) @@ -275,7 +275,7 @@ ) (set! (-> gp-1 y) 0.0) (vector-normalize! gp-1 1.0) - (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) + (+! (-> self thread-vel) -40960.0) (if (mother-spider-method-21 self gp-1 102400.0 #t) (go mother-spider-die) ) @@ -297,7 +297,7 @@ ) (set! (-> gp-2 y) 0.0) (vector-normalize! gp-2 1.0) - (set! (-> self thread-vel) (+ -8192.0 (-> self thread-vel))) + (+! (-> self thread-vel) -8192.0) (mother-spider-method-21 self gp-2 40960.0 #f) ) ) @@ -413,7 +413,7 @@ ) (set! (-> a1-0 quad) (-> obj root-override trans quad)) (set-vector! a2-0 0.0 -81920.0 0.0 1.0) - (set! (-> a1-0 y) (+ -8192.0 (-> a1-0 y))) + (+! (-> a1-0 y) -8192.0) (cond ((>= (fill-and-probe-using-line-sphere *collide-cache* @@ -1089,7 +1089,7 @@ (when (sphere-in-view-frustum? (the-as sphere gp-2)) (vector<-cspace! gp-2 (-> self node-list data 21)) (set! (-> s5-2 quad) (-> (target-pos 0) quad)) - (set! (-> s5-2 y) (+ 4915.2 (-> s5-2 y))) + (+! (-> s5-2 y) 4915.2) (cond ((< 24576.0 (vector-vector-distance gp-2 s5-2)) (go mother-spider-spit) @@ -1198,7 +1198,7 @@ ) (vector<-cspace! s4-0 (-> self node-list data 21)) (set! (-> s5-0 quad) (-> (target-pos 0) quad)) - (set! (-> s5-0 y) (+ 4915.2 (-> s5-0 y))) + (+! (-> s5-0 y) 4915.2) (when (< 24576.0 (vector-vector-distance s5-0 s4-0)) (let ((a2-1 (-> self node-list data 19 bone transform))) (set-vector! s2-0 0.0 0.0 1.0 1.0) @@ -1417,7 +1417,7 @@ (s3-2 (new 'stack-no-clear 'collide-tri-result)) ) (set! (-> a1-12 quad) (-> arg0 quad)) - (set! (-> a1-12 y) (+ 8192.0 (-> a1-12 y))) + (+! (-> a1-12 y) 8192.0) (cond ((>= (fill-and-probe-using-line-sphere *collide-cache* @@ -1503,7 +1503,7 @@ (vector-! s2-0 s2-0 s3-0) (vector-normalize! s2-0 1.0) (set! (-> s1-0 quad) (-> s2-0 quad)) - (set! (-> s1-0 y) (+ 0.3 (-> s1-0 y))) + (+! (-> s1-0 y) 0.3) (vector-normalize! s1-0 1.0) (process-spawn mother-spider-leg self s3-0 s2-0 s1-0 :to self) ) @@ -1706,7 +1706,7 @@ (set! (-> obj activate-z-thresh) -12288.0) (set! (-> obj deactivate-z-thresh) 24985.6) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 9) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind mother-spider)) @@ -1834,8 +1834,8 @@ (set! (-> obj deactivate-xz-dist) (-> (the-as (pointer float) v0-31) 7)) ) (else - (set! (-> obj thread-min-trans y) (+ 28672.0 (-> obj thread-min-trans y))) - (set! (-> obj anchor-trans y) (+ 204800.0 (-> obj anchor-trans y))) + (+! (-> obj thread-min-trans y) 28672.0) + (+! (-> obj anchor-trans y) 204800.0) (set! (-> obj max-spit-xz-dist) 81920.0) (set! (-> obj activate-xz-dist) 143360.0) (set! (-> obj deactivate-xz-dist) 163430.4) diff --git a/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc b/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc index 313fa966d8..7334081a6c 100644 --- a/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/spiderwebs_REF.gc @@ -136,7 +136,7 @@ ;; definition for method 11 of type spiderwebs ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! spiderwebs ((obj spiderwebs) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc index 60f3330464..9ddb86b0d6 100644 --- a/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc @@ -1031,7 +1031,7 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defbehavior balloonlurker-pilot-init-by-other balloonlurker-pilot ((arg0 balloonlurker)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (balloonlurker-pilot-method-20 self) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self fact) @@ -1172,7 +1172,7 @@ ;; INFO: Return type mismatch object vs none. ;; WARN: Function (method 11 balloonlurker) has a return type of none, but the expression builder found a return statement. (defmethod init-from-entity! balloonlurker ((obj balloonlurker) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc index 8ef6b1e907..e87a8f2fb6 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc @@ -640,7 +640,7 @@ ;; INFO: Return type mismatch object vs none. ;; WARN: Function (method 11 keg-conveyor) has a return type of none, but the expression builder found a return statement. (defmethod init-from-entity! keg-conveyor ((obj keg-conveyor) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy death) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy death)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *keg-conveyor-sg* '()) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc index 56322fb629..5afd029d52 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc @@ -1110,7 +1110,7 @@ ;; definition for method 11 of type boatpaddle ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! boatpaddle ((obj boatpaddle) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *boatpaddle-sg* '()) @@ -1183,7 +1183,7 @@ ;; definition for method 11 of type windturbine ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! windturbine ((obj windturbine) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -1365,7 +1365,7 @@ ;; definition for method 11 of type mis-bone-bridge ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! mis-bone-bridge ((obj mis-bone-bridge) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1548,7 +1548,7 @@ ;; definition for method 20 of type breakaway (defmethod init! breakaway ((obj breakaway) (arg0 res-lump) (arg1 int)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc index 1aa47ad05b..3e499f1a33 100644 --- a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc @@ -55,7 +55,7 @@ (set! (-> arg0 min) arg1) (set! (-> arg0 range) (the float (sar (shl (the int (- arg2 arg1)) 48) 48))) (if (< (-> arg0 range) 0.0) - (set! (-> arg0 range) (+ 65536.0 (-> arg0 range))) + (+! (-> arg0 range) 65536.0) ) (set! (-> arg0 value) (* 0.5 (-> arg0 range))) (set! (-> arg0 speed) arg3) @@ -1034,7 +1034,7 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defbehavior mistycannon-missile-init-by-other mistycannon-missile ((arg0 mistycannon-init-data) (arg1 entity-actor)) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self entity) arg1) (let ((s5-0 (new 'process 'collide-shape-moving self (collide-list-enum hit-by-player)))) @@ -1843,7 +1843,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! mistycannon ((obj mistycannon) (arg0 entity-actor)) (local-vars (sv-16 res-tag) (sv-32 res-tag) (sv-48 res-tag)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/misty/mud_REF.gc b/test/decompiler/reference/jak1/levels/misty/mud_REF.gc index b221baa6a4..8aa1f1c317 100644 --- a/test/decompiler/reference/jak1/levels/misty/mud_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/mud_REF.gc @@ -53,7 +53,7 @@ (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt18) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt18)) (let ((gp-0 (new 'process 'ripple-control))) (set! (-> obj draw ripple) gp-0) (set! (-> gp-0 global-scale) 3072.0) diff --git a/test/decompiler/reference/jak1/levels/misty/muse_REF.gc b/test/decompiler/reference/jak1/levels/misty/muse_REF.gc index d59426a369..52f53f657d 100644 --- a/test/decompiler/reference/jak1/levels/misty/muse_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/muse_REF.gc @@ -525,7 +525,7 @@ nav-enemy-default-event-handler ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! muse ((obj muse) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc index d5e7f8830c..dc324810ba 100644 --- a/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc @@ -960,7 +960,7 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! quicksandlurker ((obj quicksandlurker) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 3) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) @@ -998,7 +998,7 @@ (set! (-> obj root-override) s4-0) ) (process-drawable-from-entity! obj arg0) - (set! (-> obj root-override trans y) (+ -2048.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -2048.0) (set! (-> obj original-position quad) (-> obj root-override trans quad)) (set! (-> obj theta-angle) (rand-vu-float-range 0.0 65536.0)) (set! (-> obj bob-angle) (rand-vu-float-range 0.0 65536.0)) diff --git a/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc b/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc index da1e53205d..d2c8ecc0e1 100644 --- a/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc @@ -395,7 +395,7 @@ (a2-0 (new 'stack-no-clear 'vector)) ) (set! (-> a1-1 quad) (-> obj root trans quad)) - (set! (-> a1-1 y) (+ -8192.0 (-> a1-1 y))) + (+! (-> a1-1 y) -8192.0) (set-vector! a2-0 0.0 -81920.0 0.0 1.0) (when (>= (fill-and-probe-using-line-sphere *collide-cache* @@ -584,7 +584,7 @@ ) ) (+! (-> self root trans y) (-> self y-offset)) - (set! (-> self root trans y) (+ 12288.0 (-> self root trans y))) + (+! (-> self root trans y) 12288.0) (none) ) diff --git a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc index 13adf5d829..d0f60b55c9 100644 --- a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc @@ -932,7 +932,7 @@ ;; definition for method 31 of type ogre-isle-b ;; INFO: Return type mismatch int vs none. (defmethod rigid-body-platform-method-31 ogre-isle-b ((obj ogre-isle-b)) - (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) + (+! (-> obj root-overlay trans x) -8192.0) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) ((the-as (function ogre-isle none) (find-parent-method ogre-isle-b 31)) obj) @@ -943,7 +943,7 @@ ;; definition for method 31 of type ogre-isle-c ;; INFO: Return type mismatch int vs none. (defmethod rigid-body-platform-method-31 ogre-isle-c ((obj ogre-isle-c)) - (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) + (+! (-> obj root-overlay trans x) -8192.0) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) ((the-as (function ogre-isle none) (find-parent-method ogre-isle-c 31)) obj) @@ -954,8 +954,8 @@ ;; definition for method 31 of type ogre-isle-d ;; INFO: Return type mismatch int vs none. (defmethod rigid-body-platform-method-31 ogre-isle-d ((obj ogre-isle-d)) - (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) - (set! (-> obj root-overlay trans z) (+ -8192.0 (-> obj root-overlay trans z))) + (+! (-> obj root-overlay trans x) -8192.0) + (+! (-> obj root-overlay trans z) -8192.0) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 22528.0) (initialize-skeleton obj *ogre-isle-d-sg* '()) ((the-as (function ogre-isle none) (find-parent-method ogre-isle-d 31)) obj) @@ -1160,7 +1160,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! ogre-bridge ((obj ogre-bridge) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1522,7 +1522,7 @@ (set! (-> v1-2 waveform) ripple-for-ogre-lava) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt25) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt25)) (set! (-> obj attack-event) 'lava) (none) ) diff --git a/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc b/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc index dc420aa731..705238a25d 100644 --- a/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/ogreboss_REF.gc @@ -256,7 +256,7 @@ ) 0.0 (set! (-> s4-1 quad) (-> (the-as target t1-0) control trans quad)) - (set! (-> s4-1 y) (+ 4096.0 (-> s4-1 y))) + (+! (-> s4-1 y) 4096.0) (set-vector! s3-0 0.0 (- 118784.0 (-> s4-1 y)) 0.0 1.0) (let ((f30-0 (fill-and-probe-using-line-sphere @@ -394,7 +394,7 @@ (set! (-> self root-override quat vec quad) (-> self parent-override 0 root quat vec quad)) (vector-identity! (-> self root-override scale)) (initialize-skeleton self *ogreboss-shoot-boulder-sg* '()) - (set! (-> self mask) (logior (process-mask enemy projectile) (-> self mask))) + (logior! (-> self mask) (process-mask enemy projectile)) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self draw shadow-ctrl) *ogreboss-missile-shadow-control*) (if (> (-> arg0 duration) 0) @@ -1580,7 +1580,7 @@ (none) ) :code (behavior () - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (ogreboss-set-stage1-camera) (ogreboss-move-near (seconds 3) (the-as float 1.0)) (cond @@ -2010,7 +2010,7 @@ ;; failed to figure out what this is: (defstate ogreboss-stage3-hit (ogreboss) :code (behavior () - (set! (-> self level) (+ 1.0 (-> self level))) + (+! (-> self level) 1.0) (if (< 2.0 (-> self level)) (go ogreboss-die) ) @@ -2160,7 +2160,7 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! ogreboss ((obj ogreboss) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 6) 0))) (set! (-> s3-0 prim-core collide-as) (collide-kind enemy)) diff --git a/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc index eb589c78b1..48eb01b260 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc @@ -1316,7 +1316,7 @@ (rot->dir-targ! (-> self control)) (ja-post) (vector<-cspace! gp-1 (-> self node-list data 3)) - (set! (-> gp-1 y) (+ -5896.192 (-> gp-1 y))) + (+! (-> gp-1 y) -5896.192) (move-to-point! (-> self control) gp-1) ) (send-event *camera* 'ease-in) diff --git a/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc b/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc index 8f99cae104..639ea41fba 100644 --- a/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc +++ b/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc @@ -229,8 +229,8 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! spider-egg ((obj spider-egg) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask attackable)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -256,7 +256,7 @@ (if (not (move-to-ground (-> obj root-override) 12288.0 40960.0 #t (collide-kind background))) (go process-drawable-art-error "no ground") ) - (set! (-> obj root-override trans y) (+ -409.6 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -409.6) (let ((s4-1 (new 'stack-no-clear 'vector))) (set! (-> s4-1 quad) (-> obj root-override surface-normal quad)) (+! (-> s4-1 x) (rand-vu-float-range -0.2 0.2)) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc index 2e193414f4..da44222cf6 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc @@ -145,7 +145,7 @@ ;; definition for function pusher-base-init (defbehavior pusher-base-init pusher-base () - (set! (-> self mask) (logior (process-mask enemy platform) (-> self mask))) + (logior! (-> self mask) (process-mask enemy platform)) (let ((gp-0 (new 'process 'collide-shape-moving self (collide-list-enum hit-by-others)))) (set! (-> gp-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> gp-0 reaction) default-collision-reaction) @@ -1280,14 +1280,14 @@ (set! (-> gp-0 origin y) (the float (- 10 (-> self timer-pos-offset)))) (set! (-> gp-0 flags) (font-flags shadow kerning right large)) (print-game-text (lookup-text! *common-text* (text-id time) #f) gp-0 #f 128 22) - (set! (-> gp-0 origin x) (+ 10.0 (-> gp-0 origin x))) + (+! (-> gp-0 origin x) 10.0) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text (race-time->string (-> self this-time)) gp-0 #f 128 22) - (set! (-> gp-0 origin x) (+ -10.0 (-> gp-0 origin x))) - (set! (-> gp-0 origin y) (+ 15.0 (-> gp-0 origin y))) + (+! (-> gp-0 origin x) -10.0) + (+! (-> gp-0 origin y) 15.0) (set! (-> gp-0 flags) (font-flags shadow kerning right large)) (print-game-text (lookup-text! *common-text* (text-id record) #f) gp-0 #f 128 22) - (set! (-> gp-0 origin x) (+ 10.0 (-> gp-0 origin x))) + (+! (-> gp-0 origin x) 10.0) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text (race-time->string (-> self record-time)) gp-0 #f 128 22) (cond @@ -1604,7 +1604,7 @@ (process-drawable-from-entity! obj arg0) (let ((a0-3 (new 'stack-no-clear 'vector))) (set! (-> a0-3 quad) (-> obj root-override trans quad)) - (set! (-> a0-3 y) (+ -8192.0 (-> a0-3 y))) + (+! (-> a0-3 y) -8192.0) (gorge-init a0-3 (new 'static 'vector :z 1.0) 102400.0 40960.0) ) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc index 8969c8ad8f..c1fbad72eb 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-race-ring_REF.gc @@ -699,7 +699,7 @@ ) ) (set! (-> self old-hips quad) (-> (target-pos 26) quad)) - (set! (-> self old-hips x) (+ 1.0 (-> self old-hips x))) + (+! (-> self old-hips x) 1.0) (set! (-> self state-time) (-> *display* game-frame-counter)) (none) ) @@ -1049,7 +1049,7 @@ (if (< (vector-dot (-> obj face-vec) (new 'static 'vector :x 1.0)) 0.0) (set! (-> obj rot-y) (- (-> obj rot-y))) ) - (set! (-> obj rot-y) (+ 16384.0 (-> obj rot-y))) + (+! (-> obj rot-y) 16384.0) ) ) ) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc index a6dc532b16..b2a8f3f668 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc @@ -38,7 +38,7 @@ ) ) (eval-path-curve! (-> self path) (-> self root-override trans) arg1 'interp) - (set! (-> self root-override trans y) (+ 8192.0 (-> self root-override trans y))) + (+! (-> self root-override trans y) 8192.0) (set! (-> self root-override trans y) (fmax 106496.0 (-> self root-override trans y))) (set! (-> self base quad) (-> self root-override trans quad)) (transform-post) @@ -171,7 +171,7 @@ (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root-override trans quad)) (let ((t2-0 (new 'stack-no-clear 'collide-tri-result))) - (set! (-> gp-0 y) (+ 8192.0 (-> gp-0 y))) + (+! (-> gp-0 y) 8192.0) (let ((f0-2 (fill-and-probe-using-line-sphere *collide-cache* gp-0 @@ -251,10 +251,10 @@ ) (cond ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (eval-path-curve! (-> self path) (-> self root-override trans) (-> self curve-position) 'interp) @@ -333,10 +333,10 @@ ) (cond ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (eval-path-curve! (-> self path) (-> self root-override trans) (-> self curve-position) 'interp) @@ -397,7 +397,7 @@ (logior! (-> self draw status) (draw-status hidden)) (let ((s5-1 (new 'stack-no-clear 'vector))) (eval-path-curve! (-> self path) s5-1 (the-as float (-> v1-3 user-object 0)) 'interp) - (set! (-> s5-1 y) (+ 8192.0 (-> s5-1 y))) + (+! (-> s5-1 y) 8192.0) (birth-pickup-at-point s5-1 (pickup-type fuel-cell) diff --git a/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc b/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc index 14e1a3ff74..cc28777c46 100644 --- a/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc @@ -768,7 +768,7 @@ (s3-1 (new 'stack-no-clear 'collide-tri-result)) ) (set! (-> a1-3 quad) (-> arg0 quad)) - (set! (-> a1-3 y) (+ 16384.0 (-> a1-3 y))) + (+! (-> a1-3 y) 16384.0) (if (>= (fill-and-probe-using-line-sphere *collide-cache* a1-3 @@ -791,7 +791,7 @@ ) (else (set-vector! arg1 (rand-vu-float-range -4096.0 4096.0) 0.0 (rand-vu-float-range -4096.0 4096.0) 1.0) - (set! (-> arg1 x) (+ 409.6 (-> arg1 x))) + (+! (-> arg1 x) 409.6) ) ) (vector-normalize! arg1 1.0) @@ -849,7 +849,7 @@ (set! (-> self ground-y) (-> self collide-info trans y)) (spawn (-> self part) (-> self collide-info trans)) (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) - (set! (-> self collide-info trans y) (+ -12288.0 (-> self collide-info trans y))) + (+! (-> self collide-info trans y) -12288.0) (set! (-> self collide-info transv quad) (-> *null-vector* quad)) (set! (-> self collide-info transv y) (rand-vu-float-range 102400.0 114688.0)) (none) @@ -1324,7 +1324,7 @@ (set! (-> self anim-blend) (fmin 1.0 (* 0.000016276043 f30-1))) (vector-normalize! (-> self collide-info transv) f30-1) ) - (set! (-> self collide-info transv y) (+ -36864.0 (-> self collide-info transv y))) + (+! (-> self collide-info transv y) -36864.0) (quaternion-rotate-y-to-vector! (-> self collide-info quat) (-> self collide-info quat) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc index d189857a5c..fb79eefdf5 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc @@ -228,7 +228,7 @@ (eval-path-curve! (-> obj path) (-> s5-0 path-pos) (-> obj path-u) 'interp) (let ((f0-1 (-> obj path-coming-out-u))) (when (< (-> obj path-u) f0-1) - (set! (-> s5-0 path-pos y) (+ (- -20480.0 (* -20480.0 (/ (-> obj path-u) f0-1))) (-> s5-0 path-pos y))) + (+! (-> s5-0 path-pos y) (- -20480.0 (* -20480.0 (/ (-> obj path-u) f0-1)))) (set! (-> s5-0 hug-path?) #t) ) ) @@ -283,7 +283,7 @@ (let ((a0-1 (-> self path-info))) (set! (-> a1-0 quad) (-> a0-1 path-pos quad)) ) - (set! (-> a1-0 y) (+ 9216.0 (-> a1-0 y))) + (+! (-> a1-0 y) 9216.0) (cond ((-> self path-info hug-path?) (move-to-point! (-> self root-override) a1-0) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc index 5e4482222a..7632b62727 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc @@ -441,7 +441,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (snow-bunny-method-76 self #f) - (set! (-> self nav flags) (logior (nav-control-flags navcf19) (-> self nav flags))) + (logior! (-> self nav flags) (nav-control-flags navcf19)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate)) (set! (-> self state-timeout) (seconds 0.1)) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc index 93daebe791..42fdedf188 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc @@ -506,7 +506,7 @@ ) ) (set! (-> obj appear-trans-bottom quad) (-> obj appear-trans-top quad)) - (set! (-> obj appear-trans-bottom y) (+ -286720.0 (-> obj appear-trans-bottom y))) + (+! (-> obj appear-trans-bottom y) -286720.0) (quaternion-copy! (-> obj appear-quat-top) (-> obj root-override quat)) (let ((v1-33 (res-lump-value (-> obj entity) 'extra-id uint128))) (set! (-> obj rise-time) (the int (* 300.0 (+ 0.6 (* 0.15 (the float v1-33)))))) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc index 6f4cd4f67a..d43041a165 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc @@ -356,7 +356,7 @@ (cond ((= (-> event param 0) 'die) (if *target* - (set! (-> *target* control trans y) (+ 1024.0 (-> *target* control trans y))) + (+! (-> *target* control trans y) 1024.0) ) (go snow-eggtop-idle-down) ) @@ -500,7 +500,7 @@ (initialize-skeleton obj *snow-eggtop-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj spawn-trans quad) (-> obj root-override trans quad)) - (set! (-> obj root-override trans y) (+ -2662.4 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -2662.4) (update-transforms! (-> obj root-override)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 510) obj)) (set! (-> obj sound) @@ -513,7 +513,7 @@ (else (let ((a0-17 (new 'stack-no-clear 'vector))) (set! (-> a0-17 quad) (-> obj root-override trans quad)) - (set! (-> a0-17 y) (+ 3072.0 (-> a0-17 y))) + (+! (-> a0-17 y) 3072.0) (birth-pickup-at-point a0-17 (pickup-type fuel-cell) @@ -609,7 +609,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! snowpusher ((obj snowpusher) (arg0 entity-actor)) (local-vars (sv-16 res-tag)) - (set! (-> obj mask) (logior (process-mask enemy platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy platform)) (let ((s3-0 0) (s4-0 0) ) @@ -756,7 +756,7 @@ ;; definition for method 11 of type snow-spatula ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! snow-spatula ((obj snow-spatula) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -1046,8 +1046,8 @@ (loop (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self closed-trans quad)) - (set! (-> a1-0 y) (+ -12288.0 (-> a1-0 y))) - (set! (-> a1-0 z) (+ -12288.0 (-> a1-0 z))) + (+! (-> a1-0 y) -12288.0) + (+! (-> a1-0 z) -12288.0) (spawn (-> self part) a1-0) ) (let ((s5-0 (new 'stack-no-clear 'vector))) @@ -1057,8 +1057,8 @@ (set! gp-0 #t) (let ((a1-2 (new 'stack-no-clear 'vector))) (set! (-> a1-2 quad) (-> self open-trans quad)) - (set! (-> a1-2 y) (+ -26624.0 (-> a1-2 y))) - (set! (-> a1-2 z) (+ -3072.0 (-> a1-2 z))) + (+! (-> a1-2 y) -26624.0) + (+! (-> a1-2 z) -3072.0) (spawn (-> self part2) a1-2) ) ) @@ -1073,9 +1073,9 @@ ) (let ((a1-7 (new 'stack-no-clear 'vector))) (set! (-> a1-7 quad) (-> self root-override trans quad)) - (set! (-> a1-7 x) (+ 20480.0 (-> a1-7 x))) - (set! (-> a1-7 y) (+ 106496.0 (-> a1-7 y))) - (set! (-> a1-7 z) (+ -32768.0 (-> a1-7 z))) + (+! (-> a1-7 x) 20480.0) + (+! (-> a1-7 y) 106496.0) + (+! (-> a1-7 z) -32768.0) (spawn (-> self part3) a1-7) ) (update! (-> self sound)) @@ -1155,8 +1155,8 @@ (set! (-> obj part3) (create-launch-control (-> *part-group-id-table* 514) obj)) (set! (-> obj open-trans quad) (-> obj root-override trans quad)) (set! (-> obj closed-trans quad) (-> obj open-trans quad)) - (set! (-> obj open-trans y) (+ -141312.0 (-> obj open-trans y))) - (set! (-> obj open-trans z) (+ 32768.0 (-> obj open-trans z))) + (+! (-> obj open-trans y) -141312.0) + (+! (-> obj open-trans z) 32768.0) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "lodge-door-mov" :fo-max 80) (-> obj open-trans)) ) @@ -1291,7 +1291,7 @@ (defmethod snow-gears-method-20 snow-gears ((obj snow-gears)) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> obj root trans quad)) - (set! (-> a1-0 y) (+ 61440.0 (-> a1-0 y))) + (+! (-> a1-0 y) 61440.0) (spawn (-> obj part) a1-0) ) (none) @@ -1559,7 +1559,7 @@ :code (behavior () (set! (-> self pressed?) #t) (set! (-> self root-override trans quad) (-> self orig-trans quad)) - (set! (-> self root-override trans y) (+ -1433.6 (-> self root-override trans y))) + (+! (-> self root-override trans y) -1433.6) (transform-post) (loop (logior! (-> self mask) (process-mask sleep-code)) @@ -1615,7 +1615,7 @@ (when (not s5-2) (let ((a0-17 (new 'stack-no-clear 'vector))) (set! (-> a0-17 quad) (-> obj orig-trans quad)) - (set! (-> a0-17 y) (+ 12288.0 (-> a0-17 y))) + (+! (-> a0-17 y) 12288.0) (set! (-> obj fcell-handle) (ppointer->handle (birth-pickup-at-point a0-17 (pickup-type fuel-cell) @@ -1834,8 +1834,8 @@ (initialize-skeleton obj *snow-log-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (logior! (-> obj draw status) (draw-status hidden)) - (set! (-> obj root-override trans x) (+ -1024.0 (-> obj root-override trans x))) - (set! (-> obj root-override trans y) (+ -4915.2 (-> obj root-override trans y))) + (+! (-> obj root-override trans x) -1024.0) + (+! (-> obj root-override trans y) -4915.2) (set-vector! (-> obj root-override scale) 1.5 1.0 1.5 1.0) (nav-mesh-connect obj (-> obj root-override) (the-as nav-control #f)) (set! (-> obj master) (entity-actor-lookup arg0 'alt-actor 0)) @@ -1966,7 +1966,7 @@ :event snow-log-button-event-handler :code (behavior () (set! (-> self root-override trans quad) (-> self orig-trans quad)) - (set! (-> self root-override trans y) (+ -1433.6 (-> self root-override trans y))) + (+! (-> self root-override trans y) -1433.6) (transform-post) (loop (logior! (-> self mask) (process-mask sleep-code)) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc index 5a919b7c20..a8f61e064a 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc @@ -673,7 +673,7 @@ ) (let ((gp-0 (-> obj target))) (set! (-> gp-0 quad) (-> (target-pos 0) quad)) - (set! (-> gp-0 y) (+ 4915.2 (-> gp-0 y))) + (+! (-> gp-0 y) 4915.2) (let ((f0-2 (vector-vector-distance gp-0 (-> obj root-override trans))) (a2-0 (new 'stack-no-clear 'vector)) ) @@ -757,7 +757,7 @@ (set! (-> self launch-time) (-> *display* base-frame-counter)) (vector-float*! (-> self root-override transv) (-> self parent-override 0 proj-launch-vec) 40960.0) (set! (-> self target quad) (-> (target-pos 0) quad)) - (set! (-> self target y) (+ 4915.2 (-> self target y))) + (+! (-> self target y) 4915.2) (set! (-> self target-base quad) (-> self target quad)) (go-virtual projectile-moving) (none) @@ -1258,9 +1258,9 @@ (s4-0 (new 'stack-no-clear 'vector)) ) (set! (-> s5-0 quad) (-> obj collide-info trans quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) (set! (-> s4-0 quad) (-> (target-pos 0) quad)) - (set! (-> s4-0 y) (+ 4915.2 (-> s4-0 y))) + (+! (-> s4-0 y) 4915.2) (vector-! s4-0 s4-0 s5-0) (let* ((t2-0 (new 'stack-no-clear 'collide-tri-result)) (v0-0 (< (fill-and-probe-using-line-sphere @@ -1731,7 +1731,7 @@ ) (nav-enemy-method-54 self s5-2) (set! (-> gp-2 quad) (-> (target-pos 0) quad)) - (set! (-> gp-2 y) (+ 4915.2 (-> gp-2 y))) + (+! (-> gp-2 y) 4915.2) (vector-! (-> self proj-launch-vec) gp-2 s5-2) ) (vector-normalize! (-> self proj-launch-vec) 1.0) diff --git a/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc b/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc index ae7f7020bb..b3ef8e05a8 100644 --- a/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc @@ -248,7 +248,7 @@ (set! (-> self state-timeout) (seconds 1)) (set! (-> self ground-y) (-> self collide-info trans y)) (spawn (-> self part) (-> self collide-info trans)) - (set! (-> self collide-info trans y) (+ -12288.0 (-> self collide-info trans y))) + (+! (-> self collide-info trans y) -12288.0) (set! (-> self collide-info transv quad) (-> *null-vector* quad)) (set! (-> self collide-info transv y) (rand-vu-float-range 102400.0 114688.0)) (none) @@ -651,7 +651,7 @@ ) (else (set-vector! arg1 (rand-vu-float-range -4096.0 4096.0) 0.0 (rand-vu-float-range -4096.0 4096.0) 1.0) - (set! (-> arg1 x) (+ 409.6 (-> arg1 x))) + (+! (-> arg1 x) 409.6) ) ) (vector-normalize! arg1 1.0) diff --git a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc index ef5306cff5..94d8b7fac5 100644 --- a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc @@ -821,7 +821,7 @@ (set! (-> obj bounce-volume) 100) (set! (-> obj spin-vel) 0.0) (set! (-> obj travel-speed) 0.0) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc b/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc index 38ca205d96..75fa2546ac 100644 --- a/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc @@ -791,7 +791,7 @@ ) ) ) - (set! (-> self collide-info transv y) (+ -36864.0 (-> self collide-info transv y))) + (+! (-> self collide-info transv y) -36864.0) (integrate-for-enemy-with-move-to-ground! (-> self collide-info) (-> self collide-info transv) @@ -833,7 +833,7 @@ (s4-0 (new 'stack-no-clear 'collide-tri-result)) ) (set! (-> a1-5 quad) (-> arg0 quad)) - (set! (-> a1-5 y) (+ 8192.0 (-> a1-5 y))) + (+! (-> a1-5 y) 8192.0) (when (>= (fill-and-probe-using-line-sphere *collide-cache* a1-5 @@ -943,7 +943,7 @@ ) ) ) - (set! (-> self collide-info transv y) (+ -36864.0 (-> self collide-info transv y))) + (+! (-> self collide-info transv y) -36864.0) (integrate-for-enemy-with-move-to-ground! (-> self collide-info) (-> self collide-info transv) diff --git a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc index 71bee4430e..ccbae098ba 100644 --- a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc @@ -103,7 +103,7 @@ ;; definition for method 11 of type floating-launcher ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! floating-launcher ((obj floating-launcher) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc index a5ed34b8e0..efc575d7eb 100644 --- a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc @@ -261,7 +261,7 @@ (when (not (task-complete? *game-info* (game-task sunken-slide))) (let ((a0-1 (new 'stack-no-clear 'vector))) (set! (-> a0-1 quad) (-> self root-override trans quad)) - (set! (-> a0-1 y) (+ 30720.0 (-> a0-1 y))) + (+! (-> a0-1 y) 30720.0) (let ((v1-7 (birth-pickup-at-point a0-1 (pickup-type fuel-cell) @@ -597,7 +597,7 @@ (set! (-> s5-1 frame-num) 0.0) ) (set! (-> obj spawn-trans quad) (-> obj root-override trans quad)) - (set! (-> obj root-override trans y) (+ -26624.0 (-> obj root-override trans y))) + (+! (-> obj root-override trans y) -26624.0) (set! (-> obj down-y) (+ -6553.6 (-> obj root-override trans y))) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) diff --git a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc index 57b55fd7f3..0a94bd2bb3 100644 --- a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc @@ -193,7 +193,7 @@ :code (behavior () (loop (set! (-> self root trans quad) (-> self parent-override 0 root-override trans quad)) - (set! (-> self root trans y) (+ -5324.8 (-> self root trans y))) + (+! (-> self root trans y) -5324.8) (spawn (-> self part2) (-> self root trans)) (let* ((a0-6 (-> self parent-override 0 other)) (v1-9 (if a0-6 @@ -239,9 +239,9 @@ ) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 y) (+ -2048.0 (-> gp-1 y))) + (+! (-> gp-1 y) -2048.0) (set! (-> s5-0 quad) (-> (the-as orbit-plat v1-32) root-override trans quad)) - (set! (-> s5-0 y) (+ -7372.8 (-> s5-0 y))) + (+! (-> s5-0 y) -7372.8) (vector-! s4-0 s5-0 gp-1) (vector-normalize! s4-0 1.0) (vector+*! s5-0 gp-1 s4-0 26624.0) @@ -287,12 +287,12 @@ ;; INFO: Return type mismatch object vs none. (defbehavior orbit-plat-bottom-init-by-other orbit-plat-bottom ((arg0 entity-actor) (arg1 orbit-plat)) (set! (-> self entity) arg0) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg1 root-override trans quad)) (quaternion-copy! (-> self root quat) (-> arg1 root-override quat)) (set! (-> self root scale quad) (-> arg1 root-override scale quad)) - (set! (-> self root trans y) (+ -5324.8 (-> self root trans y))) + (+! (-> self root trans y) -5324.8) (set! (-> self part) (create-launch-control (-> *part-group-id-table* 440) self)) (set! (-> self part2) (create-launch-control (-> *part-group-id-table* 107) self)) (initialize-skeleton self *orbit-plat-bottom-sg* '()) @@ -829,7 +829,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! orbit-plat ((obj orbit-plat) (arg0 entity-actor)) (set! (-> obj plat-status) (the-as uint 0)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc b/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc index 6798a20ce6..a440b20cd1 100644 --- a/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc @@ -1168,7 +1168,7 @@ (initialize-skeleton obj *puffer-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (setup-lods! (-> obj nice-look) *puffer-sg* (-> obj draw art-group) (-> obj entity)) (setup-lods! (-> obj mean-look) *puffer-mean-sg* (-> obj draw art-group) (-> obj entity)) (load-params! (-> obj sync) obj (the-as uint 2400) 0.0 0.15 0.15) diff --git a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc index eeae1c81aa..1a9fe01ad3 100644 --- a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc @@ -183,7 +183,7 @@ ;; INFO: Return type mismatch object vs none. (defbehavior qbert-plat-on-init-by-other qbert-plat ((arg0 entity-actor) (arg1 qbert-plat)) (set! (-> self entity) arg0) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self root-overlay) (the-as collide-shape-moving (new 'process 'trsqv))) (set! (-> self root-overlay trans quad) (-> arg1 root-overlay trans quad)) (quaternion-copy! (-> self root-overlay quat) (-> arg1 root-overlay quat)) @@ -417,7 +417,7 @@ ;; definition for method 11 of type qbert-plat ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! qbert-plat ((obj qbert-plat) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc index 463bf7178c..e2015080b1 100644 --- a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc @@ -226,7 +226,7 @@ (local-vars (v0-3 sound-id) (sv-48 int)) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 quad) (-> obj root-override trans quad)) - (set! (-> s4-0 y) (+ -20480.0 (-> s4-0 y))) + (+! (-> s4-0 y) -20480.0) (let* ((v1-1 (-> obj water-entity)) (a0-4 (if v1-1 (-> v1-1 extra process) diff --git a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc index 9744d085e5..cd157bd5e3 100644 --- a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc @@ -539,7 +539,7 @@ (spawn (-> obj part2) (-> obj down)) (let ((a1-8 (new 'stack-no-clear 'vector))) (set! (-> a1-8 quad) (-> obj root-override trans quad)) - (set! (-> a1-8 y) (+ -3072.0 (-> a1-8 y))) + (+! (-> a1-8 y) -3072.0) (spawn (-> obj part3) a1-8) ) ) @@ -724,7 +724,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! steam-cap ((obj steam-cap) (arg0 entity-actor)) (local-vars (sv-16 res-tag)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -790,7 +790,7 @@ ) (set! (-> obj down quad) (-> obj root-override trans quad)) (set! (-> obj up quad) (-> obj root-override trans quad)) - (set! (-> obj up y) (+ 40960.0 (-> obj up y))) + (+! (-> obj up y) 40960.0) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 441) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 442) obj)) (set! (-> obj part3) (create-launch-control (-> *part-group-id-table* 443) obj)) diff --git a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc index 47a2fa52b3..2315053dd5 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc @@ -356,7 +356,7 @@ (set! (-> self root trans quad) (-> arg1 root trans quad)) (quaternion-copy! (-> self root quat) (-> arg1 root quat)) (set! (-> self root scale quad) (-> arg1 root scale quad)) - (set! (-> self root trans y) (+ 14069.76 (-> self root trans y))) + (+! (-> self root trans y) 14069.76) (set! (-> self rest-pos quad) (-> self root trans quad)) (initialize-skeleton self *blue-eco-charger-orb-sg* '()) (ja-channel-set! 1) @@ -682,7 +682,7 @@ (vector-! s5-0 (-> obj last-pos) (-> obj root-override trans)) (set! (-> obj draw bounds quad) (-> s5-0 quad)) ) - (set! (-> obj draw bounds y) (+ 16384.0 (-> obj draw bounds y))) + (+! (-> obj draw bounds y) 16384.0) (set! (-> obj draw bounds w) 67584.0) (let ((s5-1 (new 'stack-no-clear 'exit-chamber-items))) (exit-chamber-method-21 obj s5-1) @@ -692,7 +692,7 @@ (when (and *target* (-> obj move-player?)) (let ((a1-6 (new 'stack-no-clear 'vector))) (set! (-> a1-6 quad) (-> s5-1 button-pos quad)) - (set! (-> a1-6 y) (+ 2662.4 (-> a1-6 y))) + (+! (-> a1-6 y) 2662.4) (move-to-point! (-> *target* control) a1-6) ) (vector-reset! (-> *target* control transv)) @@ -931,7 +931,7 @@ ) (let ((a0-36 (new 'stack-no-clear 'vector))) (set! (-> a0-36 quad) (-> self last-pos quad)) - (set! (-> a0-36 y) (+ 51814.4 (-> a0-36 y))) + (+! (-> a0-36 y) 51814.4) (when (>= (-> a0-36 y) (ocean-get-height a0-36)) (if (not gp-2) (set! gp-2 #t) @@ -1004,7 +1004,7 @@ ) ) :enter (behavior ((arg0 symbol)) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self state-time) (-> *display* base-frame-counter)) (none) ) @@ -1115,7 +1115,7 @@ (when (+ (-> *display* base-frame-counter) (seconds -0.1)) (let ((a0-9 (new 'stack-no-clear 'vector))) (set! (-> a0-9 quad) (-> self last-pos quad)) - (set! (-> a0-9 y) (+ 64102.4 (-> a0-9 y))) + (+! (-> a0-9 y) 64102.4) (when (< (-> a0-9 y) (+ 12288.0 (ocean-get-height a0-9))) (if (not s5-0) (set! s5-0 #t) diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc index 13f4c259aa..259ba77235 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc @@ -830,7 +830,7 @@ (a0-109 (new 'stack-no-clear 'vector)) ) (set! (-> a0-109 quad) (-> v1-184 jar-pos quad)) - (set! (-> a0-109 y) (+ 40960.0 (-> a0-109 y))) + (+! (-> a0-109 y) 40960.0) (send-event (handle->process (-> v1-184 actor-handle)) 'trans a0-109) ) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -1029,9 +1029,9 @@ (set! (-> s0-0 sucked-up-jar-part-pos quad) (-> s0-0 jar-pos quad)) (set! (-> s0-0 sucked-up-far-part-pos quad) (-> s0-0 far-pos quad)) (set! (-> s0-0 blown-out-jar-part-pos quad) (-> s0-0 jar-pos quad)) - (set! (-> s0-0 blown-out-jar-part-pos y) (+ 24576.0 (-> s0-0 blown-out-jar-part-pos y))) + (+! (-> s0-0 blown-out-jar-part-pos y) 24576.0) (set! (-> s0-0 blown-out-far-part-pos quad) (-> s0-0 far-pos quad)) - (set! (-> s0-0 blown-out-far-part-pos y) (+ 28672.0 (-> s0-0 blown-out-far-part-pos y))) + (+! (-> s0-0 blown-out-far-part-pos y) 28672.0) (let ((v1-30 s2-0)) (cond ((zero? v1-30) @@ -1041,8 +1041,8 @@ (set-vector! s4-0 -30720.0 1146.88 5120.0 1.0) (set! (-> s0-0 sucked-up-part) (create-launch-control (-> *part-group-id-table* 448) obj)) (set! (-> s0-0 blown-out-part) (create-launch-control (-> *part-group-id-table* 451) obj)) - (set! (-> s0-0 jar-pos y) (+ 11673.6 (-> s0-0 jar-pos y))) - (set! (-> s0-0 far-pos y) (+ 11673.6 (-> s0-0 far-pos y))) + (+! (-> s0-0 jar-pos y) 11673.6) + (+! (-> s0-0 far-pos y) 11673.6) (when (not s1-1) (set! (-> s0-0 actor-handle) (ppointer->handle @@ -1063,9 +1063,9 @@ (set-vector! s4-0 0.0 1146.88 5120.0 1.0) (set! (-> s0-0 sucked-up-part) (create-launch-control (-> *part-group-id-table* 449) obj)) (set! (-> s0-0 blown-out-part) (create-launch-control (-> *part-group-id-table* 452) obj)) - (set! (-> s0-0 jar-pos y) (+ 7168.0 (-> s0-0 jar-pos y))) - (set! (-> s0-0 far-pos y) (+ 7168.0 (-> s0-0 far-pos y))) - (set! (-> s0-0 blown-out-far-part-pos y) (+ 4096.0 (-> s0-0 blown-out-far-part-pos y))) + (+! (-> s0-0 jar-pos y) 7168.0) + (+! (-> s0-0 far-pos y) 7168.0) + (+! (-> s0-0 blown-out-far-part-pos y) 4096.0) (when (not s1-1) (set! (-> s0-0 actor-handle) (ppointer->handle @@ -1087,9 +1087,9 @@ (set-vector! s4-0 30720.0 1146.88 5120.0 1.0) (set! (-> s0-0 sucked-up-part) (create-launch-control (-> *part-group-id-table* 450) obj)) (set! (-> s0-0 blown-out-part) (create-launch-control (-> *part-group-id-table* 453) obj)) - (set! (-> s0-0 jar-pos y) (+ 7168.0 (-> s0-0 jar-pos y))) - (set! (-> s0-0 far-pos y) (+ 7168.0 (-> s0-0 far-pos y))) - (set! (-> s0-0 blown-out-far-part-pos y) (+ 4096.0 (-> s0-0 blown-out-far-part-pos y))) + (+! (-> s0-0 jar-pos y) 7168.0) + (+! (-> s0-0 far-pos y) 7168.0) + (+! (-> s0-0 blown-out-far-part-pos y) 4096.0) (when (not s1-1) (set! (-> s0-0 actor-handle) (ppointer->handle diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc index e81f942f62..b9597b1848 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc @@ -146,7 +146,7 @@ ) (set! (-> self draw color-mult w) 0.5) (if (= f30-0 1.0) - (set! (-> self flags) (logior (water-flags wt19) (-> self flags))) + (logior! (-> self flags) (water-flags wt19)) ) ) ) @@ -233,7 +233,7 @@ (when (and s5-0 (or (= f0-16 0.0) (= f0-16 1.0))) (set! s5-0 #f) (if (= f0-16 0.0) - (set! (-> obj flags) (logior (water-flags wt19) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt19)) (logclear! (-> obj flags) (water-flags wt19)) ) ) diff --git a/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc index 43a5b3fa44..638dc85197 100644 --- a/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/wall-plat_REF.gc @@ -214,7 +214,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! wall-plat ((obj wall-plat) (arg0 entity-actor)) (set! (-> obj extended-amount) 0.0) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc index c4ce554fc2..905e8e2832 100644 --- a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc @@ -56,9 +56,9 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! wedge-plat-master ((obj wedge-plat-master) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (set! (-> obj center quad) (-> arg0 extra trans quad)) - (set! (-> obj center y) (+ 819.2 (-> obj center y))) + (+! (-> obj center y) 819.2) (set! (-> obj rotspeed) (res-lump-float arg0 'rotspeed)) (set! (-> obj rotate-inner) 0.0) (set! (-> obj rotate-outer) 0.0) @@ -220,7 +220,7 @@ ;; definition for method 11 of type wedge-plat ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! wedge-plat ((obj wedge-plat) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -397,7 +397,7 @@ ;; definition for method 11 of type wedge-plat-outer ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! wedge-plat-outer ((obj wedge-plat-outer) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc b/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc index fb152fae22..88a6b17144 100644 --- a/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc @@ -341,7 +341,7 @@ (when (>= (fabs f30-0) 45511.11) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self root-override trans quad)) - (set! (-> a1-0 y) (+ -8192.0 (-> a1-0 y))) + (+! (-> a1-0 y) -8192.0) (spawn (-> self part) a1-0) ) ) diff --git a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc index c5b5955231..94a5810e01 100644 --- a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc @@ -370,8 +370,8 @@ (let ((s5-1 (new 'stack-no-clear 'vector))) (dotimes (s4-0 (+ (the int (the float (+ (-> obj path-snacks curve num-cverts) -1))) 1)) (eval-path-curve-div! (-> obj path-snacks) s5-1 (the float s4-0) 'exact) - (set! (-> s5-1 x) (+ -40960.0 (-> s5-1 x))) - (set! (-> s5-1 z) (+ 20480.0 (-> s5-1 z))) + (+! (-> s5-1 x) -40960.0) + (+! (-> s5-1 z) 20480.0) (manipy-spawn s5-1 (-> obj entity) *farthy-snack-sg* #f :to obj) ) ) diff --git a/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc b/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc index 05995d253b..7d65d2de6f 100644 --- a/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc @@ -626,7 +626,7 @@ ;; INFO: Return type mismatch object vs none. (defbehavior kermit-pulse-init-by-other kermit-pulse ((arg0 vector) (arg1 entity-actor)) (logclear! (-> self mask) (process-mask enemy attackable)) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (set! (-> self entity) arg1) (let ((s5-0 (new 'process 'collide-shape-moving self (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) @@ -1483,7 +1483,7 @@ nav-enemy-default-event-handler ;; definition for method 11 of type kermit ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! kermit ((obj kermit) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc index b4c3a6d5db..e1962383d4 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc @@ -432,7 +432,7 @@ swamp-bat-slave-event-handler (vector-! gp-0 (-> self root-override trans) (-> (the-as swamp-bat v1-1) root-override trans)) ) ) - (set! (-> gp-0 y) (+ -6144.0 (-> gp-0 y))) + (+! (-> gp-0 y) -6144.0) (vector-normalize! gp-0 98304.0) (ja :group! swamp-bat-die-ja) (until (ja-done? 0) @@ -451,7 +451,7 @@ swamp-bat-slave-event-handler ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defbehavior swamp-bat-slave-init-by-other swamp-bat-slave ((arg0 swamp-bat-slave) (arg1 int)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (let ((s4-0 (new 'process 'collide-shape-moving self (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -663,7 +663,7 @@ swamp-bat-slave-event-handler ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj vol) (new 'process 'vol-control obj)) (logior! (-> obj vol flags) 3) (set! (-> obj path-list 0) (new 'process 'curve-control obj 'path -1000000000.0)) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc index f3fa9c31ca..cc1064dd4c 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc @@ -519,7 +519,7 @@ ;; definition for method 11 of type balance-plat ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! balance-plat ((obj balance-plat) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) default-collision-reaction) @@ -710,7 +710,7 @@ ;; definition for method 11 of type swamp-rock ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! swamp-rock ((obj swamp-rock) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (let ((f30-0 (res-lump-float arg0 'scale-factor :default 1.0))) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0)))) @@ -740,7 +740,7 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. (defbehavior swamp-rock-init-by-other swamp-rock ((arg0 vector)) - (set! (-> self mask) (logior (process-mask attackable) (-> self mask))) + (logior! (-> self mask) (process-mask attackable)) (let ((s5-0 (new 'process 'collide-shape-moving self (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc index b5f5548c77..fbab65e874 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc @@ -873,11 +873,11 @@ ;; INFO: Return type mismatch object vs none. (defbehavior swamp-rat-nest-dummy-init-by-other swamp-rat-nest-dummy ((arg0 swamp-rat-nest-dummy)) (let ((gp-0 (-> arg0 entity))) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (swamp-rat-nest-dummy-method-20 self) (process-drawable-from-entity! self gp-0) (set! (-> self top-sphere quad) (-> self root-override trans quad)) - (set! (-> self top-sphere y) (+ 24576.0 (-> self top-sphere y))) + (+! (-> self top-sphere y) 24576.0) (set! (-> self top-sphere w) 18432.0) (set! (-> self entity) gp-0) ) @@ -1133,7 +1133,7 @@ swamp-rat-nest-default-event-handler ;; definition for method 11 of type swamp-rat-nest ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! swamp-rat-nest ((obj swamp-rat-nest) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (set! (-> obj fact-override) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc index 40c1a176b7..b7f28d08b2 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc @@ -200,7 +200,7 @@ swamp-rat-default-event-handler (defbehavior swamp-rat-update-wiggle-target swamp-rat ((arg0 vector)) (+! (-> self wiggle-angle) (-> self delta-wiggle-angle)) (if (< 65536.0 (-> self wiggle-angle)) - (set! (-> self wiggle-angle) (+ -65536.0 (-> self wiggle-angle))) + (+! (-> self wiggle-angle) -65536.0) ) (let* ((v1-3 (-> self collide-info trans)) (a1-1 (vector-! (new 'stack-no-clear 'vector) v1-3 arg0)) diff --git a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc index 9ee4af6b2f..2f1f47f1ee 100644 --- a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc @@ -274,7 +274,7 @@ ;; definition for method 11 of type tra-pontoon ;; INFO: Return type mismatch int vs none. (defmethod init-from-entity! tra-pontoon ((obj tra-pontoon) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc index c23daff26f..57b3a07375 100644 --- a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc @@ -1550,7 +1550,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! fishermans-boat ((obj fishermans-boat) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) diff --git a/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc b/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc index a9ea2a51d5..1c940119fe 100644 --- a/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc @@ -347,7 +347,7 @@ ;; definition for method 11 of type windmill-sail ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! windmill-sail ((obj windmill-sail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (load-params! (-> obj sync) obj (the-as uint 4800) 0.0 0.15 0.15) (set! (-> obj root-override) (new 'process 'trsq)) (process-drawable-from-entity! obj arg0) @@ -420,7 +420,7 @@ ;; definition for method 11 of type sagesail ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! sagesail ((obj sagesail) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (load-params! (-> obj sync) obj (the-as uint 3000) 0.0 0.15 0.15) (set! (-> obj root-override) (new 'process 'trsq)) (process-drawable-from-entity! obj arg0) @@ -527,7 +527,7 @@ ;; definition for method 11 of type windspinner ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! windspinner ((obj windspinner) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj angle) 0.0) (set! (-> obj angle-vel) 145.63556) (set! (-> obj root) (the-as trsqv (new 'process 'trsq))) @@ -587,7 +587,7 @@ ;; definition for method 11 of type mayorgears ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! mayorgears ((obj mayorgears) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *mayorgears-sg* '()) @@ -775,7 +775,7 @@ (defstate starfish-patrol (starfish) :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (set! (-> self nav flags) (logior (nav-control-flags navcf19) (-> self nav flags))) + (logior! (-> self nav flags) (nav-control-flags navcf19)) (none) ) :trans (behavior () @@ -860,7 +860,7 @@ ;; definition for method 47 of type starfish ;; INFO: Return type mismatch int vs none. (defmethod initialize-collision starfish ((obj starfish)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc b/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc index 6230dd954c..a426502acb 100644 --- a/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc @@ -1058,7 +1058,7 @@ ;; definition for method 11 of type swamp-tetherrock ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! swamp-tetherrock ((obj swamp-tetherrock) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask attackable) (-> obj mask))) + (logior! (-> obj mask) (process-mask attackable)) (process-entity-status! obj (entity-perm-status bit-7) #t) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) @@ -1430,7 +1430,7 @@ ) :post (behavior () (set! (-> self other-pos quad) (-> self root trans quad)) - (set! (-> self other-pos y) (+ -245760.0 (-> self other-pos y))) + (+! (-> self other-pos y) -245760.0) (swamp-rope-post) (none) ) @@ -1649,13 +1649,13 @@ ) (quaternion*! (-> self rot-at-init) (-> self rot-at-init) gp-0) (if (< (-> self pos-oscillator target x) 409600.0) - (set! (-> self pos-oscillator target x) (+ 40.96 (-> self pos-oscillator target x))) + (+! (-> self pos-oscillator target x) 40.96) ) (if (< (-> self pos-oscillator target y) 4096000.0) - (set! (-> self pos-oscillator target y) (+ 819.2 (-> self pos-oscillator target y))) + (+! (-> self pos-oscillator target y) 819.2) ) (if (< (-> self pos-oscillator target z) 4096000.0) - (set! (-> self pos-oscillator target z) (+ 1228.8 (-> self pos-oscillator target z))) + (+! (-> self pos-oscillator target z) 1228.8) ) (suspend) ) diff --git a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc index 8b0cd72165..1b5e89ad15 100644 --- a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc @@ -201,7 +201,7 @@ ;; definition for method 11 of type pontoon ;; INFO: Return type mismatch int vs none. (defmethod init-from-entity! pontoon ((obj pontoon) (arg0 entity-actor)) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) (rigid-body-platform-method-31 obj) @@ -1042,7 +1042,7 @@ (when (and (not (task-complete? *game-info* (game-task sunken-room))) (not (-> self child))) (let ((a0-3 (new 'stack-no-clear 'vector))) (set! (-> a0-3 quad) (-> self root trans quad)) - (set! (-> a0-3 y) (+ 67584.0 (-> a0-3 y))) + (+! (-> a0-3 y) 67584.0) (let ((v1-12 (birth-pickup-at-point a0-3 (pickup-type fuel-cell) 47.0 #f self (the-as fact-info #f)))) (set! (-> self fcell-handle) (ppointer->handle v1-12)) (send-event (ppointer->process v1-12) 'collide-shape #f) @@ -1073,7 +1073,7 @@ (when a0-7 (let ((v1-14 (new 'stack-no-clear 'vector))) (set! (-> v1-14 quad) (-> self root trans quad)) - (set! (-> v1-14 y) (+ 67584.0 (-> v1-14 y))) + (+! (-> v1-14 y) 67584.0) (send-event a0-7 'trans v1-14) ) ) @@ -1100,7 +1100,7 @@ (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj root trans y) (+ 24576.0 (-> obj root trans y))) + (+! (-> obj root trans y) 24576.0) (set! (-> obj orig-trans quad) (-> obj root trans quad)) (initialize-skeleton obj *exit-chamber-dummy-sg* '()) (ja-channel-set! 1) @@ -1350,7 +1350,7 @@ (when (>= (ja-aframe-num 0) 82.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1378,7 +1378,7 @@ (when (>= (ja-aframe-num 0) 120.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1406,7 +1406,7 @@ (when (>= (ja-aframe-num 0) 82.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker @@ -1434,7 +1434,7 @@ (when (>= (ja-aframe-num 0) 131.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1462,7 +1462,7 @@ (when (>= (ja-aframe-num 0) 80.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker @@ -1490,7 +1490,7 @@ (when (>= (ja-aframe-num 0) 152.4) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "boulder-splash") (process-spawn part-tracker @@ -1518,7 +1518,7 @@ (when (>= (ja-aframe-num 0) 116.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker @@ -1546,7 +1546,7 @@ (when (>= (ja-aframe-num 0) 74.0) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self draw origin quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (sound-play "v2ogre-boulder") (process-spawn part-tracker diff --git a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc index 7a4fbc0e90..9f7f853e18 100644 --- a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc @@ -79,7 +79,7 @@ (set! (-> v1-2 waveform) ripple-for-villagec-lava) ) (logclear! (-> obj flags) (water-flags wt23)) - (set! (-> obj flags) (logior (water-flags wt25) (-> obj flags))) + (logior! (-> obj flags) (water-flags wt25)) (set! (-> obj attack-event) 'lava) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc index a4ab2119b8..c619386633 100644 --- a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc @@ -349,7 +349,7 @@ ) (set! (-> s1-3 flags) (font-flags shadow kerning middle left large)) (print-game-text (lookup-text! *common-text* (text-id warp-gate-use-dpad) #f) s1-3 #f 128 22) - (set! (-> s1-3 origin y) (+ 35.0 (-> s1-3 origin y))) + (+! (-> s1-3 origin y) 35.0) (let ((v1-43 s1-3)) (set! (-> v1-43 height) (the float 40)) ) @@ -416,9 +416,9 @@ ) ) (print-level-name gp-0 s1-3 s2-0 (the-as int s4-0)) - (set! (-> s1-3 origin y) (+ 20.0 (-> s1-3 origin y))) + (+! (-> s1-3 origin y) 20.0) (print-game-text (lookup-text! *common-text* (text-id press-to-warp) #f) s1-3 #f 128 22) - (set! (-> s1-3 origin y) (+ 15.0 (-> s1-3 origin y))) + (+! (-> s1-3 origin y) 15.0) (print-game-text (lookup-text! *common-text* (text-id press-to-exit) #f) s1-3 #f 128 22) ) (suspend) diff --git a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc index 37587e7d4f..0d37710a66 100644 --- a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc @@ -224,7 +224,7 @@ (water-info-init! s4-0 s5-0 (collide-action solid semi-solid)) (let ((s3-0 (-> s5-0 flags))) (when (logtest? (water-flags touch-water) s3-0) - (set! (-> obj enemy-flags) (logior (enemy-flag directed-ready) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag directed-ready)) (set! (-> obj water-surface-height) (-> s5-0 trans y)) (when (not (focus-test? obj touch-water under-water)) (let ((s2-0 (new 'stack-no-clear 'vector))) @@ -1114,7 +1114,7 @@ ) (set! (-> obj enemy-flags) (the-as enemy-flag (logior (enemy-flag dislike-combo) (-> obj enemy-flags)))) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logior! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag notice)) (set-enemy-info! obj arg0) @@ -1229,7 +1229,7 @@ ) (set! (-> obj enemy-flags) v1-80) ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (if (and (-> obj enemy-info move-to-ground) (not (logtest? (enemy-flag vulnerable-backup) (-> obj enemy-flags))) (not (logtest? (enemy-option ambush) (-> obj fact enemy-options))) @@ -1252,7 +1252,7 @@ ) ) (if (-> arg1 scale y) - (set! (-> self enemy-flags) (logior (enemy-flag alert) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag alert)) ) (if (-> arg1 scale z) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag vulnerable-backup) (-> self enemy-flags)))) @@ -1849,7 +1849,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (kill-prefer-falling obj) @@ -1867,7 +1867,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (when (zero? (-> obj hit-points)) @@ -1891,7 +1891,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (if (zero? (-> obj hit-points)) @@ -1906,7 +1906,7 @@ This commonly includes things such as: ) (let ((v1-162 (logtest? (enemy-flag alert) (-> obj enemy-flags)))) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (cond (v1-162 @@ -1991,7 +1991,7 @@ This commonly includes things such as: ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (kill-prefer-falling obj) ) ) @@ -2233,7 +2233,7 @@ This commonly includes things such as: ;; definition for function enemy-falling-post ;; INFO: Used lq/sq (defbehavior enemy-falling-post enemy () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (cond ((focus-test? self under-water) @@ -2275,7 +2275,7 @@ This commonly includes things such as: ;; INFO: Used lq/sq ;; WARN: Return type mismatch int vs none. (defbehavior enemy-die-falling-post enemy () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (if (focus-test? self under-water) (enemy-method-47 self (-> gp-0 transv)) @@ -2366,7 +2366,7 @@ This commonly includes things such as: (logior! (-> self draw status) (draw-control-status no-draw)) (set! (-> self draw origin quad) (-> self root trans quad)) (if (logtest? (enemy-flag alert) (-> self enemy-flags)) - (set! (-> self enemy-flags) (logior (enemy-flag victory) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag victory)) ) (logior! (-> self focus-status) (focus-status disable)) (none) @@ -2794,7 +2794,7 @@ This commonly includes things such as: (defmethod enemy-method-91 enemy ((obj enemy) (arg0 int) (arg1 enemy-jump-info)) (case arg0 ((2 3) - (set! (-> obj enemy-flags) (logior (enemy-flag directed) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag directed)) (let ((f30-0 (the float (-> arg1 hang-time)))) (let ((a1-3 (compute-trans-at-time (-> arg1 traj) f30-0 (new 'stack-no-clear 'vector)))) (move-to-point! (-> obj root) a1-3) @@ -3113,7 +3113,7 @@ This commonly includes things such as: ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) @@ -3135,7 +3135,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch collide-spec vs none. (defmethod enemy-method-101 enemy ((obj enemy)) (when (not (logtest? (enemy-flag use-trigger) (-> obj enemy-flags))) - (set! (-> obj enemy-flags) (logior (enemy-flag use-trigger) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag use-trigger)) (logclear! (-> obj enemy-flags) (enemy-flag directed)) (enemy-method-124 obj) ) @@ -3473,7 +3473,7 @@ This commonly includes things such as: :enter (behavior () (set! (-> self state-time) (current-time)) (stop-looking-at-target! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logclear! (-> self mask) (process-mask actor-pause)) (let* ((v1-8 *game-info*) (a0-4 (+ (-> v1-8 attack-id) 1)) @@ -3483,7 +3483,7 @@ This commonly includes things such as: ) (enemy-method-103 self) (if (logtest? (enemy-option knocked-into-water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup)) ) (let ((v1-16 (-> self root))) (logclear! (-> v1-16 status) (collide-status @@ -3556,7 +3556,7 @@ This commonly includes things such as: ) (set! (-> self enemy-flags) v1-15) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-22 (-> self enemy-flags))) @@ -3676,7 +3676,7 @@ This commonly includes things such as: (logtest? (-> *game-info* secrets) (game-secrets hero-mode)) ) ) - (set! (-> obj enemy-flags) (logior (enemy-flag cam-attack-mode) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag cam-attack-mode)) (remove-from-process *part-engine* obj) (setup-masks (-> obj draw) @@ -3777,7 +3777,7 @@ This commonly includes things such as: 0 (set! (-> self hit-points) 0) (if (logtest? (enemy-option knocked-into-water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup)) ) (enemy-method-103 self) (none) @@ -3827,7 +3827,7 @@ This commonly includes things such as: :virtual #t :event enemy-event-handler :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag victory) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag victory)) ((-> (method-of-type enemy idle) enter)) (none) ) diff --git a/test/decompiler/reference/jak2/engine/anim/joint_REF.gc b/test/decompiler/reference/jak2/engine/anim/joint_REF.gc index d055b4bf1b..f20bd0f470 100644 --- a/test/decompiler/reference/jak2/engine/anim/joint_REF.gc +++ b/test/decompiler/reference/jak2/engine/anim/joint_REF.gc @@ -2129,7 +2129,7 @@ ) ) (logior! (-> v1-6 flags) 1) - (set! (-> v1-6 flags) (logand -3 (-> v1-6 flags))) + (logand! (-> v1-6 flags) -3) ) (cond ((< arg0 (+ (-> obj free-index) -1)) @@ -2208,7 +2208,7 @@ ) (let ((s4-1 (kmalloc (-> obj kheap) (the-as int s3-0) (kmalloc-flags) "malloc"))) (unpack-comp-lzo (the-as (pointer uint8) s4-1) (the-as (pointer uint8) (-> s5-0 fixed))) - (set! (-> s5-0 flags) (logand -2 (-> s5-0 flags))) + (logand! (-> s5-0 flags) -2) (logior! (-> s5-0 flags) 2) (set! (-> s5-0 fixed) (the-as joint-anim-compressed-fixed s4-1)) (dotimes (v1-22 (the-as int (-> s5-0 num-frames))) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc index ea6185b30e..770ed9e9f0 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc @@ -2707,7 +2707,7 @@ (let ((v1-283 (handle->process (-> *camera* settings butt-handle)))) (cond (v1-283 - (set! (-> self options) (logior (cam-slave-options-u32 HAVE_BUTT_HANDLE) (-> self options))) + (logior! (-> self options) (cam-slave-options-u32 HAVE_BUTT_HANDLE)) (let* ((s3-1 (quaternion->matrix (new 'stack-no-clear 'matrix) (-> (the-as process-drawable v1-283) root quat))) (a2-18 (matrix-axis-angle! (new 'stack-no-clear 'matrix) diff --git a/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc b/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc index 2fc8c8b297..7ed35063b9 100644 --- a/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc +++ b/test/decompiler/reference/jak2/engine/collide/collide-debug_REF.gc @@ -260,7 +260,7 @@ ) (else (if (logtest? s5-1 8192) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :nolineofsight #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :nolineofsight #x1)) ) (if (logtest? s5-1 1024) (set! (-> a1-17 show-pat-set noentity) 1) @@ -284,16 +284,16 @@ (set! (-> a1-17 show-pat-set nopilot) 1) ) (if (logtest? s5-1 512) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :noendlessfall #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :noendlessfall #x1)) ) (if (logtest? s5-1 #x4000) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :nomech #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :nomech #x1)) ) (if (logtest? #x10000 s5-1) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :noproj #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :noproj #x1)) ) (if (logtest? #x40000 s5-1) - (set! (-> a1-17 show-pat-set) (logior (new 'static 'pat-surface :probe #x1) (-> a1-17 show-pat-set))) + (logior! (-> a1-17 show-pat-set) (new 'static 'pat-surface :probe #x1)) ) (if (logtest? #x20000 s5-1) (logior! (-> a1-17 event-mask) 64) diff --git a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc index 30682386c3..f6d18aed8c 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc @@ -174,7 +174,7 @@ ;; INFO: Used lq/sq (defmethod initialize-options collectable ((obj collectable) (arg0 int) (arg1 float) (arg2 fact-info)) (logclear! (-> obj mask) (process-mask crate enemy platform ambient)) - (set! (-> obj mask) (logior (process-mask bit18) (-> obj mask))) + (logior! (-> obj mask) (process-mask bit18)) (set! (-> obj flags) (collectable-flag pickup no-eco-blue)) (set! (-> obj bob-amount) arg1) (set! (-> obj bob-offset) @@ -3203,7 +3203,7 @@ This commonly includes things such as: (let ((s3-1 (new 'stack-no-clear 'collide-query))) (set! (-> s3-1 start-pos quad) (-> (the-as process-drawable (-> obj process)) root trans quad)) (set-vector! (-> s3-1 move-dist) 0.0 -81920.0 0.0 1.0) - (set! (-> s3-1 start-pos y) (+ 12288.0 (-> s3-1 start-pos y))) + (+! (-> s3-1 start-pos y) 12288.0) (let ((v1-75 s3-1)) (set! (-> v1-75 radius) 40.96) (set! (-> v1-75 collide-with) (collide-spec backgnd)) @@ -3217,7 +3217,7 @@ This commonly includes things such as: (set! (-> s3-1 start-pos quad) (-> (the-as process-drawable (-> obj process)) root trans quad)) ) (if (= s2-0 (pickup-type fuel-cell)) - (set! (-> s3-1 start-pos y) (+ 6144.0 (-> s3-1 start-pos y))) + (+! (-> s3-1 start-pos y) 6144.0) ) (birth-pickup-at-point (-> s3-1 start-pos) s2-0 f30-0 arg0 arg1 obj) ) @@ -3372,7 +3372,3 @@ This commonly includes things such as: ;; failed to figure out what this is: 0 - - - - diff --git a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc index 7a2174f8b8..894c9fa1eb 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc @@ -770,11 +770,10 @@ ) (set! (-> self root status) (collide-status)) (set! (-> self root root-prim local-sphere w) (-> self carry carry-radius)) - (set! (-> self root root-prim prim-core collide-with) - (logior (collide-spec backgnd crate obstacle hit-by-others-list pusher) - (-> self root root-prim prim-core collide-with) - ) - ) + (logior! + (-> self root root-prim prim-core collide-with) + (collide-spec backgnd crate obstacle hit-by-others-list pusher) + ) (none) ) :trans (behavior () @@ -1251,7 +1250,7 @@ This commonly includes things such as: (defmethod crate-init! crate ((obj crate) (arg0 entity-actor)) "Initialize the [[crate]] with the specified [[entity-actor]]." (stack-size-set! (-> obj main-thread) 128) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s4-0 reaction) cshape-reaction-default) diff --git a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc index 9140db2006..9e6eac8ae2 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc @@ -164,7 +164,7 @@ (s5-0 (new 'stack-no-clear 'collide-query)) ) (set! (-> s5-0 start-pos quad) (-> s4-0 prim-core world-sphere quad)) - (set! (-> s5-0 start-pos y) (+ 8192.0 (-> s5-0 start-pos y))) + (+! (-> s5-0 start-pos y) 8192.0) (set! (-> s5-0 start-pos w) 1.0) (vector-reset! (-> s5-0 move-dist)) (set! (-> s5-0 move-dist y) -90112.0) diff --git a/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc index 78287ba04d..94405122c0 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc @@ -2173,7 +2173,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 string)) (stack-size-set! (-> obj main-thread) 128) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj clock) (-> *display* part-clock)) (set! (-> obj root) (new 'process 'trsqv)) (set! (-> obj root trans quad) (-> arg0 extra trans quad)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc index 4a1e3a825d..e655766d33 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc @@ -181,7 +181,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (init-plat-collision! obj) (process-drawable-from-entity! obj entity) (initialize-skeleton obj (the-as skeleton-group (get-art-group obj)) (the-as pair 0)) 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 ce8e2f359c..548fc69870 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc @@ -872,9 +872,7 @@ (defbehavior target-powerup-process target () (let ((f30-0 (-> self control collision-spheres 0 prim-core world-sphere w))) (if (focus-test? self board) - (set! (-> self control collision-spheres 0 prim-core world-sphere w) - (+ 4096.0 (-> self control collision-spheres 0 prim-core world-sphere w)) - ) + (+! (-> self control collision-spheres 0 prim-core world-sphere w) 4096.0) ) (water-control-method-10 (-> self water)) (set! (-> self control collision-spheres 0 prim-core world-sphere w) f30-0) @@ -1114,7 +1112,7 @@ ) (logior! (-> self focus-status) (focus-status in-air)) (if (logtest? (surface-flag super) (-> self control current-surface flags)) - (set! (-> self focus-status) (logior (focus-status super) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status super)) ) ) (else @@ -1122,7 +1120,7 @@ ) ) (if (using-gun? self) - (set! (-> self focus-status) (logior (focus-status gun) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status gun)) (logclear! (-> self focus-status) (focus-status gun)) ) (if (or (logtest? (water-flags touch-water) (-> self water flags)) @@ -1142,11 +1140,11 @@ (logclear! (-> self focus-status) (focus-status under-water)) ) (if (= (-> self control ground-pat material) (pat-material ice)) - (set! (-> self focus-status) (logior (focus-status ice) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status ice)) (logclear! (-> self focus-status) (focus-status ice)) ) (if (< (- (current-time) (-> self gun fire-time)) (seconds 0.1)) - (set! (-> self focus-status) (logior (focus-status shooting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status shooting)) (logclear! (-> self focus-status) (focus-status shooting)) ) 0 diff --git a/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc index db784eb0ad..4ca79e6b69 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/projectile_REF.gc @@ -64,11 +64,11 @@ ) (when (logtest? (-> obj options) (projectile-options account-for-target-velocity)) (set! (-> v1-1 attacker-velocity quad) (-> obj pre-move-transv quad)) - (set! (-> v1-1 mask) (logior (attack-info-mask attacker-velocity) (-> v1-1 mask))) + (logior! (-> v1-1 mask) (attack-info-mask attacker-velocity)) ) (when (logtest? (-> obj options) (projectile-options deal-damage)) (set! (-> v1-1 damage) (-> obj damage)) - (set! (-> v1-1 mask) (logior (attack-info-mask damage) (-> v1-1 mask))) + (logior! (-> v1-1 mask) (attack-info-mask damage)) ) (when (logtest? (projectile-options respect-invinc-time) (-> obj options)) (set! (-> v1-1 invinc-time) (-> obj invinc-time)) @@ -521,7 +521,7 @@ If we've met or exceeded the projectiles maximum allowed hits, switch to the [[p (set! (-> self root dynam gravity-length) 1228800.0) (set! (-> self root dynam gravity-max) 1228800.0) ) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (logclear! (-> self mask) (process-mask enemy)) (set! (-> s5-0 trans quad) (-> arg0 pos quad)) (set! (-> self starting-pos quad) (-> arg0 pos quad)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc index b9fe543133..317e75d7e4 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc @@ -575,7 +575,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (allocate-and-init-cshape obj) (process-drawable-from-entity! obj arg0) (init-skel-and-rigid-body obj) 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 b7a001fe23..a4cf75e574 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc @@ -638,7 +638,7 @@ This commonly includes things such as: (setup-collision obj) (init obj) (process-drawable-from-entity! obj arg0) - (set! (-> obj root trans y) (+ 4096.0 (-> obj root trans y))) + (+! (-> obj root trans y) 4096.0) (set! (-> obj base-trans quad) (-> obj root trans quad)) (set! (-> obj total-time) (seconds 90)) (go (method-of-object obj wait)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc index 24fa77fefd..8164a79585 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc @@ -669,7 +669,7 @@ ) ) ) - (set! (-> obj flags) (logior (water-flags part-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags part-water)) (if (logtest? (-> obj flags) (water-flags flow)) (set! (-> obj flow) (new 'process 'flow-control obj (the-as res-lump #f))) ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc index 778c74fe68..fdec923050 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc @@ -752,7 +752,7 @@ ((and (logtest? (-> obj flags) (water-flags no-grab-ground)) (logtest? (-> obj process focus-status) (focus-status grabbed)) ) - (set! (-> obj flags) (logior (water-flags jump-out) (-> obj flags))) + (logior! (-> obj flags) (water-flags jump-out)) (logclear! (-> obj flags) (water-flags break-surface)) ) ((begin @@ -811,7 +811,7 @@ ) (enter-water obj) ) - (set! (-> obj flags) (logior (water-flags touch-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags touch-water)) (cond ((>= (-> obj top 0 y) (-> obj height)) (let ((s3-0 (new 'stack-no-clear 'vector))) @@ -819,7 +819,7 @@ (let ((v1-79 (-> obj process control transv))) (sqrtf (+ (* (-> v1-79 x) (-> v1-79 x)) (* (-> v1-79 z) (-> v1-79 z)))) ) - (set! (-> obj flags) (logior (water-flags break-surface) (-> obj flags))) + (logior! (-> obj flags) (water-flags break-surface)) (set! (-> s3-0 y) (+ 40.96 (-> obj surface-height))) (when (and (not (handle->process (-> obj ripple))) (>= (+ (current-time) (seconds -1.5)) (-> obj enter-water-time))) (let* ((s1-0 (get-process *default-dead-pool* manipy #x4000)) @@ -933,7 +933,7 @@ ) ) (else - (set! (-> obj flags) (logior (water-flags head-under-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags head-under-water)) ) ) (when (and (logtest? (water-flags part-splash) (-> obj flags)) (logtest? (water-flags part-water) (-> obj flags))) @@ -1026,7 +1026,7 @@ ) (set! (-> obj swim-time) (current-time)) (send-event (-> obj process) 'swim) - (set! (-> obj flags) (logior (water-flags swimming) (-> obj flags))) + (logior! (-> obj flags) (water-flags swimming)) (if (not (logtest? (water-flags swimming) s4-0)) (set! (-> obj enter-swim-time) (current-time)) ) @@ -1070,7 +1070,7 @@ ) (set! (-> obj wade-time) (current-time)) (send-event (-> obj process) 'wade) - (set! (-> obj flags) (logior (water-flags wading) (-> obj flags))) + (logior! (-> obj flags) (water-flags wading)) ) ((and (< (-> obj bottom 0 y) f30-1) (not (logtest? (water-flags jump-out) (-> obj flags)))) (logior! (-> obj flags) (water-flags under-water)) @@ -1081,7 +1081,7 @@ (< (-> obj bottom 1 y) f30-1) (and (< f30-1 (-> obj bottom 0 y)) (logtest? s4-0 (water-flags under-water))) ) - (set! (-> obj flags) (logior (water-flags swimming) (-> obj flags))) + (logior! (-> obj flags) (water-flags swimming)) (let ((a1-47 (new 'stack-no-clear 'vector))) (set! (-> a1-47 quad) (-> obj bottom 0 quad)) (let ((s4-1 (the-as collide-shape-moving (-> obj process control)))) @@ -1220,7 +1220,7 @@ ) (set! (-> obj drip-joint-index) s5-1) (set! (-> obj drip-old-pos quad) (-> v0-38 quad)) - (set! (-> obj flags) (logior (water-flags spawn-drip) (-> obj flags))) + (logior! (-> obj flags) (water-flags spawn-drip)) ) ) ) @@ -1331,7 +1331,7 @@ ;; WARN: Return type mismatch int vs none. (defmethod enter-water water-control ((obj water-control)) (with-pp - (set! (-> obj flags) (logior (water-flags touch-water) (-> obj flags))) + (logior! (-> obj flags) (water-flags touch-water)) (logclear! (-> obj flags) (water-flags jump-out)) (set! (-> obj enter-water-time) (current-time)) (set-vector! (-> obj enter-water-pos) (-> obj bottom 0 x) (-> obj surface-height) (-> obj bottom 0 z) 1.0) @@ -1583,7 +1583,7 @@ (logior! (-> arg0 flags) (water-flags can-wade can-ground)) ) ((= v1-39 'event) - (set! (-> arg0 flags) (logior (water-flags event) (-> arg0 flags))) + (logior! (-> arg0 flags) (water-flags event)) ) ((= v1-39 'tar) (logior! (-> arg0 flags) (water-flags tar)) @@ -1622,11 +1622,11 @@ (set! (-> (the-as region-prim-area #x70000000) pos quad) (-> s2-2 prim-core world-sphere quad)) (if (and (within-area? arg1 (the-as region-prim-area (+ #x70000000 0))) (begin - (set! (-> arg0 flags) (logior (water-flags over-water) (-> arg0 flags))) + (logior! (-> arg0 flags) (water-flags over-water)) (>= (-> arg0 trans y) (- (-> s2-2 prim-core world-sphere y) (-> s2-2 prim-core world-sphere w))) ) ) - (set! (-> arg0 flags) (logior (water-flags touch-water) (-> arg0 flags))) + (logior! (-> arg0 flags) (water-flags touch-water)) ) ) (&+! s2-2 80) 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 ab4aed92b2..83f5341ff3 100644 --- a/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc @@ -506,7 +506,7 @@ (let ((v1-0 *col-rend*)) (when (= arg1 (debug-menu-msg press)) (logxor! (-> v1-0 show-only) arg0) - (set! (-> v1-0 show-only) (logand -57 (-> v1-0 show-only))) + (logand! (-> v1-0 show-only) -57) ) (logtest? (-> v1-0 show-only) arg0) ) @@ -4033,16 +4033,14 @@ "get all" #f ,(lambda ((arg0 object) (arg1 debug-menu-msg)) - (set! (-> *game-info* features) - (logior (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) - (-> *game-info* features) - ) - ) - (set! (-> *game-info* debug-features) - (logior (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) - (-> *game-info* debug-features) - ) - ) + (logior! + (-> *game-info* features) + (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) + ) + (logior! + (-> *game-info* debug-features) + (game-feature darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant) + ) (send-event *target* 'get-pickup 7 #x42c80000) ) ) diff --git a/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc b/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc index 89b69f3ba5..e3349d2c57 100644 --- a/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/nav/mysql-nav-graph_REF.gc @@ -410,11 +410,10 @@ if none exist, return `-1`" (else (let ((v1-3 (indexof-visnode obj edge-id node-id))) (when (>= v1-3 0) - (set! (-> (the-as mysql-nav-visnode (+ (the-as uint (-> obj visnode-array)) (* v1-3 32))) nav_visnode_id) - (logand -3 - (-> (the-as mysql-nav-visnode (+ (the-as uint (-> obj visnode-array)) (* v1-3 32))) nav_visnode_id) - ) - ) + (logand! + (-> (the-as mysql-nav-visnode (+ (the-as uint (-> obj visnode-array)) (* v1-3 32))) nav_visnode_id) + -3 + ) (return v1-3) ) ) diff --git a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc index e925316255..b9356d68df 100644 --- a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc @@ -1594,8 +1594,8 @@ (go-virtual move-plane) ) (when (and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> self selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -5 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -5 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -5) + (logand! (-> *mouse* button0-rel 0) -5) (set! (-> self plane-height) (-> self nav-graph node-array data (-> self selected-index) position y)) ) (nav-graph-editor-method-41 self) @@ -1669,13 +1669,11 @@ ) (cond ((and (logtest? (-> *mouse* button0-rel 0) 1) - (begin - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (let ((v1-20 (logand -2 (-> *mouse* button0-rel 0)))) - (set! (-> *mouse* button0-rel 0) v1-20) - (and v1-20 (!= (-> obj selected-index) (-> obj edge-src))) - ) - ) + (begin (logand! (-> *mouse* button0-abs 0) -2) (let ((v1-20 (logand -2 (-> *mouse* button0-rel 0)))) + (set! (-> *mouse* button0-rel 0) v1-20) + (and v1-20 (!= (-> obj selected-index) (-> obj edge-src))) + ) + ) ) (cond ((>= (-> obj selected-index) 0) @@ -1698,8 +1696,8 @@ (if (= (-> obj edge-dst) -2) (nav-graph-editor-method-58 obj) ) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go (method-of-object obj create)) ) ) @@ -1745,8 +1743,8 @@ (nav-graph-editor-method-32 obj (-> obj selected-node-edge?) (-> obj selected-index)) (cond ((logtest? (-> *mouse* button0-rel 0) 1) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (go (method-of-object obj create-edge)) ) ((and (logtest? (-> *mouse* button0-rel 0) 2) @@ -1801,18 +1799,18 @@ (nav-graph-editor-method-32 self (-> self selected-node-edge?) (-> self selected-index)) (cond ((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> self selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (nav-graph-editor-method-53 self (-> self edge-visibility) (-> self selected-index)) ) ((and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> self selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -5 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -5 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -5) + (logand! (-> *mouse* button0-rel 0) -5) (nav-graph-editor-method-57 self (-> self edge-visibility) (-> self selected-index)) ) ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go-virtual adjust-minimap) ) ) @@ -2019,13 +2017,13 @@ ) (cond ((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> obj selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (go (method-of-object obj adjust-edge-visibility)) ) ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go (method-of-object obj draw-closest-minimap)) ) (else @@ -2099,8 +2097,8 @@ ) (cond ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go-virtual adjust-minimap) ) (else @@ -2121,18 +2119,18 @@ (nav-graph-editor-method-32 obj (-> obj selected-node-edge?) (-> obj selected-index)) (cond ((and (logtest? (-> *mouse* button0-abs 0) 1) (>= (-> obj selected-index) 0) (-> obj selected-node-edge?)) - (set! (-> *mouse* button0-abs 0) (logand -2 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -2 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -2) + (logand! (-> *mouse* button0-rel 0) -2) (go (method-of-object obj move-node)) ) ((logtest? (-> *mouse* button0-abs 0) 2) - (set! (-> *mouse* button0-abs 0) (logand -3 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -3 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -3) + (logand! (-> *mouse* button0-rel 0) -3) (go (method-of-object obj create-edge)) ) ((and (logtest? (-> *mouse* button0-abs 0) 4) (>= (-> obj selected-index) 0)) - (set! (-> *mouse* button0-abs 0) (logand -5 (-> *mouse* button0-abs 0))) - (set! (-> *mouse* button0-rel 0) (logand -5 (-> *mouse* button0-rel 0))) + (logand! (-> *mouse* button0-abs 0) -5) + (logand! (-> *mouse* button0-rel 0) -5) (if (-> obj selected-node-edge?) (nav-graph-editor-method-55 obj (-> obj selected-index)) (nav-graph-editor-method-56 obj (-> obj selected-index)) diff --git a/test/decompiler/reference/jak2/engine/game/fact-h_REF.gc b/test/decompiler/reference/jak2/engine/game/fact-h_REF.gc index be52e3c1db..436d0ab885 100644 --- a/test/decompiler/reference/jak2/engine/game/fact-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/fact-h_REF.gc @@ -1442,7 +1442,7 @@ (set! sv-16 (new 'static 'res-tag)) (let ((v1-11 (res-lump-data s5-0 'trigger pointer :tag-ptr (& sv-16)))) (when v1-11 - (set! (-> gp-0 enemy-options) (logior (enemy-option has-trigger) (-> gp-0 enemy-options))) + (logior! (-> gp-0 enemy-options) (enemy-option has-trigger)) (let ((a0-13 0)) (dotimes (a1-11 (the-as int (-> sv-16 elt-count))) (let ((a2-12 (-> (the-as (pointer uint32) (&+ v1-11 (* a1-11 4)))))) 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 17ebde20ac..6287bafd9b 100644 --- a/test/decompiler/reference/jak2/engine/game/game-info_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/game-info_REF.gc @@ -513,7 +513,7 @@ (set! (-> obj task-deaths) 0) (set! (-> obj task-pickup-time) (-> *display* game-clock frame-counter)) (set! (-> obj unknown-array1 task) (-> *display* game-clock frame-counter)) - (set! (-> obj fuel) (+ 1.0 (-> obj fuel))) + (+! (-> obj fuel) 1.0) (logior! (-> obj task-perm-list data task status) (entity-perm-status complete)) (task-resolution-close! (the-as game-task task)) ) diff --git a/test/decompiler/reference/jak2/engine/game/main_REF.gc b/test/decompiler/reference/jak2/engine/game/main_REF.gc index fd719e304c..983ca41dd2 100644 --- a/test/decompiler/reference/jak2/engine/game/main_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/main_REF.gc @@ -1037,23 +1037,22 @@ (send-event *target* 'get-pickup 7 #x447a0000) (send-event *target* 'get-pickup 22 #x447a0000) (send-event *target* 'get-pickup 21 #x447a0000) - (set! (-> *game-info* features) - (logior (game-feature - gun - gun-yellow - gun-red - gun-blue - gun-dark - board - darkjak - darkjak-bomb0 - darkjak-bomb1 - darkjak-invinc - darkjak-giant - ) - (-> *game-info* features) - ) - ) + (logior! + (-> *game-info* features) + (game-feature + gun + gun-yellow + gun-red + gun-blue + gun-dark + board + darkjak + darkjak-bomb0 + darkjak-bomb1 + darkjak-invinc + darkjak-giant + ) + ) (logior! (-> *game-info* debug-features) (game-feature gun gun-yellow gun-red gun-blue gun-dark board darkjak) diff --git a/test/decompiler/reference/jak2/engine/game/settings_REF.gc b/test/decompiler/reference/jak2/engine/game/settings_REF.gc index 1708e4d655..ed49d05b21 100644 --- a/test/decompiler/reference/jak2/engine/game/settings_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/settings_REF.gc @@ -663,15 +663,13 @@ ) ) (('rapid-tracking) - (set! (-> obj slave-options) (logior (cam-slave-options RAPID_TRACKING) (-> obj slave-options))) + (logior! (-> obj slave-options) (cam-slave-options RAPID_TRACKING)) ) (('bike-mode) (logior! (-> obj slave-options) (cam-slave-options BIKE_MODE)) ) (('vertical-follow-matches-camera) - (set! (-> obj slave-options) - (logior (cam-slave-options VERTICAL_FOLLOW_MATCHES_CAMERA) (-> obj slave-options)) - ) + (logior! (-> obj slave-options) (cam-slave-options VERTICAL_FOLLOW_MATCHES_CAMERA)) ) (('matrix-blend-max-angle) (set! (-> obj matrix-blend-max-angle) arg2) @@ -1043,7 +1041,7 @@ ) (if (-> s5-0 double-jump) (logclear! (-> *target* state-flags) (state-flags prevent-double-jump)) - (set! (-> *target* state-flags) (logior (state-flags prevent-double-jump) (-> *target* state-flags))) + (logior! (-> *target* state-flags) (state-flags prevent-double-jump)) ) (if (-> s5-0 attack) (logclear! (-> *target* state-flags) (state-flags prevent-attack)) @@ -1051,11 +1049,11 @@ ) (if (-> s5-0 board) (logclear! (-> *target* state-flags) (state-flags prevent-board)) - (set! (-> *target* state-flags) (logior (state-flags prevent-board) (-> *target* state-flags))) + (logior! (-> *target* state-flags) (state-flags prevent-board)) ) (if (-> s5-0 gun) (logclear! (-> *target* state-flags) (state-flags prevent-gun)) - (set! (-> *target* state-flags) (logior (state-flags prevent-gun) (-> *target* state-flags))) + (logior! (-> *target* state-flags) (state-flags prevent-gun)) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc index f69f606d5d..0e126fccd5 100644 --- a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc @@ -110,7 +110,7 @@ or collectable items on the ground (jetboard / weapon upgrades / etc)" (let ((s5-0 (new 'stack-no-clear 'collide-query-with-vec))) (set! (-> s5-0 vec quad) (-> arg0 quad)) (set! (-> s5-0 cquery start-pos quad) (-> s5-0 vec quad)) - (set! (-> s5-0 cquery start-pos y) (+ 20480.0 (-> s5-0 cquery start-pos y))) + (+! (-> s5-0 cquery start-pos y) 20480.0) (set-vector! (-> s5-0 cquery move-dist) 0.0 -81920.0 0.0 1.0) (let ((v1-4 (-> s5-0 cquery))) (set! (-> v1-4 radius) 1024.0) 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 80f2ca4548..cbd2b6d6c6 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 @@ -924,7 +924,7 @@ (logior! (-> *game-info* features) (game-feature board)) ) (((game-task-node-command add-board-training)) - (set! (-> *game-info* features) (logior (game-feature board-training) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature board-training)) ) (((game-task-node-command sub-board)) (logclear! (-> *game-info* features) (game-feature board)) @@ -948,34 +948,34 @@ (logior! (-> *game-info* features) (game-feature gun gun-upgrade-ammo)) ) (((game-task-node-command add-gun-up-3)) - (set! (-> *game-info* features) (logior (game-feature gun gun-upgrade-damage) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature gun gun-upgrade-damage)) ) (((game-task-node-command add-pass-red)) - (set! (-> *game-info* features) (logior (game-feature pass-red) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-red)) ) (((game-task-node-command add-pass-green)) - (set! (-> *game-info* features) (logior (game-feature pass-green) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-green)) ) (((game-task-node-command add-pass-yellow)) - (set! (-> *game-info* features) (logior (game-feature pass-yellow) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-yellow)) ) (((game-task-node-command add-pass-blue)) - (set! (-> *game-info* features) (logior (game-feature pass-blue) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature pass-blue)) ) (((game-task-node-command add-darkjak)) (logior! (-> *game-info* features) (game-feature darkjak)) ) (((game-task-node-command add-darkjak-0)) - (set! (-> *game-info* features) (logior (game-feature darkjak-bomb0) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-bomb0)) ) (((game-task-node-command add-darkjak-1)) - (set! (-> *game-info* features) (logior (game-feature darkjak-bomb1) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-bomb1)) ) (((game-task-node-command add-darkjak-2)) - (set! (-> *game-info* features) (logior (game-feature darkjak-invinc) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-invinc)) ) (((game-task-node-command add-darkjak-3)) - (set! (-> *game-info* features) (logior (game-feature darkjak-giant) (-> *game-info* features))) + (logior! (-> *game-info* features) (game-feature darkjak-giant)) ) ) 0 diff --git a/test/decompiler/reference/jak2/engine/gfx/background/prototype_REF.gc b/test/decompiler/reference/jak2/engine/gfx/background/prototype_REF.gc index 0c7c1b095a..530bc92d30 100644 --- a/test/decompiler/reference/jak2/engine/gfx/background/prototype_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/background/prototype_REF.gc @@ -8,7 +8,7 @@ (let ((shrub (-> obj data shrub-idx))) (when (and *debug-segment* (-> *screen-shot-work* highres-enable)) (dotimes (shrub-i 4) - (set! (-> shrub dists data shrub-i) (+ 40960000.0 (-> shrub dists data shrub-i))) + (+! (-> shrub dists data shrub-i) 40960000.0) (set! (-> shrub rdists data shrub-i) (/ 1.0 (-> shrub dists data shrub-i))) ) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/foreground/shadow-cpu_REF.gc b/test/decompiler/reference/jak2/engine/gfx/foreground/shadow-cpu_REF.gc index f6411e51cc..30d7fe3502 100644 --- a/test/decompiler/reference/jak2/engine/gfx/foreground/shadow-cpu_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/foreground/shadow-cpu_REF.gc @@ -885,7 +885,7 @@ (let ((s4-0 (new 'stack-no-clear 'collide-query))) (let ((v1-0 pp)) (set! (-> s4-0 start-pos quad) (-> arg0 quad)) - (set! (-> s4-0 start-pos y) (+ 4096.0 (-> s4-0 start-pos y))) + (+! (-> s4-0 start-pos y) 4096.0) (set-vector! (-> s4-0 move-dist) 0.0 (- arg3) 0.0 1.0) (let ((a0-4 s4-0)) (set! (-> a0-4 radius) 8192.0) diff --git a/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc b/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc index ee2e1e0401..1055c5d52b 100644 --- a/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc @@ -42,6 +42,9 @@ ;; WARN: Stack slot offset 16 signed mismatch ;; WARN: Stack slot offset 16 signed mismatch ;; ERROR: Failed store: (s.w! a0-43 v1-54) at op 457 +;; ERROR: Failed store: (s.w! (+ a0-43 4) a1-9) at op 461 +;; ERROR: Failed store: (s.w! (+ a0-43 8) a1-10) at op 463 +;; ERROR: Failed store: (s.w! (+ a0-43 12) a1-11) at op 465 (defun update-math-camera ((arg0 math-camera) (arg1 symbol) (arg2 symbol) (arg3 float)) (local-vars (sv-16 float)) (set! (-> arg0 x-ratio) (tan (* 0.5 arg3))) @@ -310,22 +313,22 @@ ) (set! (-> arg0 trans w) 1.0) (if (cpad-hold? arg1 r1) - (set! (-> arg0 trans y) (+ 80.0 (-> arg0 trans y))) + (+! (-> arg0 trans y) 80.0) ) (if (cpad-hold? arg1 r2) - (set! (-> arg0 trans y) (+ -80.0 (-> arg0 trans y))) + (+! (-> arg0 trans y) -80.0) ) (if (cpad-hold? arg1 x) - (set! (-> arg0 rot x) (+ 546.13336 (-> arg0 rot x))) + (+! (-> arg0 rot x) 546.13336) ) (if (cpad-hold? arg1 triangle) - (set! (-> arg0 rot x) (+ -546.13336 (-> arg0 rot x))) + (+! (-> arg0 rot x) -546.13336) ) (if (cpad-hold? arg1 left) - (set! (-> arg0 rot y) (+ 546.13336 (-> arg0 rot y))) + (+! (-> arg0 rot y) 546.13336) ) (if (cpad-hold? arg1 right) - (set! (-> arg0 rot y) (+ -546.13336 (-> arg0 rot y))) + (+! (-> arg0 rot y) -546.13336) ) arg0 ) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc index bceacecd16..eb444edaa8 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc @@ -466,7 +466,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ 393216.0 (-> v1-0 x))) + (+! (-> v1-0 x) 393216.0) (let ((t0-7 v1-0) (t1-3 a0-2) ) @@ -482,7 +482,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 z) (+ 393216.0 (-> v1-0 z))) + (+! (-> v1-0 z) 393216.0) (let ((t0-12 v1-0) (t1-4 a0-2) ) @@ -498,7 +498,7 @@ (logior! (-> (the-as (pointer uint8) (+ arg2 (the-as int arg0)))) (ash 1 arg1)) (return #f) ) - (set! (-> v1-0 x) (+ -393216.0 (-> v1-0 x))) + (+! (-> v1-0 x) -393216.0) (.lvf vf2 (&-> v1-0 quad)) (.lvf vf3 (&-> a0-2 quad)) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc index 297b7fed3d..b816654594 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc @@ -320,10 +320,10 @@ (+! (-> obj st-scroll x) (* 8.0 (-> pp clock seconds-per-frame))) (set! (-> obj st-scroll y) (- (-> obj st-scroll y) (* 8.0 (-> pp clock seconds-per-frame)))) (if (< 128.0 (-> obj st-scroll x)) - (set! (-> obj st-scroll x) (+ -128.0 (-> obj st-scroll x))) + (+! (-> obj st-scroll x) -128.0) ) (if (< (-> obj st-scroll y) 0.0) - (set! (-> obj st-scroll y) (+ 128.0 (-> obj st-scroll y))) + (+! (-> obj st-scroll y) 128.0) ) ) (set! (-> obj uv-scroll-0 x) (the int (* 16.0 (-> obj st-scroll x)))) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-transition_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-transition_REF.gc index 14b52f4594..d57c841424 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-transition_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-transition_REF.gc @@ -1,5 +1,7 @@ +;;-*-Lisp-*- (in-package goal) +;; definition for method 30 of type ocean (defmethod ocean-trans-camera-masks-bit? ocean ((obj ocean) (arg0 uint) (arg1 uint)) (let ((v1-2 (- arg0 (* (-> obj mid-minz) 4))) (a1-3 (- arg1 (* (-> obj mid-minx) 4))) @@ -22,6 +24,7 @@ ) ) +;; definition for method 31 of type ocean (defmethod ocean-trans-mask-ptrs-bit? ocean ((obj ocean) (arg0 int) (arg1 int)) (let ((v1-2 (- arg0 (the-as int (* (-> obj mid-minz) 4)))) (a1-3 (- arg1 (the-as int (* (-> obj mid-minx) 4)))) @@ -51,6 +54,7 @@ ) ) +;; definition for method 32 of type ocean (defmethod ocean-trans-mask-ptrs-set! ocean ((obj ocean) (arg0 uint) (arg1 uint)) (let ((v1-2 (- arg0 (* (-> obj mid-minz) 4))) (a1-3 (- arg1 (* (-> obj mid-minx) 4))) @@ -92,6 +96,8 @@ ) ) +;; definition for method 33 of type ocean +;; INFO: Used lq/sq (defmethod ocean-trans-add-upload-table ocean ((obj ocean) (arg0 dma-buffer) (arg1 uint) (arg2 uint) (arg3 int) (arg4 int) (arg5 symbol)) (local-vars (v1-16 (inline-array vector4w)) @@ -283,6 +289,9 @@ ) ) +;; definition for method 34 of type ocean +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. (defmethod ocean-trans-add-upload-strip ocean ((obj ocean) (arg0 dma-buffer) (arg1 uint) (arg2 uint) (arg3 int) (arg4 int) (arg5 int)) (local-vars (v1-10 float) @@ -399,6 +408,9 @@ ) ) +;; definition for method 35 of type ocean +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. (defmethod ocean-transition-check ocean ((obj ocean) (arg0 ocean-trans-mask) (arg1 int) (arg2 int) (arg3 vector)) (local-vars (v1-13 float) (t0-3 float) (t0-8 float) (t0-13 float)) (rlet ((vf1 :class vf) @@ -427,7 +439,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (goto cfg-24) ) - (set! (-> v1-0 x) (+ 98304.0 (-> v1-0 x))) + (+! (-> v1-0 x) 98304.0) (let ((t0-7 v1-0) (t1-3 a0-2) ) @@ -443,7 +455,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (goto cfg-24) ) - (set! (-> v1-0 z) (+ 98304.0 (-> v1-0 z))) + (+! (-> v1-0 z) 98304.0) (let ((t0-12 v1-0) (t1-4 a0-2) ) @@ -459,7 +471,7 @@ (logior! (-> arg0 mask arg2) (ash 1 arg1)) (goto cfg-24) ) - (set! (-> v1-0 x) (+ -98304.0 (-> v1-0 x))) + (+! (-> v1-0 x) -98304.0) (.lvf vf2 (&-> v1-0 quad)) (.lvf vf3 (&-> a0-2 quad)) ) @@ -478,6 +490,9 @@ ) ) +;; definition for method 36 of type ocean +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. (defmethod ocean-make-trans-camera-masks ocean ((obj ocean) (arg0 uint) (arg1 uint) (arg2 uint) (arg3 uint)) (local-vars (sv-48 ocean-trans-mask) (sv-52 vector) (sv-56 vector) (sv-60 vector)) (set! sv-48 (the-as ocean-trans-mask (&-> obj trans-camera-masks (+ (* arg2 4) arg3)))) @@ -500,6 +515,8 @@ (none) ) +;; definition for method 37 of type ocean +;; WARN: Return type mismatch int vs none. (defmethod ocean-trans-add-upload ocean ((obj ocean) (arg0 dma-buffer) (arg1 uint) (arg2 uint)) (when (not (ocean-trans-mask-ptrs-bit? obj (the-as int arg1) (the-as int arg2))) (let ((s0-0 (ocean-trans-camera-masks-bit? obj (+ arg1 -1) arg2)) @@ -624,6 +641,8 @@ (none) ) +;; definition for method 38 of type ocean +;; WARN: Return type mismatch int vs none. (defmethod draw-ocean-transition-seams ocean ((obj ocean) (arg0 dma-buffer)) (local-vars (sv-32 uint) (sv-33 uint) (sv-34 uint) (sv-35 uint) (sv-36 sphere)) (set! sv-32 (-> obj near-minx)) @@ -674,6 +693,8 @@ (none) ) +;; definition for method 39 of type ocean +;; WARN: Return type mismatch int vs none. (defmethod ocean-trans-add-constants ocean ((obj ocean) (arg0 dma-buffer)) (let* ((a2-0 4) (v1-0 arg0) @@ -697,6 +718,9 @@ (none) ) +;; definition for method 40 of type ocean +;; INFO: Used lq/sq +;; WARN: Return type mismatch int vs none. (defmethod draw-ocean-transition ocean ((obj ocean) (arg0 dma-buffer)) (local-vars (sv-32 uint) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc index cd1866537a..8aaf7bb65d 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc @@ -117,7 +117,7 @@ (set! (-> s3-0 quad) (-> arg1 pos quad)) (set! (-> s3-0 y) 0.0) (vector-normalize! s3-0 1.0) - (set! (-> s3-0 y) (+ 0.1 (-> s3-0 y))) + (+! (-> s3-0 y) 0.1) (vector-normalize! s3-0 1.0) (let ((s5-0 (new 'stack-no-clear 'vector4))) (let* ((f0-4 (vector-dot (-> s4-0 sun0-normal) s3-0)) @@ -1115,7 +1115,6 @@ ;; definition for method 19 of type ocean ;; WARN: Return type mismatch pointer vs none. -;; ERROR: Failed store: (s.w! (+ a0-1 8) 0) at op 5 (defmethod init-buffer! ocean ((obj ocean) (arg0 dma-buffer)) "Initialize [[ocean]] DMA buffer." (dma-buffer-add-gs-set arg0 @@ -1134,7 +1133,6 @@ ;; definition for method 20 of type ocean ;; WARN: Return type mismatch int vs none. -;; ERROR: Failed store: (s.w! (+ a0-1 8) 0) at op 4 (defmethod end-buffer! ocean ((obj ocean) (arg0 dma-buffer)) (dma-buffer-add-gs-set arg0 (texa (new 'static 'gs-texa :ta1 #x80))) 0 diff --git a/test/decompiler/reference/jak2/engine/gfx/sky/sky-data_REF.gc b/test/decompiler/reference/jak2/engine/gfx/sky/sky-data_REF.gc index 251313a71c..e3c2ab1fe6 100644 --- a/test/decompiler/reference/jak2/engine/gfx/sky/sky-data_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/sky/sky-data_REF.gc @@ -917,7 +917,7 @@ ) (set-vector! (-> s3-0 stq) (* 0.25 (the float (+ s4-0 -4))) (* 0.25 (the float (+ s5-0 -4))) 1.0 1.0) (set! (-> s3-0 nrm quad) (-> s3-0 pos quad)) - (set! (-> s3-0 nrm y) (+ 1.0 (-> s3-0 nrm y))) + (+! (-> s3-0 nrm y) 1.0) (vector-normalize! (-> s3-0 nrm) 1.0) (vector-negate! (-> s3-0 nrm2) (-> s3-0 nrm)) (cond @@ -1106,7 +1106,7 @@ (set! (-> s4-0 pos z) (* 9.0 (cos (* 182.04445 (* 10.0 (the float s5-0)))))) (set! (-> s4-0 pos y) 0.0) (set! (-> (the-as cloud-vertex (-> s4-0 nrm)) pos quad) (-> (the-as cloud-vertex (-> s4-0 pos)) pos quad)) - (set! (-> s4-0 nrm y) (+ 1.0 (-> s4-0 nrm y))) + (+! (-> s4-0 nrm y) 1.0) (vector-normalize! (-> s4-0 nrm) 1.0) ) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/texture/texture_REF.gc b/test/decompiler/reference/jak2/engine/gfx/texture/texture_REF.gc index eb1c6fbe33..650a929548 100644 --- a/test/decompiler/reference/jak2/engine/gfx/texture/texture_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/texture/texture_REF.gc @@ -1984,7 +1984,7 @@ ;; definition for function hack-texture (defun hack-texture ((arg0 texture)) (set! (-> arg0 uv-dist) 1000000.0) - (set! (-> arg0 masks data 0 dist) (+ 40960000.0 (-> arg0 masks data 0 dist))) + (+! (-> arg0 masks data 0 dist) 40960000.0) (set! (-> arg0 masks data 1 dist) (+ 40960000.0 (-> arg0 masks data 1 dist))) ) diff --git a/test/decompiler/reference/jak2/engine/level/level_REF.gc b/test/decompiler/reference/jak2/engine/level/level_REF.gc index 46681b4bac..f757e3dbc5 100644 --- a/test/decompiler/reference/jak2/engine/level/level_REF.gc +++ b/test/decompiler/reference/jak2/engine/level/level_REF.gc @@ -933,7 +933,7 @@ ) (when (and *debug-segment* (-> *screen-shot-work* highres-enable)) (dotimes (v1-105 4) - (set! (-> proto dists data v1-105) (+ 40960000.0 (-> proto dists data v1-105))) + (+! (-> proto dists data v1-105) 40960000.0) (set! (-> proto rdists data v1-105) (/ 1.0 (-> proto dists data v1-105))) ) ) diff --git a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc index 24df704a42..6e5fdcd66e 100644 --- a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc @@ -323,7 +323,7 @@ (nav-enemy-method-177 obj) (cond ((nav-enemy-method-174 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag directed) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag directed)) (let ((s5-0 (-> obj nav))) (when (logtest? (-> s5-0 state flags) (nav-state-flag at-gap)) (let ((s4-0 (new 'stack-no-clear 'nav-gap-info))) @@ -1160,7 +1160,7 @@ ) (set! (-> obj enemy-flags) (the-as enemy-flag (logior (enemy-flag dislike-combo) (-> obj enemy-flags)))) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logior! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag notice)) (set! (-> obj nav-radius-backup) (-> obj root nav-radius)) @@ -1311,7 +1311,7 @@ ) (set! (-> obj enemy-flags) v1-114) ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (do-navigation-to-destination (-> obj nav state) (-> obj root trans)) (if (and (-> obj enemy-info move-to-ground) (not (logtest? (enemy-flag vulnerable-backup) (-> obj enemy-flags))) @@ -2696,7 +2696,7 @@ This commonly includes things such as: ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) @@ -2988,7 +2988,7 @@ This commonly includes things such as: :virtual #t :event (the-as (function process int symbol event-message-block object :behavior nav-enemy) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag victory) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag victory)) ((-> (method-of-type nav-enemy idle) enter)) (none) ) diff --git a/test/decompiler/reference/jak2/engine/nav/nav-mesh_REF.gc b/test/decompiler/reference/jak2/engine/nav/nav-mesh_REF.gc index 7ca8b4100d..b3ae06c85e 100644 --- a/test/decompiler/reference/jak2/engine/nav/nav-mesh_REF.gc +++ b/test/decompiler/reference/jak2/engine/nav/nav-mesh_REF.gc @@ -546,7 +546,7 @@ (let ((gp-0 (new 'stack-no-clear 'inline-array 'vector 3))) (set! (-> gp-0 0 quad) (-> obj bounds quad)) (if (logtest? (-> arg0 pat) 7) - (set! (-> gp-0 0 y) (+ 409.6 (-> gp-0 0 y))) + (+! (-> gp-0 0 y) 409.6) ) (let ((v1-7 (the-as int (+ (-> arg0 vertex-count) -1)))) (dotimes (s2-0 (the-as int (-> arg0 vertex-count))) diff --git a/test/decompiler/reference/jak2/engine/scene/scene_REF.gc b/test/decompiler/reference/jak2/engine/scene/scene_REF.gc index 4e495963b8..4d1c31b71f 100644 --- a/test/decompiler/reference/jak2/engine/scene/scene_REF.gc +++ b/test/decompiler/reference/jak2/engine/scene/scene_REF.gc @@ -873,11 +873,11 @@ ) ) (set! (-> s2-0 flags) (font-flags kerning middle left large)) - (set! (-> s2-0 origin x) (+ -1.0 (-> s2-0 origin x))) - (set! (-> s2-0 origin y) (+ -1.0 (-> s2-0 origin y))) + (+! (-> s2-0 origin x) -1.0) + (+! (-> s2-0 origin y) -1.0) (set! (-> s2-0 color) (font-color font-color-39)) - (set! (-> s2-0 origin x) (+ 1.0 (-> s2-0 origin x))) - (set! (-> s2-0 origin y) (+ 1.0 (-> s2-0 origin y))) + (+! (-> s2-0 origin x) 1.0) + (+! (-> s2-0 origin y) 1.0) (set! (-> s2-0 color) (font-color default)) (set! (-> s2-0 flags) (font-flags shadow kerning middle left large)) (print-game-text (the-as string s3-0) s2-0 #f 44 (bucket-id subtitle)) diff --git a/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc b/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc index ce04c06305..a2b06b2da7 100644 --- a/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/board-h_REF.gc @@ -438,14 +438,14 @@ (set! (-> v1-51 y) (-> self water height)) ) (set! (-> s5-0 0 quad) (-> v1-51 quad)) - (set! (-> s5-0 0 y) (+ 8192.0 (-> s5-0 0 y))) + (+! (-> s5-0 0 y) 8192.0) (set! (-> s5-0 0 r) 2867.2) (set! (-> s5-0 1 quad) (-> v1-51 quad)) - (set! (-> s5-0 1 y) (+ 12288.0 (-> s5-0 1 y))) + (+! (-> s5-0 1 y) 12288.0) (set! (-> s5-0 1 r) 2867.2) (set! (-> s5-0 2 quad) (-> v1-51 quad)) ) - (set! (-> s5-0 2 y) (+ 16384.0 (-> s5-0 2 y))) + (+! (-> s5-0 2 y) 16384.0) (set! (-> s5-0 2 r) 2867.2) (let ((v1-55 gp-0)) (set! (-> v1-55 best-dist) (the-as float s5-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 13bd1e5ceb..665fa30157 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 @@ -280,7 +280,7 @@ ) ) (vector-normalize! gp-0 8192.0) - (set! (-> gp-0 y) (+ 40960.0 (-> gp-0 y))) + (+! (-> gp-0 y) 40960.0) (vector+! gp-0 gp-0 (get-trans self 6)) (vector-! gp-0 gp-0 (get-trans self 0)) (send-event *camera* 'relative-position gp-0) @@ -354,7 +354,7 @@ (when (not (logtest? (-> self control old-status) (collide-status on-surface))) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self control trans quad)) - (set! (-> gp-0 y) (+ 2048.0 (-> gp-0 y))) + (+! (-> gp-0 y) 2048.0) (let ((s5-0 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-0 (let ((t9-10 (method-of-type part-tracker activate))) @@ -899,7 +899,7 @@ ) (let ((s3-2 (new 'stack-no-clear 'vector))) (set! (-> s3-2 quad) (-> self control trans quad)) - (set! (-> s3-2 y) (+ 2048.0 (-> s3-2 y))) + (+! (-> s3-2 y) 2048.0) (let ((s2-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s2-1 (let ((t9-5 (method-of-type part-tracker activate))) @@ -1152,7 +1152,7 @@ ) ) :enter (behavior () - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (set! (-> self state-time) (current-time)) (logior! (-> self control root-prim prim-core action) (collide-action no-normal-reset)) (set! (-> self control mod-surface) *board-halfpipe-mods*) @@ -1543,7 +1543,7 @@ (set! (-> self state-time) (current-time)) (cond ((= arg2 'halfpipe) - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (target-board-halfpipe-trans) ) (else @@ -1726,7 +1726,7 @@ (set! (-> self board unknown-time-frame04) (current-time)) (cond ((= arg2 'halfpipe) - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (target-board-halfpipe-trans) ) (else @@ -2202,7 +2202,7 @@ ) :enter (behavior ((arg0 symbol) (arg1 object) (arg2 object) (arg3 float)) (set! (-> self state-time) (current-time)) - (set! (-> self focus-status) (logior (focus-status rail) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status rail)) (logior! (-> self control root-prim prim-core action) (collide-action can-ride)) (set! (-> self control mod-surface) *board-ride-mods*) (set! (-> self board mods-backup) (-> self control mod-surface)) @@ -2315,7 +2315,7 @@ (add-to-trick-list (-> self board) (board-tricks board-rail) (* 100.0 (the float v1-15))) ) ) - (set! (-> self control trans y) (+ 1228.8 (-> self control trans y))) + (+! (-> self control trans y) 1228.8) (go target-board-jump (-> *TARGET_BOARD-bank* jump-height-min) @@ -2445,7 +2445,7 @@ ) ) :enter (behavior ((arg0 handle)) - (set! (-> self focus-status) (logior (focus-status halfpipe) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status halfpipe)) (set! (-> self control unknown-handle02) arg0) (set! (-> self state-time) (current-time)) (logior! (-> self control root-prim prim-core action) (collide-action no-normal-reset)) @@ -2744,7 +2744,7 @@ ) (when s4-1 (set! (-> self control unknown-vector38 quad) (-> (get-trans (the-as process-focusable s4-1) 0) quad)) - (set! (-> self control unknown-vector38 y) (+ 4096.0 (-> self control unknown-vector38 y))) + (+! (-> self control unknown-vector38 y) 4096.0) (set! (-> self control unknown-vector40 quad) (-> (get-quat (the-as process-focusable s4-1) 0) quad)) ) (let ((f28-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 30.0)))) @@ -3108,7 +3108,7 @@ (logior! (-> self focus-status) (focus-status hit)) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (target-board-exit) (none) ) 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 9765ecab5a..fd2aeb8980 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 @@ -719,7 +719,7 @@ (set! (-> self board ride-rot-old) -1.0) (set! (-> self control reaction) target-collision-reaction) (set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1 :noboard #x1 :probe #x1)) - (set! (-> self focus-status) (logior (focus-status board) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status board)) (logclear! (-> self control root-prim prim-core action) (collide-action can-ride)) (set! (-> self control bend-target) 1.0) (let ((v1-82 (-> self node-list data))) @@ -728,7 +728,7 @@ (set! (-> v1-82 0 param2) (the-as basic (-> self control cspace-offset))) ) (target-collide-set! 'board 0.0) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (set! (-> self board thrust-scale) 1.0) (set! (-> self board turn-anim-targ) 0.0) (set! (-> self board turn-anim-frame) 0.0) @@ -2121,11 +2121,11 @@ (let ((v1-69 (logtest? (-> s4-0 status) 2))) (if (logtest? (-> s4-0 status) 1) (logior! (-> s4-0 status) 2) - (set! (-> s4-0 status) (logand -3 (-> s4-0 status))) + (logand! (-> s4-0 status) -3) ) (if v1-69 (logior! (-> s4-0 status) 1) - (set! (-> s4-0 status) (logand -2 (-> s4-0 status))) + (logand! (-> s4-0 status) -2) ) ) ) @@ -2207,7 +2207,7 @@ ) ) (if (probe-test (-> self control) s3-5 (new 'static 'pat-surface :noentity #x1 :noboard #x1 :probe #x1)) - (set! (-> self control status) (logior (collide-status probe-hit) (-> self control status))) + (logior! (-> self control status) (collide-status probe-hit)) (move-by-vector! (-> self control) s3-5) ) ) @@ -2645,7 +2645,7 @@ (vector-! (new 'stack-no-clear 'vector) s3-2 (-> self control trans)) (new 'static 'pat-surface :noentity #x1 :noboard #x1 :probe #x1) ) - (set! (-> self control status) (logior (collide-status probe-hit) (-> self control status))) + (logior! (-> self control status) (collide-status probe-hit)) ) (if (and (-> self board ride-lock-on) (not (logtest? (collide-status probe-hit) (-> self control status)))) (move-to-point! (-> self control) s3-2) diff --git a/test/decompiler/reference/jak2/engine/target/gun/gun-red-shot_REF.gc b/test/decompiler/reference/jak2/engine/target/gun/gun-red-shot_REF.gc index ad09bef233..0ee438f917 100644 --- a/test/decompiler/reference/jak2/engine/target/gun/gun-red-shot_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/gun/gun-red-shot_REF.gc @@ -583,7 +583,7 @@ ) (update-transforms (-> self root)) (set! (-> self event-hook) gun-red-shot-event-handler) - (set! (-> self mask) (logior (process-mask projectile) (-> self mask))) + (logior! (-> self mask) (process-mask projectile)) (logclear! (-> self mask) (process-mask enemy)) (gun-red-shot-method-27 self) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 204 (seconds 0.1)) diff --git a/test/decompiler/reference/jak2/engine/target/gun/gun-states_REF.gc b/test/decompiler/reference/jak2/engine/target/gun/gun-states_REF.gc index 51db9150a4..f6077af74f 100644 --- a/test/decompiler/reference/jak2/engine/target/gun/gun-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/gun/gun-states_REF.gc @@ -40,7 +40,7 @@ ) ) :enter (behavior () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (set! (-> self control mod-surface) *gun-walk-mods*) (set! (-> self control unknown-word04) (the-as uint #f)) (set! (-> self state-time) (current-time)) diff --git a/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc b/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc index f4454d6e43..11d9e1884c 100644 --- a/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc @@ -433,7 +433,7 @@ ) (vector<-cspace! s3-0 (-> self mag gp-1 joint)) (vector-normalize-copy! s4-1 (-> self mag gp-1 joint bone transform vector 1) 40960.0) - (set! (-> s4-1 y) (+ 81920.0 (-> s4-1 y))) + (+! (-> s4-1 y) 81920.0) (set! (-> s5-2 ent) (-> self entity)) (set! (-> s5-2 charge) 1.0) (set! (-> s5-2 options) (projectile-options)) @@ -971,7 +971,7 @@ (vector-z-quaternion! (new 'stack-no-clear 'vector) (-> (the-as target (-> self parent 0)) control quat)) -20480.0 ) - (set! (-> s5-0 y) (+ 81920.0 (-> s5-0 y))) + (+! (-> s5-0 y) 81920.0) (set! (-> gp-0 ent) (-> self entity)) (set! (-> gp-0 charge) 1.0) (set! (-> gp-0 options) (projectile-options)) 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 f3fd5a7ca5..236e239b28 100644 --- a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc @@ -14,10 +14,8 @@ ) (or (= (-> self control mod-surface name) 'run) (= (-> self control mod-surface name) 'jump)) ) - (set! (-> self control current-surface target-speed) - (+ 20480.0 (-> self control current-surface target-speed)) - ) - (set! (-> self control current-surface transv-max) (+ 20480.0 (-> self control current-surface transv-max))) + (+! (-> self control current-surface target-speed) 20480.0) + (+! (-> self control current-surface transv-max) 20480.0) ) (when (and (and (focus-test? self dark) (nonzero? (-> self darkjak))) (or (= (-> self control mod-surface name) 'run) @@ -2269,7 +2267,7 @@ (let ((v1-10 (new 'stack-no-clear 'vector))) (vector+! v1-10 s4-1 s3-1) (vector-float*! v1-10 v1-10 0.5) - (set! (-> v1-10 y) (+ -6144.0 (-> v1-10 y))) + (+! (-> v1-10 y) -6144.0) (send-event *camera* 'ease-in #x3f000000 v1-10) ) (vector-segment-distance-point! (-> self control midpoint-of-hands) s4-1 s3-1 s5-0) @@ -2345,7 +2343,7 @@ (and (not (logtest? (-> self draw status) (draw-control-status no-draw))) (begin (vector<-cspace! s5-0 (-> self node-list data 3)) - (set! (-> s5-0 y) (+ -5896.192 (-> s5-0 y))) + (+! (-> s5-0 y) -5896.192) (< (fabs (- (-> s5-0 y) (-> self control trans y))) 8192.0) ) ) @@ -3348,7 +3346,7 @@ (set! (-> obj water flags) (water-flags swim-ground part-splash part-drip part-rings part-water find-water)) (reset-target-state #t) (set! (-> obj control last-trans-any-surf quad) (-> obj control trans quad)) - (set! (-> obj control last-trans-any-surf y) (+ -819200.0 (-> obj control last-trans-any-surf y))) + (+! (-> obj control last-trans-any-surf y) -819200.0) (set! (-> obj align) (new 'process 'align-control obj)) (set! (-> obj manipy) (the-as (pointer manipy) #f)) (set! (-> obj event-hook) target-generic-event-handler) @@ -3367,7 +3365,7 @@ (defbehavior target-init target ((arg0 continue-point)) (init-target self arg0 #f) (set! (-> self event-hook) (-> target-continue event)) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (go target-continue arg0) (none) ) diff --git a/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc index b1bdb47a3c..67cb12df53 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc @@ -308,7 +308,7 @@ ) (let ((a1-9 (new 'stack-no-clear 'collide-query))) (set! (-> a1-9 start-pos quad) (-> obj root trans quad)) - (set! (-> a1-9 start-pos y) (+ 6144.0 (-> a1-9 start-pos y))) + (+! (-> a1-9 start-pos y) 6144.0) (vector-! (-> a1-9 move-dist) (the-as vector (+ (the-as uint (-> s4-0 holds 0 world-mat trans)) (* 192 gp-0))) @@ -391,7 +391,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag37)))) ) @@ -627,7 +627,7 @@ :event (the-as (function process int symbol event-message-block object :behavior grunt-mech) enemy-event-handler) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self root root-prim prim-core collide-as) (collide-spec)) (stop-looking-at-target! self) (set! (-> self state-timeout) (+ (current-time) (get-rand-int-range self 450 900))) 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 de72af68a3..2b01befd0c 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 @@ -1198,9 +1198,7 @@ ) (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) (set-setting! 'mode-name 'cam-endlessfall 0.0 0) - (set! (-> self control pat-ignore-mask) - (logior (new 'static 'pat-surface :noendlessfall #x1) (-> self control pat-ignore-mask)) - ) + (logior! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noendlessfall #x1)) (logclear! (-> self water flags) (water-flags swim-ground)) (let ((f0-2 (fmin -4096.0 (- (-> self control ground-impact-vel))))) (set! (-> self control unknown-word04) (the-as uint f0-2)) @@ -1441,7 +1439,7 @@ ;; definition for function target-mech-carry-post (defbehavior target-mech-carry-post target () - (set! (-> self focus-status) (logior (focus-status carry) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status carry)) (target-mech-post) (target-mech-carry-update) (none) @@ -2748,7 +2746,7 @@ (ja-post) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector<-cspace! gp-1 (-> self node-list data 3)) - (set! (-> gp-1 y) (+ -9011.2 (-> gp-1 y))) + (+! (-> gp-1 y) -9011.2) (move-to-point! (-> self control) gp-1) ) (send-event *camera* 'ease-in) diff --git a/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc b/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc index f967340cd7..b3b5d92bca 100644 --- a/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/sidekick_REF.gc @@ -465,7 +465,7 @@ ;; definition for function init-sidekick ;; WARN: Return type mismatch object vs none. (defbehavior init-sidekick sidekick () - (set! (-> self mask) (logior (process-mask sidekick) (-> self mask))) + (logior! (-> self mask) (process-mask sidekick)) (set! (-> self root) (new 'process 'trsqv)) (vector-identity! (-> self root scale)) (quaternion-identity! (-> self root quat)) diff --git a/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc b/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc index 19236a03c1..cb900c0142 100644 --- a/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc @@ -233,14 +233,13 @@ (set! gp-0 0) ) ((let ((v1-125 (ja-group))) - (and v1-125 - (or (= v1-125 (-> self draw art-group data 48)) - (= v1-125 (-> self draw art-group data 402)) - (= v1-125 (-> self draw art-group data 409)) - (= v1-125 (-> self draw art-group data 404)) - (= v1-125 (-> self draw art-group data 406)) - (= v1-125 (-> self draw art-group data 413)) - ) + (and v1-125 (or (= v1-125 (-> self draw art-group data 48)) + (= v1-125 (-> self draw art-group data 402)) + (= v1-125 (-> self draw art-group data 409)) + (= v1-125 (-> self draw art-group data 404)) + (= v1-125 (-> self draw art-group data 406)) + (= v1-125 (-> self draw art-group data 413)) + ) ) ) ((lambda :behavior target @@ -250,32 +249,32 @@ (let* ((v1-5 (ja-group)) (a1-0 (cond ((and v1-5 (= v1-5 (-> self draw art-group data 402))) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 403) ) ((let ((v1-14 (ja-group))) (and v1-14 (= v1-14 (-> self draw art-group data 409))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 410) ) ((let ((v1-23 (ja-group))) (and v1-23 (= v1-23 (-> self draw art-group data 404))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 405) ) ((let ((v1-32 (ja-group))) (and v1-32 (= v1-32 (-> self draw art-group data 406))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 407) ) (else (let ((v1-41 (ja-group))) (cond ((and v1-41 (= v1-41 (-> self draw art-group data 413))) - (set! (-> self state-flags) (logior (state-flags lleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still)) (-> self draw art-group data 414) ) ((rand-vu-percent? 0.3) @@ -449,7 +448,7 @@ (suspend) (ja :num! (seek! (ja-aframe 142.0 0))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) frames num-frames) -1))) :frame-num (ja-aframe 142.0 0) @@ -478,7 +477,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (if (and (focus-test? self dark) (nonzero? (-> self darkjak))) (ja :group! (-> self draw art-group data 396)) (ja :group! (-> self draw art-group data 5)) @@ -1164,7 +1163,7 @@ (set! (-> v1-211 channel-offset) 0) ) 0 - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) ) ) (let ((f0-37 (fabs (- f20-0 f30-0)))) @@ -1413,7 +1412,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.02)) (let ((a1-4 (target-land-anim))) (ja-no-eval :group! a1-4 @@ -1446,7 +1445,7 @@ (not (using-gun? self)) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-set! 1) (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 28)) frames num-frames) -1))) @@ -1475,7 +1474,7 @@ ) ((lambda :behavior target () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-set! 1) (cond ((using-gun? self) @@ -1552,7 +1551,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let* ((v1-142 (ja-group)) (f30-0 (if (and v1-142 (= v1-142 (-> self draw art-group data 67))) 24576.0 @@ -1597,7 +1596,7 @@ ) ((lambda :behavior target () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.04)) (cond ((using-gun? self) @@ -1664,7 +1663,7 @@ ((let ((v1-201 (ja-group))) (and v1-201 (or (= v1-201 (-> self draw art-group data 321)) (= v1-201 (-> self draw art-group data 322)))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.04)) (ja-no-eval :group! (-> self draw art-group data 323) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 323)) frames num-frames) -1))) @@ -1685,7 +1684,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) (suspend) @@ -1700,7 +1699,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (ja-channel-push! 1 (seconds 0.017)) (ja-no-eval :group! (-> self draw art-group data 331) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 331)) frames num-frames) -1))) @@ -1714,7 +1713,7 @@ ((let ((v1-279 (ja-group))) (and v1-279 (or (= v1-279 (-> self draw art-group data 340)) (= v1-279 (-> self draw art-group data 341)))) ) - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (let ((v1-286 (ja-group))) (if (and v1-286 (= v1-286 (-> self draw art-group data 341))) (ja-channel-set! 1) diff --git a/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc b/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc index fe8320b6cc..c6fb6294b8 100644 --- a/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc @@ -108,7 +108,7 @@ (defbehavior target-carry-post target () (target-post) (target-carry-update) - (set! (-> self focus-status) (logior (focus-status carry) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status carry)) (none) ) 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 fe5d27f827..5342e7df77 100644 --- a/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc @@ -316,7 +316,7 @@ (set! (-> self darkjak attack-count) (the-as uint 0)) (set! (-> self darkjak-giant-interp) 1.0) (set-setting! 'sound-flava #f 30.0 4) - (set! (-> self focus-status) (logior (focus-status dark) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status dark)) (set! (-> (the-as fact-info-target (-> self fact)) darkjak-start-time) (current-time)) (set! (-> (the-as fact-info-target (-> self fact)) darkjak-effect-time) (seconds 20)) (if (logtest? (-> self darkjak stage) 16) @@ -421,7 +421,7 @@ ) ) :enter (behavior () - (set! (-> self state-flags) (logior (state-flags lleg-still rleg-still) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-still rleg-still)) (set! (-> self neck flex-blend) 0.0) (set! (-> self control mod-surface) *darkjak-trans-mods*) (kill-persister *setting-control* (the-as engine-pers 'bg-a-speed) 'bg-a-speed) @@ -1892,7 +1892,7 @@ (set! (-> self darkjak-interp) 1.0) (set! (-> self darkjak-giant-interp) (the-as float (-> self control unknown-word04))) (when (= (the-as float (-> self control unknown-word04)) 1.0) - (set! (-> self darkjak stage) (logand -33 (-> self darkjak stage))) + (logand! (-> self darkjak stage) -33) (set! (-> self darkjak want-stage) (-> self darkjak stage)) ) (none) @@ -1912,7 +1912,7 @@ ((method-of-type sphere new) (the-as symbol (-> s5-1 s4-0)) sphere) ) (set! (-> s5-1 0 quad) (-> self control trans quad)) - (set! (-> s5-1 0 y) (+ 12697.6 (-> s5-1 0 y))) + (+! (-> s5-1 0 y) 12697.6) (set! (-> s5-1 0 r) 11878.4) (let ((v1-29 gp-1)) (set! (-> v1-29 best-dist) (the-as float s5-1)) 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 e9fa31f30a..4d380d34be 100644 --- a/test/decompiler/reference/jak2/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-death_REF.gc @@ -99,7 +99,7 @@ (set! *spawn-actors* #f) (set! (-> self control unknown-word04) (the-as uint #f)) (set! (-> self state-time) (current-time)) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (let ((a0-3 (get-continue-by-name (-> self game) (-> arg0 name)))) (cond (a0-3 @@ -147,7 +147,7 @@ (apply-settings *setting-control*) (reset-target-state #t) (target-exit) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (ja-channel-set! 0) (quaternion-copy! (-> self control quat-for-control) (the-as quaternion (-> arg0 quat))) (move-to-point! (-> self control) (-> arg0 trans)) @@ -330,7 +330,7 @@ ) (when a2-26 (set! (-> s5-8 quad) (-> a2-26 extra trans quad)) - (set! (-> s5-8 y) (+ 9011.2 (-> s5-8 y))) + (+! (-> s5-8 y) 9011.2) (go target-warp-in s5-8 (-> arg0 trans) (the-as target a2-26)) ) ) @@ -344,7 +344,7 @@ (start-sig-recorder) ) ((logtest? (continue-flags pilot pilot-dax) (-> arg0 flags)) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (while (not (-> self mode-cache)) (suspend) ) @@ -1368,7 +1368,7 @@ ;; WARN: Return type mismatch int vs none. (defbehavior target-death-anim target ((arg0 spool-anim)) (set! (-> self control mod-surface) *neutral-mods*) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (ja-channel-push! 1 (seconds 0.1)) (ja-no-eval :group! (-> self draw art-group data 69) :num! (seek! (ja-aframe 30.0 0)) :frame-num 0.0) (until (ja-done? 0) @@ -1595,9 +1595,7 @@ (the-as float (send-event (handle->process (-> self attack-info attacker)) 'target 'die arg0)) ) (set! (-> self neck flex-blend) 0.0) - (set! (-> self control pat-ignore-mask) - (logior (new 'static 'pat-surface :noendlessfall #x1) (-> self control pat-ignore-mask)) - ) + (logior! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noendlessfall #x1)) (target-timed-invulnerable-off self 0) (case arg0 (('bot 'centipede) @@ -1630,7 +1628,7 @@ (apply-settings *setting-control*) (set! (-> self control transv quad) (the-as uint128 0)) (logior! (-> self focus-status) (focus-status dead)) - (set! (-> self state-flags) (logior (state-flags disable-attacks) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags disable-attacks)) (let ((v1-50 arg0)) (b! (not (or (= v1-50 'none) (= v1-50 'instant-death))) cfg-52 :delay (nop!)) (b! #t cfg-167 :delay (nop!)) 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 a108aa793a..b0858a2661 100644 --- a/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc @@ -1164,7 +1164,7 @@ ) (vector-flatten! s4-0 s4-0 (-> self control c-R-w vector 1)) (vector-normalize! s4-0 1.0) - (set! (-> gp-0 y) (+ 6144.0 (-> gp-0 y))) + (+! (-> gp-0 y) 6144.0) (vector+float*! gp-0 gp-0 s4-0 -32768.0) (vector+float*! s5-0 gp-0 s4-0 (+ 32768.0 (-> self gun track-find-range))) ) @@ -1188,7 +1188,7 @@ (defbehavior target-gun-find-track target () (if (logtest? (-> self gun upper-body track-mode) (track-mode lock-on)) (logior! (-> self gun track?) 8) - (set! (-> self gun track?) (logand -9 (-> self gun track?))) + (logand! (-> self gun track?) -9) ) (let ((gp-0 (the-as basic #f))) (when (and (or (< (- (current-time) (-> self control time-of-last-nonzero-input)) (seconds 0.2)) @@ -1203,7 +1203,7 @@ ) (target-gun-build-track-list) (let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 8)))) - (set! (-> t2-0 y) (+ 2048.0 (-> t2-0 y))) + (+! (-> t2-0 y) 2048.0) (cond ((logtest? (surface-flag gun-strafe) (-> self control current-surface flags)) (set! gp-0 (find-nearest-focusable @@ -1335,7 +1335,7 @@ ((and (not (send-event-function (the-as process-focusable s5-1) a1-21)) (zero? (-> self gun track-target-hold-time)) ) - (set! (-> self gun track?) (logand -5 (-> self gun track?))) + (logand! (-> self gun track?) -5) (set! (-> self gun track-trans quad) (-> (get-trans (the-as process-focusable s5-1) 3) quad)) ) (else @@ -1770,13 +1770,13 @@ (set! (-> gp-6 quad) (-> self gun top-anim-look-at quad)) (case (-> self gun gun-type) (((pickup-type eco-yellow)) - (set! (-> gp-6 y) (+ -409.6 (-> gp-6 y))) + (+! (-> gp-6 y) -409.6) ) (((pickup-type eco-blue)) - (set! (-> gp-6 y) (+ 2457.6 (-> gp-6 y))) + (+! (-> gp-6 y) 2457.6) ) (else - (set! (-> gp-6 y) (+ -1638.4 (-> gp-6 y))) + (+! (-> gp-6 y) -1638.4) ) ) (if (not (logtest? (surface-flag gun-no-twist) (-> self control current-surface flags))) 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 6671befcf7..b4eb8c73c2 100644 --- a/test/decompiler/reference/jak2/engine/target/target-handler_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-handler_REF.gc @@ -194,7 +194,7 @@ ) ) (logior! (-> self focus-status) (focus-status dead)) - (set! (-> self state-flags) (logior (state-flags disable-attacks) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags disable-attacks)) ) (go arg4 arg0 (-> self attack-info-rec)) ) @@ -766,7 +766,7 @@ v0-0 ) (('continue) - (set! (-> self focus-status) (logior (focus-status teleporting) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status teleporting)) (go target-continue (the-as continue-point (-> arg3 param 0))) ) (('query) @@ -1261,7 +1261,7 @@ (go target-darkjak-get-on (the-as int (-> arg3 param 2))) ) ((logtest? (-> arg3 param 2) 128) - (set! (-> self darkjak stage) (logand -2 (-> self darkjak stage))) + (logand! (-> self darkjak stage) -2) (set! v0-0 (+ (- (seconds 20) (-> self fact darkjak-start-time)) (current-time))) (set! (-> self fact darkjak-effect-time) (the-as time-frame v0-0)) v0-0 diff --git a/test/decompiler/reference/jak2/engine/target/target-part_REF.gc b/test/decompiler/reference/jak2/engine/target/target-part_REF.gc index cf064192fd..0dd55a9f7c 100644 --- a/test/decompiler/reference/jak2/engine/target/target-part_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-part_REF.gc @@ -35,7 +35,7 @@ ) (set! (-> s4-0 start-pos quad) (-> arg2 launchrot quad)) (set-vector! (-> s4-0 move-dist) 0.0 -20480.0 0.0 1.0) - (set! (-> s4-0 start-pos y) (+ 4096.0 (-> s4-0 start-pos y))) + (+! (-> s4-0 start-pos y) 4096.0) (let ((v1-3 s4-0)) (set! (-> v1-3 radius) 40.96) (set! (-> v1-3 collide-with) (collide-spec diff --git a/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc b/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc index e98ea6740f..f94459a481 100644 --- a/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc @@ -380,7 +380,7 @@ (set! (-> self state-time) (current-time)) (set! (-> self control mod-surface) *swim-mods*) (logior! (-> self water flags) (water-flags swim-ground)) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (none) ) :exit (behavior () @@ -535,7 +535,7 @@ ((-> target-swim-stance enter)) (die-on-next-update! (-> self water bob)) (set! (-> self control unknown-word04) (the-as uint (current-time))) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (none) ) :exit (-> target-swim-stance exit) @@ -696,7 +696,7 @@ ) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (logclear! (-> self water flags) (water-flags swim-ground)) (set! (-> self control mod-surface) *dive-mods*) (set! (-> self control dynam gravity-max) 16384.0) @@ -1026,7 +1026,7 @@ :trans (behavior () (cond ((< (- (current-time) (-> self state-time)) (seconds 0.5)) - (set! (-> self water flags) (logior (water-flags jump-out) (-> self water flags))) + (logior! (-> self water flags) (water-flags jump-out)) (logclear! (-> self control status) (collide-status on-surface on-ground touch-surface)) ) (else @@ -1048,7 +1048,7 @@ ((-> target-swim-stance exit)) (die-on-next-update! (-> self water bob)) (set! (-> self water align-offset) 0.0) - (set! (-> self water flags) (logior (water-flags jump-out) (-> self water flags))) + (logior! (-> self water flags) (water-flags jump-out)) (none) ) :code (behavior ((arg0 float) (arg1 float)) diff --git a/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc b/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc index 7aee5e5aaa..92462c2608 100644 --- a/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc @@ -630,7 +630,7 @@ (target-collide-set! 'tube 0.0) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control ctrl-xz-vel) 0.0) - (set! (-> self focus-status) (logior (focus-status tube) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status tube)) (remove-exit) (cond ((< (the-as diff --git a/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc b/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc index fa96e0d65f..2ffcda5175 100644 --- a/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc @@ -1791,7 +1791,7 @@ ) (let ((gp-3 (new 'stack-no-clear 'vector))) (set! (-> gp-3 quad) (-> self root trans quad)) - (set! (-> gp-3 y) (+ 8192.0 (-> gp-3 y))) + (+! (-> gp-3 y) 8192.0) (let ((s5-2 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-2 (let ((t9-13 (method-of-type part-tracker activate))) @@ -2103,7 +2103,7 @@ (vector-rotate-y! s3-0 s3-0 f30-0) (set! (-> s2-0 start-pos quad) (-> s5-0 quad)) (set-vector! (-> s2-0 move-dist) 0.0 -24576.0 0.0 0.0) - (set! (-> s2-0 start-pos y) (+ 2048.0 (-> s2-0 start-pos y))) + (+! (-> s2-0 start-pos y) 2048.0) (let ((v1-9 s2-0)) (set! (-> v1-9 radius) 409.6) (set! (-> v1-9 collide-with) (collide-spec backgnd)) @@ -2744,7 +2744,7 @@ This commonly includes things such as: (ja-post) (let ((gp-4 (new 'stack-no-clear 'vector))) (vector<-cspace! gp-4 (-> self node-list data 3)) - (set! (-> gp-4 y) (+ -9011.2 (-> gp-4 y))) + (+! (-> gp-4 y) -9011.2) (move-to-point! (-> self control) gp-4) ) (send-event *camera* 'ease-in) 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 f060b64d04..9aedbe236e 100644 --- a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc @@ -582,7 +582,7 @@ ) (set! (-> self control penetrate-using) (penetrate touch punch)) (if (and (focus-test? self dark) (nonzero? (-> self darkjak)) (logtest? (-> self darkjak stage) 2)) - (set! (-> self control penetrate-using) (logior (penetrate dark-punch) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate dark-punch)) ) ) (('uppercut) @@ -726,9 +726,9 @@ ) ) (when (and (focus-test? self dark) (nonzero? (-> self darkjak))) - (set! (-> self control penetrate-using) (logior (penetrate dark-skin) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate dark-skin)) (when (and (focus-test? self dark) (nonzero? (-> self darkjak)) (logtest? (-> self darkjak stage) 32)) - (set! (-> self control penetrate-using) (logior (penetrate dark-giant) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate dark-giant)) (let ((f0-46 (lerp-scale 1.0 (-> self darkjak-giant-interp) (-> self darkjak-interp) 0.0 1.0))) (set! (-> self control root-prim local-sphere w) (* (-> self control root-prim local-sphere w) f0-46)) (set! (-> self control root-prim local-sphere y) (* (-> self control root-prim local-sphere y) f0-46)) @@ -744,13 +744,13 @@ ) (case (-> self fact eco-type) ((1) - (set! (-> self control penetrate-using) (logior (penetrate eco-yellow) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate eco-yellow)) ) ((2) - (set! (-> self control penetrate-using) (logior (penetrate eco-red) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate eco-red)) ) ((3) - (set! (-> self control penetrate-using) (logior (penetrate eco-blue) (-> self control penetrate-using))) + (logior! (-> self control penetrate-using) (penetrate eco-blue)) ) ((5) (set! (-> self control penetrate-using) @@ -1573,7 +1573,7 @@ (set! (-> arg1 control invul1-off-time) arg0) ) ((2) - (set! (-> arg1 state-flags) (logior (state-flags tinvul2) (-> arg1 state-flags))) + (logior! (-> arg1 state-flags) (state-flags tinvul2)) (set! (-> arg1 control invul2-on-time) (current-time)) (set! (-> arg1 control invul2-off-time) arg0) ) @@ -2163,7 +2163,3 @@ (defmethod get-notice-time target ((obj target)) (-> obj neck notice-time) ) - - - - diff --git a/test/decompiler/reference/jak2/engine/target/target_REF.gc b/test/decompiler/reference/jak2/engine/target/target_REF.gc index 187cbd18a7..e3cd9b42a1 100644 --- a/test/decompiler/reference/jak2/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target_REF.gc @@ -1051,7 +1051,7 @@ ) ) ) - (set! (-> self state-flags) (logior (state-flags lleg-no-ik rleg-no-ik) (-> self state-flags))) + (logior! (-> self state-flags) (state-flags lleg-no-ik rleg-no-ik)) (until #f (if (= (-> self skel root-channel 0) (-> self skel channel)) (set! (-> self control mod-surface) *duck-mods*) @@ -4093,7 +4093,3 @@ ) :post target-post ) - - - - diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc index 09bd9b5b4f..fbb8392629 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc @@ -652,12 +652,12 @@ (set! a0-8 (cond (arg3 - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-1 arg1)) (set! (-> a0-1 color) (font-color progress-force-selected)) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond ((-> s3-0 0) (format @@ -713,12 +713,12 @@ (set! a0-8 (cond (arg3 - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-1 arg1)) (set! (-> a0-1 color) (font-color progress-force-selected)) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond ((-> s3-0 0) (format @@ -770,23 +770,23 @@ ) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ 43.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 43.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 52.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 52.0) ) ) (cond ((and (= (-> *progress-state* graphic-options-item-selected) 3) (-> *progress-state* graphic-options-item-picked) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-6 arg1)) (set! (-> a0-6 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 44 f28-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (cond ((= (-> s3-0 0) 'pal) (format @@ -826,9 +826,9 @@ ) ) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (cond ((= (-> s3-0 0) 'pal) (format @@ -887,7 +887,7 @@ 32 ) ) - (set! (-> arg1 origin y) (+ 8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 8.0) (cond ((= (-> obj name) (text-id progress-main-secrets-scrapbook)) (cond @@ -2188,7 +2188,7 @@ (set! (-> arg1 origin y) 80.0) (set! (-> arg1 height) 52.0) (+! (-> arg1 origin y) (the float (* 42 (+ arg2 1)))) - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -100.0) ) (else (case (get-aspect-ratio) @@ -2196,13 +2196,13 @@ (set! (-> arg1 origin y) 74.0) (set! (-> arg1 height) 42.0) (+! (-> arg1 origin y) (the float (* 60 (+ arg2 1)))) - (set! (-> arg1 origin x) (+ -90.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -90.0) ) (('aspect4x3) (set! (-> arg1 origin y) 74.0) (set! (-> arg1 height) 42.0) (+! (-> arg1 origin y) (the float (* 54 (+ arg2 1)))) - (set! (-> arg1 origin x) (+ -90.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -90.0) ) ) ) @@ -2451,8 +2451,8 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-8 (-> *level* default-level)) ) - (set! (-> arg1 origin y) (+ 1.0 (-> arg1 origin y))) - (set! (-> arg1 origin x) (+ 28.0 (-> arg1 origin x))) + (+! (-> arg1 origin y) 1.0) + (+! (-> arg1 origin x) 28.0) (let* ((v1-272 (-> *progress-save-info* file arg2 game-time0)) (v1-273 (logior (shl (-> *progress-save-info* file arg2 game-time1) 32) v1-272)) (s2-11 (/ (the-as int v1-273) #x107ac0)) @@ -2470,7 +2470,7 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-10 (-> *level* default-level)) ) - (set! (-> arg1 origin x) (+ 100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 100.0) (let ((s2-13 print-game-text)) (format (clear *temp-string*) "~D%" (the int (-> *progress-save-info* file arg2 completion-percentage))) (s2-13 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -2482,7 +2482,7 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-12 (-> *level* default-level)) ) - (set! (-> arg1 origin y) (+ 28.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 28.0) (let ((s2-15 print-game-text)) (format (clear *temp-string*) "~D" (the int (-> *progress-save-info* file arg2 skill-count))) (s2-15 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -2496,7 +2496,7 @@ ) ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-14 (-> *level* default-level)) ) - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -100.0) (let ((s2-17 print-game-text)) (format (clear *temp-string*) "~D" (the int (-> *progress-save-info* file arg2 gem-count))) (s2-17 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -2599,7 +2599,7 @@ (print-game-text (lookup-text! *common-text* (the-as text-id a1-1) #f) arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (let ((v1-25 arg1)) (set! (-> v1-25 height) (the float 160)) ) @@ -2650,7 +2650,7 @@ (s3-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 80.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 80.0) (let ((v1-17 arg1)) (set! (-> v1-17 height) (the float 50)) ) @@ -2665,7 +2665,7 @@ ) (s4-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 55.0) (let ((v1-22 arg1)) (set! (-> v1-22 height) (the float 90)) ) @@ -2680,7 +2680,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (let ((s5-2 arg1)) (set! (-> s5-2 color) (progress-selected 0)) ) @@ -2697,7 +2697,7 @@ (let ((s4-2 arg1)) (set! (-> s4-2 color) (progress-selected 0)) ) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (draw-highlight (the int (+ 30.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-continue-retry arg0 arg1) ) @@ -2735,7 +2735,7 @@ (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 140.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 140.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 30)) ) @@ -2783,7 +2783,7 @@ ) (s5-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 115.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 60)) ) @@ -2840,7 +2840,7 @@ (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 105)) ) @@ -2852,7 +2852,7 @@ ) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 115.0) (let ((v1-19 arg1)) (set! (-> v1-19 height) (the float 45)) ) @@ -2899,7 +2899,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 60)) ) @@ -2907,7 +2907,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-check) #f) 1) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 45)) ) @@ -2918,7 +2918,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 95)) ) @@ -2929,7 +2929,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 90.0) (let ((v1-19 arg1)) (set! (-> v1-19 height) (the float 25)) ) @@ -2973,7 +2973,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-was-removed) #f) 1) (s5-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 65.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 65.0) (print-game-text (lookup-text! *common-text* (text-id progress-autosave-disabled) #f) arg1 @@ -2981,7 +2981,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 65.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 65.0) (let ((v1-12 arg1)) (set! (-> v1-12 height) (the float 90)) ) @@ -2992,7 +2992,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 85.0) (let ((v1-15 arg1)) (set! (-> v1-15 height) (the float 35)) ) @@ -3039,7 +3039,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 85)) ) @@ -3051,7 +3051,7 @@ (bucket-id progress) ) (when (is-cd-in?) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-14 arg1)) (set! (-> v1-14 height) (the float 50)) ) @@ -3099,7 +3099,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 55.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 85)) ) @@ -3110,7 +3110,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 105.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 50)) ) @@ -3175,7 +3175,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 115.0) (let ((v1-31 arg1)) (set! (-> v1-31 height) (the float 95)) ) @@ -3186,7 +3186,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 90.0) (let ((v1-34 arg1)) (set! (-> v1-34 height) (the float 50)) ) @@ -3230,7 +3230,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-unformatted) #f) 1) (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 85)) ) @@ -3241,7 +3241,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 25)) ) @@ -3253,7 +3253,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (draw-yes-no arg0 arg1) 0 (none) @@ -3287,7 +3287,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 105.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 45)) ) @@ -3298,7 +3298,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (draw-highlight (the int (+ 8.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3330,7 +3330,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-no-jak2-found) #f) 1) (s4-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 95.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 60)) ) @@ -3341,7 +3341,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (draw-highlight (the int (+ 18.0 (-> arg1 origin y))) 22 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3376,7 +3376,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 95)) ) @@ -3387,7 +3387,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 85.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 55)) ) @@ -3398,7 +3398,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 30)) ) @@ -3409,7 +3409,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (draw-highlight (the int (-> arg1 origin y)) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3444,7 +3444,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 50)) ) @@ -3455,7 +3455,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (draw-highlight (the int (+ 12.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3490,7 +3490,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 50.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 90)) ) @@ -3501,7 +3501,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 85.0) (let ((v1-13 arg1)) (set! (-> v1-13 height) (the float 75)) ) @@ -3512,7 +3512,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (let ((v1-16 arg1)) (set! (-> v1-16 height) (the float 30)) ) @@ -3523,7 +3523,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (draw-highlight (the int (-> arg1 origin y)) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3558,7 +3558,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 100.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 100.0) (let ((v1-10 arg1)) (set! (-> v1-10 height) (the float 75)) ) @@ -3569,7 +3569,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 70.0) (draw-highlight (the int (+ 20.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -3604,7 +3604,7 @@ 44 (bucket-id progress) ) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) (draw-highlight (the int (+ 17.0 (-> arg1 origin y))) 24 (-> arg1 alpha)) (draw-yes-no arg0 arg1) 0 @@ -4272,7 +4272,7 @@ (let ((a0-27 arg1)) (set! (-> a0-27 flags) (font-flags kerning large)) ) - (set! (-> arg1 origin x) (+ 20.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 20.0) (case (get-aspect-ratio) (('aspect16x9) (set! (-> arg1 origin y) 80.0) @@ -4388,14 +4388,14 @@ (s3-6 *temp-string* arg1 #f 44 (bucket-id progress)) ) ) - (set! (-> arg1 origin x) (+ 20.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 20.0) (let ((f30-3 3.0) (s4-7 print-game-text) ) (format (clear *temp-string*) "~S" s5-1) (set! f0-50 (+ f30-3 (s4-7 *temp-string* arg1 #f 44 (bucket-id progress)))) ) - (set! (-> arg1 origin x) (+ -20.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -20.0) f0-50 ) (else @@ -4446,10 +4446,10 @@ ((not (-> arg0 can-toggle)) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg2 origin x) (+ -25.0 (-> arg2 origin x))) + (+! (-> arg2 origin x) -25.0) ) (('aspect16x9) - (set! (-> arg2 origin x) (+ -10.0 (-> arg2 origin x))) + (+! (-> arg2 origin x) -10.0) ) ) (when (= (-> *setting-control* user-default language) (language-enum german)) @@ -5327,7 +5327,7 @@ (let ((v1-18 sv-16)) (set! (-> v1-18 scale) 0.5) ) - (set! (-> sv-16 origin y) (+ 23.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 23.0) (let ((gp-3 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-2nd) #f)) (gp-3 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -5347,7 +5347,7 @@ (let ((v1-31 sv-16)) (set! (-> v1-31 scale) 0.4) ) - (set! (-> sv-16 origin y) (+ 20.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 20.0) (let ((gp-5 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-3rd) #f)) (gp-5 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -5367,7 +5367,7 @@ (let ((v1-44 sv-16)) (set! (-> v1-44 scale) 0.3) ) - (set! (-> sv-16 origin y) (+ 15.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 15.0) (let ((gp-7 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-4th) #f)) (gp-7 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -5384,7 +5384,7 @@ ) ) ((= v1-8 4) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-9 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-5th) #f)) (gp-9 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -5401,7 +5401,7 @@ ) ) ((= v1-8 5) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-11 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-6th) #f)) (gp-11 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -5418,7 +5418,7 @@ ) ) ((= v1-8 6) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-13 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-7th) #f)) (gp-13 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -5435,7 +5435,7 @@ ) ) ((= v1-8 7) - (set! (-> sv-16 origin y) (+ 12.0 (-> sv-16 origin y))) + (+! (-> sv-16 origin y) 12.0) (let ((gp-15 print-game-text)) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (text-id progress-highscores-8th) #f)) (gp-15 *temp-string* sv-16 #f 44 (bucket-id progress)) @@ -6135,7 +6135,7 @@ (let ((v1-40 sv-140)) (set! (-> v1-40 height) 185.0) ) - (set! (-> sv-140 origin y) (+ 46.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 46.0) (set! (-> sv-140 origin x) 65.0) (let ((v1-46 sv-140)) (set! (-> v1-46 width) (the float 367)) @@ -6173,7 +6173,7 @@ ) (gp-1 *temp-string* sv-140 #f 44 (bucket-id progress)) ) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (let ((v1-68 sv-140)) (set! (-> v1-68 scale) 0.6) ) @@ -6193,7 +6193,7 @@ (gp-2 *temp-string* sv-140 #f 44 (bucket-id progress)) ) (set! (-> sv-140 origin x) (- (-> sv-140 origin x) (+ 20.0 sv-120))) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (draw-highscore-icon sv-144 (get-highscore-icon (-> sv-144 page-index)) @@ -6248,7 +6248,7 @@ (let ((v1-128 sv-140)) (set! (-> v1-128 height) 185.0) ) - (set! (-> sv-140 origin y) (+ 46.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 46.0) (set! (-> sv-140 origin x) 80.0) (set! (-> sv-144 sprites 0 pos z) #xffffff) (let ((v1-135 sv-140)) @@ -6287,7 +6287,7 @@ ) (gp-6 *temp-string* sv-140 #f 44 (bucket-id progress)) ) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (let ((v1-157 sv-140)) (set! (-> v1-157 scale) 0.6) ) @@ -6307,7 +6307,7 @@ (gp-7 *temp-string* sv-140 #f 44 (bucket-id progress)) ) (set! (-> sv-140 origin x) (- (-> sv-140 origin x) (+ 20.0 sv-124))) - (set! (-> sv-140 origin y) (+ 25.0 (-> sv-140 origin y))) + (+! (-> sv-140 origin y) 25.0) (draw-highscore-icon sv-144 (get-highscore-icon (-> sv-144 prev-page-index)) @@ -6372,17 +6372,17 @@ (let ((v1-4 arg1)) (set! (-> v1-4 scale) 0.65) ) - (set! (-> arg1 origin y) (+ 15.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 15.0) (let ((s3-0 (-> *progress-state* game-options-vibrations))) (cond ((and (zero? (-> *progress-state* game-options-item-selected)) (-> *progress-state* game-options-item-picked)) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-2 arg1)) (set! (-> a0-2 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -6405,7 +6405,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (cond ((zero? (-> *progress-state* game-options-item-selected)) (let ((s2-3 arg1)) @@ -6420,7 +6420,7 @@ ) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -6462,17 +6462,17 @@ (let ((v1-4 arg1)) (set! (-> v1-4 scale) 0.65) ) - (set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 22.0) (let ((s3-0 (-> *progress-state* game-options-subtitles))) (cond ((and (= (-> *progress-state* game-options-item-selected) 1) (-> *progress-state* game-options-item-picked)) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-3 arg1)) (set! (-> a0-3 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -6495,7 +6495,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (cond ((= (-> *progress-state* game-options-item-selected) 1) (let ((s2-3 arg1)) @@ -6510,7 +6510,7 @@ ) ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -6550,10 +6550,10 @@ ) (case arg2 ((2) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) ) ((3) - (set! (-> arg1 origin y) (+ 32.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 32.0) ) ) (if (< f30-0 0.0) @@ -6571,7 +6571,7 @@ ) (draw-highlight (the int (-> arg1 origin y)) 44 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (-> obj language-selection) (let ((s4-1 (-> s4-0 0))) 7 @@ -6594,18 +6594,18 @@ (let ((a0-14 arg1)) (set! (-> a0-14 color) (font-color progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-1 print-game-text)) (format (clear *temp-string*) "~33L~C" 163) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 70.0) + (+! (-> arg1 origin x) 70.0) (let ((s5-2 print-game-text)) (format (clear *temp-string*) "~33L~C" 161) (s5-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-3 arg1)) (set! (-> s5-3 color) (progress-selected 0)) ) @@ -6648,7 +6648,7 @@ (let ((a0-36 arg1)) (set! (-> a0-36 color) (font-color progress)) ) - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (let ((a0-37 arg1)) (set! (-> a0-37 flags) (font-flags kerning middle large)) ) @@ -6685,10 +6685,10 @@ ) (case arg2 ((2) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) ) ((3) - (set! (-> arg1 origin y) (+ 32.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 32.0) ) ) (if (< f30-0 0.0) @@ -6709,7 +6709,7 @@ (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> obj name) #f)) (s3-0 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (-> obj language-selection) (let ((s4-1 (-> s4-0 0))) 7 @@ -6732,18 +6732,18 @@ (let ((a0-16 arg1)) (set! (-> a0-16 color) (font-color progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-1 print-game-text)) (format (clear *temp-string*) "~33L~C" 163) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 70.0) + (+! (-> arg1 origin x) 70.0) (let ((s5-2 print-game-text)) (format (clear *temp-string*) "~33L~C" 161) (s5-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s5-3 arg1)) (set! (-> s5-3 color) (progress-selected 0)) ) @@ -6791,7 +6791,7 @@ ) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *language-name-remap* (-> s4-0 0)) #f)) *temp-string* - (set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 24.0) (let ((a0-44 arg1)) (set! (-> a0-44 flags) (font-flags kerning middle large)) ) @@ -6857,19 +6857,19 @@ (set! (-> v1-5 scale) 0.75) ) (set! (-> arg1 height) 35.0) - (set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 20.0) (let ((s3-0 (-> *progress-state* graphic-options-aspect-ratio))) (cond ((and (= (-> *progress-state* graphic-options-item-selected) 1) (-> *progress-state* graphic-options-item-picked) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-4 arg1)) (set! (-> a0-4 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 23.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 23.0) (cond ((= s3-0 'aspect4x3) (format @@ -6892,7 +6892,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (when (not (and (zero? (-> *progress-state* graphic-options-item-selected)) (-> *progress-state* graphic-options-item-picked) ) @@ -6912,7 +6912,7 @@ ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 23.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 23.0) (cond ((= s3-0 'aspect4x3) (format @@ -6966,19 +6966,19 @@ (set! (-> v1-4 scale) 0.75) ) (set! (-> arg1 height) 35.0) - (set! (-> arg1 origin y) (+ 35.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 35.0) (let ((s3-0 (-> *progress-state* graphic-options-progressive-scan))) (cond ((and (= (-> *progress-state* graphic-options-item-selected) 2) (-> *progress-state* graphic-options-item-picked) ) - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (let ((a0-3 arg1)) (set! (-> a0-3 color) (font-color progress-force-selected)) ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -7001,7 +7001,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -8.0) (when (not (and (zero? (-> *progress-state* graphic-options-item-selected)) (-> *progress-state* graphic-options-item-picked) ) @@ -7021,7 +7021,7 @@ ) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 18.0) (cond (s3-0 (format @@ -7083,10 +7083,10 @@ (set! (-> arg1 origin x) 80.0) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ 5.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 5.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 30.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 30.0) ) ) (when (= (-> *setting-control* user-default language) (language-enum french)) @@ -7098,7 +7098,7 @@ (format (clear *temp-string*) "~33L~C" 160) (s5-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 21.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 21.0) (let ((s5-2 print-game-text)) (format (clear *temp-string*) @@ -7109,7 +7109,7 @@ ) (s5-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 21.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 21.0) (let ((s5-3 print-game-text)) (format (clear *temp-string*) "~33L~C" 162) (s5-3 *temp-string* arg1 #f 44 (bucket-id progress)) @@ -7123,10 +7123,10 @@ ) (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ -3.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -3.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 10.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 10.0) ) ) (let ((v1-37 arg1)) @@ -7141,7 +7141,7 @@ ) ) (else - (set! (-> arg1 origin y) (+ 5.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 5.0) (cond ((zero? (-> *progress-state* graphic-options-item-selected)) (let ((s4-3 arg1)) @@ -7176,7 +7176,7 @@ (set! (-> v1-4 scale) 0.75) ) (set! (-> arg1 height) 35.0) - (set! (-> arg1 origin y) (+ 5.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 5.0) (let ((s4-0 (&-> *progress-state* yes-no-choice))) (set! a0-11 (cond @@ -7186,7 +7186,7 @@ ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f0-1) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (let ((v1-17 arg1)) (set! (-> v1-17 scale) 0.6) ) @@ -7240,7 +7240,7 @@ (let ((v1-4 arg1)) (set! (-> v1-4 scale) 0.75) ) - (set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 45.0) (set! (-> arg1 height) 35.0) (let ((s4-0 (&-> *progress-state* yes-no-choice))) (set! a0-12 @@ -7251,7 +7251,7 @@ ) (draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f30-0) (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress)) - (set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 25.0) (let ((v1-18 arg1)) (set! (-> v1-18 scale) 0.6) ) @@ -7359,22 +7359,22 @@ (let ((v1-13 s5-0)) (set! (-> v1-13 scale) 0.6) ) - (set! (-> s5-0 origin y) (+ 20.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 20.0) (case (get-aspect-ratio) (('aspect4x3) (set! s2-0 157) (let ((v1-17 gp-0)) (cond ((zero? v1-17) - (set! (-> s5-0 origin y) (+ -24.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -24.0) (+! s2-0 -9) ) ((= v1-17 1) - (set! (-> s5-0 origin y) (+ -9.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -9.0) (+! s2-0 43) ) ((= v1-17 2) - (set! (-> s5-0 origin y) (+ 6.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 6.0) (+! s2-0 96) ) ) @@ -7388,15 +7388,15 @@ (let ((v1-28 gp-0)) (cond ((zero? v1-28) - (set! (-> s5-0 origin y) (+ -20.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -20.0) (+! s2-0 -20) ) ((= v1-28 1) - (set! (-> s5-0 origin y) (+ 2.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 2.0) (+! s2-0 40) ) ((= v1-28 2) - (set! (-> s5-0 origin y) (+ 30.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) 30.0) (+! s2-0 105) ) ) @@ -7410,7 +7410,7 @@ (cond (sv-32 (set! sv-128 (-> obj value-to-modify)) - (set! (-> s5-0 origin y) (+ -8.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -8.0) (let ((a0-12 s5-0)) (set! (-> a0-12 color) (font-color progress-force-selected)) ) @@ -7535,7 +7535,7 @@ ) (else (set! sv-208 (-> obj value-to-modify)) - (set! (-> s5-0 origin y) (+ -8.0 (-> s5-0 origin y))) + (+! (-> s5-0 origin y) -8.0) (when (or (= (-> *setting-control* user-default language) (language-enum german)) (= (-> *setting-control* user-default language) (language-enum french)) ) @@ -7700,10 +7700,10 @@ ((begin (case (get-aspect-ratio) (('aspect4x3) - (set! (-> arg1 origin y) (+ 32.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 32.0) ) (('aspect16x9) - (set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 60.0) ) ) (set! s5-0 (-> *setting-control* user-default stereo-mode)) @@ -7717,7 +7717,7 @@ (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> obj name) #f)) (s3-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 22.0) (let ((a0-13 arg1)) (set! (-> a0-13 color) (font-color progress)) ) @@ -7727,18 +7727,18 @@ (let ((a0-15 arg1)) (set! (-> a0-15 color) (font-color progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s4-1 print-game-text)) (format (clear *temp-string*) "~33L~C" 163) (s4-1 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) - (set! (-> arg1 origin x) (+ 70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) 70.0) + (+! (-> arg1 origin x) 70.0) (let ((s4-2 print-game-text)) (format (clear *temp-string*) "~33L~C" 161) (s4-2 *temp-string* arg1 #f 44 (bucket-id progress)) ) - (set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -70.0) (let ((s4-3 arg1)) (set! (-> s4-3 color) (progress-selected 0)) ) @@ -7772,7 +7772,7 @@ ) (format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *stereo-mode-name-remap* s5-0) #f)) (let ((a0-37 *temp-string*)) - (set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) 22.0) (let ((a1-19 arg1)) (set! (-> a1-19 flags) (font-flags kerning middle large)) ) @@ -7814,13 +7814,13 @@ (set! s1-0 36) (+! s2-0 -8) (when (memcard-unlocked-secrets? #f) - (set! (-> arg1 origin y) (+ -35.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -35.0) (set! s1-0 36) (+! s2-0 -34) ) ) ((= *options* (-> arg0 current-options)) - (set! (-> arg1 origin y) (+ -20.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -20.0) (let ((v1-16 arg1)) (set! (-> v1-16 scale) 0.85) ) @@ -7875,7 +7875,7 @@ ) ) ) - (set! (-> arg1 origin y) (+ -120.0 (-> arg1 origin y))) + (+! (-> arg1 origin y) -120.0) (set! (-> arg1 origin x) (- (-> arg1 origin x) (the float (if (= (get-aspect-ratio) 'aspect4x3) 10 5 @@ -7961,14 +7961,14 @@ ) ) (else - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) + (+! (-> arg1 origin x) -100.0) (set! (-> arg1 origin y) (+ -35.0 (-> arg1 origin y))) ) ) ) ((= *load-save-options* (-> arg0 current-options)) - (set! (-> arg1 origin x) (+ -100.0 (-> arg1 origin x))) - (set! (-> arg1 origin y) (+ -25.0 (-> arg1 origin y))) + (+! (-> arg1 origin x) -100.0) + (+! (-> arg1 origin y) -25.0) (print-menu-text (lookup-text! *common-text* (-> obj name) #f) (-> obj scale) arg1 arg0) ) ((and (= *title* (-> arg0 current-options)) diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc index 7a5e4c9dd2..d2950e27b2 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc @@ -843,16 +843,25 @@ ) ;; definition for symbol *language-name-remap*, type (array text-id) -(define *language-name-remap* - (the-as (array text-id) - (new 'static 'boxed-array :type uint32 #x111 #x112 #x113 #x114 #x115 #x117 #x116 #x30b) - ) - ) +(define *language-name-remap* (new 'static 'boxed-array :type text-id + (text-id text-x111) + (text-id text-x112) + (text-id text-x113) + (text-id text-x114) + (text-id text-x115) + (text-id text-x117) + (text-id text-x116) + (text-id text-x30b) + ) + ) ;; definition for symbol *stereo-mode-name-remap*, type (array text-id) -(define *stereo-mode-name-remap* - (the-as (array text-id) (new 'static 'boxed-array :type uint32 #x104 #x105 #x106)) - ) +(define *stereo-mode-name-remap* (new 'static 'boxed-array :type text-id + (text-id progress-sound-mono) + (text-id progress-sound-stereo) + (text-id progress-sound-surround) + ) + ) ;; definition for symbol *hud-ring-graphic-remap*, type (array uint64) (define *hud-ring-graphic-remap* @@ -1704,7 +1713,3 @@ ) ) ) - - - - diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc index 97037e50d0..fff489cf2e 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc @@ -490,7 +490,7 @@ (s4-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) ) - (set! (-> s3-0 y) (+ -8.0 (-> s3-0 y))) + (+! (-> s3-0 y) -8.0) (case (get-aspect-ratio) (('aspect4x3) (position-in-front-of-screen! s4-0 12288.0 s3-0) @@ -1314,8 +1314,8 @@ (let ((f0-54 (- (-> self ring-want-angle) (-> self ring-angle)))) (when (< 32768.0 (fabs f0-54)) (if (< 0.0 f0-54) - (set! (-> self ring-angle) (+ 65536.0 (-> self ring-angle))) - (set! (-> self ring-angle) (+ -65536.0 (-> self ring-angle))) + (+! (-> self ring-angle) 65536.0) + (+! (-> self ring-angle) -65536.0) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/atoll/ash1-course_REF.gc b/test/decompiler/reference/jak2/levels/atoll/ash1-course_REF.gc index 8b81344f0b..5bc95910b7 100644 --- a/test/decompiler/reference/jak2/levels/atoll/ash1-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/ash1-course_REF.gc @@ -148,7 +148,7 @@ (set! (-> (the-as asht-wait-spot v1-1) check-done) (lambda ((arg0 asht-wait-spot) (arg1 ashelin-battle)) (when (scene-release? arg1) - (set! (-> arg1 bot-flags) (logior (bot-flags bf20) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf20)) (let ((s5-0 (-> arg1 ash-course spots))) (vector-! (the-as vector (-> arg1 frontline)) (the-as vector (-> s5-0 2)) (the-as vector (-> s5-0 1))) (vector-normalize! (-> arg1 frontline) 1.0) diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc index 932486a04e..d486105c06 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc @@ -178,7 +178,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (set! (-> obj sound-trans quad) (-> obj root trans quad)) - (set! (-> obj root trans y) (+ 53248.0 (-> obj root trans y))) + (+! (-> obj root trans y) 53248.0) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-piston" (the-as (pointer uint32) #f))) @@ -223,7 +223,7 @@ This commonly includes things such as: (set! (-> obj range-top) (* 4096.0 f30-0)) ) (set! (-> obj init-height) (-> obj root trans y)) - (set! (-> obj root trans y) (+ -40960.0 (-> obj root trans y))) + (+! (-> obj root trans y) -40960.0) (cond ((logtest? (actor-option user18) (-> obj fact options)) (set! (-> obj looping-id) (new-sound-id)) @@ -376,7 +376,7 @@ This commonly includes things such as: (set! (-> obj root) s4-0) ) (process-drawable-from-entity! obj arg0) - (set! (-> obj root trans y) (+ 73728.0 (-> obj root trans y))) + (+! (-> obj root trans y) 73728.0) (logclear! (-> obj mask) (process-mask actor-pause)) (initialize-skeleton obj @@ -576,7 +576,7 @@ This commonly includes things such as: ) ) ) - (set! (-> obj root trans y) (+ 55558.145 (-> obj root trans y))) + (+! (-> obj root trans y) 55558.145) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-liftcat" (the-as (pointer uint32) #f))) @@ -584,7 +584,7 @@ This commonly includes things such as: ) (let ((v1-24 (-> obj root))) (set! (-> obj down-y) (-> v1-24 trans y)) - (set! (-> v1-24 trans y) (+ 28672.0 (-> v1-24 trans y))) + (+! (-> v1-24 trans y) 28672.0) (set! (-> obj up-y) (-> v1-24 trans y)) (vector-reset! (-> v1-24 transv)) ) @@ -1169,7 +1169,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((a1-1 (new 'stack-no-clear 'sync-info-params))) (let ((v1-2 0)) (if #f @@ -1258,7 +1258,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -1319,7 +1319,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc index 21255bcd65..e27b5ba98d 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-tank_REF.gc @@ -1710,7 +1710,7 @@ ((3 2) (let ((v0-0 (new 'static 'vector :w 1.0))) (set! (-> v0-0 quad) (-> v1-0 trans quad)) - (set! (-> v0-0 y) (+ 12288.0 (-> v0-0 y))) + (+! (-> v0-0 y) 12288.0) v0-0 ) ) diff --git a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc index ce3b81454f..7f158f3277 100644 --- a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc @@ -879,7 +879,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (juicer-method-180 obj) @@ -908,7 +908,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (if (zero? (-> obj hit-points)) @@ -936,7 +936,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (juicer-method-180 obj) @@ -1421,7 +1421,7 @@ ) 0 (set! (-> self torso-track-player) (the-as basic #t)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self hit-focus) #f) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-9 *game-info*) @@ -1652,7 +1652,7 @@ ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) diff --git a/test/decompiler/reference/jak2/levels/atoll/sig0-course_REF.gc b/test/decompiler/reference/jak2/levels/atoll/sig0-course_REF.gc index 07e68fd003..4d2f0a7163 100644 --- a/test/decompiler/reference/jak2/levels/atoll/sig0-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/sig0-course_REF.gc @@ -797,7 +797,7 @@ (when (and (not (logtest? (-> arg1 waypoint-bits) 4)) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) ) - (set! (-> arg1 waypoint-bits) (logand -5 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -5) (when (not (logtest? (-> arg1 waypoint-bits) 1)) (let ((a1-2 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-2 from) (process->ppointer pp)) @@ -889,7 +889,7 @@ ((and (logtest? (-> arg0 waypoint-bits) 2) (outside-spot-radius? arg0 (the-as bot-spot #f) (the-as vector #f) #f) ) - (set! (-> arg0 waypoint-bits) (logand -3 (-> arg0 waypoint-bits))) + (logand! (-> arg0 waypoint-bits) -3) (let ((f0-0 98304.0)) (if (>= (* f0-0 f0-0) (vector-vector-xz-distance-squared (target-pos 0) (-> arg0 root trans))) (play-speech arg0 34) @@ -901,7 +901,7 @@ (>= (* f0-3 f0-3) (vector-vector-xz-distance-squared (target-pos 0) (-> arg0 root trans))) ) ) - (set! (-> arg0 waypoint-bits) (logand -3 (-> arg0 waypoint-bits))) + (logand! (-> arg0 waypoint-bits) -3) (play-speech arg0 34) ) (else @@ -930,7 +930,7 @@ (>= (- (current-time) (-> arg0 waypoint-time0)) (seconds 1)) (logtest? (-> arg0 waypoint-bits) 16) ) - (set! (-> arg0 waypoint-bits) (logand -17 (-> arg0 waypoint-bits))) + (logand! (-> arg0 waypoint-bits) -17) (talker-spawn-func (-> *talker-speech* 80) *entity-pool* (target-pos 0) (the-as region #f)) ) (when (or (not (logtest? (-> arg0 waypoint-bits) 8)) (>= (- (current-time) (-> arg0 waypoint-time0)) (seconds 8))) @@ -1147,7 +1147,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -1575,7 +1575,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -1977,7 +1977,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -2327,7 +2327,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -2538,7 +2538,7 @@ ) (else (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf20) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf20)) (logclear! (-> arg1 bot-flags) (bot-flags bf20)) ) #f @@ -2639,7 +2639,7 @@ ) (>= (- (current-time) (-> arg0 waypoint-time0)) (seconds 10)) ) - (set! (-> arg0 bot-flags) (logior (bot-flags bf21) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf21)) (logior! (-> arg0 waypoint-bits) 2) ) (else @@ -2966,7 +2966,7 @@ ) ) ) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) ) ) ) @@ -3024,7 +3024,7 @@ (logclear! (-> arg0 enemy-flags) (enemy-flag use-notice-distance)) (logclear! (-> arg0 bot-flags) (bot-flags bf06)) (bot-method-196 arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf22) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf22)) (if (demo?) (send-event *target* 'continue (get-continue-by-name *game-info* "demo-restart")) ) diff --git a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc index 5f30f6b029..628e25743b 100644 --- a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc @@ -1019,7 +1019,7 @@ For example for an elevator pre-compute the distance between the first and last (none) ) :post (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (let ((a1-0 (new-stack-vector0))) (vector-v++! (-> gp-0 transv) (compute-acc-due-to-gravity gp-0 a1-0 (-> self enemy-info slip-factor))) @@ -1198,7 +1198,7 @@ For example for an elevator pre-compute the distance between the first and last (init-vf0-vector) (+! (-> obj wiggle-angle) (-> obj delta-wiggle-angle)) (if (< 65536.0 (-> obj wiggle-angle)) - (set! (-> obj wiggle-angle) (+ -65536.0 (-> obj wiggle-angle))) + (+! (-> obj wiggle-angle) -65536.0) ) (let* ((v1-5 (-> obj root trans)) (a1-2 (vector-! (new 'stack-no-clear 'vector) v1-5 arg0)) @@ -2333,7 +2333,7 @@ For example for an elevator pre-compute the distance between the first and last (none) ) :post (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (cond ((and (>= 1449984.0 (-> gp-0 trans y)) (< (-> gp-0 transv y) 0.0)) diff --git a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc index 2e94cc4363..e48cf6f40d 100644 --- a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc @@ -457,7 +457,7 @@ This commonly includes things such as: ) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc)) ) @@ -630,7 +630,7 @@ This commonly includes things such as: (vector-rotate-x! s5-0 s5-0 (* 182.04445 (rand-vu-float-range 0.0 140.0))) (vector-rotate-y! s5-0 s5-0 (* 182.04445 (rand-vu-float-range 0.0 360.0))) (set! (-> gp-0 start-pos quad) (-> self root trans quad)) - (set! (-> gp-0 start-pos y) (+ 15400.96 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 15400.96) (vector-normalize-copy! (-> gp-0 move-dist) s5-0 40960.0) (let ((v1-9 gp-0)) (set! (-> v1-9 radius) 409.6) @@ -724,7 +724,7 @@ This commonly includes things such as: ) (let ((s5-4 (new 'stack-no-clear 'vector))) (set! (-> s5-4 quad) (-> self root trans quad)) - (set! (-> s5-4 y) (+ 15400.96 (-> s5-4 y))) + (+! (-> s5-4 y) 15400.96) (process-spawn lightning-tracker :init lightning-tracker-init @@ -1538,7 +1538,7 @@ This commonly includes things such as: (let ((v1-30 (-> obj index))) (cond ((zero? v1-30) - (set! (-> obj root trans x) (+ 5734.4 (-> obj root trans x))) + (+! (-> obj root trans x) 5734.4) (let ((s5-2 (-> obj skel root-channel 0))) (joint-control-channel-group! s5-2 (the-as art-joint-anim (-> obj draw art-group data 6)) num-func-identity) (set! (-> s5-2 frame-num) 0.0) @@ -1929,7 +1929,7 @@ This commonly includes things such as: ) (when a0-3 (set! (-> gp-1 fountain-rand-transv-lo quad) (-> (get-trans a0-3 0) quad)) - (set! (-> gp-1 fountain-rand-transv-lo y) (+ -16384.0 (-> gp-1 fountain-rand-transv-lo y))) + (+! (-> gp-1 fountain-rand-transv-lo y) -16384.0) ) ) (set! (-> gp-1 fountain-rand-transv-hi x) 24576.0) @@ -2119,7 +2119,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-cas-chain-plat" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (go (method-of-object obj idle)) (none) ) diff --git a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc index 2e4f6e8806..51f068c9e3 100644 --- a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc @@ -367,7 +367,7 @@ ((the-as (function none) t9-1)) ) ) - (set! (-> self flags) (logand -9 (-> self flags))) + (logand! (-> self flags) -9) (logior! (-> self flags) 4) (logior! (-> self nav flags) (nav-control-flag output-sphere-hash)) (let ((a1-1 (new 'stack-no-clear 'collide-query))) @@ -557,7 +557,7 @@ :enter (behavior () (logior! (-> self flags) 4) (roboguard-level-method-185 self (the-as symbol 1)) - (set! (-> self flags) (logand -9 (-> self flags))) + (logand! (-> self flags) -9) (none) ) :code (behavior () @@ -652,10 +652,10 @@ (logior! (-> self flags) 32) ) (else - (set! (-> self flags) (logand -33 (-> self flags))) + (logand! (-> self flags) -33) ) ) - (set! (-> self flags) (logand -65 (-> self flags))) + (logand! (-> self flags) -65) (seek! (-> self speed) 81920.0 (* 1228800.0 (-> self clock seconds-per-frame))) (seek! (-> self turning-acc) 4096.0 (* 1228800.0 (-> self clock seconds-per-frame))) (let ((v1-20 (-> self nav))) @@ -767,7 +767,7 @@ ) (until (ja-done? 0) (when (< 17.0 (ja-aframe-num 0)) - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (roboguard-level-method-185 self (the-as symbol 0)) ) (suspend) @@ -797,7 +797,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (roboguard-level-method-185 self (the-as symbol 0)) (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc index bc09dbcc07..21eedadd59 100644 --- a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc @@ -1337,7 +1337,7 @@ gp-1 ) (vector-! *particle-vel* s5-3 (matrix->trans gp-1 (new 'stack-no-clear 'vector))) - (set! (-> *particle-vel* y) (+ 4096.0 (-> *particle-vel* y))) + (+! (-> *particle-vel* y) 4096.0) (vector-float*! *particle-vel* *particle-vel* 0.0033333334) (when (and sv-20 (< (rand-vu) 0.005)) (let ((t9-14 sp-launch-particles-var) @@ -1982,8 +1982,8 @@ (t9-0) ) ) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) - (set! (-> self shield-hit-points) (+ -1.0 (-> self shield-hit-points))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) + (+! (-> self shield-hit-points) -1.0) (none) ) :exit (behavior () @@ -2305,7 +2305,7 @@ ) (let ((v1-23 (new 'stack-no-clear 'vector))) (set! (-> v1-23 quad) (-> self root trans quad)) - (set! (-> v1-23 y) (+ 2048.0 (-> v1-23 y))) + (+! (-> v1-23 y) 2048.0) ) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self node-list data 3 bone transform trans quad)) @@ -3208,7 +3208,7 @@ (set! (-> self shot-count) (the-as uint 5)) (set! (-> self last-trans quad) (-> self root trans quad)) (set! (-> self minimap) (add-icon! *minimap* self (the-as uint 15) (the-as int #f) (the-as vector #t) 0)) - (set! (-> self mask) (logior (process-mask enemy guard) (-> self mask))) + (logior! (-> self mask) (process-mask enemy guard)) (go-virtual hostile) (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc b/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc index 757119abee..6d03573351 100644 --- a/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/burning-bush/ctywide-bbush_REF.gc @@ -458,7 +458,7 @@ ) 0.0 ) - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) (sound-play "ring-pickup") (go-virtual die) ) @@ -520,7 +520,7 @@ (defbehavior race-ring-init-by-other race-ring ((arg0 city-race-ring-info)) (race-ring-method-22 self) (set! (-> self root trans quad) (-> arg0 pos quad)) - (set! (-> self root trans y) (+ 10240.0 (-> self root trans y))) + (+! (-> self root trans y) 10240.0) (quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (-> arg0 pos w)) (set-vector! (-> self root scale) 3.0 3.0 3.0 1.0) (race-ring-method-23 self) @@ -1873,7 +1873,7 @@ This commonly includes things such as: ;; INFO: Used lq/sq ;; WARN: Return type mismatch object vs none. (defbehavior bush-collect-init-by-other bush-collect ((arg0 vector)) - (set! (-> self mask) (logior (process-mask bit18) (-> self mask))) + (logior! (-> self mask) (process-mask bit18)) (stack-size-set! (-> self main-thread) 16) (bush-collect-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) @@ -1888,7 +1888,7 @@ This commonly includes things such as: ;; INFO: Used lq/sq ;; WARN: Return type mismatch object vs none. (defbehavior bush-collect-dark-eco-init-by-other bush-collect ((arg0 vector)) - (set! (-> self mask) (logior (process-mask bit18) (-> self mask))) + (logior! (-> self mask) (process-mask bit18)) (stack-size-set! (-> self main-thread) 16) (bush-collect-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) @@ -1904,7 +1904,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior bush-collect-homing-beacon-init-by-other bush-collect ((arg0 vector)) (set! (-> self level) (level-get *level* 'lbbush)) - (set! (-> self mask) (logior (process-mask bit18) (-> self mask))) + (logior! (-> self mask) (process-mask bit18)) (stack-size-set! (-> self main-thread) 16) (bush-collect-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) @@ -2725,7 +2725,7 @@ This commonly includes things such as: (let ((t1-3 (new 'stack 'fact-info self (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc))) ) (new 'stack-no-clear 'vector) - (set! (-> t1-3 options) (logior (actor-option fade-out no-distance-check-fadeout) (-> t1-3 options))) + (logior! (-> t1-3 options) (actor-option fade-out no-distance-check-fadeout)) (set! (-> t1-3 fade-time) (-> gp-0 time)) (set! (-> gp-0 colls s5-3 handle) (ppointer->handle @@ -2747,7 +2747,7 @@ This commonly includes things such as: (let ((t1-5 (new 'stack 'fact-info self (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc))) ) (new 'stack-no-clear 'vector) - (set! (-> t1-5 options) (logior (actor-option fade-out no-distance-check-fadeout) (-> t1-5 options))) + (logior! (-> t1-5 options) (actor-option fade-out no-distance-check-fadeout)) (set! (-> t1-5 fade-time) (-> gp-0 time)) (set! (-> gp-0 colls s5-3 handle) (ppointer->handle @@ -3050,7 +3050,7 @@ This commonly includes things such as: (the-as time-frame (the int (-> *burning-bush-get-on-info* (-> self info index) time))) ) (set! (-> a0-3 quad) (-> *burning-bush-get-on-info* (-> self info index) trans quad)) - (set! (-> a0-3 y) (+ 4096.0 (-> a0-3 y))) + (+! (-> a0-3 y) 4096.0) (set! (-> self slave 0) (ppointer->handle (birth-pickup-at-point a0-3 (pickup-type skill) (-> *FACT-bank* super-skill-inc) #t self t1-1) diff --git a/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc b/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc index 2ed8c69005..28cc6cdbad 100644 --- a/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc @@ -541,7 +541,7 @@ ) :exit (the-as (function none :behavior target) target-pilot-exit) :code (behavior () - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (logior! (-> self state-flags) (state-flags sf6)) (set! (-> self alt-cam-pos quad) (-> self control camera-pos quad)) (let ((gp-0 (if (zero? (-> self pilot stance)) diff --git a/test/decompiler/reference/jak2/levels/city/common/target-pilot_REF.gc b/test/decompiler/reference/jak2/levels/city/common/target-pilot_REF.gc index e0011ca514..ca53ecacf9 100644 --- a/test/decompiler/reference/jak2/levels/city/common/target-pilot_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/target-pilot_REF.gc @@ -256,9 +256,7 @@ ) (when (not (-> s5-0 gun?)) (if arg1 - (set! (-> self control current-surface flags) - (logior (surface-flag gun-fast-exit) (-> self control current-surface flags)) - ) + (logior! (-> self control current-surface flags) (surface-flag gun-fast-exit)) ) (target-gun-end-mode arg1) ) @@ -267,7 +265,7 @@ (set! (-> self control reaction) target-collision-reaction) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control ctrl-xz-vel) 0.0) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (set! (-> self control bend-target) 0.0) (let ((v1-73 (-> self node-list data))) (set! (-> v1-73 0 param0) (the-as (function cspace transformq none) cspace<-transformq+world-trans!)) @@ -478,7 +476,3 @@ 0 (none) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc b/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc index b798c79576..a9775896bd 100644 --- a/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc @@ -129,13 +129,13 @@ (let ((s1-1 (-> obj conn (-> s5-0 conn-ids (+ s2-1 (-> s4-0 first-conn)))))) (get-position (-> obj node (-> s1-1 head-id)) (-> s3-0 0)) (set! (-> s3-0 0 y) 53248.0) - (set! (-> s3-0 0 x) (+ -2048.0 (-> s3-0 0 x))) - (set! (-> s3-0 0 z) (+ -2048.0 (-> s3-0 0 z))) + (+! (-> s3-0 0 x) -2048.0) + (+! (-> s3-0 0 z) -2048.0) (get-position (-> obj node (-> s1-1 tail-id)) (-> s3-0 1)) ) (set! (-> s3-0 1 y) 53248.0) - (set! (-> s3-0 1 x) (+ -2048.0 (-> s3-0 1 x))) - (set! (-> s3-0 1 z) (+ -2048.0 (-> s3-0 1 z))) + (+! (-> s3-0 1 x) -2048.0) + (+! (-> s3-0 1 z) -2048.0) (add-debug-line #t (bucket-id debug2) (-> s3-0 0) (-> s3-0 1) *color-white* #f (the-as rgba -1)) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc index c2182dbf3a..21e569a6a6 100644 --- a/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctyport-obs_REF.gc @@ -472,7 +472,7 @@ (set! (-> s5-2 quad) (-> a1-24 target-post quad)) ) (when (< (vector-vector-xz-distance (-> obj root trans) s5-2) 163840.0) - (set! (-> obj path-index) (+ 0.01 (-> obj path-index))) + (+! (-> obj path-index) 0.01) (let ((f0-22 (-> obj path-index))) (set! (-> obj path-index) (- f0-22 (* (the float (the int (/ f0-22 1.0))) 1.0))) ) @@ -610,9 +610,7 @@ 0 (set! (-> obj path-num) (-> arg0 user-data)) (set! (-> obj path-index) (+ 0.05 (-> arg0 position w))) - (set! (-> obj root root-prim prim-core collide-as) - (logior (collide-spec pusher) (-> obj root root-prim prim-core collide-as)) - ) + (logior! (-> obj root root-prim prim-core collide-as) (collide-spec pusher)) (let ((v1-21 (-> obj root root-prim))) (set! (-> obj root backup-collide-as) (-> v1-21 prim-core collide-as)) (set! (-> obj root backup-collide-with) (-> v1-21 prim-core collide-with)) 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 06e7183424..a8a9c49e98 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc @@ -986,7 +986,7 @@ This commonly includes things such as: (s4-0 (-> *sp-particle-system-2d* cpuinfo-table (-> self sparts-index gp-0))) ) (set! (-> s5-0 start-pos quad) (-> self sparts-pos gp-0 quad)) - (set! (-> s5-0 start-pos y) (+ 4096.0 (-> s5-0 start-pos y))) + (+! (-> s5-0 start-pos y) 4096.0) (set-vector! (-> s5-0 move-dist) 0.0 -40960.0 0.0 1.0) (let ((v1-5 s5-0)) (set! (-> v1-5 radius) (-> s4-0 omega)) @@ -1051,7 +1051,7 @@ This commonly includes things such as: ;; definition for method 29 of type fruit-stand ;; WARN: Return type mismatch int vs none. (defmethod fruit-stand-method-29 fruit-stand ((obj fruit-stand)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 185) obj)) 0 (none) @@ -2210,7 +2210,7 @@ This commonly includes things such as: ;; definition for method 33 of type cty-guard-turret ;; WARN: Return type mismatch int vs none. (defmethod cty-guard-turret-method-33 cty-guard-turret ((obj cty-guard-turret)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) 0 (none) ) @@ -2439,7 +2439,7 @@ This commonly includes things such as: (let ((s4-0 (new 'stack 'traffic-object-spawn-params))) (set! (-> s4-0 position quad) (-> obj root trans quad)) (mem-copy! (the-as pointer (-> s4-0 rotation)) (the-as pointer (-> obj root quat)) 16) - (set! (-> s4-0 position y) (+ 14336.0 (-> s4-0 position y))) + (+! (-> s4-0 position y) 14336.0) (set! (-> s4-0 behavior) (the-as uint 0)) (set! (-> s4-0 object-type) (the-as traffic-type arg0)) (set! (-> s4-0 id) (the-as uint 0)) @@ -3015,7 +3015,7 @@ This commonly includes things such as: ;; definition for method 30 of type propa ;; WARN: Return type mismatch int vs none. (defmethod propa-method-30 propa ((obj propa)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 170) obj)) 0 (none) @@ -4407,7 +4407,7 @@ This commonly includes things such as: ;; definition for method 29 of type lurker-pipe-lid ;; WARN: Return type mismatch int vs none. (defmethod lurker-pipe-lid-method-29 lurker-pipe-lid ((obj lurker-pipe-lid)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -4591,7 +4591,7 @@ This commonly includes things such as: ;; definition for method 30 of type ctyn-lamp ;; WARN: Return type mismatch int vs none. (defmethod ctyn-lamp-method-30 ctyn-lamp ((obj ctyn-lamp)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc index 0e07725e99..3d2ca894d7 100644 --- a/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc @@ -1289,7 +1289,7 @@ ;; definition for method 30 of type farm-marrow ;; WARN: Return type mismatch int vs none. (defmethod farm-marrow-method-30 farm-marrow ((obj farm-marrow)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -1567,7 +1567,7 @@ This commonly includes things such as: ;; definition for method 30 of type farm-beetree ;; WARN: Return type mismatch int vs none. (defmethod farm-beetree-method-30 farm-beetree ((obj farm-beetree)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -1841,7 +1841,7 @@ This commonly includes things such as: ;; definition for method 30 of type farm-cabbage ;; WARN: Return type mismatch int vs none. (defmethod farm-cabbage-method-30 farm-cabbage ((obj farm-cabbage)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -2102,7 +2102,7 @@ This commonly includes things such as: ;; definition for method 30 of type farm-small-cabbage ;; WARN: Return type mismatch int vs none. (defmethod farm-small-cabbage-method-30 farm-small-cabbage ((obj farm-small-cabbage)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -2407,7 +2407,7 @@ This commonly includes things such as: ;; definition for method 30 of type farm-chilirots ;; WARN: Return type mismatch int vs none. (defmethod farm-chilirots-method-30 farm-chilirots ((obj farm-chilirots)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -2539,7 +2539,7 @@ This commonly includes things such as: ;; definition for method 29 of type farm-sprinkler-barrels ;; WARN: Return type mismatch int vs none. (defmethod farm-sprinkler-barrels-method-29 farm-sprinkler-barrels ((obj farm-sprinkler-barrels)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/generic/neon-praxis-part_REF.gc b/test/decompiler/reference/jak2/levels/city/generic/neon-praxis-part_REF.gc index f6e048ba84..776d3bffbc 100644 --- a/test/decompiler/reference/jak2/levels/city/generic/neon-praxis-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/generic/neon-praxis-part_REF.gc @@ -1220,7 +1220,7 @@ This commonly includes things such as: (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause enemy)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj master-enable) (the-as uint -1)) (set! (-> obj praxis-mode) (the-as uint (rand-vu-int-count 5))) (set! (-> obj back-mode) (the-as uint (rand-vu-int-count 8))) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc index b0ae749c01..b40b8b596a 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc @@ -410,7 +410,7 @@ ) ) ) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-active)) (logior! (-> self focus-status) (focus-status disable)) (logclear! (-> self focus-status) (focus-status arrestable)) @@ -544,7 +544,7 @@ (ja :num! (seek! (ja-aframe 12.0 0) 0.5)) ) ) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) (none) ) @@ -575,7 +575,7 @@ (logclear! (-> v1-11 shape nav-flags) (nav-flags has-extra-sphere)) ) 0 - (set! (-> self focus-status) (logior (focus-status disable pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status disable pilot-riding pilot)) (set! (-> self anim-speed) 0.0) (none) ) @@ -895,7 +895,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -1012,7 +1012,7 @@ :trans (behavior () (when (>= (- (current-time) (-> self state-time)) (seconds 0.1)) (when (not (logtest? (bot-flags bf19) (-> self bot-flags))) - (set! (-> self bot-flags) (logior (bot-flags bf19) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf19)) (fail-mission! self) ) (fail-falling self) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc index 6a8f539784..02dc183a18 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc @@ -506,7 +506,7 @@ This commonly includes things such as: (when (focus-test? obj pilot) (let ((v1-4 (handle->process (-> obj vehicle-handle)))) (when (or (not v1-4) (logtest? (-> (the-as vehicle v1-4) flags) (rigid-body-object-flag dead))) - (set! (-> obj bot-flags) (logior (bot-flags bf17) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf17)) (logclear! (-> obj bot-flags) (bot-flags bf15)) (logclear! (-> obj focus-status) (focus-status pilot-riding pilot)) (set! (-> obj vehicle-seat-index) -1) @@ -701,7 +701,3 @@ This commonly includes things such as: ) (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 5ee653e2c9..c9555f49ed 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 @@ -1657,7 +1657,7 @@ (send-event s5-1 'set-alert-level 1) (send-event s5-1 'set-alert-duration #xa4cb80) ) - (set! (-> arg1 bot-task-bits) (logand -2 (-> arg1 bot-task-bits))) + (logand! (-> arg1 bot-task-bits) -2) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc index 5301ea8b9f..63934d1974 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc @@ -331,7 +331,7 @@ ) (put-rider-in-seat (the-as vehicle gp-0) (-> self vehicle-seat-index) self) ) - (set! (-> self focus-status) (logior (focus-status pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-active)) (logior! (-> self focus-status) (focus-status disable)) (logclear! (-> self focus-status) (focus-status arrestable)) @@ -455,7 +455,7 @@ (ja :num! (seek! (ja-aframe 12.0 0) 0.25)) ) ) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (go-virtual ride-vehicle) (none) ) @@ -483,7 +483,7 @@ (logclear! (-> v1-11 shape nav-flags) (nav-flags has-extra-sphere)) ) 0 - (set! (-> self focus-status) (logior (focus-status disable pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status disable pilot-riding pilot)) (logclear! (-> self focus-status) (focus-status arrestable)) (none) ) @@ -816,7 +816,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -866,7 +866,7 @@ (vector-reset! (-> self root transv)) (stop-looking-at-target! self) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logclear! (-> self focus-status) (focus-status disable)) (if (logtest? (bot-flags bf19) (-> self bot-flags)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-active checking-water)) @@ -999,7 +999,7 @@ ) ) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logclear! (-> self focus-status) (focus-status disable)) (none) ) @@ -1051,7 +1051,7 @@ ) ) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logclear! (-> self focus-status) (focus-status disable)) (none) ) @@ -1084,7 +1084,7 @@ (logclear! (-> self enemy-flags) (enemy-flag look-at-move-dest)) (logclear! (-> self mask) (process-mask actor-pause)) (logclear! (-> self enemy-flags) (enemy-flag notice)) - (set! (-> self focus-status) (logior (focus-status arrestable) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status arrestable)) (logior! (-> self focus-status) (focus-status disable)) (set! (-> self travel-anim-interp) 0.0) (none) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc4-course_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc4-course_REF.gc index 30990638fb..bd3160180e 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc4-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc4-course_REF.gc @@ -92,7 +92,7 @@ (set! (-> v1-3 prim-core collide-with) (-> arg0 root backup-collide-with)) ) (logclear! (-> arg0 focus-status) (focus-status disable)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) (let ((v1-9 (get-task-by-type (-> arg0 ai-ctrl) kidesct-wait-spot arg0))) (set! (-> v1-9 bytes 5) 1) (set! (-> v1-9 bytes 6) 1) @@ -233,7 +233,7 @@ :skip-to -1 :on-set (lambda ((arg0 kid-escort)) (logior! (-> arg0 focus-status) (focus-status disable)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) kidesct-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 1) @@ -281,7 +281,7 @@ :skip-to -1 :on-set (lambda ((arg0 kid-escort)) (logclear! (-> arg0 focus-status) (focus-status disable)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) kidesct-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 1) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc index 59beded37f..8fe68511a2 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc @@ -202,7 +202,7 @@ #t ) (('instant-arrest) - (set! (-> obj bot-flags) (logior (bot-flags bf19) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf19)) (let ((s5-1 (the-as crimson-guard (-> arg3 param 0)))) (set! (-> obj arrestor-handle) (process->handle s5-1)) (set! (-> obj arrest-attempt-time) (current-time)) @@ -722,7 +722,7 @@ This commonly includes things such as: (when (focus-test? obj pilot) (let ((s5-0 (handle->process (-> obj vehicle-handle)))) (when (or (not s5-0) (logtest? (-> (the-as vehicle s5-0) flags) (rigid-body-object-flag dead))) - (set! (-> obj bot-flags) (logior (bot-flags bf17) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf17)) (logclear! (-> obj bot-flags) (bot-flags bf15)) (logclear! (-> obj focus-status) (focus-status pilot-riding pilot)) (if (the-as vehicle s5-0) @@ -817,7 +817,3 @@ This commonly includes things such as: ) (none) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/market/ashelin/ash4-course_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ashelin/ash4-course_REF.gc index 032d262652..c947c5257e 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ashelin/ash4-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ashelin/ash4-course_REF.gc @@ -270,7 +270,7 @@ (set-setting! 'music 'danger9 0.0 0) (set! (-> arg0 notice-enemy-dist) 245760.0) (logior! (-> arg0 bot-flags) (bot-flags bf06)) - (set! (-> arg0 bot-task-bits) (logand -3 (-> arg0 bot-task-bits))) + (logand! (-> arg0 bot-task-bits) -3) (let ((a1-3 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-3 from) (process->ppointer pp)) (set! (-> a1-3 num-params) 0) diff --git a/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc index 738439af71..ad89af39ad 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ashelin/ctyasha-obs_REF.gc @@ -943,7 +943,7 @@ (forward-up->quaternion (-> obj root quat) s4-0 *up-vector*) ) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag chase-startup)) (set-vector! (-> obj root scale) 1.0 1.0 1.0 1.0) @@ -1067,7 +1067,7 @@ (forward-up->quaternion (-> obj root quat) s4-0 *up-vector*) ) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (logior! (-> obj enemy-flags) (enemy-flag chase-startup)) (set-vector! (-> obj root scale) 1.0 1.0 1.0 1.0) diff --git a/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc index a83ac43ccc..e44631ed23 100644 --- a/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/market/ctymark-obs_REF.gc @@ -1192,7 +1192,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-basket-a" (the-as (pointer uint32) #f))) @@ -1289,7 +1289,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-basket-b" (the-as (pointer uint32) #f))) @@ -1386,7 +1386,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-crate" (the-as (pointer uint32) #f))) @@ -1483,7 +1483,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-sack-a" (the-as (pointer uint32) #f))) @@ -1580,7 +1580,7 @@ This commonly includes things such as: ) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-market-sack-b" (the-as (pointer uint32) #f))) 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 abf98aee3e..f3e6db8d8e 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 @@ -539,7 +539,7 @@ (logior! (-> obj controller flags) (vehicle-controller-flag ignore-others)) (set! (-> obj controller target-speed-offset) 81920.0) (set! (-> obj pursuit-target) (process->handle arg0)) - (set! (-> obj flags) (logior (rigid-body-object-flag alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag alert)) (if (task-node-open? (game-task-node city-save-lurkers-save-lurkers)) (vehicle-method-111 obj 1 (the-as target arg0)) (vehicle-method-111 obj 2 (the-as target arg0)) @@ -1279,7 +1279,7 @@ (citizen-nav-init! self) (set! (-> self gnd-height) (-> self root gspot-pos y)) (logior! (-> self flags) (citizen-flag persistent)) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self state-time) (current-time)) (let ((v1-31 (-> self root root-prim))) (set! (-> v1-31 prim-core collide-as) (collide-spec)) @@ -1949,7 +1949,7 @@ (set! (-> v1-13 enemy-flags) (the-as enemy-flag (logclear (-> v1-13 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self coming-from-pw) #t) (none) ) 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 28b038f414..fce44bdef1 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 @@ -124,7 +124,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior krew-package-init-by-other krew-package ((arg0 process-drawable)) (stack-size-set! (-> self main-thread) 16) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (logclear! (-> self mask) (process-mask actor-pause movie)) (krew-package-method-22 self) (set! (-> self attach-object) (process->handle arg0)) @@ -432,7 +432,7 @@ This commonly includes things such as: (.mov a0-32 vf1) (when (>= f0-3 a0-32) (set! (-> v1-59 0 quad) (-> (the-as process-drawable gp-0) root trans quad)) - (set! (-> v1-59 0 y) (+ -14336.0 (-> v1-59 0 y))) + (+! (-> v1-59 0 y) -14336.0) (send-event (handle->process (-> self arrow)) 'set-position (-> v1-59 0)) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc b/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc index d91b343eea..13d721b8a1 100644 --- a/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc @@ -3681,7 +3681,7 @@ This commonly includes things such as: (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause enemy)) - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj master-enable) (the-as uint -1)) (set! (-> obj mode) (the-as uint (rand-vu-int-count 8))) (let ((s5-1 (if (task-node-closed? (game-task-node nest-boss-resolution)) 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 a58e193b1a..005562d86d 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 @@ -1237,7 +1237,7 @@ (set! (-> self info) arg0) (set! (-> arg0 handle) (process->handle self)) (logior! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (set-vector! (-> self root trans) (-> arg0 pos1-x) (-> arg0 pos1-y) (-> arg0 pos1-z) 1.0) (quaternion-copy! (-> self root quat) *unity-quaternion*) (vector-identity! (-> self root scale)) @@ -1363,7 +1363,7 @@ (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg0 quad)) (set-vector! (-> self root scale) 1.0 1.0 1.0 1.0) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (initialize-skeleton self (the-as skeleton-group (art-group-get-by-name *level* "skel-ctyport-spy" (the-as (pointer uint32) #f))) @@ -1700,7 +1700,7 @@ (set! (-> self root trans quad) (-> arg0 quad)) (set-vector! (-> self root scale) 1.0 1.0 1.0 1.0) (set! (-> self minimap) (add-icon! *minimap* self (the-as uint 16) (the-as int #f) (the-as vector #t) 0)) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (initialize-skeleton self (the-as skeleton-group (art-group-get-by-name *level* "skel-ctyport-cargo" (the-as (pointer uint32) #f))) 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 d8928b5431..cc6d61f6b6 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 @@ -989,7 +989,7 @@ (defbehavior turbo-ring-init-by-other turbo-ring ((arg0 city-race-ring-info) (arg1 int) (arg2 symbol)) (turbo-ring-method-22 self) (set! (-> self root trans quad) (-> arg0 pos quad)) - (set! (-> self root trans y) (+ 10240.0 (-> self root trans y))) + (+! (-> self root trans y) 10240.0) (quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (-> arg0 pos w)) (set! (-> self boost) (-> arg0 boost)) (set! (-> self id) arg1) 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 ddc51a5636..0a43c5598e 100644 --- a/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc @@ -105,7 +105,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior seal-of-mar-init-by-other seal-of-mar ((arg0 vector) (arg1 vector) (arg2 vector)) (stack-size-set! (-> self main-thread) 16) - (set! (-> self mask) (logior (process-mask crate) (-> self mask))) + (logior! (-> self mask) (process-mask crate)) (logclear! (-> self mask) (process-mask actor-pause movie)) (seal-of-mar-method-22 self) (set! (-> self root trans quad) (-> arg0 quad)) 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 0aa6d6df52..72d47cf462 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 @@ -104,7 +104,7 @@ (when (>= dist 0.0) (vector+float*! (-> query vec) (-> query cquery start-pos) (-> query cquery move-dist) dist) (set! (-> query vec2 quad) (-> query cquery best-other-tri normal quad)) - (set! (-> query vec y) (+ 4915.2 (-> query vec y))) + (+! (-> query vec y) 4915.2) (set! on-ground? #t) (format #t "krew-collection-item::find-ground: ground y ~M~%" (-> query vec y)) ) @@ -136,7 +136,7 @@ ) (when (>= (* pickup-dist pickup-dist) dist-from-target) (sound-play "skill-pickup") - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) (go-virtual die) ) ) @@ -148,7 +148,7 @@ (let ((beam-params (new 'stack-no-clear 'task-arrow-params))) (let ((beam-location (new 'stack-no-clear 'vector))) (set! (-> beam-location quad) (-> self root trans quad)) - (set! (-> beam-location y) (+ -6144.0 (-> beam-location y))) + (+! (-> beam-location y) -6144.0) (set! (-> beam-params pos quad) (-> beam-location quad)) ) (quaternion-identity! (-> beam-params quat)) 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 dbd963cbc7..7e031cf8da 100644 --- a/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc @@ -433,7 +433,7 @@ (citizen-nav-init! self) (set! (-> self gnd-height) (-> self root gspot-pos y)) (logior! (-> self flags) (citizen-flag persistent)) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self state-time) (current-time)) (let ((v1-31 (-> self root root-prim))) (set! (-> v1-31 prim-core collide-as) (collide-spec)) @@ -1566,7 +1566,7 @@ (('task-done) (format #t "task-done~%") (set! (-> self sub-state) (+ (-> arg0 index) 2)) - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) ) ) (none) @@ -1746,7 +1746,7 @@ (('task-done) (format #t "task-done~%") (set! (-> self sub-state) (+ (-> arg0 index) 2)) - (set! (-> *game-info* counter) (+ -1.0 (-> *game-info* counter))) + (+! (-> *game-info* counter) -1.0) ) ) (none) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc index b637e4e828..ef049c8f8e 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc @@ -498,7 +498,7 @@ ) (set! (-> self enemy-flags) v1-31) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-38 (-> self enemy-flags))) @@ -634,7 +634,7 @@ (defstate failed (kid) :virtual #t :enter (behavior () - (set! (-> self bot-flags) (logior (bot-flags bf20) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf20)) ((-> (method-of-type kid arrested) enter)) (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc index d2fc7cb086..551f344ca1 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc @@ -116,8 +116,8 @@ :waypoint-id 5 :skip-to -1 :on-set (lambda ((arg0 kid)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 notice-enemy-dist) 122880.0) (let ((v1-6 (get-task-by-type (-> arg0 ai-ctrl) kidt-wait-spot arg0))) (set! (-> v1-6 bytes 5) 1) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kid_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kid_REF.gc index 2eff753372..ab44f22f4a 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kid_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kid_REF.gc @@ -200,7 +200,7 @@ #t ) (('instant-arrest) - (set! (-> obj bot-flags) (logior (bot-flags bf20) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf20)) (let ((v1-18 (the-as object (-> arg3 param 0)))) (set! (-> obj arrestor-handle) (process->handle (the-as process v1-18))) (set! (-> obj arrest-attempt-time) (current-time)) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc index 52d805d350..e0400f97e6 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kor-states_REF.gc @@ -509,7 +509,7 @@ ) (set! (-> self enemy-flags) v1-31) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-38 (-> self enemy-flags))) @@ -660,7 +660,7 @@ (defstate failed (kor) :virtual #t :enter (behavior () - (set! (-> self bot-flags) (logior (bot-flags bf20) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf20)) ((-> (method-of-type kor arrested) enter)) (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc index 601c0b4d78..2d8b2db3f5 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc @@ -116,8 +116,8 @@ :waypoint-id 5 :skip-to -1 :on-set (lambda ((arg0 kor)) - (set! (-> arg0 focus-status) (logior (focus-status arrestable) (-> arg0 focus-status))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 focus-status) (focus-status arrestable)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 notice-enemy-dist) 122880.0) (let ((v1-6 (get-task-by-type (-> arg0 ai-ctrl) kort-wait-spot arg0))) (set! (-> v1-6 bytes 5) 1) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kor_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kor_REF.gc index c43f2a57fa..2185bacd11 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kor_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kor_REF.gc @@ -221,7 +221,7 @@ #t ) (('instant-arrest) - (set! (-> obj bot-flags) (logior (bot-flags bf20) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf20)) (let ((v1-18 (the-as object (-> arg3 param 0)))) (set! (-> obj arrestor-handle) (process->handle (the-as process v1-18))) (set! (-> obj arrest-attempt-time) (current-time)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc index c3c291384f..a7042fa924 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-enemy_REF.gc @@ -294,7 +294,7 @@ (if (-> obj skel effect) (logior! (-> obj skel effect flags) (effect-control-flag ecf0)) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (reset-to-collide-spec (-> obj focus) (collide-spec jak civilian player-list bot-targetable jak-vehicle)) (let ((v1-12 (-> obj nav))) (set! (-> v1-12 sphere-mask) (the-as uint #x800e8)) @@ -311,11 +311,9 @@ (logior! (-> obj enemy-flags) (enemy-flag enable-on-active checking-water)) (logior! (-> obj focus-status) (focus-status dangerous)) (logior! (-> obj enemy-flags) (enemy-flag check-water)) - (set! (-> obj enemy-flags) - (logior (enemy-flag check-water-backup no-initial-move-to-ground) (-> obj enemy-flags)) - ) + (logior! (-> obj enemy-flags) (enemy-flag check-water-backup no-initial-move-to-ground)) (logclear! (-> obj focus-status) (focus-status dead)) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (logior! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (if (not (-> obj minimap)) (set! (-> obj minimap) (add-icon! *minimap* obj (the-as uint 70) (the-as int #f) (the-as vector #t) 0)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc index d748a42aae..498b008c8d 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc @@ -39,7 +39,7 @@ ;; WARN: Return type mismatch int vs none. (defmethod citizen-init! citizen ((obj citizen)) "Initialize [[citizen]] defaults." - (set! (-> obj fact enemy-options) (logior (enemy-option knocked-into-water) (-> obj fact enemy-options))) + (logior! (-> obj fact enemy-options) (enemy-option knocked-into-water)) (if (-> obj skel effect) (logclear! (-> obj skel effect flags) (effect-control-flag ecf2)) ) @@ -59,32 +59,29 @@ (set! (-> v1-28 prim-core collide-as) (-> obj root backup-collide-as)) (set! (-> v1-28 prim-core collide-with) (-> obj root backup-collide-with)) ) - (set! (-> obj root penetrated-by) - (penetrate - generic-attack - lunge - flop - punch - spin - roll - uppercut - bonk - tube - vehicle - flut-attack - board - mech-punch - dark-punch - dark-giant - ) + (set! (-> obj root penetrated-by) (penetrate + generic-attack + lunge + flop + punch + spin + roll + uppercut + bonk + tube + vehicle + flut-attack + board + mech-punch + dark-punch + dark-giant + ) ) (logior! (-> obj enemy-flags) (enemy-flag enable-on-active checking-water)) (logior! (-> obj focus-status) (focus-status dangerous)) (logior! (-> obj enemy-flags) (enemy-flag check-water)) - (set! (-> obj enemy-flags) - (logior (enemy-flag check-water-backup no-initial-move-to-ground) (-> obj enemy-flags)) - ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj enemy-flags) (enemy-flag check-water-backup no-initial-move-to-ground)) + (logior! (-> obj mask) (process-mask collectable)) (logior! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (set! (-> obj hit-points) (-> obj enemy-info default-hit-points)) (set! (-> obj fated-time) 0) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc index 4acd0d0364..1bc7a1364a 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc @@ -211,11 +211,9 @@ (logior! (-> obj enemy-flags) (enemy-flag enable-on-active checking-water)) (logior! (-> obj focus-status) (focus-status dangerous)) (logior! (-> obj enemy-flags) (enemy-flag check-water)) - (set! (-> obj enemy-flags) - (logior (enemy-flag check-water-backup no-initial-move-to-ground) (-> obj enemy-flags)) - ) + (logior! (-> obj enemy-flags) (enemy-flag check-water-backup no-initial-move-to-ground)) (logclear! (-> obj focus-status) (focus-status dead)) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (logior! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (if (zero? (-> obj hit-face)) (go (method-of-object obj get-up-front)) @@ -1544,7 +1542,7 @@ ;; definition for function civilian-falling-post ;; INFO: Used lq/sq (defbehavior civilian-falling-post civilian () - (set! (-> self enemy-flags) (logior (enemy-flag directed) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag directed)) (let ((gp-0 (-> self root))) (cond ((focus-test? self under-water) @@ -2101,7 +2099,7 @@ (set! (-> v1-10 enemy-flags) (the-as enemy-flag (logclear (-> v1-10 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (none) ) :exit (behavior () @@ -2167,7 +2165,7 @@ (citizen-nav-init! self) (set! (-> self gnd-height) (-> self root gspot-pos y)) (logior! (-> self flags) (citizen-flag persistent)) - (set! (-> self focus-status) (logior (focus-status pilot-riding pilot) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status pilot-riding pilot)) (set! (-> self state-time) (current-time)) (let ((v1-28 (-> self root root-prim))) (set! (-> v1-28 prim-core collide-as) (collide-spec)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc index 91bff3ee6e..a090cf14ef 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc @@ -1668,7 +1668,7 @@ (init-vf0-vector) (cond ((logtest? (-> obj controller traffic alert-state flags) (traffic-alert-flag guard-multi-focus)) - (set! (-> obj enemy-flags) (logior (enemy-flag trackable) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag trackable)) (when (not (logtest? (enemy-flag actor-pause-backup) (-> obj enemy-flags))) (let ((a0-4 (find-closest-to-with-collide-lists (-> obj controller traffic) obj (-> obj focus collide-with)))) (if a0-4 @@ -1696,7 +1696,7 @@ ) (let ((a1-3 (new 'stack-no-clear 'vector))) (set! (-> a1-3 quad) (-> obj root trans quad)) - (set! (-> a1-3 y) (+ 8192.0 (-> a1-3 y))) + (+! (-> a1-3 y) 8192.0) (let ((s5-1 (traffic-engine-method-49 (-> obj controller traffic) a1-3 (-> obj traffic-id) (-> obj traffic-target-status)) ) @@ -2187,7 +2187,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-4 enemy-flags))) @@ -2260,7 +2260,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self other-side) (if (< (rand-vu) 0.5) #t #f @@ -2714,7 +2714,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -2815,7 +2815,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -3298,7 +3298,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior crimson-guard) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self joint-enable) #t) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-5 self)) @@ -4159,7 +4159,7 @@ 0 (set! (-> obj joint-enable) #f) (logclear! (-> obj mask) (process-mask enemy)) - (set! (-> obj mask) (logior (process-mask guard) (-> obj mask))) + (logior! (-> obj mask) (process-mask guard)) (set! (-> obj fact pickup-type) (pickup-type ammo-random)) (set! (-> obj fact pickup-amount) 10.0) (set! (-> obj fact pickup-spawn-amount) 1.0) @@ -4206,7 +4206,3 @@ 0 (none) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc index afa90707da..1650cb3461 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc @@ -416,7 +416,7 @@ (suspend) ) ) - (set! (-> self root trans y) (+ -8192.0 (-> self root trans y))) + (+! (-> self root trans y) -8192.0) (logior! (-> self draw status) (draw-control-status no-draw)) (let ((gp-3 (current-time))) (until (>= (- (current-time) gp-3) (the int (* 300.0 (get-rand-float-range self 0.0 0.6)))) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc index ece56f704a..64ee66120f 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc @@ -295,7 +295,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -800,7 +800,7 @@ (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) @@ -913,7 +913,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) @@ -1212,7 +1212,7 @@ (joint-control-channel-group! a0-16 (the-as art-joint-anim s4-0) num-func-seek!) ) ) - (set! (-> obj grunt-flags) (logand -3 (-> obj grunt-flags))) + (logand! (-> obj grunt-flags) -3) #t ) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc index 119f27517c..2b53d41bda 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc @@ -951,7 +951,7 @@ (set! (-> self attack-id) a0-1) ) (traffic-danger-init! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (none) ) :exit (behavior () @@ -1029,7 +1029,7 @@ ) :enter (behavior () (traffic-danger-init! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) @@ -1255,7 +1255,3 @@ 0 (none) ) - - - - diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc index fd7145bc3d..8dd908e500 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc @@ -1598,10 +1598,10 @@ ;; WARN: Return type mismatch int vs none. (defmethod start-jump guard-bike ((obj guard-bike)) (when (not (logtest? (rigid-body-object-flag jump-sound) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag jump-sound) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump-sound)) (sound-play "bike-hop") ) - (set! (-> obj flags) (logior (rigid-body-object-flag jump) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump)) 0 (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc index e89082a52b..17297a7b51 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc @@ -515,7 +515,7 @@ (set! (-> s5-0 guard-type) (the-as uint 7)) (vector-reset! (-> s5-0 velocity)) (set! (-> s5-0 position quad) (-> obj root trans quad)) - (set! (-> s5-0 position y) (+ 8192.0 (-> s5-0 position y))) + (+! (-> s5-0 position y) 8192.0) (quaternion-rotate-local-y! (-> s5-0 rotation) (-> obj root quat) 32768.0) (send-event *traffic-manager* 'activate-object s5-0) (when (-> s5-0 proc) @@ -619,7 +619,7 @@ ) (transport-method-32 self) (set! (-> self y-dest) (-> self root trans y)) - (set! (-> self root trans y) (+ 163840.0 (-> self root trans y))) + (+! (-> self root trans y) 163840.0) (set! (-> self spawn?) #t) (set! (-> self leave-time) 0) (if (-> arg0 turret?) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc index 96c28ba458..60497a9673 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc @@ -779,7 +779,7 @@ (set! (-> arg0 svel quad) (-> obj root transv quad)) (vector-normalize-copy! (-> arg0 tdir) (-> arg0 tvel) 1.0) (vector-normalize-copy! (-> arg0 sdir) (-> arg0 svel) 1.0) - (set! (-> arg0 tpos y) (+ 4096.0 (-> arg0 tpos y))) + (+! (-> arg0 tpos y) 4096.0) (vector-! (-> arg0 to-target) (-> arg0 tpos) (-> arg0 spos)) (let* ((f0-2 (vector-length (-> arg0 to-target))) (f1-2 (/ 1.0 f0-2)) @@ -992,7 +992,7 @@ (defmethod vehicle-method-134 vehicle-guard ((obj vehicle-guard) (arg0 process)) "Stubbed" (set! (-> obj pursuit-target) (process->handle arg0)) - (set! (-> obj flags) (logior (rigid-body-object-flag alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag alert)) (vehicle-method-111 obj 2 (the-as target arg0)) 0 (none) @@ -1042,7 +1042,7 @@ (logtest? (rigid-body-object-flag ai-driving) (-> obj flags)) (>= (the-as uint (get-alert-level (-> obj controller traffic))) (the-as uint 2)) ) - (set! (-> obj flags) (logior (rigid-body-object-flag alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag alert)) (let ((v0-4 (the-as object (process->handle (the-as process (-> arg3 param 0)))))) (set! (-> obj pursuit-target) (the-as handle v0-4)) v0-4 @@ -1133,7 +1133,7 @@ (let ((t9-0 (method-of-type vehicle alloc-and-init-rigid-body-control))) (t9-0 obj arg0) ) - (set! (-> obj mask) (logior (process-mask enemy guard) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy guard)) (set! (-> obj pursuit-target) (the-as handle #f)) (set! (-> obj minimap) #f) (set! (-> obj lod2) (the-as symbol (-> obj draw lod-set lod 2 geo))) @@ -1188,7 +1188,7 @@ (case (-> arg0 behavior) ((9) (vehicle-method-128 obj) - (set! (-> obj flags) (logior (rigid-body-object-flag persistent alert) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag persistent alert)) (set! (-> obj pursuit-target) (-> arg0 handle)) (go (method-of-object obj waiting-ambush)) ) @@ -1577,7 +1577,7 @@ vehicle-event-handler ) :enter (behavior () - (set! (-> self flags) (logior (rigid-body-object-flag riding ignition ai-driving) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag riding ignition ai-driving)) (set! (-> self ai-hook) (method-of-object self vehicle-guard-method-156)) (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc index 2ae798dbb7..bf55edb855 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc @@ -60,7 +60,7 @@ ) ) ) - (set! (-> obj flags) (logand -5 (-> obj flags))) + (logand! (-> obj flags) -5) (if (and s5-0 (nonzero? (vehicle-method-72 s5-0))) (logior! (-> obj flags) 4) ) @@ -123,7 +123,7 @@ (when a0-1 (+! (-> obj anim-t) (* 41870.223 (-> obj anim-speed) (-> pp clock seconds-per-frame))) (if (< 65536.0 (-> obj anim-t)) - (set! (-> obj anim-t) (+ -65536.0 (-> obj anim-t))) + (+! (-> obj anim-t) -65536.0) ) (let* ((f0-5 (vehicle-method-75 a0-1)) (f0-9 (+ (* 5.0 (- 1.0 f0-5)) (sin (-> obj anim-t)))) @@ -152,7 +152,7 @@ ) ) (('traffic-off) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) (vehicle-rider-method-35 self) ) (('knocked-off) @@ -178,7 +178,7 @@ (quaternion-copy! (-> gp-0 rotation) (-> self root quat)) (send-event *traffic-manager* 'activate-object gp-0) ) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) (vehicle-rider-method-35 self) ) (('race-pass 'taunt) @@ -200,7 +200,7 @@ ) ) (('rider-off) - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (vehicle-rider-method-35 self) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc index 77de407c17..e7a7ad6279 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-states_REF.gc @@ -59,7 +59,7 @@ :enter (behavior () (set! (-> self state-time) (current-time)) (vehicle-method-139 self) - (set! (-> self flags) (logior (rigid-body-object-flag riding ai-driving) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag riding ai-driving)) (vehicle-method-142 self) (set! (-> self flight-level-index) 1) (none) @@ -151,19 +151,16 @@ ) ) (vehicle-method-139 self) - (set! (-> self flags) - (the-as - rigid-body-object-flag - (logior (rigid-body-object-flag riding player-driving nav-spheres) (-> self flags)) - ) + (set! (-> self flags) (the-as + rigid-body-object-flag + (logior (rigid-body-object-flag riding player-driving nav-spheres) (-> self flags)) + ) ) (set! (-> self max-time-step) 0.02) (rigid-body-object-method-38 self) (vehicle-method-102 self) (vehicle-method-87 self) - (set! (-> self root penetrated-by) - (logior (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot) (-> self root penetrated-by)) - ) + (logior! (-> self root penetrated-by) (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot)) (set! (-> self damage-factor) (* 0.7518797 (-> self damage-factor))) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc index a01c10c002..8cbcfba6b2 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc @@ -247,7 +247,7 @@ This commonly includes things such as: (set! (-> s5-0 floats 4) (* 1.5 (-> s5-0 floats 4))) ) (set! (-> s5-0 matrices 0 vector 1 quad) (-> (target-pos 0) quad)) - (set! (-> s5-0 matrices 0 vector 1 y) (+ 8192.0 (-> s5-0 matrices 0 vector 1 y))) + (+! (-> s5-0 matrices 0 vector 1 y) 8192.0) (let* ((v1-14 (-> s5-0 matrices 1)) (a3-0 (-> obj node-list data 0 bone transform)) (a0-5 (-> a3-0 quad 0)) @@ -499,10 +499,10 @@ This commonly includes things such as: (defmethod start-jump vehicle ((obj vehicle)) (when (logtest? (-> obj info flags) 16) (when (not (logtest? (rigid-body-object-flag jump-sound) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag jump-sound) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump-sound)) (sound-play "bike-hop") ) - (set! (-> obj flags) (logior (rigid-body-object-flag jump) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag jump)) ) 0 (none) @@ -850,9 +850,7 @@ This commonly includes things such as: (defmethod vehicle-method-78 vehicle ((obj vehicle) (arg0 int)) (set! (-> obj flight-level-index-prev) (-> obj flight-level-index)) (set! (-> obj flight-level-index) arg0) - (set! (-> obj flags) - (logior (rigid-body-object-flag flight-level-transition camera-rapid-track-mode) (-> obj flags)) - ) + (logior! (-> obj flags) (rigid-body-object-flag flight-level-transition camera-rapid-track-mode)) (logclear! (-> obj flags) (rigid-body-object-flag flight-level-transition-ending)) (set! (-> obj transition-time) (current-time)) (vehicle-method-91 obj) @@ -864,7 +862,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch int vs none. (defmethod vehicle-method-79 vehicle ((obj vehicle)) (logclear! (-> obj flags) (rigid-body-object-flag flight-level-transition)) - (set! (-> obj flags) (logior (rigid-body-object-flag flight-level-transition-ending) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag flight-level-transition-ending)) (set! (-> obj transition-end-time) (current-time)) 0 (none) @@ -900,7 +898,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch int vs none. (defmethod vehicle-method-139 vehicle ((obj vehicle)) (when (not (logtest? (rigid-body-object-flag ignition) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag ignition) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag ignition)) (sound-play "vehicl-ignition") (let ((s5-1 (-> obj node-list data 0 bone transform)) (s4-1 (new 'stack-no-clear 'merc-matrix)) @@ -1016,7 +1014,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch int vs none. (defmethod vehicle-method-87 vehicle ((obj vehicle)) (when (not (logtest? (rigid-body-object-flag camera) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag camera) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag camera)) (set! (-> obj cam-speed-interp) 0.0) (set-setting! 'string-min-height 'abs (-> obj info camera-string-min-height) 0) (set-setting! 'string-max-height 'abs (-> obj info camera-string-max-height) 0) @@ -1084,7 +1082,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch int vs none. (defmethod vehicle-method-89 vehicle ((obj vehicle)) (when (not (logtest? (rigid-body-object-flag camera-bike-mode) (-> obj flags))) - (set! (-> obj flags) (logior (rigid-body-object-flag camera-bike-mode) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag camera-bike-mode)) (set-setting! 'bike-mode #f 0.0 0) ) 0 @@ -1106,7 +1104,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch int vs none. (defmethod vehicle-method-91 vehicle ((obj vehicle)) (when (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) - (set! (-> obj flags) (logior (rigid-body-object-flag camera-rapid-track-mode) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag camera-rapid-track-mode)) (set-setting! 'rapid-tracking #f 0.0 0) ) 0 @@ -1409,7 +1407,7 @@ This commonly includes things such as: (defmethod vehicle-method-128 vehicle ((obj vehicle)) (vehicle-method-82 obj) (set! (-> obj root trans y) (-> obj flight-level)) - (set! (-> obj flags) (logior (rigid-body-object-flag ignition ai-driving) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag ignition ai-driving)) (let ((gp-1 (-> obj child))) (while gp-1 (send-event (ppointer->process gp-1) 'traffic-on) @@ -1549,7 +1547,7 @@ This commonly includes things such as: (label cfg-1) (let ((v1-7 (find-best-segment (-> obj controller traffic) (-> s5-0 local-pos) (-> s5-0 normal) 0))) (when (and (not v1-7) (< s4-0 3)) - (set! (-> s5-0 local-pos w) (+ 40960.0 (-> s5-0 local-pos w))) + (+! (-> s5-0 local-pos w) 40960.0) (+! s4-0 1) (goto cfg-1) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc index 623d951c02..051450bb18 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc @@ -325,7 +325,7 @@ (logclear! (-> obj flags) (rigid-body-object-flag reverse-gear)) (when (< 0.0 f30-0) (set! f30-0 0.25) - (set! (-> obj flags) (logior (rigid-body-object-flag slide) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag slide)) ) f30-0 ) @@ -357,7 +357,7 @@ (f2-8 8192.0) ) (if (< f1-10 (* f2-8 f2-8)) - (set! (-> obj flags) (logior (rigid-body-object-flag reverse-gear) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag reverse-gear)) ) ) f30-0 @@ -558,7 +558,7 @@ (not (logtest? (-> obj flags) (rigid-body-object-flag in-air))) (logtest? (-> obj vehicle-jkhn1b23jn1) 1024) ) - (set! (-> obj flags) (logior (rigid-body-object-flag hard-turn) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag hard-turn)) (set! (-> obj turn-time) (current-time)) ) (if (or (not (logtest? (rigid-body-object-flag jump) (-> obj flags))) @@ -1481,7 +1481,7 @@ (logior! (-> obj rbody state flags) (rigid-body-flag enable-collision)) (set! (-> obj root max-iteration-count) (the-as uint 8)) (set! (-> obj max-time-step) 0.033333335) - (set! (-> obj mask) (logior (process-mask vehicle) (-> obj mask))) + (logior! (-> obj mask) (process-mask vehicle)) (logclear! (-> obj mask) (process-mask actor-pause movie)) (logclear! (-> obj skel status) (joint-control-status sync-math)) (process-entity-status! obj (entity-perm-status no-kill) #t) @@ -1851,7 +1851,7 @@ ) ((= v1-19 'traffic-activate) (set! (-> obj controller traffic) (the-as traffic-engine (-> arg3 param 1))) - (set! (-> obj flags) (logior (rigid-body-object-flag traffic-managed) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag traffic-managed)) (let ((s5-1 (the-as traffic-object-spawn-params (-> arg3 param 0)))) (set! (-> obj root trans quad) (-> s5-1 position quad)) (quaternion-copy! (-> obj root quat) (-> s5-1 rotation)) @@ -1885,7 +1885,7 @@ (set! (-> obj turbo-boost-factor) (the-as float (-> arg3 param 0))) (set! (-> obj turbo-boost-time) (current-time)) (set! (-> obj turbo-boost-duration) (the-as uint 75)) - (set! (-> obj flags) (logior (rigid-body-object-flag turbo-boost) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag turbo-boost)) (if (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) (sound-play "boost-ring") ) @@ -1947,7 +1947,7 @@ ;; INFO: Used lq/sq (defbehavior vehicle-init-by-other vehicle ((arg0 traffic-object-spawn-params)) (stack-size-set! (-> self main-thread) 16) - (set! (-> self mask) (logior (process-mask vehicle) (-> self mask))) + (logior! (-> self mask) (process-mask vehicle)) (allocate-and-init-cshape self) (set! (-> self root trans quad) (-> arg0 position quad)) (quaternion-copy! (-> self root quat) (-> arg0 rotation)) diff --git a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc index 602e5072e7..ac36c16df0 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-states_REF.gc @@ -488,7 +488,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (if (not (handle->process (-> self focus handle))) (react-to-focus self) ) @@ -1041,7 +1041,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -1073,7 +1073,7 @@ (when (and (nonzero? (-> self hit-points)) (zero? (-> self fated-time))) (if (logtest? (-> self bot-flags) (bot-flags bf04)) (logior! (-> self bot-flags) (bot-flags bf12)) - (set! (-> self bot-flags) (logior (bot-flags bf23) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf23)) ) ) (none) diff --git a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash_REF.gc index 64f8169378..d7c40659c0 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash_REF.gc @@ -250,7 +250,7 @@ ;; WARN: Return type mismatch penetrate vs none. (defmethod ashelin-method-250 ashelin ((obj ashelin) (arg0 symbol)) (if arg0 - (set! (-> obj bot-flags) (logior (bot-flags bf22) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf22)) (logclear! (-> obj bot-flags) (bot-flags bf22)) ) (set! (-> obj root penetrated-by) (get-penetrate-info obj)) @@ -266,7 +266,7 @@ (if (logtest? (bot-flags bf22) (-> obj bot-flags)) (set! v0-0 #t) ) - (set! (-> obj bot-flags) (logior (bot-flags bf21) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf21)) ) v0-0 ) @@ -851,7 +851,7 @@ (set! (-> v1-27 dist) 43690.68) (set! (-> v1-27 frame-group) (the-as art-joint-anim (-> obj draw art-group data 6))) ) - (set! (-> obj bot-flags) (logior (bot-flags bf19) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf19)) f0-4 ) (else @@ -924,7 +924,7 @@ (set! (-> a0-29 param 0) 0.0) (joint-control-channel-group! a0-29 (the-as art-joint-anim (-> obj draw art-group data 6)) num-func-chan) ) - (set! (-> obj bot-flags) (logior (bot-flags bf19) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf19)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/ai/bot-h_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/bot-h_REF.gc index ab594a6afc..db5b3369b1 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/bot-h_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/bot-h_REF.gc @@ -712,7 +712,7 @@ ;; WARN: Return type mismatch int vs none. (defmethod reset-index bot-speech-list ((obj bot-speech-list) (arg0 symbol)) (if arg0 - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) (set! (-> obj last-local-index) -1) (none) diff --git a/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc index 166b55962e..ffc05d528c 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/bot-states_REF.gc @@ -56,7 +56,7 @@ ) (set! (-> self enemy-flags) v1-37) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-44 (-> self enemy-flags))) diff --git a/test/decompiler/reference/jak2/levels/common/ai/bot_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/bot_REF.gc index 40142f534e..7794909ee8 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/bot_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/bot_REF.gc @@ -847,7 +847,7 @@ ) (cond (v1-43 - (set! (-> obj bot-flags) (logior (bot-flags bf16) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf16)) (when (and (>= (the-as int s5-1) 0) (!= s5-1 (-> obj nav-mesh-index))) (change-to (nav-mesh-from-res-tag (-> obj entity) 'nav-mesh-actor (the-as int s5-1)) obj) (set! (-> obj nav-mesh-index) (the-as int s5-1)) @@ -1516,8 +1516,8 @@ If the player is too far, play a warning speech." (process-entity-status! obj (entity-perm-status bit-4) #t) (set! (-> obj ai-ctrl) (new 'process 'ai-task-control *bot-task-pool*)) (logclear! (-> obj mask) (process-mask enemy)) - (set! (-> obj mask) (logior (process-mask bot) (-> obj mask))) - (set! (-> obj enemy-flags) (logior (enemy-flag use-notice-distance multi-focus) (-> obj enemy-flags))) + (logior! (-> obj mask) (process-mask bot)) + (logior! (-> obj enemy-flags) (enemy-flag use-notice-distance multi-focus)) (logclear! (-> obj mask) (process-mask collectable)) (logclear! (-> obj enemy-flags) (enemy-flag look-at-move-dest)) (logior! (-> obj focus-status) (focus-status disable)) @@ -1601,7 +1601,7 @@ If the player is too far, play a warning speech." (when (and arg0 focus-proc (zero? (-> focus los))) (let ((cquery (new 'stack-no-clear 'collide-query))) (set! (-> cquery start-pos quad) (-> obj root trans quad)) - (set! (-> cquery start-pos y) (+ 8192.0 (-> cquery start-pos y))) + (+! (-> cquery start-pos y) 8192.0) (vector-! (-> cquery move-dist) (-> focus bullseye) (-> cquery start-pos)) (let ((f0-19 (fmax 1.0 (+ -1638.4 (vector-length (-> cquery move-dist)))))) (cond @@ -1760,7 +1760,7 @@ If the player is too far, play a warning speech." (s5-0 (new 'stack-no-clear 'vector)) ) (set! (-> v1-0 quad) (-> obj root trans quad)) - (set! (-> v1-0 y) (+ 9216.0 (-> v1-0 y))) + (+! (-> v1-0 y) 9216.0) (vector-! s1-0 arg0 v1-0) (vector-normalize! s1-0 1.0) (vector-z-quaternion! s2-0 (-> obj root quat)) diff --git a/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc index 2bfab90855..7851344c6f 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-states_REF.gc @@ -380,7 +380,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-11 *game-info*) (a0-6 (+ (-> v1-11 attack-id) 1)) @@ -423,7 +423,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (if (not (handle->process (-> self focus handle))) (react-to-focus self) ) @@ -486,7 +486,7 @@ (when (and (nonzero? (-> self hit-points)) (zero? (-> self fated-time))) (if (logtest? (-> self bot-flags) (bot-flags bf04)) (logior! (-> self bot-flags) (bot-flags bf12)) - (set! (-> self bot-flags) (logior (bot-flags bf24) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf24)) ) ) (set! (-> self travel-anim-interp) 0.0) diff --git a/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-task_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-task_REF.gc index 8a7d7b98ba..3985eee90a 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/ruffian/ruf-task_REF.gc @@ -219,7 +219,7 @@ (not (logtest? (bot-flags bf21) (-> arg0 bot-flags))) ) ) - (set! (-> arg0 bot-flags) (logior (bot-flags bf20) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf20)) (logclear! (-> arg0 bot-flags) (bot-flags bf20)) ) (when (logtest? *display-bot-marks* (bot-marks-controls bmc16)) diff --git a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc index 83c7ffcbd2..1fa8e7e680 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc @@ -632,7 +632,7 @@ ) (sound-play "sig-gun-jam") (logclear! (-> self bot-flags) (bot-flags bf20)) - (set! (-> self bot-flags) (logior (bot-flags bf19) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf19)) (ja-no-eval :num! (seek!)) (while (not (ja-done? 0)) (suspend) @@ -1197,7 +1197,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-11 *game-info*) (a0-6 (+ (-> v1-11 attack-id) 1)) @@ -1283,7 +1283,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (if (not (handle->process (-> self focus handle))) (react-to-focus self) ) @@ -1416,7 +1416,7 @@ (if (not (handle->process (-> self focus handle))) (go-virtual traveling) ) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (none) ) :exit (behavior () @@ -1528,7 +1528,7 @@ ) (set! (-> self enemy-flags) v1-31) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-38 (-> self enemy-flags))) @@ -1719,7 +1719,7 @@ (look-at-target! self (enemy-flag lock-focus)) (set! (-> self skel top-anim interp) 0.0) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self bot-flags) (logior (bot-flags bf24) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf24)) (none) ) :trans (behavior () @@ -1862,7 +1862,7 @@ (look-at-target! self (enemy-flag lock-focus)) (set! (-> self skel top-anim interp) 0.0) (set! (-> self travel-anim-interp) 0.0) - (set! (-> self bot-flags) (logior (bot-flags bf24) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf24)) (logclear! (-> self bot-flags) (bot-flags bf25)) (none) ) @@ -1908,7 +1908,7 @@ (if (and (not (logtest? (bot-flags bf25) (-> self bot-flags))) (and (< 5.0 (ja-aframe-num 0)) (sig-method-250 self)) ) - (set! (-> self bot-flags) (logior (bot-flags bf25) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf25)) ) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc index 67ea5a5a59..754148ca9d 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc @@ -1021,7 +1021,7 @@ (f1-4 (cond ((or (not (and v1-6 (= v1-6 (-> obj draw art-group data 3)))) (or (= (-> obj jump-why) 4) (>= f2-1 8192.0))) - (set! (-> obj bot-flags) (logior (bot-flags bf23) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf23)) (let ((f2-3 (fmax 12288.0 (* 0.5 f1-0))) (f1-3 (fmax (-> arg0 start-pos y) (-> arg0 dest-pos y))) ) diff --git a/test/decompiler/reference/jak2/levels/common/battle_REF.gc b/test/decompiler/reference/jak2/levels/common/battle_REF.gc index e8a46cee26..1f385a672b 100644 --- a/test/decompiler/reference/jak2/levels/common/battle_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/battle_REF.gc @@ -2033,7 +2033,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (let ((s4-0 (new 'process 'trsqv))) (set! (-> obj root) s4-0) (set! (-> s4-0 trans quad) (-> arg0 extra trans quad)) diff --git a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc index 90c5b48b7d..56a885e534 100644 --- a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc @@ -951,7 +951,7 @@ This commonly includes things such as: ) ) (set! (-> obj wall-xz) (* 0.5 (-> obj wall-xz))) - (set! (-> obj wall-xz) (+ 4096.0 (-> obj wall-xz))) + (+! (-> obj wall-xz) 4096.0) (set! (-> obj wall-y) (fabs (- (-> (get-point-in-path! (-> obj path) (new 'stack-no-clear 'vector) (get-num-segments (-> obj path)) 'interp) @@ -961,7 +961,7 @@ This commonly includes things such as: ) ) ) - (set! (-> obj wall-y) (+ 4096.0 (-> obj wall-y))) + (+! (-> obj wall-y) 4096.0) (set! (-> obj quality-enabled?) #t) (set! (-> obj lightning-quality) 1.0) (set! (-> obj sound) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc index 370efea555..f787ad1fcb 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/amphibian/amphibian_REF.gc @@ -369,7 +369,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (when (= (-> obj incoming knocked-type) (knocked-type knocked-type-4)) @@ -1036,7 +1036,7 @@ ) (if s4-0 (logior! (-> obj flags) 1) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) (cond @@ -1059,7 +1059,7 @@ ) (set! (-> s5-3 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) (else @@ -1081,7 +1081,7 @@ ) (set! (-> s5-4 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) (else @@ -1095,7 +1095,7 @@ ) (set! (-> s5-5 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) ) @@ -1120,7 +1120,7 @@ ) (set! (-> s5-6 frame-num) (ja-aframe f26-0 0)) ) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) ) ) ) @@ -1322,7 +1322,7 @@ (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag37)))) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-8 (-> self nav))) (set! (-> v1-8 turning-acceleration) 204800.0) ) @@ -1509,7 +1509,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) @@ -1579,7 +1579,7 @@ (set! (-> v1-3 turning-acceleration) 204800.0) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-7 self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> v1-7 enemy-flags))) (set! (-> v1-7 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag38) (-> v1-7 enemy-flags)))) @@ -1642,7 +1642,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -1684,7 +1684,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior amphibian) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) @@ -1806,7 +1806,7 @@ (nav-enemy-method-167 self) (set! (-> self tongue-scale) 0.0) (set! (-> self tongue-mode) (the-as uint 0)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (sound-play "tongue-warn") (let ((gp-1 (new 'stack-no-clear 'amphibian-tongue-attack-info))) (amphibian-method-185 self gp-1) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc index 363d19b9df..405917a396 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc @@ -743,7 +743,7 @@ (suspend) ) ) - (set! (-> self root trans y) (+ -8192.0 (-> self root trans y))) + (+! (-> self root trans y) -8192.0) (enemy-method-129 self) (let ((a0-5 (handle->process (-> self focus handle)))) (when a0-5 diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc index b5acd39d1a..083c7a5d57 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc @@ -558,7 +558,7 @@ ) (grenadier-method-181 self) (look-at-target! self (enemy-flag death-start)) - (set! (-> self status-flags) (logand -2 (-> self status-flags))) + (logand! (-> self status-flags) -2) (none) ) :trans (behavior () @@ -931,7 +931,7 @@ (logior! (-> self nav flags) (nav-control-flag update-heading-from-facing)) (logclear! (-> self nav flags) (nav-control-flag update-heading-from-facing)) ) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (if (logtest? (-> self enemy-flags) (enemy-flag check-water)) (logior! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self focus-status) (focus-status dangerous)) @@ -968,7 +968,7 @@ (ja :num! (seek! max f30-0)) ) (ja-channel-push! 1 (seconds 0.067)) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (if (logtest? (enemy-flag enemy-flag43) (-> self enemy-flags)) (logior! (-> self nav flags) (nav-control-flag update-heading-from-facing)) (logclear! (-> self nav flags) (nav-control-flag update-heading-from-facing)) @@ -991,7 +991,7 @@ (suspend) (ja :num! (seek! max f30-0)) ) - (set! (-> self status-flags) (logand -2 (-> self status-flags))) + (logand! (-> self status-flags) -2) ) (else (when (not (enemy-method-96 self 1820.4445 #t)) @@ -1131,7 +1131,7 @@ ) (set! (-> self enemy-flags) v1-44) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-51 (-> self enemy-flags))) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc index a0a6bd06dc..9f6edb063e 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc @@ -415,7 +415,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -923,7 +923,7 @@ (set! (-> v1-1 speed) (-> self enemy-info run-travel-speed)) ) 0 - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) @@ -1022,7 +1022,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior grunt) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 self)) (set! (-> v1-2 enemy-flags) (the-as enemy-flag (logclear (-> v1-2 enemy-flags) (enemy-flag enemy-flag36)))) (set! (-> v1-2 nav callback-info) *nav-enemy-null-callback-info*) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc index 13e0906b07..c3d39acec1 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc @@ -2109,7 +2109,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (nav-enemy-method-167 self) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag36)))) @@ -2336,7 +2336,7 @@ (cond ((logtest? (-> self flags) 4) (if (< (-> self target-vel) 40.96) - (set! (-> self miss-amount) (+ -12288.0 (-> self miss-amount))) + (+! (-> self miss-amount) -12288.0) ) ) ((logtest? (-> self draw status) (draw-control-status on-screen)) @@ -2841,7 +2841,7 @@ (let ((v1-3 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 3))) (logior! (-> v1-3 prim-core action) (collide-action deadly)) ) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-8 *game-info*) (a0-4 (+ (-> v1-8 attack-id) 1)) @@ -2949,7 +2949,7 @@ enemy-event-handler ) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 self)) (set! (-> v1-4 enemy-flags) (the-as enemy-flag (logclear (-> v1-4 enemy-flags) (enemy-flag enemy-flag37)))) @@ -3041,7 +3041,7 @@ ) :enter (behavior () (set! (-> self joint-enable) #t) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-5 *game-info*) (a0-2 (+ (-> v1-5 attack-id) 1)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc index 0830f43d0d..fa60f9f074 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/transport-level_REF.gc @@ -299,7 +299,7 @@ (set! (-> s5-0 transport-side) (-> obj spawn-side)) (set! (-> s5-0 nav-mesh) (-> obj nav-mesh)) (set! (-> s5-0 pos quad) (-> obj root trans quad)) - (set! (-> s5-0 pos y) (+ 8192.0 (-> s5-0 pos y))) + (+! (-> s5-0 pos y) 8192.0) (quaternion-rotate-local-y! (-> s5-0 quat) (-> obj root quat) 32768.0) (set! (-> s5-0 handle) (the-as uint (process->handle obj))) (set! (-> s5-0 weapon) 1) @@ -401,9 +401,9 @@ This commonly includes things such as: (set! (-> obj guards v1-11) (the-as handle #f)) ) (set! (-> obj spawn-time) (seconds 4)) - (set! (-> obj root trans y) (+ 40960.0 (-> obj root trans y))) + (+! (-> obj root trans y) 40960.0) (set! (-> obj y-dest) (-> obj root trans y)) - (set! (-> obj root trans y) (+ 163840.0 (-> obj root trans y))) + (+! (-> obj root trans y) 163840.0) (go (method-of-object obj come-down)) (none) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc index 0cef7cfb83..e6d9633ce5 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc @@ -828,7 +828,7 @@ (let ((s4-0 (new 'stack-no-clear 'vector))) 0.0 (get-point-in-path! (-> self path-intro) s5-0 0.0 'exact) - (set! (-> s5-0 y) (+ -16384.0 (-> s5-0 y))) + (+! (-> s5-0 y) -16384.0) (get-point-in-path! (-> self path-intro) s4-0 1.0 'exact) (let ((f0-3 (deg-diff (quaternion-y-angle (-> gp-1 quat)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc index 2091447b1f..a0bd8c61c8 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc @@ -912,7 +912,7 @@ ) (set! (-> gp-0 quad) (-> (get-trans (the-as process-focusable a0-6) 0) quad)) ) - (set! (-> gp-0 y) (+ -20480.0 (-> gp-0 y))) + (+! (-> gp-0 y) -20480.0) (hover-nav-control-method-11 (-> self hover) gp-0) ) (hover-enemy-dest-post) @@ -1073,7 +1073,7 @@ ) (set! (-> self enemy-flags) v1-35) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-42 (-> self enemy-flags))) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc index a1921228e3..afc11413af 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc @@ -284,7 +284,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (go (method-of-object obj knocked)) @@ -1408,7 +1408,7 @@ 0 (set! (-> self hit-points) 0) (if (logtest? (enemy-option knocked-into-water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup)) ) (let ((v1-8 self)) (set! (-> v1-8 enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag37) (-> v1-8 enemy-flags)))) @@ -1572,7 +1572,7 @@ (set! (-> obj root dynam gravity-max) 225280.0) (let ((v1-25 (-> obj root trans))) (set! (-> obj base-pos quad) (-> v1-25 quad)) - (set! (-> v1-25 y) (+ 22528.0 (-> v1-25 y))) + (+! (-> v1-25 y) 22528.0) (set! (-> obj idle-pos quad) (-> v1-25 quad)) ) (set! (-> obj flit-joint) (the-as joint-mod (new 'process 'joint-mod-set-local obj 3 #t #f #f))) @@ -1595,7 +1595,7 @@ (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "flamer-loop" :fo-max 80) (-> obj root trans)) ) - (set! (-> obj enemy-flags) (logior (enemy-flag multi-focus) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag multi-focus)) (let ((v1-45 (-> obj nav))) (set! (-> v1-45 sphere-mask) (the-as uint 0)) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc index b8ce21e4f7..4234dcc487 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc @@ -25,7 +25,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -717,7 +717,7 @@ ) (set! (-> self enemy-flags) v1-38) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-45 (-> self enemy-flags))) @@ -752,7 +752,7 @@ (set! (-> self state-time) (current-time)) (dispose! self) (stop-looking-at-target! self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logclear! (-> self mask) (process-mask actor-pause)) (logclear! (-> self focus-status) (focus-status dangerous)) (logclear! (-> self enemy-flags) (enemy-flag check-water-backup)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc index 3391d727cc..aa1a1573c5 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc @@ -1310,7 +1310,7 @@ ;; WARN: Return type mismatch int vs none. (defmethod hover-nav-control-method-20 hover-nav-control ((obj hover-nav-control)) (hover-nav-control-method-21 obj) - (set! (-> obj flags) (logand -2 (-> obj flags))) + (logand! (-> obj flags) -2) 0 (none) ) @@ -1397,7 +1397,7 @@ ) (else (set! (-> obj los-last-clear-time) (current-time)) - (set! (-> obj flags) (logand -3 (-> obj flags))) + (logand! (-> obj flags) -3) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc index 17de62d235..a31869047e 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc @@ -491,7 +491,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (if (zero? (-> obj hit-points)) @@ -758,7 +758,7 @@ ((< a0-0 (-> v1-0 length)) (let ((a1-1 (-> v1-0 data a0-0 actor extra trans))) (set! (-> self plat-pos quad) (-> a1-1 quad)) - (set! (-> self plat-pos y) (+ -8192.0 (-> self plat-pos y))) + (+! (-> self plat-pos y) -8192.0) (set! (-> self focus-pos quad) (-> self plat-pos quad)) (when (< (vector-vector-distance (-> self root trans) a1-1) (- 327680.0 (* 81920.0 (the float (-> self bridge-index)))) @@ -779,8 +779,8 @@ :post (behavior () (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self focus-pos quad)) - (set! (-> a1-0 z) (+ 81920.0 (-> a1-0 z))) - (set! (-> a1-0 y) (+ 40960.0 (-> a1-0 y))) + (+! (-> a1-0 z) 81920.0) + (+! (-> a1-0 y) 40960.0) (hover-nav-control-method-11 (-> self hover) a1-0) ) (hover-enemy-dest-post) @@ -866,8 +866,8 @@ ) (let ((a1-8 (new 'stack-no-clear 'vector))) (set! (-> a1-8 quad) (-> self focus-pos quad)) - (set! (-> a1-8 z) (+ 81920.0 (-> a1-8 z))) - (set! (-> a1-8 y) (+ 40960.0 (-> a1-8 y))) + (+! (-> a1-8 z) 81920.0) + (+! (-> a1-8 y) 40960.0) (hover-nav-control-method-11 (-> self hover) a1-8) ) (hover-enemy-dest-post) @@ -1067,7 +1067,7 @@ ) (set! (-> self enemy-flags) v1-35) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-42 (-> self enemy-flags))) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc index 9ab0a09917..73185f5fc6 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc @@ -455,7 +455,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -803,7 +803,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior metalmonk) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (metalmonk-method-180 self #t) (nav-enemy-method-169 self 6144.0 #f) (let ((v1-6 (-> self nav))) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc index c09edb7837..b77ed1525f 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc @@ -318,7 +318,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (when (zero? (-> obj hit-points)) @@ -672,7 +672,7 @@ (cond ((logtest? (-> obj status-flags) 8) (vector-! s4-1 (-> obj face-pos) (-> obj root trans)) - (set! (-> obj status-flags) (logand -9 (-> obj status-flags))) + (logand! (-> obj status-flags) -9) ) (else (set! (-> s4-1 quad) (-> s3-0 quad)) @@ -737,7 +737,7 @@ (let ((t9-6 (method-of-type nav-enemy track-target!))) (t9-6 obj) ) - (set! (-> obj status-flags) (logand -2 (-> obj status-flags))) + (logand! (-> obj status-flags) -2) (if (logtest? (-> obj status-flags) 32) (los-control-method-9 (-> obj los) (the-as process-focusable #f) (the-as vector #f) 2048.0) ) @@ -948,7 +948,7 @@ ) (spyder-method-181 self) (look-at-target! self (enemy-flag death-start)) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (when (!= (-> self dest-fade) 128.0) (set! (-> self shock-effect-end) (+ (current-time) (seconds 1))) (set! (-> self dest-fade) 128.0) @@ -962,7 +962,7 @@ (t9-0) ) ) - (set! (-> self status-flags) (logand -33 (-> self status-flags))) + (logand! (-> self status-flags) -33) (look-at-target! self (enemy-flag lock-focus)) (none) ) @@ -1117,7 +1117,7 @@ ) 0 (look-at-target! self (enemy-flag lock-focus)) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (none) ) :exit (behavior () @@ -1258,7 +1258,7 @@ (t9-0) ) ) - (set! (-> self status-flags) (logand -5 (-> self status-flags))) + (logand! (-> self status-flags) -5) (dotimes (gp-0 4) (enable-set! (-> self joint-ik gp-0) #f) ) diff --git a/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc index 1d19c923a5..f548dc336f 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc @@ -67,7 +67,7 @@ (when a0-2 (let ((s1-1 (new 'stack-no-clear 'vector))) (set! (-> s1-1 quad) (-> (get-trans a0-2 0) quad)) - (set! (-> s1-1 y) (+ 8192.0 (-> s1-1 y))) + (+! (-> s1-1 y) 8192.0) (vector-! s4-0 s1-1 (-> s5-0 trans)) ) (vector-normalize! s4-0 f30-0) @@ -179,7 +179,7 @@ (set! (-> obj move) gun-buoy-shot-move) (set! (-> obj timeout) (seconds 2.78)) (set! (-> obj damage) 1024.0) - (set! (-> obj options) (logior (projectile-options deal-damage ignore-impact) (-> obj options))) + (logior! (-> obj options) (projectile-options deal-damage ignore-impact)) (set-gravity-length (-> obj root dynam) 573440.0) (none) ) @@ -419,7 +419,7 @@ ) (let ((s4-1 (new 'stack-no-clear 'vector))) (set! (-> s3-0 quad) (-> self root trans quad)) - (set! (-> s3-0 y) (+ 4096.0 (-> s3-0 y))) + (+! (-> s3-0 y) 4096.0) (vector-! s4-1 (get-trans (the-as process-focusable gp-0) 3) s3-0) (vector-normalize! s4-1 1.0) (vector-lerp! s5-1 s5-1 s4-1 0.99) @@ -459,8 +459,8 @@ ) :enter (behavior () (set! (-> self root trans quad) (-> self start-pos quad)) - (set! (-> self flags) (logand -3 (-> self flags))) - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -3) + (logand! (-> self flags) -5) (none) ) :trans (behavior () @@ -496,7 +496,7 @@ 0 (nav-enemy-method-166 self) (logior! (-> self flags) 1) - (set! (-> self water flags) (logior (water-flags touch-water) (-> self water flags))) + (logior! (-> self water flags) (water-flags touch-water)) (let* ((gp-0 *target*) (s3-0 (if (type? gp-0 process-focusable) gp-0 @@ -601,7 +601,7 @@ (defstate exit-ambush (gun-buoy) :virtual #t :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :exit (behavior () @@ -1162,7 +1162,7 @@ ) (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 quad) (-> (get-trans arg0 0) quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) (set! (-> s4-0 ent) (-> obj entity)) (set! (-> s4-0 charge) 1.0) (set! (-> s4-0 options) (projectile-options)) diff --git a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc index 3197b228a6..42da90f0c4 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc @@ -747,10 +747,10 @@ (set! (-> obj diff-angle) (- (-> obj old-y-deg) f0-5)) (cond ((< 32768.0 (-> obj diff-angle)) - (set! (-> obj diff-angle) (+ -65536.0 (-> obj diff-angle))) + (+! (-> obj diff-angle) -65536.0) ) ((< (-> obj diff-angle) -32768.0) - (set! (-> obj diff-angle) (+ 65536.0 (-> obj diff-angle))) + (+! (-> obj diff-angle) 65536.0) ) ) (set! (-> obj old-y-deg) f0-5) @@ -979,7 +979,7 @@ :event (the-as (function process int symbol event-message-block object :behavior spydroid) enemy-event-handler) :enter (behavior () (set! (-> self hit-target) #f) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((v1-2 (-> self nav))) (set! (-> v1-2 target-speed) (+ 8192.0 (-> self enemy-info run-travel-speed))) ) 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 e5d8d83d57..c237562028 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 @@ -57,9 +57,9 @@ (when gp-0 (let ((s4-0 (-> gp-0 edges 0))) (vector-average! (-> obj start-sphere) (-> s4-0 left) (-> s4-0 right)) - (set! (-> obj start-sphere y) (+ 40960.0 (-> obj start-sphere y))) + (+! (-> obj start-sphere y) 40960.0) (race-find-ground (-> obj start-sphere) (-> obj start-sphere)) - (set! (-> obj start-sphere y) (+ 8192.0 (-> obj start-sphere y))) + (+! (-> obj start-sphere y) 8192.0) (set! (-> obj start-sphere r) (* 0.5 (vector-vector-distance (-> s4-0 left) (-> s4-0 right)))) (let ((v1-6 (new 'stack-no-clear 'vector))) (vector-! v1-6 (-> s4-0 right) (-> s4-0 left)) @@ -794,7 +794,7 @@ (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) (.svf (&-> a0-7 0 quad) vf6) ) - (set! (-> s4-0 vector 0 y) (+ 22528.0 (-> s4-0 vector 0 y))) + (+! (-> s4-0 vector 0 y) 22528.0) (set! (-> obj race-signal) (process->handle (race-signal-spawn s5-1 (the-as vector (-> s4-0 vector)) (the-as quaternion (-> s4-0 vector 1))) @@ -1048,7 +1048,7 @@ (set! (-> gp-0 i-player) 0) (set! (-> s4-0 params position quad) (-> *target* control trans quad)) (quaternion-copy! (-> s4-0 params rotation) (-> *target* control quat)) - (set! (-> s4-0 params position y) (+ 12288.0 (-> s4-0 params position y))) + (+! (-> s4-0 params position y) 12288.0) (set! (-> s4-0 params behavior) (the-as uint 4)) (logclear! (-> s4-0 params flags) (traffic-spawn-flags trsflags-01)) (let ((s5-1 (vehicle-spawn obj (type-from-race-vehicle-type (-> s2-0 vehicle)) (-> s4-0 params)))) @@ -1094,7 +1094,7 @@ (set! (-> gp-0 arrow) (process->handle (t9-11 sv-352 (the-as task-arrow a1-17)))) ) (set! (-> s4-0 params position quad) (-> gp-0 info player-intro-pos quad)) - (set! (-> s4-0 params position y) (+ 12288.0 (-> s4-0 params position y))) + (+! (-> s4-0 params position y) 12288.0) ) (logclear! (-> s4-0 params flags) (traffic-spawn-flags trsflags-01)) (set! sv-416 37) @@ -1305,7 +1305,7 @@ (format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1) (s5-0 *temp-string* gp-1 #f 44 (bucket-id progress)) ) - (set! (-> gp-1 origin y) (+ 35.0 (-> gp-1 origin y))) + (+! (-> gp-1 origin y) 35.0) (let ((s5-1 print-game-text)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1) (s5-1 *temp-string* gp-1 #f 44 (bucket-id progress)) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc index a8b425fd17..ca8e66e8f7 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-obs_REF.gc @@ -307,7 +307,7 @@ (set! (-> v1-8 trans y) 204800.0) (set! (-> v1-8 vector 0 quad) (-> self pos quad)) (set! (-> v1-8 vector 1 quad) (-> self pos quad)) - (set! (-> v1-8 vector 1 y) (+ 204800.0 (-> v1-8 vector 1 y))) + (+! (-> v1-8 vector 1 y) 204800.0) (cubic-curve-method-9 (-> self curve) (the-as vector (-> v1-8 vector)) @@ -785,7 +785,7 @@ (when (>= f0-6 0.0) (vector+float*! (-> gp-0 push-vel) (-> gp-0 cquery start-pos) (-> gp-0 cquery move-dist) f0-6) (set! (-> gp-0 vec33 quad) (-> gp-0 cquery best-other-tri normal quad)) - (set! (-> gp-0 push-vel y) (+ 4915.2 (-> gp-0 push-vel y))) + (+! (-> gp-0 push-vel y) 4915.2) (set! s4-0 #t) (format #t "turbo-pickup::find-ground: ground y ~M~%" (-> gp-0 push-vel y)) ) 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 8449011375..b66a627c96 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 @@ -322,7 +322,7 @@ (set! (-> obj turbo-boost-time) (current-time)) (set! (-> obj turbo-boost-factor) 1.0) (set! (-> obj turbo-boost-duration) (the-as uint 150)) - (set! (-> obj flags) (logior (rigid-body-object-flag turbo-boost) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag turbo-boost)) (if (logtest? (-> obj flags) (rigid-body-object-flag player-driving)) (sound-play "turbo-boost") ) @@ -352,7 +352,7 @@ (race-control-method-9 (-> obj race) (-> obj traffic-priority-id) (-> obj root trans)) (cond ((logtest? (-> arg0 flags) (traffic-spawn-flags trsflags-01)) - (set! (-> obj flags) (logior (rigid-body-object-flag riding ai-driving) (-> obj flags))) + (logior! (-> obj flags) (rigid-body-object-flag riding ai-driving)) (cond ((-> obj race path) (go (method-of-object obj waiting-for-start)) @@ -997,7 +997,7 @@ ) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self flags) (logior (rigid-body-object-flag ignition) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag ignition)) (set! (-> self controls throttle) 0.0) (set! (-> self controls brake) 0.0) (set! (-> self controls steering) 0.0) @@ -1064,7 +1064,7 @@ (set! (-> self state-time) (current-time)) (set! (-> self damage-factor) (-> self info damage-factor)) (vehicle-method-143 self) - (set! (-> self flags) (logior (rigid-body-object-flag ignition) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag ignition)) (none) ) :code (the-as (function none :behavior vehicle-racer) sleep-code) @@ -1092,7 +1092,7 @@ ) :enter (behavior () (set! (-> self state-time) (current-time)) - (set! (-> self flags) (logior (rigid-body-object-flag riding ignition) (-> self flags))) + (logior! (-> self flags) (rigid-body-object-flag riding ignition)) (set! (-> self controls throttle) 0.0) (set! (-> self controls brake) 0.0) (set! (-> self controls steering) 0.0) 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 30fed4b0a3..61191b6f2f 100644 --- a/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc @@ -801,7 +801,7 @@ (set! (-> obj on-close) #f) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 130) obj)) (set! (-> obj center quad) (-> obj root trans quad)) - (set! (-> obj center y) (+ 13516.8 (-> obj center y))) + (+! (-> obj center y) 13516.8) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "warpgate" :fo-max 30) (-> obj root trans)) ) @@ -894,7 +894,7 @@ This commonly includes things such as: (set! (-> self control mod-surface) *warp-jump-mods*) (set! (-> self control unknown-vector37 quad) (-> arg0 quad)) (set! (-> self control unknown-vector38 quad) (-> arg1 quad)) - (set! (-> self control unknown-vector37 y) (+ -4096.0 (-> self control unknown-vector37 y))) + (+! (-> self control unknown-vector37 y) -4096.0) (set! (-> self control unknown-word04) (the-as uint #f)) (set! (-> self control unknown-handle02) (the-as handle arg2)) (vector-reset! (-> self control transv)) 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 d4291282d3..b60a1ac581 100644 --- a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc @@ -518,13 +518,21 @@ (sound-play "dmenu-hit") (let ((gp-1 (cond ((= *kernel-boot-message* 'demo-shared) - (new 'static 'boxed-array :type uint32 #x24f #x250 #x123) + (new 'static 'boxed-array :type text-id + (text-id atoll-unknown) + (text-id strip-unknown) + (text-id progress-demo-exit) + ) ) ((= (scf-get-territory) 1) - (new 'static 'boxed-array :type uint32 #x24f #x250) + (new 'static 'boxed-array :type text-id (text-id atoll-unknown) (text-id strip-unknown)) ) (else - (new 'static 'boxed-array :type uint32 #x24f #x250 #x251) + (new 'static 'boxed-array :type text-id + (text-id atoll-unknown) + (text-id strip-unknown) + (text-id watch-trailer) + ) ) ) ) @@ -561,14 +569,8 @@ (set! (-> sv-112 color) (font-color progress-old-selected)) (set! (-> sv-112 color) (font-color white)) ) - (print-game-text - (lookup-text! *common-text* (the-as text-id (-> gp-1 s5-4)) #f) - sv-112 - #f - 44 - (bucket-id progress) - ) - (set! (-> sv-112 origin y) (+ 22.0 (-> sv-112 origin y))) + (print-game-text (lookup-text! *common-text* (-> gp-1 s5-4) #f) sv-112 #f 44 (bucket-id progress)) + (+! (-> sv-112 origin y) 22.0) ) ) (suspend) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc index c3ac3d222b..df6bf85466 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc @@ -209,7 +209,7 @@ ) (let ((s2-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 start-pos quad) (-> (the-as process-drawable s3-0) root trans quad)) - (set! (-> s4-0 start-pos y) (+ 61440.0 (-> s4-0 start-pos y))) + (+! (-> s4-0 start-pos y) 61440.0) (set! (-> s2-0 x) (-> arg1 vel-sxvel x)) (set! (-> s2-0 z) (-> arg1 vel-sxvel z)) (vector-normalize! s2-0 1.0) @@ -1047,7 +1047,7 @@ This commonly includes things such as: (let ((v1-23 (-> sv-144 position quad))) (set! (-> sv-160 quad) v1-23) ) - (set! (-> sv-160 y) (+ -2048.0 (-> sv-160 y))) + (+! (-> sv-160 y) -2048.0) (vector+float*! sv-160 sv-160 (the-as vector s2-0) f28-0) (set! f28-0 (fmin 1.0 (+ 0.2 f28-0))) (when (< s0-0 7) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc index 9f410c51fa..4246373540 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc @@ -240,7 +240,7 @@ (else (let ((v1-5 (new 'stack-no-clear 'vector))) (set! (-> v1-5 quad) (-> arg0 quad)) - (set! (-> v1-5 y) (+ -8192.0 (-> v1-5 y))) + (+! (-> v1-5 y) -8192.0) (let ((a0-16 (-> obj rbody)) (a2-2 (-> obj root quat)) ) diff --git a/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc index 81ddb8f479..bbc8d05b21 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig1-obs_REF.gc @@ -851,7 +851,7 @@ (set! (-> self root trans quad) (-> arg0 pos quad)) (quaternion-copy! (-> self root quat) (-> arg0 quat)) (init-skel-and-rigid-body self) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (vector-float*! (-> self rbody state lin-momentum) (-> arg0 vel) (-> self info info mass)) (vector-float*! (-> self rbody state ang-momentum) (-> arg0 avel) (-> self info info mass)) (go-virtual idle) @@ -1036,7 +1036,7 @@ ) (when a0-5 (set! (-> gp-1 fountain-rand-transv-lo quad) (-> (get-trans a0-5 0) quad)) - (set! (-> gp-1 fountain-rand-transv-lo y) (+ -16384.0 (-> gp-1 fountain-rand-transv-lo y))) + (+! (-> gp-1 fountain-rand-transv-lo y) -16384.0) ) ) (set! (-> gp-1 fountain-rand-transv-hi x) 24576.0) @@ -1114,7 +1114,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-dig-bomb-crate" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (transform-post) (go (method-of-object obj idle)) (none) diff --git a/test/decompiler/reference/jak2/levels/dig/dig2-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig2-obs_REF.gc index 03c7fe6dee..a599eea7e1 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig2-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig2-obs_REF.gc @@ -63,7 +63,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s4-0 (art-group-get-by-name *level* "skel-dig-breakable-door" (the-as (pointer uint32) #f)))) (let ((s3-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player)))) (let ((v1-7 (new 'process 'collide-shape-prim-mesh s3-0 (the-as uint 0) (the-as uint 0)))) diff --git a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc index 8003923d2a..cd8bdf9898 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc @@ -1297,7 +1297,7 @@ This commonly includes things such as: ) (+! (-> self bob-counter) (* 3.0 (-> self clock time-adjust-ratio))) (if (< 360.0 (-> self bob-counter)) - (set! (-> self bob-counter) (+ -360.0 (-> self bob-counter))) + (+! (-> self bob-counter) -360.0) ) (if (not (!= (-> self smush amp) 0.0)) (set! (-> self bouncing) #f) @@ -1949,15 +1949,9 @@ This commonly includes things such as: ) (countdown (a0-16 (-> a0-15 num-tris)) (when (= (-> (the-as collide-cache-tri v1-6) pat event) (pat-event endlessfall)) - (set! (-> (the-as collide-cache-tri v1-6) vertex 0 y) - (+ 409600.0 (-> (the-as collide-cache-tri v1-6) vertex 0 y)) - ) - (set! (-> (the-as collide-cache-tri v1-6) vertex 1 y) - (+ 409600.0 (-> (the-as collide-cache-tri v1-6) vertex 1 y)) - ) - (set! (-> (the-as collide-cache-tri v1-6) vertex 2 y) - (+ 409600.0 (-> (the-as collide-cache-tri v1-6) vertex 2 y)) - ) + (+! (-> (the-as collide-cache-tri v1-6) vertex 0 y) 409600.0) + (+! (-> (the-as collide-cache-tri v1-6) vertex 1 y) 409600.0) + (+! (-> (the-as collide-cache-tri v1-6) vertex 2 y) 409600.0) ) (set! v1-6 (-> (the-as (inline-array collide-cache-tri) v1-6) 1)) ) @@ -2099,7 +2093,7 @@ This commonly includes things such as: ;; INFO: Used lq/sq ;; WARN: Return type mismatch object vs none. (defbehavior dig-stomp-block-init-by-other dig-stomp-block ((arg0 vector)) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (allocate-and-init-cshape self) (set! (-> self root trans quad) (-> arg0 quad)) (set-vector! (-> self root quat) 0.0 1.0 0.0 0.0) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc index 9eee4edbfe..58b1b1093e 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc @@ -1849,7 +1849,7 @@ This commonly includes things such as: (set! (-> self info next-to-shoot) #f) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 z) (+ 81920.0 (-> gp-1 z))) + (+! (-> gp-1 z) 81920.0) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-1 (let ((t9-3 (method-of-type part-tracker activate))) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc index f8ca66767e..6cac932b16 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-obs2_REF.gc @@ -933,7 +933,7 @@ This commonly includes things such as: (sound-play "mhead-egg-break" :position (-> self root trans)) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 y) (+ 8192.0 (-> gp-1 y))) + (+! (-> gp-1 y) 8192.0) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-1 (let ((t9-3 (method-of-type part-tracker activate))) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc index d85f3839fa..7ddb4978c6 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc @@ -1535,7 +1535,7 @@ This commonly includes things such as: (logior! (-> obj button-status) (button-status pressed)) (logclear! (-> obj button-status) (button-status pressed)) ) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (logclear! (-> obj mask) (process-mask no-track)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 451) obj)) (set! (-> obj green-part) (create-launch-control (-> *part-group-id-table* 452) obj)) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc index fc70c219c4..2df72e8db7 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-panel_REF.gc @@ -743,7 +743,7 @@ (defmethod init-panel drill-control-panel ((obj drill-control-panel)) "Init some parameters for the panel." (set! (-> obj idle-sound-id) (new-sound-id)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj id) (res-lump-value (-> obj entity) 'extra-id int :time -1000000000.0)) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc index fa221f98ec..4a97072ed2 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-spool_REF.gc @@ -867,7 +867,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 res-tag)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 ((method-of-type res-lump get-property-struct) (-> obj entity) 'art-name @@ -1076,7 +1076,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 res-tag) (sv-32 res-tag)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 "drill-crane-break") (s4-0 (art-group-get-by-name *level* "skel-drill-crane" (the-as (pointer uint32) #f))) ) diff --git a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc index 39d7ee1b9f..5781c3fc49 100644 --- a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc @@ -758,7 +758,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-4 (-> self nav))) (set! (-> v1-4 target-speed) 8192.0) @@ -824,7 +824,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior ginsu) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (ginsu-method-183 self #t) (set! (-> self root penetrate-using) (penetrate generic-attack lunge)) (enemy-method-49 self) diff --git a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc index 0359a36ae5..58d7ec2927 100644 --- a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc @@ -246,7 +246,7 @@ This commonly includes things such as: ) ) ) - (set! (-> self hit-points) (+ -1.0 (-> self hit-points))) + (+! (-> self hit-points) -1.0) (if (>= 0.0 (-> self hit-points)) (go-virtual die) (go-virtual hit) @@ -535,7 +535,7 @@ This commonly includes things such as: (process-entity-status! obj (entity-perm-status no-kill) #t) (set! (-> obj desired-pos quad) (-> obj root trans quad)) (quaternion-copy! (-> obj init-quat) (-> obj root quat)) - (set! (-> obj desired-pos y) (+ 8192.0 (-> obj desired-pos y))) + (+! (-> obj desired-pos y) 8192.0) (vector-reset! (-> obj hit-dir)) (set! (-> obj hit-points) 9.0) (set! (-> obj incoming-attack-id) (the-as uint -1)) diff --git a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc index 91179f647c..cb25725a61 100644 --- a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc @@ -276,7 +276,7 @@ For pegasus, it will call [[enemy::57]] only if the [[pegasus]] has been targett ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action proc) (send-event proc 'get-attack-count 1) (kill-prefer-falling obj) @@ -462,10 +462,10 @@ In practice, this is never called" (set! (-> self curve-position) 0.0) ) ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (none) @@ -797,10 +797,10 @@ The faster it's moving the fast it flaps it's wings, etc ) (cond ((< 1.0 (-> self curve-position)) - (set! (-> self curve-position) (+ -1.0 (-> self curve-position))) + (+! (-> self curve-position) -1.0) ) ((< (-> self curve-position) 0.0) - (set! (-> self curve-position) (+ 1.0 (-> self curve-position))) + (+! (-> self curve-position) 1.0) ) ) (get-point-at-percent-along-path! diff --git a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc index 27a7a2d99c..ad2e7d8061 100644 --- a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc @@ -1065,7 +1065,7 @@ :event (the-as (function process int symbol event-message-block object :behavior predator) enemy-event-handler) :enter (behavior () (set-dangerous! self #t) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-6 *game-info*) (a0-3 (+ (-> v1-6 attack-id) 1)) @@ -1655,7 +1655,7 @@ This commonly includes things such as: (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "pred-hum" :fo-min 2 :fo-max 30) (-> obj root trans)) ) - (set! (-> obj enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) (add-icon! *minimap* obj (the-as uint 16) (the-as int #f) (the-as vector #t) 0) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc index 17e1d1cd86..287a32231a 100644 --- a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc @@ -158,7 +158,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (when (< (vector-vector-xz-distance (-> self root trans) (-> self move-dest)) 2048.0) (cond ((logtest? (-> self flags) 4) - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (set! (-> self fly-index) (the-as uint 0)) (go-virtual fly) ) @@ -216,7 +216,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" :enter (behavior () (set! (-> self state-time) (current-time)) (set! (-> self peck-timer) (the-as uint (the int (* 300.0 (rand-vu-float-range 1.4 4.3))))) - (set! (-> self flags) (logand -7 (-> self flags))) + (logand! (-> self flags) -7) (none) ) :trans (behavior () @@ -228,7 +228,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ) (when (logtest? (-> self flags) 2) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) (when (spooked? self) (get-point-in-path! (-> self fly-curve 0) (-> self move-dest) 0.0 'interp) (set-yaw-angle-clear-roll-pitch! @@ -244,7 +244,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" :code (behavior () (local-vars (v1-34 symbol)) (until #f - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (let ((f0-0 (rand-vu-float-range 0.0 (get-num-segments (-> self path))))) (get-point-in-path! (-> self path) (-> self move-dest) f0-0 'interp) ) @@ -430,7 +430,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" (none) ) :code (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (ja-channel-push! 1 (seconds 0.2)) (let ((gp-0 (current-time)) (s5-0 (the int (* 300.0 (rand-vu-float-range 4.2 16.8)))) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc index 2b92fb1b27..177e1ca762 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpa-obs_REF.gc @@ -124,7 +124,7 @@ (logior! (-> self draw status) (draw-control-status no-draw)) (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) - (set! (-> gp-0 y) (+ 8192.0 (-> gp-0 y))) + (+! (-> gp-0 y) 8192.0) (let ((s5-0 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-0 (let ((t9-1 (method-of-type part-tracker activate))) @@ -340,8 +340,8 @@ This commonly includes things such as: ) (set! (-> a0-20 quad) (-> obj root trans quad)) (set! (-> v1-26 quad) (-> obj root trans quad)) - (set! (-> a0-20 y) (+ 4915.2 (-> a0-20 y))) - (set! (-> v1-26 y) (+ 17203.2 (-> v1-26 y))) + (+! (-> a0-20 y) 4915.2) + (+! (-> v1-26 y) 17203.2) (set! (-> obj l-bolt state meet data 0 quad) (-> a0-20 quad)) (let ((a0-22 (-> obj l-bolt))) (set! (-> a0-22 state meet data (+ (-> a0-22 state points-to-draw) -1) quad) (-> v1-26 quad)) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc index 6fa9b29e7f..68af7f853f 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc @@ -118,7 +118,7 @@ (sound-play "fort-bomb") (let ((gp-1 (new 'stack-no-clear 'matrix))) (set! (-> gp-1 quad 0) (-> self root trans quad)) - (set! (-> gp-1 vector 0 y) (+ 8192.0 (-> gp-1 vector 0 y))) + (+! (-> gp-1 vector 0 y) 8192.0) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-1 (let ((t9-3 (method-of-type part-tracker activate))) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc index c78ceb5ead..4aef305980 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc @@ -1157,7 +1157,7 @@ (vector-float*! s5-2 s5-2 (* 0.8 (-> self clock frames-per-second))) (set! (-> s5-2 y) 0.0) (vector+! s5-2 (-> self aim-pos-2) s5-2) - (set! (-> s5-2 y) (+ 8192.0 (-> s5-2 y))) + (+! (-> s5-2 y) 8192.0) (vector+! s4-0 s4-0 v1-31) ) (vector-float*! s4-0 s4-0 0.5) @@ -1259,7 +1259,7 @@ ((logtest? (-> self flags) 64) (sound-play "robotank-turret" :id (-> self turn-sound-id) :position (-> self root trans)) (when (< (fabs (-> self rotate-rate)) 728.1778) - (set! (-> self flags) (logand -65 (-> self flags))) + (logand! (-> self flags) -65) (sound-stop (-> self turn-sound-id)) (sound-play "robo-turret-end") ) @@ -1347,7 +1347,7 @@ (set! (-> v1-33 prim-core collide-with) (collide-spec)) ) 0 - (set! (-> self flags) (logand -129 (-> self flags))) + (logand! (-> self flags) -129) (remove-setting! 'fov) (send-event (handle->process (-> self screen)) 'untrigger) ) @@ -1469,7 +1469,7 @@ (and (logtest? (-> self flags) 512) (not (logtest? (-> self flags) 8)) (skip-check-los? (-> self los) 0)) (logtest? (-> self flags) 16) ) - (set! (-> self flags) (logand -257 (-> self flags))) + (logand! (-> self flags) -257) (go-virtual ready) ) ) @@ -1529,7 +1529,7 @@ ) ) (label cfg-26) - (set! (-> self flags) (logand -9 (-> self flags))) + (logand! (-> self flags) -9) (send-event (handle->process (-> self reticle)) 'unlock) (until (fort-robotank-turret-method-34 self (-> self aim-pos-1) 2730.6667) (suspend) @@ -1575,7 +1575,7 @@ ;; definition for method 10 of type fort-robotank-turret (defmethod deactivate fort-robotank-turret ((obj fort-robotank-turret)) - (set! (-> obj flags) (logand -65 (-> obj flags))) + (logand! (-> obj flags) -65) (sound-stop (-> obj turn-sound-id)) (let ((a0-4 (handle->process (-> obj screen)))) (if a0-4 @@ -1684,8 +1684,8 @@ (set! (-> self gun-index) 0) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (set! (-> gp-1 z) (+ 40960.0 (-> gp-1 z))) - (set! (-> gp-1 y) (+ 32768.0 (-> gp-1 y))) + (+! (-> gp-1 z) 40960.0) + (+! (-> gp-1 y) 32768.0) (set! (-> self reticle) (ppointer->handle (process-spawn fort-robotank-reticle gp-1 :to self))) ) (let ((gp-2 (new 'stack-no-clear 'vector)) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc index b4c4bec178..7e7fb3dad1 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc @@ -442,7 +442,7 @@ (s5-0 (new 'stack-no-clear 'matrix)) ) (set! (-> s4-0 random-rangef) (lerp-scale 1.0 6.0 (-> self roller-jmod twist y) 8192.0 65536.0)) - (set! (-> gp-0 y) (+ -6144.0 (-> gp-0 y))) + (+! (-> gp-0 y) -6144.0) (quaternion->matrix s5-0 (-> self root quat)) (set! (-> s5-0 trans quad) (-> gp-0 quad)) (spawn-with-matrix (-> self barrel-part) s5-0) @@ -465,7 +465,7 @@ ) (let ((a1-14 (forward-up-nopitch->inv-matrix (new 'stack-no-clear 'matrix) s2-0 *up-vector*))) (set! (-> a1-14 trans quad) (-> s4-1 quad)) - (set! (-> a1-14 trans y) (+ -2498.56 (-> a1-14 trans y))) + (+! (-> a1-14 trans y) -2498.56) (spawn-with-matrix (-> self part) a1-14) ) ) @@ -748,7 +748,7 @@ (remove-setting! 'target-height) (remove-setting! 'pov-offset) (send-event (handle->process (-> obj turret)) 'pov-cam-off) - (set! (-> obj flags) (logand -129 (-> obj flags))) + (logand! (-> obj flags) -129) (let ((v1-57 (-> (the-as collide-shape-prim-group (-> obj root root-prim)) child 2))) (set! (-> v1-57 prim-core collide-as) (collide-spec)) (set! (-> v1-57 prim-core collide-with) (collide-spec)) @@ -820,7 +820,7 @@ (logior! (-> self flags) 32) ) (when (logtest? (-> self flags) 32) - (set! (-> self flags) (logand -33 (-> self flags))) + (logand! (-> self flags) -33) (set-setting! 'music 'danger11 0.0 0) (set-setting! 'music-volume 'rel 0.9 0) (go-virtual moving) @@ -881,7 +881,7 @@ (none) ) :exit (behavior () - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (none) ) :trans (behavior () @@ -937,7 +937,7 @@ (none) ) :code (behavior () - (set! (-> self flags) (logand -5 (-> self flags))) + (logand! (-> self flags) -5) (let ((gp-0 (current-time))) (until (>= (- (current-time) gp-0) (seconds 0.1)) (suspend) @@ -970,7 +970,7 @@ (s1-0 (-> self root)) ) (get-point-at-percent-along-path! s4-0 (-> s1-0 trans) f30-0 'interp) - (set! (-> s1-0 trans y) (+ 1024.0 (-> s1-0 trans y))) + (+! (-> s1-0 trans y) 1024.0) (displacement-between-points-at-percent-normalized! s4-0 s0-0 f30-0) (displacement-between-points-at-percent-scaled! s4-0 s2-0 f30-0 (-> gp-1 du-final)) (seek-toward-heading-vec! s1-0 s0-0 16384.0 (seconds 0.02)) @@ -1055,7 +1055,7 @@ ) :trans (behavior () (when (logtest? (-> self flags) 32) - (set! (-> self flags) (logand -33 (-> self flags))) + (logand! (-> self flags) -33) (go-virtual moving) ) (none) @@ -1258,7 +1258,7 @@ This commonly includes things such as: (let ((s5-3 (new 'stack-no-clear 'vector))) (let ((s4-3 (-> obj path-info data 0 path))) (get-point-in-path! s4-3 (-> obj root trans) 0.0 'interp) - (set! (-> obj root trans y) (+ 1024.0 (-> obj root trans y))) + (+! (-> obj root trans y) 1024.0) (displacement-between-points-at-percent-normalized! s4-3 s5-3 0.0) ) (set-heading-vec! (-> obj root) s5-3) diff --git a/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc b/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc index a0459f30f6..96881f08fc 100644 --- a/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/fort-turret_REF.gc @@ -726,7 +726,7 @@ (+ 2.0 (* 0.00024414062 (vector-length (vector-! (new 'stack-no-clear 'vector) s3-3 a0-21)))) ) (if (= (-> obj beam-intersect) 'wall) - (set! (-> v1-23 z) (+ -5.0 (-> v1-23 z))) + (+! (-> v1-23 z) -5.0) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc index 71e70fae87..35e808bc96 100644 --- a/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/fortress-obs_REF.gc @@ -127,9 +127,7 @@ ) (when target-proc (set! (-> exploder-tuning fountain-rand-transv-lo quad) (-> (get-trans target-proc 0) quad)) - (set! (-> exploder-tuning fountain-rand-transv-lo y) - (+ -16384.0 (-> exploder-tuning fountain-rand-transv-lo y)) - ) + (+! (-> exploder-tuning fountain-rand-transv-lo y) -16384.0) ) ) (set! (-> exploder-tuning fountain-rand-transv-hi x) 24576.0) diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc index 4874f4e009..1c82deaa91 100644 --- a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc @@ -258,7 +258,7 @@ This commonly includes things such as: (let ((t2-0 (new 'stack-no-clear 'vector))) (vector+! t2-0 s3-0 s2-0) (vector-float*! t2-0 t2-0 0.5) - (set! (-> t2-0 y) (+ -20480.0 (-> t2-0 y))) + (+! (-> t2-0 y) -20480.0) (sound-play "sliding-laser" :id (-> self sound-id) :position t2-0) ) (let* ((v0-4 (vector-normalize! (vector-! (new 'stack-no-clear 'vector) s2-0 s3-0) 1.0)) diff --git a/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc index 2c85ca2b13..7901e94740 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gun-dummy_REF.gc @@ -2289,7 +2289,7 @@ ((3 2) (let ((vec (new 'static 'vector :w 1.0))) (set! (-> vec quad) (-> root trans quad)) - (set! (-> vec y) (+ 8192.0 (-> vec y))) + (+! (-> vec y) 8192.0) vec ) ) @@ -2508,11 +2508,11 @@ This commonly includes things such as: ;; WARN: Return type mismatch int vs none. (defmethod init-tpath-info! gun-dummy ((obj gun-dummy) (arg0 tpath-info)) "Given a [[tpath-info]] use it to initialize the dummy with any relevant data or flags" - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask collectable)) (vector-identity! (-> obj root scale)) (quaternion-copy! (-> obj quat) (-> obj root quat)) - (set! (-> obj root trans y) (+ -16384.0 (-> obj root trans y))) + (+! (-> obj root trans y) -16384.0) (if (not (logtest? (-> arg0 flags) (tpath-flags tpath-rand))) (set! *tpath-rand* (the-as uint (rand-vu-int-count 16))) ) diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc index 7e8f15f368..5eb19bd0ac 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc @@ -2081,9 +2081,9 @@ This commonly includes things such as: (set! (-> s3-0 quad) (-> *entrance-gungame-crates-pos* s0-0 pos quad)) (set! (-> s3-0 w) 1.0) (vector-rotate-around-y! s3-0 s3-0 -4460.999) - (set! (-> s3-0 x) (+ 1667072.0 (-> s3-0 x))) - (set! (-> s3-0 y) (+ 40960.0 (-> s3-0 y))) - (set! (-> s3-0 z) (+ 5025792.0 (-> s3-0 z))) + (+! (-> s3-0 x) 1667072.0) + (+! (-> s3-0 y) 40960.0) + (+! (-> s3-0 z) 5025792.0) (training-manager-method-29 obj s3-0) (when arg0 (set! (-> s2-0 quad) (-> s3-0 quad)) @@ -2166,9 +2166,9 @@ This commonly includes things such as: (set! (-> s4-0 quad) (-> arg0 s2-0 pos quad)) (set! (-> s4-0 w) 1.0) (vector-rotate-around-y! s4-0 s4-0 -4460.999) - (set! (-> s4-0 x) (+ 1667072.0 (-> s4-0 x))) - (set! (-> s4-0 y) (+ 40960.0 (-> s4-0 y))) - (set! (-> s4-0 z) (+ 5025792.0 (-> s4-0 z))) + (+! (-> s4-0 x) 1667072.0) + (+! (-> s4-0 y) 40960.0) + (+! (-> s4-0 z) 5025792.0) (training-manager-method-29 obj s4-0) (set! (-> s3-0 pickup-type) (-> arg0 s2-0 ammo)) (set! (-> s3-0 pickup-spawn-amount) (the float (-> arg0 s2-0 num))) diff --git a/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc b/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc index 7da60492dc..3fb91eaab8 100644 --- a/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/hideout/hideout-obs_REF.gc @@ -190,7 +190,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc index 44b21d0530..6ad19486af 100644 --- a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc +++ b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc @@ -2658,7 +2658,7 @@ gp-0 :to *entity-pool* ) - (set! (-> self score) (+ 50.0 (-> self score))) + (+! (-> self score) 50.0) ) (else (when (>= (- (current-time) (-> self speech-time)) (seconds 12)) @@ -2688,7 +2688,7 @@ gp-0 :to *entity-pool* ) - (set! (-> self score) (+ 10.0 (-> self score))) + (+! (-> self score) 10.0) (if (>= (-> self score) 300.0) (send-event (handle->process (-> self hud-goal)) 'hide-and-die) ) diff --git a/test/decompiler/reference/jak2/levels/mountain/canyon/canyon-scenes_REF.gc b/test/decompiler/reference/jak2/levels/mountain/canyon/canyon-scenes_REF.gc index 79dde11a0b..9e3f19df31 100644 --- a/test/decompiler/reference/jak2/levels/mountain/canyon/canyon-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/canyon/canyon-scenes_REF.gc @@ -1464,7 +1464,7 @@ (s4-0 (the-as process-drawable (command-get-process "ctypal-baron-statue-break" *target*))) ) (vector-matrix*! s5-0 (new 'static 'vector :w 1.0) (-> s3-0 node-list data 8 bone transform)) - (set! (-> s5-0 y) (+ 28672.0 (-> s5-0 y))) + (+! (-> s5-0 y) 28672.0) (canyon-draw-beam-lens s5-0 gp-0) (vector-matrix*! gp-0 (new 'static 'vector :w 1.0) (-> s4-0 node-list data 34 bone transform)) ) diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc index 4c2bf86fef..842152d8b7 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc @@ -209,7 +209,7 @@ This commonly includes things such as: "Does any necessary initial platform setup. For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound." (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set-vector! (-> obj axe-flip) 1.0 0.0 0.0 1.0) (set! (-> obj angle-flip) 180.0) (set! (-> obj time-flip) (the float (the int (* 300.0 (res-lump-float (-> obj entity) 'delay :default 4.0))))) diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc index 21cefc8fee..00ae3d72c7 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc @@ -436,7 +436,7 @@ (matrix-rotate-xyz! (-> self face-matrix gp-0) (-> *dice-angle-array* gp-0)) (set! (-> self face-matrix gp-0 trans quad) (-> *dice-position-array* gp-0 quad)) (vector+! (-> self face-matrix gp-0 trans) (-> self face-matrix gp-0 trans) (-> self root trans)) - (set! (-> self face-matrix gp-0 trans y) (+ 8192.0 (-> self face-matrix gp-0 trans y))) + (+! (-> self face-matrix gp-0 trans y) 8192.0) (let* ((v1-40 (-> self face-matrix-back gp-0)) (a3-0 (-> self face-matrix gp-0)) (a0-18 (-> a3-0 quad 0)) @@ -649,7 +649,7 @@ (vector-negate-in-place! s1-0) ) ) - (set! (-> s4-1 y) (+ -8192.0 (-> s4-1 y))) + (+! (-> s4-1 y) -8192.0) (set! (-> s2-0 y) 1.0) (vector-cross! s3-1 s2-0 s1-0) (vector-normalize! s3-1 1.0) @@ -980,7 +980,7 @@ ) (when (> *dice-back-way-num* 0) (set! (-> *dice-last-safe-position* quad) (-> *dice-back-way* (+ *dice-back-way-num* -1) quad)) - (set! (-> *dice-last-safe-position* y) (+ 8192.0 (-> *dice-last-safe-position* y))) + (+! (-> *dice-last-safe-position* y) 8192.0) ) (when (not (dice-wrong-way?)) (set! (-> *dice-back-way* *dice-back-way-num* quad) (-> self root trans quad)) @@ -1190,7 +1190,7 @@ (when (and (= (-> gp-0 active) 1) (not (logtest? (-> *dice-blocked-array* s0-0) (ash 1 (- 15 sv-544))))) (when (> *dice-back-way-num* 0) (set! (-> *dice-last-safe-position* quad) (-> *dice-back-way* (+ *dice-back-way-num* -1) quad)) - (set! (-> *dice-last-safe-position* y) (+ 8192.0 (-> *dice-last-safe-position* y))) + (+! (-> *dice-last-safe-position* y) 8192.0) ) (when (not (dice-wrong-way?)) (set! (-> *dice-back-way* *dice-back-way-num* quad) (-> s1-0 trans quad)) @@ -1261,9 +1261,9 @@ ) (set! (-> sv-640 quad) (-> sv-560 quad)) (set! (-> sv-576 quad) (-> sv-560 quad)) - (set! (-> sv-576 x) (+ 8192.0 (-> sv-576 x))) + (+! (-> sv-576 x) 8192.0) (set! (-> sv-608 quad) (-> sv-560 quad)) - (set! (-> sv-608 z) (+ 8192.0 (-> sv-608 z))) + (+! (-> sv-608 z) 8192.0) (set! (-> sv-560 y) (get-ripple-height s0-1 sv-560)) (set! (-> sv-576 y) (get-ripple-height s0-1 sv-576)) (set! (-> sv-608 y) (get-ripple-height s0-1 sv-608)) @@ -1293,7 +1293,7 @@ (matrix*! (the-as matrix sv-688) sv-656 sv-672) (matrix*! s1-0 s1-0 (the-as matrix sv-688)) (+! (-> s1-0 trans y) (* 0.5 (- (-> sv-560 y) (-> s0-1 water-height)))) - (set! (-> s1-0 trans y) (+ 8192.0 (-> s1-0 trans y))) + (+! (-> s1-0 trans y) 8192.0) (set! (-> s4-0 x) (fmin (-> s4-0 x) (-> s1-0 trans x))) (set! (-> s4-0 y) (fmin (-> s4-0 y) (-> s1-0 trans y))) (set! (-> s4-0 z) (fmin (-> s4-0 z) (-> s1-0 trans z))) @@ -1503,7 +1503,7 @@ This commonly includes things such as: (matrix-rotate-xyz! (-> obj face-matrix s4-2) (-> *dice-angle-array* s4-2)) (set! (-> obj face-matrix s4-2 trans quad) (-> *dice-position-array* s4-2 quad)) (vector+! (-> obj face-matrix s4-2 trans) (-> obj face-matrix s4-2 trans) (-> obj root trans)) - (set! (-> obj face-matrix s4-2 trans y) (+ 8192.0 (-> obj face-matrix s4-2 trans y))) + (+! (-> obj face-matrix s4-2 trans y) 8192.0) ) (mem-set32! (the-as pointer *dice-blocked-array*) 13 0) (set! (-> *dice-blocked-array* 1) (the-as uint 256)) @@ -2303,7 +2303,7 @@ This commonly includes things such as: ((< (vector-vector-distance (math-camera-pos) (-> self root trans)) (-> gp-0 settings fade-dist)) (let ((s5-2 (new 'stack-no-clear 'collide-query))) (set! (-> s5-2 start-pos quad) (-> self root trans quad)) - (set! (-> s5-2 start-pos z) (+ -8192.0 (-> s5-2 start-pos z))) + (+! (-> s5-2 start-pos z) -8192.0) (set-vector! (-> s5-2 move-dist) 0.0 -81920.0 0.0 1.0) (let ((v1-13 s5-2)) (set! (-> v1-13 radius) 819.2) @@ -2558,7 +2558,7 @@ This commonly includes things such as: (let* ((a1-3 (-> self node-list data gp-0)) (s5-0 (vector<-cspace! (new 'stack-no-clear 'vector) a1-3)) ) - (set! (-> s5-0 y) (+ -4096.0 (-> s5-0 y))) + (+! (-> s5-0 y) -4096.0) (set! sv-48 (* (- (-> s5-0 y) (-> sv-16 data gp-0 x)) (-> self clock frames-per-second))) (set! sv-52 (the-as symbol #f)) (when (and (< (-> sv-16 data gp-0 y) -24576.0) (< (* 0.45 (-> sv-16 data gp-0 y)) sv-48)) @@ -2843,7 +2843,7 @@ This commonly includes things such as: (none) ) :trans (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (plat-trans) (if (not (logtest? (-> self flags) 1)) (set! (-> self ride-timer) (current-time)) diff --git a/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc b/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc index f385141406..05d84c99d0 100644 --- a/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/rhino-wall_REF.gc @@ -123,7 +123,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 (res-lump-struct (-> obj entity) 'art-name structure)) (s4-0 (art-group-get-by-name *level* "skel-rhino-wall-1" (the-as (pointer uint32) #f))) ) diff --git a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc index 57b56bc566..26bd75c7e5 100644 --- a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc @@ -994,7 +994,7 @@ ) (set! (-> self enemy-flags) v1-67) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-74 (-> self enemy-flags))) @@ -1522,7 +1522,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior rhino) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let* ((v1-4 *game-info*) (a0-2 (+ (-> v1-4 attack-id) 1)) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc index 7896ceab97..3d33e17d9a 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc @@ -484,7 +484,7 @@ (set! (-> v0-0 quad) (-> (the-as collide-shape-prim-group (-> obj root root-prim)) child 0 prim-core world-sphere quad) ) - (set! (-> v0-0 y) (+ 32768.0 (-> v0-0 y))) + (+! (-> v0-0 y) 32768.0) v0-0 ) ) @@ -792,7 +792,7 @@ ) (vector-normalize! s5-0 (* 81920.0 (cos 10922.667))) (+! (-> s5-0 y) (* 81920.0 (sin 10922.667))) - (set! (-> s5-0 y) (+ 12288.0 (-> s5-0 y))) + (+! (-> s5-0 y) 12288.0) (vector+! s5-0 s5-0 (-> self entity trans)) (set! (-> self spinners arg0) (ppointer->handle @@ -1599,7 +1599,7 @@ ) ) ) - (set! (-> obj enemy-flags) (logior (enemy-flag cam-attack-mode) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag cam-attack-mode)) (remove-from-process *part-engine* obj) (setup-masks (-> obj draw) @@ -1645,7 +1645,7 @@ ) ) ) - (set! (-> obj enemy-flags) (logior (enemy-flag cam-attack-mode) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag cam-attack-mode)) (remove-from-process *part-engine* obj) (setup-masks (-> obj draw) @@ -2586,7 +2586,7 @@ This commonly includes things such as: ) ) (set! (-> gp-0 start-pos quad) (-> s4-0 quad)) - (set! (-> gp-0 start-pos y) (+ 81920.0 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 81920.0) (set! (-> gp-0 move-dist quad) (-> (new 'static 'vector :y -163840.0) quad)) (let ((v1-17 gp-0)) (set! (-> v1-17 radius) 4096.0) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc index 7b085f1b5c..13e93df5d6 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc @@ -1176,7 +1176,7 @@ This commonly includes things such as: (set! (-> obj root) s4-0) ) (process-drawable-from-entity! obj arg0) - (set! (-> obj root trans y) (+ -36864.0 (-> obj root trans y))) + (+! (-> obj root trans y) -36864.0) (initialize-skeleton obj (the-as skeleton-group (art-group-get-by-name *level* "skel-nestb-tail-bound" (the-as (pointer uint32) #f))) @@ -1282,7 +1282,7 @@ This commonly includes things such as: (defbehavior metalkor-kid-init-by-other metalkor-kid ((arg0 vector)) (set! (-> self root) (new 'process 'trsqv)) (set! (-> self root trans quad) (-> arg0 quad)) - (set! (-> self root trans y) (+ 61440.0 (-> self root trans y))) + (+! (-> self root trans y) 61440.0) (initialize-skeleton self (the-as skeleton-group (art-group-get-by-name *level* "skel-metalkor-kid" (the-as (pointer uint32) #f))) @@ -1512,7 +1512,7 @@ This commonly includes things such as: ) ) (logclear! (-> self mask) (process-mask actor-pause)) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set-vector! (-> self last-hit-normal) 0.0 1.0 0.0 1.0) (set! (-> self sticky-time) 0) (set! (-> self flitter-slot) arg2) @@ -1754,7 +1754,7 @@ This commonly includes things such as: ) ) ) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self trackable) #f) (set! (-> self event-hook) (-> (method-of-object self idle) event)) (dotimes (gp-2 6) @@ -2096,7 +2096,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-metalkor" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set! (-> obj draw light-index) (the-as uint 10)) (set! (-> obj lowtorso) (the-as handle #f)) (set! (-> obj trackable) #f) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc index d50e45f071..bfc2acdb53 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc @@ -34,7 +34,7 @@ ) (vector-normalize! s5-0 (* 81920.0 (cos 10922.667))) (+! (-> s5-0 y) (* 81920.0 (sin 10922.667))) - (set! (-> s5-0 y) (+ 12288.0 (-> s5-0 y))) + (+! (-> s5-0 y) 12288.0) (vector+! s5-0 s5-0 (-> self entity trans)) (let ((v0-0 (ppointer->handle (process-spawn metalkor-spinner s5-0 (-> *metalkor-spinner-setup* arg0 joint-index) :to self) @@ -281,7 +281,7 @@ (set! (-> self trackable) #t) (let ((t0-2 (new 'static 'vector))) (set! (-> t0-2 quad) (-> self root trans quad)) - (set! (-> t0-2 y) (+ 16384.0 (-> t0-2 y))) + (+! (-> t0-2 y) 16384.0) (set-setting! 'point-of-interest 'abs t0-2 0) ) (set! (-> self live-flitters) 0) @@ -352,7 +352,7 @@ ) (else (set! (-> s5-0 quad) (-> obj root trans quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) ) ) (when (< 0.0 (-> obj ring-cam-pos value)) @@ -360,7 +360,7 @@ (a2-0 (new 'stack-no-clear 'vector)) ) (set! (-> a2-0 quad) (-> a0-15 trans quad)) - (set! (-> a2-0 y) (+ -65536.0 (-> a2-0 y))) + (+! (-> a2-0 y) -65536.0) (vector-lerp! s5-0 s5-0 a2-0 (-> obj ring-cam-pos value)) ) ) @@ -472,8 +472,8 @@ ) (let ((v1-106 (new 'stack-no-clear 'vector))) (set! (-> v1-106 quad) (-> self entity trans quad)) - (set! (-> v1-106 x) (+ 90112.0 (-> v1-106 x))) - (set! (-> v1-106 z) (+ -90112.0 (-> v1-106 z))) + (+! (-> v1-106 x) 90112.0) + (+! (-> v1-106 z) -90112.0) (set! (-> self root trans quad) (-> v1-106 quad)) ) (when (not (handle->process (-> self hud))) @@ -1667,7 +1667,7 @@ (cond (a0-6 (set! (-> self hit-ring-trans quad) (-> a0-6 trans quad)) - (set! (-> self hit-ring-trans y) (+ -110592.0 (-> self hit-ring-trans y))) + (+! (-> self hit-ring-trans y) -110592.0) (vector-! (-> self hit-ring-offset) (-> self hit-ring-trans) (-> self entity trans)) (set! (-> self hit-ring-offset y) 0.0) (vector-normalize! (-> self hit-ring-offset) 1.0) @@ -1747,7 +1747,7 @@ (else (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self entity trans quad)) - (set! (-> gp-1 y) (+ -61440.0 (-> gp-1 y))) + (+! (-> gp-1 y) -61440.0) (vector-seek-3d-smooth! (-> self root trans) gp-1 (* 3072.0 (-> self flying-speed value)) 0.5) (let ((f0-10 (vector-vector-distance-squared (-> self root trans) gp-1)) (f1-9 12288.0) diff --git a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc index 638f297d6a..305f69b2b8 100644 --- a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc @@ -653,7 +653,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -726,7 +726,7 @@ (when (>= (- (current-time) (-> obj gspot-timer)) (seconds 0.2)) (let ((a1-2 (new 'stack-no-clear 'collide-query))) (set! (-> a1-2 start-pos quad) (-> obj root gspot-pos quad)) - (set! (-> a1-2 start-pos y) (+ 2048.0 (-> a1-2 start-pos y))) + (+! (-> a1-2 start-pos y) 2048.0) (set-vector! (-> a1-2 move-dist) 0.0 -6144.0 0.0 0.0) (let ((v1-10 a1-2)) (set! (-> v1-10 radius) 4915.2) diff --git a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc index 0328b15846..0de88c9a79 100644 --- a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc @@ -824,7 +824,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) ) @@ -853,7 +853,7 @@ (vector-! s2-0 s1-0 arg0) (set! (-> s2-0 y) 0.0) (vector-xz-normalize! s2-0 49152.0) - (set! (-> s2-0 y) (+ -81920.0 (-> s2-0 y))) + (+! (-> s2-0 y) -81920.0) (vector+! s2-0 s2-0 s4-1) ) (let ((s3-1 (new 'stack-no-clear 'collide-query)) @@ -1523,7 +1523,7 @@ (when (not (logtest? (ash 1 s4-0) (-> obj old-foot-flags))) (set! (-> s2-0 start-pos quad) (-> s3-0 quad)) (vector-reset! (-> s2-0 move-dist)) - (set! (-> s2-0 start-pos y) (+ 8192.0 (-> s2-0 start-pos y))) + (+! (-> s2-0 start-pos y) 8192.0) (set! (-> s2-0 move-dist y) -40960.0) (let ((v1-27 s2-0)) (set! (-> v1-27 radius) 2048.0) diff --git a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc index e33ed70fd6..8b3c5d3574 100644 --- a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc @@ -551,7 +551,7 @@ :code (behavior () (let ((gp-0 (new 'stack-no-clear 'vector))) (set! (-> gp-0 quad) (-> self root trans quad)) - (set! (-> gp-0 y) (+ -18841.6 (-> gp-0 y))) + (+! (-> gp-0 y) -18841.6) (let ((s5-0 (get-process *default-dead-pool* part-tracker #x4000))) (when s5-0 (let ((t9-1 (method-of-type part-tracker activate))) @@ -1356,7 +1356,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (cond @@ -1489,7 +1489,7 @@ (when (>= (- (current-time) (-> obj gspot-timer)) (seconds 0.2)) (let ((a1-2 (new 'stack-no-clear 'collide-query))) (set! (-> a1-2 start-pos quad) (-> obj root gspot-pos quad)) - (set! (-> a1-2 start-pos y) (+ 2048.0 (-> a1-2 start-pos y))) + (+! (-> a1-2 start-pos y) 2048.0) (set-vector! (-> a1-2 move-dist) 0.0 -6144.0 0.0 0.0) (let ((v1-10 a1-2)) (set! (-> v1-10 radius) 4915.2) diff --git a/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc b/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc index 2768a4e137..10417ae72f 100644 --- a/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/nest-obs_REF.gc @@ -300,7 +300,7 @@ This commonly includes things such as: (the-as pair 0) ) (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj root trans y) (+ 8192.0 (-> obj root trans y))) + (+! (-> obj root trans y) 8192.0) (set! (-> obj y-level) (-> obj root trans y)) (set! (-> obj y-offset) 0.0) (transform-post) 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 0d37bd4dfe..ee746203e1 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 @@ -411,7 +411,7 @@ (set! (-> self whirl-sound-playing) #t) (let ((a1-2 (new 'stack-no-clear 'vector))) (set! (-> a1-2 quad) (-> self root trans quad)) - (set! (-> a1-2 y) (+ 2048.0 (-> a1-2 y))) + (+! (-> a1-2 y) 2048.0) (spawn (-> self part) a1-2) ) (when (or (>= (- (current-time) (-> self state-time)) (-> self duration)) diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc index b6322a2f87..ee0e068815 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc @@ -964,7 +964,7 @@ ) (cond ((-> obj wrap) - (set! (-> sv-1904 y) (+ -409.6 (-> sv-1904 y))) + (+! (-> sv-1904 y) -409.6) (set! sv-1472 (new 'stack-no-clear 'vector)) (let ((v1-25 sv-1904) (a0-10 (-> obj center)) @@ -1031,7 +1031,7 @@ (vector+! sv-1904 s1-0 s4-1) (let ((v0-15 (vector<-cspace! (new 'stack-no-clear 'vector) (-> obj node-list data 3)))) (set! sv-1616 (new 'stack-no-clear 'vector)) - (set! (-> v0-15 y) (+ 31744.0 (-> v0-15 y))) + (+! (-> v0-15 y) 31744.0) (vector-! sv-1616 sv-1904 v0-15) ) (let ((f0-27 (vector-normalize-ret-len! sv-1616 1.0))) @@ -2052,7 +2052,7 @@ This commonly includes things such as: ) (set! (-> obj draw light-index) (the-as uint 10)) (logior! (-> obj skel status) (joint-control-status sync-math)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj trans quad) (-> obj root trans quad)) (set! (-> obj force-onto-mesh) #t) @@ -2248,7 +2248,7 @@ This commonly includes things such as: (s0-0 0) ) (set! sv-672 (squid-method-42 obj (new 'stack-no-clear 'vector))) - (set! (-> sv-672 y) (+ 8192.0 (-> sv-672 y))) + (+! (-> sv-672 y) 8192.0) (set! (-> s3-0 quad) (-> arg0 quad)) (set! (-> s3-0 y) (-> obj nav state mesh bounds y)) (set! (-> obj current-nav-poly) (cloest-point-on-mesh (-> obj nav) s3-0 s3-0 (-> obj current-nav-poly))) @@ -2324,7 +2324,7 @@ This commonly includes things such as: (.svf (&-> v1-54 quad) vf6) ) 0 - (set! (-> s1-0 y) (+ 32768.0 (-> s1-0 y))) + (+! (-> s1-0 y) 32768.0) ) (set! f30-0 f28-0) ) @@ -2357,7 +2357,7 @@ This commonly includes things such as: (.svf (&-> v1-68 quad) vf6) ) 0 - (set! (-> s5-0 s0-0 y) (+ 32768.0 (-> s5-0 s0-0 y))) + (+! (-> s5-0 s0-0 y) 32768.0) ) (+! s0-0 1) ) @@ -2887,7 +2887,7 @@ This commonly includes things such as: (sound-play "sqd-shield-brk") (let ((s4-10 (new 'stack 'joint-exploder-tuning (the-as uint 1)))) (set! (-> s4-10 fountain-rand-transv-lo quad) (-> obj root trans quad)) - (set! (-> s4-10 fountain-rand-transv-lo y) (+ -12288.0 (-> s4-10 fountain-rand-transv-lo y))) + (+! (-> s4-10 fountain-rand-transv-lo y) -12288.0) (set! (-> s4-10 fountain-rand-transv-hi x) 16424.96) (set! (-> s4-10 fountain-rand-transv-hi y) 32808.96) (set! (-> s4-10 fountain-rand-transv-hi z) -32808.96) @@ -3132,7 +3132,7 @@ This commonly includes things such as: (set! (-> obj timeout) (seconds 0.417)) (logior! (-> obj options) (projectile-options account-for-target-velocity)) (set-gravity-length (-> obj root dynam) 573440.0) - (set! (-> obj options) (logior (projectile-options respect-invinc-time) (-> obj options))) + (logior! (-> obj options) (projectile-options respect-invinc-time)) (set! (-> obj invinc-time) (seconds 3.5)) (none) ) 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 db76a42657..c2b2b84430 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 @@ -437,7 +437,7 @@ ) (let ((a3-6 (new 'stack-no-clear 'vector))) (set! (-> a3-6 quad) (-> self nav state mesh bounds quad)) - (set! (-> a3-6 y) (+ 16384.0 (-> a3-6 y))) + (+! (-> a3-6 y) 16384.0) (set-traj-towards-vec self (-> self trans) (-> self trans) a3-6) ) (set! (-> self gate-intact) #t) @@ -1059,7 +1059,7 @@ (vector+! s3-1 s3-1 (-> s2-1 state mesh bounds)) ) 0 - (set! (-> s5-1 y) (+ 20480.0 (-> s5-1 y))) + (+! (-> s5-1 y) 20480.0) (set! (-> self trans y) (lerp (-> self trans y) (-> s5-1 y) (* 0.4 f30-1))) ) (set! (-> self trans y) (fmax (-> self trans y) (fmin (-> s5-1 y) (-> gp-3 y)))) @@ -1183,7 +1183,7 @@ (vector+! s4-2 s4-2 (-> s3-0 state mesh bounds)) ) 0 - (set! (-> s5-0 y) (+ 409.6 (-> s5-0 y))) + (+! (-> s5-0 y) 409.6) (set! (-> gp-0 target-position y) (-> s5-0 y)) (let ((s5-1 (get-process *default-dead-pool* part-tracker #x4000))) (set! (-> gp-0 marker) @@ -1439,7 +1439,7 @@ ) (set! (-> gp-0 y) (+ 8192.0 (-> self nav state mesh bounds y))) (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> s5-0 y) (+ -40960.0 (-> s5-0 y))) + (+! (-> s5-0 y) -40960.0) (set! (-> self gun-high-to-low) (squid-method-44 self gp-0 s5-0)) ) (dotimes (gp-1 6) diff --git a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc index 746e04adf2..83b2869356 100644 --- a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc @@ -1187,7 +1187,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc index 3ddd0777bf..7c6322d690 100644 --- a/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/pal-obs_REF.gc @@ -435,8 +435,8 @@ This commonly includes things such as: ) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask collectable)) (go (method-of-object obj idle)) (none) ) @@ -461,8 +461,8 @@ This commonly includes things such as: ) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask collectable)) (go (method-of-object obj idle)) (none) ) @@ -663,8 +663,8 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-pal-grind-ring" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) + (logior! (-> obj mask) (process-mask collectable)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 1131) obj)) (process-spawn pal-grind-ring-center arg0 :to obj) (go (method-of-object obj idle)) @@ -833,7 +833,7 @@ This commonly includes things such as: ;; definition for method 30 of type pal-ent-glass ;; WARN: Return type mismatch int vs none. (defmethod pal-ent-glass-method-30 pal-ent-glass ((obj pal-ent-glass)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) @@ -1252,7 +1252,7 @@ This commonly includes things such as: ;; definition for method 30 of type pal-breakable-window ;; WARN: Return type mismatch int vs none. (defmethod pal-breakable-window-method-30 pal-breakable-window ((obj pal-breakable-window)) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) 0 (none) ) diff --git a/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc index 057afb61e3..6702fa1190 100644 --- a/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/roof/palroof-obs_REF.gc @@ -266,7 +266,7 @@ This commonly includes things such as: :trans (behavior () (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self root trans quad)) - (set! (-> a1-0 y) (+ 36864.0 (-> a1-0 y))) + (+! (-> a1-0 y) 36864.0) (spawn (-> self part) a1-0) ) (none) diff --git a/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc b/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc index e263e07844..ad2403e085 100644 --- a/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/breakable-wall_REF.gc @@ -485,7 +485,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (set! (-> obj side) #f) (set! (-> obj nav-mesh) #f) (let ((v1-5 (res-lump-value (-> obj entity) 'extra-id uint128 :time -1000000000.0))) diff --git a/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc b/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc index 6294af1963..62939edadc 100644 --- a/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc @@ -254,7 +254,7 @@ This commonly includes things such as: - sounds" (local-vars (sv-16 collide-shape-prim-mesh) (sv-32 symbol) (sv-48 type) (sv-64 collide-shape-moving)) (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (dotimes (v1-3 3) (set! (-> obj mesh-trans v1-3) (the-as uint v1-3)) ) diff --git a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc index 89c6fe28ae..a2cd442edf 100644 --- a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc @@ -275,7 +275,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (go (method-of-object obj knocked)) @@ -756,7 +756,7 @@ ) (when (logtest? (-> self status-flags) 2) (set! (-> self spin-up-timer) (+ (current-time) (seconds 2))) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) ) (if (zero? (rand-vu-int-range 0 3)) (set! (-> self shoot-anim-index) 15) @@ -1220,7 +1220,7 @@ (cond ((handle->process (-> self focus handle)) (if (check-los? (-> self los) 0) - (set! (-> self status-flags) (logand -3 (-> self status-flags))) + (logand! (-> self status-flags) -3) (logior! (-> self status-flags) 2) ) ) @@ -1590,7 +1590,7 @@ ) (set! (-> obj shots-fired) (the-as uint 0)) (set! (-> obj spin-up-timer) 0) - (set! (-> obj status-flags) (logand -2 (-> obj status-flags))) + (logand! (-> obj status-flags) -2) (logior! (-> obj status-flags) 2) (let ((f30-0 3640.889)) (set! sv-48 0) diff --git a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc index 2ba2ee1dfe..527355328c 100644 --- a/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/escort/jinx-states_REF.gc @@ -588,7 +588,7 @@ ) (set! (-> self enemy-flags) v1-7) (if (logtest? (-> self enemy-flags) (enemy-flag look-at-move-dest)) - (set! (-> self mask) (logior (process-mask collectable) (-> self mask))) + (logior! (-> self mask) (process-mask collectable)) (logclear! (-> self mask) (process-mask collectable)) ) (let ((v1-14 (-> self enemy-flags))) @@ -645,7 +645,7 @@ :virtual #t :exit (behavior () (if (logtest? (bot-flags bf21) (-> self bot-flags)) - (set! (-> self bot-flags) (logior (bot-flags bf22) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf22)) ) (none) ) @@ -679,7 +679,7 @@ ) ) (send-event (handle->process (-> self master-handle)) 'notify 'jinx-bomb) - (set! (-> self bot-flags) (logior (bot-flags bf21) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf21)) (setup-masks (-> self draw) 0 4096) (ja-no-eval :group! (-> self draw art-group data 62) :num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 62)) frames num-frames) -1))) diff --git a/test/decompiler/reference/jak2/levels/sewer/escort/mog_REF.gc b/test/decompiler/reference/jak2/levels/sewer/escort/mog_REF.gc index f3a8cfb4bf..4b48a0f0d9 100644 --- a/test/decompiler/reference/jak2/levels/sewer/escort/mog_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/escort/mog_REF.gc @@ -179,16 +179,16 @@ (defun mog-prebind-function ((arg0 joint-anim-frame) (arg1 int) (arg2 joint-control)) (let ((v1-0 (-> arg0 data))) (let ((a0-1 (-> v1-0 2))) - (set! (-> a0-1 trans y) (+ -663.552 (-> a0-1 trans y))) + (+! (-> a0-1 trans y) -663.552) ) (let ((a0-3 (-> v1-0 5))) - (set! (-> a0-3 trans x) (+ 409.6 (-> a0-3 trans x))) + (+! (-> a0-3 trans x) 409.6) ) (let ((a0-5 (-> v1-0 21))) - (set! (-> a0-5 trans x) (+ 409.6 (-> a0-5 trans x))) + (+! (-> a0-5 trans x) 409.6) ) (let ((v1-1 (-> v1-0 8))) - (set! (-> v1-1 trans x) (+ -409.6 (-> v1-1 trans x))) + (+! (-> v1-1 trans x) -409.6) ) ) 0 diff --git a/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc b/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc index dc4a7147a6..7da8b4f899 100644 --- a/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/gator_REF.gc @@ -401,7 +401,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior gator) enemy-event-handler) :enter (behavior () - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (let ((_self self)) (if (not (logtest? (enemy-flag enemy-flag36) (-> _self enemy-flags))) (set! (-> _self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag38) (-> _self enemy-flags)))) diff --git a/test/decompiler/reference/jak2/levels/sewer/grim2-course_REF.gc b/test/decompiler/reference/jak2/levels/sewer/grim2-course_REF.gc index 6f41da21ca..6766a34a6e 100644 --- a/test/decompiler/reference/jak2/levels/sewer/grim2-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/grim2-course_REF.gc @@ -430,7 +430,7 @@ :skip-to -1 :on-set (lambda ((arg0 grim-sewer)) (set! (-> arg0 waypoint-time0) (current-time)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (clear-poi-and-focus! arg0) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) @@ -629,7 +629,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 grim-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 min-speed) 40960.0) (set! (-> arg0 max-speed) 40960.0) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) @@ -779,7 +779,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 grim-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 491520.0) (set! (-> arg0 min-speed) 40960.0) @@ -1066,8 +1066,8 @@ :nav-mesh-index -1 :skip-to 54 :on-set (lambda ((arg0 grim-sewer)) - (set! (-> arg0 enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> arg0 enemy-flags))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) @@ -1139,7 +1139,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 grim-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 44) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1234,7 +1234,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 grim-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 48) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1414,7 +1414,7 @@ :on-set (lambda ((arg0 grim-sewer)) (set! (-> arg0 focus-mode) 0) (clear-poi-and-focus! arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 42) diff --git a/test/decompiler/reference/jak2/levels/sewer/hal2-course_REF.gc b/test/decompiler/reference/jak2/levels/sewer/hal2-course_REF.gc index 8df31b8b55..5499731dd1 100644 --- a/test/decompiler/reference/jak2/levels/sewer/hal2-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/hal2-course_REF.gc @@ -256,7 +256,7 @@ (when (and arg0 arg1) (let ((gp-0 (new 'stack-no-clear 'collide-query))) (set! (-> gp-0 start-pos quad) (-> arg0 root trans quad)) - (set! (-> gp-0 start-pos y) (+ 8192.0 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 8192.0) (vector-! (-> gp-0 move-dist) (get-trans arg1 3) (-> gp-0 start-pos)) (let ((v1-5 gp-0)) (set! (-> v1-5 radius) 2048.0) @@ -376,7 +376,7 @@ ) ) (logclear! (-> obj bot-flags) (bot-flags bf22)) - (set! (-> obj bot-flags) (logior (bot-flags bf23) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf23)) ) ) ) @@ -425,7 +425,7 @@ ) ) ) - (set! (-> obj bot-flags) (logior (bot-flags bf22) (-> obj bot-flags))) + (logior! (-> obj bot-flags) (bot-flags bf22)) ) ) ) @@ -3060,7 +3060,7 @@ (play-speech arg1 (-> a1-14 v1-55)) ) (else - (set! (-> arg1 bot-flags) (logior (bot-flags bf24) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf24)) ) ) ) @@ -3281,7 +3281,7 @@ ) (else (if (>= (- (current-time) (-> arg1 waypoint-time0)) (seconds 20)) - (set! (-> arg1 bot-flags) (logior (bot-flags bf24) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf24)) ) ) ) @@ -3353,7 +3353,7 @@ ) ) (when (and (logtest? (-> arg1 waypoint-bits) 1) (>= (- (current-time) (-> arg1 waypoint-time0)) (seconds 0.25))) - (set! (-> arg1 waypoint-bits) (logand -2 (-> arg1 waypoint-bits))) + (logand! (-> arg1 waypoint-bits) -2) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-1 from) (process->ppointer pp)) (set! (-> a1-1 num-params) 0) @@ -3740,7 +3740,7 @@ ) (if (>= a1-8 0) (play-speech arg1 a1-8) - (set! (-> arg1 bot-flags) (logior (bot-flags bf24) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf24)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc index dbbbfb6331..2a22fc39e9 100644 --- a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc @@ -661,7 +661,7 @@ (when a0-2 (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 quad) (-> (get-trans (the-as process-focusable a0-2) 1) quad)) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> s5-0 y) 8192.0) (set! (-> obj target-pos quad) (-> s5-0 quad)) ) ) @@ -903,14 +903,14 @@ (cond ((-> obj on-wall?) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (go (method-of-object obj notice-wall)) ) ((-> obj sentry?) (when (and (-> obj next-state) (= (-> obj next-state name) 'idle-sentry)) (logclear! (-> obj enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> obj enemy-flags) (logior (enemy-flag dangerous-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> obj mask) (process-mask actor-pause)) (go (method-of-object obj hostile-sentry)) ) @@ -963,8 +963,8 @@ (.svf (&-> s2-0 quad) vf6) ) (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> gp-0 y) (+ -8192.0 (-> gp-0 y))) - (set! (-> s5-0 y) (+ 8192.0 (-> s5-0 y))) + (+! (-> gp-0 y) -8192.0) + (+! (-> s5-0 y) 8192.0) (set! (-> s3-0 start-pos quad) (-> gp-0 quad)) (vector-float*! (-> s3-0 move-dist) @@ -1086,7 +1086,7 @@ ) ) (when (not (-> self sentry?)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable)) (set! (-> self focus collide-with) (collide-spec jak bot player-list jak-vehicle)) (let ((gp-1 (-> self on-stop-sentry))) (if gp-1 @@ -1158,7 +1158,7 @@ (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) (.svf (&-> gp-0 quad) vf6) ) - (set! (-> self target-pos y) (+ 2867.2 (-> self target-pos y))) + (+! (-> self target-pos y) 2867.2) (let ((f0-5 (* (-> self angle-sentry) (+ -0.5 (get-norm! (-> self sync) 0))))) (if (logtest? (enemy-flag dislike-combo) (-> self enemy-flags)) (set! f0-5 (- f0-5)) @@ -1176,7 +1176,7 @@ ) ) (when (not (-> self sentry?)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable)) (set! (-> self focus collide-with) (collide-spec jak bot player-list jak-vehicle)) (let ((gp-2 (-> self on-stop-sentry))) (if gp-2 @@ -1378,7 +1378,7 @@ (else (set! (-> arg1 quad) (-> obj root trans quad)) (set! (-> arg0 quad) (-> arg1 quad)) - (set! (-> arg0 y) (+ 81920.0 (-> arg0 y))) + (+! (-> arg0 y) 81920.0) ) ) (none) @@ -1468,7 +1468,7 @@ (set! (-> self attack-id) a0-22) ) (if (logtest? (enemy-option water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) ) (logclear! (-> self draw status) (draw-control-status no-draw)) (none) @@ -1822,7 +1822,7 @@ :virtual #t :enter (behavior () (if (logtest? (enemy-option water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) ) (let ((t9-0 (-> (method-of-type nav-enemy knocked) enter))) (if t9-0 @@ -1838,7 +1838,7 @@ :virtual #t :enter (behavior () (if (logtest? (enemy-option water) (-> self fact enemy-options)) - (set! (-> self enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) ) (let ((t9-0 (-> (method-of-type nav-enemy jump) enter))) (if t9-0 diff --git a/test/decompiler/reference/jak2/levels/sewer/jinx2-course_REF.gc b/test/decompiler/reference/jak2/levels/sewer/jinx2-course_REF.gc index 612b745b5c..7ac75ea920 100644 --- a/test/decompiler/reference/jak2/levels/sewer/jinx2-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/jinx2-course_REF.gc @@ -491,7 +491,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) (set! (-> arg0 min-speed) 49152.0) @@ -535,7 +535,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) (set! (-> arg0 min-speed) 49152.0) @@ -698,7 +698,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 min-speed) 49152.0) (set! (-> arg0 max-speed) 49152.0) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) @@ -730,7 +730,7 @@ :skip-to 34 :on-set (lambda ((arg0 jinx-sewer)) (logclear! (-> arg0 bot-flags) (bot-flags bf19)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf23) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf23)) (set! (-> arg0 min-speed) 32768.0) (set! (-> arg0 max-speed) 32768.0) (set! (-> arg0 bomb-func) jinx2-bomb1-callback) @@ -848,7 +848,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 491520.0) (set! (-> arg0 min-speed) 49152.0) @@ -1137,8 +1137,8 @@ :nav-mesh-index -1 :skip-to 54 :on-set (lambda ((arg0 jinx-sewer)) - (set! (-> arg0 enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> arg0 enemy-flags))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) @@ -1210,7 +1210,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 jinx-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 44) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1305,7 +1305,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 jinx-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 48) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1549,7 +1549,7 @@ :on-set (lambda ((arg0 jinx-sewer)) (set! (-> arg0 focus-mode) 0) (clear-poi-and-focus! arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 54) diff --git a/test/decompiler/reference/jak2/levels/sewer/mog2-course_REF.gc b/test/decompiler/reference/jak2/levels/sewer/mog2-course_REF.gc index f1b07737b0..c28c1e4bf7 100644 --- a/test/decompiler/reference/jak2/levels/sewer/mog2-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/mog2-course_REF.gc @@ -438,7 +438,7 @@ :skip-to -1 :on-set (lambda ((arg0 mog-sewer)) (set! (-> arg0 waypoint-time0) (current-time)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (clear-poi-and-focus! arg0) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 204800.0) @@ -638,7 +638,7 @@ :nav-mesh-index 2 :skip-to -1 :on-set (lambda ((arg0 mog-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (set! (-> arg0 min-speed) 32768.0) (set! (-> arg0 max-speed) 32768.0) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) @@ -788,7 +788,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 mog-sewer)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (set! (-> arg0 notice-enemy-dist) 491520.0) (set! (-> arg0 min-speed) 24576.0) @@ -1077,8 +1077,8 @@ :nav-mesh-index -1 :skip-to 54 :on-set (lambda ((arg0 mog-sewer)) - (set! (-> arg0 enemy-flags) (logior (enemy-flag trackable-backup enable-on-hostile) (-> arg0 enemy-flags))) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 enemy-flags) (enemy-flag trackable-backup enable-on-hostile)) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (logclear! (-> arg0 focus-status) (focus-status disable)) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) @@ -1210,7 +1210,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 mog-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 44) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1305,7 +1305,7 @@ (function ruft-wait-spot ruffian symbol) (lambda ((arg0 object) (arg1 mog-sewer)) (if (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) - (set! (-> arg1 bot-flags) (logior (bot-flags bf19) (-> arg1 bot-flags))) + (logior! (-> arg1 bot-flags) (bot-flags bf19)) ) (when (and (>= (-> arg1 waypoint-request) 48) (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f) @@ -1514,7 +1514,7 @@ :on-set (lambda ((arg0 mog-sewer)) (set! (-> arg0 focus-mode) 0) (clear-poi-and-focus! arg0) - (set! (-> arg0 bot-flags) (logior (bot-flags bf19) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf19)) (let ((v1-5 (get-task-by-type (-> arg0 ai-ctrl) ruft-wait-spot arg0))) (set! (-> v1-5 bytes 5) 1) (set! (-> v1-5 bytes 6) 45) 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 8e4093dbbb..493bfdf0be 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc @@ -957,7 +957,7 @@ (ja-channel-set! 0) (let ((vec (new 'stack-no-clear 'vector))) (set! (-> vec quad) (-> self root trans quad)) - (set! (-> vec y) (+ 10240.0 (-> vec y))) + (+! (-> vec y) 10240.0) (let ((frame-counter (current-time))) (until (>= (- (current-time) frame-counter) (seconds 2)) (spawn (-> self part) vec) diff --git a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc index 1a5554cf63..b1a048085f 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc @@ -434,7 +434,7 @@ This commonly includes things such as: ) ) (format #t "~S water-height: ~m~%" (-> obj name) (-> obj water-height)) - (set! (-> obj water-height) (+ -216498.17 (-> obj water-height))) + (+! (-> obj water-height) -216498.17) (go (method-of-object obj idle)) (none) ) @@ -1241,7 +1241,7 @@ This commonly includes things such as: (set! (-> obj time-skew) (the-as uint (the int (* 300.0 (rand-vu-float-range 0.1 1.4))))) (set! (-> obj period) (* 300.0 (rand-vu-float-range 1.2 1.8))) (set! (-> obj center quad) (-> obj root trans quad)) - (set! (-> obj base-height) (+ -216498.17 (-> obj base-height))) + (+! (-> obj base-height) -216498.17) (set! (-> obj root pause-adjust-distance) 532480.0) (go (method-of-object obj idle)) (none) @@ -1309,7 +1309,7 @@ This commonly includes things such as: (when (and (>= deadly-radius dist-from-wall) (>= dist-from-wall (+ -4096.0 prev-deadly-radius))) (let ((cquery (new 'stack-no-clear 'collide-query))) (set! (-> cquery start-pos quad) (-> obj root trans quad)) - (set! (-> cquery start-pos y) (+ 12288.0 (-> cquery start-pos y))) + (+! (-> cquery start-pos y) 12288.0) (vector-! (-> cquery move-dist) (get-trans target 3) (-> cquery start-pos)) (let ((v1-9 cquery)) (set! (-> v1-9 radius) 819.2) @@ -1467,7 +1467,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((data ((method-of-type res-lump get-property-struct) (-> obj entity) 'art-name @@ -1543,7 +1543,7 @@ This commonly includes things such as: (set! (-> obj anim) (new 'static 'spool-anim :name "sew-wall-2" :anim-name "2-break" :parts 1 :command-list '()) ) - (set! (-> obj root trans z) (+ 26624.0 (-> obj root trans z))) + (+! (-> obj root trans z) 26624.0) (set! (-> obj first-wall?) #f) ) (else @@ -2078,6 +2078,6 @@ This commonly includes things such as: (let ((func (method-of-type grunt init-enemy!))) (func obj) ) - (set! (-> obj root trans y) (+ -3276.8 (-> obj root trans y))) + (+! (-> obj root trans y) -3276.8) (none) ) diff --git a/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc index 97f3100d59..005b4fd433 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sewer-obs_REF.gc @@ -177,7 +177,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -396,7 +396,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -564,7 +564,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -713,7 +713,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) @@ -895,7 +895,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask ambient) (-> obj mask))) + (logior! (-> obj mask) (process-mask ambient)) (let ((cshape (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> cshape dynam) (copy *standard-dynamics* 'process)) (set! (-> cshape reaction) cshape-reaction-default) 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 fbf9212e66..d83f1f484a 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 @@ -2043,7 +2043,7 @@ This commonly includes things such as: ) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj pos-y) (-> obj root trans y)) (set! (-> obj offset) (rand-vu)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 539) obj)) 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 47f01d53da..767cb55bdd 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc @@ -281,9 +281,7 @@ This commonly includes things such as: ) (let ((v1-24 (-> s4-0 root-prim))) (dotimes (a0-10 (the-as int (-> v1-24 specific 0))) - (set! (-> (the-as collide-shape-prim-group v1-24) child a0-10 local-sphere y) - (+ -14336.0 (-> (the-as collide-shape-prim-group v1-24) child a0-10 local-sphere y)) - ) + (+! (-> (the-as collide-shape-prim-group v1-24) child a0-10 local-sphere y) -14336.0) ) ) (set! (-> obj root) s4-0) @@ -521,7 +519,7 @@ This commonly includes things such as: (let ((v1-4 (new 'stack-no-clear 'vector))) (set! (-> v1-4 quad) (-> self dest-pos quad)) (let ((s5-0 (new 'stack-no-clear 'vector))) - (set! (-> v1-4 y) (+ 49152.0 (-> v1-4 y))) + (+! (-> v1-4 y) 49152.0) (vector-! s5-0 v1-4 (-> gp-0 trans)) (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) (process->ppointer self)) @@ -3012,7 +3010,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-stad-force-field" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj field) (the-as handle #f)) (set! (-> obj ripple) (the-as handle #f)) (transform-post) @@ -3064,7 +3062,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-stad-c-force-field" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj field) (the-as handle #f)) (set! (-> obj ripple) (the-as handle #f)) (transform-post) @@ -3116,7 +3114,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-stad-d-force-field" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj mask) (logior (process-mask crate) (-> obj mask))) + (logior! (-> obj mask) (process-mask crate)) (set! (-> obj field) (the-as handle #f)) (set! (-> obj ripple) (the-as handle #f)) (transform-post) diff --git a/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc index 32310dd9fe..7d8ba4195a 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc @@ -627,7 +627,7 @@ This commonly includes things such as: (the-as skeleton-group (art-group-get-by-name *level* "skel-cranecrate" (the-as (pointer uint32) #f))) (the-as pair 0) ) - (set! (-> obj root trans y) (+ -163348.48 (-> obj root trans y))) + (+! (-> obj root trans y) -163348.48) (when (or (demo?) (and (= *kernel-boot-message* 'kiosk) (task-node-open? (game-task-node strip-drop-resolution)))) (let ((s5-2 (new 'stack-no-clear 'task-arrow-params))) (set! (-> s5-2 pos quad) (-> (new 'static 'vector :x 9920120.0 :y 288036.03 :z -179639.1 :w 1.0) quad)) diff --git a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc index 37fc9fa00c..4b6e4b36ca 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc @@ -1561,7 +1561,7 @@ This commonly includes things such as: ) (logclear! (-> obj options) (projectile-options proj-options-4)) (vector-normalize! (-> obj root transv) 1.0) - (set! (-> obj root transv y) (+ 1.0 (-> obj root transv y))) + (+! (-> obj root transv y) 1.0) (vector-normalize! (-> obj root transv) 184320.0) (set! (-> obj attack-mode) 'eco-yellow) (set! (-> obj blast-radius) 20480.0) @@ -1941,7 +1941,7 @@ This commonly includes things such as: (logclear! (-> obj mask) (process-mask actor-pause)) (let ((a3-5 (new 'stack-no-clear 'vector))) (set! (-> a3-5 quad) (-> obj root trans quad)) - (set! (-> a3-5 x) (+ 57344.0 (-> a3-5 x))) + (+! (-> a3-5 x) 57344.0) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "drill-plat-a" :fo-max 90) a3-5)) ) (ja-post) 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 50806ff779..a0819caf95 100644 --- a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc @@ -576,7 +576,7 @@ 44 (bucket-id progress) ) - (set! (-> sv-112 origin y) (+ 22.0 (-> sv-112 origin y))) + (+! (-> sv-112 origin y) 22.0) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc b/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc index ccd7b32972..88da200ff6 100644 --- a/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/target-indax_REF.gc @@ -254,9 +254,7 @@ ;; INFO: Used lq/sq ;; WARN: Return type mismatch object vs none. (defbehavior target-indax-init target () - (set! (-> self control current-surface flags) - (logior (surface-flag gun-fast-exit) (-> self control current-surface flags)) - ) + (logior! (-> self control current-surface flags) (surface-flag gun-fast-exit)) (target-gun-end-mode #t) (target-exit) (logior! (-> self game features) (game-feature sidekick)) @@ -267,7 +265,7 @@ (set! (-> self control reaction) target-collision-reaction) (set! (-> self control transv quad) (the-as uint128 0)) (set! (-> self control ctrl-xz-vel) 0.0) - (set! (-> self focus-status) (logior (focus-status indax) (-> self focus-status))) + (logior! (-> self focus-status) (focus-status indax)) (set! (-> self control bend-target) 0.0) (target-collide-set! 'indax 0.0) (set! (-> self fact health) (-> self fact health-max)) @@ -1470,9 +1468,7 @@ (add-process *gui-control* *target* (gui-channel daxter) (gui-action play) "ds175" -99.0 0) ) (set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2) - (set! (-> self control pat-ignore-mask) - (logior (new 'static 'pat-surface :noendlessfall #x1) (-> self control pat-ignore-mask)) - ) + (logior! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noendlessfall #x1)) (logclear! (-> self water flags) (water-flags swim-ground)) (set! (-> self post-hook) target-no-move-post) (let ((f30-0 (if (rand-vu-percent? 0.2) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc index 82b822b85e..a55927aa4d 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-baby-spider_REF.gc @@ -332,7 +332,7 @@ ) :enter (behavior () (nav-enemy-method-166 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (logior! (-> self focus-status) (focus-status dangerous)) (let ((v1-9 (-> (the-as collide-shape-prim-group (-> self root root-prim)) child 1))) (set! (-> v1-9 local-sphere w) 4915.2) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc index 2078e18aaf..955cdd8c8a 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc @@ -606,7 +606,7 @@ ) (set! (-> s5-0 0 dst quad) (the-as uint128 (the-as vector (-> self root trans quad)))) (set! (-> gp-0 0 dst quad) (-> self entity extra trans quad)) - (set! (-> gp-0 0 dst y) (+ 106496.0 (-> gp-0 0 dst y))) + (+! (-> gp-0 0 dst y) 106496.0) (vector-! (-> self fly-away-dir) (the-as vector (-> gp-0 0)) (the-as vector (-> s5-0 0))) (vector-normalize! (-> self fly-away-dir) 1.0) (quaternion-copy! (-> s5-0 0 dst-quat) (-> self root quat)) @@ -905,7 +905,7 @@ ) (else (set! (-> (the-as vector (-> gp-0 0)) quad) (-> self root trans quad)) - (set! (-> gp-0 0 dst y) (+ 16384.0 (-> gp-0 0 dst y))) + (+! (-> gp-0 0 dst y) 16384.0) ) ) (let ((s4-2 (vector-! (new 'stack-no-clear 'vector) (the-as vector (-> gp-0 0)) (-> self root trans)))) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc index 2c90d55eab..a0ca0e057e 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc @@ -160,7 +160,7 @@ This commonly includes things such as: - collision information - loading the skeleton group / bones - sounds" - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (init-plat-collision! obj) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj (the-as skeleton-group (get-art-group obj)) (the-as pair 0)) @@ -476,7 +476,7 @@ This commonly includes things such as: (when (and v1-1 (< (the-as uint arg0) (-> sv-16 elt-count)) (-> v1-1 arg0) (> (-> v1-1 0 length) 0)) (let ((a0-12 (new 'stack-no-clear 'vector))) (set! (-> a0-12 quad) (-> v1-1 arg0 data 0 actor trans quad)) - (set! (-> a0-12 y) (+ -163840.0 (-> a0-12 y))) + (+! (-> a0-12 y) -163840.0) (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) (process->ppointer self)) (set! (-> a1-4 num-params) 1) @@ -1744,7 +1744,7 @@ This commonly includes things such as: (none) ) :trans (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (plat-trans) (if (not (logtest? (-> self flags) 1)) (set! (-> self ride-timer) (current-time)) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc index b1b135f654..ac3cb731eb 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc @@ -520,7 +520,7 @@ This commonly includes things such as: "Sets `event-going-down` to `'trigger`" (logior! (-> obj button-status) (button-status button-status-4)) (set! (-> obj event-going-down) 'cue-chase) - (set! (-> obj root trans y) (+ 204.8 (-> obj root trans y))) + (+! (-> obj root trans y) 204.8) (none) ) @@ -1666,10 +1666,10 @@ This commonly includes things such as: ;; WARN: Return type mismatch object vs none. (defbehavior tomb-simon-block-init-by-other tomb-simon-block ((arg0 vector) (arg1 int) (arg2 int) (arg3 int) (arg4 int)) (init-plat-collision! self) - (set! (-> self mask) (logior (process-mask platform) (-> self mask))) + (logior! (-> self mask) (process-mask platform)) (set! (-> self root trans quad) (-> arg0 quad)) (set! (-> self base-height) (-> self root trans y)) - (set! (-> self root trans y) (+ -122880.0 (-> self root trans y))) + (+! (-> self root trans y) -122880.0) (quaternion-copy! (-> self root quat) *unity-quaternion*) (vector-identity! (-> self root scale)) (initialize-skeleton self (the-as skeleton-group (get-art-group self)) (the-as pair 0)) @@ -2175,7 +2175,7 @@ This commonly includes things such as: (< 184320.0 (vector-vector-distance (-> self root trans) (get-trans gp-0 0))) ) (remove-setting! 'sound-mode) - (set! (-> self flags) (logand -3 (-> self flags))) + (logand! (-> self flags) -3) ) ) ) @@ -2406,7 +2406,7 @@ This commonly includes things such as: ) (set! (-> obj entity) arg0) (set! (-> obj spawn-pos quad) (-> obj root trans quad)) - (set! (-> obj spawn-pos y) (+ 81.92 (-> obj spawn-pos y))) + (+! (-> obj spawn-pos y) 81.92) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-eco-pill-green-inc)) ) @@ -2825,7 +2825,7 @@ This commonly includes things such as: ) ) (get-bounding-sphere (-> obj bbox) s5-1) - (set! (-> s5-1 r) (+ 81920.0 (-> s5-1 r))) + (+! (-> s5-1 r) 81920.0) (set-from-sphere! (-> obj run-bbox) s5-1) ) (let* ((v1-29 *game-info*) diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc index 714b854889..d00501bf05 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc @@ -841,8 +841,8 @@ This commonly includes things such as: (if (and (nonzero? (-> self fizzle-timer)) (>= (- (current-time) (-> self fizzle-timer)) (seconds 3))) (go-virtual explode) ) - (set! (-> self x-rotate) (+ 1092.2667 (-> self x-rotate))) - (set! (-> self y-rotate) (+ 728.1778 (-> self y-rotate))) + (+! (-> self x-rotate) 1092.2667) + (+! (-> self y-rotate) 728.1778) (widow-bomb-method-34 self) (spawn-with-cspace (-> self part) (-> self node-list data 3)) (cond @@ -894,8 +894,8 @@ This commonly includes things such as: (if (and (nonzero? (-> self fizzle-timer)) (>= (- (current-time) (-> self fizzle-timer)) (seconds 3))) (go-virtual explode) ) - (set! (-> self x-rotate) (+ 4369.067 (-> self x-rotate))) - (set! (-> self y-rotate) (+ 3458.8445 (-> self y-rotate))) + (+! (-> self x-rotate) 4369.067) + (+! (-> self y-rotate) 3458.8445) (widow-bomb-method-34 self) (cond ((>= (- (current-time) (-> self state-time)) (the int (-> self traj time))) @@ -988,7 +988,7 @@ This commonly includes things such as: ((< (- (current-time) (-> self state-time)) (seconds 2)) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self root trans quad)) - (set! (-> a1-0 y) (+ 2048.0 (-> a1-0 y))) + (+! (-> a1-0 y) 2048.0) (spawn (-> self explode-part) a1-0) ) ) @@ -1169,11 +1169,11 @@ This commonly includes things such as: (let ((v1-0 (-> self which-trajectory))) (cond ((zero? v1-0) - (set! (-> self x-rotate) (+ 4369.067 (-> self x-rotate))) - (set! (-> self y-rotate) (+ 3458.8445 (-> self y-rotate))) + (+! (-> self x-rotate) 4369.067) + (+! (-> self y-rotate) 3458.8445) ) ((= v1-0 1) - (set! (-> self x-rotate) (+ 7281.778 (-> self x-rotate))) + (+! (-> self x-rotate) 7281.778) (set! (-> self y-rotate) 0.0) ) (else @@ -1182,10 +1182,10 @@ This commonly includes things such as: ) ) (if (< 65536.0 (-> self x-rotate)) - (set! (-> self x-rotate) (+ -65536.0 (-> self x-rotate))) + (+! (-> self x-rotate) -65536.0) ) (if (< 65536.0 (-> self y-rotate)) - (set! (-> self y-rotate) (+ -65536.0 (-> self y-rotate))) + (+! (-> self y-rotate) -65536.0) ) (widow-bomb-method-34 self) (when (< (-> self root scale x) 1.0) diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc index a4844ba928..6d1246f09a 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-more-extras_REF.gc @@ -508,7 +508,7 @@ (when (>= (- (current-time) (-> self state-time)) 0) (let ((gp-0 (new 'stack-no-clear 'vector))) (cavein-get-random-point gp-0) - (set! (-> gp-0 y) (+ 327680.0 (-> gp-0 y))) + (+! (-> gp-0 y) 327680.0) (process-spawn tomb-boss-debris gp-0 (rand-vu-int-count 8) :to self) ) (set! (-> self state-time) (+ (current-time) (the int (* 300.0 (rand-vu-float-range 0.1 0.5))))) @@ -546,7 +546,7 @@ This commonly includes things such as: (if (-> obj path) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) ) - (set! (-> obj root trans y) (+ 327680.0 (-> obj root trans y))) + (+! (-> obj root trans y) 327680.0) (logclear! (-> obj mask) (process-mask actor-pause)) (dotimes (v1-12 100) (set! (-> obj prev-points v1-12) 0) diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-part_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-part_REF.gc index 2c47d14ed3..19d0bd5545 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-part_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-part_REF.gc @@ -2283,7 +2283,7 @@ (birth-func-texture-group arg0 arg1 arg2) (let ((s5-0 (new 'stack-no-clear 'collide-query))) (set! (-> s5-0 start-pos quad) (-> arg2 launchrot quad)) - (set! (-> s5-0 start-pos y) (+ -143360.0 (-> s5-0 start-pos y))) + (+! (-> s5-0 start-pos y) -143360.0) (set-vector! (-> s5-0 move-dist) 0.0 -81920.0 0.0 1.0) (let ((s4-0 (new 'stack-no-clear 'vector))) (.svf (&-> s4-0 quad) vf30) diff --git a/test/decompiler/reference/jak2/levels/tomb/widow2_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow2_REF.gc index c8da66e01d..435cefc22e 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow2_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow2_REF.gc @@ -250,8 +250,8 @@ This commonly includes things such as: 0 (let ((s3-2 (new 'stack-no-clear 'vector))) (set! (-> s3-2 quad) (-> arg0 extra trans quad)) - (set! (-> s3-2 y) (+ -32768.0 (-> s3-2 y))) - (set! (-> s3-2 z) (+ 42475.52 (-> s3-2 z))) + (+! (-> s3-2 y) -32768.0) + (+! (-> s3-2 z) 42475.52) (dotimes (s5-1 8) (cond ((not (logtest? (the-as int (-> s4-2 user-object 1)) (ash 1 s5-1))) @@ -281,7 +281,7 @@ This commonly includes things such as: (set! (-> obj flying) #f) (set! (-> obj previous-anim) 0) (set! (-> obj circle-center quad) (-> obj root trans quad)) - (set! (-> obj circle-center z) (+ 40960.0 (-> obj circle-center z))) + (+! (-> obj circle-center z) 40960.0) (init (-> obj theta) 0.0 0.01 91.022224 0.9) (init (-> obj tilt) 0.0 0.01 91.022224 0.9) (set! (-> obj left-cover-jm) (new 'process 'joint-mod (joint-mod-mode joint-set*) obj 90)) diff --git a/test/decompiler/reference/jak2/levels/under/centipede_REF.gc b/test/decompiler/reference/jak2/levels/under/centipede_REF.gc index 2a568b9a6d..e11ea2b5db 100644 --- a/test/decompiler/reference/jak2/levels/under/centipede_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/centipede_REF.gc @@ -874,7 +874,7 @@ (let ((v1-13 *camera*)) (when (and v1-13 (-> v1-13 slave)) (logclear! (-> self enemy-flags) (enemy-flag enable-on-notice alert victory called-dying)) - (set! (-> self enemy-flags) (logior (enemy-flag dangerous-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag dangerous-backup)) (logclear! (-> self mask) (process-mask actor-pause)) (go-hostile self) ) @@ -1165,7 +1165,7 @@ ) 0 (nav-enemy-method-167 self) - (set! (-> self enemy-flags) (logior (enemy-flag actor-pause-backup) (-> self enemy-flags))) + (logior! (-> self enemy-flags) (enemy-flag actor-pause-backup)) (set! (-> self grabbed-focus?) #f) (vector-reset! (-> self root transv)) (set! (-> self desired-talking-volume) 0.0) @@ -1422,7 +1422,7 @@ (set! (-> obj focus-gnd-height) -40959590.0) (set! (-> obj bobbing-intensity) 1.0) (set-vector! (-> obj root scale) 0.75 0.75 0.75 1.0) - (set! (-> obj root trans y) (+ 4096.0 (-> obj root trans y))) + (+! (-> obj root trans y) 4096.0) (case (-> obj id) ((1) (let ((v1-10 (-> obj root))) @@ -1449,7 +1449,7 @@ (set! (-> obj skel generate-frame-function) create-interpolated2-joint-animation-frame) (init-enemy-behaviour-and-stats! obj *centipede-nav-enemy-info*) (logclear! (-> obj mask) (process-mask enemy)) - (set! (-> obj mask) (logior (process-mask bot) (-> obj mask))) + (logior! (-> obj mask) (process-mask bot)) (let ((v1-31 (-> obj nav))) (set! (-> v1-31 sphere-mask) (the-as uint 64)) ) diff --git a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc index ddd1af3a42..67c95e2b17 100644 --- a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc @@ -518,10 +518,10 @@ ) ) (jellyfish-method-161 self (-> self stare-pos) (-> self path-stare-u)) - (set! (-> self stare-pos y) (+ -32768.0 (-> self stare-pos y))) + (+! (-> self stare-pos y) -32768.0) (let ((gp-0 (new 'stack-no-clear 'collide-query))) (set! (-> gp-0 start-pos quad) (-> self stare-pos quad)) - (set! (-> gp-0 start-pos y) (+ 8192.0 (-> gp-0 start-pos y))) + (+! (-> gp-0 start-pos y) 8192.0) (set-vector! (-> gp-0 move-dist) 0.0 -81920.0 0.0 0.0) (let ((v1-8 gp-0)) (set! (-> v1-8 radius) 819.2) @@ -1001,7 +1001,7 @@ ) (logclear! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (enemy-method-62 obj) - (set! (-> obj enemy-flags) (logior (enemy-flag actor-pause-backup) (-> obj enemy-flags))) + (logior! (-> obj enemy-flags) (enemy-flag actor-pause-backup)) (process-contact-action arg0) (send-event arg0 'get-attack-count 1) (go (method-of-object obj die)) diff --git a/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc b/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc index 63de8ab1ac..75f3a7b59e 100644 --- a/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/sig5-course_REF.gc @@ -406,10 +406,8 @@ (nav-enemy-method-167 self) (set! (-> self skel top-anim interp) 0.0) (set! (-> self focus-mode) 1) - (set! (-> self bot-flags) (logior (bot-flags bf11 bf18) (-> self bot-flags))) - (set! (-> self root penetrated-by) - (logior (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot) (-> self root penetrated-by)) - ) + (logior! (-> self bot-flags) (bot-flags bf11 bf18)) + (logior! (-> self root penetrated-by) (penetrate jak-yellow-shot jak-red-shot jak-blue-shot jak-dark-shot)) (look-at-target! self (enemy-flag lock-focus)) (none) ) @@ -488,7 +486,7 @@ ) ) (label cfg-27) - (set! (-> self bot-flags) (logior (bot-flags bf18) (-> self bot-flags))) + (logior! (-> self bot-flags) (bot-flags bf18)) ) #f (none) @@ -658,7 +656,7 @@ :nav-mesh-index -1 :skip-to -1 :on-set (lambda ((arg0 sig-under)) - (set! (-> arg0 bot-task-bits) (logand -5 (-> arg0 bot-task-bits))) + (logand! (-> arg0 bot-task-bits) -5) (logior! (-> arg0 bot-flags) (bot-flags bf06)) (logior! (-> arg0 enemy-flags) (enemy-flag enable-on-active checking-water)) (set! (-> arg0 notice-enemy-dist) 122880.0) @@ -1317,7 +1315,7 @@ (set! (-> arg0 notice-enemy-dist) 0.0) (logclear! (-> arg0 enemy-flags) (enemy-flag enable-on-active checking-water)) (clear-focused (-> arg0 focus)) - (set! (-> arg0 bot-flags) (logior (bot-flags bf26) (-> arg0 bot-flags))) + (logior! (-> arg0 bot-flags) (bot-flags bf26)) (when (and (process-grab? arg0 #t) (process-grab? *target* #t)) (process-grab? arg0 #f) (process-grab? *target* #f) @@ -1554,7 +1552,7 @@ :on-set (lambda ((arg0 sig-under)) (stop-speech arg0 (the-as uint 0) #f) (set-setting! 'music 'danger7 0.0 0) - (set! (-> arg0 bot-task-bits) (logand -9 (-> arg0 bot-task-bits))) + (logand! (-> arg0 bot-task-bits) -9) (let ((v1-7 (get-task-by-type (-> arg0 ai-ctrl) sigt-wait-spot arg0))) (set! (-> v1-7 bytes 5) 1) (set! (-> v1-7 bytes 6) 23) diff --git a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc index 77f6bdfb96..0427eb53fc 100644 --- a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc @@ -528,7 +528,7 @@ This commonly includes things such as: (let* ((a0-1 (target-pos 0)) (v1-6 (vector-! (new 'stack-no-clear 'vector) (-> self root trans) a0-1)) ) - (set! (-> v1-6 y) (+ 58000.0 (-> v1-6 y))) + (+! (-> v1-6 y) 58000.0) (if (< (-> self down-threshold) (-> v1-6 y)) (go-virtual going-down) ) @@ -615,7 +615,7 @@ This commonly includes things such as: (let* ((a0-4 (target-pos 0)) (v1-19 (vector-! (new 'stack-no-clear 'vector) (-> self root trans) a0-4)) ) - (set! (-> v1-19 y) (+ 58000.0 (-> v1-19 y))) + (+! (-> v1-19 y) 58000.0) (if (< (-> v1-19 y) (-> self up-threshold)) (go-virtual going-up) ) @@ -789,7 +789,7 @@ This commonly includes things such as: :trans (behavior () (when (-> self release) (ja :num-func num-func-identity :frame-num (-> self open-anim-frame)) - (set! (-> self open-anim-frame) (+ 0.2 (-> self open-anim-frame))) + (+! (-> self open-anim-frame) 0.2) (if (< 17.0 (-> self open-anim-frame)) (go-virtual opened) ) @@ -1273,7 +1273,7 @@ This commonly includes things such as: ((>= arg1 (the-as int (+ (-> obj num-joints) -1))) (set! v1-7 (new 'stack-no-clear 'vector)) (set! (-> v1-7 quad) (-> arg2 entity trans quad)) - (set! (-> v1-7 y) (+ 8192.0 (-> v1-7 y))) + (+! (-> v1-7 y) 8192.0) ) (else (set! v1-7 (new 'stack-no-clear 'vector)) @@ -1336,7 +1336,7 @@ This commonly includes things such as: (let ((v1-0 (new 'stack-no-clear 'vector))) (set! (-> v1-0 quad) (-> arg3 entity trans quad)) (let ((s5-0 (new 'stack-no-clear 'vector))) - (set! (-> v1-0 y) (+ -19660.8 (-> v1-0 y))) + (+! (-> v1-0 y) -19660.8) (vector-! s5-0 arg0 v1-0) (let ((f0-2 (vector-normalize-ret-len! s5-0 1.0))) (if (< f0-2 20480.0) @@ -1518,14 +1518,14 @@ This commonly includes things such as: (cond (*target* (set! (-> s5-0 quad) (-> (get-trans *target* 3) quad)) - (set! (-> s5-0 y) (+ -28672.0 (-> s5-0 y))) + (+! (-> s5-0 y) -28672.0) ) (else (set! (-> s5-0 quad) (-> gp-0 quad)) - (set! (-> s5-0 y) (+ -1024.0 (-> s5-0 y))) + (+! (-> s5-0 y) -1024.0) ) ) - (set! (-> gp-0 y) (+ -28672.0 (-> gp-0 y))) + (+! (-> gp-0 y) -28672.0) (vector-seek-3d-smooth! (-> self root trans) s5-0 (* 204.8 (-> self clock time-adjust-ratio)) 0.25) ) (let ((v1-21 (vector-! (new 'stack-no-clear 'vector) (-> self root trans) gp-0))) @@ -1967,7 +1967,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (stack-size-set! (-> obj main-thread) 512) - (set! (-> obj mask) (logior (process-mask collectable) (-> obj mask))) + (logior! (-> obj mask) (process-mask collectable)) (let ((s3-0 ((method-of-type res-lump get-property-struct) (-> obj entity) 'art-name diff --git a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc index 38e73e8110..902add6539 100644 --- a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc @@ -847,7 +847,7 @@ (set! (-> self move-dir-x) s5-1) (set! (-> self move-dir-z) gp-1) (under-block-method-48 self (+ (-> self col) s5-1) (+ (-> self row) gp-1)) - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (if (zero? (-> self activated-time)) (under-block-method-42 self) ) @@ -856,7 +856,7 @@ ((under-block-method-49 self s5-1 gp-1) (set! (-> self move-dir-x) s5-1) (set! (-> self move-dir-z) gp-1) - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (go-virtual rock) ) ((and (-> self next-state) (= (-> self next-state name) 'idle)) @@ -1029,7 +1029,7 @@ ) ) (else - (set! (-> obj flags) (logand -3 (-> obj flags))) + (logand! (-> obj flags) -3) (set-vector! (-> obj draw color-mult) 1.0 1.0 1.0 1.0) (set-vector! (-> obj draw color-emissive) 0.0 0.0 0.0 1.0) ) @@ -1359,7 +1359,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :code (the-as (function none :behavior under-block) sleep-code) @@ -1371,7 +1371,7 @@ :event under-block-event-handler :trans (the-as (function none :behavior under-block) rider-trans) :code (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (while (not (under-block-method-48 self (-> self col) (-> self row))) (suspend) ) @@ -1381,7 +1381,7 @@ (let ((gp-1 (new 'stack-no-clear 'matrix))) (set! (-> gp-1 vector 0 quad) (-> self root trans quad)) (set! (-> gp-1 vector 1 quad) (-> gp-1 vector 0 quad)) - (set! (-> gp-1 vector 1 y) (+ 16384.0 (-> gp-1 vector 1 y))) + (+! (-> gp-1 vector 1 y) 16384.0) (until (>= 409.6 (fabs (- (-> gp-1 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1406,12 +1406,12 @@ :event under-block-event-handler :trans (the-as (function none :behavior under-block) rider-trans) :code (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (set! (-> self state-time) (current-time)) (let ((gp-0 (new 'stack-no-clear 'matrix))) (set! (-> gp-0 vector 0 quad) (-> self root trans quad)) (set! (-> gp-0 vector 1 quad) (-> gp-0 vector 0 quad)) - (set! (-> gp-0 vector 1 y) (+ 16384.0 (-> gp-0 vector 1 y))) + (+! (-> gp-0 vector 1 y) 16384.0) (until (>= 409.6 (fabs (- (-> gp-0 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1453,7 +1453,7 @@ (none) ) :exit (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :trans (behavior () @@ -1660,7 +1660,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (none) ) :trans (behavior () @@ -1673,7 +1673,7 @@ (let ((gp-1 (new 'stack-no-clear 'matrix))) (set! (-> gp-1 vector 0 quad) (-> self root trans quad)) (set! (-> gp-1 vector 1 quad) (-> gp-1 vector 0 quad)) - (set! (-> gp-1 vector 1 y) (+ -1228.8 (-> gp-1 vector 1 y))) + (+! (-> gp-1 vector 1 y) -1228.8) (until (>= 40.96 (fabs (- (-> gp-1 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1716,7 +1716,7 @@ (set! (-> gp-1 vector 0 quad) (-> self root trans quad)) (set! (-> gp-1 vector 1 quad) (-> gp-1 vector 0 quad)) (set! (-> gp-1 vector 1 y) (-> self puzzle origin y)) - (set! (-> gp-1 vector 1 y) (+ -8192.0 (-> gp-1 vector 1 y))) + (+! (-> gp-1 vector 1 y) -8192.0) (until (>= 40.96 (fabs (- (-> gp-1 vector 1 y) (-> self root trans y)))) (vector-seek-3d-smooth! (-> self root trans) @@ -1738,7 +1738,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (under-block-method-41 self 'beaten) (none) ) @@ -1750,7 +1750,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (logclear! (-> self mask) (process-mask actor-pause)) (under-block-method-41 self 'fall) (none) @@ -1804,7 +1804,7 @@ :virtual #t :event under-block-event-handler :enter (behavior () - (set! (-> self flags) (logand -2 (-> self flags))) + (logand! (-> self flags) -2) (under-block-method-46 self (-> self col) (-> self row)) (let ((v1-4 (-> self puzzle))) (countdown (a0-3 (-> v1-4 slots length)) @@ -1939,10 +1939,10 @@ (vector-matrix*! (-> s5-1 trans) (-> s5-1 trans) (-> self puzzle local-to-world)) (case arg2 (('waiting 'beaten) - (set! (-> s5-1 trans y) (+ -16384.0 (-> s5-1 trans y))) + (+! (-> s5-1 trans y) -16384.0) ) (('follow) - (set! (-> s5-1 trans y) (+ -32768.0 (-> s5-1 trans y))) + (+! (-> s5-1 trans y) -32768.0) ) ) (matrix->quaternion (-> s5-1 quat) (-> self puzzle local-to-world)) @@ -1954,7 +1954,7 @@ (the-as pair 0) ) (transform-post) - (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) + (logior! (-> self mask) (process-mask enemy)) (set! (-> self draw light-index) (the-as uint 30)) (cond ((= arg2 'idle) diff --git a/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc b/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc index 85a3cae4af..325961fc58 100644 --- a/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-sig-obs_REF.gc @@ -142,7 +142,7 @@ "Does any necessary initial platform setup. For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound." (logclear! (-> obj mask) (process-mask actor-pause)) - (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) + (logior! (-> obj mask) (process-mask enemy)) (set-vector! (-> obj axe-flip) 1.0 0.0 0.0 1.0) (set! (-> obj angle-flip) 180.0) (set! (-> obj time-flip) (the-as uint 570)) @@ -1370,7 +1370,7 @@ This commonly includes things such as: - loading the skeleton group / bones - sounds" (set! (-> obj extended-amount) 0.0) - (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) + (logior! (-> obj mask) (process-mask platform)) (set! (-> obj clock) (-> *display* user0-clock)) (let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s3-0 (new 'process 'collide-shape-prim-mesh s4-0 (the-as uint 0) (the-as uint 0))))