Fixed proficiency calculations

app/imports/api/creature/computation/ComputationMemo.js

@@ -40,7 +40,7 @@ export default class ComputationMemo {
     this.statsByVariableName[variableName] = prop;
     if (
       prop.type === 'skill' &&
-      includes(['skill', 'check'], prop.skillType) &&
+      isSkillCheck(prop) &&
       prop.ability
     ){
       this.addSkillToAbility(prop, prop.ability)
@@ -114,7 +114,7 @@ function isAbility(prop){
 }
 
 function isSkillCheck(prop){
-  return includes(['skill', 'check'], prop.skillType);
+  return includes(['skill', 'check', 'save', 'utility'], prop.skillType);
 }
 
 function isSkillOperation(prop){
@@ -146,6 +146,9 @@ const propDetailsByType = {
       computed: false,
     };
   },
+  proficiency(){
+    return {};
+  },
   damageMultiplier(){
     return {};
   },

app/imports/api/creature/computation/combineStat.js

@@ -34,8 +34,9 @@ function combineSkill(stat, aggregator, memo){
     stat.abilityMod = ability.modifier;
   }
   // Combine all the child proficiencies
-  for (let i in stat.proficiencies){
-    let prof = stat.proficiencies[i];
+  stat.proficiency = stat.baseProficiency || 0;
+  for (let i in stat.computationDetails.proficiencies){
+    let prof = stat.computationDetails.proficiencies[i];
     if (prof.value > stat.proficiency) stat.proficiency = prof.value;
   }
   // Get the character's proficiency bonus to apply

app/imports/api/creature/computation/getCalculationProperties.js

@@ -1,5 +1,5 @@
-import Creatures from "/imports/api/creature/Creatures.js";
-import CreatureProperties from "/imports/api/creature/CreatureProperties.js";
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 
 export default function getCalculationProperties(creatureId){
   // First get ids of disabled properties and unequiped items
@@ -29,6 +29,7 @@ export default function getCalculationProperties(creatureId){
       $eq: creatureId,
       $nin: disabledAncestorIds,
     },
+    removed: {$ne: true},
     type: {$in: [
       'attribute',
       'skill',

app/imports/api/creature/computation/writeAlteredProperties.js

@@ -22,6 +22,8 @@ export default function writeAlteredProperties(memo){
       case 'effect':
         schema = ComputedOnlyEffectSchema;
         break;
+      default:
+        return;
     }
     let op = undefined;
     // Loop through all keys that can be changed by computation