Nighthawk/roll20-character-sheets
1
0
Fork 0
mirror of https://github.com/Nighthawk42/roll20-character-sheets.git synced 2026-09-11 17:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

math operator

Browse Source
This commit is contained in:
Mark
2016-04-08 20:14:08 +02:00
parent 462a968315
commit cfd5027009
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
D&D_5e_Reshaped/precompiled/components/sheetWorkers.js
+11 -12
View File
@@ -287,12 +287,12 @@ const getAbilityMod = (score) => {
return Math.floor((getIntValue(score) - 10) / 2);
};
const addArithmeticOperator = (string, number) => {
let value = number;
if (string && value) {
if (value >= 0) {
value = ` + ${value}`;
let value = '';
if (string && number) {
if (number >= 0) {
value = ` + ${number}`;
} else {
value = ` - ${Math.abs(value)}`;
value = ` - ${Math.abs(number)}`;
}
}
return value;
@@ -465,10 +465,12 @@ const updateAbilityModifier = (ability) => {
abilityCheck += abilityCheckBonus;
abilityCheckFormula += `${addArithmeticOperator(abilityCheckFormula, abilityCheckBonus)}[${ability} check bonus]`;
}
if (!isNaN(v.global_check_bonus)) {
abilityCheck += getIntValue(v.global_check_bonus);
if (v.global_check_bonus) {
if (!isNaN(v.global_check_bonus)) {
abilityCheck += getIntValue(v.global_check_bonus);
}
abilityCheckFormula += ' + (@{global_check_bonus})[global check bonus]';
}
abilityCheckFormula += ' + (@{global_check_bonus})[global check bonus]';
finalSetAttrs[`${ability}_calculated`] = abilityScoreCalc;
finalSetAttrs[`${ability}_mod`] = abilityMod;
@@ -2524,10 +2526,7 @@ const updateDamageToggle = (v, finalSetAttrs, repeatingString, options) => {
const damageBonus = getIntValue(v[`${repeatingString}damage_bonus`]);
if (exists(damageBonus)) {
damageAddition += damageBonus;
if (damageFormula !== '') {
damageFormula += ' + ';
}
damageFormula += `${damageBonus}[bonus]`;
damageFormula += `${addArithmeticOperator(damageFormula, damageBonus)}[bonus]`;
}
if (exists(options.globalDamageBonus)) {