diff --git a/rpg-docs/Model/Character/Characters.js b/rpg-docs/Model/Character/Characters.js index a3c52296..e36d345c 100644 --- a/rpg-docs/Model/Character/Characters.js +++ b/rpg-docs/Model/Character/Characters.js @@ -61,19 +61,19 @@ Schemas.Character = new SimpleSchema({ d12HitDice: {type: Schemas.Attribute}, //vulnerabilities - acidMultiplier: {type: Schemas.Vulnerability}, - bludgeoningMultiplier: {type: Schemas.Vulnerability}, - coldMultiplier: {type: Schemas.Vulnerability}, - fireMultiplier: {type: Schemas.Vulnerability}, - forceMultiplier: {type: Schemas.Vulnerability}, - lightningMultiplier: {type: Schemas.Vulnerability}, - necroticMultiplier: {type: Schemas.Vulnerability}, - piercingMultiplier: {type: Schemas.Vulnerability}, - poisonMultiplier: {type: Schemas.Vulnerability}, - psychicMultiplier: {type: Schemas.Vulnerability}, - radiantMultiplier: {type: Schemas.Vulnerability}, - slashingMultiplier: {type: Schemas.Vulnerability}, - thunderMultiplier: {type: Schemas.Vulnerability}, + acidMultiplier: {type: Schemas.Attribute}, + bludgeoningMultiplier: {type: Schemas.Attribute}, + coldMultiplier: {type: Schemas.Attribute}, + fireMultiplier: {type: Schemas.Attribute}, + forceMultiplier: {type: Schemas.Attribute}, + lightningMultiplier: {type: Schemas.Attribute}, + necroticMultiplier: {type: Schemas.Attribute}, + piercingMultiplier: {type: Schemas.Attribute}, + poisonMultiplier: {type: Schemas.Attribute}, + psychicMultiplier: {type: Schemas.Attribute}, + radiantMultiplier: {type: Schemas.Attribute}, + slashingMultiplier: {type: Schemas.Attribute}, + thunderMultiplier: {type: Schemas.Attribute}, //skills @@ -178,7 +178,7 @@ var attributeBase = function(charId, statName){ check(statName, String); var effects = Effects.find({charId: charId, stat: statName, enabled: true}).fetch(); effects = _.groupBy(effects, "operation"); - var value = 0; + var value = _.contains(DAMAGE_MULTIPLIERS, statName)? 1 : 0; //start with the highest base value _.each(effects.base, function(effect){ diff --git a/rpg-docs/Model/Character/SubSchemas/Attribute.js b/rpg-docs/Model/Character/SubSchemas/Attribute.js index 69cf05cf..a6f9499a 100644 --- a/rpg-docs/Model/Character/SubSchemas/Attribute.js +++ b/rpg-docs/Model/Character/SubSchemas/Attribute.js @@ -11,17 +11,3 @@ Schemas.Attribute = new SimpleSchema({ allowedValues: ["longRest", "shortRest"] } }); - -//note that to make an invulnerability add a new max of zero value -Schemas.Vulnerability = new SimpleSchema({ - //same as attribute - adjustment: { - type: Number, - defaultValue: 0 - }, - reset: { - type: String, - defaultValue: "longRest", - allowedValues: ["longRest", "shortRest"] - } -}); diff --git a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js index ceab7f93..ac8a5a47 100644 --- a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js +++ b/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js @@ -175,7 +175,7 @@ Template.effectEdit.events({ if(!detail.isSelected) return; var value = +detail.item.getAttribute("name"); if (value == this.value) return; - Effects.update(this._id, {$set: {value: value, calculation: ""}}); + Effects.update(this._id, {$set: {value: value, calculation: "", operation: "mul"}}); }, "core-select #proficiencyDropDown": function(event){ var detail = event.originalEvent.detail; diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/character/stats/healthCard/healthCard.html index ed2154d4..ccaf35e4 100644 --- a/rpg-docs/client/views/character/stats/healthCard/healthCard.html +++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.html @@ -10,6 +10,12 @@ editable pin role="slider" > + +