Unprepared spells without lists now correctly show up when unprepared

app/.meteor/packages

@@ -16,7 +16,7 @@ meteorhacks:subs-manager
 chuangbo:marked
 meteor-base@1.4.0
 mobile-experience@1.1.0
-mongo@1.10.1
+mongo@1.11.0
 session@1.2.0
 tracker@1.2.0
 logging@1.2.0
@@ -26,7 +26,7 @@ check@1.3.1
 standard-minifier-js@2.6.0
 shell-server@0.5.0
 templates:array
-ecmascript@0.15.0
+ecmascript@0.15.1
 es5-shim@4.8.0
 reactive-dict@1.3.0
 percolate:synced-cron

app/.meteor/release

@@ -1 +1 @@
-METEOR@2.1
+METEOR@2.2

app/.meteor/versions

@@ -1,4 +1,4 @@
-accounts-base@1.8.0
+accounts-base@1.9.0
 accounts-google@1.3.3
 accounts-oauth@1.2.0
 accounts-password@1.7.0
@@ -9,19 +9,19 @@ akryum:vue-component-dev-client@0.4.7
 akryum:vue-component-dev-server@0.1.4
 akryum:vue-router2@0.2.3
 akryum:vue-sass@0.1.2
-aldeed:collection2@3.2.1
+aldeed:collection2@3.3.0
 aldeed:schema-index@3.0.0
 allow-deny@1.1.0
 autoupdate@1.7.0
-babel-compiler@7.6.0
+babel-compiler@7.6.1
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-blaze-tools@1.0.10
+blaze-tools@1.1.1
 boilerplate-generator@1.7.1
 bozhao:link-accounts@2.3.2
 caching-compiler@1.2.2
-caching-html-compiler@1.1.3
+caching-html-compiler@1.2.0
 callback-hook@1.3.0
 check@1.3.1
 chuangbo:marked@0.3.5_1
@@ -37,7 +37,7 @@ ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.6.0
-ecmascript@0.15.0
+ecmascript@0.15.1
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
@@ -48,13 +48,13 @@ fetch@0.1.1
 geojson-utils@1.0.10
 google-oauth@1.3.0
 hot-code-push@1.0.4
-html-tools@1.0.11
+html-tools@1.1.1
-htmljs@1.0.11
+htmljs@1.1.0
 http@1.4.3
 id-map@1.1.0
 inter-process-messaging@0.1.1
 lai:collection-extensions@0.2.1_1
-launch-screen@1.2.0
+launch-screen@1.2.1
 livedata@1.0.18
 localstorage@1.2.0
 logging@1.2.0
@@ -65,19 +65,19 @@ meteorhacks:subs-manager@1.6.4
 mikowals:batch-insert@1.2.0
 minifier-css@1.5.3
 minifier-js@2.6.0
-minimongo@1.6.1
+minimongo@1.6.2
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.5
 modules@0.16.0
 modules-runtime@0.12.0
 momentjs:moment@2.29.1
-mongo@1.10.1
+mongo@1.11.0
 mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 npm-bcrypt@0.9.3
-npm-mongo@3.8.1
+npm-mongo@3.9.0
 oauth@1.3.2
 oauth2@1.3.0
 ongoworks:speakingurl@9.0.0
@@ -113,16 +113,17 @@ simple:json-routes@2.1.0
 simple:rest@1.1.1
 simple:rest-method-mixin@1.0.1
 socket-stream-client@0.3.1
-spacebars-compiler@1.1.3
+spacebars-compiler@1.2.1
 srp@1.1.0
 standard-minifier-js@2.6.0
-static-html@1.2.2
+static-html@1.3.0
 templates:array@1.0.3
-templating-tools@1.1.2
+templating-tools@1.2.0
-tmeasday:check-npm-versions@0.3.2
+tmeasday:check-npm-versions@1.0.1
 tracker@1.2.0
+typescript@4.2.2
 underscore@1.0.10
 url@1.3.1
-webapp@1.10.0
+webapp@1.10.1
 webapp-hashing@1.1.0
 zer0th:meteor-vuetify-loader@0.1.30

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

