Made ChatSetAttr 1.8 inline parsing more explicit

Author: joesinghaus

ChatSetAttr/1.8/ChatSetAttr.js

@@ -1,5 +1,5 @@
 // ChatSetAttr version 1.8
-// Last Updated: 2018-07-13
+// Last Updated: 2018-07-15
 // A script to create, modify, or delete character attributes from the chat area or macros.
 // If you don't like my choices for --replace, you can edit the replacers variable at your own peril to change them.
 
@@ -696,12 +696,12 @@ var chatSetAttr = chatSetAttr || (function () {
 			}
 		},
 		handleInlineCommand = (msg) => {
-			const matches = msg.content.match(/!(?:set|mod|modb)attr\b[^{]*?(?:\s*--(?:[^{-]+?-?)*?{{[^}[\]]+\$\[\[(?:\d+)\]\][^}]*?}})+/g);
+			const command = msg.content.match(/!(set|mod|modb)attr .*?!!!/);
 
-			(matches || []).forEach(str => {
-				const mode = str.match(/^!(set|mod|modb)attr/),
-					newMsgContent = str.replace(/(--(?:[^{-]+?-?)*?){{[^}[\]]+\$\[\[(\d+)\]\][^}]*?}}/g, (_, pre, number) => {
-						return `${pre}$[[${number}]]`;
+			if (command) {
+				const mode = command[1],
+					newMsgContent = command[0].slice(0, -3).replace(/{{[^}[\]]+\$\[\[(\d+)\]\].*?}}/g, (_, number) => {
+						return `$[[${number}]]`;
 					});
 				const newMsg = {
 					content: newMsgContent,
@@ -711,9 +711,9 @@ var chatSetAttr = chatSetAttr || (function () {
 					processInlinerolls(newMsg),
 					msg.playerid,
 					msg.selected,
-					mode[1]
+					mode
 				);
-			});
+			}
 		},
 		// Main function, called after chat message input
 		handleInput = function (msg) {

ChatSetAttr/ChatSetAttr.js

@@ -1,5 +1,5 @@
 // ChatSetAttr version 1.8
-// Last Updated: 2018-07-13
+// Last Updated: 2018-07-15
 // A script to create, modify, or delete character attributes from the chat area or macros.
 // If you don't like my choices for --replace, you can edit the replacers variable at your own peril to change them.
 
@@ -696,12 +696,12 @@ var chatSetAttr = chatSetAttr || (function () {
 			}
 		},
 		handleInlineCommand = (msg) => {
-			const matches = msg.content.match(/!(?:set|mod|modb)attr\b[^{]*?(?:\s*--(?:[^{-]+?-?)*?{{[^}[\]]+\$\[\[(?:\d+)\]\][^}]*?}})+/g);
+			const command = msg.content.match(/!(set|mod|modb)attr .*?!!!/);
 
-			(matches || []).forEach(str => {
-				const mode = str.match(/^!(set|mod|modb)attr/),
-					newMsgContent = str.replace(/(--(?:[^{-]+?-?)*?){{[^}[\]]+\$\[\[(\d+)\]\][^}]*?}}/g, (_, pre, number) => {
-						return `${pre}$[[${number}]]`;
+			if (command) {
+				const mode = command[1],
+					newMsgContent = command[0].slice(0, -3).replace(/{{[^}[\]]+\$\[\[(\d+)\]\].*?}}/g, (_, number) => {
+						return `$[[${number}]]`;
 					});
 				const newMsg = {
 					content: newMsgContent,
@@ -711,9 +711,9 @@ var chatSetAttr = chatSetAttr || (function () {
 					processInlinerolls(newMsg),
 					msg.playerid,
 					msg.selected,
-					mode[1]
+					mode
 				);
-			});
+			}
 		},
 		// Main function, called after chat message input
 		handleInput = function (msg) {

ChatSetAttr/README.md

@@ -14,13 +14,13 @@ One of the following options must be specified; they determine which characters
 
 ## Inline commands
 
-It is possible to use some ChatSetAttr commands in the middle of a roll template, with some limitations. To do so, write the ChatSetAttr command between the properties of a roll template. If one of the attribute values is a whole roll template property, the first inline roll within that property will be used instead. It is easiest to illustrate how this works in an example:
+It is possible to use some ChatSetAttr commands in the middle of a roll template, with some limitations. To do so, write the ChatSetAttr command between the properties of a roll template, and end it "!!!". If one of the attribute values is a whole roll template property, the first inline roll within that property will be used instead. It is easiest to illustrate how this works in an example:
 
 ```null
-&{template:default} {{name=Cthulhu}} !modattr --silent --charid @{target|character_id} --sanity|-{{Sanity damage=[[2d10+2]]}} --corruption|{{Corruption=Corruption increases by [[1]]}} {{description=Text}}
+&{template:default} {{name=Cthulhu}} !modattr --silent --charid @{target|character_id} --sanity|-{{Sanity damage=[[2d10+2]]}} --corruption|{{Corruption=Corruption increases by [[1]]}}!!! {{description=Text}}
 ```
 
-This will decrease sanity by 2d10+2 and increase corruption by 1 for the character selected with the --charid @{target|character\_id} command. In order for the parsing to work correctly, all attributes specified by roll templates must come at at the end of the command (but they are not required to be at the end of the chat message).
+This will decrease sanity by 2d10+2 and increase corruption by 1 for the character selected with the --charid @{target|character\_id} command. **It is crucial** that the ChatSetAttr part of the command is ended by three exclamation marks like in the message above – this is how the script know when to stop interpreting the roll template as part of the ChatSetAttr command.
 
 ## Additional options