Skip to content

Commit d5acbea

Browse files
committed
Fix char sheet version check for 5e characters
* If a 5e (or other D&D version) character was loaded or transmogrified, the system would crash on checking the sheet version. Fixed.
1 parent dc7a10b commit d5acbea

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

AttackMaster/2.1.0/attackMaster.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,7 @@ var attackMaster = (function() {
18841884
return new Promise(resolve => {
18851885

18861886
try {
1887-
var errFlag = doCheckAC( [tokenID], findTheGM(), [], true );
1887+
var errFlag = doCheckAC( [tokenID,'quiet'], findTheGM(), [], true );
18881888
} catch (e) {
18891889
log('AttackMaster checkACvars: JavaScript '+e.name+': '+e.message+' while checking AC for tokenID '+tokenID);
18901890
sendDebug('AttackMaster checkACvars: JavaScript '+e.name+': '+e.message+' while checking AC for tokenID '+tokenID);
@@ -6273,7 +6273,7 @@ var attackMaster = (function() {
62736273

62746274
// set rogue activity percentages
62756275

6276-
let csVersion = attrLookup(charCS,fields.csVersion).match(/(\d+)\.?(\d*)/);
6276+
let csVersion = String(attrLookup(charCS,fields.csVersion) || 4.17).match(/(\d+)\.?(\d*)/);
62776277
let modTag = (csVersion[1] >= 4 && (!csVersion[2] || csVersion[2] >= 17)) ? fields.Armor_mod_417 : fields.Armor_mod_416;
62786278

62796279
setAttr( charCS, [fields.Pick_Pockets[0]+modTag,fields.Pick_Pockets[1]], acValues.armour.data.ppa );
@@ -6287,7 +6287,7 @@ var attackMaster = (function() {
62876287
setAttr( charCS, [fields.Legend_Lore[0]+modTag,fields.Legend_Lore[1]], acValues.armour.data.iba );
62886288
setAttr( charCS, fields.Armor_name, acValues.armour.data.racname);
62896289

6290-
if (!silent || ((ac != prevAC) && !magicItem)) {
6290+
if ((silentCmd !== 'quiet') && (!silent || ((ac != prevAC) && !magicItem))) {
62916291
makeACDisplay( args, senderId, ac, dmgAdj, acValues, armourMsgs );
62926292
} else {
62936293
sendWait(senderId,0);

AttackMaster/attackMaster.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,7 @@ var attackMaster = (function() {
18841884
return new Promise(resolve => {
18851885

18861886
try {
1887-
var errFlag = doCheckAC( [tokenID], findTheGM(), [], true );
1887+
var errFlag = doCheckAC( [tokenID,'quiet'], findTheGM(), [], true );
18881888
} catch (e) {
18891889
log('AttackMaster checkACvars: JavaScript '+e.name+': '+e.message+' while checking AC for tokenID '+tokenID);
18901890
sendDebug('AttackMaster checkACvars: JavaScript '+e.name+': '+e.message+' while checking AC for tokenID '+tokenID);
@@ -6273,7 +6273,7 @@ var attackMaster = (function() {
62736273

62746274
// set rogue activity percentages
62756275

6276-
let csVersion = attrLookup(charCS,fields.csVersion).match(/(\d+)\.?(\d*)/);
6276+
let csVersion = String(attrLookup(charCS,fields.csVersion) || 4.17).match(/(\d+)\.?(\d*)/);
62776277
let modTag = (csVersion[1] >= 4 && (!csVersion[2] || csVersion[2] >= 17)) ? fields.Armor_mod_417 : fields.Armor_mod_416;
62786278

62796279
setAttr( charCS, [fields.Pick_Pockets[0]+modTag,fields.Pick_Pockets[1]], acValues.armour.data.ppa );
@@ -6287,7 +6287,7 @@ var attackMaster = (function() {
62876287
setAttr( charCS, [fields.Legend_Lore[0]+modTag,fields.Legend_Lore[1]], acValues.armour.data.iba );
62886288
setAttr( charCS, fields.Armor_name, acValues.armour.data.racname);
62896289

6290-
if (!silent || ((ac != prevAC) && !magicItem)) {
6290+
if ((silentCmd !== 'quiet') && (!silent || ((ac != prevAC) && !magicItem))) {
62916291
makeACDisplay( args, senderId, ac, dmgAdj, acValues, armourMsgs );
62926292
} else {
62936293
sendWait(senderId,0);

0 commit comments

Comments
 (0)