@@ -104,31 +104,10 @@ export default class ComputationMemo {
     let variableName = prop.variableName;
     if (!variableName) return;
     let existingStat = this.statsByVariableName[variableName];
+    prop = this.registerProperty(prop);
     if (existingStat){
       existingStat.computationDetails.idsOfSameName.push(prop._id);
-      this.originalPropsById[prop._id] = cloneDeep(prop);
-      if (prop.baseValueCalculation){
-        existingStat.computationDetails.effects.push({
-          operation: 'base',
-          calculation: prop.baseValueCalculation,
-          stats: [variableName],
-          computationDetails: propDetailsByType.effect(),
-          statBase: true,
-          dependencies: [],
-        });
-      }
-      if (prop.baseProficiency){
-        existingStat.computationDetails.proficiencies.push({
-          value: prop.baseProficiency,
-          stats: [variableName],
-          computationDetails: propDetailsByType.proficiency(),
-          type: 'proficiency',
-          statBase: true,
-          dependencies: [],
-        });
-      }
     } else {
-      prop = this.registerProperty(prop);
       this.statsById[prop._id] = prop;
       this.statsByVariableName[variableName] = prop;
       if (
@@ -190,7 +169,9 @@ export default class ComputationMemo {
     prop = this.registerProperty(prop);
     let targets = this.getProficiencyTargets(prop);
     targets.forEach(target => {
-      target.computationDetails.proficiencies.push(prop);
+      if(target.computationDetails.proficiencies){
+        target.computationDetails.proficiencies.push(prop);
+      }
     });
   }
   getProficiencyTargets(prop){
@@ -267,6 +248,7 @@ const propDetailsByType = {
       computed: false,
       busyComputing: false,
       effects: [],
+      proficiencies: [],
       toggleAncestors: [],
       idsOfSameName: [],
     };

app/imports/api/creature/computation/engine/EffectAggregator.js

@@ -1,31 +1,6 @@
-import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
-import { union } from 'lodash';
-
 export default class EffectAggregator{
-  constructor(stat, memo){
+  constructor(){
-    delete this.baseValueErrors;
+    this.base = 0;
-    if (stat.baseValueCalculation){
-      let {
-        result,
-        context,
-        dependencies
-      } = evaluateCalculation({
-        string: stat.baseValueCalculation,
-        prop: stat,
-        memo
-      });
-      this.statBaseValue = +result.value;
-      stat.dependencies = union(
-        stat.dependencies,
-        dependencies,
-      );
-      if (context.errors.length){
-        this.baseValueErrors = context.errors;
-      }
-      this.base = this.statBaseValue;
-    } else {
-      this.base = 0;
-    }
     this.add = 0;
     this.mul = 1;
     this.min = Number.NEGATIVE_INFINITY;
@@ -46,11 +21,6 @@ export default class EffectAggregator{
       case 'base':
         // Take the largest base value
         this.base = result > this.base ? result : this.base;
-        if (effect.statBase){
-          if (this.statBaseValue === undefined || result > this.statBaseValue){
-            this.statBaseValue = result;
-          }
-        }
         break;
       case 'add':
         // Add all adds together

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

@@ -1,5 +1,5 @@
 import computeStat from '/imports/api/creature/computation/engine/computeStat.js';
-import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+import computeProficiency from '/imports/api/creature/computation/engine/computeProficiency.js';
 import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
 import { union } from 'lodash';
 
@@ -14,7 +14,8 @@ export default function combineStat(stat, aggregator, memo){
 }
 
 function getAggregatorResult(stat, aggregator){
-  let result = (aggregator.base + aggregator.add) * aggregator.mul;
+  let base = Math.max(aggregator.base, stat.baseValue || 0);
+  let result = (base + aggregator.add) * aggregator.mul;
   if (result < aggregator.min) {
     result = aggregator.min;
   }
@@ -32,8 +33,6 @@ function getAggregatorResult(stat, aggregator){
 
 function combineAttribute(stat, aggregator, memo){
   stat.value = getAggregatorResult(stat, aggregator);
-  stat.baseValue = aggregator.statBaseValue;
-  stat.baseValueErrors = aggregator.baseValueErrors;
   if (stat.attributeType === 'spellSlot'){
     let {
       result,
@@ -78,9 +77,7 @@ function combineSkill(stat, aggregator, memo){
   // Skills are based on some ability Modifier
   let ability = stat.ability && memo.statsByVariableName[stat.ability]
   if (stat.ability && ability){
-    if (!ability.computationDetails.computed){
+    computeStat(ability, memo);
-      computeStat(ability, memo);
-    }
     stat.abilityMod = ability.modifier;
     stat.dependencies = union(
       stat.dependencies,
@@ -91,10 +88,10 @@ function combineSkill(stat, aggregator, memo){
     stat.abilityMod = 0;
   }
   // Combine all the child proficiencies
-  stat.proficiency = stat.baseProficiency || 0;
+  stat.proficiency = 0;
   for (let i in stat.computationDetails.proficiencies){
     let prof = stat.computationDetails.proficiencies[i];
-    applyToggles(prof, memo);
+    computeProficiency(prof, memo);
     if (
       !prof.deactivatedByToggle &&
       prof.value > stat.proficiency
@@ -111,6 +108,14 @@ function combineSkill(stat, aggregator, memo){
   let profBonusStat = memo.statsByVariableName['proficiencyBonus'];
   let profBonus = profBonusStat && profBonusStat.value;
 
+  if (profBonusStat){
+    stat.dependencies = union(
+      stat.dependencies,
+      [profBonusStat._id],
+      profBonusStat.dependencies,
+    );
+  }
+
   if (typeof profBonus !== 'number' && memo.statsByVariableName['level']){
     let levelProp = memo.statsByVariableName['level'];
     let level = levelProp.value;
@@ -121,18 +126,16 @@ function combineSkill(stat, aggregator, memo){
     if (levelProp.dependencies){
       stat.dependencies = union(stat.dependencies, levelProp.dependencies);
     }
-  } else {
-    stat.dependencies = union(
-      stat.dependencies,
-      [profBonusStat._id],
-      profBonusStat.dependencies,
-    );
   }
+
   // Multiply the proficiency bonus by the actual proficiency
-  profBonus *= stat.proficiency;
+  if(stat.proficiency === 0.49){
-  // Base value
+    // Round down proficiency bonus in the special case
-  stat.baseValue = aggregator.statBaseValue;
+    profBonus = Math.floor(profBonus * 0.5);
-  stat.baseValueErrors = aggregator.baseValueErrors;
+  } else {
+    profBonus = Math.ceil(profBonus * stat.proficiency);
+  }
+
   // Combine everything to get the final result
   let result = (aggregator.base + stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
   if (result < aggregator.min) result = aggregator.min;

app/imports/api/creature/computation/engine/computeProficiency.js

@@ -0,0 +1,23 @@
+import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+
+export default function computeEffect(proficiency, memo){
+  if (proficiency.computationDetails.computed) return;
+  if (proficiency.computationDetails.busyComputing){
+    // Trying to compute this proficiency again while it is already computing.
+    // We must be in a dependency loop.
+    proficiency.computationDetails.computed = true;
+    proficiency.result = NaN;
+    proficiency.computationDetails.busyComputing = false;
+    proficiency.computationDetails.error = 'dependencyLoop';
+    if (Meteor.isClient) console.warn('dependencyLoop', proficiency);
+    return;
+  }
+  // Before doing any work, mark this proficiency as busy
+  proficiency.computationDetails.busyComputing = true;
+
+  // Apply any toggles
+  applyToggles(proficiency, memo);
+
+  proficiency.computationDetails.computed = true;
+  proficiency.computationDetails.busyComputing = false;
+}

app/imports/api/creature/computation/engine/computeStat.js

@@ -1,8 +1,9 @@
 import combineStat from '/imports/api/creature/computation/engine/combineStat.js';
 import computeEffect from '/imports/api/creature/computation/engine/computeEffect.js';
 import EffectAggregator from '/imports/api/creature/computation/engine/EffectAggregator.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
 import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
-import { each, union } from 'lodash';
+import { each, union, without } from 'lodash';
 
 export default function computeStat(stat, memo){
   // If the stat is already computed, skip it
@@ -19,29 +20,135 @@ export default function computeStat(stat, memo){
   }
   // Before doing any work, mark this stat as busy
   stat.computationDetails.busyComputing = true;
-  // Apply any toggles
+
-  applyToggles(stat, memo);
+  let effects = stat.computationDetails.effects;
+  let proficiencies = stat.computationDetails.proficiencies;
+
+  // Get references to all the stats that share the variable name
+  let sameNameStats = stat.computationDetails.idsOfSameName.map(
+    id => memo.propsById[id]
+  );
+
+  let allStats = [stat, ...sameNameStats];
+
+  // Decide which stat is the last active stat
+  // The last active stat is considered the cannonical stat
+  let lastActiveStat;
+  allStats.forEach(candidateStat => {
+    applyToggles(candidateStat, memo);
+    if (!candidateStat.inactive) lastActiveStat = candidateStat;
+    candidateStat.overridden = undefined;
+  });
+  if (!lastActiveStat){
+    delete memo.statsByVariableName[stat.variableName];
+    return;
+  }
+  // Make sure the active stat has all the effects and proficiencies
+  lastActiveStat.computationDetails.effects = effects;
+  lastActiveStat.computationDetails.proficiencies = proficiencies;
+
+  // Update the memo's stat with the chosen stat
+  memo.statsByVariableName[stat.variableName] = lastActiveStat;
+
+  // Recreate list of the non-cannonical stats
+  sameNameStats = without(allStats, lastActiveStat);
+
+  sameNameStats.forEach(statInstance => {
+    // Mark the non-cannonical stats as overridden
+    statInstance.overridden = true;
+
+    // Apply the cannonical damage
+    statInstance.damage = lastActiveStat.damage;
+  });
+
+  let baseDependencies = [];
+  allStats.forEach(statInstance => {
+    // Add this stat and its deps to the dependencies
+    baseDependencies = union(
+      baseDependencies,
+      [statInstance._id],
+      statInstance.dependencies,
+    );
+
+    // Apply all the base proficiencies
+    if (statInstance.baseProficiency && !statInstance.inactive){
+      proficiencies.push({
+        value: statInstance.baseProficiency,
+        stats: [statInstance.variableName],
+        type: 'proficiency',
+        dependencies: [],
+        computationDetails: {
+          computed: true,
+        }
+      });
+    }
+
+    // Compute each active stat's baseValue calculation and apply it
+    if (statInstance.baseValueCalculation) {
+      let {
+        result,
+        context,
+        dependencies
+      } = evaluateCalculation({
+        string: statInstance.baseValueCalculation,
+        prop: statInstance,
+        memo
+      });
+      baseDependencies = union(baseDependencies, dependencies);
+      statInstance.baseValue = +result.value;
+      if (context.errors.length){
+        statInstance.baseValueErrors = context.errors;
+      }
+      // Apply all the base values
+      if (!statInstance.inactive){
+        effects.push({
+          operation: 'base',
+          calculation: statInstance.baseValueCalculation,
+          result: statInstance.baseValue,
+          stats: [statInstance.variableName],
+          dependencies: [],
+          computationDetails: {
+            computed: true,
+          },
+        });
+      }
+    }
+  });
+
+  // Apply all the base baseDependencies
+  allStats.forEach(statInstance => {
+    statInstance.dependencies = union(
+      statInstance.dependencies,
+      without(baseDependencies, statInstance._id)
+    );
+  });
 
   // Compute and aggregate all the effects
-  let aggregator = new EffectAggregator(stat, memo)
+  let aggregator = new EffectAggregator();
-  each(stat.computationDetails.effects, (effect) => {
+  let effectDeps = [];
+  each(effects, (effect) => {
+    // Compute
     computeEffect(effect, memo);
     if (effect.deactivatedByToggle) return;
-    if (effect._id){
+
-      stat.dependencies = union(
+    // dependencies
-        stat.dependencies,
+    if (effect._id) effectDeps = [effect._id];
-        [effect._id]
+    effectDeps = union(effectDeps, effect.dependencies);
-      );
+
-    }
+    // Add computed effect to aggregator
-    stat.dependencies = union(
-      stat.dependencies,
-      effect.dependencies
-    )
     aggregator.addEffect(effect);
   });
-  // Conglomerate all the effects to compute the final stat values
+
-  combineStat(stat, aggregator, memo);
+  // Combine the effects into the stats
-  // Mark the attribute as computed
+  allStats.forEach(statInstance => {
-  stat.computationDetails.computed = true;
+    // Conglomerate all the effects to compute the final stat values
-  stat.computationDetails.busyComputing = false;
+    combineStat(statInstance, aggregator, memo);
+    // Mark the stats as computed
+    statInstance.computationDetails.computed = true;
+    statInstance.computationDetails.busyComputing = false;
+    statInstance.dependencies = union(
+      statInstance.dependencies,
+      effectDeps
+    );
+  });
 }

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

@@ -12,29 +12,22 @@ export default function writeAlteredProperties(memo){
       console.warn('No schema for ' + changed.type);
       return;
     }
-    let extraIds = changed.computationDetails.idsOfSameName;
+    let id = changed._id;
-    let ids;
+    let op = undefined;
-    if (extraIds && extraIds.length){
+    let original = memo.originalPropsById[id];
-      ids = [changed._id, ...extraIds];
+    let keys = [
-    } else {
+      'dependencies',
-      ids = [changed._id];
+      'inactive',
+      'deactivatedBySelf',
+      'deactivatedByAncestor',
+      'deactivatedByToggle',
+      'damage',
+      ...schema.objectKeys(),
+    ];
+    op = addChangedKeysToOp(op, keys, original, changed);
+    if (op){
+      bulkWriteOperations.push(op);
     }
-    ids.forEach(id => {
-      let op = undefined;
-      let original = memo.originalPropsById[id];
-      let keys = [
-        'dependencies',
-        'inactive',
-        'deactivatedBySelf',
-        'deactivatedByAncestor',
-        'deactivatedByToggle',
-        ...schema.objectKeys(),
-      ];
-      op = addChangedKeysToOp(op, keys, original, changed);
-      if (op){
-        bulkWriteOperations.push(op);
-      }
-    });
   });
   writePropertiesSequentially(bulkWriteOperations);
 }

app/imports/api/properties/Attributes.js

@@ -133,6 +133,11 @@ let ComputedOnlyAttributeSchema = new SimpleSchema({
     type: Boolean,
     optional: true,
   },
+  // Denormalised tag if stat is overridden by one with the same variable name
+  overridden: {
+    type: Boolean,
+    optional: true,
+  },
 });
 
 const ComputedAttributeSchema = new SimpleSchema()

app/imports/api/properties/Proficiencies.js

@@ -14,9 +14,10 @@ let ProficiencySchema = new SimpleSchema({
 		type: String,
 	},
 	// A number representing how proficient the character is
+  // where 0.49 is half rounded down and 0.5 is half rounded up
 	value: {
 		type: Number,
-		allowedValues: [0.5, 1, 2],
+		allowedValues: [0.49, 0.5, 1, 2],
 		defaultValue: 1,
 	},
 });

app/imports/api/properties/Skills.js

@@ -121,6 +121,11 @@ let ComputedOnlySkillSchema = new SimpleSchema({
     type: Boolean,
     optional: true,
   },
+  // Denormalised tag if stat is overridden by one with the same variable name
+  overridden: {
+    type: Boolean,
+    optional: true,
+  },
 })
 
 const ComputedSkillSchema = new SimpleSchema()

app/imports/parser/parseTree/CallNode.js

@@ -20,7 +20,6 @@ export default class CallNode extends ParseNode {
 
     // Resolve the arguments
     let resolvedArgs = this.args.map(node => node[fn](scope, context));
-
     // Check that the arguments match what is expected
     let checkFailed = this.checkArugments({
       fn,
@@ -30,7 +29,7 @@ export default class CallNode extends ParseNode {
     });
 
     if (checkFailed){
-      if (fn !== 'reduce'){
+      if (fn === 'reduce'){
         return new ErrorNode({
           node: this,
           error: `Invalid arguments to ${this.functionName} function`,

app/imports/ui/components/propertyToolbar.vue

@@ -6,6 +6,7 @@
     :flat="flat"
   >
     <v-btn
+      v-if="!embedded"
       icon
       @click="back"
     >
@@ -143,6 +144,7 @@ export default {
     },
     flat: Boolean,
     editing: Boolean,
+    embedded: Boolean,
   },
   computed: {
     isDark(){

app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue

@@ -62,7 +62,7 @@ export default {
         },
         type: 'spell',
         removed: {$ne: true},
-        inactive: {$ne: true},
+        deactivatedByAncestor: {$ne: true},
       }, {
         sort: {
           level: 1,

app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue

@@ -345,6 +345,7 @@
     filter['ancestors.id'] = creature._id;
     filter.removed = {$ne: true};
     filter.inactive = {$ne: true};
+    filter.overridden = {$ne: true};
     return CreatureProperties.find(filter, {
       sort: {order: 1}
     });

app/imports/ui/creature/creatureProperties/Breadcrumbs.vue

@@ -1,5 +1,8 @@
 <template lang="html">
-  <div class="breadcrumbs layout align-center wrap">
+  <div
+    class="breadcrumbs layout align-center wrap"
+    :class="{'no-icons': noIcons}"
+  >
     <template v-for="(prop, index) in props">
       <v-icon
         v-if="index !== 0"
@@ -7,12 +10,25 @@
       >
         chevron_right
       </v-icon>
+      <span
+        v-if="noLinks"
+        :key="prop._id"
+      >
+        <tree-node-view
+          :model="prop"
+          class="breadcrumb-tree-node-view"
+        />
+      </span>
       <a
+        v-else
         :key="prop._id"
         :data-id="`breadcrumb-${prop._id}`"
         @click="click(prop._id)"
       >
-        <tree-node-view :model="prop" />
+        <tree-node-view
+          :model="prop"
+          class="breadcrumb-tree-node-view"
+        />
       </a>
     </template>
   </div>
@@ -31,6 +47,8 @@
         type: Object,
         required: true,
       },
+      noLinks: Boolean,
+      noIcons: Boolean,
     },
     computed:{
       props(){
@@ -74,5 +92,14 @@
 .breadcrumbs {
   margin-bottom: 16px;
   opacity: 0.8;
+}
+.no-icons {
+
 }
 </style>
+
+<style lang="css">
+  .no-icons .breadcrumb-tree-node-view .v-icon {
+    display: none;
+  }
+</style>

app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue

@@ -5,6 +5,7 @@
         :model="model"
         :editing="editing"
         :flat="flat"
+        :embedded="embedded"
         style="flex-grow: 0;"
         @duplicate="duplicate"
         @remove="remove"

app/imports/ui/properties/components/attributes/AttributeEffect.vue

@@ -0,0 +1,138 @@
+<template lang="html">
+  <v-list-item
+    class="effect-viewer layout align-center"
+    v-on="!hideBreadcrumbs ? {click} : {}"
+  >
+    <div class="effect-icon">
+      <v-tooltip bottom>
+        <template #activator="{ on }">
+          <v-icon
+            class="mx-2"
+            style="cursor: default;"
+            large
+            v-on="on"
+          >
+            {{ effectIcon }}
+          </v-icon>
+        </template>
+        <span>{{ operation }}</span>
+      </v-tooltip>
+    </div>
+    <div
+      class="text-h4 effect-value mr-2"
+    >
+      {{ displayedValue }}
+    </div>
+    <div class="layout column my-2">
+      <div class="text-body-1 mb-1">
+        {{ model.name || operation }}
+      </div>
+      <div v-if="!hideBreadcrumbs">
+        <breadcrumbs
+          :model="model"
+          class="text-caption"
+          no-links
+          no-icons
+          style="margin-bottom: 0"
+        />
+      </div>
+    </div>
+  </v-list-item>
+</template>
+
+<script lang="js">
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+	import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+  import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
+  import { isFinite } from 'lodash';
+
+	export default {
+    components: {
+      Breadcrumbs,
+    },
+		mixins: [propertyViewerMixin],
+    props: {
+      hideBreadcrumbs: Boolean
+    },
+		computed: {
+      hasClickListener(){
+        return this.$listeners && this.$listeners.click
+      },
+			resolvedValue(){
+				return this.model.result !== undefined ? this.model.result : this.model.calculation;
+			},
+			effectIcon(){
+				let value = this.resolvedValue;
+				return getEffectIcon(this.model.operation, value);
+			},
+			operation(){
+				switch(this.model.operation) {
+					case 'base': return 'Base value';
+					case 'add': return 'Add';
+					case 'mul': return 'Multiply';
+					case 'min': return 'Minimum';
+					case 'max': return 'Maximum';
+					case 'advantage': return 'Advantage';
+					case 'disadvantage': return 'Disadvantage';
+					case 'passiveAdd': return 'Passive bonus';
+					case 'fail': return 'Always fail';
+					case 'conditional': return 'Conditional benefit' ;
+          default: return '';
+				}
+			},
+			showValue(){
+				switch(this.model.operation) {
+					case 'base': return true;
+					case 'add': return true;
+					case 'mul': return true;
+					case 'min': return true;
+					case 'max': return true;
+					case 'advantage': return false;
+					case 'disadvantage': return false;
+					case 'passiveAdd': return true;
+					case 'fail': return false;
+					case 'conditional': return false;
+          default: return false;
+				}
+			},
+			displayedValue(){
+				let value = this.resolvedValue;
+				switch(this.model.operation) {
+					case 'base': return value;
+					case 'add': return isFinite(value) ? Math.abs(value) : value;
+					case 'mul': return value;
+					case 'min': return value;
+					case 'max': return value;
+					case 'advantage': return;
+					case 'disadvantage': return;
+					case 'passiveAdd': return isFinite(value) ? Math.abs(value) : value;
+					case 'fail': return;
+					case 'conditional': return;
+          default: return undefined;
+				}
+			}
+		},
+    methods: {
+      click(e){
+        this.$emit('click', e);
+      },
+    },
+	};
+</script>
+
+<style lang="css" scoped>
+	.icon, .effect-icon {
+		min-width: 30px;
+	}
+	.icon {
+		color: inherit !important;
+	}
+	.net-effect {
+		flex-grow: 0;
+		flex-shrink: 0;
+	}
+	.effect-value {
+		min-width: 60px;
+    text-align: center;
+	}
+</style>

app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue

@@ -41,6 +41,7 @@
 					attributeType: 'healthBar',
           removed: {$ne: true},
           inactive: {$ne: true},
+          overridden: {$ne: true},
         };
         if (creature.settings.hideUnusedStats){
           filter.hide = {$ne: true};

app/imports/ui/properties/components/skills/SkillListTile.vue

@@ -52,7 +52,9 @@ export default {
 	},
 	computed: {
 		icon(){
-			if (this.model.proficiency == 0.5){
+      if (this.model.proficiency == 0.49){
+				return 'brightness_3';
+			} else if (this.model.proficiency == 0.5){
 				return 'brightness_2';
 			} else if (this.model.proficiency == 1) {
 				return 'brightness_1'

app/imports/ui/properties/components/skills/SkillProficiency.vue

@@ -0,0 +1,114 @@
+<template lang="html">
+  <v-list-item
+    class="proficiency-viewer layout align-center"
+    v-on="!hideBreadcrumbs ? {click} : {}"
+  >
+    <div class="effect-icon">
+      <v-tooltip bottom>
+        <template #activator="{ on }">
+          <v-icon
+            class="mx-2"
+            style="cursor: default;"
+            large
+            v-on="on"
+          >
+            {{ icon }}
+          </v-icon>
+        </template>
+        <span>{{ proficiencyText }}</span>
+      </v-tooltip>
+    </div>
+    <div
+      class="text-h4 effect-value mr-2"
+    >
+      {{ proficiencyValue }}
+    </div>
+    <div class="layout column my-2">
+      <div class="text-body-1 mb-1">
+        {{ model.name || proficiencyText }}
+      </div>
+      <div v-if="!hideBreadcrumbs">
+        <breadcrumbs
+          :model="model"
+          class="text-caption"
+          no-links
+          no-icons
+          style="margin-bottom: 0"
+        />
+      </div>
+    </div>
+  </v-list-item>
+</template>
+
+<script lang="js">
+  import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+  import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
+
+  export default {
+    components: {
+      Breadcrumbs,
+    },
+    mixins: [propertyViewerMixin],
+    props: {
+      hideBreadcrumbs: Boolean,
+      proficiencyBonus: {
+        type: Number,
+        default: null,
+      },
+    },
+    computed: {
+      icon(){
+        if (this.model.value == 0.49){
+          return 'brightness_3';
+        } else if (this.model.value == 0.5) {
+          return 'brightness_2'
+        } else if (this.model.value == 1) {
+          return 'brightness_1'
+        } else if (this.model.value == 2){
+          return 'album'
+        } else {
+          return 'radio_button_unchecked';
+        }
+      },
+      proficiencyText(){
+        switch (this.model.value){
+          case 0.49: return 'Half proficiency bonus rounded down';
+          case 0.5: return 'Half proficiency bonus rounded up';
+          case 1: return 'Proficient';
+          case 2: return 'Double proficiency bonus';
+          default: return '';
+        }
+      },
+      proficiencyValue(){
+        if (!this.proficiencyBonus) return;
+        if (this.model.value === 0.49){
+          return Math.floor(0.5 * this.proficiencyBonus);
+        } else {
+          return Math.ceil(this.model.value * this.proficiencyBonus);
+        }
+      },
+    },
+    methods: {
+      click(e){
+        this.$emit('click', e);
+      },
+    },
+  };
+</script>
+
+<style lang="css" scoped>
+  .icon, .effect-icon {
+    min-width: 30px;
+  }
+  .icon {
+    color: inherit !important;
+  }
+  .net-effect {
+    flex-grow: 0;
+    flex-shrink: 0;
+  }
+  .effect-value {
+    min-width: 60px;
+    text-align: center;
+  }
+</style>

app/imports/ui/properties/forms/shared/ProficiencySelect.vue

@@ -22,7 +22,9 @@
 <script lang="js">
 	const ICON_SPIN_DURATION = 300;
 	let proficiencyIcon = function(value){
-		if (value == 0.5){
+    if (value == 0.49){
+			return 'brightness_3';
+		} else if (value == 0.5){
 			return 'brightness_2';
 		} else if (value == 1) {
 			return 'brightness_1'
@@ -49,7 +51,8 @@
 			iconClass: '',
 			values: [
 				{value: 1, text: 'Proficient'},
-				{value: 0.5, text: 'Half proficiency bonus'},
+        {value: 0.49, text: 'Half proficiency bonus rounded down'},
+				{value: 0.5, text: 'Half proficiency bonus rounded up'},
 				{value: 2, text: 'Double proficiency bonus'},
 			],
 		}},

app/imports/ui/properties/viewers/AttributeViewer.vue

@@ -43,27 +43,30 @@
       :calculations="model.descriptionCalculations"
       :inactive="model.inactive"
     />
-
+    <v-list>
-    <effect-viewer
+      <attribute-effect
-      v-if="context.creatureId && model.baseValueCalculation"
+        v-for="effect in baseEffects"
-      :model="{
+        :key="effect._id"
-        name: 'Base value',
+        :model="effect"
-        result: model.baseValue,
+        :hide-breadcrumbs="effect._id === model._id"
-        operation: 'base'
+        :data-id="effect._id"
-      }"
+        @click="effect._id !== model._id && clickEffect(effect._id)"
-    />
+      />
-    <effect-viewer
+      <attribute-effect
-      v-for="effect in effects"
+        v-for="effect in effects"
-      :key="effect._id"
+        :key="effect._id"
-      :model="effect"
+        :model="effect"
-    />
+        :data-id="effect._id"
+        @click="clickEffect(effect._id)"
+      />
+    </v-list>
   </div>
 </template>
 
 <script lang="js">
 	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
 	import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-	import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
+	import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
   import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 	export default {
@@ -71,7 +74,7 @@
       context: { default: {} }
     },
 		components: {
-			EffectViewer,
+			AttributeEffect,
 		},
 		mixins: [propertyViewerMixin],
 		computed: {
@@ -87,8 +90,37 @@
 		},
 		methods: {
 			numberToSignedString,
+      clickEffect(id){
+        this.$store.commit('pushDialogStack', {
+          component: 'creature-property-dialog',
+          elementId: `${id}`,
+          data: {_id: id},
+        });
+      },
 		},
     meteor: {
+      baseEffects(){
+        if (this.context.creatureId){
+          let creatureId = this.context.creatureId;
+          return CreatureProperties.find({
+            'ancestors.id': creatureId,
+            type: 'attribute',
+            variableName: this.model.variableName,
+            removed: {$ne: true},
+            inactive: {$ne: true},
+          }).map( prop => ({
+            _id: prop._id,
+            name: 'Attribute base value',
+            operation: 'base',
+            calculation: prop.baseValueCalculation,
+            result: prop.baseValue,
+            stats: [prop.variableName],
+            ancestors: prop.ancestors,
+          }) ).filter(effect => effect.result);
+        } else {
+          return [];
+        }
+      },
       effects(){
         if (this.context.creatureId){
           let creatureId = this.context.creatureId;

app/imports/ui/properties/viewers/ProficiencyViewer.vue

@@ -17,19 +17,19 @@
 import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
 import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
 export default {
-	components: {
+  components: {
-		ProficiencyIcon,
+    ProficiencyIcon,
-	},
+  },
-	mixins: [propertyViewerMixin],
+  mixins: [propertyViewerMixin],
-	computed: {
+  computed: {
-		proficiencyText(){
+    proficiencyText(){
-			switch (this.model.value){
+      switch (this.model.value){
-				case 0.5: return 'Half proficiency bonus';
+        case 0.5: return 'Half proficiency bonus';
-				case 1: return 'Proficient';
+        case 1: return 'Proficient';
-				case 2: return 'Double proficiency bonus';
+        case 2: return 'Double proficiency bonus';
         default: return '';
-			}
+      }
-		}
+    }
-	}
+  }
 }
 </script>

app/imports/ui/properties/viewers/SkillViewer.vue

@@ -40,18 +40,44 @@
       :inactive="model.inactive"
     />
 
-    <effect-viewer
+    <attribute-effect
-      v-if="context.creatureId && model.baseValue"
+      v-for="effect in baseEffects"
-      :model="{
+      :key="effect._id"
-        name: 'Base value',
+      :model="effect"
-        result: model.baseValue,
+      :hide-breadcrumbs="effect._id === model._id"
-        operation: 'base'
+      :data-id="effect._id"
-      }"
+      @click="effect._id !== model._id && clickEffect(effect._id)"
     />
-    <effect-viewer
+    <attribute-effect
+      v-if="ability"
+      :key="ability._id"
+      :model="ability"
+      :data-id="ability._id"
+      @click="clickEffect(ability._id)"
+    />
+    <attribute-effect
       v-for="effect in effects"
       :key="effect._id"
       :model="effect"
+      :data-id="effect._id"
+      @click="clickEffect(effect._id)"
+    />
+    <skill-proficiency
+      v-for="proficiency in baseProficiencies"
+      :key="proficiency._id"
+      :model="proficiency"
+      :proficiency-bonus="proficiencyBonus"
+      :hide-breadcrumbs="proficiency._id === model._id"
+      :data-id="proficiency._id"
+      @click="clickEffect(proficiency._id)"
+    />
+    <skill-proficiency
+      v-for="proficiency in proficiencies"
+      :key="proficiency._id"
+      :model="proficiency"
+      :proficiency-bonus="proficiencyBonus"
+      :data-id="proficiency._id"
+      @click="clickEffect(proficiency._id)"
     />
   </div>
 </template>
@@ -60,11 +86,14 @@
 import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
+import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
+import SkillProficiency from '/imports/ui/properties/components/skills/SkillProficiency.vue';
+import Creatures from '/imports/api/creature/Creatures.js';
 
 export default {
   components: {
-    EffectViewer,
+    AttributeEffect,
+    SkillProficiency,
   },
 	mixins: [propertyViewerMixin],
   inject: {
@@ -80,7 +109,9 @@ export default {
 			}
 		},
     icon(){
-			if (this.model.proficiency == 0.5){
+			if (this.model.proficiency == 0.49){
+				return 'brightness_3';
+			} else if (this.model.proficiency == 0.5){
 				return 'brightness_2';
 			} else if (this.model.proficiency == 1) {
 				return 'brightness_1'
@@ -94,8 +125,37 @@ export default {
   methods: {
     numberToSignedString,
     isFinite: Number.isFinite,
+    clickEffect(id){
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `${id}`,
+        data: {_id: id},
+      });
+    },
   },
   meteor: {
+    baseEffects(){
+      if (this.context.creatureId){
+        let creatureId = this.context.creatureId;
+        return CreatureProperties.find({
+          'ancestors.id': creatureId,
+          type: 'attribute',
+          variableName: this.model.variableName,
+          removed: {$ne: true},
+          inactive: {$ne: true},
+        }).map( prop => ({
+          _id: prop._id,
+          name: 'Skill base value',
+          operation: 'base',
+          calculation: prop.baseValueCalculation,
+          result: prop.baseValue,
+          stats: [prop.variableName],
+          ancestors: prop.ancestors,
+        }) ).filter(effect => effect.result);
+      } else {
+        return [];
+      }
+    },
     effects(){
       if (this.context.creatureId){
         let creatureId = this.context.creatureId;
@@ -109,6 +169,70 @@ export default {
         return [];
       }
     },
+    baseProficiencies(){
+      if (this.context.creatureId){
+        let creatureId = this.context.creatureId;
+        return CreatureProperties.find({
+          'ancestors.id': creatureId,
+          type: 'skill',
+          variableName: this.model.variableName,
+          removed: {$ne: true},
+          inactive: {$ne: true},
+        }).map( prop => ({
+          _id: prop._id,
+          name: 'Skill base proficiency',
+          value: prop.baseProficiency,
+          stats: [prop.variableName],
+          ancestors: prop.ancestors,
+        }) ).filter(prof => prof.value);
+      } else {
+        return [];
+      }
+    },
+    proficiencies(){
+      let creatureId = this.context.creatureId;
+      if (creatureId){
+        return CreatureProperties.find({
+          'ancestors.id': creatureId,
+          stats: this.model.variableName,
+          type: 'proficiency',
+          removed: {$ne: true},
+          inactive: {$ne: true},
+        });
+      } else {
+        return [];
+      }
+    },
+    ability(){
+      let creatureId = this.context.creatureId;
+      let ability = this.model.ability;
+      if (!creatureId || !ability) return;
+      let abilityProp = CreatureProperties.findOne({
+        'ancestors.id': creatureId,
+        variableName: ability,
+        type: 'attribute',
+        removed: {$ne: true},
+        inactive: {$ne: true},
+        overridden: {$ne: true},
+      });
+      if (!abilityProp) return;
+      return {
+        _id: abilityProp._id,
+        name: abilityProp.name,
+        operation: 'base',
+        result: abilityProp.modifier,
+        stats: [this.model.variableName],
+        ancestors: abilityProp.ancestors,
+      }
+    },
+    proficiencyBonus(){
+      let creatureId = this.context.creatureId;
+      if (!creatureId) return;
+      let creature = Creatures.findOne(creatureId)
+      return creature &&
+        creature.variables.proficiencyBonus &&
+        creature.variables.proficiencyBonus.currentValue;
+    },
   },
 }
 </script>