From 79d166e6af1b88f044f2d7fbb06b8f1613fa5c89 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 25 Jun 2015 13:34:44 +0200
Subject: [PATCH] Removed references to old calculations

---
 rpg-docs/Model/Character/Characters.js        | 205 ++++--------------
 .../Model/Character/SubSchemas/Adjustment.js  |   4 -
 .../client/views/character/characterSheet.js  |   2 +-
 .../views/character/features/features.html    |   4 +-
 .../views/character/features/features.js      |  15 +-
 .../carryCapacityBar/carryCapacityBar.js      |   2 +-
 .../views/character/journal/journal.html      |   4 +-
 .../client/views/character/journal/journal.js |   2 +-
 .../client/views/character/spells/spells.js   |  24 +-
 .../stats/abilityCards/abilityCards.html      |   4 +-
 .../stats/abilityCards/abilityCards.js        |   9 +
 .../stats/attributeDialog/attributeDialog.js  |  14 +-
 .../stats/healthCard/healthCard.html          |  28 ++-
 .../character/stats/healthCard/healthCard.js  |  32 +--
 .../character/stats/hitDice/hitDice.html      |   2 +-
 .../views/character/stats/hitDice/hitDice.js  |  17 +-
 .../character/stats/skillRow/skillRow.html    |   2 +-
 .../character/stats/skillRow/skillRow.js      |  10 +-
 .../client/views/character/stats/stats.html   |   2 +-
 .../client/views/character/stats/stats.js     |  10 +-
 .../paperTemplates/baseDialog/baseDialog.html |  12 +-
 rpg-docs/lib/functions/evaluate.js            |   1 -
 rpg-docs/lib/methods/conditions.js            |   4 +-
 23 files changed, 155 insertions(+), 254 deletions(-)
 create mode 100644 rpg-docs/client/views/character/stats/abilityCards/abilityCards.js

