discord-bots/TheArtificer
discord-bots
/
TheArtificer
mirror of https://github.com/Burn-E99/TheArtificer.git
1
1
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

indicate these vars are holding indexes

This commit is contained in:
Ean Milligan 2025-04-28 03:04:42 -04:00
parent 5b0de24466
commit fd7bc5f152
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/solver/solver.ts
View File

@ -35,51 +35,49 @@ export const fullSolver = (conf: (string | number | SolvedStep)[], wrapDetails:
while (conf.includes('(')) { while (conf.includes('(')) {
loggingEnabled && log(LT.LOG, `Evaluating roll ${JSON.stringify(conf)} | Looking for (`); loggingEnabled && log(LT.LOG, `Evaluating roll ${JSON.stringify(conf)} | Looking for (`);
// Get first open parenthesis // Get first open parenthesis
const openParen = conf.indexOf('('); const openParenIdx = conf.indexOf('(');
let closeParen = -1; let closeParenIdx = -1;
let nextParen = 0; let nextParenIdx = 0;
// Using nextParen to count the opening/closing parens, find the matching paren to openParen above // Using nextParenIdx to count the opening/closing parens, find the matching paren to openParenIdx above
for (let i = openParen; i < conf.length; i++) { closingParenLocator: for (let i = openParenIdx; i < conf.length; i++) {
loggingEnabled && log(LT.LOG, `Evaluating roll ${JSON.stringify(conf)} | Looking for matching ) openIdx: ${openParen} checking: ${i}`); loggingEnabled && log(LT.LOG, `Evaluating roll ${JSON.stringify(conf)} | Looking for matching ) openIdx: ${openParenIdx} checking: ${i}`);
// If we hit an open, add one (this includes the openParen we start with), if we hit a close, subtract one // If we hit an open, add one (this includes the openParenIdx we start with), if we hit a close, subtract one
if (conf[i] === '(') { if (conf[i] === '(') {
nextParen++; nextParenIdx++;
} else if (conf[i] === ')') { } else if (conf[i] === ')') {
nextParen--; nextParenIdx--;
} }
// When nextParen reaches 0 again, we will have found the matching closing parenthesis and can safely exit the for loop // When nextParenIdx reaches 0 again, we will have found the matching closing parenthesis and can safely exit the for loop
if (nextParen === 0) { if (nextParenIdx === 0) {
closeParen = i; closeParenIdx = i;
break; break closingParenLocator;
} }
} }
// Make sure we did find the correct closing paren, if not, error out now // Make sure we did find the correct closing paren, if not, error out now
if (closeParen === -1 || closeParen < openParen) { if (closeParenIdx === -1 || closeParenIdx < openParenIdx) {
throw new Error('UnbalancedParens'); throw new Error('UnbalancedParens');
} }
// Call the solver on the items between openParen and closeParen (excluding the parens) // Call the solver on the items between openParenIdx and closeParenIdx (excluding the parens)
const parenSolve = fullSolver(conf.slice(openParen + 1, closeParen), true); const parenSolve = fullSolver(conf.slice(openParenIdx + 1, closeParenIdx), true);
// Replace the items between openParen and closeParen (including the parens) with its solved equivalent // Replace the items between openParenIdx and closeParenIdx (including the parens) with its solved equivalent
conf.splice(openParen, closeParen - openParen + 1, parenSolve); conf.splice(openParenIdx, closeParenIdx - openParenIdx + 1, parenSolve);
// Determining if we need to add in a multiplication sign to handle implicit multiplication (like "(4)2" = 8) // Determining if we need to add in a multiplication sign to handle implicit multiplication (like "(4)2" = 8)
// insertedMult flags if there was a multiplication sign inserted before the parens // insertedMult flags if there was a multiplication sign inserted before the parens
let insertedMult = false; let insertedMult = 0;
// Check if a number was directly before openParen and slip in the "*" if needed // Check if a number was directly before openParenIdx and slip in the "*" if needed
if (openParen - 1 > -1 && signs.indexOf(conf[openParen - 1].toString()) === -1) { if (openParenIdx - 1 > -1 && !signs.includes(conf[openParenIdx - 1].toString())) {
insertedMult = true; insertedMult = 1;
conf.splice(openParen, 0, '*'); conf.splice(openParenIdx, 0, '*');
} }
// Check if a number is directly after closeParen and slip in the "*" if needed // Check if a number is directly after the closing paren and slip in the "*" if needed
if (!insertedMult && openParen + 1 < conf.length && signs.indexOf(conf[openParen + 1].toString()) === -1) { // openParenIdx is used here as the conf array has already been collapsed down
conf.splice(openParen + 1, 0, '*'); if (openParenIdx + 1 + insertedMult < conf.length && !signs.includes(conf[openParenIdx + 1 + insertedMult].toString())) {
} else if (insertedMult && openParen + 2 < conf.length && signs.indexOf(conf[openParen + 2].toString()) === -1) { conf.splice(openParenIdx + 1 + insertedMult, 0, '*');
// insertedMult is utilized here to let us account for an additional item being inserted into the array (the "*" from before openParen)
conf.splice(openParen + 2, 0, '*');
} }
} }