Athemis/ds4
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix option parsing for rolls.

Browse source
This commit is contained in:
Oliver Rümpelein 2021-01-02 13:54:59 +01:00
parent 75301b2c56
commit 00f7e30b41
2 changed files with 38 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/module/rolls/roll-executor.ts
View file

@ -1,6 +1,6 @@
import { DS4RollProvider, RollProvider } from "./roll-provider";
export function ds4test(testValue: number, rollOptions: RollOptions = new RollOptions()): RollResult {
export function ds4test(testValue: number, rollOptions: Partial<RollOptions> = {}): RollResult {
const finalRollValue = testValue;
if (finalRollValue <= 20) {
return rollCheckSingleDie(finalRollValue, rollOptions);
@ -11,15 +11,16 @@ export function ds4test(testValue: number, rollOptions: RollOptions = new RollOp
export function rollCheckSingleDie(
testValue: number,
rollOptions: RollOptions,
rollOptions: Partial<RollOptions>,
provider: RollProvider = new DS4RollProvider(),
): RollResult {
const usedOptions = new DefaultRollOptions().mergeWith(rollOptions);
const roll = provider.getNextRoll();
const dice = [roll];
if (roll <= rollOptions.maxCritSucc) {
if (roll <= usedOptions.maxCritSucc) {
return new RollResult(testValue, RollResultStatus.CRITICAL_SUCCESS, dice);
} else if (roll >= rollOptions.minCritFail) {
} else if (roll >= usedOptions.minCritFail) {
return new RollResult(0, RollResultStatus.CRITICAL_FAILURE, dice);
} else {
if (roll <= testValue) {
@ -32,9 +33,10 @@ export function rollCheckSingleDie(
export function rollCheckMultipleDice(
testValue: number,
rollOptions: RollOptions,
rollOptions: Partial<RollOptions>,
provider: RollProvider = new DS4RollProvider(),
): RollResult {
const usedOptions = new DefaultRollOptions().mergeWith(rollOptions);
const finalCheck = testValue % 20;
const numberOfDice = Math.ceil(testValue / 20);
@ -42,12 +44,12 @@ export function rollCheckMultipleDice(
const firstResult = dice[0];
if (firstResult >= rollOptions.minCritFail) {
if (firstResult >= usedOptions.minCritFail) {
return new RollResult(0, RollResultStatus.CRITICAL_FAILURE, dice);
}
const partitionCallback = (prev: [Array<number>, Array<number>], cur: number) => {
if (cur <= rollOptions.maxCritSucc) {
if (cur <= usedOptions.maxCritSucc) {
prev[0].push(cur);
} else {
prev[1].push(cur);
@ -64,13 +66,16 @@ export function rollCheckMultipleDice(
const evaluationResult = sortedRollResults
.map((value, index) => {
if (index == numberOfDice - 1) {
console.log(`Last dice: ${value}, checking against ${finalCheck}`);
if (value == 1) {
return finalCheck;
} else if (value <= finalCheck) {
return value;
} else {
return value <= finalCheck ? value : 0;
return 0;
}
} else {
if (value <= rollOptions.maxCritSucc) {
if (value <= usedOptions.maxCritSucc) {
return 20;
} else {
return value;
@ -82,11 +87,22 @@ export function rollCheckMultipleDice(
return new RollResult(evaluationResult, RollResultStatus.SUCCESS, sortedRollResults);
}
export class RollOptions {
export interface RollOptions {
maxCritSucc: number;
minCritFail: number;
useSlayingDice: boolean;
slayingDiceRepetition: boolean;
}
class DefaultRollOptions implements RollOptions {
public maxCritSucc = 1;
public minCritFail = 20;
public useSlayingDice = false;
public slayingDiceRepetition = false;
mergeWith(other: Partial<RollOptions>): RollOptions {
return { ...this, ...other } as RollOptions;
}
}
export class RollResult {