Fixed migration of attack data

Conflicts:
	rpg-docs/client/style/main.scss

rpg-docs/Model/Character/Attacks.js

@@ -24,18 +24,12 @@ Schemas.Attack = new SimpleSchema({
 		optional: true,
 		trim: false,
 	},
-	damageBonus: {
+	damage: {
 		type: String,
-		defaultValue: "strengthMod",
+		defaultValue: "1d8 + {strengthMod}",
 		optional: true,
 		trim: false,
 	},
-	damageDice: {
-		type: String,
-		optional: true,
-		defaultValue: "1d8",
-		allowedValues: DAMAGE_DICE,
-	},
 	damageType: {
 		type: String,
 		allowedValues: [

rpg-docs/Model/Inventory/Items.js

@@ -10,6 +10,7 @@ Schemas.Item = new SimpleSchema({
 	value:		{type: Number, min: 0, defaultValue: 0, decimal: true},
 	enabled:    {type: Boolean, defaultValue: false},
 	requiresAttunement: {type: Boolean, defaultValue: false},
+	"settings.showIncrement": {type: Boolean, defaultValue: false},
 	color:      {
 		type: String,
 		allowedValues: _.pluck(colorOptions, "key"),

rpg-docs/client/style/main.scss

@@ -57,6 +57,18 @@ paper-button {
 	cursor: pointer;
 }
 
+.pre-wrap, .prewrap{
+	white-space: pre-wrap;
+}
+
+.padded {
+	padding: 8px;
+}
+
+.fullwidth {
+	width: 100%;
+}
+
 .fab-buffer {
     height: 100px;
 }

rpg-docs/client/style/tables.scss

@@ -0,0 +1,18 @@
+td {
+	padding: 8px;
+	&:nth-child(1) {
+		min-width: 100px;
+	}
+}
+
+.strengthTable{
+	width: 100%;
+	td{
+		&:nth-child(2) {
+			text-align: right;
+		}
+		&:nth-child(3) {
+			width: 250px;
+		}
+	}
+}

rpg-docs/client/views/character/attacks/attackEdit/attackEdit.html

@@ -15,21 +15,11 @@
 							 value={{details}}></paper-input>
 			</div>
 			<div layout horizontal>
-				<!--DamageType-->
-				<paper-dropdown-menu id="damageDiceDropdown" label="Damage Dice">
-					<paper-dropdown layered class="dropdown">
-						<core-menu class="menu"  selected={{damageDice}}>
-							{{#each DAMAGE_DICE}}
-								<paper-item name={{this}} class="containerMenuItem">{{this}}</paper-item>
-							{{/each}}
-						</core-menu>
-					</paper-dropdown>
-				</paper-dropdown-menu>
 				<!--damageBonus-->
 				<paper-input id="damageInput"
-							 label="Damage Bonus"
+							 label="Damage"
 							 floatinglabel
-							 value={{damageBonus}}
+							 value={{damage}}
 							 flex></paper-input>
 				<!--DamageType-->
 				<paper-dropdown-menu id="damageTypeDropdown" label="Damage Type">

rpg-docs/client/views/character/attacks/attackEdit/attackEdit.js

@@ -1,6 +1,18 @@
-var damageTypes = ["bludgeoning", "piercing", "slashing",
-				   "acid", "cold", "fire", "force", "lightning", "necrotic",
-				  "poison", "psychic", "radiant", "thunder"];
+var damageTypes = [
+	"bludgeoning",
+	"piercing",
+	"slashing",
+	"acid",
+	"cold",
+	"fire",
+	"force",
+	"lightning",
+	"necrotic",
+	"poison",
+	"psychic",
+	"radiant",
+	"thunder",
+];
 
 Template.attackEdit.events({
 	"tap #deleteAttack": function(event, instance) {
@@ -13,7 +25,7 @@ Template.attackEdit.events({
 	},
 	"change #damageInput": function(event) {
 		var value = event.currentTarget.value;
-		Attacks.update(this._id, {$set: {damageBonus: value}});
+		Attacks.update(this._id, {$set: {damage: value}});
 	},
 	"change #detailInput": function(event) {
 		var value = event.currentTarget.value;
@@ -26,13 +38,6 @@ Template.attackEdit.events({
 		if (value == this.damageType) return;
 		Attacks.update(this._id, {$set: {damageType: value}});
 	},
-	"core-select #damageDiceDropdown": function(event) {
-		var detail = event.originalEvent.detail;
-		if (!detail.isSelected) return;
-		var value = detail.item.getAttribute("name");
-		if (value == this.damageDice) return;
-		Attacks.update(this._id, {$set: {damageDice: value}});
-	}
 });
 
 Template.attackEdit.helpers({
@@ -41,5 +46,5 @@ Template.attackEdit.helpers({
 	},
 	DAMAGE_DICE: function() {
 		return DAMAGE_DICE;
-	}
+	},
 });

rpg-docs/client/views/character/attacks/attackView/attackView.html

@@ -1,11 +1,11 @@
 <template name="attackView">
 	<div class="attackView" layout horizontal>
-		<div class="headline rightPadded" layout horizontal center>
+		<div class="headline" style="margin-right: 16px;" layout horizontal center>
 			{{evaluateSigned charId attackBonus}}
 		</div>
 		<div layout vertical>
 			<div>
-				{{damageDice}}&nbsp;{{{evaluateSignedSpaced charId damageBonus}}}&nbsp;{{damageType}}
+				{{evaluateString charId damage}}&nbsp;{{damageType}}
 			</div>
 			{{#if details}}
 			<div class="caption">

rpg-docs/client/views/character/features/featureDialog/featureDialog.html

@@ -32,7 +32,7 @@
 	{{/if}}
 
 	{{#if description}}
-		<div class="prewrap">{{description}}</div>
+		<div class="pre-wrap">{{evaluateString charId description}}</div>
 	{{/if}}
 
 	{{> effectsViewList charId=charId parentId=_id}}

rpg-docs/client/views/character/features/features.html

@@ -34,7 +34,7 @@
 												{{name}}
 											</div>
 											<div>
-												{{damageDice}}&nbsp;{{{evaluateSignedSpaced ../_id damageBonus}}}&nbsp;{{damageType}}
+												{{evaluateString ../_id damage}}&nbsp;{{damageType}}
 											</div>
 											{{#if details}}
 												<div class="caption">
@@ -102,7 +102,7 @@
 						</div>
 						{{#if description}}
 							<div flex class="bottom text"
-								 >{{description}}</div>
+								 >{{evaluateString charId description}}</div>
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>

rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html

@@ -41,6 +41,6 @@
 	</div>
 	{{#if description}}
 		<hr class="vertMargin">
-		<div class="prewrap">{{description}}</div>
+		<div class="pre-wrap">{{evaluateString charId description}}</div>
 	{{/if}}
 </template>

rpg-docs/client/views/character/inventory/inventory.html

@@ -120,11 +120,24 @@
 
 <template name="inventoryItem">
 	<div class="item-slot">
-		<paper-item class="item inventoryItem {{hidden}}" noink
+		<div class="item {{hidden}} inventoryItem"
 					hero-id="main" {{detailHero}}
-					layout horizontal
+					layout horizontal center
 					draggable="true">
-			{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
-		</paper-item>
+			<div flex class="itemName">
+				{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
+			</div>
+			{{#if settings.showIncrement}}
+			<div class="incrementButtons">
+				<paper-icon-button class="addItemQuantity"
+								   icon="add"
+								   style="margin-right: -8px"></paper-icon-button>
+				<paper-icon-button class="subItemQuantity"
+								   disabled={{lt1 quantity}}
+								   icon="remove"
+								   style="margin-right: -8px"></paper-icon-button>
+			</div>
+			{{/if}}
+		</div>
 	</div>
 </template>

rpg-docs/client/views/character/inventory/inventory.js

@@ -145,6 +145,17 @@ Template.inventory.events({
 			heroId:   itemId,
 		});
 	},
+	"tap .incrementButtons": function(event) {
+		event.stopPropagation();
+	},
+	"tap .addItemQuantity": function(event) {
+		var itemId = this._id;
+		Items.update(itemId, {$set: {quantity: this.quantity + 1}});
+	},
+	"tap .subItemQuantity": function(event) {
+		var itemId = this._id;
+		Items.update(itemId, {$set: {quantity: this.quantity - 1}});
+	},
 	"tap .itemContainer .top": function(event){
 		GlobalUI.setDetail({
 			template: "containerDialog",
@@ -167,6 +178,9 @@ Template.inventoryItem.helpers({
 	ne1: function(num){
 		return num !== 1;
 	},
+	lt1: function(num) {
+		return num < 1;
+	},
 	hidden: function(){
 		return Session.equals("inventory.dragItemId", this._id) ? "hidden" : null;
 	},

rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html

@@ -19,7 +19,7 @@
 	</div>
 	{{#if description}}
 		<hr class="vertMargin">
-		<div class="prewrap">{{description}}</div>
+		<div class="pre-wrap">{{evaluateString charId description}}</div>
 	{{/if}}
 	{{> effectsViewList charId=charId parentId=_id}}
 	{{> attacksViewList charId=charId parentId=_id}}
@@ -28,10 +28,25 @@
 <template name="itemEdit">
 	<paper-input class="fullwidth" id="itemNameInput" label="Name" floatinglabel value={{name}}></paper-input>
 	<div layout horizontal wrap>
-		<paper-input-decorator label="Quantity" floatinglabel>
-			<input id="quantityInput" type="number" value={{quantity}}>
+		<paper-input-decorator label="Quantity"
+							   floatinglabel
+							   style="width: 80px">
+			<input id="quantityInput"
+				   type="number"
+				   value={{quantity}}>
 		</paper-input-decorator>
-		{{# if ne1 quantity}}<paper-input flex id="itemPluralInput" label="Plural Name" floatinglabel value={{plural}}></paper-input>{{/if}}
+		{{# if ne1 quantity}}
+		<paper-input flex id="itemPluralInput" 
+					 label="Plural Name" 
+					 floatinglabel
+					 value={{plural}}></paper-input>
+		{{/if}}
+	</div>
+	<div center horizontal layout>
+		<div class="padded">Show increment buttons</div>
+		<paper-checkbox id="incrementCheckbox"
+						checked={{settings.showIncrement}}>
+		</paper-checkbox>
 	</div>
 
 	<hr class="vertMargin">
@@ -53,7 +68,9 @@
 		</div>
 		<div center horizontal layout>
 			<div class="padded">Requires Attunement</div>
-			<paper-checkbox id="attunementCheckbox" checked={{requiresAttunement}}></paper-checkbox>
+			<paper-checkbox id="attunementCheckbox"
+							checked={{requiresAttunement}}>
+			</paper-checkbox>
 		</div>
 	</div>
 

rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js

@@ -50,7 +50,7 @@ Template.itemEdit.onRendered(function(){
 Template.itemEdit.helpers({
 	ne1: function(num){
 		return num != 1;
-	}
+	},
 });
 
 Template.itemEdit.events({
@@ -87,6 +87,10 @@ Template.itemEdit.events({
 			Meteor.call("unequipItem", this._id, this.charId);
 		}
 	},
+	"change #incrementCheckbox": function(event){
+		var value = event.currentTarget.checked;
+		Items.update(this._id, {$set: {"settings.showIncrement": value}});
+	},
 	"change #attunementCheckbox": function(event){
 		var value = event.currentTarget.checked;
 		Items.update(this._id, {$set: {requiresAttunement: value}});

rpg-docs/client/views/character/journal/classDialog/classDialog.js

@@ -3,6 +3,9 @@ Template.classDialog.onRendered(function(){
 });
 
 Template.classDialog.events({
+	"color-change": function(event, instance){
+		Classes.update(instance.data.classId, {$set: {color: event.color}});
+	},
 	"tap #deleteButton": function(event, instance){
 		Classes.softRemoveNode(instance.data.classId);
 		GlobalUI.deletedToast(instance.data.classId, "Classes", "Class");

rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html

@@ -1,12 +1,12 @@
 <template name="experienceDialog">
 	{{#with experience}}
-		{{#baseDialog title=name class=colorClass hideColor="true" startEditing=../startEditing}}
+		{{#baseDialog title=name class=color hideColor="true" startEditing=../startEditing}}
 			<div horizontal layout center-justified class= "display2">
 				{{value}}
 			</div>
 			{{#if description}}
 				<hr class="vertMargin">
-				<div class="prewrap">{{description}}</div>
+				<div class="pre-wrap">{{description}}</div>
 			{{/if}}
 		{{else}}
 			<div horizontal layout>

rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js

@@ -1,6 +1,11 @@
 Template.experienceDialog.helpers({
-	feature: function(){
-		return Features.findOne(this.featureId);
+	experience: function(){
+		Experiences.findOne(this.experienceId);
+		return Experiences.findOne(this.experienceId);
+	},
+	color: function() {
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
 	},
 });
 
@@ -27,10 +32,3 @@ Template.experienceDialog.events({
 		Experiences.update(this._id, {$set: {description: value}});
 	},
 });
-
-Template.experienceDialog.helpers({
-	experience: function(){
-		Experiences.findOne(this.experienceId);
-		return Experiences.findOne(this.experienceId);
-	}
-});

rpg-docs/client/views/character/journal/noteDialog/noteDialog.html

@@ -1,7 +1,7 @@
 <template name="noteDialog">
 	{{#with note}}
 		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
-			<div class="prewrap">{{description}}</div>
+			<div class="pre-wrap">{{description}}</div>
 		{{else}}
 			{{> noteDialogEdit}}
 		{{/baseDialog}}

rpg-docs/client/views/character/journal/raceDialog/raceDialog.html

@@ -1,5 +1,5 @@
 <template name="raceDialog">
-	{{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
+	{{#baseDialog title="Race" class=color hideColor="true" hideDelete="true" startEditing=startEditing}}
 		<div horizontal layout center-justified class= "display2">
 			{{race}}
 		</div>

rpg-docs/client/views/character/journal/raceDialog/raceDialog.js

@@ -13,5 +13,9 @@ Template.raceDialog.helpers({
 	race: function(){
 		var char = Characters.findOne(this.charId, {fields: {race: 1}});
 		return char && char.race;
-	}
+	},
+	color: function() {
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
+	},
 });

rpg-docs/client/views/character/persona/persona.html

@@ -27,7 +27,7 @@
 </template>
 
 <template name="containerCard">
-	{{#containerCardHelper this}}{{body}}{{/containerCardHelper}}
+	{{#containerCardHelper this}}{{evaluateString _id body}}{{/containerCardHelper}}
 </template>
 
 <template name="containerCardHelper">

rpg-docs/client/views/character/persona/textDialog/textDialog.html

@@ -1,6 +1,6 @@
 <template name="textDialog">
 	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
-		<div class="prewrap">{{value}}</div>
+		<div class="pre-wrap">{{evaluateString charId value}}</div>
 	{{else}}
 		{{> textDialogEdit}}
 	{{/baseDialog}}

rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

@@ -26,7 +26,7 @@
 			<span class="body2">Duration: </span><span>{{duration}}</span>
 		</div>
 	</div>
-	<div class="prewrap">{{description}}</div>
+	<div class="pre-wrap">{{evaluateString charId description}}</div>
 </template>
 
 <template name="spellEdit">

rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html

@@ -20,7 +20,7 @@
 					{{/if}}
 				</div>
 				<hr class="vertMargin">
-				<div class="prewrap">{{description}}</div>
+				<div class="pre-wrap">{{evaluateString charId description}}</div>
 			</div>
 		{{else}}
 			<!--Name-->

rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.html

@@ -0,0 +1,64 @@
+<template name="strengthDialog">
+	{{#baseDialog title=name class=color hideEdit=true}}
+		{{> attributeDialogView}}
+		<hr class="vertMargin">
+		<div>
+			<div class="title padded">Carrying</div>
+			<table class="strengthTable">
+				<tr>
+					<td>Encumbered</td>
+					<td>{{evaluate charId "strength * 5"}}lbs</td>
+					<td class="caption">Speed drops by 10 feet</td>
+				</tr>
+				<tr>
+					<td>Heavily encumbered</td>
+					<td>{{evaluate charId "strength * 10"}}lbs</td>
+					<td class="caption">
+						Speed drops by 20 feet, disadvantage on strength,
+						dexterity and constitution ability checks, attack
+						rolls and saving throws
+					</td>
+				</tr>
+				<tr>
+					<td>Maximum carrying capacity</td>
+					<td>{{evaluate charId "strength * 15"}}lbs</td>
+					<td class="caption">Speed drops to 5 feet</td>
+				</tr>
+				<tr>
+					<td>Push, drag or lift maximum</td>
+					<td>{{evaluate charId "strength * 30"}}lbs</td>
+					<td class="caption">You can't move more than this weight</td>
+				</tr>
+			</table>
+			<div class="title padded">Jumping</div>
+			<table class="strengthTable">
+				<tr>
+					<td>Running long jump</td>
+					<td>{{evaluate charId "strength"}} feet</td>
+				</tr>
+				<tr>
+					<td>Standing long jump</td>
+					<td>{{evaluate charId "floor(strength/2)"}} feet</td>
+				</tr>
+				<tr>
+					<td>Running high jump</td>
+					<td>{{evaluate charId "3 + strengthMod"}} feet</td>
+					<td class="caption">
+						Can reach a ledge as high as
+						{{evaluate charId "3 + strengthMod"}} feet
+						+ 1.5&times; your height
+					</td>
+				</tr>
+				<tr>
+					<td>Standing high jump</td>
+					<td>{{evaluate charId "floor((3 + strengthMod)/2)"}} feet</td>
+					<td class="caption">
+						Can reach a ledge as high as
+						{{evaluate charId "floor((3 + strengthMod)/2)"}} feet
+						+ 1.5&times; your height
+					</td>
+				</tr>
+			</table>
+		</div>
+	{{/baseDialog}}
+</template>

rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.js

@@ -0,0 +1,7 @@
+Template.strengthDialog.helpers({
+	color: function(){
+		if (this.color) return this.color + " white-text";
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
+	},
+});

rpg-docs/client/views/character/stats/stats.js

@@ -27,8 +27,10 @@ Template.stats.events({
 	},
 	"tap .abilityMiniCard": function(event, instance){
 		var charId = Template.parentData()._id;
+		var template = "attributeDialog";
+		if (this.ability === "strength") template = "strengthDialog";
 		GlobalUI.setDetail({
-			template: "attributeDialog",
+			template: template,
 			data:     {
 				name: this.title,
 				statName: this.ability,

rpg-docs/lib/dice/roll.js

@@ -0,0 +1,21 @@
+roll = function(n, d){
+	var result = [];
+	if (!isNaN(n)){
+		//if only provided 1 argument, it is the dice to roll
+		if (d === undefined){
+			d = n;
+			n = 1;
+		}
+		//hard limit the number of dice rolled
+		if (n > 500){
+			console.warn(n + " > 500, cannot lift that many dice to roll them");
+			return;
+		}
+		for (var i = 0; i < n; i++){
+			var roll = Math.floor(Random.fraction() * d + 1);
+			result.push(roll);
+		}
+		return result;
+	}
+	return result;
+};

rpg-docs/lib/functions/dice.js

@@ -1,44 +0,0 @@
-roll = function(n, d){
-	if (!isNaN(n)){
-		//first digit is a number
-		if (d === undefined){
-			d = n;
-			n = 1;
-		}
-		if (n > 500){
-			console.log(n + " > 500, cannot lift that many dice to roll them");
-			return;
-		}
-		var result = {sum: 0, rolls: []};
-		for (var i = 0; i < n; i++){
-			var roll = Math.floor(Random.fraction() * d + 1);
-			result.sum += roll;
-			result.rolls.push(roll);
-		}
-		return result;
-	}
-	console.log("rolling dice failed for inputs: ", n, d);
-	return {sum: 0, rolls: []};
-};
-
-rollDropLow = function(n, d, drop){
-	var r = roll(n, d);
-	r.rolls.sort(function(a, b){return a - b;}); //sort ascending
-	r.rolls.splice(0, drop); //remove the lowest elements
-	r.sum = 0;
-	for (var i = 0, l = r.rolls.length; i , l ; i++){
-		sum += r.rolls[i];
-	}
-	return r;
-};
-
-rollDropHigh = function(n, d, drop){
-	var r = roll(n, d);
-	r.rolls.sort(function(a, b){return b - a;}); //sort descending
-	r.rolls.splice(0, drop); //remove the highest elements
-	r.sum = 0;
-	for (var i = 0, l = r.rolls.length; i , l ; i++){
-		sum += r.rolls[i];
-	}
-	return r;
-};

rpg-docs/private/changeLogs/changeLogs.js

@@ -76,3 +76,20 @@ ChangeLogs.insert({
 		"Removed a lot of unneeded effects and webcomponents, should result in significantly improved performance on low-powered devices.",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.3.1",
+	changes: [
+		"Re-implemented floating action button menu component to move away from the broken third party implementation.",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.4.0",
+	changes: [
+		"Changed attacks to use arbitrary strings with inline calculations",
+		"Added item increment and decrement buttons",
+		"fixed incorrect line breaks and formatting in dialogs",
+		"Added calculated values for jumping and carrying to the strength detail box",
+	],
+});

rpg-docs/server/migrations/migrations.js

@@ -6,7 +6,7 @@ Meteor.methods({
 		var user = Meteor.users.findOne(this.userId);
 		if (!user){
 			throw new Meteor.Error(
-				"logged-out", 
+				"logged-out",
 				"The user must be logged in to migrate the database"
 			);
 		}
@@ -18,7 +18,7 @@ Meteor.methods({
 				"The user must be an administrator to migrate the database"
 			);
 		}
-	}
+	},
 });
 
 Migrations.add({
@@ -58,3 +58,35 @@ Migrations.add({
 		);
 	},
 });
+
+Migrations.add({
+	version: 2,
+	name: "Converts attacks from damage dice and damage bonus to a string with curly bracket calculations, adds settings.showIncrement to items",
+	up: function() {
+		//update attacks
+		Attacks.find({}).forEach(function(attack) {
+			if (!attack.damage && attack.damageDice && attack.damageBonus){
+				var newDamage = attack.damageDice +
+					" + {" + attack.damageBonus + "}";
+				Attacks.update(
+					attack._id,
+					{
+						$unset: {
+							damageBonus: "",
+							damageDice: "",
+						},
+						$set: {
+							damage: newDamage
+						},
+					},
+					{validate: false});
+			}
+		});
+		//update Items
+		Items.update(
+			{settings: undefined},
+			{$set: {"settings.showIncrement" : false}},
+			{validate: false, multi: true}
+		);
+	},
+});