Merge branch 'master' into fix-gdpath-read

readme.txt

@@ -19,4 +19,9 @@ HOW TO USE:
 ===
 
 If the program closes as soon as you open it, that means it crashed.
-A file called crash_log.txt will be created - send it to Colon and he'll hopefully get around to fixing it.
+A file called crash_log.txt will be created - send it to Colon and he'll hopefully get around to fixing it.
+
+===
+
+Mac/Linux/non-Windows users, or if the game is installed in a nonstandard location:
+Replace the directory in directory.txt with whereever the game's Resources folder is located on your system, or simply pass it as a command-line argument.

shuffle.js

@@ -36,8 +36,10 @@ let iconRegex = /^.+?_(\d+?)_.+/
 let forms = assets.forms
 let sheetList = Object.keys(assets.sheets)
 let glowName = sheetList.filter(x => x.startsWith('GJ_GameSheetGlow'))
+
 // newlines/CRs are usually present in text files, strip them out so they aren't part of the pathname
-let gdPath = fs.readFileSync('directory.txt', 'utf8').replace(/[\n\r]/g, '')
+let gdPath = process.argv[2] ?? fs.readFileSync('directory.txt', 'utf8').replace(/[\n\r]/g, '')
+
 if (!fs.existsSync(gdPath)) throw "Couldn't find your GD directory! Make sure to enter the correct file path in directory.txt"  
 let glowPlist = fs.readFileSync(`${gdPath}/${glowName[0]}.plist`, 'utf8')
 let sheetNames = sheetList.filter(x => !glowName.includes(x))