Merge branch 'Roll20:master' into master

Author: keithcurtis1

AttackMaster/5.0.5/attackMaster.js

@@ -114,14 +114,17 @@ API_Meta.AttackMaster={offset:Number.MAX_SAFE_INTEGER,lineCount:-1};
  * v5.0.4  26/09/2025  Fixed ranged two weapon penalty to be a penalty rather than a benefit!
  *                     Fixed scanForModifiers() priority selection and added saves as a new possible 
  *                     priority.
+ * v5.0.5  14/10/2025  Fixed the error introduced to scanForModifiers() by 5.0.4! Fixed AC calc on 
+ *                     changing player page and/or dropping token on map. Fixed crash if !attk called
+ *                     without a command or parameters.
  */
 
 var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 	'use strict'; 
-	var version = '5.0.4',
+	var version = '5.0.5',
 		author = 'Richard @ Damery',
 		pending = null;
-    const lastUpdate = 1758783460;
+    const lastUpdate = 1760686967;
 
 	/*
 	 * Define redirections for functions moved to the RPGMaster library
@@ -262,7 +265,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 						 version:4.04,
 						 avatar:'https://s3.amazonaws.com/files.d20.io/images/257656656/ckSHhNht7v3u60CRKonRTg/thumb.png?1638050703',
 						 bio:'<div style="font-weight: bold; text-align: center; border-bottom: 2px solid black;">'
-							+'<span style="font-weight: bold; font-size: 125%">AttackMaster Help v4.03</span>'
+							+'<span style="font-weight: bold; font-size: 125%">AttackMaster Help v4.04</span>'
 							+'</div>'
 							+'<div style="padding-left: 5px; padding-right: 5px; overflow: hidden;">'
 							+'<h1>Attack Master API v'+version+'</h1>'
@@ -2224,8 +2227,6 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 			isInnate = wt.includes('innate'),
 			isType = isInnate, isSuperType=false, isSameName=false, isSpecialist=false, isMastery=false;
 
-//		isType = isSuperType = isSameName = isSpecialist = isMastery = false;
-
 		if (classObjs[0].base === 'creature') return 0;
 
 		if (allowedWeap) {
@@ -2912,7 +2913,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 				  adj = (parseInt(thisData.adj || 0) + (dmgType !== 'nadj' ? parseInt(thisData[dmgType] || 0) : 0)),
 				  dexAdj = Math.floor(dexBonus * parseFloat(Math.max(thisData.dexBonus,0))),
 				  curDexAdj = Math.floor(dexBonus * parseFloat(Math.max(curBest.data.dexBonus,0))),
-				  acDiff = ((curBest.data.ac || 0) - (curBest.data.adj || 0) - (curDexAdj*dexBonus)) - (ac - adj - dexAdj);
+				  acDiff = ((curBest.data.ac || 0) - (curBest.data.adj || 0) - curDexAdj) - (ac - adj - dexAdj);
 			let   diff;
 
 			switch (priority) {
@@ -3530,8 +3531,6 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 					attkMacro	= '',
 					attkMacroDef, dmgMacroDef, qualifier, arTable;
 
-//				log('buildMWattkMacros: weapon '+weaponName+' dancing = '+dancing+', proficiency = '+proficiency);
-					
 				var parseMWattkMacro = function( args, charCS, attkType, macro ) {
 
 					var	attkAdvantage = (attrLookup(charCS,[fields.Magical_advantages[0]+tokenID,fields.Magical_advantages[1]])+'/////').split('/')[0],
@@ -7177,7 +7176,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 	 * of rounds or HP damage taken).
 	 */
 
