Skip to content

Commit ee0a840

Browse files
committed
Added --noWaitMsg command
1 parent fadeb18 commit ee0a840

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

AttackMaster/5.0.3/attackMaster.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8604,6 +8604,8 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
86048604
// RED: v1.207 allow anyone to set debug and who to send debug messages to
86058605
doSetDebug(argString,senderId);
86068606
break;
8607+
case 'nowaitmsg':
8608+
break;
86078609
default:
86088610
showHelp();
86098611
sendFeedback('<span style="color: red;">Invalid command " <b>'+msg.content+'</b> "</span>',flags.feedbackName,flags.feedbackImg);
@@ -8651,7 +8653,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
86518653
} else {
86528654
sendDebug('senderId is defined as ' + getObj('player',senderId).get('_displayname'));
86538655
};
8654-
if (!flags.noWaitMsg) sendWait(senderId,1,'attkMaster');
8656+
if (!flags.noWaitMsg && !args[0].toLowerCase().startsWith('nowaitmsg')) sendWait(senderId,1,'attkMaster');
86558657

86568658
_.each(args, function(e) {
86578659
setTimeout( doAttkCmd, (1*t++), e, selected, senderId, isGM );
@@ -8669,6 +8671,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
86698671

86708672
var cmdMasterRegister = function() {
86718673
var cmd = fields.commandMaster
8674+
+ ' --noWaitMsg'
86728675
+ ' --register Attack_hit|Do an attack where Roll20 rolls the dice|attk|~~attk-hit|`{selected|token_id}'
86738676
+ ' --register Attack_roll|Do an attack where player rolls the dice|attk|~~attk-roll|`{selected|token_id}'
86748677
+ ' --register Attack_target|Do an attack with full target statistics (GM-only)|attk|~~attk-target|`{selected|token_id}'

AttackMaster/attackMaster.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8604,6 +8604,8 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
86048604
// RED: v1.207 allow anyone to set debug and who to send debug messages to
86058605
doSetDebug(argString,senderId);
86068606
break;
8607+
case 'nowaitmsg':
8608+
break;
86078609
default:
86088610
showHelp();
86098611
sendFeedback('<span style="color: red;">Invalid command " <b>'+msg.content+'</b> "</span>',flags.feedbackName,flags.feedbackImg);
@@ -8651,7 +8653,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
86518653
} else {
86528654
sendDebug('senderId is defined as ' + getObj('player',senderId).get('_displayname'));
86538655
};
8654-
if (!flags.noWaitMsg) sendWait(senderId,1,'attkMaster');
8656+
if (!flags.noWaitMsg && !args[0].toLowerCase().startsWith('nowaitmsg')) sendWait(senderId,1,'attkMaster');
86558657

86568658
_.each(args, function(e) {
86578659
setTimeout( doAttkCmd, (1*t++), e, selected, senderId, isGM );
@@ -8669,6 +8671,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
86698671

86708672
var cmdMasterRegister = function() {
86718673
var cmd = fields.commandMaster
8674+
+ ' --noWaitMsg'
86728675
+ ' --register Attack_hit|Do an attack where Roll20 rolls the dice|attk|~~attk-hit|`{selected|token_id}'
86738676
+ ' --register Attack_roll|Do an attack where player rolls the dice|attk|~~attk-roll|`{selected|token_id}'
86748677
+ ' --register Attack_target|Do an attack with full target statistics (GM-only)|attk|~~attk-target|`{selected|token_id}'

0 commit comments

Comments
 (0)