From 5fcba98f9229b9b42e482e763c87dda38fe5ae7c Mon Sep 17 00:00:00 2001 From: sisby-folk Date: Thu, 9 Nov 2023 18:41:52 +1100 Subject: [PATCH 1/5] convert repeatable option --- odysseus/HeraclesQuest.ts | 1 + odysseus/convertFtbQuests.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/odysseus/HeraclesQuest.ts b/odysseus/HeraclesQuest.ts index c8b99e3..1aa6efe 100644 --- a/odysseus/HeraclesQuest.ts +++ b/odysseus/HeraclesQuest.ts @@ -328,6 +328,7 @@ export type HeraclesQuest = { settings?: { individual_progress?: boolean; + repeatable?: boolean; hidden?: "LOCKED" | "IN_PROGRESS" | "COMPLETED" | "COMPLETED_CLAIMED"; }; diff --git a/odysseus/convertFtbQuests.ts b/odysseus/convertFtbQuests.ts index fa70eae..5a9020d 100644 --- a/odysseus/convertFtbQuests.ts +++ b/odysseus/convertFtbQuests.ts @@ -301,6 +301,7 @@ type Chapter = QuestObject & { dependencies?: number[] | string[]; hide?: boolean; invisible?: boolean; + can_repeat?: boolean; dependency_requirement: | "all_completed" | "one_completed" @@ -650,6 +651,7 @@ export const convertFtbQuests = async ( const heraclesQuest: HeraclesQuest = { settings: { hidden, + repeatable: quest.can_repeat }, dependencies: areNumericIds(quest.dependencies) From 24cd6aff4339bad50e04ea33864d3b2650c91afe Mon Sep 17 00:00:00 2001 From: sisby-folk Date: Fri, 10 Nov 2023 10:14:46 +1100 Subject: [PATCH 2/5] lint & compress scripts --- .github/workflows/validate.yml | 13 ------------- odysseus/convertFtbQuests.ts | 2 +- package.json | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 043cc47..ed1b274 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -16,19 +16,6 @@ jobs: - name: Lint run: npm run lint - check-style: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: NPM Install - run: npm install - - - name: Check style - run: npm run checkstyle - compile: runs-on: ubuntu-latest diff --git a/odysseus/convertFtbQuests.ts b/odysseus/convertFtbQuests.ts index 5a9020d..b113c52 100644 --- a/odysseus/convertFtbQuests.ts +++ b/odysseus/convertFtbQuests.ts @@ -651,7 +651,7 @@ export const convertFtbQuests = async ( const heraclesQuest: HeraclesQuest = { settings: { hidden, - repeatable: quest.can_repeat + repeatable: quest.can_repeat, }, dependencies: areNumericIds(quest.dependencies) diff --git a/package.json b/package.json index 18fa628..e38a347 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "odysseus", "scripts": { - "lint": "eslint .", - "checkstyle": "prettier . --check" + "lint": "eslint . && prettier . --check", + "lint:fix": "prettier . --write" }, "workspaces": [ "odysseus", From 3cad510536afb4529e8f7a48ef34e0b599902227 Mon Sep 17 00:00:00 2001 From: sisby-folk Date: Fri, 10 Nov 2023 10:32:27 +1100 Subject: [PATCH 3/5] Revert "lint & compress scripts" This reverts commit 24cd6aff4339bad50e04ea33864d3b2650c91afe. --- .github/workflows/validate.yml | 13 +++++++++++++ odysseus/convertFtbQuests.ts | 2 +- package.json | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index ed1b274..043cc47 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -16,6 +16,19 @@ jobs: - name: Lint run: npm run lint + check-style: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: NPM Install + run: npm install + + - name: Check style + run: npm run checkstyle + compile: runs-on: ubuntu-latest diff --git a/odysseus/convertFtbQuests.ts b/odysseus/convertFtbQuests.ts index b113c52..5a9020d 100644 --- a/odysseus/convertFtbQuests.ts +++ b/odysseus/convertFtbQuests.ts @@ -651,7 +651,7 @@ export const convertFtbQuests = async ( const heraclesQuest: HeraclesQuest = { settings: { hidden, - repeatable: quest.can_repeat, + repeatable: quest.can_repeat }, dependencies: areNumericIds(quest.dependencies) diff --git a/package.json b/package.json index e38a347..18fa628 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "odysseus", "scripts": { - "lint": "eslint . && prettier . --check", - "lint:fix": "prettier . --write" + "lint": "eslint .", + "checkstyle": "prettier . --check" }, "workspaces": [ "odysseus", From 8b661029266d885400b69fa47c88545ad1782004 Mon Sep 17 00:00:00 2001 From: sisby-folk Date: Fri, 10 Nov 2023 10:42:31 +1100 Subject: [PATCH 4/5] separate lint and prettier --- odysseus/convertFtbQuests.ts | 2 +- package.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/odysseus/convertFtbQuests.ts b/odysseus/convertFtbQuests.ts index 5a9020d..b113c52 100644 --- a/odysseus/convertFtbQuests.ts +++ b/odysseus/convertFtbQuests.ts @@ -651,7 +651,7 @@ export const convertFtbQuests = async ( const heraclesQuest: HeraclesQuest = { settings: { hidden, - repeatable: quest.can_repeat + repeatable: quest.can_repeat, }, dependencies: areNumericIds(quest.dependencies) diff --git a/package.json b/package.json index 18fa628..de2f6e6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,10 @@ "name": "odysseus", "scripts": { "lint": "eslint .", - "checkstyle": "prettier . --check" + "lint:fix": "eslint . --fix", + "checkstyle": "prettier . --check", + "checkstyle:write": "prettier . --write", + "fix": "npm run lint:fix && npm run checkstyle:write" }, "workspaces": [ "odysseus", From 4b7318c939179a536ae4c92d0282ab764c0f8d48 Mon Sep 17 00:00:00 2001 From: sisby-folk Date: Fri, 10 Nov 2023 11:01:16 +1100 Subject: [PATCH 5/5] fix -> lint-format --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de2f6e6..40477d5 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "lint:fix": "eslint . --fix", "checkstyle": "prettier . --check", "checkstyle:write": "prettier . --write", - "fix": "npm run lint:fix && npm run checkstyle:write" + "lint-format": "npm run lint:fix && npm run checkstyle:write" }, "workspaces": [ "odysseus",