From 4021893d791b4e4d46c975f6f468c5082abb7984 Mon Sep 17 00:00:00 2001 From: DameryDad <74715860+DameryDad@users.noreply.github.com> Date: Wed, 8 Oct 2025 14:35:24 +0100 Subject: [PATCH 1/2] Fix critical error - parentheses on calculation --- AttackMaster/5.0.4/attackMaster.js | 2 +- AttackMaster/attackMaster.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AttackMaster/5.0.4/attackMaster.js b/AttackMaster/5.0.4/attackMaster.js index 7a9179858..2818a1e62 100644 --- a/AttackMaster/5.0.4/attackMaster.js +++ b/AttackMaster/5.0.4/attackMaster.js @@ -2910,7 +2910,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*dexBonus)) - (ac - adj - dexAdj); let diff; switch (priority) { diff --git a/AttackMaster/attackMaster.js b/AttackMaster/attackMaster.js index 7a9179858..2818a1e62 100644 --- a/AttackMaster/attackMaster.js +++ b/AttackMaster/attackMaster.js @@ -2910,7 +2910,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*dexBonus)) - (ac - adj - dexAdj); let diff; switch (priority) { From 560b3c0caff8ac76a9c58c6aefb1481a1f4fab8c Mon Sep 17 00:00:00 2001 From: DameryDad <74715860+DameryDad@users.noreply.github.com> Date: Wed, 8 Oct 2025 15:32:08 +0100 Subject: [PATCH 2/2] Fix reference to reSaveSpecs --- AttackMaster/5.0.4/attackMaster.js | 4 +++- AttackMaster/attackMaster.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AttackMaster/5.0.4/attackMaster.js b/AttackMaster/5.0.4/attackMaster.js index 2818a1e62..a91f7e57c 100644 --- a/AttackMaster/5.0.4/attackMaster.js +++ b/AttackMaster/5.0.4/attackMaster.js @@ -649,6 +649,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars var reACSpecs; var reThiefSpecs; var reModSpecs; + var reSaveSpecs; var spellLevels; var classLevels; var rangedWeapMods; @@ -1002,6 +1003,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars reACSpecs = RPGMap.reACSpecs; reThiefSpecs = RPGMap.reThiefSpecs; reModSpecs = RPGMap.reModSpecs; + reSaveSpecs = RPGMap.reSaveSpecs; DBindex = undefined; flags.noWaitMsg = true; setTimeout( () => {flags.noWaitMsg = false}, 5000 ); @@ -2933,7 +2935,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars return diff; }; - const assessItem = function( itemName, itemTrueName, itemCharge, itemSpecs, itemData ) { + const assessItem = function( itemName, itemTrueName, itemCharge, itemSpecs, itemData ) { // reSaveSpecs let ac, acData, acRules, isMod, data, itemType, itemClass, itemHands, itemSuperType, itemAC, itemAdj, itemCursed, itemRules, diff --git a/AttackMaster/attackMaster.js b/AttackMaster/attackMaster.js index 2818a1e62..a91f7e57c 100644 --- a/AttackMaster/attackMaster.js +++ b/AttackMaster/attackMaster.js @@ -649,6 +649,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars var reACSpecs; var reThiefSpecs; var reModSpecs; + var reSaveSpecs; var spellLevels; var classLevels; var rangedWeapMods; @@ -1002,6 +1003,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars reACSpecs = RPGMap.reACSpecs; reThiefSpecs = RPGMap.reThiefSpecs; reModSpecs = RPGMap.reModSpecs; + reSaveSpecs = RPGMap.reSaveSpecs; DBindex = undefined; flags.noWaitMsg = true; setTimeout( () => {flags.noWaitMsg = false}, 5000 ); @@ -2933,7 +2935,7 @@ var attackMaster = (function() { // eslint-disable-line no-unused-vars return diff; }; - const assessItem = function( itemName, itemTrueName, itemCharge, itemSpecs, itemData ) { + const assessItem = function( itemName, itemTrueName, itemCharge, itemSpecs, itemData ) { // reSaveSpecs let ac, acData, acRules, isMod, data, itemType, itemClass, itemHands, itemSuperType, itemAC, itemAdj, itemCursed, itemRules,