mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-11 11:33:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

[jak3] fix some flag names and a wcar crash (#3498)

Browse Source
This commit is contained in:
ManDude
2024-05-01 08:44:26 +01:00
committed by GitHub
parent cbf75a96f7
commit 5705359df9
45 changed files with 646 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak3/all-types.gc
+24 -25
View File
@@ -10786,8 +10786,8 @@
(darkjak-smack 41)
(darkjak-bomb0 42)
(darkjak-bomb1 43)
(feature44 44)
(feature45 45)
(darkjak-tracking 44)
(darkjak-invinc 45)
(lightjak 46)
(lightjak-regen 47)
(lightjak-swoop 48)
@@ -16986,7 +16986,6 @@
)
;; +++game-info-h:continue-flags
;; TODO copied from jak 2
(defenum continue-flags
:type uint32
:bitfield #t
@@ -16996,32 +16995,32 @@
(no-auto 3)
(no-blackout 4)
(game-start 5)
(demo-end 6)
(grab)
(warp-gate 7)
(demo 8)
(intro 9)
(hero-mode 10)
(demo-movie 11)
(darkjak)
(title 12)
(title-movie 13)
(continue-flag-14 14)
(copy-entity-pos 15)
(continue-flag-16 16)
(test 17)
(record-path 18)
(pilot 19)
(pilot-dax 20)
(record-sig 21)
(indax 22)
(cf23 23)
(cf24 24)
(cf25 25)
(cf26 26)
(cf27 27)
(cf28 28)
(cf29 29)
(cf30 30)
(cf31 31)
(test)
(nothing-apparently 17)
(race 18)
(credits)
(indax)
(mech)
(continue-flag-22 22)
(flut 23)
(flut-racer 24)
(vehicle 25)
(vehicle-movie 26)
(indax-hang 27)
(flut-fight 28)
(htorpedo 29)
(vehicle-scorpion 30)
(lightjak 31)
)
;; ---game-info-h:continue-flags
@@ -23226,15 +23225,15 @@
:bitfield #t
:type uint32
(force-on)
(endless-dark)
(active)
(smack)
(bomb0)
(bomb1)
(tracking)
(invinc)
(giant)
(invis)
(no-anim)
(disable-force-on)
(ds8 8)
(ds9 9)
)
;; ---target-h:darkjak-stage
decompiler/config/jak3/ntsc_v1/stack_structures.jsonc
+5 -6
View File
@@ -1113,11 +1113,11 @@
"(method 199 wvehicle)": [[16, "wvehicle-stack-type3"]],
"(method 169 wcar-snake-base)": [[16, "wcar-proj-init-by-other-params"]],
"(method 79 wcar-snake-base)": [
[16, ["inline-array", "quaternion", 2]],
[16, ["inline-array", "quaternion", 3]],
[64, "wcar-stack-type1"]
],
"(method 79 v-turtle)": [
[16, ["inline-array", "quaternion", 2]],
[16, ["inline-array", "quaternion", 3]],
[64, "wvehicle-physics-work"],
[128, "wvehicle-jmod-work"]
],
@@ -1155,7 +1155,7 @@
],
"(method 24 w-parking-spot)": [[16, "cquery-with-5vec"]],
"(method 79 v-scorpion)": [
[32, ["inline-array", "quaternion", 2]],
[32, ["inline-array", "quaternion", 3]],
[16, "vector"],
[80, "wvehicle-physics-work"]
],
@@ -1170,9 +1170,8 @@
"(method 169 v-rhino)": [[16, "wcar-rhino-proj-params"]],
"(method 169 v-mirage)": [[16, "wcar-toad-stack-var0"]],
"(method 79 v-rhino)": [
[16, ["inline-array", "quaternion", 2]],
[48, ["inline-array", "quaternion", 1]],
[64, ["inline-array", "quaternion", 2]]
[16, ["inline-array", "quaternion", 3]],
[64, ["inline-array", "quaternion", 3]]
],
"(method 17 turret-control)": [[16, "turret-control-stack-var0"]],
"(method 9 turret-control)": [
decompiler/level_extractor/extract_level.cpp
+5
View File
@@ -180,6 +180,11 @@ level_tools::BspHeader extract_bsp_from_level(const ObjectFileDB& db,
bsp_header.read_from_file(bsp_file.linked_data, db.dts, &draw_stats, db.version());
ASSERT((int)bsp_header.drawable_tree_array.trees.size() == bsp_header.drawable_tree_array.length);
if (db.version() == GameVersion::Jak1 && dgo_name == "TIT.DGO" && bsp_header.name == "intro") {
// grrr.....
bsp_header.name = "title";
}
/*
level_tools::PrintSettings settings;
settings.expand_collide = true;
game/overlord/jak2/srpc.cpp
+4
View File
@@ -365,6 +365,10 @@ void* RPC_Player(unsigned int /*fno*/, void* data, int size) {
case Jak2SoundCommand::set_fps: {
gFPS = cmd->fps.fps;
} break;
case Jak2SoundCommand::cancel_dgo: {
// temporary. here just so we don't assert.
lg::error("RPC Player dgo cancel command received");
} break;
default:
ASSERT_MSG(false, fmt::format("Unhandled RPC Player command {}", int(cmd->j2command)));
}
goal_src/jak1/engine/level/level.gc
+3
View File
@@ -141,6 +141,9 @@
(else
(load-dbg "bsp relocate: ~A~%" this)
;; everything is okay, link the bsp and level.
;; og:preserve-this fix bad filename.
(when (= (-> s5-0 name) 'title)
(set! (-> this name) 'title))
(set! (-> s5-0 bsp) this)
(set! (-> this level) s5-0)
this
goal_src/jak3/engine/debug/bug-report.gc
+1 -1
View File
@@ -18,7 +18,7 @@
(new 'static 'continue-point
:name "wasall-start"
:level #f
:flags (continue-flags continue-flag-16)
:flags (continue-flags test)
:trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
:camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
:quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
goal_src/jak3/engine/debug/default-menu.gc
+87 -201
View File
@@ -1214,25 +1214,13 @@
(let ((s3-0 (-> (the-as drawable-tree-instance-shrub v1-7) info prototype-inline-array-shrub)))
(dotimes (s2-0 (-> s3-0 length))
(let ((a1-4
(new
'global
'debug-menu-item-flag
(-> s3-0 data s2-0 name)
(the-as int (-> s3-0 data s2-0 name))
dm-instance-pick-func
)
(new 'global 'debug-menu-item-flag (-> s3-0 data s2-0 name) (-> s3-0 data s2-0 name) dm-instance-pick-func)
)
)
(debug-menu-append-item *instance-shrub-menu* a1-4)
)
(let ((a1-6
(new
'debug
'debug-menu-item-flag
(-> s3-0 data s2-0 name)
(the-as int (-> s3-0 data s2-0 name))
dm-enable-instance-func
)
(new 'debug 'debug-menu-item-flag (-> s3-0 data s2-0 name) (-> s3-0 data s2-0 name) dm-enable-instance-func)
)
)
(set! (-> a1-6 is-on) #t)
@@ -1249,7 +1237,7 @@
'debug
'debug-menu-item-flag
(-> s3-1 array-data s2-1 name)
(the-as int (-> s3-1 array-data s2-1 name))
(-> s3-1 array-data s2-1 name)
dm-instance-pick-func
)
)
@@ -1261,7 +1249,7 @@
'debug
'debug-menu-item-flag
(-> s3-1 array-data s2-1 name)
(the-as int (-> s3-1 array-data s2-1 name))
(-> s3-1 array-data s2-1 name)
dm-enable-instance-func
)
)
@@ -1415,61 +1403,61 @@
(let ((a1-3 (new 'debug 'debug-menu-item-submenu "Mode" arg1)))
(debug-menu-append-item arg0 a1-3)
)
(let ((a1-5 (new 'debug 'debug-menu-item-flag "Default" (the-as int #f) dm-cam-mode-default)))
(let ((a1-5 (new 'debug 'debug-menu-item-flag "Default" #f dm-cam-mode-default)))
(debug-menu-append-item arg1 a1-5)
)
(let ((a1-7 (new 'debug 'debug-menu-item-flag "Free-floating" (the-as int cam-free-floating) dm-cam-mode-func)))
(let ((a1-7 (new 'debug 'debug-menu-item-flag "Free-floating" cam-free-floating dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-7)
)
(let ((a1-9 (new 'debug 'debug-menu-item-flag "Fixed" (the-as int cam-fixed) dm-cam-mode-func)))
(let ((a1-9 (new 'debug 'debug-menu-item-flag "Fixed" cam-fixed dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-9)
)
(let ((a1-11 (new 'debug 'debug-menu-item-flag "No Trans" (the-as int cam-no-trans) dm-cam-mode-func)))
(let ((a1-11 (new 'debug 'debug-menu-item-flag "No Trans" cam-no-trans dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-11)
)
(let ((a1-13 (new 'debug 'debug-menu-item-flag "Pov" (the-as int cam-pov) dm-cam-mode-func)))
(let ((a1-13 (new 'debug 'debug-menu-item-flag "Pov" cam-pov dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-13)
)
(let ((a1-15 (new 'debug 'debug-menu-item-flag "Pov180" (the-as int cam-pov180) dm-cam-mode-func)))
(let ((a1-15 (new 'debug 'debug-menu-item-flag "Pov180" cam-pov180 dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-15)
)
(let ((a1-17 (new 'debug 'debug-menu-item-flag "Pov-track" (the-as int cam-pov-track) dm-cam-mode-func)))
(let ((a1-17 (new 'debug 'debug-menu-item-flag "Pov-track" cam-pov-track dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-17)
)
(let ((a1-19 (new 'debug 'debug-menu-item-flag "Decel" (the-as int cam-decel) dm-cam-mode-func)))
(let ((a1-19 (new 'debug 'debug-menu-item-flag "Decel" cam-decel dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-19)
)
(let ((a1-21 (new 'debug 'debug-menu-item-flag "Endless fall" (the-as int cam-endlessfall) dm-cam-mode-func)))
(let ((a1-21 (new 'debug 'debug-menu-item-flag "Endless fall" cam-endlessfall dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-21)
)
(let ((a1-23 (new 'debug 'debug-menu-item-flag "Eye" (the-as int cam-eye) dm-cam-mode-func)))
(let ((a1-23 (new 'debug 'debug-menu-item-flag "Eye" cam-eye dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-23)
)
(let ((a1-25 (new 'debug 'debug-menu-item-flag "Stick" (the-as int cam-stick) dm-cam-mode-func)))
(let ((a1-25 (new 'debug 'debug-menu-item-flag "Stick" cam-stick dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-25)
)
(let ((a1-27 (new 'debug 'debug-menu-item-flag "String" (the-as int cam-string) dm-cam-mode-func)))
(let ((a1-27 (new 'debug 'debug-menu-item-flag "String" cam-string dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-27)
)
(let ((a1-29 (new 'debug 'debug-menu-item-flag "Standoff" (the-as int cam-standoff) dm-cam-mode-func)))
(let ((a1-29 (new 'debug 'debug-menu-item-flag "Standoff" cam-standoff dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-29)
)
(let ((a1-31 (new 'debug 'debug-menu-item-flag "Circular" (the-as int cam-circular) dm-cam-mode-func)))
(let ((a1-31 (new 'debug 'debug-menu-item-flag "Circular" cam-circular dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-31)
)
(let ((a1-33 (new 'debug 'debug-menu-item-flag "Look At" (the-as int cam-lookat) dm-cam-mode-func)))
(let ((a1-33 (new 'debug 'debug-menu-item-flag "Look At" cam-lookat dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-33)
)
(let ((a1-35 (new 'debug 'debug-menu-item-flag "Center of world" (the-as int cam-point-watch) dm-cam-mode-func)))
(let ((a1-35 (new 'debug 'debug-menu-item-flag "Center of world" cam-point-watch dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-35)
)
(let ((a1-37 (new 'debug 'debug-menu-item-flag "Spline" (the-as int cam-spline) dm-cam-mode-func)))
(let ((a1-37 (new 'debug 'debug-menu-item-flag "Spline" cam-spline dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-37)
)
(let ((a1-39 (new 'debug 'debug-menu-item-flag "Tube Sled" (the-as int cam-tube-sled) dm-cam-mode-func)))
(let ((a1-39 (new 'debug 'debug-menu-item-flag "Tube Sled" cam-tube-sled dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-39)
)
(let ((a1-41 (new 'debug 'debug-menu-item-flag "Bike" (the-as int cam-bike) dm-cam-mode-func)))
(let ((a1-41 (new 'debug 'debug-menu-item-flag "Bike" cam-bike dm-cam-mode-func)))
(debug-menu-append-item arg1 a1-41)
)
)
@@ -1485,29 +1473,26 @@
(let ((a1-6 (new 'debug 'debug-menu-item-submenu "External" s3-0)))
(debug-menu-append-item gp-0 a1-6)
)
(let ((a1-8 (new 'debug 'debug-menu-item-flag "CPad 0" (the-as int 'pad-0) dm-cam-externalize)))
(let ((a1-8 (new 'debug 'debug-menu-item-flag "CPad 0" 'pad-0 dm-cam-externalize)))
(debug-menu-append-item s3-0 a1-8)
)
(let ((a1-10 (new 'debug 'debug-menu-item-flag "CPad 1" (the-as int 'pad-1) dm-cam-externalize)))
(let ((a1-10 (new 'debug 'debug-menu-item-flag "CPad 1" 'pad-1 dm-cam-externalize)))
(debug-menu-append-item s3-0 a1-10)
)
(let ((a1-12 (new 'debug 'debug-menu-item-flag "Lock" (the-as int 'locked) dm-cam-externalize)))
(let ((a1-12 (new 'debug 'debug-menu-item-flag "Lock" 'locked dm-cam-externalize)))
(debug-menu-append-item s3-0 a1-12)
)
(let ((a1-14 (new 'debug 'debug-menu-item-flag "Reset" (the-as int 'reset) dm-cam-externalize)))
(let ((a1-14 (new 'debug 'debug-menu-item-flag "Reset" 'reset dm-cam-externalize)))
(debug-menu-append-item s3-0 a1-14)
)
(let ((a1-16 (new 'debug 'debug-menu-item-flag "Allow z rot" (the-as int 'allow-z) dm-cam-externalize)))
(let ((a1-16 (new 'debug 'debug-menu-item-flag "Allow z rot" 'allow-z dm-cam-externalize)))
(debug-menu-append-item s3-0 a1-16)
)
(let ((s2-0 (new 'debug 'debug-menu-item-var "Fov" 0 80)))
(debug-menu-item-var-make-float s2-0 dm-cam-render-float 1.0 #t 15.0 180.0 1)
(debug-menu-append-item s3-0 s2-0)
)
(let ((a1-21
(new 'debug 'debug-menu-item-flag "turbo free" (the-as int '*camera-turbo-free*) dm-boolean-toggle-pick-func)
)
)
(let ((a1-21 (new 'debug 'debug-menu-item-flag "turbo free" '*camera-turbo-free* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s3-0 a1-21)
)
)
@@ -1515,25 +1500,13 @@
(let ((a1-24 (new 'debug 'debug-menu-item-submenu "Collision" s3-1)))
(debug-menu-append-item gp-0 a1-24)
)
(let ((a1-26 (new
'debug
'debug-menu-item-flag
"Record"
(the-as int '*record-cam-collide-history*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-26 (new 'debug 'debug-menu-item-flag "Record" '*record-cam-collide-history* dm-boolean-toggle-pick-func))
)
(debug-menu-append-item s3-1 a1-26)
)
(let ((a1-28 (new
'debug
'debug-menu-item-flag
"Display"
(the-as int '*display-cam-collide-history*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-28
(new 'debug 'debug-menu-item-flag "Display" '*display-cam-collide-history* dm-boolean-toggle-pick-func)
)
)
(debug-menu-append-item s3-1 a1-28)
)
@@ -1542,13 +1515,10 @@
(let ((a1-31 (new 'debug 'debug-menu-item-submenu "Settings" s4-1)))
(debug-menu-append-item gp-0 a1-31)
)
(let ((a1-33 (new 'debug 'debug-menu-item-flag "Default" (the-as int #f) dm-cam-settings-default)))
(let ((a1-33 (new 'debug 'debug-menu-item-flag "Default" #f dm-cam-settings-default)))
(debug-menu-append-item s4-1 a1-33)
)
(let ((a1-35
(new 'debug 'debug-menu-item-flag "turbo free" (the-as int '*camera-turbo-free*) dm-boolean-toggle-pick-func)
)
)
(let ((a1-35 (new 'debug 'debug-menu-item-flag "turbo free" '*camera-turbo-free* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s4-1 a1-35)
)
(let ((s3-2 (new 'debug 'debug-menu-item-var "Fov" (the-as int 'fov) 80)))
@@ -1604,127 +1574,66 @@
'debug
'debug-menu-item-flag
"no mip/lod correction"
(the-as int '*camera-no-mip-correction*)
'*camera-no-mip-correction*
dm-boolean-toggle-pick-func
)
)
)
(debug-menu-append-item s4-1 a1-65)
)
(let ((a1-67 (new
'debug
'debug-menu-item-flag
"last attacker"
(the-as int '*display-camera-last-attacker*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-67
(new 'debug 'debug-menu-item-flag "last attacker" '*display-camera-last-attacker* dm-boolean-toggle-pick-func)
)
)
(debug-menu-append-item s4-1 a1-67)
)
(let ((a1-69 (new
'debug
'debug-menu-item-flag
"old stats"
(the-as int '*display-camera-old-stats*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-69 (new 'debug 'debug-menu-item-flag "old stats" '*display-camera-old-stats* dm-boolean-toggle-pick-func))
)
(debug-menu-append-item s4-1 a1-69)
)
(let ((a1-71 (new 'debug 'debug-menu-item-flag "Amy cam" (the-as int '*amy-cam*) dm-boolean-toggle-pick-func)))
(let ((a1-71 (new 'debug 'debug-menu-item-flag "Amy cam" '*amy-cam* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s4-1 a1-71)
)
(let ((a1-73
(new 'debug 'debug-menu-item-flag "xyz axes" (the-as int '*display-xyz-axes*) dm-boolean-toggle-pick-func)
)
)
(let ((a1-73 (new 'debug 'debug-menu-item-flag "xyz axes" '*display-xyz-axes* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s4-1 a1-73)
)
(let ((a1-75 (new
'debug
'debug-menu-item-flag
"Master Marks"
(the-as int '*display-cam-master-marks*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-75
(new 'debug 'debug-menu-item-flag "Master Marks" '*display-cam-master-marks* dm-boolean-toggle-pick-func)
)
)
(debug-menu-append-item s4-1 a1-75)
)
(let ((a1-77
(new 'debug 'debug-menu-item-flag "Other Marks" (the-as int '*display-cam-other*) dm-boolean-toggle-pick-func)
)
)
(let ((a1-77 (new 'debug 'debug-menu-item-flag "Other Marks" '*display-cam-other* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s4-1 a1-77)
)
(let ((a1-79 (new
'debug
'debug-menu-item-flag
"los debug"
(the-as int '*display-cam-los-debug*)
dm-boolean-toggle-pick-func
)
)
)
(let ((a1-79 (new 'debug 'debug-menu-item-flag "los debug" '*display-cam-los-debug* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s4-1 a1-79)
)
(let ((a1-81
(new 'debug 'debug-menu-item-flag "los info" (the-as int '*display-cam-los-info*) dm-boolean-toggle-pick-func)
)
)
(let ((a1-81 (new 'debug 'debug-menu-item-flag "los info" '*display-cam-los-info* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s4-1 a1-81)
)
(let ((a1-83 (new
'debug
'debug-menu-item-flag
"los Marks"
(the-as int '*display-cam-los-marks*)
dm-boolean-toggle-pick-func
)
)
)
(let ((a1-83 (new 'debug 'debug-menu-item-flag "los Marks" '*display-cam-los-marks* dm-boolean-toggle-pick-func)))
(debug-menu-append-item s4-1 a1-83)
)
(let ((a1-85 (new
'debug
'debug-menu-item-flag
"coll Marks"
(the-as int '*display-cam-coll-marks*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-85 (new 'debug 'debug-menu-item-flag "coll Marks" '*display-cam-coll-marks* dm-boolean-toggle-pick-func))
)
(debug-menu-append-item s4-1 a1-85)
)
(let ((a1-87 (new
'debug
'debug-menu-item-flag
"Camera Marks"
(the-as int '*display-camera-marks*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-87 (new 'debug 'debug-menu-item-flag "Camera Marks" '*display-camera-marks* dm-boolean-toggle-pick-func))
)
(debug-menu-append-item s4-1 a1-87)
)
)
(let ((a1-89 (new
'debug
'debug-menu-item-flag
"Edit"
(the-as int '*cam-layout*)
(lambda ((arg0 symbol) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if (-> arg0 value)
(cam-layout-stop)
(cam-layout-start)
)
)
(-> arg0 value)
)
)
(let ((a1-89 (new 'debug 'debug-menu-item-flag "Edit" '*cam-layout* (lambda ((arg0 symbol) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if (-> arg0 value)
(cam-layout-stop)
(cam-layout-start)
)
)
(-> arg0 value)
)
)
)
)
(debug-menu-append-item gp-0 a1-89)
@@ -1733,7 +1642,7 @@
'debug
'debug-menu-item-function
"Save Pos"
(the-as int #f)
#f
(the-as (function object object) debug-create-cam-restore)
)
)
@@ -1754,14 +1663,7 @@
(debug-menu-append-item gp-0 a1-4)
)
)
(let ((a1-6 (new
'debug
'debug-menu-item-function
"Refresh"
(the-as int #f)
(the-as (function object object) build-shader-list)
)
)
(let ((a1-6 (new 'debug 'debug-menu-item-function "Refresh" #f (the-as (function object object) build-shader-list)))
)
(debug-menu-append-item gp-0 a1-6)
)
@@ -1816,7 +1718,7 @@
'debug
'debug-menu-item-function
"all tweak+"
(the-as int #f)
#f
(the-as (function object object) (lambda () (all-texture-tweak-adjust *texture-page-dir* 0.1)))
)
)
@@ -1827,7 +1729,7 @@
'debug
'debug-menu-item-function
"all tweak-"
(the-as int #f)
#f
(the-as (function object object) (lambda () (all-texture-tweak-adjust *texture-page-dir* -0.1)))
)
)
@@ -2675,17 +2577,12 @@
(debug-menu-append-item gp-0 a1-7)
)
)
(let ((a1-9 (new 'debug 'debug-menu-item-function "Refresh" (the-as int #f) build-instance-list)))
(let ((a1-9 (new 'debug 'debug-menu-item-function "Refresh" #f build-instance-list)))
(debug-menu-append-item gp-0 a1-9)
)
(let ((a1-11 (new
'debug
'debug-menu-item-function
"Print Info"
(the-as int #f)
(the-as (function object object) print-prototype-list)
)
)
(let ((a1-11
(new 'debug 'debug-menu-item-function "Print Info" #f (the-as (function object object) print-prototype-list))
)
)
(debug-menu-append-item gp-0 a1-11)
)
@@ -2796,14 +2693,9 @@
(debug-menu-append-item gp-0 a1-31)
)
)
(let ((a1-33 (new
'debug
'debug-menu-item-flag
"Instance Info"
(the-as int '*display-instance-info*)
dm-boolean-toggle-pick-func
)
)
(let ((a1-33
(new 'debug 'debug-menu-item-flag "Instance Info" '*display-instance-info* dm-boolean-toggle-pick-func)
)
)
(debug-menu-append-item gp-0 a1-33)
)
@@ -2857,7 +2749,7 @@
(a0-5 arg1)
)
(when (if (= a0-5 'test)
(logtest? (continue-flags continue-flag-16) (-> (the-as continue-point v1-2) flags))
(logtest? (continue-flags test) (-> (the-as continue-point v1-2) flags))
#t
)
(let ((s2-0 (method-of-type pair new))
@@ -4413,7 +4305,7 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
(function
@@ -4504,7 +4396,7 @@
(set! (-> *game-info* features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* features)
)
)
@@ -4512,7 +4404,7 @@
(set! (-> *game-info* debug-features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* debug-features)
)
)
@@ -4527,7 +4419,7 @@
(set! (-> *game-info* features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* features)
)
)
@@ -4535,13 +4427,13 @@
(set! (-> *game-info* debug-features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* debug-features)
)
)
)
(send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage active bomb0 no-anim disable-force-on))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage endless-dark active tracking invinc))
)
)
(function
@@ -4557,7 +4449,7 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
(function
@@ -4573,14 +4465,14 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage active))
)
)
(function "smack" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack))
)
)
(function
@@ -4590,7 +4482,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0))
)
)
(function
@@ -4600,7 +4492,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1))
)
)
(function
@@ -4610,7 +4502,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant no-anim))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1 tracking))
)
)
(function
@@ -4620,13 +4512,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event
*target*
'change-mode
'darkjak
#f
(darkjak-stage force-on bomb0 invinc giant no-anim disable-force-on)
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active bomb0 bomb1 tracking invinc))
)
)
)
@@ -7014,7 +6900,7 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
(function
goal_src/jak3/engine/game/game-info-h.gc
+18 -19
View File
@@ -121,7 +121,6 @@
;; +++continue-flags
;; TODO copied from jak 2
(defenum continue-flags
:type uint32
:bitfield #t
@@ -131,32 +130,32 @@
(no-auto 3)
(no-blackout 4)
(game-start 5)
(demo-end 6)
(grab)
(warp-gate 7)
(demo 8)
(intro 9)
(hero-mode 10)
(demo-movie 11)
(darkjak)
(title 12)
(title-movie 13)
(continue-flag-14 14)
(copy-entity-pos 15)
(continue-flag-16 16)
(test 17)
(record-path 18)
(pilot 19)
(pilot-dax 20)
(record-sig 21)
(indax 22)
(cf23 23)
(cf24 24)
(cf25 25)
(cf26 26)
(cf27 27)
(cf28 28)
(cf29 29)
(cf30 30)
(cf31 31)
(test)
(nothing-apparently 17)
(race 18)
(credits)
(indax)
(mech)
(continue-flag-22 22)
(flut 23)
(flut-racer 24)
(vehicle 25)
(vehicle-movie 26)
(indax-hang 27)
(flut-fight 28)
(htorpedo 29)
(vehicle-scorpion 30)
(lightjak 31)
)
;; ---continue-flags
goal_src/jak3/engine/game/game-info.gc
+2 -2
View File
@@ -2154,8 +2154,8 @@
darkjak-smack
darkjak-bomb0
darkjak-bomb1
feature44
feature45
darkjak-tracking
darkjak-invinc
lightjak
lightjak-regen
lightjak-swoop
goal_src/jak3/engine/game/main.gc
+21 -21
View File
@@ -671,8 +671,8 @@
(logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons r1))
(set! *cheat-mode* (not *cheat-mode*))
(if *cheat-mode*
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
(set! (-> *cheat-temp* 0) 0)
0
@@ -844,8 +844,8 @@
)
)
(if (= *cheat-mode* 'debug)
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
(set! (-> *cheat-temp* 1) 0)
0
@@ -956,8 +956,8 @@
)
)
(if *progress-cheat*
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
(set! (-> *cheat-temp* 2) 0)
0
@@ -1063,8 +1063,8 @@
)
)
(if *progress-cheat*
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
(set! (-> *cheat-temp* 3) 0)
0
@@ -1174,11 +1174,11 @@
(external-cam-reset!)
)
(set! *external-cam-mode* 'pad-1)
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
(else
(set! *external-cam-mode* #f)
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
)
(set! (-> *cheat-temp* 5) 0)
@@ -1232,8 +1232,8 @@
darkjak-smack
darkjak-bomb0
darkjak-bomb1
feature44
feature45
darkjak-tracking
darkjak-invinc
lightjak
lightjak-regen
lightjak-swoop
@@ -1252,34 +1252,34 @@
)
)
)
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
((and (cpad-pressed? 1 triangle) (!= *cheat-mode* 'debug))
(send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0)
(send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0)
(send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0)
(send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0)
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
((cpad-pressed? 1 square)
(set! (-> *level* disk-load-timing?) (not (-> *level* disk-load-timing?)))
(if (-> *level* disk-load-timing?)
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
)
((cpad-pressed? 1 r1)
(set! *display-scene-control* (logxor *display-scene-control* (scene-controls bounds-spheres)))
(if (logtest? *display-scene-control* (scene-controls bounds-spheres))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
)
((cpad-pressed? 1 circle)
(set! *display-bug-report* (not *display-bug-report*))
(if *display-bug-report*
(sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
(sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
)
)
)
@@ -1657,7 +1657,7 @@
(let ((gp-1 *display*))
;; initial setup
(set! *teleport* #t)
(update *setting-control*) ;; dies on camera stuff, which looks for entities.
(update *setting-control*)
(init-time-of-day-context *time-of-day-context*)
(display-sync gp-1)
(display-frame-finish gp-1)
goal_src/jak3/engine/game/settings-h.gc
+2 -2
View File
@@ -108,8 +108,8 @@
(darkjak-smack 41)
(darkjak-bomb0 42)
(darkjak-bomb1 43)
(feature44 44)
(feature45 45)
(darkjak-tracking 44)
(darkjak-invinc 45)
(lightjak 46)
(lightjak-regen 47)
(lightjak-swoop 48)
goal_src/jak3/engine/game/task/task-control.gc
+4 -4
View File
@@ -320,7 +320,7 @@
)
(if (logtest? (game-secrets darkjak-tracking) (-> *game-info* secrets))
(set! (-> *game-info* features)
(the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
(the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
)
)
(logior! (-> *game-info* features) (-> *game-info* debug-features))
@@ -784,7 +784,7 @@
((= (status-of-level-and-borrows *level* 'wasall #f) 'active)
(set! gp-1 "wasdoors-desert")
(if (and (-> *game-info* current-continue)
(logtest? (continue-flags record-path) (-> *game-info* current-continue flags))
(logtest? (continue-flags race) (-> *game-info* current-continue flags))
)
(set! gp-1 (-> *game-info* current-continue name))
)
@@ -1357,12 +1357,12 @@
)
(((game-task-node-command add-darkjak-tracking))
(set! (-> *game-info* features)
(the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
(the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
)
)
(((game-task-node-command add-darkjak-invinc))
(set! (-> *game-info* features)
(the-as game-feature (logior (game-feature feature45) (-> *game-info* features)))
(the-as game-feature (logior (game-feature darkjak-invinc) (-> *game-info* features)))
)
)
(((game-task-node-command add-lighteco))
goal_src/jak3/engine/level/level-info.gc
+156 -156
View File
File diff suppressed because it is too large Load Diff
goal_src/jak3/engine/target/target-darkjak.gc
+18 -18
View File
@@ -784,7 +784,7 @@
)
)
)
(or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(not (-> *setting-control* user-current darkjak))
(not (logtest? (the-as game-feature (logand (game-feature darkjak) (-> *setting-control* user-current features)))
(-> self game features)
@@ -971,21 +971,21 @@
(target-lightjak-end-mode #t)
(set! (-> self darkjak latch-out-time) 0)
(set! (-> self lightjak get-off-lock) #f)
(set! (-> self darkjak stage) (logior arg0 (darkjak-stage bomb0)))
(set! (-> self darkjak stage) (logior arg0 (darkjak-stage active)))
(if (logtest? (game-feature darkjak-bomb0) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage invinc))
(logior! (-> self darkjak stage) (darkjak-stage bomb0))
)
(if (logtest? (game-feature darkjak-bomb1) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage giant))
(logior! (-> self darkjak stage) (darkjak-stage bomb1))
)
(if (logtest? (game-feature feature45) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage disable-force-on))
(if (logtest? (game-feature darkjak-invinc) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage invinc))
)
(if (logtest? (game-feature feature44) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage no-anim))
(if (logtest? (game-feature darkjak-tracking) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage tracking))
)
(if (logtest? (game-feature darkjak-smack) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage bomb1))
(logior! (-> self darkjak stage) (darkjak-stage smack))
)
(set! (-> self darkjak want-stage) (-> self darkjak stage))
(set! (-> self neck flex-blend) 0.0)
@@ -1000,20 +1000,20 @@
(set! (-> self darkjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modedark 0.0 0))
(set! (-> self darkjak lightning-count) 0)
(cond
((logtest? (-> self darkjak stage) (darkjak-stage ds8))
((logtest? (-> self darkjak stage) (darkjak-stage invis))
(logclear! (-> self target-flags) (target-flags tf4))
(logclear! (-> self darkjak stage) (darkjak-stage bomb1 invinc giant no-anim disable-force-on))
(logclear! (-> self darkjak stage) (darkjak-stage smack bomb0 bomb1 tracking invinc))
(target-invisible-start (-> *TARGET-bank* invisible-duration))
(set! (-> self fact darkjak-effect-time) (-> *TARGET-bank* invisible-duration))
)
((logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
((logtest? (-> self darkjak stage) (darkjak-stage invinc))
(logior! (-> self target-flags) (target-flags tf4))
)
(else
(logclear! (-> self target-flags) (target-flags tf4))
)
)
(if (logtest? arg0 (darkjak-stage ds9))
(if (logtest? arg0 (darkjak-stage no-anim))
(go target-stance)
)
(target-start-attack)
@@ -1244,7 +1244,7 @@
)
(target-start-attack)
(target-danger-set! 'punch #f)
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
)
(let ((a0-11 (-> self control impact-ctrl))
@@ -1279,7 +1279,7 @@
(not (logtest? (-> self control current-surface flags) (surface-flag no-attack)))
(and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
(logtest? (-> self darkjak stage) (darkjak-stage active))
)
(< sv-32 2)
)
@@ -1298,7 +1298,7 @@
((arg0 (pointer float)) (arg1 (pointer int64)) (arg2 (pointer int64)))
(let ((s3-0 (if (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage no-anim))
(logtest? (-> self darkjak stage) (darkjak-stage tracking))
)
(combo-tracker-method-13
(-> self control unknown-combo-tracker00)
@@ -1324,7 +1324,7 @@
)
(target-start-attack)
(target-danger-set! 'punch #f)
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
)
(let ((v1-34 (ja-group)))
@@ -1696,7 +1696,7 @@
:code (behavior ()
(target-start-attack)
(target-danger-set! 'dark-smack #f)
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-smack-inc)))
)
(set! (-> self control lightjak-sound-id) (sound-play "djak-pnch-swing"))
goal_src/jak3/engine/target/target-death.gc
+21 -24
View File
@@ -20,7 +20,7 @@
(a3-0 (car a2-2))
)
(while (not (null? a2-2))
(if (and v1-0 (logtest? (continue-flags continue-flag-16) (-> (the-as continue-point a3-0) flags)))
(if (and v1-0 (logtest? (continue-flags test) (-> (the-as continue-point a3-0) flags)))
(return (the-as continue-point a3-0))
)
(if (= a3-0 arg0)
@@ -41,12 +41,9 @@
(defbehavior arrive-at-continue target ((arg0 continue-point))
(cond
((logtest? (-> arg0 flags) (continue-flags title))
enter-state
#t
(go target-title #t)
)
((logtest? (-> arg0 flags) (continue-flags title-movie))
enter-state
(go target-title #f)
)
((logtest? (-> arg0 flags) (continue-flags intro))
@@ -75,23 +72,23 @@
)
)
)
((logtest? (continue-flags pilot-dax) (-> arg0 flags))
(go target-indax-start (the-as handle #f) (if (logtest? (continue-flags cf27) (-> arg0 flags))
((logtest? (continue-flags indax) (-> arg0 flags))
(go target-indax-start (the-as handle #f) (if (logtest? (continue-flags indax-hang) (-> arg0 flags))
'hang
#t
)
)
)
((logtest? (continue-flags cf23) (-> arg0 flags))
((logtest? (continue-flags flut) (-> arg0 flags))
(go target-flut-start (the-as handle #f) 'normal -1)
)
((logtest? (continue-flags cf24) (-> arg0 flags))
((logtest? (continue-flags flut-racer) (-> arg0 flags))
(go target-flut-start (the-as handle #f) 'racer -1)
)
((logtest? (continue-flags cf28) (-> arg0 flags))
((logtest? (continue-flags flut-fight) (-> arg0 flags))
(go target-flut-start (the-as handle #f) 'fight -1)
)
((logtest? (continue-flags cf31) (-> arg0 flags))
((logtest? (continue-flags lightjak) (-> arg0 flags))
(send-event self 'get-pickup (pickup-type eco-pill-light) 100.0)
(case (-> arg0 vehicle-type)
((38)
@@ -102,11 +99,11 @@
)
)
)
((logtest? (-> arg0 flags) (continue-flags demo-movie))
((logtest? (-> arg0 flags) (continue-flags darkjak))
(send-event self 'get-pickup (pickup-type eco-pill-dark) 100.0)
(go target-darkjak-get-on (darkjak-stage force-on bomb0 ds9))
(go target-darkjak-get-on (darkjak-stage force-on active no-anim))
)
((logtest? (continue-flags cf25) (-> arg0 flags))
((logtest? (continue-flags vehicle) (-> arg0 flags))
(label cfg-39)
(let* ((v1-77 (-> arg0 vehicle-type))
(s5-2
@@ -138,7 +135,7 @@
(send-event (handle->process s5-2) 'pickup)
)
)
((logtest? (continue-flags cf30) (-> arg0 flags))
((logtest? (continue-flags vehicle-scorpion) (-> arg0 flags))
(label cfg-84)
(let ((gp-1 (process->handle
(search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 scorpion-gun-manager)))
@@ -157,7 +154,7 @@
)
)
)
((logtest? (continue-flags cf29) (-> arg0 flags))
((logtest? (continue-flags htorpedo) (-> arg0 flags))
(label cfg-114)
(let ((gp-2 (process->handle (search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 htorpedo))))))
(when (not (handle->process gp-2))
@@ -169,12 +166,12 @@
(send-event self 'change-mode 'pilot-daxter (handle->process gp-2))
)
)
((logtest? (continue-flags record-sig) (-> arg0 flags))
((logtest? (continue-flags mech) (-> arg0 flags))
(go target-mech-start (the-as handle #f) 100.0 #t)
)
((logtest? (continue-flags test) (-> arg0 flags))
((logtest? (continue-flags nothing-apparently) (-> arg0 flags))
)
((logtest? (continue-flags pilot) (-> arg0 flags))
((logtest? (continue-flags credits) (-> arg0 flags))
(case (-> arg0 vehicle-type)
((41)
(go target-credits 1)
@@ -190,7 +187,7 @@
)
)
)
((and (logtest? (continue-flags record-path) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
((and (logtest? (continue-flags race) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
(set! (-> self mode-cache) (the-as basic 'pilot))
(set! (-> self mode-param1) (the-as handle #f))
(set! (-> self mode-param2) (-> arg0 vehicle-type))
@@ -219,7 +216,7 @@
)
(set! (-> self mode-param3) (the-as uint #t))
)
((logtest? (-> arg0 flags) (continue-flags demo-end))
((logtest? (-> arg0 flags) (continue-flags grab))
(go target-grab 'stance)
)
(else
@@ -576,7 +573,7 @@
(kill-persister *setting-control* (the-as engine-pers 'fail-dialog-volume) 'dialog-volume)
(kill-persister *setting-control* (the-as engine-pers 'fail-music-volume) 'music-volume)
(when (-> *setting-control* user-current render)
(when (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
(when (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
(add-setting! 'bg-a 'abs 1.0 0)
(set! (-> *setting-control* user-current bg-a) 1.0)
)
@@ -594,7 +591,7 @@
(set-setting! 'allow-progress #f 0.0 0)
(set-setting! 'level-trans-time #f 0.0 0)
(kill-persister *setting-control* (the-as engine-pers 'speech-control) 'speech-control)
(when (logtest? (continue-flags cf27) (-> arg0 flags))
(when (logtest? (continue-flags indax-hang) (-> arg0 flags))
(set-setting! 'head-offset 'abs (meters 1) 0)
(set-setting! 'foot-offset 'abs (meters -1) 0)
(set-setting! 'target-height 'abs (meters 1.5) 0)
@@ -710,7 +707,7 @@
(suspend)
0
)
(when (logtest? (continue-flags pilot-dax) (-> arg0 flags))
(when (logtest? (continue-flags indax) (-> arg0 flags))
(while (!= (-> self ext-anim) (-> self pending-ext-anim))
(suspend)
)
@@ -772,7 +769,7 @@
(set! *spawn-actors* #t)
(set! *teleport* #t)
(set! (-> *ACTOR-bank* birth-max) 1000)
(if (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
(if (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
(set-blackout-frames (seconds 0.1))
)
(let* ((a0-128 *game-info*)
goal_src/jak3/engine/target/target-h.gc
+4 -4
View File
@@ -50,15 +50,15 @@
:bitfield #t
:type uint32
(force-on)
(endless-dark)
(active)
(smack)
(bomb0)
(bomb1)
(tracking)
(invinc)
(giant)
(invis)
(no-anim)
(disable-force-on)
(ds8 8)
(ds9 9)
)
;; ---darkjak-stage
goal_src/jak3/engine/target/target-handler.gc
+1 -1
View File
@@ -1037,7 +1037,7 @@
((and (and (focus-test? self dark) (nonzero? (-> self darkjak)))
(or (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
(logtest? (-> self darkjak stage) (darkjak-stage invinc))
)
(logtest? (process-mask crate) (-> arg0 mask))
)
goal_src/jak3/engine/target/target-lightjak.gc
+1 -1
View File
@@ -878,7 +878,7 @@
(set! (-> self lightjak lightjak-before-powerjak) (the-as symbol (-> self control unknown-spool-anim00)))
(case (-> self lightjak get-on-latch)
((512)
(go target-darkjak-get-on (darkjak-stage bomb0))
(go target-darkjak-get-on (darkjak-stage active))
)
((8)
(if (and (focus-test? self light) (nonzero? (-> self lightjak)))
goal_src/jak3/engine/target/target-util.gc
+1 -1
View File
@@ -636,7 +636,7 @@
(set! (-> self control penetrate-using) (penetrate touch punch))
(if (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
(logtest? (-> self darkjak stage) (darkjak-stage active))
)
(logior! (-> self control penetrate-using) (penetrate dark-punch))
)
goal_src/jak3/engine/target/target.gc
+12 -12
View File
@@ -116,7 +116,7 @@
(>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
)
(target-invisible-start (seconds 30))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
)
)
@@ -258,7 +258,7 @@
(>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
)
(target-invisible-start (seconds 30))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
)
)
@@ -2030,7 +2030,7 @@
(>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
)
(target-invisible-start (seconds 30))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
)
)
@@ -2195,7 +2195,7 @@
(target-start-attack)
(target-danger-set! 'spin #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -2227,7 +2227,7 @@
(let ((s5-0 jakb-attack-from-stance-ja)
(gp-0 (if (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage no-anim))
(logtest? (-> self darkjak stage) (darkjak-stage tracking))
)
(combo-tracker-method-13
(-> self control unknown-combo-tracker00)
@@ -2717,7 +2717,7 @@
(target-start-attack)
(target-danger-set! 'punch #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
@@ -2974,7 +2974,7 @@
(target-start-attack)
(target-danger-set! 'spin-air #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -3169,7 +3169,7 @@
(target-start-attack)
(target-danger-set! 'uppercut #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-uppercut-inc)))
@@ -3254,7 +3254,7 @@
)
((and (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage giant))
(logtest? (-> self darkjak stage) (darkjak-stage bomb1))
)
(and (= (-> self ext-anim) (target-anim dark))
(logtest? (the-as game-feature (logand (game-feature darkjak-bomb1) (-> *setting-control* user-current features)))
@@ -3507,7 +3507,7 @@
)
((and (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage invinc))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
)
(and (= (-> self ext-anim) (target-anim dark))
(logtest? (the-as game-feature (logand (game-feature darkjak-bomb0) (-> *setting-control* user-current features)))
@@ -3586,7 +3586,7 @@
(when (or (and (= (-> self fact eco-type) 2) (>= (-> self fact eco-level) 1.0))
(and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
(logtest? (-> self darkjak stage) (darkjak-stage active))
)
)
(cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5))
@@ -3637,7 +3637,7 @@
(target-start-attack)
(target-danger-set! 'flop #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-flop-inc)))
goal_src/jak3/levels/common/race/race-manager.gc
+1 -1
View File
@@ -1030,7 +1030,7 @@
(s5-0 (-> gp-0 info))
)
(if (or (logtest? (-> s5-0 flags) (racer-info-flag rif0))
(logtest? (continue-flags record-path) (-> *game-info* last-continue flags))
(logtest? (continue-flags race) (-> *game-info* last-continue flags))
)
(logior! (-> gp-0 flags) (race-flag rf2))
)
goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc
+2 -2
View File
@@ -186,14 +186,14 @@
(defmethod vehicle-method-79 ((this v-rhino))
(set! (-> this turbo-supply) 3.0)
(seek! (-> this gun-kick) 0.0 (* 32768.0 (seconds-per-frame)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set! (-> this jmod-gun-kick transform trans z) (-> this gun-kick))
(quaternion-axis-angle! (-> s5-0 1) 1.0 0.0 0.0 (- (-> this gun-pitch)))
(quaternion-axis-angle! (-> s5-0 2) 0.0 1.0 0.0 (-> this gun-yaw))
(quaternion*! (-> this jmod-gun-turn rotation) (-> s5-0 2) (-> s5-0 1))
)
0
(let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-1 2) 0.0 0.0 0.0 0.0)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((v1-8 (-> this wheel s4-0)))
goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc
+1 -1
View File
@@ -224,7 +224,7 @@
(quaternion-axis-angle! (-> this jmod-gun-tilt transform quat) 1.0 0.0 0.0 (-> this gun-pitch))
(quaternion-axis-angle! (-> this jmod-gun-turn rotation) 0.0 1.0 0.0 (+ 32768.0 (-> this gun-yaw)))
0
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-0 2) -1638.4 -1638.4 1638.4 1638.4)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((v1-9 (-> this wheel s4-0)))
goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc
+1 -1
View File
@@ -120,7 +120,7 @@
)
(init-vf0-vector)
(set-vector! (-> this root scale) 1.0 1.0 1.07 1.0)
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-0 2) -3640.889 3640.889 3640.889 -3640.889)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((v1-6 (-> this wheel s4-0)))
goal_src/jak3/levels/desert/wvehicle/wcar.gc
+1 -1
View File
@@ -4040,7 +4040,7 @@
)
(defmethod vehicle-method-79 ((this wcar-snake-base))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-0 2) 1092.2667 1092.2667 0.0 0.0)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((s3-0 (-> this wheel s4-0)))
goal_src/jak3/levels/mhcity/destroy-dark-eco.gc
+2 -2
View File
@@ -248,7 +248,7 @@
(task-node-close! (game-task-node city-destroy-darkeco-dark-punch) 'event)
(set-setting! 'airlock #f 0.0 0)
(suspend)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 ds9))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active no-anim))
)
)
@@ -1213,7 +1213,7 @@
*target*
(not (logtest? (focus-status dark) (-> *target* focus-status)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
(let ((t9-3 (-> (find-parent-state) trans)))
(if t9-3
goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc
+3 -3
View File
@@ -2391,7 +2391,7 @@
(persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
(persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
(when (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
(send-event (ppointer->process *crowd-manager*) 'darkjak)
)
)
@@ -2446,7 +2446,7 @@
(persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
(persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
(if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
(suspend)
)
@@ -2521,7 +2521,7 @@
(persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
(persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
(if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
)
test/decompiler/reference/jak3/engine/debug/default-menu_REF.gc
Generated Vendored
+15 -21
View File
@@ -2849,7 +2849,7 @@
(a0-5 arg1)
)
(when (if (= a0-5 'test)
(logtest? (continue-flags continue-flag-16) (-> (the-as continue-point v1-2) flags))
(logtest? (continue-flags test) (-> (the-as continue-point v1-2) flags))
#t
)
(let ((s2-0 (method-of-type pair new))
@@ -4420,7 +4420,7 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
(function
@@ -4511,7 +4511,7 @@
(set! (-> *game-info* features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* features)
)
)
@@ -4519,7 +4519,7 @@
(set! (-> *game-info* debug-features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* debug-features)
)
)
@@ -4534,7 +4534,7 @@
(set! (-> *game-info* features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* features)
)
)
@@ -4542,13 +4542,13 @@
(set! (-> *game-info* debug-features)
(the-as
game-feature
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
(logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
(-> *game-info* debug-features)
)
)
)
(send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage active bomb0 no-anim disable-force-on))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage endless-dark active tracking invinc))
)
)
(function
@@ -4564,7 +4564,7 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
(function
@@ -4580,14 +4580,14 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage active))
)
)
(function "smack" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack))
)
)
(function
@@ -4597,7 +4597,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0))
)
)
(function
@@ -4607,7 +4607,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1))
)
)
(function
@@ -4617,7 +4617,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant no-anim))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1 tracking))
)
)
(function
@@ -4627,13 +4627,7 @@
(if (not *target*)
(start 'debug (get-current-continue-forced *game-info*))
)
(send-event
*target*
'change-mode
'darkjak
#f
(darkjak-stage force-on bomb0 invinc giant no-anim disable-force-on)
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active bomb0 bomb1 tracking invinc))
)
)
)
@@ -7023,7 +7017,7 @@
(set! (-> *game-info* debug-features)
(the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
(function
test/decompiler/reference/jak3/engine/game/game-info_REF.gc
Generated Vendored
+2 -2
View File
@@ -2183,8 +2183,8 @@
darkjak-smack
darkjak-bomb0
darkjak-bomb1
feature44
feature45
darkjak-tracking
darkjak-invinc
lightjak
lightjak-regen
lightjak-swoop
test/decompiler/reference/jak3/engine/game/main_REF.gc
Generated Vendored
+2 -2
View File
@@ -1232,8 +1232,8 @@
darkjak-smack
darkjak-bomb0
darkjak-bomb1
feature44
feature45
darkjak-tracking
darkjak-invinc
lightjak
lightjak-regen
lightjak-swoop
test/decompiler/reference/jak3/engine/game/task/task-control_REF.gc
Generated Vendored
+4 -8
View File
@@ -334,7 +334,7 @@
)
(if (logtest? (game-secrets darkjak-tracking) (-> *game-info* secrets))
(set! (-> *game-info* features)
(the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
(the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
)
)
(logior! (-> *game-info* features) (-> *game-info* debug-features))
@@ -804,7 +804,7 @@
((= (status-of-level-and-borrows *level* 'wasall #f) 'active)
(set! gp-1 "wasdoors-desert")
(if (and (-> *game-info* current-continue)
(logtest? (continue-flags record-path) (-> *game-info* current-continue flags))
(logtest? (continue-flags race) (-> *game-info* current-continue flags))
)
(set! gp-1 (-> *game-info* current-continue name))
)
@@ -1395,12 +1395,12 @@
)
(((game-task-node-command add-darkjak-tracking))
(set! (-> *game-info* features)
(the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
(the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
)
)
(((game-task-node-command add-darkjak-invinc))
(set! (-> *game-info* features)
(the-as game-feature (logior (game-feature feature45) (-> *game-info* features)))
(the-as game-feature (logior (game-feature darkjak-invinc) (-> *game-info* features)))
)
)
(((game-task-node-command add-lighteco))
@@ -3484,7 +3484,3 @@
)
)
)
test/decompiler/reference/jak3/engine/level/level-info_REF.gc
Generated Vendored
+156 -156
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc
Generated Vendored
+18 -18
View File
@@ -860,7 +860,7 @@
)
)
)
(or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(not (-> *setting-control* user-current darkjak))
(not (logtest? (the-as game-feature (logand (game-feature darkjak) (-> *setting-control* user-current features)))
(-> self game features)
@@ -1048,21 +1048,21 @@
(target-lightjak-end-mode #t)
(set! (-> self darkjak latch-out-time) 0)
(set! (-> self lightjak get-off-lock) #f)
(set! (-> self darkjak stage) (logior arg0 (darkjak-stage bomb0)))
(set! (-> self darkjak stage) (logior arg0 (darkjak-stage active)))
(if (logtest? (game-feature darkjak-bomb0) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage invinc))
(logior! (-> self darkjak stage) (darkjak-stage bomb0))
)
(if (logtest? (game-feature darkjak-bomb1) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage giant))
(logior! (-> self darkjak stage) (darkjak-stage bomb1))
)
(if (logtest? (game-feature feature45) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage disable-force-on))
(if (logtest? (game-feature darkjak-invinc) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage invinc))
)
(if (logtest? (game-feature feature44) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage no-anim))
(if (logtest? (game-feature darkjak-tracking) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage tracking))
)
(if (logtest? (game-feature darkjak-smack) (-> self game features))
(logior! (-> self darkjak stage) (darkjak-stage bomb1))
(logior! (-> self darkjak stage) (darkjak-stage smack))
)
(set! (-> self darkjak want-stage) (-> self darkjak stage))
(set! (-> self neck flex-blend) 0.0)
@@ -1077,20 +1077,20 @@
(set! (-> self darkjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modedark 0.0 0))
(set! (-> self darkjak lightning-count) 0)
(cond
((logtest? (-> self darkjak stage) (darkjak-stage ds8))
((logtest? (-> self darkjak stage) (darkjak-stage invis))
(logclear! (-> self target-flags) (target-flags tf4))
(logclear! (-> self darkjak stage) (darkjak-stage bomb1 invinc giant no-anim disable-force-on))
(logclear! (-> self darkjak stage) (darkjak-stage smack bomb0 bomb1 tracking invinc))
(target-invisible-start (-> *TARGET-bank* invisible-duration))
(set! (-> self fact darkjak-effect-time) (-> *TARGET-bank* invisible-duration))
)
((logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
((logtest? (-> self darkjak stage) (darkjak-stage invinc))
(logior! (-> self target-flags) (target-flags tf4))
)
(else
(logclear! (-> self target-flags) (target-flags tf4))
)
)
(if (logtest? arg0 (darkjak-stage ds9))
(if (logtest? arg0 (darkjak-stage no-anim))
(go target-stance)
)
(target-start-attack)
@@ -1323,7 +1323,7 @@
)
(target-start-attack)
(target-danger-set! 'punch #f)
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
)
(let ((a0-11 (-> self control impact-ctrl))
@@ -1358,7 +1358,7 @@
(not (logtest? (-> self control current-surface flags) (surface-flag no-attack)))
(and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
(logtest? (-> self darkjak stage) (darkjak-stage active))
)
(< sv-32 2)
)
@@ -1377,7 +1377,7 @@
((arg0 (pointer float)) (arg1 (pointer int64)) (arg2 (pointer int64)))
(let ((s3-0 (if (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage no-anim))
(logtest? (-> self darkjak stage) (darkjak-stage tracking))
)
(combo-tracker-method-13
(-> self control unknown-combo-tracker00)
@@ -1403,7 +1403,7 @@
)
(target-start-attack)
(target-danger-set! 'punch #f)
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
)
(let ((v1-34 (ja-group)))
@@ -1777,7 +1777,7 @@
:code (behavior ()
(target-start-attack)
(target-danger-set! 'dark-smack #f)
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-smack-inc)))
)
(set! (-> self control lightjak-sound-id) (sound-play "djak-pnch-swing"))
test/decompiler/reference/jak3/engine/target/target-death_REF.gc
Generated Vendored
+21 -21
View File
@@ -16,7 +16,7 @@
(a3-0 (car a2-2))
)
(while (not (null? a2-2))
(if (and v1-0 (logtest? (continue-flags continue-flag-16) (-> (the-as continue-point a3-0) flags)))
(if (and v1-0 (logtest? (continue-flags test) (-> (the-as continue-point a3-0) flags)))
(return (the-as continue-point a3-0))
)
(if (= a3-0 arg0)
@@ -71,23 +71,23 @@
)
)
)
((logtest? (continue-flags pilot-dax) (-> arg0 flags))
(go target-indax-start (the-as handle #f) (if (logtest? (continue-flags cf27) (-> arg0 flags))
((logtest? (continue-flags indax) (-> arg0 flags))
(go target-indax-start (the-as handle #f) (if (logtest? (continue-flags indax-hang) (-> arg0 flags))
'hang
#t
)
)
)
((logtest? (continue-flags cf23) (-> arg0 flags))
((logtest? (continue-flags flut) (-> arg0 flags))
(go target-flut-start (the-as handle #f) 'normal -1)
)
((logtest? (continue-flags cf24) (-> arg0 flags))
((logtest? (continue-flags flut-racer) (-> arg0 flags))
(go target-flut-start (the-as handle #f) 'racer -1)
)
((logtest? (continue-flags cf28) (-> arg0 flags))
((logtest? (continue-flags flut-fight) (-> arg0 flags))
(go target-flut-start (the-as handle #f) 'fight -1)
)
((logtest? (continue-flags cf31) (-> arg0 flags))
((logtest? (continue-flags lightjak) (-> arg0 flags))
(send-event self 'get-pickup (pickup-type eco-pill-light) 100.0)
(case (-> arg0 vehicle-type)
((38)
@@ -98,11 +98,11 @@
)
)
)
((logtest? (-> arg0 flags) (continue-flags demo-movie))
((logtest? (-> arg0 flags) (continue-flags darkjak))
(send-event self 'get-pickup (pickup-type eco-pill-dark) 100.0)
(go target-darkjak-get-on (darkjak-stage force-on bomb0 ds9))
(go target-darkjak-get-on (darkjak-stage force-on active no-anim))
)
((logtest? (continue-flags cf25) (-> arg0 flags))
((logtest? (continue-flags vehicle) (-> arg0 flags))
(label cfg-39)
(let* ((v1-77 (-> arg0 vehicle-type))
(s5-2
@@ -134,7 +134,7 @@
(send-event (handle->process s5-2) 'pickup)
)
)
((logtest? (continue-flags cf30) (-> arg0 flags))
((logtest? (continue-flags vehicle-scorpion) (-> arg0 flags))
(label cfg-84)
(let ((gp-1 (process->handle
(search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 scorpion-gun-manager)))
@@ -153,7 +153,7 @@
)
)
)
((logtest? (continue-flags cf29) (-> arg0 flags))
((logtest? (continue-flags htorpedo) (-> arg0 flags))
(label cfg-114)
(let ((gp-2 (process->handle (search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 htorpedo))))))
(when (not (handle->process gp-2))
@@ -165,12 +165,12 @@
(send-event self 'change-mode 'pilot-daxter (handle->process gp-2))
)
)
((logtest? (continue-flags record-sig) (-> arg0 flags))
((logtest? (continue-flags mech) (-> arg0 flags))
(go target-mech-start (the-as handle #f) 100.0 #t)
)
((logtest? (continue-flags test) (-> arg0 flags))
((logtest? (continue-flags nothing-apparently) (-> arg0 flags))
)
((logtest? (continue-flags pilot) (-> arg0 flags))
((logtest? (continue-flags credits) (-> arg0 flags))
(case (-> arg0 vehicle-type)
((41)
(go target-credits 1)
@@ -186,7 +186,7 @@
)
)
)
((and (logtest? (continue-flags record-path) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
((and (logtest? (continue-flags race) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
(set! (-> self mode-cache) (the-as basic 'pilot))
(set! (-> self mode-param1) (the-as handle #f))
(set! (-> self mode-param2) (-> arg0 vehicle-type))
@@ -215,7 +215,7 @@
)
(set! (-> self mode-param3) (the-as uint #t))
)
((logtest? (-> arg0 flags) (continue-flags demo-end))
((logtest? (-> arg0 flags) (continue-flags grab))
(go target-grab 'stance)
)
(else
@@ -577,7 +577,7 @@
(kill-persister *setting-control* (the-as engine-pers 'fail-dialog-volume) 'dialog-volume)
(kill-persister *setting-control* (the-as engine-pers 'fail-music-volume) 'music-volume)
(when (-> *setting-control* user-current render)
(when (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
(when (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
(add-setting! 'bg-a 'abs 1.0 0)
(set! (-> *setting-control* user-current bg-a) 1.0)
)
@@ -595,7 +595,7 @@
(set-setting! 'allow-progress #f 0.0 0)
(set-setting! 'level-trans-time #f 0.0 0)
(kill-persister *setting-control* (the-as engine-pers 'speech-control) 'speech-control)
(when (logtest? (continue-flags cf27) (-> arg0 flags))
(when (logtest? (continue-flags indax-hang) (-> arg0 flags))
(set-setting! 'head-offset 'abs (meters 1) 0)
(set-setting! 'foot-offset 'abs (meters -1) 0)
(set-setting! 'target-height 'abs (meters 1.5) 0)
@@ -711,7 +711,7 @@
(suspend)
0
)
(when (logtest? (continue-flags pilot-dax) (-> arg0 flags))
(when (logtest? (continue-flags indax) (-> arg0 flags))
(while (!= (-> self ext-anim) (-> self pending-ext-anim))
(suspend)
)
@@ -773,7 +773,7 @@
(set! *spawn-actors* #t)
(set! *teleport* #t)
(set! (-> *ACTOR-bank* birth-max) 1000)
(if (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
(if (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
(set-blackout-frames (seconds 0.1))
)
(let* ((a0-128 *game-info*)
test/decompiler/reference/jak3/engine/target/target-handler_REF.gc
Generated Vendored
+2 -2
View File
@@ -418,7 +418,7 @@
(send-event self 'hit arg1 arg0 arg2 sv-128)
(set! arg0 (and (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
(logtest? (-> self darkjak stage) (darkjak-stage active))
)
arg0
)
@@ -1052,7 +1052,7 @@
((and (and (focus-test? self dark) (nonzero? (-> self darkjak)))
(or (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
(logtest? (-> self darkjak stage) (darkjak-stage invinc))
)
(logtest? (process-mask crate) (-> arg0 mask))
)
test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc
Generated Vendored
+1 -1
View File
@@ -914,7 +914,7 @@
(set! (-> self lightjak lightjak-before-powerjak) (the-as symbol (-> self control unknown-spool-anim00)))
(case (-> self lightjak get-on-latch)
((512)
(go target-darkjak-get-on (darkjak-stage bomb0))
(go target-darkjak-get-on (darkjak-stage active))
)
((8)
(if (and (focus-test? self light) (nonzero? (-> self lightjak)))
test/decompiler/reference/jak3/engine/target/target-util_REF.gc
Generated Vendored
+1 -1
View File
@@ -767,7 +767,7 @@
(set! (-> self control penetrate-using) (penetrate touch punch))
(if (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
(logtest? (-> self darkjak stage) (darkjak-stage active))
)
(logior! (-> self control penetrate-using) (penetrate dark-punch))
)
test/decompiler/reference/jak3/engine/target/target_REF.gc
Generated Vendored
+12 -12
View File
@@ -114,7 +114,7 @@
(>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
)
(target-invisible-start (seconds 30))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
)
)
@@ -257,7 +257,7 @@
(>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
)
(target-invisible-start (seconds 30))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
)
)
@@ -2051,7 +2051,7 @@
(>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
)
(target-invisible-start (seconds 30))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
(if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
)
)
@@ -2220,7 +2220,7 @@
(target-start-attack)
(target-danger-set! 'spin #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -2252,7 +2252,7 @@
(let ((s5-0 jakb-attack-from-stance-ja)
(gp-0 (if (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage no-anim))
(logtest? (-> self darkjak stage) (darkjak-stage tracking))
)
(combo-tracker-method-13
(-> self control unknown-combo-tracker00)
@@ -2744,7 +2744,7 @@
(target-start-attack)
(target-danger-set! 'punch #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
@@ -3003,7 +3003,7 @@
(target-start-attack)
(target-danger-set! 'spin-air #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -3201,7 +3201,7 @@
(target-start-attack)
(target-danger-set! 'uppercut #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-uppercut-inc)))
@@ -3286,7 +3286,7 @@
)
((and (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage giant))
(logtest? (-> self darkjak stage) (darkjak-stage bomb1))
)
(and (= (-> self ext-anim) (target-anim dark))
(logtest? (the-as game-feature (logand (game-feature darkjak-bomb1) (-> *setting-control* user-current features)))
@@ -3541,7 +3541,7 @@
)
((and (and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage invinc))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
)
(and (= (-> self ext-anim) (target-anim dark))
(logtest? (the-as game-feature (logand (game-feature darkjak-bomb0) (-> *setting-control* user-current features)))
@@ -3620,7 +3620,7 @@
(when (or (and (= (-> self fact eco-type) 2) (>= (-> self fact eco-level) 1.0))
(and (focus-test? self dark)
(nonzero? (-> self darkjak))
(logtest? (-> self darkjak stage) (darkjak-stage bomb0))
(logtest? (-> self darkjak stage) (darkjak-stage active))
)
)
(cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5))
@@ -3671,7 +3671,7 @@
(target-start-attack)
(target-danger-set! 'flop #f)
(if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
(logtest? (-> self darkjak stage) (darkjak-stage force-on active))
(logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
)
)
(send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-flop-inc)))
test/decompiler/reference/jak3/levels/common/race/race-manager_REF.gc
Generated Vendored
+1 -1
View File
@@ -1053,7 +1053,7 @@
(s5-0 (-> gp-0 info))
)
(if (or (logtest? (-> s5-0 flags) (racer-info-flag rif0))
(logtest? (continue-flags record-path) (-> *game-info* last-continue flags))
(logtest? (continue-flags race) (-> *game-info* last-continue flags))
)
(logior! (-> gp-0 flags) (race-flag rf2))
)
test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-rhino_REF.gc
Generated Vendored
+2 -6
View File
@@ -209,14 +209,14 @@
(defmethod vehicle-method-79 ((this v-rhino))
(set! (-> this turbo-supply) 3.0)
(seek! (-> this gun-kick) 0.0 (* 32768.0 (seconds-per-frame)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set! (-> this jmod-gun-kick transform trans z) (-> this gun-kick))
(quaternion-axis-angle! (-> s5-0 1) 1.0 0.0 0.0 (- (-> this gun-pitch)))
(quaternion-axis-angle! (-> s5-0 2) 0.0 1.0 0.0 (-> this gun-yaw))
(quaternion*! (-> this jmod-gun-turn rotation) (-> s5-0 2) (-> s5-0 1))
)
0
(let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-1 2) 0.0 0.0 0.0 0.0)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((v1-8 (-> this wheel s4-0)))
@@ -268,7 +268,3 @@
0
(none)
)
test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-scorpion_REF.gc
Generated Vendored
+1 -5
View File
@@ -241,7 +241,7 @@
(quaternion-axis-angle! (-> this jmod-gun-tilt transform quat) 1.0 0.0 0.0 (-> this gun-pitch))
(quaternion-axis-angle! (-> this jmod-gun-turn rotation) 0.0 1.0 0.0 (+ 32768.0 (-> this gun-yaw)))
0
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-0 2) -1638.4 -1638.4 1638.4 1638.4)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((v1-9 (-> this wheel s4-0)))
@@ -407,7 +407,3 @@
)
)
)
test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-turtle_REF.gc
Generated Vendored
+1 -1
View File
@@ -140,7 +140,7 @@
)
(init-vf0-vector)
(set-vector! (-> this root scale) 1.0 1.0 1.07 1.0)
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-0 2) -3640.889 3640.889 3640.889 -3640.889)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((v1-6 (-> this wheel s4-0)))
test/decompiler/reference/jak3/levels/desert/wvehicle/wcar_REF.gc
Generated Vendored
+1 -1
View File
@@ -4081,7 +4081,7 @@
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod vehicle-method-79 ((this wcar-snake-base))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
(let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
(set-vector! (-> s5-0 2) 1092.2667 1092.2667 0.0 0.0)
(dotimes (s4-0 (-> this info physics-model wheel-count))
(let ((s3-0 (-> this wheel s4-0)))
test/decompiler/reference/jak3/levels/mhcity/destroy-dark-eco_REF.gc
Generated Vendored
+2 -6
View File
@@ -341,7 +341,7 @@
(task-node-close! (game-task-node city-destroy-darkeco-dark-punch) 'event)
(set-setting! 'airlock #f 0.0 0)
(suspend)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 ds9))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active no-anim))
)
)
@@ -1431,7 +1431,7 @@
*target*
(not (logtest? (focus-status dark) (-> *target* focus-status)))
)
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
(let ((t9-3 (-> (find-parent-state) trans)))
(if t9-3
@@ -1643,7 +1643,3 @@
(process-drawable-from-entity! this arg0)
(go (method-of-object this idle))
)
test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc
Generated Vendored
+3 -3
View File
@@ -2631,7 +2631,7 @@
(persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
(persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
(when (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
(send-event (ppointer->process *crowd-manager*) 'darkjak)
)
)
@@ -2687,7 +2687,7 @@
(persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
(persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
(if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
(suspend)
)
@@ -2763,7 +2763,7 @@
(persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
(persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
(if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
(send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
)
)
)