mirror of
https://github.com/open-goal/jak-project
synced 2026-08-13 04:10:18 -04:00
decomp: finish target-racer | target-tube (#1042)
* decomp: finish `target-racer` target-racing-turn-anim was the `cond` issue here * decomp: finish `target-tube` target-tube-turn-anim was the issue here
This commit is contained in:
+1
-1
@@ -225,7 +225,7 @@
|
||||
(load-game! (_type_ game-save) game-save 25)
|
||||
(clear-text-seen! (_type_ game-text-id) none 26)
|
||||
(get-death-count (_type_ symbol) int 27)
|
||||
(get-health-percent-lost (_type_) float 28)
|
||||
(get-health-percent-lost (_type_ symbol) float 28)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
+1
-1
@@ -1239,6 +1239,6 @@
|
||||
)
|
||||
|
||||
;; definition for method 28 of type game-info
|
||||
(defmethod get-health-percent-lost game-info ((obj game-info))
|
||||
(defmethod get-health-percent-lost game-info ((obj game-info) (arg0 symbol))
|
||||
(* 0.25 (the float (get-death-count obj #f)))
|
||||
)
|
||||
|
||||
Generated
Vendored
+1715
File diff suppressed because it is too large
Load Diff
+1163
File diff suppressed because it is too large
Load Diff
+7
-18
@@ -1387,32 +1387,21 @@ swamp-rat-nest-default-event-handler
|
||||
(set! (-> obj path) (new 'process 'path-control obj 'path 0.0))
|
||||
(logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text))
|
||||
(let ((s5-1 (res-lump-value arg0 'num-lurkers uint128 :default (the-as uint128 3))))
|
||||
(let* ((a0-8 *game-info*) (t9-5 (method-of-object a0-8 get-health-percent-lost))) (if (>= (t9-5 a0-8) 0.5)
|
||||
(+! s5-1 -1)
|
||||
)
|
||||
)
|
||||
(if (>= (get-health-percent-lost *game-info* #f) 0.5)
|
||||
(+! s5-1 -1)
|
||||
)
|
||||
(set! (-> obj rat-count) (max 1 (min 4 (the-as int s5-1))))
|
||||
)
|
||||
(set! (-> obj defensive-rat-count) 2)
|
||||
(let* ((a0-11 *game-info*)
|
||||
(t9-6 (method-of-object a0-11 get-health-percent-lost))
|
||||
)
|
||||
(if (>= (t9-6 a0-11) 0.75)
|
||||
(+! (-> obj defensive-rat-count) -1)
|
||||
)
|
||||
)
|
||||
(if (>= (get-health-percent-lost *game-info* #f) 0.75)
|
||||
(+! (-> obj defensive-rat-count) -1)
|
||||
)
|
||||
(set! (-> obj dummy) (the-as (pointer swamp-rat-nest-dummy) #f))
|
||||
(set! (-> obj dummy-type) 0)
|
||||
(set! (-> obj hit-points) 0)
|
||||
(set! (-> obj damaged) #f)
|
||||
(set! (-> obj spawn-period) (* 1200.0 (rand-vu-float-range 0.9 1.1)))
|
||||
(let* ((f30-1 1.0)
|
||||
(f28-0 2.0)
|
||||
(a0-13 *game-info*)
|
||||
(t9-8 (method-of-object a0-13 get-health-percent-lost))
|
||||
)
|
||||
(set! (-> obj spawn-period-scale) (+ f30-1 (* f28-0 (t9-8 a0-13))))
|
||||
)
|
||||
(set! (-> obj spawn-period-scale) (+ 1.0 (* 2.0 (get-health-percent-lost *game-info* #f))))
|
||||
(set! (-> obj test-interval) (the-as uint (rand-vu-int-range 30 60)))
|
||||
(go swamp-rat-nest-idle)
|
||||
(none)
|
||||
|
||||
@@ -214,6 +214,9 @@
|
||||
],
|
||||
"orbit-plat-rotating": [
|
||||
"code"
|
||||
],
|
||||
"slide-control-ride": [
|
||||
"exit" // asm code
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user