-
{{title}}
+
+
{{> UI.contentBlock}}
diff --git a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html
index 0522fca5..1fd24314 100644
--- a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html
+++ b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html
@@ -1,13 +1,13 @@
-
+
- {{> ripple color="#eee"}}
{{../attributeValue ability}}
{{../abilityMod ability}}
{{title}}
+
diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html
new file mode 100644
index 00000000..10ae00c9
--- /dev/null
+++ b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html
@@ -0,0 +1,81 @@
+
+
+ {{#baseDialog title=name class=colorClass hideColor="true" hideDelete="true"}}
+
+
+
+ {{#if profSource}}
+ {{#with profSource}}
+ {{statValue}} - {{sourceName}}
+ {{/with}}
+ {{else}}
+ Not Proficient
+ {{/if}}
+
+
+
+
+
+
{{abilityName}}
+
{{char.abilityMod ability}}
+
+
+ {{#if char.proficiency skillName}}
+
+
{{#with profSource}}{{statValue}}{{/with}}
+
+{{profBonus}}
+
+ {{/if}}
+
+ {{#each addEffects}}
+
+
{{sourceName}}
+
+{{statValue}}
+
+ {{/each}}
+ {{#each mulEffects}}
+
+
{{sourceName}}
+
×{{statValue}}
+
+ {{/each}}
+ {{#each minEffects}}
+
+
{{sourceName}}
+
Min: {{statValue}}
+
+ {{/each}}
+ {{#each maxEffects}}
+
+
{{sourceName}}
+
Max: {{statValue}}
+
+ {{/each}}
+
+
+
Total
+
{{char.skillMod skillName}}
+
+
{{sourceName}}
+ {{/each}}
+ {{/if}}
+ {{#if dadvEffects.count}}
+ Disadvantage:
+ {{#each dadvEffects}}
+ {{sourceName}}
+ {{/each}}
+ {{/if}}
+
+ {{#each conditionalEffects}}
+
+
{{sourceName}}
+
*{{statValue}}
+
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
new file mode 100644
index 00000000..590ded00
--- /dev/null
+++ b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
@@ -0,0 +1,195 @@
+//TODO add dexterity armor
+var stats = {
+ "strength":{"name":"Strength"},
+ "dexterity":{"name":"Dexterity"},
+ "constitution":{"name":"Constitution"},
+ "intelligence":{"name":"Intelligence"},
+ "wisdom":{"name":"Wisdom"},
+ "charisma":{"name":"Charisma"},
+ "strengthSave":{"name":"Strength Save",},
+ "dexteritySave":{"name":"Dexterity Save",},
+ "constitutionSave":{"name":"Constitution Save",},
+ "intelligenceSave":{"name":"Intelligence Save",},
+ "wisdomSave":{"name":"Wisdom Save",},
+ "charismaSave":{"name":"Charisma Save",},
+ "acrobatics":{"name":"Acrobatics",},
+ "animalHandling":{"name":"Animal Handling",},
+ "arcana":{"name":"Arcana",},
+ "athletics":{"name":"Athletics",},
+ "deception":{"name":"Deception",},
+ "history":{"name":"History",},
+ "insight":{"name":"Insight",},
+ "intimidation":{"name":"Intimidation",},
+ "investigation":{"name":"Investigation",},
+ "medicine":{"name":"Medicine",},
+ "nature":{"name":"Nature",},
+ "perception":{"name":"Perception",},
+ "performance":{"name":"Performance",},
+ "persuasion":{"name":"Persuasion",},
+ "religion":{"name":"Religion",},
+ "sleightOfHand":{"name":"Sleight of Hand",},
+ "stealth":{"name":"Stealth",},
+ "survival":{"name":"Survival",},
+ "initiative":{"name":"Initiative",},
+ "hitPoints":{"name":"Hit Points"},
+ "armor":{"name":"Armor"},
+ "dexterityArmor":{"name":"Dexterity Armor Bonus"}
+ ,"speed":{"name":"Speed"},
+ "proficiencyBonus":{"name":"Proficiency Bonus"},
+ "ki":{"name":"Ki Points"},
+ "sorceryPoints":{"name":"Sorcery Points"},
+ "rages":{"name":"Rages"},
+ "rageDamage":{"name":"Rage Damage"},
+ "expertiseDice":{"name":"Expertise Dice"},
+ "superiorityDice":{"name":"Superiority Dice"},
+ "level1SpellSlots":{"name":"level 1 Spell Slots"},
+ "level2SpellSlots":{"name":"level 2 Spell Slots"},
+ "level3SpellSlots":{"name":"level 3 Spell Slots"},
+ "level4SpellSlots":{"name":"level 4 Spell Slots"},
+ "level5SpellSlots":{"name":"level 5 Spell Slots"},
+ "level6SpellSlots":{"name":"level 6 Spell Slots"},
+ "level7SpellSlots":{"name":"level 7 Spell Slots"},
+ "level8SpellSlots":{"name":"level 8 Spell Slots"},
+ "level9SpellSlots":{"name":"level 9 Spell Slots"},
+ "d6HitDice":{"name":"d6 Hit Dice"},
+ "d8HitDice":{"name":"d8 Hit Dice"},
+ "d10HitDice":{"name":"d10 Hit Dice"},
+ "d12HitDice":{"name":"d12 Hit Dice"},
+ "acidMultiplier":{"name":"Acid", "group": "Weakness/Resistance"},
+ "bludgeoningMultiplier":{"name":"Bludgeoning", "group": "Weakness/Resistance"},
+ "coldMultiplier":{"name":"Cold", "group": "Weakness/Resistance"},
+ "fireMultiplier":{"name":"Fire", "group": "Weakness/Resistance"},
+ "forceMultiplier":{"name":"Force", "group": "Weakness/Resistance"},
+ "lightningMultiplier":{"name":"Lightning", "group": "Weakness/Resistance"},
+ "necroticMultiplier":{"name":"Necrotic", "group": "Weakness/Resistance"},
+ "piercingMultiplier":{"name":"Piercing", "group": "Weakness/Resistance"},
+ "poisonMultiplier":{"name":"Poison", "group": "Weakness/Resistance"},
+ "psychicMultiplier":{"name":"Psychic", "group": "Weakness/Resistance"},
+ "radiantMultiplier":{"name":"Radiant", "group": "Weakness/Resistance"},
+ "slashingMultiplier":{"name":"Slashing", "group": "Weakness/Resistance"},
+ "thunderMultiplier":{"name":"Thunder", "group": "Weakness/Resistance"}
+};
+
+var operations = {
+ base: {name: "Base Value"},
+ proficiency: {name: "Proficiency"},
+ add: {name: "+"},
+ mul: {name: "×"},
+ min: {name: "Min"},
+ max: {name: "Max"},
+ advantage: {name: "Advantage"},
+ disadvantage: {name: "Disadvantage"},
+ passiveAdd: {name: "Passive Bonus"},
+ fail: {name: "Automatically Fail"},
+ conditional: {name: "Conditional Benefit"}
+};
+
+var abilities = {
+ strength: {name: "Strength"},
+ dexterity: {name: "Dexterity"},
+ constitution: {name: "Constitution"},
+ intelligence: {name: "Intelligence"},
+ wisdom: {name: "Wisdom"},
+ charisma: {name: "Charisma"},
+}
+
+Template.skillDialog.created = function(){
+ this.data.char = Characters.findOne(this.data.charId, {fields: {_id : 1}});
+};
+
+Template.skillDialog.helpers({
+ profIcon: function(){
+ var prof = this.char.proficiency(this.skillName);
+ if(prof > 0 && prof < 1) return "image:brightness-2";
+ if(prof === 1) return "image:brightness-1";
+ if(prof > 1) return "av:album";
+ return "radio-button-off";
+ },
+ profSource: function(){
+ var effs = Effects.find({charId: this.char._id, stat: this.skillName, operation: "proficiency"}, {sort: {value: -1}}).fetch();
+ return effs && effs[0];
+ },
+ profBonus: function(){
+ return this.char.proficiency(this.skillName) * this.char.attributeValue("proficiencyBonus");
+ },
+ addEffects: function(){
+ return Effects.find({charId: this.char._id, stat: this.skillName, operation: "add"});
+ },
+ mulEffects: function(){
+ return Effects.find({charId: this.char._id, stat: this.skillName, operation: "mul"});
+ },
+ minEffects: function(){
+ return Effects.find({charId: this.char._id, stat: this.skillName, operation: "min"});
+ },
+ maxEffects: function(){
+ return Effects.find({charId: this.char._id, stat: this.skillName, operation: "max"});
+ },
+ advEffects: function(){
+ return Effects.find({charId: this.char._id, stat: this.skillName, operation: "advantage"});
+ },
+ dadvEffects: function(){
+ return Effects.find({charId: this.char._id, stat: this.skillName, operation: "disadvantage"});
+ },
+ conditionalEffects: function(){
+ return Effects.find({charId: this.char._id, stat: this.skillName, operation: "conditional"});
+ },
+ ability: function(){
+ var opts = {fields: {}};
+ opts.fields[this.skillName] = 1;
+ var char = Characters.findOne(this.char._id, opts);
+ var skill = char && char[this.skillName];
+ return skill.ability;
+ },
+ abilityName: function(){
+ var opts = {fields: {}};
+ opts.fields[this.skillName] = 1;
+ var char = Characters.findOne(this.char._id, opts);
+ var skill = char && char[this.skillName];
+ var ability = skill.ability;
+ return abilities[ability] && abilities[ability].name;
+ },
+ char: function(){
+ return Characters.findOne(this.charId, {fields:{_id: 1}});
+ },
+ sourceName: function(){
+ var id = this.sourceId;
+ if(!id) return;
+ switch(this.type){
+ case "feature":
+ return Features.findOne(id, {fields: {name: 1}}).name;
+ case "class":
+ return Classes.findOne(id, {fields: {name: 1}}).name;
+ case "buff":
+ return Buffs.findOne(id, {fields: {name: 1}}).name;
+ case "equipment":
+ return Items.findOne(id, {fields: {name: 1}}).name;
+ case "racial":
+ return Characters.findOne(this.charId, {fields: {race: 1}}).race;
+ case "inate":
+ return "Inate"
+ }
+ },
+ operationName: function(){
+ if(this.operation === "proficiency") return null;
+ if(stats[this.stat].group === "Weakness/Resistance") return null;
+ return operations[this.operation] && operations[this.operation].name || "No Operation"
+ },
+ statValue: function(){
+ if(this.operation === "advantage" ||
+ this.operation === "disadvantage" ||
+ this.operation === "fail"){
+ return null;
+ }
+ if(this.operation === "proficiency"){
+ if(this.value == 0.5 || this.calculation == 0.5) return "Half Proficiency";
+ if(this.value == 1 || this.calculation == 1) return "Proficiency";
+ if(this.value == 2 || this.calculation == 2) return "Double Proficiency";
+ }
+ if(stats[this.stat].group === "Weakness/Resistance"){
+ if(this.value == 0.5 || this.calculation == 0.5) return "Resistance";
+ if(this.value == 2 || this.calculation == 2) return "Vulnerability";
+ if(this.value == 0 || this.calculation == 0) return "Immunity";
+ }
+ return this.calculation || this.value;
+ }
+});
diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.css b/rpg-docs/client/views/character/stats/skillRow/skillRow.css
index e46eb080..c2dfa258 100644
--- a/rpg-docs/client/views/character/stats/skillRow/skillRow.css
+++ b/rpg-docs/client/views/character/stats/skillRow/skillRow.css
@@ -1,6 +1,7 @@
.skillRow {
height: 32px;
margin: 0 -16px 0 -16px;
+ background: white;
}
.skillRow core-icon {
diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.html b/rpg-docs/client/views/character/stats/skillRow/skillRow.html
index 61c01fd5..58fdac4a 100644
--- a/rpg-docs/client/views/character/stats/skillRow/skillRow.html
+++ b/rpg-docs/client/views/character/stats/skillRow/skillRow.html
@@ -1,5 +1,5 @@
-
+
{{#if failSkill}}
fail
diff --git a/rpg-docs/client/views/character/stats/stats.html b/rpg-docs/client/views/character/stats/stats.html
index 8f07f03d..82b795da 100644
--- a/rpg-docs/client/views/character/stats/stats.html
+++ b/rpg-docs/client/views/character/stats/stats.html
@@ -11,46 +11,17 @@
{{> abilityMiniCard ability="intelligence" title="Intelligence" color="deep-orange"}}
{{> abilityMiniCard ability="wisdom" title="Wisdom" color="purple"}}
{{> abilityMiniCard ability="charisma" title="Charisma" color="pink"}}
+
-
-
- {{attributeValue "armor"}}
-
-
- Armor Class
-
-
-
+ {{> statCard stat="armor" name="Armor Class" color="teal"}}
-
-
- {{attributeValue "speed"}}
-
-
- Speed
-
-
-
+ {{> statCard stat="speed" name="Speed" color="teal"}}
-
-
- {{skillMod "initiative"}}
-
-
- Initiative
-
-
-
+ {{> statCard stat="initiative" name="Initiative" color="indigo" isSkill="true"}}
-
-
- +{{attributeValue "proficiencyBonus"}}
-
-
- Proficiency Bonus
-
-
-
+ {{> statCard stat="proficiencyBonus" name="Proficiency Bonus" color="blue" prefix="+"}}
+
+
{{>hitDice name="d6HitDice" diceNum="6" char=this}}
{{>hitDice name="d8HitDice" diceNum="8" char=this}}
{{>hitDice name="d10HitDice" diceNum="10" char=this}}
@@ -98,3 +69,19 @@