From 3d3e9c784e522c31ab3535bb8ce0979823916de7 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 00:27:40 +0300 Subject: [PATCH 01/10] Test --- objects/obj_controller/Create_0.gml | 2 +- objects/obj_controller/KeyPress_32.gml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 4aea22823..7f50fc101 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -77,7 +77,7 @@ is_test_map = false; target_navy_number = 5; global.sound_playing = 0; global.defeat = 0; -tutorial = 0; +tutorial=0; sound_in = 0; sound_to = ""; fix_right = 0; diff --git a/objects/obj_controller/KeyPress_32.gml b/objects/obj_controller/KeyPress_32.gml index bfe2d7897..fd4e529a9 100644 --- a/objects/obj_controller/KeyPress_32.gml +++ b/objects/obj_controller/KeyPress_32.gml @@ -7,7 +7,7 @@ if (__b__) { if (__b__) { if ((obj_controller.menu == 0 && !instance_exists(obj_popup_dialogue)) || ((obj_controller.menu == 999) && instance_exists(obj_ncombat))) { if (instance_exists(obj_ncombat)) { - if (obj_ncombat.start == 7) { + if (obj_ncombat.start==7) { exit; } } From ceecfa1970565dc867fe580035985867f8defa8b Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 00:31:26 +0300 Subject: [PATCH 02/10] Fix 1 --- .github/workflows/gobo_check.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gobo_check.yml b/.github/workflows/gobo_check.yml index 590250908..991bd3a9c 100644 --- a/.github/workflows/gobo_check.yml +++ b/.github/workflows/gobo_check.yml @@ -31,8 +31,10 @@ jobs: - name: Run Formatter if: steps.changed-files.outputs.any_changed == 'true' run: | - # Pass all changed files to gobo at once - ./gobo ${{ steps.changed-files.outputs.all_changed_files }} + for file in ${{ steps.changed-files.outputs.all_changed_files }}; do + echo "Formatting $file..." + ./gobo "$file" + done - name: Verify Formatting run: | From b436d59f0c8cc12ee84daba3c6f3cf5de04634a5 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:22:25 +0300 Subject: [PATCH 03/10] test 2 --- .github/workflows/gobo_check.yml | 2 +- .github/workflows/gobo_lint.yml | 62 ++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/gobo_lint.yml diff --git a/.github/workflows/gobo_check.yml b/.github/workflows/gobo_check.yml index 991bd3a9c..9e6885b8b 100644 --- a/.github/workflows/gobo_check.yml +++ b/.github/workflows/gobo_check.yml @@ -1,4 +1,4 @@ -name: Format Code +name: GoboLintCheck on: pull_request: diff --git a/.github/workflows/gobo_lint.yml b/.github/workflows/gobo_lint.yml new file mode 100644 index 000000000..355c798d9 --- /dev/null +++ b/.github/workflows/gobo_lint.yml @@ -0,0 +1,62 @@ +name: GoboLint + +on: + issue_comment: + types: [created] + +jobs: + lint: + if: > + github.event.issue.pull_request && + startsWith(github.event.comment.body, '/lint') && + (github.event.comment.author_association == 'COLLABORATOR' || + github.event.comment.author_association == 'MEMBER' || + github.event.comment.author_association == 'OWNER') + + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + + steps: + - name: Get PR branch + uses: xt0rted/pull-request-comment-branch@v2 + id: comment-branch + + - name: Checkout PR branch + uses: actions/checkout@v4 + with: + ref: ${{ steps.comment-branch.outputs.head_ref }} + repository: ${{ steps.comment-branch.outputs.head_owner }}/${{ steps.comment-branch.outputs.head_repo }} + fetch-depth: 0 + + - name: Get Changed Files + id: changed-files + uses: tj-actions/changed-files@v44 + with: + base_sha: ${{ steps.comment-branch.outputs.base_ref }} + files: '**.gml' + + - name: Setup Gobo + if: steps.changed-files.outputs.any_changed == 'true' + run: | + curl -LO https://github.com/EttyKitty/Gobo/releases/download/v1.0.0/gobo-ubuntu.zip + unzip gobo-ubuntu.zip + chmod +x ./gobo + + - name: Run Linter + if: steps.changed-files.outputs.any_changed == 'true' + run: | + for file in ${{ steps.changed-files.outputs.all_changed_files }}; do + if [ -f "$file" ]; then + echo "Linting $file..." + ./gobo "$file" + fi + done + + - name: Commit Changes + if: steps.changed-files.outputs.any_changed == 'true' + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "style: auto-lint GML files with Gobo" + file_pattern: '**.gml' \ No newline at end of file From a4de7099a0bf756f59a24c2f615663dbb8bdadf6 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:23:22 +0300 Subject: [PATCH 04/10] Discard changes to objects/obj_controller/Create_0.gml --- objects/obj_controller/Create_0.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 7f50fc101..4aea22823 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -77,7 +77,7 @@ is_test_map = false; target_navy_number = 5; global.sound_playing = 0; global.defeat = 0; -tutorial=0; +tutorial = 0; sound_in = 0; sound_to = ""; fix_right = 0; From 031b1d95624106887e72c0cd50272b57584ee9b5 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:23:26 +0300 Subject: [PATCH 05/10] Discard changes to objects/obj_controller/KeyPress_32.gml --- objects/obj_controller/KeyPress_32.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/obj_controller/KeyPress_32.gml b/objects/obj_controller/KeyPress_32.gml index fd4e529a9..bfe2d7897 100644 --- a/objects/obj_controller/KeyPress_32.gml +++ b/objects/obj_controller/KeyPress_32.gml @@ -7,7 +7,7 @@ if (__b__) { if (__b__) { if ((obj_controller.menu == 0 && !instance_exists(obj_popup_dialogue)) || ((obj_controller.menu == 999) && instance_exists(obj_ncombat))) { if (instance_exists(obj_ncombat)) { - if (obj_ncombat.start==7) { + if (obj_ncombat.start == 7) { exit; } } From 7f6eedb41ad75b0d90227e0d40454d800a492e2b Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:25:30 +0300 Subject: [PATCH 06/10] df --- scripts/scr_animated_scanline/scr_animated_scanline.gml | 2 +- scripts/scr_arti_descr/scr_arti_descr.gml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/scr_animated_scanline/scr_animated_scanline.gml b/scripts/scr_animated_scanline/scr_animated_scanline.gml index 91b39a4af..3bbf141fe 100644 --- a/scripts/scr_animated_scanline/scr_animated_scanline.gml +++ b/scripts/scr_animated_scanline/scr_animated_scanline.gml @@ -6,7 +6,7 @@ function draw_animated_scanline(x1, y1, width, height, time = 10, color = 599838 if (anim <= 10) { draw_set_alpha(anim / 10); } else { - draw_set_alpha(2 - (anim / 10)); + draw_set_alpha(2-(anim / 10)); } line_move = y1 + (height * ((anim % 20) / 20)); if (irandom(100) <= 5) { diff --git a/scripts/scr_arti_descr/scr_arti_descr.gml b/scripts/scr_arti_descr/scr_arti_descr.gml index f6b7c134d..9c488878c 100644 --- a/scripts/scr_arti_descr/scr_arti_descr.gml +++ b/scripts/scr_arti_descr/scr_arti_descr.gml @@ -10,10 +10,9 @@ function scr_arti_descr() { if (typ != "armour") { mission_data = $"This artifact is a {type()}"; if (inq_mission) { - mission_data += ", entrusted by the Inquisition.#"; + mission_data +=", entrusted by the Inquisition.#"; } else if (!inq_mission) { - mission_data += ".#"; - } + mission_data += ".#";} } else if (typ == "armour") { mission_data = $"This artifact is {type()}"; if (inq_mission) { From 4750b09335ffca532cd5a864213a129c2fda544c Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:29:36 +0300 Subject: [PATCH 07/10] ts --- .github/workflows/gobo_lint.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gobo_lint.yml b/.github/workflows/gobo_lint.yml index 355c798d9..34ab00720 100644 --- a/.github/workflows/gobo_lint.yml +++ b/.github/workflows/gobo_lint.yml @@ -19,22 +19,22 @@ jobs: pull-requests: write steps: - - name: Get PR branch + - name: Get PR branch info + id: pr_data uses: xt0rted/pull-request-comment-branch@v2 - id: comment-branch - - name: Checkout PR branch + - name: Checkout PR Branch uses: actions/checkout@v4 with: - ref: ${{ steps.comment-branch.outputs.head_ref }} - repository: ${{ steps.comment-branch.outputs.head_owner }}/${{ steps.comment-branch.outputs.head_repo }} - fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ steps.pr_data.outputs.head_owner }}/${{ steps.pr_data.outputs.head_repo }} + ref: ${{ steps.pr_data.outputs.head_ref }} - name: Get Changed Files id: changed-files uses: tj-actions/changed-files@v44 with: - base_sha: ${{ steps.comment-branch.outputs.base_ref }} + base_sha: ${{ steps.pr_data.outputs.base_ref }} files: '**.gml' - name: Setup Gobo From 958434713b24067005b7141416ac1b393d091b71 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:31:46 +0300 Subject: [PATCH 08/10] h --- .github/workflows/gobo_lint.yml | 46 +++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/gobo_lint.yml b/.github/workflows/gobo_lint.yml index 34ab00720..a4b884a8a 100644 --- a/.github/workflows/gobo_lint.yml +++ b/.github/workflows/gobo_lint.yml @@ -1,40 +1,52 @@ -name: GoboLint +name: Gobo Lint on: issue_comment: types: [created] jobs: - lint: + format: if: > github.event.issue.pull_request && - startsWith(github.event.comment.body, '/lint') && - (github.event.comment.author_association == 'COLLABORATOR' || - github.event.comment.author_association == 'MEMBER' || - github.event.comment.author_association == 'OWNER') - + startsWith(github.event.comment.body, '/format') && + (github.event.comment.author_association == 'MEMBER' || + github.event.comment.author_association == 'OWNER' || + github.event.comment.author_association == 'COLLABORATOR') runs-on: ubuntu-latest permissions: contents: write pull-requests: write steps: - - name: Get PR branch info - id: pr_data - uses: xt0rted/pull-request-comment-branch@v2 + - name: Fetch PR Details + id: pr + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + # Use the GitHub CLI to get the branch name and the full repository name (owner/repo) + PR_JSON=$(gh pr view ${{ github.event.issue.number }} --repo ${{ github.repository }} --json headRefName,headRepositoryOwner,headRepository) + + # Extract values using jq + HEAD_REF=$(echo "$PR_JSON" | jq -r .headRefName) + HEAD_OWNER=$(echo "$PR_JSON" | jq -r .headRepositoryOwner.login) + HEAD_REPO_NAME=$(echo "$PR_JSON" | jq -r .headRepository.name) + + echo "head_ref=$HEAD_REF" >> $GITHUB_OUTPUT + echo "head_repo=$HEAD_OWNER/$HEAD_REPO_NAME" >> $GITHUB_OUTPUT - name: Checkout PR Branch uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ steps.pr_data.outputs.head_owner }}/${{ steps.pr_data.outputs.head_repo }} - ref: ${{ steps.pr_data.outputs.head_ref }} + repository: ${{ steps.pr.outputs.head_repo }} + ref: ${{ steps.pr.outputs.head_ref }} + fetch-depth: 0 - name: Get Changed Files id: changed-files uses: tj-actions/changed-files@v44 with: - base_sha: ${{ steps.pr_data.outputs.base_ref }} + base_sha: ${{ github.event.issue.pull_request.base.sha }} files: '**.gml' - name: Setup Gobo @@ -44,19 +56,19 @@ jobs: unzip gobo-ubuntu.zip chmod +x ./gobo - - name: Run Linter + - name: Run Formatter if: steps.changed-files.outputs.any_changed == 'true' run: | for file in ${{ steps.changed-files.outputs.all_changed_files }}; do if [ -f "$file" ]; then - echo "Linting $file..." + echo "Formatting $file..." ./gobo "$file" fi done - - name: Commit Changes + - name: Commit and Push changes if: steps.changed-files.outputs.any_changed == 'true' uses: stefanzweifel/git-auto-commit-action@v5 with: - commit_message: "style: auto-lint GML files with Gobo" + commit_message: "style: Auto-format GML files with Gobo" file_pattern: '**.gml' \ No newline at end of file From 3062c2f7447341b53549fba239d11234d6ff88ee Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:33:38 +0300 Subject: [PATCH 09/10] Discard changes to scripts/scr_animated_scanline/scr_animated_scanline.gml --- scripts/scr_animated_scanline/scr_animated_scanline.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_animated_scanline/scr_animated_scanline.gml b/scripts/scr_animated_scanline/scr_animated_scanline.gml index 3bbf141fe..91b39a4af 100644 --- a/scripts/scr_animated_scanline/scr_animated_scanline.gml +++ b/scripts/scr_animated_scanline/scr_animated_scanline.gml @@ -6,7 +6,7 @@ function draw_animated_scanline(x1, y1, width, height, time = 10, color = 599838 if (anim <= 10) { draw_set_alpha(anim / 10); } else { - draw_set_alpha(2-(anim / 10)); + draw_set_alpha(2 - (anim / 10)); } line_move = y1 + (height * ((anim % 20) / 20)); if (irandom(100) <= 5) { From a32c8bf80a5d258a5100ad2604de879f8be4656a Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 1 Feb 2026 01:33:46 +0300 Subject: [PATCH 10/10] Discard changes to scripts/scr_arti_descr/scr_arti_descr.gml --- scripts/scr_arti_descr/scr_arti_descr.gml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/scr_arti_descr/scr_arti_descr.gml b/scripts/scr_arti_descr/scr_arti_descr.gml index 9c488878c..f6b7c134d 100644 --- a/scripts/scr_arti_descr/scr_arti_descr.gml +++ b/scripts/scr_arti_descr/scr_arti_descr.gml @@ -10,9 +10,10 @@ function scr_arti_descr() { if (typ != "armour") { mission_data = $"This artifact is a {type()}"; if (inq_mission) { - mission_data +=", entrusted by the Inquisition.#"; + mission_data += ", entrusted by the Inquisition.#"; } else if (!inq_mission) { - mission_data += ".#";} + mission_data += ".#"; + } } else if (typ == "armour") { mission_data = $"This artifact is {type()}"; if (inq_mission) {