Made Attacks come from items

This commit is contained in:
Thaum
2015-03-09 14:03:11 +00:00
parent 40a050d88f
commit 55784d0e3b
17 changed files with 185 additions and 67 deletions

View File

@@ -1,26 +0,0 @@
<template name="attackDialog">
{{#with attack}}
{{#baseDialog title=name class=colorClass}}
<div layout horizontal>
<!--Name-->
<paper-input id="attackNameInput" label="Name" floatinglabel value={{name}}></paper-input>
</div>
<!--attackBonus-->
<paper-input id="attackBonusInput" label="Attack Bonus" floatinglabel value={{attackBonus}}></paper-input>
<!--damage-->
<paper-input id="damageInput" label="Damage" floatinglabel value={{damage}}></paper-input>
<!--range-->
<paper-input id="rangeInput" label="Range" floatinglabel value={{range}}></paper-input>
<!--DamageType-->
<paper-dropdown-menu id="damageTypeDropdown" label="DamageType">
<paper-dropdown layered class="dropdown">
<core-menu class="menu" selected={{damageType}}>
{{#each damageTypes}}
<paper-item name={{this}} class="containerMenuItem">{{this}}</paper-item>
{{/each}}
</core-menu>
</paper-dropdown>
</paper-dropdown-menu>
{{/baseDialog}}
{{/with}}
</template>

View File

@@ -1,44 +0,0 @@
var damageTypes = ["bludgeoning", "piercing", "slashing", "acid", "cold", "fire", "force", "lightning", "necrotic",
"poison", "psychic", "radiant", "thunder"];
Template.attackDialog.events({
"color-change": function(event, instance){
Attacks.update(instance.data.attackId, {$set: {color: event.color}});
},
"tap #deleteButton": function(event, instance){
Attacks.remove(instance.data.attackId);
GlobalUI.closeDetail()
},
"change #attackNameInput": function(event){
var value = event.currentTarget.value;
Attacks.update(this._id, {$set: {name: value}});
},
"change #attackBonusInput": function(event){
var value = event.currentTarget.value;
Attacks.update(this._id, {$set: {attackBonus: value}});
},
"change #damageInput": function(event){
var value = event.currentTarget.value;
Attacks.update(this._id, {$set: {damage: value}});
},
"change #rangeInput": function(event){
var value = event.currentTarget.value;
Attacks.update(this._id, {$set: {range: value}});
},
"core-select #damageTypeDropdown": function(event){
var detail = event.originalEvent.detail;
if(!detail.isSelected) return;
var value = detail.item.getAttribute("name");
if(value == this.damageType) return;
Attacks.update(this._id, {$set: {damageType: value}});
}
});
Template.attackDialog.helpers({
attack: function(){
return Attacks.findOne(this.attackId);
},
damageTypes: function(){
return damageTypes;
}
});

View File

@@ -19,7 +19,7 @@
<div flex>
<div class="containerName subhead">Attacks</div>
</div>
<paper-icon-button class="black54" id="addAttackButton" icon="add"></paper-icon-button>
<!--<paper-icon-button class="black54" id="addAttackButton" icon="add"></paper-icon-button>-->
</div>
<div class="containerMain listPadded">
{{#each attacks}}
@@ -30,10 +30,17 @@
{{evaluateSigned ../_id attackBonus}}
</div>
<div layout vertical flex>
<div>{{name}}</div>
<div class="caption">
{{{evaluateString ../_id damage}}} {{damageType}} {{range}}
<div class="body2">
{{name}}
</div>
<div>
{{damageDice}}&nbsp;{{{evaluateSignedSpaced ../_id damageBonus}}}&nbsp;{{damageType}}
</div>
{{#if details}}
<div class="caption">
{{details}}
</div>
{{/if}}
</div>
</div>
</paper-item>

View File

@@ -19,7 +19,7 @@ Template.features.helpers({
return _.indexOf(_.keys(colorOptions), this.color);
},
attacks: function(){
return Attacks.find({charId: this._id}, {sort: {color: 1, name: 1}});
return Attacks.find({charId: this._id, enabled: true}, {sort: {color: 1, name: 1}});
},
characterProficiencies: function(){
var char = Characters.findOne(this._id);