Skip to content

Commit d365ed6

Browse files
DameryDadDameryDad
committed
Added --noWaitMsg to --hsq requests
1 parent ee0a840 commit d365ed6

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

‎AttackMaster/5.0.3/attackMaster.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,16 @@ API_Meta.AttackMaster={offset:Number.MAX_SAFE_INTEGER,lineCount:-1};
109109
* parsing and enactment. Fix situational mod for save vs. dodgeable attack.
110110
* Fix changing ring table update.
111111
* v5.0.2 13/09/2025 Fixed assignment to a constant in buildRogueRoll().
112-
* v5.0.3 23/09/2025 Corrected Two Weapon Style Specialisation to not apply for ranged weapons.
112+
* v5.0.3 23/09/2025 Corrected Two Weapon Style Specialisation to not apply for ranged weapons. Added
113+
* --noWaitMsg command to suppress spurious Please Wait messages.
113114
*/
114115

115116
var attackMaster = (function() { // eslint-disable-line no-unused-vars
116117
'use strict';
117118
var version = '5.0.3',
118119
author = 'Richard @ Damery',
119120
pending = null;
120-
const lastUpdate = 1758697790;
121+
const lastUpdate = 1758783460;
121122

122123
/*
123124
* Define redirections for functions moved to the RPGMaster library
@@ -1108,7 +1109,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
11081109
**/
11091110

11101111
var issueHandshakeQuery = function( api, cmd ) {
1111-
var handshake = '!'+api+' --hsq attk'+((cmd && cmd.length) ? ('|'+cmd) : '');
1112+
var handshake = '!'+api+' --noWaitMsg --hsq attk'+((cmd && cmd.length) ? ('|'+cmd) : '');
11121113
sendAPI(handshake);
11131114
if (_.isUndefined(apiCommands[api])) apiCommands[api] = {};
11141115
apiCommands[api].exists = false;
@@ -3004,17 +3005,17 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
30043005
acValues.armour.magic = parseInt(acData.adj||0)!==0;
30053006
}
30063007
acValues = _.omit( acValues, function(item,iClass) {
3007-
let itemRules = item.data.rules.toLowerCase();
3008+
const itemRules = item.data.rules.toLowerCase().replace(/[_\s]/g, '').split('|').map(r => r.replace(/\-/g,(match,i,s)=>(i>0?'':match)));
30083009

3009-
if (itemClass === 'armour' && acValues.armour.magic && item.data.rules.includes('-magic')) {
3010+
if (itemClass === 'armour' && acValues.armour.magic && itemRules.includes('-magic')) {
30103011
armourMsg.push(item.name+' cannot be used alongside magical armour');
30113012
return true;
30123013
}
3013-
if (itemClass === 'armour' && (item.data.rules.includes('-'+itemSuperType) || (item.data.rules.includes('-acall') && !item.data.rules.includes('+'+itemSuperType)))) {
3014+
if (itemClass === 'armour' && (itemRules.includes('-'+itemSuperType) || (itemRules.includes('-acall') && !itemRules.includes('+'+itemSuperType)))) {
30143015
armourMsg.push(item.name+' cannot be used alongside '+acValues.armour.specs[4]);
30153016
return true;
30163017
}
3017-
if (item.data.rules.includes('-'+itemClass)) {
3018+
if (itemRules.includes('-'+itemClass)) {
30183019
armourMsg.push(item.name+' cannot be used alongside '+itemName);
30193020
return true;
30203021
}
@@ -8333,7 +8334,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
83338334
var from = args[0] || '',
83348335
func = args[1] || '',
83358336
funcTrue = ['menu','other-menu','attk-hit','attk-roll','attk-target','weapon','dance','mod-weapon','quiet-modweap','ammo','setammo','checkac','save','help','check-db','debug'].includes(func.toLowerCase()),
8336-
cmd = '!'+from+' --hsr attk'+((func && func.length) ? ('|'+func+'|'+funcTrue) : '');
8337+
cmd = '!'+from+' --noWaitMsg --hsr attk'+((func && func.length) ? ('|'+func+'|'+funcTrue) : '');
83378338

83388339
sendAPI(cmd);
83398340
return;

‎AttackMaster/attackMaster.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,16 @@ API_Meta.AttackMaster={offset:Number.MAX_SAFE_INTEGER,lineCount:-1};
109109
* parsing and enactment. Fix situational mod for save vs. dodgeable attack.
110110
* Fix changing ring table update.
111111
* v5.0.2 13/09/2025 Fixed assignment to a constant in buildRogueRoll().
112-
* v5.0.3 23/09/2025 Corrected Two Weapon Style Specialisation to not apply for ranged weapons.
112+
* v5.0.3 23/09/2025 Corrected Two Weapon Style Specialisation to not apply for ranged weapons. Added
113+
* --noWaitMsg command to suppress spurious Please Wait messages.
113114
*/
114115

115116
var attackMaster = (function() { // eslint-disable-line no-unused-vars
116117
'use strict';
117118
var version = '5.0.3',
118119
author = 'Richard @ Damery',
119120
pending = null;
120-
const lastUpdate = 1758697790;
121+
const lastUpdate = 1758783460;
121122

122123
/*
123124
* Define redirections for functions moved to the RPGMaster library
@@ -1108,7 +1109,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
11081109
**/
11091110

11101111
var issueHandshakeQuery = function( api, cmd ) {
1111-
var handshake = '!'+api+' --hsq attk'+((cmd && cmd.length) ? ('|'+cmd) : '');
1112+
var handshake = '!'+api+' --noWaitMsg --hsq attk'+((cmd && cmd.length) ? ('|'+cmd) : '');
11121113
sendAPI(handshake);
11131114
if (_.isUndefined(apiCommands[api])) apiCommands[api] = {};
11141115
apiCommands[api].exists = false;
@@ -3004,17 +3005,17 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
30043005
acValues.armour.magic = parseInt(acData.adj||0)!==0;
30053006
}
30063007
acValues = _.omit( acValues, function(item,iClass) {
3007-
let itemRules = item.data.rules.toLowerCase();
3008+
const itemRules = item.data.rules.toLowerCase().replace(/[_\s]/g, '').split('|').map(r => r.replace(/\-/g,(match,i,s)=>(i>0?'':match)));
30083009

3009-
if (itemClass === 'armour' && acValues.armour.magic && item.data.rules.includes('-magic')) {
3010+
if (itemClass === 'armour' && acValues.armour.magic && itemRules.includes('-magic')) {
30103011
armourMsg.push(item.name+' cannot be used alongside magical armour');
30113012
return true;
30123013
}
3013-
if (itemClass === 'armour' && (item.data.rules.includes('-'+itemSuperType) || (item.data.rules.includes('-acall') && !item.data.rules.includes('+'+itemSuperType)))) {
3014+
if (itemClass === 'armour' && (itemRules.includes('-'+itemSuperType) || (itemRules.includes('-acall') && !itemRules.includes('+'+itemSuperType)))) {
30143015
armourMsg.push(item.name+' cannot be used alongside '+acValues.armour.specs[4]);
30153016
return true;
30163017
}
3017-
if (item.data.rules.includes('-'+itemClass)) {
3018+
if (itemRules.includes('-'+itemClass)) {
30183019
armourMsg.push(item.name+' cannot be used alongside '+itemName);
30193020
return true;
30203021
}
@@ -8333,7 +8334,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars
83338334
var from = args[0] || '',
83348335
func = args[1] || '',
83358336
funcTrue = ['menu','other-menu','attk-hit','attk-roll','attk-target','weapon','dance','mod-weapon','quiet-modweap','ammo','setammo','checkac','save','help','check-db','debug'].includes(func.toLowerCase()),
8336-
cmd = '!'+from+' --hsr attk'+((func && func.length) ? ('|'+func+'|'+funcTrue) : '');
8337+
cmd = '!'+from+' --noWaitMsg --hsr attk'+((func && func.length) ? ('|'+func+'|'+funcTrue) : '');
83378338

83388339
sendAPI(cmd);
83398340
return;

0 commit comments

Comments
 (0)