From 884a1857dea92c5d2f0c872e9e5da98be0e5b880 Mon Sep 17 00:00:00 2001 From: water Date: Fri, 12 Apr 2024 20:19:34 -0400 Subject: [PATCH] fix minimap offset, connection setting return type --- decompiler/config/jak3/all-types.gc | 4 ++-- game/overlord/jak2/iso.cpp | 6 ++++- goal_src/jak3/engine/game/settings-h.gc | 4 ++-- goal_src/jak3/engine/game/settings.gc | 4 ---- .../jak3/engine/target/board/target-board.gc | 3 ++- .../jak3/engine/target/flut/target-flut.gc | 2 +- .../jak3/engine/target/mech/target-mech.gc | 4 ++-- goal_src/jak3/engine/target/target-darkjak.gc | 2 +- goal_src/jak3/engine/target/target-gun.gc | 24 +++++++++---------- .../jak3/engine/target/target-lightjak.gc | 2 +- .../jak3/engine/game/settings-h_REF.gc | 4 ++-- .../jak3/engine/game/settings_REF.gc | 4 ---- .../engine/target/board/target-board_REF.gc | 3 ++- .../engine/target/flut/target-flut_REF.gc | 2 +- .../engine/target/mech/target-mech_REF.gc | 2 +- .../jak3/engine/target/target-darkjak_REF.gc | 2 +- .../jak3/engine/target/target-gun_REF.gc | 24 +++++++++---------- .../jak3/engine/target/target-lightjak_REF.gc | 2 +- 18 files changed, 48 insertions(+), 50 deletions(-) diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc index 685207b317..23bb589c35 100644 --- a/decompiler/config/jak3/all-types.gc +++ b/decompiler/config/jak3/all-types.gc @@ -10841,8 +10841,8 @@ (:methods (new (symbol type int) _type_) ;; 0 (add-setting (_type_ process symbol object object object) connection) ;; 9 - (persist-with-delay (_type_ symbol time-frame symbol symbol float int) connection) ;; 10 - (set-setting (_type_ process symbol object object object) none) ;; 11 + (persist-with-delay (_type_ symbol time-frame symbol symbol float int) none) ;; 10 + (set-setting (_type_ process symbol object object object) connection) ;; 11 (remove-setting (_type_ process symbol) none) ;; 12 (kill-persister (_type_ engine-pers object) none) ;; 13 (setting-control-method-14 (_type_ object) connectable) ;; 14 diff --git a/game/overlord/jak2/iso.cpp b/game/overlord/jak2/iso.cpp index 127f246fce..32c0eba4f3 100644 --- a/game/overlord/jak2/iso.cpp +++ b/game/overlord/jak2/iso.cpp @@ -677,7 +677,11 @@ u32 ISOThread() { pLVar14 = (VagStrListNode*)NewStreamsList.next; do { if (pLVar14->id != 0) { - QueueVAGStream(pLVar14); + if (g_game_version != GameVersion::Jak3) { + // doesn't work. + printf("jak3 skipping vag stream\n"); + QueueVAGStream(pLVar14); + } } pLVar14 = (VagStrListNode*)pLVar14->list.next; iVar4 = iVar4 + 1; diff --git a/goal_src/jak3/engine/game/settings-h.gc b/goal_src/jak3/engine/game/settings-h.gc index 1e500bc5e4..2ecd8eccd0 100644 --- a/goal_src/jak3/engine/game/settings-h.gc +++ b/goal_src/jak3/engine/game/settings-h.gc @@ -572,9 +572,9 @@ ) (:methods (new (symbol type int) _type_) - (add-setting (_type_ process symbol object object object) none) + (add-setting (_type_ process symbol object object object) connection) (persist-with-delay (_type_ symbol time-frame symbol symbol float int) none) - (set-setting (_type_ process symbol object object object) none) + (set-setting (_type_ process symbol object object object) connection) (remove-setting (_type_ process symbol) none) (kill-persister (_type_ engine-pers object) none) (setting-control-method-14 (_type_ object) connectable) diff --git a/goal_src/jak3/engine/game/settings.gc b/goal_src/jak3/engine/game/settings.gc index 5e4f1a00f0..2fe58d2dc1 100644 --- a/goal_src/jak3/engine/game/settings.gc +++ b/goal_src/jak3/engine/game/settings.gc @@ -1199,17 +1199,13 @@ this ) -;; WARN: Return type mismatch connection vs none. (defmethod add-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object)) (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4) - (none) ) -;; WARN: Return type mismatch connection vs none. (defmethod set-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object)) (remove-setting this arg0 arg1) (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4) - (none) ) (defmethod persist-with-delay ((this setting-control) (arg0 symbol) (arg1 time-frame) (arg2 symbol) (arg3 symbol) (arg4 float) (arg5 int)) diff --git a/goal_src/jak3/engine/target/board/target-board.gc b/goal_src/jak3/engine/target/board/target-board.gc index 5585ea3fb4..22d3c4a1b2 100644 --- a/goal_src/jak3/engine/target/board/target-board.gc +++ b/goal_src/jak3/engine/target/board/target-board.gc @@ -866,6 +866,7 @@ (none) ) +;; WARN: Return type mismatch connection vs none. (defbehavior target-board-init target () (target-lightjak-end-mode #t) (target-darkjak-end-mode #t) @@ -899,7 +900,7 @@ (set! (-> self board sound-air-knob) 0.0) (set! (-> self board sound-bank-knob) 0.0) (set! (-> self board turn-sound-id) (new 'static 'sound-id)) - (set! (-> self board mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modebord 0.0 0))) + (set! (-> self board mode-sound-bank) (add-setting! 'mode-sound-bank 'modebord 0.0 0)) (set-time! (-> self board board-get-on-time)) (set! (-> self board stick-lock) #f) (set! (-> self board stick-off) #f) diff --git a/goal_src/jak3/engine/target/flut/target-flut.gc b/goal_src/jak3/engine/target/flut/target-flut.gc index 2e9041df23..7a07321abb 100644 --- a/goal_src/jak3/engine/target/flut/target-flut.gc +++ b/goal_src/jak3/engine/target/flut/target-flut.gc @@ -1131,7 +1131,7 @@ (set! (-> self flut attack-id) a0-22) ) (set! (-> self flut flap-sound-id) (the-as uint (new-sound-id))) - (set! (-> self flut mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeflut 0.0 0))) + (set! (-> self flut mode-sound-bank) (add-setting! 'mode-sound-bank 'modeflut 0.0 0)) (set! (-> self flut entity) #f) (let ((v1-41 (handle->process arg0))) (if v1-41 diff --git a/goal_src/jak3/engine/target/mech/target-mech.gc b/goal_src/jak3/engine/target/mech/target-mech.gc index c3544618a6..e56322c416 100644 --- a/goal_src/jak3/engine/target/mech/target-mech.gc +++ b/goal_src/jak3/engine/target/mech/target-mech.gc @@ -1368,7 +1368,7 @@ (set-setting! 'string-min-height 'low (meters 1.5) 0) (set-setting! 'fov 'abs (degrees 75.0) 0) (set-setting! 'head-offset 'abs (meters 4.5) 0) - (set! (-> self mech mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modemech 0.0 0))) + (set! (-> self mech mode-sound-bank) (add-setting! 'mode-sound-bank 'modemech 0.0 0)) (set! (-> self mech hud 0) (ppointer->handle (process-spawn hud-heatmeter :init hud-init-by-other :name "hud-heatmeter" :to self)) ) @@ -1458,7 +1458,7 @@ (deactivate a0-27) ) ) - ;; (setting-control-method-14 *setting-control* (-> self mech mode-sound-bank)) + (setting-control-method-14 *setting-control* (-> self mech mode-sound-bank)) (set! (-> self mech mode-sound-bank) #f) (logclear! (-> self draw status) (draw-control-status no-draw-bounds)) (logclear! (-> self focus-status) (focus-status mech)) diff --git a/goal_src/jak3/engine/target/target-darkjak.gc b/goal_src/jak3/engine/target/target-darkjak.gc index 7e2797006b..e74459e42b 100644 --- a/goal_src/jak3/engine/target/target-darkjak.gc +++ b/goal_src/jak3/engine/target/target-darkjak.gc @@ -997,7 +997,7 @@ (set! (-> self pending-ext-anim) (target-anim dark)) (set-time! (-> self fact darkjak-start-time)) (set! (-> self fact darkjak-effect-time) (seconds 20)) - (set! (-> self darkjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modedark 0.0 0))) + (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)) diff --git a/goal_src/jak3/engine/target/target-gun.gc b/goal_src/jak3/engine/target/target-gun.gc index bb679d9dae..c426f521ba 100644 --- a/goal_src/jak3/engine/target/target-gun.gc +++ b/goal_src/jak3/engine/target/target-gun.gc @@ -720,40 +720,40 @@ ((arg0 pickup-type)) (case arg0 (((pickup-type gun-yellow-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy1 0.0 0)) ) (((pickup-type gun-yellow-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy2 0.0 0)) ) (((pickup-type gun-yellow-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy3 0.0 0)) ) (((pickup-type gun-red-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur1 0.0 0)) ) (((pickup-type gun-red-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur2 0.0 0)) ) (((pickup-type gun-red-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur3 0.0 0)) ) (((pickup-type gun-blue-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub1 0.0 0)) ) (((pickup-type gun-blue-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub2 0.0 0)) ) (((pickup-type gun-blue-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub3 0.0 0)) ) (((pickup-type gun-dark-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud1 0.0 0)) ) (((pickup-type gun-dark-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud2 0.0 0)) ) (((pickup-type gun-dark-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud3 0.0 0)) ) ) (none) diff --git a/goal_src/jak3/engine/target/target-lightjak.gc b/goal_src/jak3/engine/target/target-lightjak.gc index eec18ce4b8..117bb8606f 100644 --- a/goal_src/jak3/engine/target/target-lightjak.gc +++ b/goal_src/jak3/engine/target/target-lightjak.gc @@ -1571,7 +1571,7 @@ (set! (-> self pending-ext-anim) (target-anim light)) (set-time! (-> self fact lightjak-start-time)) (set! (-> self fact lightjak-effect-time) (seconds 20)) - (set! (-> self lightjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modelit 0.0 0))) + (set! (-> self lightjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modelit 0.0 0)) (target-start-attack) (target-danger-set! 'get-on #f) (cond diff --git a/test/decompiler/reference/jak3/engine/game/settings-h_REF.gc b/test/decompiler/reference/jak3/engine/game/settings-h_REF.gc index 51c601ce6a..a8ea297ae3 100644 --- a/test/decompiler/reference/jak3/engine/game/settings-h_REF.gc +++ b/test/decompiler/reference/jak3/engine/game/settings-h_REF.gc @@ -700,9 +700,9 @@ ) (:methods (new (symbol type int) _type_) - (add-setting (_type_ process symbol object object object) none) + (add-setting (_type_ process symbol object object object) connection) (persist-with-delay (_type_ symbol time-frame symbol symbol float int) none) - (set-setting (_type_ process symbol object object object) none) + (set-setting (_type_ process symbol object object object) connection) (remove-setting (_type_ process symbol) none) (kill-persister (_type_ engine-pers object) none) (setting-control-method-14 (_type_ object) connectable) diff --git a/test/decompiler/reference/jak3/engine/game/settings_REF.gc b/test/decompiler/reference/jak3/engine/game/settings_REF.gc index fdc9fd3c52..5e0f503e4c 100644 --- a/test/decompiler/reference/jak3/engine/game/settings_REF.gc +++ b/test/decompiler/reference/jak3/engine/game/settings_REF.gc @@ -1186,18 +1186,14 @@ ) ;; definition for method 9 of type setting-control -;; WARN: Return type mismatch connection vs none. (defmethod add-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object)) (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4) - (none) ) ;; definition for method 11 of type setting-control -;; WARN: Return type mismatch connection vs none. (defmethod set-setting ((this setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object)) (remove-setting this arg0 arg1) (add-connection (-> this engine) arg0 arg1 arg2 arg3 arg4) - (none) ) ;; definition for method 10 of type setting-control diff --git a/test/decompiler/reference/jak3/engine/target/board/target-board_REF.gc b/test/decompiler/reference/jak3/engine/target/board/target-board_REF.gc index eef083e244..b9642dbf64 100644 --- a/test/decompiler/reference/jak3/engine/target/board/target-board_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/board/target-board_REF.gc @@ -882,6 +882,7 @@ ) ;; definition for function target-board-init +;; WARN: Return type mismatch connection vs none. (defbehavior target-board-init target () (target-lightjak-end-mode #t) (target-darkjak-end-mode #t) @@ -915,7 +916,7 @@ (set! (-> self board sound-air-knob) 0.0) (set! (-> self board sound-bank-knob) 0.0) (set! (-> self board turn-sound-id) (new 'static 'sound-id)) - (set! (-> self board mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modebord 0.0 0))) + (set! (-> self board mode-sound-bank) (add-setting! 'mode-sound-bank 'modebord 0.0 0)) (set-time! (-> self board board-get-on-time)) (set! (-> self board stick-lock) #f) (set! (-> self board stick-off) #f) diff --git a/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc b/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc index 0784e47ebe..cb9c85a637 100644 --- a/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc @@ -1173,7 +1173,7 @@ (set! (-> self flut attack-id) a0-22) ) (set! (-> self flut flap-sound-id) (the-as uint (new-sound-id))) - (set! (-> self flut mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeflut 0.0 0))) + (set! (-> self flut mode-sound-bank) (add-setting! 'mode-sound-bank 'modeflut 0.0 0)) (set! (-> self flut entity) #f) (let ((v1-41 (handle->process arg0))) (if v1-41 diff --git a/test/decompiler/reference/jak3/engine/target/mech/target-mech_REF.gc b/test/decompiler/reference/jak3/engine/target/mech/target-mech_REF.gc index bd3cc58f3e..13355c113b 100644 --- a/test/decompiler/reference/jak3/engine/target/mech/target-mech_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/mech/target-mech_REF.gc @@ -1413,7 +1413,7 @@ (set-setting! 'string-min-height 'low (meters 1.5) 0) (set-setting! 'fov 'abs (degrees 75.0) 0) (set-setting! 'head-offset 'abs (meters 4.5) 0) - (set! (-> self mech mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modemech 0.0 0))) + (set! (-> self mech mode-sound-bank) (add-setting! 'mode-sound-bank 'modemech 0.0 0)) (set! (-> self mech hud 0) (ppointer->handle (process-spawn hud-heatmeter :init hud-init-by-other :name "hud-heatmeter" :to self)) ) diff --git a/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc b/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc index aea5332d64..2093a7fd5c 100644 --- a/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc @@ -1074,7 +1074,7 @@ (set! (-> self pending-ext-anim) (target-anim dark)) (set-time! (-> self fact darkjak-start-time)) (set! (-> self fact darkjak-effect-time) (seconds 20)) - (set! (-> self darkjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modedark 0.0 0))) + (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)) diff --git a/test/decompiler/reference/jak3/engine/target/target-gun_REF.gc b/test/decompiler/reference/jak3/engine/target/target-gun_REF.gc index c9e27a36d8..32870e2c04 100644 --- a/test/decompiler/reference/jak3/engine/target/target-gun_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-gun_REF.gc @@ -727,40 +727,40 @@ ((arg0 pickup-type)) (case arg0 (((pickup-type gun-yellow-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy1 0.0 0)) ) (((pickup-type gun-yellow-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy2 0.0 0)) ) (((pickup-type gun-yellow-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modeguy3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modeguy3 0.0 0)) ) (((pickup-type gun-red-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur1 0.0 0)) ) (((pickup-type gun-red-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur2 0.0 0)) ) (((pickup-type gun-red-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegur3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegur3 0.0 0)) ) (((pickup-type gun-blue-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub1 0.0 0)) ) (((pickup-type gun-blue-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub2 0.0 0)) ) (((pickup-type gun-blue-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegub3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegub3 0.0 0)) ) (((pickup-type gun-dark-1)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud1 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud1 0.0 0)) ) (((pickup-type gun-dark-2)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud2 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud2 0.0 0)) ) (((pickup-type gun-dark-3)) - (set! (-> self gun mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modegud3 0.0 0))) + (set! (-> self gun mode-sound-bank) (add-setting! 'mode-sound-bank 'modegud3 0.0 0)) ) ) (none) diff --git a/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc b/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc index e3b015499e..1eb8726f39 100644 --- a/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc @@ -1617,7 +1617,7 @@ (set! (-> self pending-ext-anim) (target-anim light)) (set-time! (-> self fact lightjak-start-time)) (set! (-> self fact lightjak-effect-time) (seconds 20)) - (set! (-> self lightjak mode-sound-bank) (the-as connection (add-setting! 'mode-sound-bank 'modelit 0.0 0))) + (set! (-> self lightjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modelit 0.0 0)) (target-start-attack) (target-danger-set! 'get-on #f) (cond