Stopped characters with poor names from having failed URL's

makes some progress on #72

rpg-docs/.meteor/packages

@@ -48,3 +48,4 @@ es5-shim@4.6.15
 differential:vulcanize
 reactive-dict
 percolate:synced-cron
+ongoworks:speakingurl

rpg-docs/.meteor/versions

@@ -85,6 +85,7 @@ npm-mongo@2.2.16_1
 oauth@1.1.12
 oauth2@1.1.11
 observe-sequence@1.0.14
+ongoworks:speakingurl@9.0.0
 ordered-dict@1.0.9
 percolate:migrations@0.9.8
 percolate:synced-cron@1.3.2

rpg-docs/Model/Character/Actions.js

@@ -11,10 +11,12 @@ Schemas.Action = new SimpleSchema({
 	},
 	name: {
 		type: String,
+		optional: true,
 		trim: false,
 	},
 	description: {
 		type: String,
+		optional: true,
 		trim: false,
 	},
 	type: {

rpg-docs/Model/Character/Attacks.js

@@ -12,6 +12,7 @@ Schemas.Attack = new SimpleSchema({
 	name: {
 		type: String,
 		defaultValue: "New Attack",
+		optional: true,
 		trim: false,
 	},
 	details: {

rpg-docs/Model/Character/Buffs.js

@@ -8,6 +8,7 @@ Schemas.Buff = new SimpleSchema({
 	},
 	name: {
 		type: String,
+		optional: true,
 		trim: false,
 	},
 	description: {

rpg-docs/Model/Character/Characters.js

@@ -4,6 +4,7 @@ Characters = new Mongo.Collection("characters");
 Schemas.Character = new SimpleSchema({
 	//strings
 	name:         {type: String, defaultValue: "", trim: false, optional: true},
+	urlName:      {type: String, defaultValue: "-", trim: false, optional: true},
 	alignment:    {type: String, defaultValue: "", trim: false, optional: true},
 	gender:       {type: String, defaultValue: "", trim: false, optional: true},
 	race:         {type: String, defaultValue: "", trim: false, optional: true},
@@ -257,7 +258,10 @@ var attributeBase = preventLoop(function(charId, statName){
 	var result = (base + add) * mul;
 	if (result < min) result = min;
 	if (result > max) result = max;
-
+	// Don't round carry multiplier
+	if (statName === "carryMultiplier"){
+		return result;
+	}
 	return Math.floor(result);
 });
 
@@ -537,6 +541,15 @@ if (Meteor.isServer){
 		Items         .remove({charId: character._id});
 		Containers    .remove({charId: character._id});
 	});
+	Characters.after.update(function(userId, doc, fieldNames, modifier, options) {
+		if (_.contains(fieldNames, "name")){
+			var urlName = getSlug(doc.name, {maintainCase: true}) || "-";
+			Characters.update(doc._id, {$set: {urlName}});
+		}
+	});
+	Characters.before.insert(function(userId, doc) {
+		doc.urlName = getSlug(doc.name, {maintainCase: true}) || "-";
+	});
 }
 
 Characters.allow({

rpg-docs/Model/Character/Classes.js

@@ -2,7 +2,7 @@ Classes = new Mongo.Collection("classes");
 
 Schemas.Class = new SimpleSchema({
 	charId:      {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
-	name:		 {type: String, trim: false},
+	name:		 {type: String, optional: true, trim: false},
 	level:		 {type: Number},
 	createdAt: {
 		type: Date,

rpg-docs/Model/Character/Experience.js

@@ -2,7 +2,7 @@ Experiences = new Mongo.Collection("experience");
 
 Schemas.Experience = new SimpleSchema({
 	charId:      {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
-	name:		 {type: String, defaultValue: "New Experience", trim: false},
+	name:		 {type: String, optional: true, trim: false, defaultValue: "New Experience"},
 	description: {type: String, optional: true, trim: false},
 	value:       {type: Number, defaultValue: 0},
 	dateAdded:   {

rpg-docs/Model/Character/Features.js

@@ -2,7 +2,7 @@ Features = new Mongo.Collection("features");
 
 Schemas.Feature = new SimpleSchema({
 	charId:		  {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
-	name:         {type: String, trim: false},
+	name:         {type: String, optional: true, trim: false},
 	description:  {type: String, optional: true, trim: false},
 	uses:         {type: String, optional: true, trim: false},
 	used:         {type: Number, defaultValue: 0},

rpg-docs/Model/Character/Notes.js

@@ -2,7 +2,7 @@ Notes = new Mongo.Collection("notes");
 
 Schemas.Note = new SimpleSchema({
 	charId:      {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
-	name:		 {type: String, trim: false},
+	name:		 {type: String, optional: true, trim: false},
 	description: {type: String, optional: true, trim: false},
 	color:   {
 		type: String,

rpg-docs/Model/Character/SpellLists.js

@@ -2,7 +2,7 @@ SpellLists = new Mongo.Collection("spellLists");
 
 Schemas.SpellLists = new SimpleSchema({
 	charId:      {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
-	name:        {type: String, trim: false},
+	name:        {type: String, optional: true, trim: false},
 	description: {type: String, optional: true, trim: false},
 	saveDC:      {type: String, optional: true, trim: false},
 	attackBonus: {type: String, optional: true, trim: false},

rpg-docs/Model/Character/Spells.js

@@ -9,6 +9,7 @@ Schemas.Spell = new SimpleSchema({
 	},
 	name: {
 		type: String,
+		optional: true,
 		trim: false,
 		defaultValue: "New Spell",
 	},

rpg-docs/Model/Inventory/Containers.js

@@ -2,7 +2,7 @@
 Containers = new Mongo.Collection("containers");
 
 Schemas.Container = new SimpleSchema({
-	name:       {type: String, trim: false},
+	name:       {type: String, optional: true, trim: false},
 	charId:     {type: String, regEx: SimpleSchema.RegEx.Id, index: 1},
 	isCarried:  {type: Boolean},
 	weight:		{type: Number, min: 0, defaultValue: 0, decimal: true},

rpg-docs/Model/Inventory/Items.js

@@ -1,7 +1,7 @@
 Items = new Mongo.Collection("items");
 
 Schemas.Item = new SimpleSchema({
-	name:       {type: String, defaultValue: "New Item", trim: false},
+	name:       {type: String, optional: true, trim: false, defaultValue: "New Item"},
 	plural:		{type: String, optional: true, trim: false},
 	description:{type: String, optional: true, trim: false},
 	charId:     {type: String, regEx: SimpleSchema.RegEx.Id, index: 1}, //id of owner

rpg-docs/Routes/Routes.js

@@ -24,7 +24,7 @@ Router.map(function() {
 	this.route("characterList", {
 		path: "/characterList",
 		waitOn: function(){
-			return subsManager.subscribe("characterList", Meteor.userId());
+			return subsManager.subscribe("characterList");
 		},
 		onAfterAction: function() {
 			document.title = appName + " - Characters";
@@ -32,11 +32,27 @@ Router.map(function() {
 		fastRender: true,
 	});
 
-	this.route("characterSheet", {
-		path: "/character/:_id",
+	this.route("characterSheetNaked", {
+		path: "/character/:_id/",
 		waitOn: function(){
 			return [
-				subsManager.subscribe("singleCharacter", this.params._id, Meteor.userId()),
+				subsManager.subscribe("singleCharacter", this.params._id),
+			];
+		},
+		action: function(){
+			var _id = this.params._id
+			var character = Characters.findOne(_id);
+			var urlName = character && character.urlName;
+			var path = `\/character\/${_id}\/${urlName || "-"}`;
+			Router.go(path,{},{replaceState:true});
+		},
+	});
+
+	this.route("characterSheet", {
+		path: "/character/:_id/:urlName",
+		waitOn: function(){
+			return [
+				subsManager.subscribe("singleCharacter", this.params._id),
 			];
 		},
 		data: function() {

rpg-docs/client/globalHelpers/characterPath.js

@@ -0,0 +1,3 @@
+Template.registerHelper("characterPath", function(char) {
+	return `\/character\/${char._id}\/${char.urlName || "-"}`;
+});

rpg-docs/client/globalHelpers/evaluate.js

@@ -24,6 +24,10 @@ Template.registerHelper("evaluateString", function(charId, string) {
 	return evaluateString(charId, string);
 });
 
+Template.registerHelper("evaluateSpellString", function(charId, spellListId, string) {
+	return evaluateSpellString(charId, spellListId, string);
+});
+
 Template.registerHelper("evaluateShortString", function(charId, string) {
 	if (_.isString(string)){
 		return evaluateString(

rpg-docs/client/lib/improvedInitiativeJson.js

@@ -49,7 +49,10 @@ improvedInitiativeJson = function(charId, options){
 			{"Name": "Cha", "Modifier": skillMod("charismaSave")},
 		],
 		"Skills": getSkills(charId),
-		"Senses": [],
+		"Senses": [
+			"passive Perception " +
+			Characters.calculate.passiveSkill(charId, "perception")
+		],
 		"Languages": getLanguages(charId),
 		"Challenge": "",
 		"Traits": options.features ? getTraits(charId) : [],
@@ -116,10 +119,11 @@ var getDamageMods = function(charId){
 	];
 	// jscs:enable maximumLineLength
 	multipliers = _.groupBy(multipliers, "value");
+	var names = o => o.name;
 	return {
-		"immunities": multipliers["0"] || [],
-		"resistances": multipliers["0.5"] || [],
-		"weaknesses": multipliers["2"] || [],
+		"immunities": _.map(multipliers["0"], names),
+		"resistances": _.map(multipliers["0.5"], names),
+		"vulnerabilities": _.map(multipliers["2"], names),
 	};
 }
 

rpg-docs/client/lib/requestAnimationFramePolyfill.js

@@ -0,0 +1,28 @@
+// http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+// http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating
+
+// requestAnimationFrame polyfill by Erik Möller. fixes from Paul Irish and Tino Zijdel
+
+// MIT license
+var lastTime = 0;
+var vendors = ["ms", "moz", "webkit", "o"];
+for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+	window.requestAnimationFrame = window[vendors[x] + "RequestAnimationFrame"];
+	window.cancelAnimationFrame = window[vendors[x] + "CancelAnimationFrame"] ||
+	window[vendors[x] + "CancelRequestAnimationFrame"];
+}
+
+if (!window.requestAnimationFrame)
+window.requestAnimationFrame = function(callback, element) {
+	var currTime = new Date().getTime();
+	var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+	var id = window.setTimeout(function() { callback(currTime + timeToCall); },
+	timeToCall);
+	lastTime = currTime + timeToCall;
+	return id;
+};
+
+if (!window.cancelAnimationFrame)
+window.cancelAnimationFrame = function(id) {
+	clearTimeout(id);
+};

rpg-docs/client/views/character/effects/effectEdit/effectEdit.html

@@ -20,26 +20,28 @@
 			<div class="effectEdit layout horizontal flex">
 				<dicecloud-selector class="statMenu flex" selected={{stat}} selectable="paper-item" style="height: 100%; overflow-y: auto;">
 					{{#each statGroups}}
-						<div style="font-weight: bold; margin-top: 16px; padding-left: 8px;">
+						<div class="statGroupTitle clickable" style="font-weight: bold; margin-top: 16px; padding-left: 8px;">
 							{{this}}
 						</div>
-						{{#each stats}}
-							<paper-item name={{stat}}>{{name}}</paper-item>
-						{{/each}}
+						<iron-collapse opened={{isGroupSelected this ../stat}}>
+							{{#each stats}}
+								<paper-item name={{stat}} class="clickable">{{name}}</paper-item>
+							{{/each}}
+						</iron-collapse>
 					{{/each}}
 				</dicecloud-selector>
 				{{#if operations}}
 					<dicecloud-selector class="operationMenu flex" selected={{operation}}  style="height: 100%; overflow-y: auto;">
 						{{#each operations}}
-							<paper-item name={{operation}}>{{name}}</paper-item>
+							<paper-item name={{operation}} class="clickable">{{name}}</paper-item>
 						{{/each}}
 					</dicecloud-selector>
 				{{else}} {{#if showMultiplierOperations}}
 					<dicecloud-selector class="multiplierMenu flex"
 							   selected={{value}}>
-						<paper-item name="0.5">Resistance</paper-item>
-						<paper-item name="2">Vulnerability</paper-item>
-						<paper-item name="0">Immunity</paper-item>
+						<paper-item name="0.5" class="clickable">Resistance</paper-item>
+						<paper-item name="2" class="clickable">Vulnerability</paper-item>
+						<paper-item name="0" class="clickable">Immunity</paper-item>
 					</dicecloud-selector>
 				{{else}}
 					<div class="flex" style="height: 100%;"></div>

rpg-docs/client/views/character/effects/effectEdit/effectEdit.js

@@ -149,47 +149,71 @@ Template.effectEdit.helpers({
 	effectValue: function(){
 		return this.calculation || this.value;
 	},
+	isGroupSelected: function(groupName, statName){
+		var stat = statsDict[statName]
+		return stat && (stat.group === groupName);
+	},
 });
 
+var setStat = function(statName, effectId){
+	var setter = {stat: statName};
+	var effect = Effects.findOne(this._id);
+	var group = statsDict[statName].group;
+	if (group === "Saving Throws" || group === "Skills"){
+		// Skills must have a valid skill operation
+		if (!_.contains(
+			_.map(skillOperations, ao => ao.operation),
+			effect.operation
+		)){
+			setter.operation = "add";
+		}
+	} else if (group !== "Weakness/Resistance"){
+		// Attributes must have a valid attribute operation
+		if (!_.contains(
+			_.map(attributeOperations, ao => ao.operation),
+			effect.operation
+		)){
+			setter.operation = "base";
+		}
+	} else {
+		// Weakness/Resistance must have a mul operation and value
+		if (effect.operation !== "mul"){
+			setter.operation = "mul";
+		}
+		if (!_.contains([0, 0.5, 2], effect.value)){
+			setter.value = 0.5;
+		}
+	}
+	Effects.update(effectId, {$set: setter});
+};
+
+var scrollAnimationId;
+var scrollElementToView = element => {
+	var scrollFunction =  function(){
+		element.scrollIntoView();
+		scrollAnimationId = requestAnimationFrame(scrollFunction);
+	};
+	return scrollFunction;
+}
+
 Template.effectEdit.events({
 	"click #deleteButton": function(event, instance){
 		Effects.softRemoveNode(instance.data.id);
 		GlobalUI.deletedToast(instance.data.id, "Effects", "Effect");
 		popDialogStack();
 	},
+	"click .statGroupTitle": function(event, instance){
+		var groupName = this.toString();
+		var firstStat = statGroups[groupName][0].stat;
+		setStat(firstStat, instance.data.id);
+		scrollAnimationId = requestAnimationFrame(scrollElementToView(event.target));
+		_.delay(() => cancelAnimationFrame(scrollAnimationId), 300);
+	},
 	"iron-select .statMenu": function(event){
 		var detail = event.originalEvent.detail;
 		var statName = detail.item.getAttribute("name");
 		if (statName == this.stat) return;
-		var setter = {stat: statName};
-		var group = Blaze.getData(detail.item).group;
-		var effect = Effects.findOne(this._id);
-		if (group === "Saving Throws" || group === "Skills"){
-			// Skills must have a valid skill operation
-			if (!_.contains(
-				_.map(skillOperations, ao => ao.operation),
-				effect.operation
-			)){
-				setter.operation = "add";
-			}
-		} else if (group !== "Weakness/Resistance"){
-			// Attributes must have a valid attribute operation
-			if (!_.contains(
-				_.map(attributeOperations, ao => ao.operation),
-				effect.operation
-			)){
-				setter.operation = "base";
-			}
-		} else {
-			// Weakness/Resistance must have a mul operation and value
-			if (effect.operation !== "mul"){
-				setter.operation = "mul";
-			}
-			if (!_.contains([0, 0.5, 2], effect.value)){
-				setter.value = 0.5;
-			}
-		}
-		Effects.update(this._id, {$set: setter});
+		setStat(statName, this._id);
 	},
 	"iron-select .operationMenu": function(event){
 		var detail = event.originalEvent.detail;

rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js

@@ -33,7 +33,7 @@ Template.effectsEditList.events({
 			template: "effectEdit",
 			data: {id: effectId},
 			element: event.currentTarget,
-			returnElement: instance.find(`tr.effect[data-id='${effectId}']`),
+			returnElement: () => instance.find(`tr.effect[data-id='${effectId}']`),
 		});
 	},
 	"tap .edit-effect": function(event, template){

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

@@ -36,7 +36,7 @@
 		</div>
 		{{/if}}
 	</div>
-	<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
+	<div>{{#markdown}}{{evaluateSpellString charId parent.id description}}{{/markdown}}</div>
 	{{> attacksViewList charId=charId parentId=_id}}
 </template>
 

rpg-docs/client/views/character/stats/skillDialog/skillDialog.html

@@ -61,6 +61,18 @@
 				<td>Total</td>
 				<td>{{characterCalculate "skillMod" charId skillName}}</td>
 			</tr>
+			{{#each passiveEffects}}
+				<tr>
+					<td>{{sourceName}}</td>
+					<td>Passive Bonus: {{statValue}}</td>
+				</tr>
+			{{/each}}
+			{{#if showPassiveTotal}}
+				<tr class="paper-font-body2">
+					<td>Passive Score</td>
+					<td>{{characterCalculate "passiveSkill" charId skillName}}</td>
+				</tr>
+			{{/if}}
 		</table>
 	</div>
 

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

@@ -122,7 +122,7 @@ Template.skillDialogView.helpers({
 		var char = Characters.findOne(this.charId);
 		if (!char) return;
 		var prof = Characters.calculate.proficiency(this.charId, this.skillName);
-		var proficiencyBonus = 
+		var proficiencyBonus =
 			Characters.calculate.attributeValue(this.charId, "proficiencyBonus");
 		return prof * proficiencyBonus;
 	},
@@ -189,6 +189,23 @@ Template.skillDialogView.helpers({
 			enabled: true,
 		});
 	},
+	passiveEffects: function(){
+		return Effects.find({
+			charId: this.charId,
+			stat: this.skillName,
+			operation: "passiveAdd",
+			enabled: true,
+		});
+	},
+	showPassiveTotal: function(){
+		if (this.skillName === "perception") return true;
+		return Effects.find({
+			charId: this.charId,
+			stat: this.skillName,
+			operation: "passiveAdd",
+			enabled: true,
+		}).count();
+	},
 	ability: function(){
 		var opts = {fields: {}};
 		opts.fields[this.skillName] = 1;

rpg-docs/client/views/character/stats/skillRow/skillRow.html

@@ -14,7 +14,7 @@
 				{{#if conditionalCount}}
 					*
 				{{/if}}
-				{{#if showPassive}}
+				{{#if isPassiveShown}}
 					({{characterCalculate "passiveSkill" ../_id skill}})
 				{{/if}}
 			</div>

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

@@ -38,4 +38,16 @@ Template.skillRow.helpers({
 			operation: "conditional",
 		}).count();
 	},
+	isPassiveShown: function(){
+		if (this.showPassive === "forced") return true;
+		if (this.showPassive === "ifNeeded"){
+			var charId = Template.parentData()._id;
+			return Effects.find({
+				charId,
+				stat: this.skill,
+				operation: "passiveAdd",
+				enabled: true,
+			}).count();
+		}
+	},
 });

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

@@ -49,24 +49,24 @@
 					Skills
 				</div>
 				<div flex class="bottom list">
-					{{> skillRow name="Acrobatics" skill="acrobatics"}}
-					{{> skillRow name="Animal Handling" skill="animalHandling"}}
-					{{> skillRow name="Arcana" skill="arcana"}}
-					{{> skillRow name="Athletics" skill="athletics"}}
-					{{> skillRow name="Deception" skill="deception"}}
-					{{> skillRow name="History" skill="history"}}
-					{{> skillRow name="Insight" skill="insight"}}
-					{{> skillRow name="Intimidation" skill="intimidation"}}
-					{{> skillRow name="Investigation" skill="investigation"}}
-					{{> skillRow name="Medicine" skill="medicine"}}
-					{{> skillRow name="Nature" skill="nature"}}
-					{{> skillRow name="Perception" skill="perception" showPassive="true"}}
-					{{> skillRow name="Performance" skill="performance"}}
-					{{> skillRow name="Persuasion" skill="persuasion"}}
-					{{> skillRow name="Religion" skill="religion"}}
-					{{> skillRow name="Sleight of Hand" skill="sleightOfHand"}}
-					{{> skillRow name="Stealth" skill="stealth"}}
-					{{> skillRow name="Survival" skill="survival"}}
+					{{> skillRow name="Acrobatics" skill="acrobatics" showPassive="ifNeeded"}}
+					{{> skillRow name="Animal Handling" skill="animalHandling" showPassive="ifNeeded"}}
+					{{> skillRow name="Arcana" skill="arcana" showPassive="ifNeeded"}}
+					{{> skillRow name="Athletics" skill="athletics" showPassive="ifNeeded"}}
+					{{> skillRow name="Deception" skill="deception" showPassive="ifNeeded"}}
+					{{> skillRow name="History" skill="history" showPassive="ifNeeded"}}
+					{{> skillRow name="Insight" skill="insight" showPassive="ifNeeded"}}
+					{{> skillRow name="Intimidation" skill="intimidation" showPassive="ifNeeded"}}
+					{{> skillRow name="Investigation" skill="investigation" showPassive="ifNeeded"}}
+					{{> skillRow name="Medicine" skill="medicine" showPassive="ifNeeded"}}
+					{{> skillRow name="Nature" skill="nature" showPassive="ifNeeded"}}
+					{{> skillRow name="Perception" skill="perception" showPassive="forced"}}
+					{{> skillRow name="Performance" skill="performance" showPassive="ifNeeded"}}
+					{{> skillRow name="Persuasion" skill="persuasion" showPassive="ifNeeded"}}
+					{{> skillRow name="Religion" skill="religion" showPassive="ifNeeded"}}
+					{{> skillRow name="Sleight of Hand" skill="sleightOfHand" showPassive="ifNeeded"}}
+					{{> skillRow name="Stealth" skill="stealth" showPassive="ifNeeded"}}
+					{{> skillRow name="Survival" skill="survival" showPassive="ifNeeded"}}
 				</div>
 			</paper-material>
 			</div>

rpg-docs/client/views/characterList/characterList.html

@@ -11,7 +11,7 @@
 					{{#if characters.count}}
 						<div class="character-list layout horizontal wrap">
 							{{# each characters}}
-								<a class="character-card flex layout vertical end-justified" href="/character/{{_id}}">
+								<a class="character-card flex layout vertical end-justified" href="{{characterPath this}}">
 									<iron-image class="fit {{colorClass}}"
 												sizing="cover" preload fade src={{picture}}>
 									</iron-image>

rpg-docs/client/views/characterList/characterList.js

@@ -10,7 +10,15 @@ Template.characterList.helpers({
 				]
 			},
 			{
-				fields: {name: 1, picture: 1, color: 1, race: 1, alignment: 1, gender: 1},
+				fields: {
+					name: 1,
+					urlName: 1,
+					picture: 1,
+					color: 1,
+					race: 1,
+					alignment: 1,
+					gender: 1,
+				},
 				sort: {name: 1},
 			}
 		);

rpg-docs/client/views/characterList/characterSideList.html

@@ -2,7 +2,7 @@
 	{{#if characters.count}}
 		<div class="side-list">
 			{{#each characters}}
-				<a href={{pathFor route="characterSheet" data=this}} tabindex="-1" class="side-list-character characterRepresentative">
+				<a href={{characterPath this}} tabindex="-1" class="side-list-character characterRepresentative">
 					<paper-item class="short">
 						<div class="character-name">
 							{{name}}

rpg-docs/client/views/characterList/characterSideList.js

@@ -14,7 +14,7 @@ Template.characterSideList.helpers({
 				]
 			},
 			{
-				fields: {name: 1},
+				fields: {name: 1, urlName: 1},
 				sort: {name: 1},
 			}
 		);

rpg-docs/lib/functions/evaluate.js

@@ -8,9 +8,10 @@
 })();
 
 //evaluates a calculation string
-evaluate = function(charId, string){
+evaluate = function(charId, string, opts){
+    var spellListId = opts && opts.spellListId;
 	if (!string) return string;
-	string = string.replace(/\b[a-z]+\b/gi, function(sub){
+	string = string.replace(/\b[a-z,1-9]+\b/gi, function(sub){
 		//fields
 		if (Schemas.Character.schema(sub)){
 			return Characters.calculate.fieldValue(charId, sub);
@@ -43,6 +44,12 @@ evaluate = function(charId, string){
 		if (sub.toUpperCase()  === "LEVEL"){
 			return Characters.calculate.level(charId);
 		}
+        if (spellListId && sub.toUpperCase() === "DC") {
+            var list = SpellLists.findOne(spellListId);
+            if (list && list.saveDC){
+                return evaluate(charId, list.saveDC);
+            }
+        }
 		return sub;
 	});
 	try {
@@ -66,6 +73,17 @@ evaluateString = function(charId, string){
 	return result;
 };
 
+evaluateSpellString = function (charId, spellListId, string) {
+    //define brackets as curly brackets around anything that isn't a curly bracket
+	if (!string) return string;
+	var brackets = /\{[^\{\}]*\}/g;
+	var result = string.replace(brackets, function(exp){
+		exp = exp.replace(/(\{|\})/g, ""); //remove curly brackets
+		return evaluate(charId, exp, {spellListId});
+	});
+	return result;
+}
+
 //returns the value of the effect if it exists,
 //otherwise returns the result of the calculation if it exists,
 //otherwise returns 0

rpg-docs/public/custom_components/dicecloud-selector/dicecloud-selectable.html

@@ -249,7 +249,9 @@
     },
 
     _updateItems: function() {
-      var nodes = Polymer.dom(this).queryDistributedElements(this.selectable || '*');
+      var nodes = this.selectable
+        ? Polymer.dom(this).querySelectorAll(this.selectable)
+        : Polymer.dom(this).queryDistributedElements('*');
       nodes = Array.prototype.filter.call(nodes, this._bindFilterItem);
       this._setItems(nodes);
     },

rpg-docs/server/migrations/migrations.js

@@ -23,127 +23,13 @@ Meteor.methods({
 
 Migrations.add({
 	version: 1,
-	name: "converts effect proficiencies to proficiency objects, removes types from assets",
-	up: function() {
-		//convert proficiency effects to proficiency objects
-		Effects.find({operation: "proficiency"}).forEach(function(effect){
-			var type = "skill";
-			if (_.contains(SAVES, effect.stat)) type = "save";
-			Proficiencies.insert({
-				charId: effect.charId,
-				name: effect.stat,
-				value: effect.value,
-				parent: _.clone(effect.parent),
-				type: type,
-				enabled: effect.enabled,
-			}, function(err){
-				if (!err) Effects.remove(effect._id);
-			});
-		});
-		//store type as a parent group if it's needed
-		Effects.find({"parent.collection": "Characters"}).forEach(function(e){
-			Effects.update(e._id, {$set: {"parent.group": e.type}});
-		});
-		Attacks.find({"parent.collection": "Characters"}).forEach(function(a){
-			Attacks.update(a._id, {$set: {"parent.group": a.type}});
-		});
-		//remove type
-		Effects.update({}, {$unset: {type: ""}}, {validate: false, multi: true});
-		Attacks.update({}, {$unset: {type: ""}}, {validate: false, multi: true});
-		//remove languages and proficiencies
-		Characters.update(
-			{},
-			{$unset: {languages: "", proficiencies: ""}},
-			{validate: false, multi: true}
-		);
-	},
-});
-
-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}
-		);
-	},
-});
-
-Migrations.add({
-	version: 3,
-	name: "Converts attacks from damage dice and damage bonus to a string with curly bracket calculations, adds settings.showIncrement to items",
+	name: "Gives all characters a URL name",
 	up: function() {
 		//update characters
-		Characters.update(
-			{"settings.useVariantEncumbrance": undefined},
-			{$set: {"settings.useVariantEncumbrance" : false}},
-			{validate: false, multi: true}
-		);
-		Characters.update(
-			{"settings.useStandardEncumbrance": undefined},
-			{$set: {"settings.useStandardEncumbrance" : true}},
-			{validate: false, multi: true}
-		);
-	},
-});
-
-Migrations.add({
-	version: 4,
-	name: "Adds an effect to give characters a base carry capacity",
-	up: function() {
-		//update characters
-
 		Characters.find({}).forEach(function(char){
-			Characters.update(char._id, {
-				$set: {
-					carryMultiplier: {
-						adjustment: 0,
-						reset: "longRest",
-					}
-				}
-			});
-			var effect = Effects.findOne({
-				charId: char._id, name: "Natural Carrying Capacity"
-			});
-			if (effect) return;
-			Effects.insert({
-				charId: char._id,
-				name: "Natural Carrying Capacity",
-				stat: "carryMultiplier",
-				operation: "base",
-				value: "1",
-				parent: {
-					id: char._id,
-					collection: "Characters",
-					group: "Inate",
-				},
-			});
-			effect = Effects.findOne({
-				charId: char._id, name: "Natural Carrying Capacity"
-			});
-			if (!effect) throw "Carry capacity effect should be set by now."
+			if (char.urlName) return;
+			var urlName = getSlug(char.name, {maintainCase: true}) || "-";
+			Characters.update(char._id, {$set: {urlName}});
 		});
 	},
 	down: function(){

rpg-docs/server/publications/characterList.js

@@ -15,6 +15,7 @@ Meteor.publish("characterList", function(){
 		{
 			fields: {
 				name: 1,
+				urlName: 1,
 				race: 1,
 				alignment: 1,
 				gender: 1,