From c1faeac042cee6e90423d6fa263e235cd6c68eba Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sat, 28 May 2022 20:23:39 +0100 Subject: [PATCH] fix float->int cast suppression + minor cleanup of a couple files (#1375) * fix float->int cast suppression + minor cleanup of a couple files * add missing cutscenes --- decompiler/IR2/FormExpressionAnalysis.cpp | 11 +++++ .../jak1_ntsc_black_label/type_casts.jsonc | 25 ---------- goal_src/engine/game/task/task-control.gc | 42 ++++++++-------- goal_src/engine/ps2/pad.gc | 48 ++++++++----------- goal_src/game.gp | 5 +- goal_src/goos-lib.gs | 6 +++ goalc/main.cpp | 6 +-- .../engine/game/task/task-control_REF.gc | 42 ++++++++-------- 8 files changed, 86 insertions(+), 99 deletions(-) diff --git a/decompiler/IR2/FormExpressionAnalysis.cpp b/decompiler/IR2/FormExpressionAnalysis.cpp index bf3c30c2e..2e7822bb3 100644 --- a/decompiler/IR2/FormExpressionAnalysis.cpp +++ b/decompiler/IR2/FormExpressionAnalysis.cpp @@ -2079,8 +2079,19 @@ void SimpleExpressionElement::update_from_stack_float_to_int(const Env& env, auto var = m_expr.get_arg(0).var(); auto arg = pop_to_forms({var}, env, pool, stack, allow_side_effects).at(0); auto type = env.get_types_before_op(var.idx()).get(var.reg()).typespec(); + auto fpr_convert_matcher = + Matcher::op(GenericOpMatcher::fixed(FixedOperatorKind::GPR_TO_FPR), {Matcher::any(0)}); + auto mr = match(fpr_convert_matcher, arg); if (type == TypeSpec("float")) { result->push_back(pool.alloc_element(TypeSpec("int"), arg, true)); + } else if (env.dts->ts.tc(type, TypeSpec("float")) && mr.matched) { + // this is a parent of float. normally we would fix this with a manual cast, but that is too + // effective since float->int requires the type to be EXACTLY float. + // so we add a cast to float first. + // we also strip the gpr->fpr here + result->push_back(pool.alloc_element( + TypeSpec("int"), pool.form(TypeSpec("float"), mr.maps.forms.at(0), true), + true)); } else { throw std::runtime_error( fmt::format("Used float to int on a {}: {}", type.print(), to_string(env))); diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc index 54868cd45..d71d5d257 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -824,29 +824,6 @@ [[157, 162], "a1", "dma-packet"] ], "(top-level-login task-control)": [[165, "v1", "symbol"]], - "(anon-function 494 task-control)": [[32, "v0", "float"]], - "(anon-function 493 task-control)": [[32, "v0", "float"]], - "(anon-function 480 task-control)": [[13, "v0", "float"]], - "(anon-function 477 task-control)": [[38, "v0", "float"]], - "(anon-function 476 task-control)": [[38, "v0", "float"]], - "(anon-function 475 task-control)": [ - [37, "v0", "float"], - [81, "v0", "float"] - ], - "(anon-function 474 task-control)": [ - [37, "v0", "float"], - [81, "v0", "float"] - ], - "(anon-function 426 task-control)": [[32, "v0", "float"]], - "(anon-function 425 task-control)": [[32, "v0", "float"]], - "(anon-function 415 task-control)": [[32, "v0", "float"]], - "(anon-function 414 task-control)": [[32, "v0", "float"]], - "(anon-function 365 task-control)": [[32, "v0", "float"]], - "(anon-function 364 task-control)": [[32, "v0", "float"]], - "(anon-function 363 task-control)": [[32, "v0", "float"]], - "(anon-function 362 task-control)": [[32, "v0", "float"]], - "(anon-function 337 task-control)": [[32, "v0", "float"]], - "(anon-function 336 task-control)": [[32, "v0", "float"]], "(anon-function 227 task-control)": [ [[14, 16], "t9", "(function process event-message-block float)"] ], @@ -892,8 +869,6 @@ "(anon-function 455 task-control)": [ [[14, 16], "t9", "(function process event-message-block float)"] ], - "(anon-function 38 task-control)": [[13, "v0", "float"]], - "(anon-function 28 task-control)": [[13, "v0", "float"]], "(method 18 game-info)": [ [4, "v1", "symbol"], [5, "v1", "level-load-info"], diff --git a/goal_src/engine/game/task/task-control.gc b/goal_src/engine/game/task/task-control.gc index ce5179cc1..fe06c4b72 100644 --- a/goal_src/engine/game/task/task-control.gc +++ b/goal_src/engine/game/task/task-control.gc @@ -335,7 +335,7 @@ (set! (-> a1-2 message) 'query) (set! (-> a1-2 param 0) (the-as uint 'pickup)) (set! (-> a1-2 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-2)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-2))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -357,7 +357,7 @@ (set! (-> a1-2 message) 'query) (set! (-> a1-2 param 0) (the-as uint 'pickup)) (set! (-> a1-2 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-2)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-2))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -474,7 +474,7 @@ (set! (-> a1-0 message) 'query) (set! (-> a1-0 param 0) (the-as uint 'pickup)) (set! (-> a1-0 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-0)) 45) + (>= (the int (the float (send-event-function *target* a1-0))) 45) ) ) ) @@ -511,7 +511,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -536,7 +536,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -561,7 +561,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -573,7 +573,7 @@ (set! (-> a1-8 message) 'query) (set! (-> a1-8 param 0) (the-as uint 'pickup)) (set! (-> a1-8 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-8)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-8))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -598,7 +598,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -610,7 +610,7 @@ (set! (-> a1-8 message) 'query) (set! (-> a1-8 param 0) (the-as uint 'pickup)) (set! (-> a1-8 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-8)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-8))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1106,7 +1106,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1129,7 +1129,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1229,7 +1229,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1252,7 +1252,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1840,7 +1840,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1863,7 +1863,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1886,7 +1886,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1909,7 +1909,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -2107,7 +2107,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -2130,7 +2130,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -5115,7 +5115,7 @@ (set! (-> a1-0 message) 'query) (set! (-> a1-0 param 0) (the-as uint 'pickup)) (set! (-> a1-0 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-0)) 20) + (>= (the int (the float (send-event-function *target* a1-0))) 20) ) ) ) @@ -5228,7 +5228,7 @@ (set! (-> a1-0 message) 'query) (set! (-> a1-0 param 0) (the-as uint 'pickup)) (set! (-> a1-0 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-0)) 72) + (>= (the int (the float (send-event-function *target* a1-0))) 72) ) ) ) diff --git a/goal_src/engine/ps2/pad.gc b/goal_src/engine/ps2/pad.gc index 0f9ecbfb3..0390b5fec 100644 --- a/goal_src/engine/ps2/pad.gc +++ b/goal_src/engine/ps2/pad.gc @@ -202,47 +202,39 @@ (defmacro analog-input-horizontal-first (in offset center-val max-val out-range) "Same as analog-input but respects First-Person Horizontal camera control setting." - `(#if PC_PORT - (* - (if (-> *pc-settings* first-camera-h-inverted?) -1.0 1.0) ;; first-person horizontal is NOT inverted in original game - (analog-input ,in ,offset ,center-val ,max-val ,out-range) - ) - (analog-input ,in ,offset ,center-val ,max-val ,out-range) + `(#if PC_PORT ;; first-person horizontal is NOT inverted in original game + (* (if (-> *pc-settings* first-camera-h-inverted?) -1.0 1.0) + (analog-input ,in ,offset ,center-val ,max-val ,out-range)) + (analog-input ,in ,offset ,center-val ,max-val ,out-range) + ) ) -) (defmacro analog-input-vertical-first (in offset center-val max-val out-range) "Same as analog-input but respects First-Person Vertical camera control setting." - `(#if PC_PORT - (* - (if (-> *pc-settings* first-camera-v-inverted?) 1.0 -1.0) ;; first-person vertical is already inverted in original game - (analog-input ,in ,offset ,center-val ,max-val ,out-range) - ) - (analog-input ,in ,offset ,center-val ,max-val ,out-range) + `(#if PC_PORT ;; first-person vertical is already inverted in original game + (* (if (-> *pc-settings* first-camera-v-inverted?) 1.0 -1.0) + (analog-input ,in ,offset ,center-val ,max-val ,out-range)) + (analog-input ,in ,offset ,center-val ,max-val ,out-range) + ) ) -) (defmacro analog-input-horizontal-third (in offset center-val max-val out-range) "Same as analog-input but respects Third-Person Horizontal camera control setting." - `(#if PC_PORT - (* - (if (-> *pc-settings* third-camera-h-inverted?) 1.0 -1.0) ;; third-person horizontal is already inverted in original game - (analog-input ,in ,offset ,center-val ,max-val ,out-range) - ) - (analog-input ,in ,offset ,center-val ,max-val ,out-range) + `(#if PC_PORT ;; third-person horizontal is already inverted in original game + (* (if (-> *pc-settings* third-camera-h-inverted?) 1.0 -1.0) + (analog-input ,in ,offset ,center-val ,max-val ,out-range)) + (analog-input ,in ,offset ,center-val ,max-val ,out-range) + ) ) -) (defmacro analog-input-vertical-third (in offset center-val max-val out-range) "Same as analog-input but respects Third-Person Vertical camera control setting." - `(#if PC_PORT - (* - (if (-> *pc-settings* third-camera-v-inverted?) 1.0 -1.0) ;; third-person vertical is already inverted in original game - (analog-input ,in ,offset ,center-val ,max-val ,out-range) - ) - (analog-input ,in ,offset ,center-val ,max-val ,out-range) + `(#if PC_PORT ;; third-person vertical is already inverted in original game + (* (if (-> *pc-settings* third-camera-v-inverted?) 1.0 -1.0) + (analog-input ,in ,offset ,center-val ,max-val ,out-range)) + (analog-input ,in ,offset ,center-val ,max-val ,out-range) + ) ) -) (defun cpad-set-buzz! ((pad cpad-info) (buzz-idx int) (buzz-amount int) (duration time-frame)) "Turn on vibration motor 'buzz-idx' for duration, at magnitude buzz-amount." diff --git a/goal_src/game.gp b/goal_src/game.gp index e31be3c18..0ae8dad6e 100644 --- a/goal_src/game.gp +++ b/goal_src/game.gp @@ -642,7 +642,7 @@ ;; oracle (copy-strs "ORI1" "ORLE1" "ORRE1" "ORR1") ;; assistant -(copy-strs "ASIBESWI" "ASR1BESW") +(copy-strs "ASIBESWI" "ASR1BESW" "ASIRBIKE" "ASR1RBIK" "ASR1GENE") ;; sage (copy-strs "SAISA" "SAISD1" "SAISD2" "SAISE" "SAR1ECOR" "SAIMCANN" "SAR1MCAN" "SAR1GENE" "SAR2GENE") ;; fishermans-boat @@ -1937,10 +1937,12 @@ ) +(fmt #t "found {} spools\n" (count *all-str*)) (group-list "spools" `(,@(reverse *all-str*)) ) + (group-list "text" `("out/iso/0COMMON.TXT" "out/iso/0SUBTIT.TXT" @@ -1960,3 +1962,4 @@ (group-list "all-code" `(,@(reverse *all-gc*)) ) + diff --git a/goal_src/goos-lib.gs b/goal_src/goos-lib.gs index 5892242f5..f6e476d1f 100644 --- a/goal_src/goos-lib.gs +++ b/goal_src/goos-lib.gs @@ -108,6 +108,12 @@ `(set! ,lst (cdr ,lst)) ) +(desfun count (lst) + (if (null? lst) + 0 + (+ 1 (count (cdr lst)))) + ) + (desfun apply (fun x) (if (null? x) '() diff --git a/goalc/main.cpp b/goalc/main.cpp index 525ae9364..9d9154a8c 100644 --- a/goalc/main.cpp +++ b/goalc/main.cpp @@ -64,11 +64,11 @@ int main(int argc, char** argv) { ts.seek_past_whitespace_and_comments(); std::string found_username; while (ts.text_remains()) { - auto character = std::string(1, ts.peek()); - if (!std::regex_match(character, allowed_chars)) { + auto character = ts.read(); + if (!std::regex_match(std::string(1, character), allowed_chars)) { break; } - found_username.push_back(ts.read()); + found_username.push_back(character); } if (!found_username.empty()) { username = found_username; diff --git a/test/decompiler/reference/engine/game/task/task-control_REF.gc b/test/decompiler/reference/engine/game/task/task-control_REF.gc index 72529719b..82414fa06 100644 --- a/test/decompiler/reference/engine/game/task/task-control_REF.gc +++ b/test/decompiler/reference/engine/game/task/task-control_REF.gc @@ -324,7 +324,7 @@ (set! (-> a1-2 message) 'query) (set! (-> a1-2 param 0) (the-as uint 'pickup)) (set! (-> a1-2 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-2)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-2))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -346,7 +346,7 @@ (set! (-> a1-2 message) 'query) (set! (-> a1-2 param 0) (the-as uint 'pickup)) (set! (-> a1-2 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-2)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-2))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -464,7 +464,7 @@ (set! (-> a1-0 message) 'query) (set! (-> a1-0 param 0) (the-as uint 'pickup)) (set! (-> a1-0 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-0)) 45) + (>= (the int (the float (send-event-function *target* a1-0))) 45) ) ) ) @@ -501,7 +501,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -526,7 +526,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -551,7 +551,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -563,7 +563,7 @@ (set! (-> a1-8 message) 'query) (set! (-> a1-8 param 0) (the-as uint 'pickup)) (set! (-> a1-8 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-8)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-8))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -588,7 +588,7 @@ (set! (-> a1-4 message) 'query) (set! (-> a1-4 param 0) (the-as uint 'pickup)) (set! (-> a1-4 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -600,7 +600,7 @@ (set! (-> a1-8 message) 'query) (set! (-> a1-8 param 0) (the-as uint 'pickup)) (set! (-> a1-8 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-8)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-8))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1100,7 +1100,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1123,7 +1123,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1224,7 +1224,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1247,7 +1247,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1839,7 +1839,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1862,7 +1862,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1885,7 +1885,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -1908,7 +1908,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -2107,7 +2107,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -2130,7 +2130,7 @@ (set! (-> a1-3 message) 'query) (set! (-> a1-3 param 0) (the-as uint 'pickup)) (set! (-> a1-3 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3)) + (>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3)) ) ) ) @@ -5120,7 +5120,7 @@ (set! (-> a1-0 message) 'query) (set! (-> a1-0 param 0) (the-as uint 'pickup)) (set! (-> a1-0 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-0)) 20) + (>= (the int (the float (send-event-function *target* a1-0))) 20) ) ) ) @@ -5233,7 +5233,7 @@ (set! (-> a1-0 message) 'query) (set! (-> a1-0 param 0) (the-as uint 'pickup)) (set! (-> a1-0 param 1) (the-as uint 6)) - (>= (the int (send-event-function *target* a1-0)) 72) + (>= (the int (the float (send-event-function *target* a1-0))) 72) ) ) )