Merge branch 'challengepack-ammonia' of https://github.com/suanjiansa…

…lt/Peacock into challengepack-ammonia
thepeacockproject · Aug 13, 2024 · a74eceb · a74eceb
2 parents 77db51c + 7b1e592
commit a74eceb
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git 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"
+                                    }
                                 ]
                             }
                         }

diff --git 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())