From a72b6e5e017e6b769bfa9687c7894ab0b70a821a Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sat, 6 Aug 2022 12:03:42 -0400 Subject: [PATCH] goal_src: Get rid of `*OLD*` files in jak1's goal_src (#1736) * gsrc: delete empty OLD files * ci: put the right author on the controller updating commits --- .github/workflows/inform-pages-repo.yaml | 5 ----- .github/workflows/update-controller-db.yaml | 3 +++ goal_src/jak1/old/citb-drop-plat-OLD.gc | 6 ------ goal_src/jak1/old/fisher-OLD.gc | 6 ------ goal_src/jak1/old/lava/lava.gc | 7 ------- goal_src/jak1/old/racer-states-OLD.gc | 6 ------ goal_src/jak1/old/sage-finalboss-OLD.gc | 6 ------ goal_src/jak1/old/target-racer-OLD.gc | 6 ------ goal_src/jak1/old/target-racer-h-OLD.gc | 6 ------ goal_src/jak1/old/village-obs-OLD.gc | 6 ------ goal_src/jak2/kernel/dgo-h.gc | 2 ++ goal_src/jak2/kernel/gcommon.gc | 2 ++ goal_src/jak2/kernel/gkernel-h.gc | 2 ++ goal_src/jak2/kernel/gkernel.gc | 2 ++ goal_src/jak2/kernel/gstate.gc | 2 ++ goal_src/jak2/kernel/gstring-h.gc | 2 ++ goal_src/jak2/kernel/gstring.gc | 2 ++ 17 files changed, 17 insertions(+), 54 deletions(-) delete mode 100644 goal_src/jak1/old/citb-drop-plat-OLD.gc delete mode 100644 goal_src/jak1/old/fisher-OLD.gc delete mode 100644 goal_src/jak1/old/lava/lava.gc delete mode 100644 goal_src/jak1/old/racer-states-OLD.gc delete mode 100644 goal_src/jak1/old/sage-finalboss-OLD.gc delete mode 100644 goal_src/jak1/old/target-racer-OLD.gc delete mode 100644 goal_src/jak1/old/target-racer-h-OLD.gc delete mode 100644 goal_src/jak1/old/village-obs-OLD.gc diff --git a/.github/workflows/inform-pages-repo.yaml b/.github/workflows/inform-pages-repo.yaml index 977a6e1b5..9bdb97ad2 100644 --- a/.github/workflows/inform-pages-repo.yaml +++ b/.github/workflows/inform-pages-repo.yaml @@ -1,9 +1,5 @@ name: Inform Pages Repo -# This action triggers an action on our other repo, which will: -# - clone this repo -# - use the latest files to update our progress - on: push: branches: @@ -16,7 +12,6 @@ jobs: name: Inform Pages Repo if: github.repository == 'open-goal/jak-project' runs-on: ubuntu-latest - # Set some sort of timeout in the event of run-away builds. We are limited on concurrent jobs so, get rid of them. timeout-minutes: 10 steps: - name: Send Dispatch diff --git a/.github/workflows/update-controller-db.yaml b/.github/workflows/update-controller-db.yaml index b28c07501..f47a3fb91 100644 --- a/.github/workflows/update-controller-db.yaml +++ b/.github/workflows/update-controller-db.yaml @@ -20,4 +20,7 @@ jobs: - name: commit version bump uses: EndBug/add-and-commit@v9 with: + default_author: github_actor + author_name: 'OpenGOALBot' + author_email: 'OpenGOALBot@users.noreply.github.com' message: "Updating Controller Database" diff --git a/goal_src/jak1/old/citb-drop-plat-OLD.gc b/goal_src/jak1/old/citb-drop-plat-OLD.gc deleted file mode 100644 index 970a35946..000000000 --- a/goal_src/jak1/old/citb-drop-plat-OLD.gc +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: citb-drop-plat-L1.gc -;; name in dgo: citb-drop-plat -;; dgos: L1 diff --git a/goal_src/jak1/old/fisher-OLD.gc b/goal_src/jak1/old/fisher-OLD.gc deleted file mode 100644 index bf0faa670..000000000 --- a/goal_src/jak1/old/fisher-OLD.gc +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: fisher-JUNGLE-L1.gc -;; name in dgo: fisher -;; dgos: JUNGLE, L1 diff --git a/goal_src/jak1/old/lava/lava.gc b/goal_src/jak1/old/lava/lava.gc deleted file mode 100644 index 0f8aee60d..000000000 --- a/goal_src/jak1/old/lava/lava.gc +++ /dev/null @@ -1,7 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: lava.gc -;; name in dgo: lava -;; dgos: WATER-AN - diff --git a/goal_src/jak1/old/racer-states-OLD.gc b/goal_src/jak1/old/racer-states-OLD.gc deleted file mode 100644 index ae48e2e48..000000000 --- a/goal_src/jak1/old/racer-states-OLD.gc +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: racer-states-L1-RACERP.gc -;; name in dgo: racer-states -;; dgos: L1, RACERP diff --git a/goal_src/jak1/old/sage-finalboss-OLD.gc b/goal_src/jak1/old/sage-finalboss-OLD.gc deleted file mode 100644 index 3cb9948c2..000000000 --- a/goal_src/jak1/old/sage-finalboss-OLD.gc +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: sage-finalboss-L1.gc -;; name in dgo: sage-finalboss -;; dgos: L1 diff --git a/goal_src/jak1/old/target-racer-OLD.gc b/goal_src/jak1/old/target-racer-OLD.gc deleted file mode 100644 index 4e4d93da3..000000000 --- a/goal_src/jak1/old/target-racer-OLD.gc +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: target-racer-L1-RACERP.gc -;; name in dgo: target-racer -;; dgos: L1, RACERP diff --git a/goal_src/jak1/old/target-racer-h-OLD.gc b/goal_src/jak1/old/target-racer-h-OLD.gc deleted file mode 100644 index e8e77dea1..000000000 --- a/goal_src/jak1/old/target-racer-h-OLD.gc +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: target-racer-h-L1-RACERP.gc -;; name in dgo: target-racer-h -;; dgos: L1, RACERP diff --git a/goal_src/jak1/old/village-obs-OLD.gc b/goal_src/jak1/old/village-obs-OLD.gc deleted file mode 100644 index 5b33b0193..000000000 --- a/goal_src/jak1/old/village-obs-OLD.gc +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -(in-package goal) - -;; name: village-obs-L1.gc -;; name in dgo: village-obs -;; dgos: L1 diff --git a/goal_src/jak2/kernel/dgo-h.gc b/goal_src/jak2/kernel/dgo-h.gc index 91cc1713f..342b07e6a 100644 --- a/goal_src/jak2/kernel/dgo-h.gc +++ b/goal_src/jak2/kernel/dgo-h.gc @@ -5,6 +5,8 @@ ;; name in dgo: dgo-h ;; dgos: KERNEL +;; DECOMP BEGINS + ;; I suspect that these are unused, and were for an older version of DGO. ;; All DGO stuff is handled on the IOP. diff --git a/goal_src/jak2/kernel/gcommon.gc b/goal_src/jak2/kernel/gcommon.gc index 36b1bf016..3933844d6 100644 --- a/goal_src/jak2/kernel/gcommon.gc +++ b/goal_src/jak2/kernel/gcommon.gc @@ -5,6 +5,8 @@ ;; name in dgo: gcommon ;; dgos: KERNEL +;; DECOMP BEGINS + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Game constants ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/goal_src/jak2/kernel/gkernel-h.gc b/goal_src/jak2/kernel/gkernel-h.gc index 2a3891ac9..3b136dc48 100644 --- a/goal_src/jak2/kernel/gkernel-h.gc +++ b/goal_src/jak2/kernel/gkernel-h.gc @@ -5,6 +5,8 @@ ;; name in dgo: gkernel-h ;; dgos: KERNEL +;; DECOMP BEGINS + (defconstant *kernel-major-version* 2) (defconstant *kernel-minor-version* 0) diff --git a/goal_src/jak2/kernel/gkernel.gc b/goal_src/jak2/kernel/gkernel.gc index eccd78752..03444d131 100644 --- a/goal_src/jak2/kernel/gkernel.gc +++ b/goal_src/jak2/kernel/gkernel.gc @@ -5,6 +5,8 @@ ;; name in dgo: gkernel ;; dgos: KERNEL +;; DECOMP BEGINS + ;; Version constants (define *kernel-version* (the binteger (logior (ash *kernel-major-version* 16) *kernel-minor-version*))) (define *irx-version* (the-as binteger #x200000)) diff --git a/goal_src/jak2/kernel/gstate.gc b/goal_src/jak2/kernel/gstate.gc index c655116b2..c43e646dc 100644 --- a/goal_src/jak2/kernel/gstate.gc +++ b/goal_src/jak2/kernel/gstate.gc @@ -5,6 +5,8 @@ ;; name in dgo: gstate ;; dgos: KERNEL +;; DECOMP BEGINS + #| Summary of state system: diff --git a/goal_src/jak2/kernel/gstring-h.gc b/goal_src/jak2/kernel/gstring-h.gc index be82621eb..38b8885f1 100644 --- a/goal_src/jak2/kernel/gstring-h.gc +++ b/goal_src/jak2/kernel/gstring-h.gc @@ -5,6 +5,8 @@ ;; name in dgo: gstring-h ;; dgos: KERNEL +;; DECOMP BEGINS + (define-extern *string-tmp-str* string) (define-extern *temp-string* string) (define-extern *stdcon0* string) diff --git a/goal_src/jak2/kernel/gstring.gc b/goal_src/jak2/kernel/gstring.gc index 5e69927e1..f96a30a35 100644 --- a/goal_src/jak2/kernel/gstring.gc +++ b/goal_src/jak2/kernel/gstring.gc @@ -5,6 +5,8 @@ ;; name in dgo: gstring ;; dgos: KERNEL +;; DECOMP BEGINS + (defmethod length string ((obj string)) "Get the length of a string. Like strlen" (let ((v1-0 (-> obj data)))