jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skill base values now work in a way consistent with attribute base values

Browse Source
This commit is contained in:
Stefan Zermatten
2020-05-30 12:32:05 +02:00
parent 56cd48da9d
commit 51845c62a7
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/imports/api/creature/computation/combineStat.js
View File

@@ -72,8 +72,11 @@ function combineSkill(stat, aggregator, memo){
}
// Multiply the proficiency bonus by the actual proficiency
profBonus *= stat.proficiency;
// Base value
stat.baseValue = aggregator.statBaseValue;
stat.baseValueErrors = aggregator.baseValueErrors;
// Combine everything to get the final result
let result = (stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
let result = (aggregator.base + stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
if (result < aggregator.min) result = aggregator.min;
if (result > aggregator.max) result = aggregator.max;
if (aggregator.set !== undefined) {
@@ -103,6 +106,7 @@ function combineSkill(stat, aggregator, memo){
stat.rollBonuses = aggregator.rollBonus;
// Hide
stat.hide = aggregator.hasNoEffects &&
stat.baseValue === undefined &&
stat.proficiency == 0 ||
undefined;
}