From 549c65c4222ac41cac30ffd75554481cedec8700 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 22:21:34 +0000 Subject: [PATCH 1/3] Bump micromatch from 4.0.5 to 4.0.8 Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b1bbb7..0673316 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1763,11 +1763,11 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -3951,11 +3951,11 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, From 3f8c6cffd4b87e81e449d0f3070a75e1ab09362b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Lozano?= Date: Sat, 5 Oct 2024 09:24:32 +0200 Subject: [PATCH 2/3] Fix data --- .../Generate_Operation_Code_Name_YWm6lbQwW2la81fc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packs/source/operation-code-name-generator-macro/Generate_Operation_Code_Name_YWm6lbQwW2la81fc.json b/packs/source/operation-code-name-generator-macro/Generate_Operation_Code_Name_YWm6lbQwW2la81fc.json index b526e60..f774405 100644 --- a/packs/source/operation-code-name-generator-macro/Generate_Operation_Code_Name_YWm6lbQwW2la81fc.json +++ b/packs/source/operation-code-name-generator-macro/Generate_Operation_Code_Name_YWm6lbQwW2la81fc.json @@ -4,7 +4,7 @@ "author": "HQMGHY3GfipU1eSK", "img": "icons/svg/tower-flag.svg", "scope": "global", - "command": "let finalMessage = 'Operation ';\nlet part1 = '';\nlet part2 = '';\n\nlet pack = await game.packs.get(\"deltagreen.operation-code-name-generator-tables\").getDocuments();\n\nlet combinationsTable = await pack.find(t => t.name === 'Codename Part Combinations');\nlet adjectiveTable = await pack.find(t => t.name === 'Codename Generator - Adjective');\nlet colorTable = await pack.find(t => t.name === 'Codename Generator - Color');\nlet nounTable = await pack.find(t => t.name === 'Codename Generator - Noun');\nlet phoneticTable = await pack.find(t => t.name === 'Codename Generator - Phonetic');\n\nlet rollResult = await combinationsTable.roll();\n\nlet randomCombinationResult = rollResult.results[0].data.text;\n\n\nif(randomCombinationResult === 'Color-Noun'){\n rollResult = await colorTable.roll();\n \n part1 = rollResult.results[0].data.text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].data.text;\n}\nelse if(randomCombinationResult === 'Adjective-Noun'){\n rollResult = await adjectiveTable.roll();\n \n part1 = rollResult.results[0].data.text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].data.text;\n \n // if identical noun, re-try once\n if(part1 === part2){\n rollResult = await nounTable.roll();\n part2 = rollResult.results[0].data.text;\n }\n}\nelse if(randomCombinationResult === 'Noun-Noun'){\n rollResult = await nounTable.roll();\n \n part1 = rollResult.results[0].data.text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].data.text;\n}\nelse if(randomCombinationResult === 'Phonetic-Noun'){\n rollResult = await phoneticTable.roll();\n \n part1 = rollResult.results[0].data.text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].data.text;\n}\n\nfinalMessage += part1 + ' ' + part2;\n\nlet messageData = {\n flavor: finalMessage\n};\n\nChatMessage.create(messageData);", + "command": "let finalMessage = 'Operation ';\nlet part1 = '';\nlet part2 = '';\n\nlet pack = await game.packs.get(\"deltagreen.operation-code-name-generator-tables\").getDocuments();\n\nlet combinationsTable = await pack.find(t => t.name === 'Codename Part Combinations');\nlet adjectiveTable = await pack.find(t => t.name === 'Codename Generator - Adjective');\nlet colorTable = await pack.find(t => t.name === 'Codename Generator - Color');\nlet nounTable = await pack.find(t => t.name === 'Codename Generator - Noun');\nlet phoneticTable = await pack.find(t => t.name === 'Codename Generator - Phonetic');\n\nlet rollResult = await combinationsTable.roll();\n\nlet randomCombinationResult = rollResult.results[0].text;\n\n\nif(randomCombinationResult === 'Color-Noun'){\n rollResult = await colorTable.roll();\n \n part1 = rollResult.results[0].text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].text;\n}\nelse if(randomCombinationResult === 'Adjective-Noun'){\n rollResult = await adjectiveTable.roll();\n \n part1 = rollResult.results[0].text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].text;\n \n // if identical noun, re-try once\n if(part1 === part2){\n rollResult = await nounTable.roll();\n part2 = rollResult.results[0].text;\n }\n}\nelse if(randomCombinationResult === 'Noun-Noun'){\n rollResult = await nounTable.roll();\n \n part1 = rollResult.results[0].text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].text;\n}\nelse if(randomCombinationResult === 'Phonetic-Noun'){\n rollResult = await phoneticTable.roll();\n \n part1 = rollResult.results[0].text;\n \n rollResult = await nounTable.roll();\n \n part2 = rollResult.results[0].text;\n}\n\nfinalMessage += part1 + ' ' + part2;\n\nlet messageData = {\n flavor: finalMessage\n};\n\nChatMessage.create(messageData);", "folder": null, "sort": 0, "permission": { From 625066c0241d2fa4b335ecaff5dc08ed8f4942a1 Mon Sep 17 00:00:00 2001 From: TheLastScrub <67403321+TheLastScrub@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:32:04 -0700 Subject: [PATCH 3/3] vehicles Fixes #145 --- templates/actor/vehicle-sheet.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/actor/vehicle-sheet.html b/templates/actor/vehicle-sheet.html index 66a63fc..8728340 100644 --- a/templates/actor/vehicle-sheet.html +++ b/templates/actor/vehicle-sheet.html @@ -59,7 +59,7 @@ {{!-- GEAR Tab --}}
- {{> "systems/deltagreen/templates/actor/equipment-partial.html" }} + {{> "systems/deltagreen/templates/actor/partials/equipment-partial.html" }}
{{!-- About Tab --}}