Merge branch 'Roll20:master' into master

Author: keithcurtis1

AttackMaster/5.3.2/attackMaster.js

@@ -128,14 +128,15 @@ API_Meta.AttackMaster={offset:Number.MAX_SAFE_INTEGER,lineCount:-1};
  *                     Fix to One Hander fighting style.
  * v5.3.1  12/05/2026  Correted behaviour of mods when a token is deleted to be same as RoundMaster
  *                     effects & statuses. Fixed doSetMods() to cater for deleting mob tokens with running mods.
+ * v5.3.2  20/05/2026  Fix default encumbrance for attack macros.
  */
 
 var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 	'use strict'; 
-	var version = '5.3.1',
+	var version = '5.3.2',
 		author = 'Richard @ Damery',
 		pending = null;
-    const lastUpdate = 1777318205;
+    const lastUpdate = 1779252799;
 
 	/*
 	 * Define redirections for functions moved to the RPGMaster library
@@ -3702,7 +3703,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 						magicattkadj:	String(thac0Bar.name && thac0Bar.barName.startsWith('bar') ? (thac0 - thac0Bar.val) : ((attrLookup( charCS, fields.Magical_hitAdj ) || 0) + (attrLookup( charCS, [fields.Magical_hitAdj[0]
 										+ tokenID, fields.Magical_hitAdj[1], fields.Magical_hitAdj[2]] ) || 0) + (attrLookup( charCS, fields.Legacy_hitAdj ) || 0))),
 						twoweappenalty:	String((ranger || primeWeapon < 1) ? 0 : (-1*(((mwIndex*2)+(fields.MW_table[1]==0?1:3)) == primeWeapon ? Math.floor(twPen) : Math.floor((10*twPen)%10)))),
-						encumbrance:	String(encumberDef.attack[parseInt(attrLookup(charCS,fields.Encumbrance)) || 0]),
+						encumbrance:	String(encumberDef.attack[parseInt(attrLookup(charCS,fields.Encumbrance)) || 0] || 0),
 						weapdmgadj:		(tableInfo.DMG.tableLookup( fields.Dmg_adj, mwIndex ) || '0'),
 						weapstyledmgadj:tableInfo.DMG.tableLookup( fields.Dmg_styleAdj, mwIndex ),
 						magicdmgadj:	String((parseInt(attrLookup(charCS,[fields.Magical_dmgAdj[0]+tokenID,fields.Magical_dmgAdj[1],undefined],{def:false}) || attrLookup( charCS, fields.Magical_dmgAdj )) || 0) 
@@ -4003,7 +4004,7 @@ var attackMaster = (function() {	// eslint-disable-line no-unused-vars
 			magicattkadj:			String(thac0Bar.name && thac0Bar.barName.startsWith('bar') ? (thac0 - thac0Bar.val) : ((attrLookup( charCS, fields.Magical_hitAdj ) || 0) + (attrLookup( charCS, [fields.Magical_hitAdj[0]
 									+tokenID,fields.Magical_hitAdj[1], fields.Magical_hitAdj[2]] ) || 0) + (attrLookup( charCS, fields.Legacy_hitAdj ) || 0))),
 			twoweappenalty:			String((ranger || primeWeapon < 1) ? 0 : (-1*(((rwIndex*2)+(fields.RW_table[1]==0?2:4)) == primeWeapon ? Math.floor(twPen) : Math.floor((10*twPen)%10)))),
-			encumbrance:			String(encumberDef.attack[parseInt(attrLookup(charCS,fields.Encumbrance)) || 0]),
+			encumbrance:			String(encumberDef.attack[parseInt(attrLookup(charCS,fields.Encumbrance)) || 0] || 0),
 			ammodmgadj:				String((tableInfo.AMMO.tableLookup( fields.Ammo_adj, ammoIndex ) + (weapDmgAdj ? attkAdj : ''))),
 			ammostyledmgadj:		tableInfo.AMMO.tableLookup( fields.Ammo_styleAdj, ammoIndex ),
 			magicdmgadj:			String((parseInt(attrLookup( charCS, [fields.Magical_dmgAdj[0]+tokenID,fields.Magical_dmgAdj[1],undefined],{def:false}) || attrLookup( charCS, fields.Magical_dmgAdj )) || 0)

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.3.1",
-    "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","5.0.5","5.0.6","5.3.0"],
+    "version": "5.3.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","5.0.2","5.0.3","5.0.4","5.0.5","5.0.6","5.3.0","5.3.1"],
     "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",

AttackMaster/script.json

@@ -0,0 +1,9 @@
+# Enforce LF line endings for all text files in this project
+* text=auto eol=lf
+
+# Treat these as binary to avoid any line-ending normalisation
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary

CombatEncounterDirector/.gitattributes

@@ -0,0 +1,6 @@
+
+node_modules
+
+*.zip
+*alpha*
+*beta*

CombatEncounterDirector/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+package-lock.json

CombatEncounterDirector/.prettierignore

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "printWidth": 100
+}