jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed proficiency from effects

Browse Source
This commit is contained in:
Stefan Zermatten
2015-04-29 12:31:51 +02:00
parent e05fa064d5
commit a1a243bf52
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rpg-docs/client/views/character/effects/effectEdit/effectEdit.html
View File

@@ -52,15 +52,3 @@
</paper-dropdown> </paper-dropdown>
</paper-dropdown-menu> </paper-dropdown-menu>
</template> </template>
<template name="proficiencyEffectValue">
<paper-dropdown-menu class="proficiencyDropDown" label="Proficiency" flex>
<paper-dropdown layered class="dropdown">
<core-menu class="menu proficiencyMenu" selected={{value}}>
<paper-item name="1">Proficient</paper-item>
<paper-item name="0.5">Half Prof. Bonus</paper-item>
<paper-item name="2">Double Prof. Bonus</paper-item>
</core-menu>
</paper-dropdown>
</paper-dropdown-menu>
</template>

18
rpg-docs/client/views/character/effects/effectEdit/effectEdit.js
View File

@@ -82,7 +82,6 @@ var attributeOperations = [
{name: "Max", operation: "max"} {name: "Max", operation: "max"}
]; ];
var skillOperations = [ var skillOperations = [
{name: "Proficiency", operation: "proficiency"},
{name: "Add", operation: "add"}, {name: "Add", operation: "add"},
{name: "Multiply", operation: "mul"}, {name: "Multiply", operation: "mul"},
{name: "Min", operation: "min"}, {name: "Min", operation: "min"},
@@ -128,8 +127,6 @@ Template.effectEdit.helpers({
if (!op) return null; if (!op) return null;
//operations that don't need templates //operations that don't need templates
if (op === "advantage" || op === "disadvantage" || op === "fail") return null; if (op === "advantage" || op === "disadvantage" || op === "fail") return null;
//proficiency template
if (op === "proficiency") return "proficiencyEffectValue";
//default template //default template
return "regularEffectValue"; return "regularEffectValue";
@@ -154,13 +151,7 @@ Template.effectEdit.events({
var oldName = Template.instance().selectedStatGroup.get(); var oldName = Template.instance().selectedStatGroup.get();
if (oldName != groupName){ if (oldName != groupName){
instance.selectedStatGroup.set(groupName); instance.selectedStatGroup.set(groupName);
if (groupName === "Skills" || groupName === "Saving Throws"){ if (groupName === "Weakness/Resistance"){
Effects.update(this._id, {$set: {
operation: "proficiency",
value: 1,
calculation: ""
}, $unset: {stat: ""}});
} else if (groupName === "Weakness/Resistance"){
Effects.update(this._id, {$set: { Effects.update(this._id, {$set: {
value: 0.5, value: 0.5,
calculation: "", calculation: "",
@@ -197,13 +188,6 @@ Template.effectEdit.events({
operation: "mul" operation: "mul"
}}); }});
}, },
"core-select .proficiencyDropDown": function(event){
var detail = event.originalEvent.detail;
if (!detail.isSelected) return;
var value = +detail.item.getAttribute("name");
if (value == this.value) return;
Effects.update(this._id, {$set: {value: value, calculation: ""}});
},
"change .effectValueInput": function(event){ "change .effectValueInput": function(event){
var value = event.currentTarget.value; var value = event.currentTarget.value;
var numValue = +value; var numValue = +value;