-	async function doCheckMods( args, senderId, selected, silent=false ) {
+	async function doCheckMods( args, senderId, selected, silent=false, forceMod=false ) {
 
 		try {
 			if (!args) args=[];
@@ -7231,7 +7230,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 			let newThac0 = (baseThac0 - thac0Mod);
 //			log('doCheckMods: baseThac0 = '+handleGetBaseThac0(charCS)+', thac0Mod = '+thac0Mod+', newThac0 = '+newThac0+', currentThac0 = '+currentThac0+', currentMod = '+currentThac0Mod+', attrName = '+currentThac0Field.name+', barName = '+currentThac0Field.barName); 
 			if (currentThac0Field.name && currentThac0Field.barName.startsWith('bar')) {
-				if ((baseThac0 - currentThac0Mod) === currentThac0) {
+				if ((baseThac0 - currentThac0Mod) === currentThac0 || forceMod) {
 					curToken.set((currentThac0Field.barName+'_value'),newThac0);
 					curToken.set((currentThac0Field.barName+'_max'),'');
 				} else if (newThac0 !== currentThac0) {
@@ -7267,7 +7266,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 	 * if the two are different turn on the AC bar to indicate difference
 	 */
 
-	async function doCheckAC( args, senderId, selected, silent = false ) {
+	async function doCheckAC( args, senderId, selected, silent = false, forceAC = false ) {
 
 		try {
 			if (!args) args=[];
@@ -7408,15 +7407,31 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 			currentAC = getTokenValue(curToken,fields.Token_AC,fields.AC,fields.MonsterAC,fields.Thac0_base);
 //			log('doCheckAC: baseAC('+baseAC+')-dmgAdj.armoured.adj('+dmgAdj.armoured.adj+')-dexBonus('+dexBonus+')-styleBonus('+styleBonus+') = '+ac);
 //			log('doCheckAC: currentAC.val = '+currentAC.val+', newAC = '+newAC+', prevAC = '+prevAC+', so val changed to '+((isNaN(currentAC.val) || newAC) ? ac : (currentAC.val + ac - prevAC)));
-			currentAC.val = ((isNaN(currentAC.val) || newAC) ? ac : (currentAC.val + ac - prevAC));
+//			currentAC.val = ((isNaN(currentAC.val) || newAC) ? ac : (currentAC.val + ac - prevAC));
+//			if (currentAC.barName.startsWith('bar')) {
+//				if (currentAC.val != ac ) {
+//					curToken.set(currentAC.barName+'_max',ac);
+//				} else {
+//					curToken.set(currentAC.barName+'_max','');
+//				}
+//				curToken.set(currentAC.barName+'_value',currentAC.val);
+//			}
+
 			if (currentAC.barName.startsWith('bar')) {
-				if (currentAC.val != ac) {
-					curToken.set(currentAC.barName+'_max',ac);
-				} else {
+				prevAC = isNaN(prevAC) ? 10 : prevAC;
+				if (prevAC == currentAC.val || forceAC) {
+					curToken.set(currentAC.barName+'_value',ac);
 					curToken.set(currentAC.barName+'_max','');
-				}
-				curToken.set(currentAC.barName+'_value',currentAC.val);
-			}
+				} else {
+					currentAC.val = ((isNaN(currentAC.val)) ? ac : (currentAC.val + ac - prevAC));
+					if (currentAC.val != ac) {
+						curToken.set(currentAC.barName+'_max',ac);
+					} else {
+						curToken.set(currentAC.barName+'_max','');
+					}
+					curToken.set(currentAC.barName+'_value',currentAC.val);
+				};
+			};
 
 			setAttr( charCS, fields.StdAC, (ac+dmgAdj.armoured[dmgType]-dmgAdj.armoured.nadj) );
 			setAttr( charCS, fields.SlashAC, (ac+dmgAdj.armoured[dmgType]-dmgAdj.armoured.sadj) );
@@ -8663,7 +8678,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 		} else {
 			sendDebug('senderId is defined as ' + getObj('player',senderId).get('_displayname'));
 		};
-		if (!flags.noWaitMsg && !args[0].toLowerCase().startsWith('nowaitmsg')) sendWait(senderId,1,'attkMaster');
+		if (!flags.noWaitMsg && args[0] && !args[0].toLowerCase().startsWith('nowaitmsg')) sendWait(senderId,1,'attkMaster');
 
 		_.each(args, function(e) {
 			setTimeout( doAttkCmd, (1*t++), e, selected, senderId, isGM );
@@ -8818,8 +8833,8 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 					const defClass = (classObjs.length == 1 && classObjs[0].name == 'creature' && classObjs[0].level == 0);
 					if ((race && race.length) || !defClass) {
 						ModTable = moveMods( obj, charCS, ModTable );
-						doCheckAC( [obj.id], findTheGM(), [], true );
-						doCheckMods( [obj.id,'quiet'], findTheGM(), [], true );
+						doCheckAC( [obj.id], findTheGM(), [], true, true );
+						doCheckMods( [obj.id,'quiet'], findTheGM(), [], true, true );
 					}
 				}
 			}

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.4",
-    "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","5.0.3"],
+    "version": "5.0.5",
+    "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","5.0.3","5.0.4"],
     "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",