From 342858d2811229127577e98cea4c9c9f8c32ef9a Mon Sep 17 00:00:00 2001 From: AnthonyFuller <24512050+AnthonyFuller@users.noreply.github.com> Date: Tue, 13 Aug 2024 04:19:01 +0100 Subject: [PATCH 1/2] Allow usage of path for rebuildLocale --- resources/rebuildLocale.cjs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/rebuildLocale.cjs b/resources/rebuildLocale.cjs index 7b68cf6e3..a3e7ec779 100644 --- a/resources/rebuildLocale.cjs +++ b/resources/rebuildLocale.cjs @@ -19,8 +19,10 @@ const fs = require("fs") const { execSync } = require("child_process") -const rpkgCli = `"resources/rpkg-cli.exe"` -const hmlt = `"resources/HMLanguageTools.exe"` +const usePath = process.env.USE_PATH === "true" + +const rpkgCli = usePath ? "rpkg-cli" : `"resources/rpkg-cli.exe"` +const hmlt = usePath ? "HMLanguageTools" : `"resources/HMLanguageTools.exe"` const locale = JSON.parse(fs.readFileSync("resources/locale.json").toString()) From 7b1e59228b094bea05db8f0d5525741994aa13ed Mon Sep 17 00:00:00 2001 From: AnthonyFuller Date: Tue, 13 Aug 2024 04:47:29 +0100 Subject: [PATCH 2/2] fix(ammonia/abandoned): allow for starting suits --- contractdata/MUMBAI/_MUMBAI_CHALLENGES.json | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json index 2310e6a54..3cf35e872 100644 --- a/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json +++ b/contractdata/MUMBAI/_MUMBAI_CHALLENGES.json @@ -6702,6 +6702,33 @@ }, "Transition": "Success" } + ], + "StartingSuit": [ + { + "Condition": { + "$any": { + "in": "$.EligibleDisguises", + "?": { + "$eq": ["$.#", "$Value"] + } + } + }, + "Actions": { + "$pushunique": [ + "DisguiseEquipped", + "$Value" + ] + } + }, + { + "Condition": { + "$eq": [ + "($.EligibleDisguises).Count", + "($.DisguiseEquipped).Count" + ] + }, + "Transition": "Success" + } ] } }