mirror of
https://github.com/open-goal/jak-project
synced 2026-09-10 04:22:13 -04:00
ManDude
7a8aa71204
Currently only tracks enemy kills, and how they were killed. There is currently no menu for this, but I've already added most of the text for it. Also did a bunch of misc decompilation fixes and renamed some methods. Fixes #3277 Fixes #3278
78 lines
2.4 KiB
Common Lisp
78 lines
2.4 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: ash-task.gc
|
|
;; name in dgo: ash-task
|
|
;; dgos: ATE, CTYASHA
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defmethod reset-task! ((this asht-wait-spot))
|
|
(set! (-> this check-done) #f)
|
|
(set! (-> this which-spot) -1)
|
|
(set! (-> this num-spots) (the-as uint 0))
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod ai-task-method-11 ((this asht-wait-spot) (arg0 bot))
|
|
(let ((s4-0 (-> this which-spot)))
|
|
(when (>= s4-0 0)
|
|
(let ((s3-0 (-> arg0 course spots (-> this spot-indexes s4-0))))
|
|
(if (and (not (outside-spot-radius? arg0 s3-0 (the-as vector #f) #f)) (player-blocking-spot? arg0 s3-0))
|
|
(set! s4-0 -1)
|
|
)
|
|
)
|
|
)
|
|
(when (< s4-0 0)
|
|
(set! s4-0 (choose-spot arg0 (the-as int (-> this num-spots)) (the-as (pointer uint) (-> this spot-indexes))))
|
|
(set! (-> this which-spot) s4-0)
|
|
(mem-copy!
|
|
(the-as pointer (-> arg0 spot))
|
|
(the-as pointer (-> arg0 course spots (-> this spot-indexes s4-0)))
|
|
20
|
|
)
|
|
)
|
|
(if (logtest? *display-bot-marks* (bot-marks-controls bmc16))
|
|
(bot-debug-draw-spot-sphere
|
|
arg0
|
|
(the-as int (-> this num-spots))
|
|
(the-as (pointer uint) (-> this spot-indexes))
|
|
(the-as int (-> this spot-indexes s4-0))
|
|
)
|
|
)
|
|
)
|
|
(when (not ((-> this check-done) this (the-as ashelin arg0)))
|
|
(let ((a1-10 (handle->process (-> arg0 focus handle))))
|
|
(when (and a1-10
|
|
(attacked-by-player? arg0 (the-as process-focusable a1-10))
|
|
(not (logtest? (-> arg0 focus-status) (focus-status grabbed)))
|
|
)
|
|
(get-task-by-type (-> arg0 ai-ctrl) asht-fight-focus arg0)
|
|
(ai-task-control-method-10 (-> arg0 ai-ctrl) arg0)
|
|
)
|
|
)
|
|
)
|
|
(none)
|
|
)
|
|
|
|
;; WARN: Return type mismatch object vs none.
|
|
(defmethod ai-task-method-11 ((this asht-fight-focus) (arg0 bot))
|
|
(let ((a1-1 (handle->process (-> arg0 focus handle))))
|
|
(if (and a1-1
|
|
(attacked-by-player? arg0 (the-as process-focusable a1-1))
|
|
(not (logtest? (-> arg0 focus-status) (focus-status grabbed)))
|
|
)
|
|
(logior! (-> arg0 bot-flags) (bot-flags bf00))
|
|
(ai-task-control-method-14 (-> arg0 ai-ctrl) this arg0)
|
|
)
|
|
)
|
|
(none)
|
|
)
|
|
|
|
;; WARN: Return type mismatch bot-flags vs none.
|
|
(defmethod ai-task-method-10 ((this asht-fight-focus) (arg0 bot))
|
|
(logclear! (-> arg0 bot-flags) (bot-flags bf00))
|
|
(none)
|
|
)
|