diff --git a/rpg-docs/Model/Character/Characters.js b/rpg-docs/Model/Character/Characters.js
index eed8b734..f2da0da4 100644
--- a/rpg-docs/Model/Character/Characters.js
+++ b/rpg-docs/Model/Character/Characters.js
@@ -3,16 +3,16 @@ Characters = new Mongo.Collection("characters");
 
 Schemas.Character = new SimpleSchema({
 	//strings
-	name:         {type: String, defaultValue: "", trim: false},
-	alignment:    {type: String, defaultValue: "", trim: false},
-	gender:       {type: String, defaultValue: "", trim: false},
-	race:         {type: String, defaultValue: "", trim: false},
-	description:  {type: String, defaultValue: "", trim: false},
-	personality:  {type: String, defaultValue: "", trim: false},
-	ideals:       {type: String, defaultValue: "", trim: false},
-	bonds:        {type: String, defaultValue: "", trim: false},
-	flaws:        {type: String, defaultValue: "", trim: false},
-	backstory:    {type: String, defaultValue: "", trim: false},
+	name:         {type: String, defaultValue: "", trim: false, optional: true},
+	alignment:    {type: String, defaultValue: "", trim: false, optional: true},
+	gender:       {type: String, defaultValue: "", trim: false, optional: true},
+	race:         {type: String, defaultValue: "", trim: false, optional: true},
+	description:  {type: String, defaultValue: "", trim: false, optional: true},
+	personality:  {type: String, defaultValue: "", trim: false, optional: true},
+	ideals:       {type: String, defaultValue: "", trim: false, optional: true},
+	bonds:        {type: String, defaultValue: "", trim: false, optional: true},
+	flaws:        {type: String, defaultValue: "", trim: false, optional: true},
+	backstory:    {type: String, defaultValue: "", trim: false, optional: true},
 
 	//attributes
 	//ability scores
@@ -442,12 +442,17 @@ Characters.calculate = {
 };
 
 var depreciated = function() {
-	var err = new Error();
+	//var err = new Error("this function has been depreciated");
 	var name = "";
-	if(Template.instance()){
+	if (Template.instance()){
 		name = Template.instance().view.name;
 	}
-	console.log("this function has been depreciated", {viewName: name, stacktrace: err.stack});
+	var logString = "this function has been depreciated \n";
+	if (name){
+		logString += "View: " + name + "\n\n";
+	}
+	//logString += err.stack + "\n\n---------------------\n\n";
+	console.log(logString);
 };
 
 //functions and calculated values.
@@ -458,194 +463,62 @@ Characters.helpers({
 	//will set up dependencies on just that field
 	getField : function(fieldName){
 		depreciated();
-		var fieldSelector = {};
-		fieldSelector[fieldName] = 1;
-		var char = Characters.findOne(this._id, {fields: fieldSelector});
-		var field = char[fieldName];
-		if (field === undefined){
-			throw new Meteor.Error(
-				"getField failed",
-				"getField could not find field " +
-				fieldName +
-				" in character " +
-				char._id
-			);
-		}
-		return field;
+		return Characters.calculate.getField(this._id, fieldName);
 	},
 	//returns the value of a field
 	fieldValue : function(fieldName){
 		depreciated();
-		if (!Schemas.Character.schema(fieldName)){
-			throw new Meteor.Error(
-				"Field not found",
-				"Character's schema does not contain a field called: " + fieldName
-			);
-		}
-		//duck typing to get the right value function
-		//.ability implies skill
-		if (Schemas.Character.schema(fieldName + ".ability")){
-			return this.skillMod(fieldName);
-		}
-		//adjustment implies attribute
-		if (Schemas.Character.schema(fieldName + ".adjustment")){
-			return this.attributeValue(fieldName);
-		}
-		//fall back to just returning the field itself
-		return this.getField(fieldName);
+		return Characters.calculate.fieldValue(this._id, fieldName);
 	},
-
 	attributeValue: function(attributeName){
 		depreciated();
-		var charId = this._id;
-		var attribute = this.getField(attributeName);
-		//base value
-		var value = this.attributeBase(attributeName);
-		//plus adjustment
-		value += attribute.adjustment;
-		return value;
+		return Characters.calculate.attributeValue(this._id, attributeName);
 	},
-
-	attributeBase: preventLoop(function(attributeName){
+	attributeBase: function(attributeName){
 		depreciated();
-		var charId = this._id;
-		//base value
-		return attributeBase(charId, attributeName);
-	}),
-
-	skillMod: preventLoop(function(skillName){
+		return Characters.calculate.attributeBase(this._id, attributeName);
+	},
+	skillMod: function(skillName){
 		depreciated();
-		var charId = this._id;
-		var skill = this.getField(skillName);
-		//get the final value of the ability score
-		var ability = this.attributeValue(skill.ability);
-
-		//base modifier
-		var mod = +getMod(ability);
-
-		//multiply proficiency bonus by largest value in proficiency array
-		var prof = this.proficiency(skillName);
-
-		//add multiplied proficiency bonus to modifier
-		mod += prof * this.attributeValue("proficiencyBonus");
-
-		//apply all effects
-		var rawEffects = Effects.find(
-			{charId: charId, stat: skillName, enabled: true}
-		).fetch();
-		var effects = _.groupBy(rawEffects, "operation");
-		_.forEach(effects.add, function(effect){
-			mod += evaluateEffect(charId, effect);
-		});
-		_.forEach(effects.mul, function(effect){
-			mod *= evaluateEffect(charId, effect);
-		});
-		_.forEach(effects.min, function(effect){
-			var min = evaluateEffect(charId, effect);
-			mod = mod > min ? mod : min;
-		});
-		_.forEach(effects.max, function(effect){
-			var max = evaluateEffect(charId, effect);
-			mod = mod < max ? mod : max;
-		});
-		return signedString(mod);
-	}),
-
+		return Characters.calculate.skillMod(this._id, skillName);
+	},
 	proficiency: function(skillName){
 		depreciated();
-		var charId = this._id;
-		//return largest value in proficiency array
-		var prof = 0;
-		Proficiencies.find(
-			{charId: charId, name: skillName, enabled: true}
-		).forEach(function(proficiency){
-			var newProf = proficiency.value;
-			if (newProf > prof){
-				prof = newProf;
-			}
-		});
-		return prof;
+		return Characters.calculate.proficiency(this._id, skillName);
 	},
-
 	passiveSkill: function(skillName){
 		depreciated();
-		if (_.isString(skillName)){
-			var skill = this.getField(skillName);
-		}
-		var charId = this._id;
-		var mod = +this.skillMod(skillName);
-		var value = 10 + mod;
-		Effects.find(
-			{charId: charId, stat: skillName, enabled: true, operation: "passiveAdd"}
-		).forEach(function(effect){
-			value += evaluateEffect(charId, effect);
-		});
-		return value;
-		//TODO decide whether (dis)advantage gives (-)+5 to passive checks
+		return Characters.calculate.passiveSkill(this._id, skillName);
 	},
-
 	advantage: function(skillName){
 		depreciated();
-		var charId = this._id;
-		var advantage = Effects.find(
-			{charId: charId, stat: skillName, enabled: true, operation: "advantage"}
-		).count();
-		var disadvantage = Effects.find(
-			{charId: charId, stat: skillName, enabled: true, operation: "disadvantage"}
-		).count();
-		if (advantage && !disadvantage) return 1;
-		if (disadvantage && !advantage) return -1;
-		return 0;
+		return Characters.calculate.advantage(this._id, skillName);
 	},
-
 	abilityMod: function(attribute){
 		depreciated();
-		return signedString(getMod(this.attributeValue(attribute)));
+		return Characters.calculate.abilityMod(this._id, attribute);
 	},
-
 	passiveAbility: function(attribute){
 		depreciated();
-		var mod = +getMod(this.attributeValue(attribute));
-		return 10 + mod;
+		return Characters.calculate.passiveAbility(this._id, attribute);
 	},
-
 	xpLevel: function(){
 		depreciated();
-		var xp = this.experience();
-		for (var i = 0; i < 19; i++){
-			if (xp < XP_TABLE[i]){
-				return i;
-			}
-		}
-		if (xp > 355000) return 20;
-		return 0;
+		return Characters.calculate.xpLevel(this._id);
 	},
-
 	level: function(){
 		depreciated();
-		var level = 0;
-		Classes.find({charId: this._id}).forEach(function(cls){
-			level += cls.level;
-		});
-		return level;
+		return Characters.calculate.level(this._id);
 	},
-
 	experience: function(){
 		depreciated();
-		var xp = 0;
-		Experiences.find(
-			{charId: this._id},
-			{fields: {value: 1}}
-		).forEach(function(e){
-			xp += e.value;
-		});
-		return xp;
+		return Characters.calculate.experience(this._id);
 	},
 });
 
 //clean up all data related to that character before removing it
-Characters.after.remove(function(userId, character) {
-	if (Meteor.isServer){
+if (Meteor.isServer){
+	Characters.after.remove(function(userId, character) {
 		Actions       .remove({charId: character._id});
 		Attacks       .remove({charId: character._id});
 		Buffs         .remove({charId: character._id});
@@ -658,8 +531,8 @@ Characters.after.remove(function(userId, character) {
 		SpellLists    .remove({charId: character._id});
 		Items         .remove({charId: character._id});
 		Containers    .remove({charId: character._id});
-	}
-});
+	});
+}
 
 Characters.allow({
 	insert: function(userId, doc) {
diff --git a/rpg-docs/Model/Character/SubSchemas/Adjustment.js b/rpg-docs/Model/Character/SubSchemas/Adjustment.js
index b33f8e93..8025f089 100644
--- a/rpg-docs/Model/Character/SubSchemas/Adjustment.js
+++ b/rpg-docs/Model/Character/SubSchemas/Adjustment.js
@@ -3,10 +3,6 @@
  * Damage, healing and resource cost/recovery are all adjustments
  */
 Schemas.Adjustment = new SimpleSchema({
-	name: {
-		type: String,
-		optional: true,
-	},
 	//which stat the adjustment is applied to
 	stat: {
 		type: String,
diff --git a/rpg-docs/client/views/character/characterSheet.js b/rpg-docs/client/views/character/characterSheet.js
index 71933b46..4e7681b9 100644
--- a/rpg-docs/client/views/character/characterSheet.js
+++ b/rpg-docs/client/views/character/characterSheet.js
@@ -20,7 +20,7 @@ Template.characterSheet.helpers({
 	hideSpellcasting: function() {
 		var char = Characters.findOne(this._id);
 		return char && char.settings.hideSpellcasting;
-	}
+	},
 });
 
 Template.characterSheet.events({
diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html
index 52043f27..e39dd965 100644
--- a/rpg-docs/client/views/character/features/features.html
+++ b/rpg-docs/client/views/character/features/features.html
@@ -135,7 +135,7 @@
 </template>
 
 <template name="resource">
-	{{#if char.attributeBase name}}
+	{{#if characterCalculate "attributeBase" char._id name}}
 		<paper-shadow class="card" 
 					  hero-id="main" {{detailHero name char._id}}
 					  layout horizontal>
@@ -152,7 +152,7 @@
 									   disabled={{cantDecrement}}>
 					</paper-icon-button>
 				</div>
-				<div>{{char.attributeValue name}}</div>
+				<div>{{characterCalculate "attributeValue" char._id name}}</div>
 				<!--<div>/{{char.attributeBase name}}</div>-->
 			</div>
 			<div class="right clickable" 
diff --git a/rpg-docs/client/views/character/features/features.js b/rpg-docs/client/views/character/features/features.js
index 3ae8b376..5a9fa705 100644
--- a/rpg-docs/client/views/character/features/features.js
+++ b/rpg-docs/client/views/character/features/features.js
@@ -96,12 +96,14 @@ Template.features.events({
 
 Template.resource.helpers({
 	cantIncrement: function(){
-		var baseBigger = this.char.attributeValue(this.name) <
-			this.char.attributeBase(this.name);
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		var baseBigger = value < base;
 		return !baseBigger;
 	},
 	cantDecrement: function(){
-		var valuePositive = this.char.attributeValue(this.name) > 0;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var valuePositive = value > 0;
 		return !valuePositive;
 	},
 	getColor: function(){
@@ -115,14 +117,17 @@ Template.resource.helpers({
 
 Template.resource.events({
 	"tap .resourceUp": function(event){
-		if (this.char.attributeValue(this.name) < this.char.attributeBase(this.name)){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		if (value < base){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = 1;
 			Characters.update(this.char._id, modifier, {validate: false});
 		}
 	},
 	"tap .resourceDown": function(event){
-		if (this.char.attributeValue(this.name) > 0){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		if (value > 0){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = -1;
 			Characters.update(this.char._id, modifier, {validate: false});
diff --git a/rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.js b/rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.js
index bc8a42f9..c6a56997 100644
--- a/rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.js
+++ b/rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.js
@@ -13,7 +13,7 @@ var getFractionCarried = function(char) {
 		weight += item.totalWeight();
 	});
 	//get strength
-	var strength = char.attributeValue("strength");
+	var strength = Characters.calculate.attributeValue(char._id, "strength");
 	var capacity = strength * 15;
 	return weight / capacity;
 };
diff --git a/rpg-docs/client/views/character/journal/journal.html b/rpg-docs/client/views/character/journal/journal.html
index 1bb050e1..1ab6a6ab 100644
--- a/rpg-docs/client/views/character/journal/journal.html
+++ b/rpg-docs/client/views/character/journal/journal.html
@@ -9,7 +9,7 @@
 						 hero-id="toolbar" {{detailHero}}
 						 layout horizontal center>
 						<div flex>Experience</div>
-						<div >{{experience}} XP</div>
+						<div >{{characterCalculate "experience" _id}} XP</div>
 						<paper-icon-button class="black54" id="addXP" icon="add"></paper-icon-button>
 					</div>
 					<div class="bottom list">
@@ -45,7 +45,7 @@
 						 layout horizontal center>
 						<div flex>
 							<div class="containerName subhead">
-								Level {{level}}
+								Level {{characterCalculate "level" _id}}
 							</div>
 							{{#if nextLevelXP}}
 								<div class="caption">
diff --git a/rpg-docs/client/views/character/journal/journal.js b/rpg-docs/client/views/character/journal/journal.js
index b96a533c..6686e14e 100644
--- a/rpg-docs/client/views/character/journal/journal.js
+++ b/rpg-docs/client/views/character/journal/journal.js
@@ -41,7 +41,7 @@ Template.journal.helpers({
 		return Levels.find({charId: charId, classId: this._id}, {sort: {value: 1}});
 	},
 	nextLevelXP: function(){
-		var currentLevel = this.level();
+		var currentLevel = Characters.calculate.level(this._id);
 		if (currentLevel < 20){
 			return XP_TABLE[currentLevel];
 		}
diff --git a/rpg-docs/client/views/character/spells/spells.js b/rpg-docs/client/views/character/spells/spells.js
index 6f9d4438..3ec6e0ea 100644
--- a/rpg-docs/client/views/character/spells/spells.js
+++ b/rpg-docs/client/views/character/spells/spells.js
@@ -84,32 +84,28 @@ Template.spells.helpers({
 	},
 	cantCast: function(level, char){
 		for (var i = level; i <= 9; i++){
-			if (char.attributeValue("level" + i + "SpellSlots") > 0){
+			if (Characters.calculate.attributeValue(char._id, "level" + i + "SpellSlots") > 0){
 				return false;
 			}
 		}
 		return true;
 	},
-	baseSlots: function(char){
-		return char.attributeBase("level" + this.level + "SpellSlots");
-	},
-	slots: function(char){
-		return char.attributeValue("level" + this.level + "SpellSlots");
-	},
 	showSlots: function(char){
-		return this.level && char.attributeBase("level" + this.level + "SpellSlots");
+		return this.level && Characters.calculate.attributeBase(
+			char._id, "level" + this.level + "SpellSlots"
+		);
 	},
 	hasSlots: function(){
 		for (var i = 1; i <= 9; i += 1){
-			if (this.attributeBase("level" + i + "SpellSlots")){
+			if (Characters.calculate.attributeBase(this._id, "level" + i + "SpellSlots")){
 				return true;
 			}
 		}
 		return false;
 	},
 	slotBubbles: function(char){
-		var baseSlots = char.attributeBase("level" + this.level + "SpellSlots");
-		var currentSlots = char.attributeValue("level" + this.level + "SpellSlots");
+		var baseSlots = Characters.calculate.attributeBase(char._id, "level" + this.level + "SpellSlots");
+		var currentSlots = Characters.calculate.attributeValue(char._id, "level" + this.level + "SpellSlots");
 		var slotsUsed = baseSlots - currentSlots;
 		var bubbles = [];
 		var i;
@@ -143,15 +139,15 @@ Template.spells.events({
 			var char = Characters.findOne(this.charId);
 			if (event.currentTarget.icon === "radio-button-off"){
 				if (
-					char.attributeValue(this.attribute) <
-					char.attributeBase(this.attribute)
+					Characters.calculate.attributeValue(char._id, this.attribute) <
+					Characters.calculate.attributeBase(char._id, this.attribute)
 				){
 					modifier = {$inc: {}};
 					modifier.$inc[this.attribute + ".adjustment"] = 1;
 					Characters.update(this.charId, modifier, {validate: false});
 				}
 			} else {
-				if (char.attributeValue(this.attribute) > 0){
+				if (Characters.calculate.attributeValue(char._id, this.attribute) > 0){
 					modifier = {$inc: {}};
 					modifier.$inc[this.attribute + ".adjustment"] = -1;
 					Characters.update(this.charId, modifier, {validate: false});
diff --git a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html
index eb32ac7a..d044bc55 100644
--- a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html
+++ b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html
@@ -4,8 +4,8 @@
 				  layout horizontal>
 		<div class="left white-text {{color}}"
 			 hero-id="toolbar" {{detailHero ability ../_id}}>
-			<div class="display1">{{../attributeValue ability}}</div>
-			<div class="title">{{../abilityMod ability}}</div>
+			<div class="display1">{{characterCalculate "attributeValue" ../_id ability}}</div>
+			<div class="title">{{abilityMod}}</div>
 		</div>
 		<div class="right subhead" layout horizontal center>
 			{{title}}
diff --git a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.js b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.js
new file mode 100644
index 00000000..4b184574
--- /dev/null
+++ b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.js
@@ -0,0 +1,9 @@
+Template.abilityMiniCard.helpers({
+	abilityMod: function() {
+		return signedString(
+			Characters.calculate.abilityMod(
+				Template.parentData()._id, this.ability
+			)
+		);
+	}
+});
diff --git a/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js b/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js
index 81b461be..1e2bf9a3 100644
--- a/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js
+++ b/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js
@@ -106,10 +106,8 @@ Template.attributeDialogView.helpers({
 		return a || b || c;
 	},
 	adjustment: function(){
-		var char = Characters.findOne(this.charId);
-		if (!char) return;
-		var value = char.attributeValue(this.statName);
-		var base = char.attributeBase(this.statName);
+		var value = Characters.calculate.attributeValue(this.charId, this.statName);
+		var base = Characters.calculate.attributeBase(this.charId, this.statName);
 		return value - base;
 	},
 	baseEffects: function(){
@@ -138,14 +136,10 @@ Template.attributeDialogView.helpers({
 		);
 	},
 	attributeBase: function(){
-		var char = Characters.findOne(this.charId);
-		if (!char) throw "character is " + char;
-		return char.attributeBase(this.statName);
+		return Characters.calculate.attributeBase(this.charId, this.statName);
 	},
 	attributeValue: function() {
-		var char = Characters.findOne(this.charId);
-		if (!char) throw "character is " + char;
-		return char.attributeValue(this.statName);
+		return Characters.calculate.attributeValue(this.charId, this.statName);
 	},
 	sourceName: function(){
 		if (this.parent.group === "racial"){
diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/character/stats/healthCard/healthCard.html
index 56f035e9..e31c042c 100644
--- a/rpg-docs/client/views/character/stats/healthCard/healthCard.html
+++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.html
@@ -11,11 +11,11 @@
 		<div class="right" flex layout vertical center-justified style="min-width: 180px;">
 			<div layout horizontal>
 				<paper-diff-slider id="hitPointSlider"
-							  value={{attributeValue "hitPoints"}}
-							  max={{attributeBase "hitPoints"}} 
-							  editable pin
-							  role="slider"
-							  ></paper-diff-slider>
+								   value={{characterCalculate "attributeValue" _id "hitPoints"}}
+								   max={{characterCalculate "attributeBase" _id "hitPoints"}}
+								   editable pin
+								   role="slider">
+				</paper-diff-slider>
 			</div>
 			{{#each tempHitPoints}}
 				<div>
@@ -35,9 +35,21 @@
 			</div>
 			{{/each}}
 			<div class="caption">
-				{{#if multipliers.immunities.length}} <div>Immune:     {{#each multipliers.immunities}}  {{name}} {{/each}}</div>{{/if}}
-				{{#if multipliers.resistances.length}}<div>Resistance: {{#each multipliers.resistances}} {{name}} {{/each}}</div>{{/if}}
-				{{#if multipliers.weaknesses.length}} <div>Weakness:   {{#each multipliers.weaknesses}}  {{name}} {{/each}}</div>{{/if}}
+				{{#if multipliers.immunities.length}} 
+					<div>
+						Immune:     {{#each multipliers.immunities}}  {{name}} {{/each}}
+					</div>
+				{{/if}}
+				{{#if multipliers.resistances.length}}
+					<div>
+						Resistance: {{#each multipliers.resistances}} {{name}} {{/each}}
+					</div>
+				{{/if}}
+				{{#if multipliers.weaknesses.length}}
+					<div>
+						Weakness:   {{#each multipliers.weaknesses}}  {{name}} {{/each}}
+					</div>
+				{{/if}}
 			</div>
 			{{#if showDeathSave}}
 				{{#with deathSaveObject}}
diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.js b/rpg-docs/client/views/character/stats/healthCard/healthCard.js
index 5fb37eab..6fe9a7c8 100644
--- a/rpg-docs/client/views/character/stats/healthCard/healthCard.js
+++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.js
@@ -3,7 +3,7 @@ Template.healthCard.helpers({
 		return TemporaryHitPoints.find({charId: this._id});
 	},
 	showDeathSave: function(){
-		return this.attributeValue("hitPoints") <= 0;
+		return Characters.calculate.attributeValue(this._id, "hitPoints") <= 0;
 	},
 	deathSaveObject: function(){
 		var char = Characters.findOne(this._id, {fields: {deathSave: 1}});
@@ -27,21 +27,20 @@ Template.healthCard.helpers({
 		return this.fail >= 3;
 	},
 	multipliers: function(){
-		var char = Characters.findOne(this._id, {fields: {_id: 1}});
 		var multipliers = [
-			{name: "Acid",        value: char.attributeValue("acidMultiplier", 1)},
-			{name: "Bludgeoning", value: char.attributeValue("bludgeoningMultiplier", 1)},
-			{name: "Cold",        value: char.attributeValue("coldMultiplier", 1)},
-			{name: "Fire",        value: char.attributeValue("fireMultiplier", 1)},
-			{name: "Force",       value: char.attributeValue("forceMultiplier", 1)},
-			{name: "Lightning",   value: char.attributeValue("lightningMultiplier", 1)},
-			{name: "Necrotic",    value: char.attributeValue("necroticMultiplier", 1)},
-			{name: "Piercing",    value: char.attributeValue("piercingMultiplier", 1)},
-			{name: "Poison",      value: char.attributeValue("poisonMultiplier", 1)},
-			{name: "Psychic",     value: char.attributeValue("psychicMultiplier", 1)},
-			{name: "Radiant",     value: char.attributeValue("radiantMultiplier", 1)},
-			{name: "Slashing",    value: char.attributeValue("slashingMultiplier", 1)},
-			{name: "Thunder",     value: char.attributeValue("thunderMultiplier", 1)},
+			{name: "Acid",        value: Characters.calculate.attributeValue(this._id, "acidMultiplier")},
+			{name: "Bludgeoning", value: Characters.calculate.attributeValue(this._id, "bludgeoningMultiplier")},
+			{name: "Cold",        value: Characters.calculate.attributeValue(this._id, "coldMultiplier")},
+			{name: "Fire",        value: Characters.calculate.attributeValue(this._id, "fireMultiplier")},
+			{name: "Force",       value: Characters.calculate.attributeValue(this._id, "forceMultiplier")},
+			{name: "Lightning",   value: Characters.calculate.attributeValue(this._id, "lightningMultiplier")},
+			{name: "Necrotic",    value: Characters.calculate.attributeValue(this._id, "necroticMultiplier")},
+			{name: "Piercing",    value: Characters.calculate.attributeValue(this._id, "piercingMultiplier")},
+			{name: "Poison",      value: Characters.calculate.attributeValue(this._id, "poisonMultiplier")},
+			{name: "Psychic",     value: Characters.calculate.attributeValue(this._id, "psychicMultiplier")},
+			{name: "Radiant",     value: Characters.calculate.attributeValue(this._id, "radiantMultiplier")},
+			{name: "Slashing",    value: Characters.calculate.attributeValue(this._id, "slashingMultiplier")},
+			{name: "Thunder",     value: Characters.calculate.attributeValue(this._id, "thunderMultiplier")},
 		];
 		multipliers = _.groupBy(multipliers, "value");
 		return {
@@ -55,7 +54,8 @@ Template.healthCard.helpers({
 Template.healthCard.events({
 	"change #hitPointSlider": function(event){
 		var value = event.currentTarget.value;
-		var adjustment = value - this.attributeBase("hitPoints");
+		var base = Characters.calculate.attributeBase(this._id, "hitPoints")
+		var adjustment = value - base;
 		Characters.update(this._id, {$set: {"hitPoints.adjustment": adjustment}});
 		//reset the death saves if we are gaining HP
 		if (value > 0)
diff --git a/rpg-docs/client/views/character/stats/hitDice/hitDice.html b/rpg-docs/client/views/character/stats/hitDice/hitDice.html
index 3298bb32..ac1b2af3 100644
--- a/rpg-docs/client/views/character/stats/hitDice/hitDice.html
+++ b/rpg-docs/client/views/character/stats/hitDice/hitDice.html
@@ -1,5 +1,5 @@
 <template name="hitDice">
-	{{#if ../attributeBase name}}
+	{{#if characterCalculate "attributeBase" ../_id name}}
 		<paper-shadow class="card hit-dice" hero-id="main" 
 					  {{detailHero name ../_id}} 
 					  layout horizontal>
diff --git a/rpg-docs/client/views/character/stats/hitDice/hitDice.js b/rpg-docs/client/views/character/stats/hitDice/hitDice.js
index bdaef24d..e6cd38e5 100644
--- a/rpg-docs/client/views/character/stats/hitDice/hitDice.js
+++ b/rpg-docs/client/views/character/stats/hitDice/hitDice.js
@@ -1,25 +1,28 @@
 Template.hitDice.helpers({
 	cantIncrement: function(){
-		var valueSmallerThanBase = this.char.attributeValue(this.name) <
-			this.char.attributeBase(this.name);
-		return !valueSmallerThanBase;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		return value >= base;
 	},
 	cantDecrement: function(){
-		var valuePositive = this.char.attributeValue(this.name) > 0;
-		return !valuePositive;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		return value <= 0;
 	},
 });
 
 Template.hitDice.events({
 	"tap .resourceUp": function(event){
-		if (this.char.attributeValue(this.name) < this.char.attributeBase(this.name)){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		if (value < base){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = 1;
 			Characters.update(this.char._id, modifier, {validate: false});
 		}
 	},
 	"tap .resourceDown": function(event){
-		if (this.char.attributeValue(this.name) > 0){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		if (value > 0){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = -1;
 			Characters.update(this.char._id, modifier, {validate: false});
diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.html b/rpg-docs/client/views/character/stats/skillRow/skillRow.html
index 37caa03b..c40d6460 100644
--- a/rpg-docs/client/views/character/stats/skillRow/skillRow.html
+++ b/rpg-docs/client/views/character/stats/skillRow/skillRow.html
@@ -9,7 +9,7 @@
 				<div class="fail skill-mod">fail</div>
 			{{else}}
 				<div class="{{advantage}} skill-mod">
-					{{characterCalculate "skillMod" ../_id skill}}
+					{{skillMod}}
 				</div>
 			{{/if}}
 			<div flex>
diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.js b/rpg-docs/client/views/character/stats/skillRow/skillRow.js
index 760c0e4f..fae6145a 100644
--- a/rpg-docs/client/views/character/stats/skillRow/skillRow.js
+++ b/rpg-docs/client/views/character/stats/skillRow/skillRow.js
@@ -1,6 +1,14 @@
 Template.skillRow.helpers({
+	skillMod: function() {
+		return signedString(
+			Characters.calculate.skillMod(
+				Template.parentData()._id, this.skill
+			)
+		);
+	},
 	profIcon: function(){
-		var prof = Template.parentData(1).proficiency(this.skill);
+		var charId = Template.parentData()._id;
+		var prof = Characters.calculate.proficiency(charId, this.skill);
 		if (prof > 0 && prof < 1) return "image:brightness-2";
 		if (prof === 1) return "image:brightness-1";
 		if (prof > 1) return "av:album";
diff --git a/rpg-docs/client/views/character/stats/stats.html b/rpg-docs/client/views/character/stats/stats.html
index 0e7eb6da..afff375b 100644
--- a/rpg-docs/client/views/character/stats/stats.html
+++ b/rpg-docs/client/views/character/stats/stats.html
@@ -75,7 +75,7 @@
 		<div class="left display1 white-text {{color}}"
 			 hero-id="toolbar" {{detailHero stat ../_id}}>
 			{{#if isSkill}}
-				{{characterCalculate "skillMod" ../_id stat}}
+				{{prefix}}{{skillMod}}
 			{{else}}
 				{{prefix}}{{characterCalculate "attributeValue" ../_id stat}}
 			{{/if}}
diff --git a/rpg-docs/client/views/character/stats/stats.js b/rpg-docs/client/views/character/stats/stats.js
index acfcd759..0cf7b922 100644
--- a/rpg-docs/client/views/character/stats/stats.js
+++ b/rpg-docs/client/views/character/stats/stats.js
@@ -67,6 +67,12 @@ Template.stats.events({
 	},
 });
 
-Template.stats.helpers({
-
+Template.statCard.helpers({
+	skillMod: function() {
+		return signedString(
+			Characters.calculate.skillMod(
+				Template.parentData()._id, this.stat
+			)
+		);
+	},
 });
diff --git a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html
index a3771702..249f2d5b 100644
--- a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html
+++ b/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html
@@ -13,22 +13,22 @@
 								   role="button"
 								   tabindex="0"
 								   icon="delete"
-								   aria-label="Delete Feature"
-								   noink></paper-icon-button>
+								   aria-label="Delete Feature">
+				</paper-icon-button>
 			{{/unless}}
 			{{#unless hideColor}}
 				{{> colorDropdown}}
 			{{/unless}}
 			<paper-icon-button id="doneEditingButton"
 							   icon="done"
-							   aria-label="Delete Feature"
-							   noink></paper-icon-button>
+							   aria-label="Delete Feature">
+			</paper-icon-button>
 		{{else}}
 			{{#if showEdit}}
 				<paper-icon-button id="editButton"
 								   icon="create"
-								   aria-label="Delete Feature"
-								   noink></paper-icon-button>
+								   aria-label="Delete Feature">
+				</paper-icon-button>
 			{{/if}}
 		{{/if}}
 	</div>
diff --git a/rpg-docs/lib/functions/evaluate.js b/rpg-docs/lib/functions/evaluate.js
index 86d42e93..552f6944 100644
--- a/rpg-docs/lib/functions/evaluate.js
+++ b/rpg-docs/lib/functions/evaluate.js
@@ -40,7 +40,6 @@ evaluate = function(charId, string){
 		var result = math.eval(string);
 		return result;
 	} catch (e){
-		console.log("Failed to evaluate ", string);
 		return string;
 	}
 };
diff --git a/rpg-docs/lib/methods/conditions.js b/rpg-docs/lib/methods/conditions.js
index e5a83801..f0ecddb0 100644
--- a/rpg-docs/lib/methods/conditions.js
+++ b/rpg-docs/lib/methods/conditions.js
@@ -98,9 +98,9 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 		});
 		var character = Characters.findOne(
 			charId,
-			{fields: {strength: 1, "settings": 1}}
+			{fields: {"settings": 1}}
 		);
-		var strength = character.attributeValue("strength");
+		var strength = Characters.calculate.attributeValue(charId, "strength");
 		var give = function(condition) {
 			Meteor.call("giveCondition", charId, condition);
 		};