Merge pull request #14902 from Zen-Raven/Draw-Steel-Mar26-Updates

[Draw Steel] Bugfix and i18n update

Author: NorWhal

Draw Steel/draw-steel.html

@@ -4893,7 +4893,7 @@ <h2 data-i18n="standard-move-actions"></h2>
 
 			const characteristicTranslation = getTranslationByKey(directMap.characteristic) || directMap.characteristic;
 
-			const name = !directMap.name ? '{{name=' + characteristicTranslation + ` ` + powerRollTranslation + '}} ': '';
+			const name = !directMap.name ? `{{name=${characteristicTranslation} ${t['power-roll']}}} `: '';
 			rollString += [
 				'[[ [[2d10cs>11cf<0]][2d10]',
 				`+ [[${rollValueMap.characteristicValue}[${characteristicTranslation}]]][${characteristicTranslation}]`,
@@ -5298,10 +5298,7 @@ <h2 data-i18n="standard-move-actions"></h2>
 		 * )
 		 * )?                  : End Optional group (the "?" makes "3 damage" work).
 		 */
-		const damageRegex = new RegExp(
-			`^(\\d+)(?:\\s*\\+\\s*([${charList}](?:[\\s,]+(?:${orTrans}\\s+)?[${charList}]) *))?`, 
-			"i"
-		);
+		const damageRegex = new RegExp(`^(\\d+)(?:\\s*\\+\\s*([${charList}](?:[\\s,]+(?:${orTrans}\\s+)?[${charList}])*))?`, "");
 
 		const match = rawDamage.trim().match(damageRegex);
 		if (!match) return tierEffect;
@@ -6152,17 +6149,22 @@ <h2 data-i18n="standard-move-actions"></h2>
 				importMonster(data, []);
 			} else if (data.hasOwnProperty('monsters')) {
 				// iterate through the monsters and add them to a list.
-				let queryString = "!{{template:default}}{{ask=![[?{Monster to Import";
+				
+				let queryString = `!{{template:default}}{{ask=![[?{${getTranslationByKey('import-monster')}|${getTranslationByKey('import-select-prompt')},-1`;
 				for (const [index, monster] of data.monsters.entries()) {
 
-					queryString += "|" + monster.name + ", " + index.toString();
+					queryString += '|' + monster.name + ', ' + index.toString();
 				}
-				queryString += "}]]}}";
+				queryString += '}]]}}';
 
 				// Use a roll to provide the user with an choice of the monsters in the
 				const results = await startRoll(queryString);
 				finishRoll( results.rollId );
 				const choice = results.results.ask.result;
+				if (parseInt(choice) < 0) {
+					console.log('Invalid monster selection');
+					return;
+				}
 				await importMonster(data.monsters[choice], data.malice);
 				console.log(data.monsters[choice].name);
 			}
@@ -6178,6 +6180,12 @@ <h2 data-i18n="standard-move-actions"></h2>
 	 * @param {object} data the loaded and validated JSON file
 	 **/
 	async function importPlayer(data) {
+		console.log('~~~ importPlayer ~~~');
+		
+		if (!data) {
+			console.log('No Player Data Found');
+			return;
+		}
 		const {
 			name: character_name,
 			ancestry,
@@ -6376,6 +6384,12 @@ <h2 data-i18n="standard-move-actions"></h2>
 	 **/
 
 	async function importMonster(data, malice) {
+		console.log('~~~ importMonster ~~~');
+		
+		if (!data) {
+			console.log('No Monster Data Found');
+			return;
+		}
 		const {
 			name, level, characteristics, keywords, role: dataRole, 
 			size: dataSize, speed: dataSpeed, stability, stamina, 

Draw Steel/translation.json

@@ -565,5 +565,6 @@
 	"roll-surge-potency": "Using Surges for Potency",
 	"roll-surge-potency-desc": "Surges used to increase potency by 1",
 	"roll-resource-gain": "Gain",
-	"damage-calc-or": "or"
+	"damage-calc-or": "or",
+	"import-select-prompt": "Select One"
 }