Rolled back changes to spells tab, It wasn't a column-layout

rpg-docs/Model/Character/Characters.js

@@ -33,6 +33,7 @@ Schemas.Character = new SimpleSchema({
 	age:              {type: Schemas.Attribute},
 	ageRate:          {type: Schemas.Attribute},
 	armor:            {type: Schemas.Attribute},
+	carryMultiplier:  {type: Schemas.Attribute},
 
 	//resources
 	level1SpellSlots: {type: Schemas.Attribute},

rpg-docs/Model/Character/Effects.js

@@ -107,6 +107,18 @@ if (Meteor.isServer) Characters.after.insert(function(userId, char) {
 			group: "Inate",
 		},
 	});
+	Effects.insert({
+		charId: char._id,
+		name: "Natural Carrying Capacity",
+		stat: "carryMultiplier",
+		operation: "base",
+		value: "1",
+		parent: {
+			id: char._id,
+			collection: "Characters",
+			group: "Inate",
+		},
+	});
 });
 
 Effects.attachBehaviour("softRemovable");

rpg-docs/client/style/cards.scss

@@ -3,17 +3,24 @@
 $thickColumnWidth: 304px;
 $thinColumnWidth: 240px;
 
-//Column layouts of cards
+//Column layout
 .column-container {
 	@include column-fill(balance);
-	@include column-gap(8px);
+	@include column-gap(0px);
 	@include column-width($thickColumnWidth);
-	padding: 8px;
+	padding: 4px;
 
 	&.thin-columns {
 		@include column-count(4);
 		@include column-width($thinColumnWidth);
 	}
+	& > div {
+		padding: 4px;
+		//stop divs breaking over multiple columns
+		-webkit-column-break-inside: avoid;
+		page-break-inside: avoid;
+		break-inside: avoid;
+	}
 }
 
 //Cards
@@ -21,20 +28,6 @@ $thinColumnWidth: 240px;
 	background: white;
 	border-radius: 2px;
 
