Merge branch 'Roll20:master' into master

Author: keithcurtis1

AttackMaster/5.0.3/attackMaster.js

@@ -109,14 +109,16 @@ API_Meta.AttackMaster={offset:Number.MAX_SAFE_INTEGER,lineCount:-1};
  *                     parsing and enactment. Fix situational mod for save vs. dodgeable attack.
  *                     Fix changing ring table update.
  * v5.0.2  13/09/2025  Fixed assignment to a constant in buildRogueRoll().
+ * v5.0.3  23/09/2025  Corrected Two Weapon Style Specialisation to not apply for ranged weapons. Added
+ *                     --noWaitMsg command to suppress spurious Please Wait messages.
  */
 
 var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 	'use strict'; 
-	var version = '5.0.2',
+	var version = '5.0.3',
 		author = 'Richard @ Damery',
 		pending = null;
-    const lastUpdate = 1757793054;
+    const lastUpdate = 1758783460;
 
 	/*
 	 * Define redirections for functions moved to the RPGMaster library
@@ -1107,7 +1109,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 	 **/
 
 	var issueHandshakeQuery = function( api, cmd ) {
-		var handshake = '!'+api+' --hsq attk'+((cmd && cmd.length) ? ('|'+cmd) : '');
+		var handshake = '!'+api+' --noWaitMsg --hsq attk'+((cmd && cmd.length) ? ('|'+cmd) : '');
 		sendAPI(handshake);
 		if (_.isUndefined(apiCommands[api])) apiCommands[api] = {};
 		apiCommands[api].exists = false;
@@ -3003,17 +3005,17 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 								acValues.armour.magic = parseInt(acData.adj||0)!==0;
 							}
 							acValues = _.omit( acValues, function(item,iClass) {
-								let itemRules = item.data.rules.toLowerCase();
+								const itemRules = item.data.rules.toLowerCase().replace(/[_\s]/g, '').split('|').map(r => r.replace(/\-/g,(match,i,s)=>(i>0?'':match)));
 
-								if (itemClass === 'armour' && acValues.armour.magic && item.data.rules.includes('-magic')) {
+								if (itemClass === 'armour' && acValues.armour.magic && itemRules.includes('-magic')) {
 									armourMsg.push(item.name+' cannot be used alongside magical armour');
 									return true;
 								}
-								if (itemClass === 'armour' && (item.data.rules.includes('-'+itemSuperType) || (item.data.rules.includes('-acall') && !item.data.rules.includes('+'+itemSuperType)))) {
+								if (itemClass === 'armour' && (itemRules.includes('-'+itemSuperType) || (itemRules.includes('-acall') && !itemRules.includes('+'+itemSuperType)))) {
 									armourMsg.push(item.name+' cannot be used alongside '+acValues.armour.specs[4]);
 									return true;
 								}
-								if (item.data.rules.includes('-'+itemClass)) {
+								if (itemRules.includes('-'+itemClass)) {
 									armourMsg.push(item.name+' cannot be used alongside '+itemName);
 									return true;
 								}
@@ -3803,7 +3805,9 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 			magicDmgAdj = (parseInt(attrLookup( charCS, [fields.Magical_dmgAdj[0]+tokenID,fields.Magical_dmgAdj[1],undefined],null,null,null,null,false) || attrLookup( charCS, fields.Magical_dmgAdj )) || 0)
 						+ (parseInt(attrLookup( charCS, fields.Legacy_dmgAdj )) || 0),
 			primeWeapon = attrLookup( charCS, fields.Primary_weapon ) || 0,
-			twPen		= Math.min(parseFloat(attrLookup( charCS, fields.TwoWeapStylePenalty ) || 9.9), classes.map(c => parseFloat(c.classData.twoWeapPen)).reduce((prev,cur) => (Math.min(prev,cur)))),
+			twPen			= String(classes.map(c => parseFloat(c.classData.twoWeapPen)).reduce((prev,cur) => (Math.min(prev,cur)))),    // Two Weapon Style Specialisation benefits do not apply to ranged weapons
+																																		  // (Complete Fighters Handbook > Combat > Fighting Styles)
+//			twPen			= String(Math.min(parseFloat(attrLookup( charCS, fields.TwoWeapStylePenalty ) || 9.9), classes.map(c => parseFloat(c.classData.twoWeapPen)).reduce((prev,cur) => (Math.min(prev,cur))))),
 			twoWeapPenalty = (ranger || primeWeapon < 1) ? 0 : (((rwIndex*2)+(fields.RW_table[1]==0?2:4)) == primeWeapon ? Math.floor(twPen) : Math.floor((10*twPen)%10)),
 			proficiency = dancing != 1 ? proficient( charCS, weaponName, rwType, rwSuperType ) : tableInfo.RANGED.tableLookup( fields.RW_dancingProf, rwIndex ),
 			race		= raceMods( charCS, rwType, rwSuperType ),
@@ -8330,7 +8334,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 		var from = args[0] || '',
 			func = args[1] || '',
 			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()),
-			cmd = '!'+from+' --hsr attk'+((func && func.length) ? ('|'+func+'|'+funcTrue) : '');
+			cmd = '!'+from+' --noWaitMsg --hsr attk'+((func && func.length) ? ('|'+func+'|'+funcTrue) : '');
 
 		sendAPI(cmd);
 		return;
@@ -8601,6 +8605,8 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 						// RED: v1.207 allow anyone to set debug and who to send debug messages to
 						doSetDebug(argString,senderId);
 						break;
+					case 'nowaitmsg':
+						break;
 					default:
 						showHelp(); 
 						sendFeedback('<span style="color: red;">Invalid command " <b>'+msg.content+'</b> "</span>',flags.feedbackName,flags.feedbackImg);
@@ -8648,7 +8654,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 		} else {
 			sendDebug('senderId is defined as ' + getObj('player',senderId).get('_displayname'));
 		};
-		if (!flags.noWaitMsg) sendWait(senderId,1,'attkMaster');
+		if (!flags.noWaitMsg && !args[0].toLowerCase().startsWith('nowaitmsg')) sendWait(senderId,1,'attkMaster');
 
 		_.each(args, function(e) {
 			setTimeout( doAttkCmd, (1*t++), e, selected, senderId, isGM );
@@ -8666,6 +8672,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 
 	var cmdMasterRegister = function() {
 		var cmd = fields.commandMaster
+				+ ' --noWaitMsg'
 				+ ' --register Attack_hit|Do an attack where Roll20 rolls the dice|attk|~~attk-hit|`{selected|token_id}'
 				+ ' --register Attack_roll|Do an attack where player rolls the dice|attk|~~attk-roll|`{selected|token_id}'
 				+ ' --register Attack_target|Do an attack with full target statistics (GM-only)|attk|~~attk-target|`{selected|token_id}'

AttackMaster/attackMaster.js

@@ -2,8 +2,8 @@
     "$schema": "https://github.com/DameryDad/roll20-api-scripts/blob/AttackMaster/AttackMaster/Script.json",
     "name": "AttackMaster",
     "script": "attackMaster.js",
-    "version": "5.0.2",
-    "previousversions": ["1.036","1.038","1.039","1.041","1.042","2.046","1.3.00","1.3.01","1.3.02","1.3.03","1.4.01","1.4.02","1.4.03","1.4.04","1.4.05","1.4.06","1.4.07","1.5.01","1.5.02","1.5.03","2.1.0","2.2.0","2.3.0","2.3.1","2.3.2","2.3.3","3.0.0","3.1.2","3.2.0","3.2.1","3.3.0","3.4.0","3.5.0","4.0.1","4.0.2","4.0.3","4.0.4","5.0.0","5.0.1"],
+    "version": "5.0.3",
+    "previousversions": ["1.036","1.038","1.039","1.041","1.042","2.046","1.3.00","1.3.01","1.3.02","1.3.03","1.4.01","1.4.02","1.4.03","1.4.04","1.4.05","1.4.06","1.4.07","1.5.01","1.5.02","1.5.03","2.1.0","2.2.0","2.3.0","2.3.1","2.3.2","2.3.3","3.0.0","3.1.2","3.2.0","3.2.1","3.3.0","3.4.0","3.5.0","4.0.1","4.0.2","4.0.3","4.0.4","5.0.0","5.0.1","5.0.2"],
     "description": "AttackMaster API for AD&D 2E provides functions to manage weapons, armour & shields, including taking weapons in hand and using them to attack, ranged weapon range and ammo management; penalties & bonuses for non-proficiency, proficiency, specialisation & mastery; 1-handed, 2-handed or many-handed weapons, and multi-weapon attacks.\n[AttackMaster Documentation](https://wiki.roll20.net/Script:AttackMaster) \n\n### Related APIs\nThis API works best with the RPGMaster series of APIs\n[RPGMaster Documentation](https://wiki.roll20.net/RPGMaster) \n\n### Getting Started\n* After installation, add the commands `!attk --menu` and `!attk --other-menu` as Ability Macros on Character Sheets of Characters, NPCs & Monsters that will use the API, and tick 'Show as Token Action'.  These menus will then be available to Players controlling those sheets and give access to all common commands used in game-play.",
     "authors": "Richard E.",
     "roll20userid": "6497708",