From 975bcd1e15087836898644d2238afdf63801488a Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 14:29:39 +0100 Subject: [PATCH 01/12] =?UTF-8?q?#10=20Kampfkunst=20nicht=20=C3=B6ffenbar?= =?UTF-8?q?=20(#11)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Änderungen: + auskommentierte if Bedingung wieder drin + if Bedingung angepasst Reviewed-on: https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/pulls/11 Reviewed-by: Le-Frique --- templates/sheets/item/kampfkunst.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sheets/item/kampfkunst.hbs b/templates/sheets/item/kampfkunst.hbs index 0a8f566..d97e4ba 100644 --- a/templates/sheets/item/kampfkunst.hbs +++ b/templates/sheets/item/kampfkunst.hbs @@ -76,7 +76,7 @@ {{localize "midgard5.skill"}} - {{!-- {{#if data.calc.skills.general}} --}} + {{#if data.calc.generalSkills}} + {{#if (eq data.info.race "Zwerg")}} + + {{/if}} diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs index a250aaa..bfd17bf 100644 --- a/templates/sheets/character/main.hbs +++ b/templates/sheets/character/main.hbs @@ -7,7 +7,7 @@
{{data.calc.level}}
- + Name diff --git a/templates/sheets/item/armor.hbs b/templates/sheets/item/armor.hbs index 26eeb21..1c1c8ea 100644 --- a/templates/sheets/item/armor.hbs +++ b/templates/sheets/item/armor.hbs @@ -18,6 +18,34 @@ + + + + + + + {{#if (eq item.parent.system.info.race "Zwerg")}} + + + + + {{/if}} + + + + + +
+ {{localize "midgard5.item-value"}} + +
diff --git a/templates/sheets/item/defensiveWeapon.hbs b/templates/sheets/item/defensiveWeapon.hbs index 3bbca1c..80ead44 100644 --- a/templates/sheets/item/defensiveWeapon.hbs +++ b/templates/sheets/item/defensiveWeapon.hbs @@ -7,7 +7,7 @@ - + + + diff --git a/templates/sheets/item/item.hbs b/templates/sheets/item/item.hbs index f91f011..c55afeb 100644 --- a/templates/sheets/item/item.hbs +++ b/templates/sheets/item/item.hbs @@ -6,7 +6,7 @@
+
@@ -18,6 +18,34 @@ + + + + + + + {{#if (eq item.parent.system.info.race "Zwerg")}} + + + + + {{/if}} +
+
+
+ {{localize "midgard5.item-value"}} + +
- @@ -28,7 +39,7 @@ -
+
@@ -16,6 +16,17 @@ + + + + + + {{#if (eq item.parent.system.info.race "Zwerg")}} + + + + + {{/if}}
+
{{localize "midgard5.item-value"}} diff --git a/templates/sheets/item/weapon.hbs b/templates/sheets/item/weapon.hbs index 09e6f2b..dbd69b7 100644 --- a/templates/sheets/item/weapon.hbs +++ b/templates/sheets/item/weapon.hbs @@ -7,7 +7,7 @@ - + + + From 4825166f87bc37e96a23c59d33502761713ceed0 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 15:06:01 +0100 Subject: [PATCH 03/12] Add .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitea/workflows/add-issue-to-project.yaml diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml new file mode 100644 index 0000000..e69de29 From 840a7c1dc4e99e92942c86d0806e0cd90632b24b Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 15:33:26 +0100 Subject: [PATCH 04/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index e69de29..ffad1a2 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -0,0 +1,17 @@ +name: Adds all issues to project board + +on: + issues: + types: + - opened + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@RELEASE_VERSION + with: + project-url: https://git.byroks.de/MidgardVTT-Entwicklung/-/projects/3 + labeled: enhancement, bug + label-operator: OR \ No newline at end of file From da1ae4e16ed20c4d59e968aac699f69ce57e75ac Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 15:35:54 +0100 Subject: [PATCH 05/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index ffad1a2..23826ca 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@RELEASE_VERSION + - uses: actions/add-to-project@latest with: project-url: https://git.byroks.de/MidgardVTT-Entwicklung/-/projects/3 labeled: enhancement, bug From b1ef88235f84f2e1bb982cfcecb787faed02cfc3 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 15:37:37 +0100 Subject: [PATCH 06/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index 23826ca..b8ea196 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@latest + - uses: actions/add-to-project with: project-url: https://git.byroks.de/MidgardVTT-Entwicklung/-/projects/3 labeled: enhancement, bug From c83cd8f079a43eabac2254dda062b9733a4a33a2 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 15:40:56 +0100 Subject: [PATCH 07/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index b8ea196..e16226c 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project + - uses: actions/add-to-project@v0.5.0 with: project-url: https://git.byroks.de/MidgardVTT-Entwicklung/-/projects/3 labeled: enhancement, bug From b08bd195c73636b5e695e1adc49a769f5b02e92b Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 15:45:46 +0100 Subject: [PATCH 08/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index e16226c..c3f39bc 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -13,5 +13,6 @@ jobs: - uses: actions/add-to-project@v0.5.0 with: project-url: https://git.byroks.de/MidgardVTT-Entwicklung/-/projects/3 + github-token: ${{ secrets.GH_TOKEN }} labeled: enhancement, bug label-operator: OR \ No newline at end of file From ad884994dd573e1472b2a565f1044ef2a5863391 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 16:17:20 +0100 Subject: [PATCH 09/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index c3f39bc..1581d5e 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -10,9 +10,9 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.5.0 + - name: GitHub Project Board Automation + uses: pritishvaidya/github-project-board-automation@0.0.1.5 with: - project-url: https://git.byroks.de/MidgardVTT-Entwicklung/-/projects/3 - github-token: ${{ secrets.GH_TOKEN }} - labeled: enhancement, bug - label-operator: OR \ No newline at end of file + projects: Midgard 5 Entwicklung,Midgard5VTT Entwicklung + column: In Progress + token: ${{ secrets.GH_TOKEN }} \ No newline at end of file From 47fd5b77637d3368b8f6b6aa9b0c5b8ffb036b99 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 16:37:27 +0100 Subject: [PATCH 10/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index 1581d5e..3d9d9e8 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -10,9 +10,9 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - name: GitHub Project Board Automation - uses: pritishvaidya/github-project-board-automation@0.0.1.5 + - uses: actions/add-to-project@v0.5.0 with: - projects: Midgard 5 Entwicklung,Midgard5VTT Entwicklung - column: In Progress - token: ${{ secrets.GH_TOKEN }} \ No newline at end of file + project-url: https://git.byroks.de/orgs/MidgardVTT-Entwicklung/projects/3 + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} + labeled: bug, needs-triage + label-operator: OR \ No newline at end of file From 718f1eab99da1b995cff0181c8d7002de1c29926 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 16:38:35 +0100 Subject: [PATCH 11/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index 3d9d9e8..030d8a4 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -13,6 +13,6 @@ jobs: - uses: actions/add-to-project@v0.5.0 with: project-url: https://git.byroks.de/orgs/MidgardVTT-Entwicklung/projects/3 - github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} - labeled: bug, needs-triage + github-token: ${{ secrets.GH_TOKEN }} + labeled: bug, enhancement label-operator: OR \ No newline at end of file From d67de1b064330c1bed6137fd0d279e6d9d7a76b0 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sun, 7 Jan 2024 16:47:12 +0100 Subject: [PATCH 12/12] Update .gitea/workflows/add-issue-to-project.yaml --- .gitea/workflows/add-issue-to-project.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitea/workflows/add-issue-to-project.yaml b/.gitea/workflows/add-issue-to-project.yaml index 030d8a4..98e3139 100644 --- a/.gitea/workflows/add-issue-to-project.yaml +++ b/.gitea/workflows/add-issue-to-project.yaml @@ -1,10 +1,5 @@ name: Adds all issues to project board -on: - issues: - types: - - opened - jobs: add-to-project: name: Add issue to project @@ -12,7 +7,7 @@ jobs: steps: - uses: actions/add-to-project@v0.5.0 with: - project-url: https://git.byroks.de/orgs/MidgardVTT-Entwicklung/projects/3 + project-url: https://git.byroks.de/MidgardVTT-Entwicklung/-/projects/3 github-token: ${{ secrets.GH_TOKEN }} labeled: bug, enhancement label-operator: OR \ No newline at end of file
+
@@ -23,6 +23,34 @@ + + + + + + + {{#if (eq item.parent.system.info.race "Zwerg")}} + + + + + {{/if}} +
+
+
+ {{localize "midgard5.item-value"}} + +