-	.column-container & {
-		margin-bottom: 8px;
-		width: 100%;
-		//hack to stop flickering
-		-webkit-backface-visibility: hidden;
-		-webkit-transform: translateX(0);
-		//stop breaking over column divide
-		-webkit-column-break-inside: avoid;
-		page-break-inside: avoid;
-		break-inside: avoid;
-		//Fixes extra margin at top of columns
-		display: inline-block;
-	}
-
 	.top {
 		cursor: pointer;
 		padding: 16px;

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

@@ -42,6 +42,7 @@ var stats = [
 	{stat: "rageDamage", name: "Rage Damage", group: "Stats"},
 	{stat: "expertiseDice", name: "Expertise Dice", group: "Stats"},
 	{stat: "superiorityDice", name: "Superiority Dice", group: "Stats"},
+	{stat: "carryMultiplier", name: "Carry Capacity Multiplier", group: "Stats"},
 	{stat: "level1SpellSlots", name: "level 1", group: "Spell Slots"},
 	{stat: "level2SpellSlots", name: "level 2", group: "Spell Slots"},
 	{stat: "level3SpellSlots", name: "level 3", group: "Spell Slots"},

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

@@ -42,6 +42,7 @@ var stats = {
 	"rageDamage":{"name":"Rage Damage"},
 	"expertiseDice":{"name":"Expertise Dice"},
 	"superiorityDice":{"name":"Superiority Dice"},
+	"carryMultiplier": {"name": "Carry Capacity Multiplier"},
 	"level1SpellSlots":{"name":"level 1 Spell Slots"},
 	"level2SpellSlots":{"name":"level 2 Spell Slots"},
 	"level3SpellSlots":{"name":"level 3 Spell Slots"},

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

@@ -12,8 +12,9 @@
 				{{>resource name="sorceryPoints" title="Sorcery Points" color="teal" char=this}}
 				<!--superiorityDice-->
 				{{>resource name="superiorityDice" title="Superiority Dice" color="teal" char=this}}
-				
+
 				<!--Attacks-->
+				<div>
 				<paper-shadow class="card">
 					<div class="top white">
 						Attacks
@@ -48,8 +49,10 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 
 				<!--Proficiencies-->
+				<div>
 				<paper-shadow class="card">
 					<div class="white top">
 						Proficiencies
@@ -75,13 +78,15 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 
 				<!--features-->
 				{{#each features}}
+					<div>
 					<paper-shadow class="card featureCard"
 								  hero-id="main" {{detailHero}}>
-						<div class="top {{colorClass}} subhead" 
+						<div class="top {{colorClass}} subhead"
-							 layout horizontal 
+							 layout horizontal
 							 hero-id="toolbar" {{detailHero}}>
 							<div flex hero-id="title" {{detailHero}}>
 								{{name}}
@@ -94,7 +99,7 @@
 							{{#if canEnable}}
 								<core-tooltip label="Feature enabled"
 											  position="left">
-									<paper-checkbox class="enabledCheckbox" 
+									<paper-checkbox class="enabledCheckbox"
 													checked={{enabled}}
 													disabled={{#unless canEditCharacter charId}}true{{/unless}}>
 									</paper-checkbox>
@@ -108,29 +113,30 @@
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>
-								<paper-button class="useFeature" 
+								<paper-button class="useFeature"
 											  disabled={{noUsesLeft}}>
 									Use
 								</paper-button>
-								<paper-button class="resetFeature" 
+								<paper-button class="resetFeature"
 											  disabled={{usesFull}}>
 									Reset
 								</paper-button>
 							</div>
 						{{/if}}
 					</paper-shadow>
+					</div>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>
 		</div>
 		{{#if canEditCharacter _id}}
-			<paper-fab id="addFeature" 
+			<paper-fab id="addFeature"
-					   class="floatyButton" 
+					   class="floatyButton"
-					   icon="add" 
+					   icon="add"
-					   title="Add" 
+					   title="Add"
-					   role="button" 
+					   role="button"
-					   tabindex="0" 
+					   tabindex="0"
-					   aria-label="Add" 
+					   aria-label="Add"
 					   hero-id="main"></paper-fab>
 		{{/if}}
 	</div>
@@ -138,15 +144,16 @@
 
 <template name="resource">
 	{{#if characterCalculate "attributeBase" char._id name}}
-		<paper-shadow class="card" 
+	<div>
+		<paper-shadow class="card"
 					  hero-id="main" {{detailHero name char._id}}
 					  layout horizontal>
-			<div class="left {{getColor}} display1 white-text" 
+			<div class="left {{getColor}} display1 white-text"
 				 hero-id="toolbar" {{detailHero name char._id}}
 				 layout horizontal center>
 				<div style="margin-right: 8px;">
-					<paper-icon-button class="resourceUp" 
+					<paper-icon-button class="resourceUp"
-									   icon="arrow-drop-up" 
+									   icon="arrow-drop-up"
 									   disabled={{cantIncrement}}>
 					</paper-icon-button>
 					<paper-icon-button class="resourceDown"
@@ -157,10 +164,11 @@
 				<div>{{characterCalculate "attributeValue" char._id name}}</div>
 				<!--<div>/{{char.attributeBase name}}</div>-->
 			</div>
-			<div class="right clickable" 
+			<div class="right clickable"
 				 flex layout horizontal center>
 				{{title}}
 			</div>
 		</paper-shadow>
+	</div>
 	{{/if}}
 </template>

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

@@ -14,7 +14,9 @@ var getFractionCarried = function(char) {
 	});
 	//get strength
 	var strength = Characters.calculate.attributeValue(char._id, "strength");
-	var capacity = strength * 15;
+	var carryMultiplier = Characters.calculate
+		.attributeValue(char._id, "carryMultiplier");
+	var capacity = strength * 15 * carryMultiplier;
 	return weight / capacity;
 };
 

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

@@ -3,6 +3,7 @@
 		<div id="inventory" class="scroll-y" fit>
 			<div class="column-container">
 				<!--Net Worth-->
+				<div>
 				<paper-shadow class="card">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
@@ -13,7 +14,9 @@
 						</div>
 					</div>
 				</paper-shadow>
+				</div>
 				<!--Weight Carried-->
+				<div>
 				<paper-shadow class="card"
 							  hero-id="main" {{detailHero "weightCarried" _id}}>
 					<div class="top green white-text weightCarried"
@@ -48,7 +51,9 @@
 					</div>
 					{{/if}}
 				</paper-shadow>
+				</div>
 				<!--Equipment-->
+				<div>
 				<paper-shadow class="card equipmentContainer">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
@@ -76,7 +81,9 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 				<!--Carried Items-->
+				<div>
 				<paper-shadow class="card carriedContainer">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
@@ -95,8 +102,10 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 				{{#each containers}}
-					<paper-shadow class="card itemContainer" 
+					<div>
+					<paper-shadow class="card itemContainer"
 								  hero-id="main" {{detailHero}}>
 						<div class="top {{colorClass}}"
 							 hero-id="toolbar" {{detailHero}}
@@ -124,6 +133,7 @@
 							{{/each}}
 						</div>
 					</paper-shadow>
+					</div>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>

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

@@ -3,7 +3,7 @@
 		<div id="journal" class="scroll-y" fit>
 			<div class="column-container">
 				<!--Experience Table-->
-				<paper-shadow class="card experiencesCard"
+				<div><paper-shadow class="card experiencesCard"
 							  hero-id="main" {{detailHero}}>
 					<div class="top white subhead"
 						 hero-id="toolbar" {{detailHero}}
@@ -37,9 +37,9 @@
 							</paper-button>
 						</div>
 					{{/if}}
-				</paper-shadow>
+				</paper-shadow></div>
 				<!--Class Table-->
-				<paper-shadow class="card"
+				<div><paper-shadow class="card"
 							  hero-id="main" {{detailHero}}>
 					<div class="white top"
 						 hero-id="toolbar" {{detailHero}}
@@ -78,9 +78,10 @@
 							</div>
 						{{/each}}
 					</div>
-				</paper-shadow>
+				</paper-shadow></div>
 				<!--Notes-->
 				{{#each notes}}
+				<div>
 					<paper-shadow class="card"  hero-id="main" {{detailHero}}>
 						<div class="top {{colorClass}} noteTop subhead"
 							 hero-id="toolbar" {{detailHero}}
@@ -89,18 +90,19 @@
 						</div>
 						<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
 					</paper-shadow>
+				</div>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>
 		</div>
 	</div>
 	{{#if canEditCharacter _id}}
-	<paper-fab id="addNote" 
+	<paper-fab id="addNote"
-				   class="floatyButton" 
+				   class="floatyButton"
-				   icon="add" 
+				   icon="add"
-				   title="Add" 
+				   title="Add"
-				   role="button" 
+				   role="button"
-				   tabindex="0" 
+				   tabindex="0"
 				   hero-id="main"></paper-fab>
 	{{/if}}
-</template>
+</template>

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

@@ -3,6 +3,7 @@
 		<div id="persona" class="scroll-y" fit>
 			<div class="column-container">
 				{{#with characterDetails}}
+				<div>
 					<paper-shadow class="card"
 								  hero-id="main" {{detailHero "details" _id}}>
 						{{#unless picture}}
@@ -32,13 +33,15 @@
 							</div>
 						</div>
 					</paper-shadow>
+				</div>
 				{{/with}}
-				{{> containerCard characterField "description" "Description"}}
+				<div>{{> containerCard characterField "description" "Description"}}</div>
-				{{> containerCard characterField "personality" "Personality Traits"}}
+				<div>{{> containerCard characterField "personality" "Personality Traits"}}</div>
-				{{> containerCard characterField "ideals" "Ideals"}}
+				<div>{{> containerCard characterField "ideals" "Ideals"}}</div>
-				{{> containerCard characterField "bonds" "Bonds"}}
+				<div>{{> containerCard characterField "bonds" "Bonds"}}</div>
-				{{> containerCard characterField "flaws" "Flaws"}}
+				<div>{{> containerCard characterField "flaws" "Flaws"}}</div>
-				{{> containerCard characterField "backstory" "Background"}}
+				<div>{{> containerCard characterField "backstory" "Background"}}</div>
+				<div>
 				<paper-shadow class="card">
                     <div class="white top subhead">
                       Languages
@@ -49,6 +52,7 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -70,4 +74,4 @@
 		</div>
 		<div class="bottom">{{#markdown}}{{> UI.contentBlock}}{{/markdown}}</div>
 	</paper-shadow>
-</template>
+</template>

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

@@ -1,7 +1,7 @@
 <template name="spells">
 	<div fit>
 		<div id="spells" class="scroll-y" fit>
-			<div style="padding: 4px;" 
+			<div style="padding: 4px;"
 				 layout horizontal start wrap>
 				{{#if hasSlots}}
 					<paper-shadow class="card"
@@ -92,7 +92,7 @@
 												<div class="tall spell item"
 													 hero-id="main" {{detailHero}}
 													 layout horizontal center>
-													<core-icon icon="social:whatshot" 
+													<core-icon icon="social:whatshot"
 															   style="color: {{hexColor color}};
 																	  margin-right: 16px;"
 															   ></core-icon>
@@ -144,4 +144,4 @@
 			</core-tooltip>
 		{{/fabMenu}}
 	{{/if}}
-</template>
+</template>

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

@@ -1,5 +1,6 @@
 <template name="abilityMiniCard">
-	<paper-shadow class="card abilityMiniCard clickable" 
+	<div>
+	<paper-shadow class="card abilityMiniCard clickable"
 				  hero-id="main" {{detailHero ability ../_id}}
 				  layout horizontal>
 		<div class="left white-text {{color}}"
@@ -11,4 +12,5 @@
 			{{title}}
 		</div>
 	</paper-shadow>
+	</div>
 </template>

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

@@ -2,27 +2,27 @@
 	<table class="carryCapacityTable strengthTable">
 		<tr>
 			<td>Encumbered</td>
-			<td>&gt;{{evaluate charId "strength * 5"}}lbs</td>
+			<td>&gt;{{evaluate charId "strength * 5 * carryMultiplier"}}lbs</td>
 			<td class="caption">Variant rule, encumbered characters move 10 feet slower</td>
 		</tr>
 		<tr>
 			<td>Heavily encumbered</td>
-			<td>&gt;{{evaluate charId "strength * 10"}}lbs</td>
+			<td>&gt;{{evaluate charId "strength * 10 * carryMultiplier"}}lbs</td>
 			<td class="caption">
 				Variant rule, heavily encumbered characters move 20 feet slower and have disadvantage on ability checks, attack rolls, and saving thows that use Strength, Dexterity, or Constitution
 			</td>
 		</tr>
 		<tr>
 			<td>Over Encumbered</td>
-			<td>&gt;{{evaluate charId "strength * 15"}}lbs</td>
+			<td>&gt;{{evaluate charId "strength * 15 * carryMultiplier"}}lbs</td>
 			<td class="caption">
 				Characters that can only just lift, push or drag their current load can only move at 5 feet.
 			</td>
 		</tr>
 		<tr>
 			<td>Push, drag or lift maximum</td>
-			<td>{{evaluate charId "strength * 30"}}lbs</td>
+			<td>{{evaluate charId "strength * 30 * carryMultiplier"}}lbs</td>
 			<td class="caption"></td>
 		</tr>
 	</table>
-</template>
+</template>

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

@@ -1,14 +1,15 @@
 <template name="hitDice">
 	{{#if characterCalculate "attributeBase" ../_id name}}
-		<paper-shadow class="card hit-dice" hero-id="main" 
+		<div>
-					  {{detailHero name ../_id}} 
+		<paper-shadow class="card hit-dice" hero-id="main"
+					  {{detailHero name ../_id}}
 					  layout horizontal>
-			<div class="left green display1 white-text" 
+			<div class="left green display1 white-text"
 				 hero-id="toolbar" {{detailHero name ../_id}}
 				 layout horizontal>
 				<div>
-					<paper-icon-button class="resourceUp" 
+					<paper-icon-button class="resourceUp"
-									   icon="arrow-drop-up" 
+									   icon="arrow-drop-up"
 									   disabled={{cantIncrement}}>
 					</paper-icon-button>
 					<paper-icon-button class="resourceDown"
@@ -29,5 +30,6 @@
 				Hit Dice
 			</div>
 		</paper-shadow>
+		</div>
 	{{/if}}
 </template>

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

@@ -27,6 +27,7 @@
 			{{>hitDice name="d10HitDice" diceNum="10" char=this}}
 			{{>hitDice name="d12HitDice" diceNum="12" char=this}}
 			<!--Saving Throws-->
+			<div>
 			<paper-shadow class="card">
 				<div class="top white subhead">
 					Saving Throws
@@ -40,7 +41,9 @@
 					{{> skillRow name="Charisma" skill="charismaSave"}}
 				</div>
 			</paper-shadow>
+			</div>
 			<!--Skills-->
+			<div>
 			<paper-shadow class="card">
 				<div class="top white subhead">
 					Skills
@@ -66,11 +69,13 @@
 					{{> skillRow name="Survival" skill="survival"}}
 				</div>
 			</paper-shadow>
+			</div>
 		</div>
 	</div>
 </template>
 
 <template name="statCard">
+	<div>
 	<paper-shadow class="card statCard clickable" hero-id="main" {{detailHero stat ../_id}} layout horizontal>
 		<div class="left display1 white-text {{color}}"
 			 hero-id="toolbar" {{detailHero stat ../_id}}>
@@ -84,4 +89,5 @@
 			{{name}}
 		</div>
 	</paper-shadow>
+	</div>
 </template>

rpg-docs/lib/methods/conditions.js

@@ -101,6 +101,8 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 			{fields: {"settings": 1}}
 		);
 		var strength = Characters.calculate.attributeValue(charId, "strength");
+		var carryMultiplier = Characters.calculate
+			.attributeValue(charId, "carryMultiplier");
 		var give = function(condition) {
 			Meteor.call("giveCondition", charId, condition);
 		};
@@ -108,11 +110,11 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 			Meteor.call("removeCondition", charId, condition);
 		};
 		//variant encumbrance rules
-		if (weight > strength * 10 &&
+		if (weight > strength * 10 * carryMultiplier &&
 			character.settings.useVariantEncumbrance) {
 			give("encumbered2");
 			remove("encumbered");
-		} else if (weight > strength * 5 &&
+		} else if (weight > strength * 5 * carryMultiplier &&
 				   character.settings.useVariantEncumbrance){
 			give("encumbered");
 			remove("encumbered2");
@@ -121,11 +123,11 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 			remove("encumbered2");
 		}
 		//normal encumbrance rules
-		if (weight > strength * 30 &&
+		if (weight > strength * 30 * carryMultiplier &&
 			character.settings.useStandardEncumbrance){
 			give("encumbered4");
 			remove("encumbered3");
-		} else if (weight > strength * 15 &&
+		} else if (weight > strength * 15 * carryMultiplier &&
 				   character.settings.useStandardEncumbrance) {
 			give("encumbered3");
 			remove("encumbered4");

rpg-docs/private/changeLogs/changeLogs.js

@@ -243,3 +243,28 @@ ChangeLogs.insert({
 		"Added basic analytics",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.6.8",
+	changes: [
+		"Fixed share dialog not finding user names",
+		"Fixed temporary hitpoint sliders allowing negative values",
+		"Fixed proficiencies not being disabled with their features",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.7.0",
+	changes: [
+		"Added carry capacity multiplier as a stat with a default value of 1",
+		"Improved loading times by vulcanizing polymer imports",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.7.1",
+	changes: [
+		"Fixed carry capacity effects not displaying correctly when not editing",
+		"Changed how columns are presented to fix a display issue introduced in Chrome 44",
+	],
+});

rpg-docs/server/migrations/migrations.js

@@ -108,3 +108,45 @@ Migrations.add({
 		);
 	},
 });
+
+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."
+		});
+	},
+	down: function(){
+		return;
+	},
+});