Merge branch 'master' into feature-conditions

rpg-docs/Model/Campaign/Party.js

@@ -1,8 +1,42 @@
 Parties = new Mongo.Collection("parties");
 
 Schemas.Party = new SimpleSchema({
-	//each character/monster can only be in one party at a time
-	//each party can only be in a single instance at a time
+	name: {
+		type: String,
+		defaultValue: "New Party",
+		trim: false,
+		optional: true,
+	},
+	characters: {
+		type: [String],
+		regEx: SimpleSchema.RegEx.Id,
+		index: 1,
+		defaultValue: [],
+	},
+	owner: {
+		type: String,
+		regEx: SimpleSchema.RegEx.Id,
+	},
 });
 
 Parties.attachSchema(Schemas.Party);
+
+Parties.allow({
+	insert: function(userId, doc) {
+		return userId && doc.owner === userId;
+	},
+	update: function(userId, doc, fields, modifier) {
+		return userId && doc.owner === userId;
+	},
+	remove: function(userId, doc) {
+		return userId && doc.owner === userId;
+	},
+	fetch: ["owner"],
+});
+
+Parties.deny({
+	update: function(userId, docs, fields, modifier) {
+		// can't change owners
+		return _.contains(fields, "owner");
+	}
+});

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},
@@ -184,6 +185,9 @@ Schemas.Character = new SimpleSchema({
 		defaultValue: "whitelist",
 		allowedValues: ["whitelist", "public"],
 	},
+	"settings.exportFeatures": {type: Boolean, defaultValue: true},
+	"settings.exportAttacks": {type: Boolean, defaultValue: true},
+	"settings.exportDescription": {type: Boolean, defaultValue: true},
 });
 
 Characters.attachSchema(Schemas.Character);
@@ -254,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);
 });
 
@@ -534,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