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

Merge branch 'bugfix-150'

Browse Source
This commit is contained in:
Stefan Zermatten
2018-11-13 12:01:52 +02:00
parent b36720511b 1c95336843
commit 0ff6c08abd
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/client/views/character/spells/spells.html
View File

@@ -11,16 +11,20 @@
<div class="bottom list"> <div class="bottom list">
{{#each levels}}{{#if showSlots ..}} {{#each levels}}{{#if showSlots ..}}
<div class="item-slot"> <div class="item-slot">
<div class="item spellSlot layout horizontal center"> <div class="white spellSlot layout horizontal center ">
<div style="margin-right: 16px"> <div class="spellLevelName" style="margin-right: 16px; margin-left: 8px; cursor: pointer;">
{{name}} {{name}}
</div> </div>
<div class="flex layout horizontal center"> <div class="flex layout horizontal center wrap">
{{#each slotBubbles ..}} {{#each slotBubbles ..}}
<paper-icon-button class="slotBubble" {{#unless overflow}}
icon={{icon}} <paper-icon-button class="slotBubble"
disabled={{disabled}}> icon={{icon}}
</paper-icon-button> disabled={{disabled}}>
</paper-icon-button>
{{else}}
<div class="paper-font-subhead">+{{overflow}}</div>
{{/unless}}
{{/each}} {{/each}}
</div> </div>
</div> </div>

26
app/client/views/character/spells/spells.js
View File

@@ -122,6 +122,7 @@ Template.spells.helpers({
return false; return false;
}, },
slotBubbles: function(char){ slotBubbles: function(char){
const MAX_SLOTS = 10;
var baseSlots = Characters.calculate.attributeBase( var baseSlots = Characters.calculate.attributeBase(
char._id, "level" + this.level + "SpellSlots" char._id, "level" + this.level + "SpellSlots"
); );
@@ -130,16 +131,28 @@ Template.spells.helpers({
); );
var slotsUsed = baseSlots - currentSlots; var slotsUsed = baseSlots - currentSlots;
var bubbles = []; var bubbles = [];
var i; var i, overflowFilled, overflowEmpty;
for (i = 0; i < currentSlots; i++){ var filledSlots = currentSlots;
var maxEmptySlots = Math.max(MAX_SLOTS - filledSlots + 1, 1);
var emptySlots = slotsUsed;
if (baseSlots > MAX_SLOTS){
filledSlots = Math.min(MAX_SLOTS, filledSlots);
overflowFilled = Math.max(currentSlots - MAX_SLOTS, 0);
emptySlots = Math.min(maxEmptySlots, emptySlots);
overflowEmpty = Math.max(slotsUsed - maxEmptySlots, 0);
}
for (i = 0; i < filledSlots; i++){
bubbles.push({ bubbles.push({
icon: "radio-button-checked", icon: "radio-button-checked",
disabled: i !== currentSlots - 1 || !canEditCharacter(char._id), //last full slot not disabled disabled: i !== filledSlots - 1 || !canEditCharacter(char._id), //last full slot not disabled
attribute: "level" + this.level + "SpellSlots", attribute: "level" + this.level + "SpellSlots",
charId: char._id, charId: char._id,
}); });
} }
for (i = 0; i < slotsUsed; i++){ if (overflowFilled){
bubbles.push({overflow: overflowFilled});
}
for (i = 0; i < emptySlots; i++){
bubbles.push({ bubbles.push({
icon: "radio-button-unchecked", icon: "radio-button-unchecked",
disabled: i !== 0 || !canEditCharacter(char._id), //first empty slot not disabled disabled: i !== 0 || !canEditCharacter(char._id), //first empty slot not disabled
@@ -147,6 +160,9 @@ Template.spells.helpers({
charId: char._id, charId: char._id,
}); });
} }
if (overflowEmpty){
bubbles.push({overflow: overflowEmpty});
}
return bubbles; return bubbles;
}, },
slotStatName: function() { slotStatName: function() {
@@ -178,7 +194,7 @@ Template.spells.events({
} }
event.stopPropagation(); event.stopPropagation();
}, },
"click .spellSlot": function(event, instance) { "click .spellLevelName": function(event, instance) {
var name = "Level " + this.level + " Spell Slots"; var name = "Level " + this.level + " Spell Slots";
var stat = "level" + this.level + "SpellSlots"; var stat = "level" + this.level + "SpellSlots";
var charId = instance.data._id; var charId = instance.data._id;