mirror of
https://github.com/open-goal/jak-project
synced 2026-08-07 02:06:59 -04:00
c162c66118
This PR does two main things: 1. Work through the main low-hanging fruit issues in the formatter keeping it from feeling mature and usable 2. Iterate and prove that point by formatting all of the Jak 1 code base. **This has removed around 100K lines in total.** - The decompiler will now format it's results for jak 1 to keep things from drifting back to where they were. This is controlled by a new config flag `format_code`. How am I confident this hasn't broken anything?: - I compiled the entire project and stored it's `out/jak1/obj` files separately - I then recompiled the project after formatting and wrote a script that md5's each file and compares it (`compare-compilation-outputs.py` - The results (eventually) were the same:  > This proves that the only difference before and after is non-critical whitespace for all code/macros that is actually in use. I'm still aware of improvements that could be made to the formatter, as well as general optimization of it's performance. But in general these are for rare or non-critical situations in my opinion and I'll work through them before doing Jak 2. The vast majority looks great and is working properly at this point. Those known issues are the following if you are curious: 
128 lines
2.8 KiB
Common Lisp
128 lines
2.8 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "ENGINE.CGO" "GAME.CGO")
|
|
|
|
;; this file has no code.
|
|
|
|
;; List of each task in the game.
|
|
;; Each task has a task-control associated with it, see task-control.gc
|
|
(defenum game-task
|
|
:type uint8
|
|
(none 0)
|
|
(complete 1)
|
|
(jungle-eggtop 2)
|
|
(jungle-lurkerm 3)
|
|
(jungle-tower 4)
|
|
(jungle-fishgame 5)
|
|
(jungle-plant 6)
|
|
(jungle-buzzer 7)
|
|
(jungle-canyon-end 8)
|
|
(jungle-temple-door 9)
|
|
(village1-yakow 10)
|
|
(village1-mayor-money 11)
|
|
(village1-uncle-money 12)
|
|
(village1-oracle-money1 13)
|
|
(village1-oracle-money2 14)
|
|
(beach-ecorocks 15)
|
|
(beach-pelican 16)
|
|
(beach-flutflut 17)
|
|
(beach-seagull 18)
|
|
(beach-cannon 19)
|
|
(beach-buzzer 20)
|
|
(beach-gimmie 21)
|
|
(beach-sentinel 22)
|
|
(misty-muse 23)
|
|
(misty-boat 24)
|
|
(misty-warehouse 25)
|
|
(misty-cannon 26)
|
|
(misty-bike 27)
|
|
(misty-buzzer 28)
|
|
(misty-bike-jump 29)
|
|
(misty-eco-challenge 30)
|
|
(village2-gambler-money 31)
|
|
(village2-geologist-money 32)
|
|
(village2-warrior-money 33)
|
|
(village2-oracle-money1 34)
|
|
(village2-oracle-money2 35)
|
|
(swamp-billy 36)
|
|
(swamp-flutflut 37)
|
|
(swamp-battle 38)
|
|
(swamp-tether-1 39)
|
|
(swamp-tether-2 40)
|
|
(swamp-tether-3 41)
|
|
(swamp-tether-4 42)
|
|
(swamp-buzzer 43)
|
|
(sunken-platforms 44)
|
|
(sunken-pipe 45)
|
|
(sunken-slide 46)
|
|
(sunken-room 47)
|
|
(sunken-sharks 48)
|
|
(sunken-buzzer 49)
|
|
(sunken-top-of-helix 50)
|
|
(sunken-spinning-room 51)
|
|
(rolling-race 52)
|
|
(rolling-robbers 53)
|
|
(rolling-moles 54)
|
|
(rolling-plants 55)
|
|
(rolling-lake 56)
|
|
(rolling-buzzer 57)
|
|
(rolling-ring-chase-1 58)
|
|
(rolling-ring-chase-2 59)
|
|
(snow-eggtop 60)
|
|
(snow-ram 61)
|
|
(snow-fort 62)
|
|
(snow-ball 63)
|
|
(snow-bunnies 64)
|
|
(snow-buzzer 65)
|
|
(snow-bumpers 66)
|
|
(snow-cage 67)
|
|
(firecanyon-buzzer 68)
|
|
(firecanyon-end 69)
|
|
(citadel-sage-green 70)
|
|
(citadel-sage-blue 71)
|
|
(citadel-sage-red 72)
|
|
(citadel-sage-yellow 73)
|
|
(village3-extra1 74)
|
|
(village1-buzzer 75)
|
|
(village2-buzzer 76)
|
|
(village3-buzzer 77)
|
|
(cave-gnawers 78)
|
|
(cave-dark-crystals 79)
|
|
(cave-dark-climb 80)
|
|
(cave-robot-climb 81)
|
|
(cave-swing-poles 82)
|
|
(cave-spider-tunnel 83)
|
|
(cave-platforms 84)
|
|
(cave-buzzer 85)
|
|
(ogre-boss 86)
|
|
(ogre-end 87)
|
|
(ogre-buzzer 88)
|
|
(lavatube-end 89)
|
|
(lavatube-buzzer 90)
|
|
(citadel-buzzer 91)
|
|
(training-gimmie 92)
|
|
(training-door 93)
|
|
(training-climb 94)
|
|
(training-buzzer 95)
|
|
(village3-miner-money1 96)
|
|
(village3-miner-money2 97)
|
|
(village3-miner-money3 98)
|
|
(village3-miner-money4 99)
|
|
(village3-oracle-money1 100)
|
|
(village3-oracle-money2 101)
|
|
(firecanyon-assistant 102)
|
|
(village2-levitator 103)
|
|
(swamp-arm 104)
|
|
(village3-button 105)
|
|
(red-eggtop 106)
|
|
(lavatube-balls 107)
|
|
(lavatube-start 108)
|
|
(intro 109)
|
|
(ogre-secret 110)
|
|
(village4-button 111)
|
|
(finalboss-movies 112)
|
|
(plunger-lurker-hit 113)
|
|
(leaving-misty 114)
|
|
(assistant-village3 115)
|
|
(max 116))
|