Changed effect arrays to a single effect array array

rpg-docs/Model/Character/SubSchemas/Attribute.js

@@ -6,11 +6,7 @@ Schemas.Attribute = new SimpleSchema({
 		defaultValue: 0
 	},
 	//effect arrays
-	add: 		{ type: [Schemas.Effect], defaultValue: [] },
-	mul: 		{ type: [Schemas.Effect], defaultValue: [] },
-	min: 		{ type: [Schemas.Effect], defaultValue: [] },
-	max: 		{ type: [Schemas.Effect], defaultValue: [] },
-	conditional:{ type: [Schemas.Effect], defaultValue: [] },
+	effects: { type: [Schemas.Effect], defaultValue: [] },
   reset: {
     type: String,
     defaultValue: "longRest",

rpg-docs/Model/Character/SubSchemas/Effect/Effect.js

@@ -13,6 +13,11 @@ Schemas.Effect = new SimpleSchema({
 	name: {
 		type: String
 	},
+	operation: {
+		type: String,
+		defaultValue: "add",
+		allowedValues: ["proficiency","add","mul","min","max","advantage","disadvantage","passiveAdd","fail","conditional","passiveAdd"]
+	},
 	value: {
 		type: Number,
 		decimal: true,
@@ -28,4 +33,4 @@ Schemas.Effect = new SimpleSchema({
 		defaultValue: "default",
 		allowedValues: ["default", "inate", "class", "race", "feat", "equippedMagic", "equippedMundane", "external"]
 	}
-});
+});

rpg-docs/Model/Character/SubSchemas/Skill.js

@@ -1,25 +1,5 @@
 Schemas.Skill = new SimpleSchema({
 	//attribute name that this skill used as base mod for roll
-	ability: 		{ type: String, defaultValue: "" },
-	//multiplied by profBonus and added to base mod
-	//only highest value proficiency is used
-	proficiency:	{ type: [Schemas.Effect], defaultValue: [] },
-	//added to base mod
-	add:			{ type: [Schemas.Effect], defaultValue: [] },
-	//multiplied by base + adds
-	mul:			{ type: [Schemas.Effect], defaultValue: [] },
-	//lower bounds, highest used
-	min:			{ type: [Schemas.Effect], defaultValue: [] },
-	//upper bounds, lowest used
-	max:			{ type: [Schemas.Effect], defaultValue: [] },
-	//things giving advantage
-	advantage:		{ type: [Schemas.Effect], defaultValue: [] }, 
-	//things giving disadvantage
-	disadvantage:	{ type: [Schemas.Effect], defaultValue: [] },
-	//added to passive checks only
-	passiveAdd: 	{ type: [Schemas.Effect], defaultValue: [] },
-	//things causing all rolls to fail
-	fail: 			{ type: [Schemas.Effect], defaultValue: [] },
-	//things that only apply sometimes
-	conditional: 	{ type: [Schemas.Effect], defaultValue: [] }
+	ability: { type: String, defaultValue: "" },
+	effects: { type: [Schemas.Effect], defaultValue: [] },
 });