diff --git a/src/artigen/artigen.ts b/src/artigen/artigen.ts index 9de8e48..bed1850 100644 --- a/src/artigen/artigen.ts +++ b/src/artigen/artigen.ts @@ -10,7 +10,7 @@ import { QueuedRoll } from 'artigen/managers/manager.d.ts'; import { reduceCountDetails } from 'artigen/utils/counter.ts'; import { cmdSplitRegex, escapeCharacters, withYVarsDash } from 'artigen/utils/escape.ts'; -import { loggingEnabled, loopLoggingEnabled } from 'artigen/utils/logFlag.ts'; +import { loggingEnabled, showLoopCountDebug } from 'artigen/utils/logFlag.ts'; import { assertPrePostBalance } from 'artigen/utils/parenBalance.ts'; import { reduceRollDistMaps } from 'artigen/utils/rollDist.ts'; import { compareTotalRolls, compareTotalRollsReverse, sortYVars } from 'artigen/utils/sortFuncs.ts'; @@ -179,7 +179,7 @@ export const runCmd = (rollRequest: QueuedRoll): SolvedRoll => { [returnMsg.errorCode, returnMsg.errorMsg] = translateError(solverError); } - if (loopLoggingEnabled) returnMsg.footer = `Loop Count: ${getLoopCount()}`; + if (showLoopCountDebug) returnMsg.footer = `Loop Count: ${getLoopCount()}`; return returnMsg; }; diff --git a/src/artigen/math/mathSolver.ts b/src/artigen/math/mathSolver.ts index 1d6befc..c90e359 100644 --- a/src/artigen/math/mathSolver.ts +++ b/src/artigen/math/mathSolver.ts @@ -95,12 +95,13 @@ export const mathSolver = (conf: MathConf[], wrapDetails = false): SolvedStep => ]; allCurOps.forEach((curOps) => { // No loopCountCheck here since its finite/will always be 3 loops - loggingEnabled && log(LT.LOG, `Evaluating roll ${JSON.stringify(conf)} | Evaluating ${JSON.stringify(curOps)}`); + loggingEnabled && log(LT.LOG, `Cur Ops ${JSON.stringify(curOps)}`); // Iterate thru all operators/operands in the conf for (let i = 0; i < conf.length; i++) { - loggingEnabled && log(LT.LOG, `Evaluating roll ${JSON.stringify(conf)} | Evaluating ${JSON.stringify(curOps)} | Checking ${JSON.stringify(conf[i])}`); + loggingEnabled && log(LT.LOG, `Checking ${JSON.stringify(conf[i])}`); // Check if the current index is in the active tier of operators if (curOps.includes(conf[i].toString())) { + loggingEnabled && log(LT.LOG, `Evaluating roll ${JSON.stringify(conf)} as ${JSON.stringify(conf[i])} is in curOps`); loopCountCheck('mathSolver.ts - evaluating roll'); // Grab the operands from before and after the operator const operand1 = conf[i - 1];