slaguru666/foundry-Slamother
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix best/worst for panic checks

Browse Source
This commit is contained in:
Chris Schmalz
2024-05-29 12:45:17 -07:00
parent eecafa22e2
commit 01a162253f
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/actor/actor.js
+18 -6
View File
@@ -1115,8 +1115,14 @@ export class MothershipActor extends Actor {
}
}
} else {
//choose highest
enrichedRollResult._total = Math.max(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);
//compare values based on comparison setting
if (comparison === '<') {
//choose lowest
enrichedRollResult._total = Math.min(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);
} else {
//choose highest
enrichedRollResult._total = Math.max(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);
}
}
//if [+] pick a new lowest number
} else if (rollString.includes("[+]")) {
@@ -1139,8 +1145,14 @@ export class MothershipActor extends Actor {
}
}
} else {
//choose lowest
enrichedRollResult._total = Math.min(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);
//compare values based on comparison setting
if (comparison === '<') {
//choose lowest
enrichedRollResult._total = Math.min(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);
} else {
//choose highest
enrichedRollResult._total = Math.max(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);
}
}
}
//use new value if a regular roll
@@ -1153,7 +1165,7 @@ export class MothershipActor extends Actor {
//compare values based on compararison setting
if (comparison === '<') {
//are both a failure?
if (enrichedRollResult.dice[0].results[0].result > rollTarget && enrichedRollResult.dice[1].results[0].result > rollTarget) {
if (enrichedRollResult.dice[0].results[0].result >= rollTarget && enrichedRollResult.dice[1].results[0].result >= rollTarget) {
//advantage
if (rollString.includes("[+]")) {
enrichedRollResult._total = Math.max(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);
@@ -1164,7 +1176,7 @@ export class MothershipActor extends Actor {
}
} else {
//check against being over the target
if (enrichedRollResult.dice[0].results[0].result < rollTarget && enrichedRollResult.dice[1].results[0].result < rollTarget) {
if (enrichedRollResult.dice[0].results[0].result <= rollTarget && enrichedRollResult.dice[1].results[0].result <= rollTarget) {
//advantage
if (rollString.includes("[+]")) {
enrichedRollResult._total = Math.min(enrichedRollResult.dice[0].results[0].result,enrichedRollResult.dice[1].results[0].result);