Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #33

Merged
merged 6 commits into from
Aug 28, 2022
Merged

Dev #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9145708
Fix DM about BetterRolls5e Incompatibility
UranusBytes Aug 27, 2022
fcb9a0c
Change wording of DM about BetterRolls5e Incompatibility
UranusBytes Aug 27, 2022
bddeffe
Change around some wording and DMs
UranusBytes Aug 27, 2022
93fe698
Clean up inconsistent use of quotes
UranusBytes Aug 27, 2022
a1f66ff
Merge remote-tracking branch 'origin/dev' into dev
UranusBytes Aug 28, 2022
2e2a0a5
Merge branch 'main' of https://github.com/UranusBytes/foundry-die-har…
UranusBytes Aug 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions scripts/classes/DieHardSystem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {dieHardLog, makeId} from "../lib/helpers.js";
import DieHardFudgeRoll from "./DieHardFudgeRoll.js";
import DieHard, {DieHardSetting} from "./DieHard.js";
import {dieHardLog, makeId} from '../lib/helpers.js';
import DieHardFudgeRoll from './DieHardFudgeRoll.js';
import DieHard, {DieHardSetting} from './DieHard.js';

export default class DieHardSystem {
constructor() {
Expand Down Expand Up @@ -194,14 +194,18 @@ export default class DieHardSystem {
gen_new_result = false;
roll.result = newResult
this.results.push(roll);
DieHard.dmToGm("Raw Fudge (" + userFudge.howFormula + ") values: " + failedRolls.join(', ') + " Final: " + newResult);
if (failedRolls.length === 0) {
DieHard.dmToGm('DieHard-Fudge: Total Fudge not needed (' + newResult + ' ' + userFudge.howFormula + ')');
} else {
DieHard.dmToGm('DieHard-Fudge: Raw Fudge (' + userFudge.howFormula + ') values: ' + failedRolls.join(', ') + ' Final: ' + newResult);
}
} else {
// New roll is insufficient, but lets at least check if it is "closer"
if (game.dieHardSystem.isBetterFudge(roll.result, newResult, userFudge.operator, userFudge.operatorValue)) {
dieHardLog(false, functionLogName + ' - New result insufficient, but at least better (' + newResult + "). Try again (tries left: " + SafetyLoopIndex + ")...")
dieHardLog(false, functionLogName + ' - New result (' + newResult + ') insufficient (' + userFudge.fudgeOperator + ' ' + userFudge.fudgeOperatorValue + '), but at least better. Try again (tries left: ' + SafetyLoopIndex + ')...')
roll.result = newResult
} else {
dieHardLog(false, functionLogName + ' - New result insufficient (' + newResult + "). Try again (tries left: " + SafetyLoopIndex + ")...")
dieHardLog(false, functionLogName + ' - New result (' + newResult + ') insufficient (' + userFudge.fudgeOperator + ' ' + userFudge.fudgeOperatorValue + '). Try again (tries left: ' + SafetyLoopIndex + ')...')
}
failedRolls.push(newResult);
}
Expand Down Expand Up @@ -286,7 +290,7 @@ export default class DieHardSystem {
if (avgKarmaSettings.enabled) {
dieHardLog(false, functionLogName + ' - Avg Karma', this);
let avgKarmaData = game.users.current.getFlag('foundry-die-hard', 'avgKarmaData')

if (avgKarmaData === undefined) {
avgKarmaData = {
history: [],
Expand Down Expand Up @@ -347,7 +351,7 @@ export default class DieHardSystem {
wrapRollEvaluate(wrapped, eval_options) {
let uuid = makeId(6)
let functionLogName = 'DieHardSystem.wrapRollEvaluate-' + uuid
dieHardLog(false, functionLogName);
dieHardLog(false, functionLogName, this, eval_options);

if (! DieHardSetting('fudgeEnabled') ) {
dieHardLog(false, functionLogName + ' - Fudge disabled');
Expand Down Expand Up @@ -394,14 +398,13 @@ export default class DieHardSystem {
if (this instanceof CONFIG.Dice.DieHardFudgeRoll) {
dieHardLog(false, functionLogName + 'e - recursive roll', this);
} else {
dieHardLog(false, functionLogName + ' - base roll', this);
dieHardLog(false, functionLogName + ' - result', result);
dieHardLog(false, functionLogName + ' - base roll', this, result);
let gen_new_result = false;
let evalResult = game.dieHardSystem.evalFudge(this.total, this.data.fudgeOperator, this.data.fudgeOperatorValue)

if (evalResult) {
dieHardLog(false, functionLogName + ' - Fudge not needed, but still disabled');
DieHard.dmToGm('DieHard-Fudge: Total Fudge not needed, but still disabled...');
dieHardLog(false, functionLogName + ' - Fudge not needed (' + this.total + ' ' + this.data.fudgeOperator + ' ' + this.data.fudgeOperatorValue + ')');
DieHard.dmToGm('DieHard-Fudge: Total Fudge not needed (' + this.total + ' ' + this.data.fudgeOperator + ' ' + this.data.fudgeOperatorValue + ')');
dieHardLog(false, functionLogName + ' - dmToGm');

} else {
Expand All @@ -418,14 +421,14 @@ export default class DieHardSystem {
dieHardLog(false, functionLogName + ' - New result: ' + new_roll.total)
gen_new_result = false;
foundry.utils.mergeObject(this, new_roll);
DieHard.dmToGm("Total Fudge (" + result.data.fudgeHow + ") values: " + failedRolls.join(', ') + " Final: " + new_roll.total);
DieHard.dmToGm('DieHard-Fudge: Total Fudge (' + result.data.fudgeHow + ') values: ' + failedRolls.join(', ') + ' Final: ' + new_roll.total);
} else {
// New roll is insufficient, but lets at least check if it is "closer"
if (game.dieHardSystem.isBetterFudge(this.total, new_roll.total, this.data.fudgeOperator, this.data.fudgeOperatorValue)) {
dieHardLog(false, functionLogName + ' - New result insufficient, but at least better (' + new_roll.total + "). Try again (tries left: " + SafetyLoopIndex + ")...")
dieHardLog(false, functionLogName + ' - New result (' + new_roll.total + ') insufficient (' + this.data.fudgeOperator + ' ' + this.data.fudgeOperatorValue + '), but at least better. Try again (tries left: ' + SafetyLoopIndex + ')...')
foundry.utils.mergeObject(this, new_roll);
} else {
dieHardLog(false, functionLogName + ' - New result insufficient (' + new_roll.total + "). Try again (tries left: " + SafetyLoopIndex + ")...")
dieHardLog(false, functionLogName + ' - New result (' + new_roll.total + ') insufficient (' + this.data.fudgeOperator + ' ' + this.data.fudgeOperatorValue + '). Try again (tries left: ' + SafetyLoopIndex + ')...')
}
failedRolls.push(new_roll.total);
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/die-hard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Hooks.once('ready', () => {

if (game.modules.get("betterrolls5e") !== undefined && game.modules.get("betterrolls5e")?.active === true) {
dieHardLog(true, 'WARNING - DieHard is incompatible with Better Rolls 5e.')
game.dieHardSystem.dmToGm('WARNING - DieHard is incompatible with Better Rolls 5e.');
DieHard.dmToGm('WARNING - DieHard is incompatible with Better Rolls 5e. To learn more and be alerted when a fix is released, watch this <a href=https://github.com/UranusBytes/foundry-die-hard/issues/6>GitHub Issue</a>');
}
});

Expand Down