Added encumbrance effects, conditions and encumbrance buffs

rpg-docs/client/style/cards.scss

@@ -89,3 +89,8 @@ $thinColumnWidth: 240px;
 		border-radius: 0 2px 2px 0;
 	}
 }
+
+/* undo pointer cursor on detail box heading */
+#globalDetail .card .top {
+	cursor: auto;
+}

rpg-docs/client/views/character/buffs/buffDialog/buffDialog.html

@@ -0,0 +1,15 @@
+<template name="buffDialog">
+	{{#with buff}}
+		{{#baseDialog title=name class=colorClass hideEdit=true}}
+			{{> buffDetails}}
+		{{/baseDialog}}
+	{{/with}}
+</template>
+
+<template name="buffDetails">
+	{{#if description}}
+		<div class="pre-wrap">{{evaluateString charId description}}</div>
+	{{/if}}
+
+	{{> effectsViewList charId=charId parentId=_id}}
+</template>

rpg-docs/client/views/character/buffs/buffDialog/buffDialog.js

@@ -0,0 +1,5 @@
+Template.buffDialog.helpers({
+	buff: function(){
+		return Buffs.findOne(this.buffId);
+	},
+});

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

@@ -1,3 +1,13 @@
 <template name="characterSettings">
-
+	{{#with character}}
+	<div>
+		<div layout horizontal>
+			<div>Use variant encumbrance </div>
+			<paper-toggle-button id="variantEncumbrance"
+								 checked={{settings.useVariantEncumbrance}}
+								 touch-action="pan-y">
+			</paper-toggle-button>
+		</div>
+	</div>
+	{{/with}}
 </template>

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

@@ -1,3 +1,17 @@
-Template.characterSettings.events({
-
+Template.characterSettings.helpers({
+	character: function() {
+		return Characters.findOne(this._id, {fields: {settings: 1}});
+	}
+});
+
+Template.characterSettings.events({
+	"change #variantEncumbrance": function(event, instance){
+		var value = instance.find("#variantEncumbrance").checked;
+		if (this.settings.useVariantEncumbrance !== value){
+			Characters.update(
+				this._id,
+				{$set: {"settings.useVariantEncumbrance": value}}
+			);
+		}
+	},
 });

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

@@ -19,6 +19,9 @@
 						<paper-item id="shareCharacter">
 							<core-icon icon="social:share"></core-icon>Share
 						</paper-item>
+						<paper-item id="characterSettings">
+							<core-icon icon="settings"></core-icon>Settings
+						</paper-item>
 					</core-menu>
 				</paper-dropdown>
 			</paper-menu-button>

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

@@ -1,6 +1,9 @@
-Template.characterSheet.created = function(){
+Template.characterSheet.onCreated(function() {
+	//default to the first tab
 	Session.setDefault(this.data._id + ".selectedTab", "stats");
-};
+	//watch this character and make sure their encumbrance is updated
+	trackEncumbranceConditions(this.data._id, this);
+});
 
 var setTab = function(charId, tab){
 	return Session.set(charId + ".selectedTab", tab);
@@ -40,4 +43,11 @@ Template.characterSheet.events({
 			template: "shareDialog",
 		});
 	},
+	"tap #characterSettings": function(event, instance){
+		GlobalUI.showDialog({
+			heading: this.name + " Settings",
+			data: this,
+			template: "characterSettings",
+		});
+	},
 });

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

@@ -11,4 +11,12 @@
 			 style="width: 66.666%;">
 		</div>
 	</div>
+	{{#if overCarriedPercent}}
+	<div class="carryCapacityBar">
+		<div class="carriedWeightBar"
+			 style="width: {{overCarriedPercent}}%;
+					background-color: {{overCarriedColor}}">
+		</div>
+	</div>
+	{{/if}}
 </template>

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

@@ -18,13 +18,40 @@ var getFractionCarried = function(char) {
 	return weight / capacity;
 };
 
+Template.carryCapacityBar.onCreated(function() {
+	var self = this;
+	self.carriedFraction = new ReactiveVar(0);
+	self.autorun(function() {
+		self.carriedFraction.set(getFractionCarried(self.data));
+	});
+});
+
 Template.carryCapacityBar.helpers({
 	carriedPercent: function() {
-		var percent = 100 * getFractionCarried(this);
+		var percent = 100 * Template.instance().carriedFraction.get();
 		return percent > 100 ? 100 : percent;
 	},
+	overCarriedPercent: function() {
+		var percent = 100 * Template.instance().carriedFraction.get();
+		var overPercent = percent - 100;
+		if (overPercent < 0) return 0;
+		if (overPercent > 100) return 100;
+		return overPercent;
+	},
 	carriedColor: function() {
-		var frac = getFractionCarried(this);
+		var frac = Template.instance().carriedFraction.get();
+		if (frac < 1 / 3){
+			return "#2196F3";
+		} else if (frac < 2 / 3){
+			return "#CDDC39";
+		} else if (frac < 1) {
+			return "#FFC107";
+		} else {
+			return "#F44336";
+		}
+	},
+	overCarriedColor: function() {
+		var frac = Template.instance().carriedFraction.get();
 		if (frac < 1 / 3){
 			return "#2196F3";
 		} else if (frac < 2 / 3){

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

@@ -14,9 +14,9 @@
 					</div>
 				</paper-shadow>
 				<!--Weight Carried-->
-				<paper-shadow class="card weightCarried"
+				<paper-shadow class="card"
 							  hero-id="main" {{detailHero "weightCarried" _id}}>
-					<div class="top green white-text"
+					<div class="top green white-text weightCarried"
 						 hero-id="toolbar" {{detailHero "weightCarried" _id}}
 						 layout horizontal center>
 						<div class="subhead" flex>
@@ -29,6 +29,25 @@
 					<div class="bottom green" style="padding: 0;">
 						{{> carryCapacityBar}}
 					</div>
+					{{#if encumberedBuffs.count}}
+					<div class="bottom list">
+						{{#each encumberedBuffs}}
+						<div class="item-slot">
+							<div class="item buff"
+								 hero-id="main" {{detailHero}}
+								 layout horizontal center
+								 draggable="true">
+								<div flex>
+									<core-icon icon="work"
+											   style="margin-right: 16px">
+									</core-icon>
+									{{name}}
+								</div>
+							</div>
+						</div>
+						{{/each}}
+					</div>
+					{{/if}}
 				</paper-shadow>
 				<!--Equipment-->
 				<paper-shadow class="card equipmentContainer">

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

@@ -61,6 +61,18 @@ Template.inventory.helpers({
 		});
 		return weight;
 	},
+	encumberedBuffs: function(){
+		return Buffs.find({
+			charId: this._id,
+			type: "inate",
+			name: {$in: [
+				"Encumbered",
+				"Heavily encumbered",
+				"Over encumbered",
+				"Can't move load",
+			]},
+		});
+	},
 	equipmentValue: function(){
 		var value = 0;
 		Items.find(
@@ -144,6 +156,15 @@ Template.inventory.events({
 			heroId:   charId + "weightCarried",
 		});
 	},
+	"tap .buff": function(event){
+		var buffId = this._id;
+		var charId = Template.parentData()._id;
+		GlobalUI.setDetail({
+			template: "buffDialog",
+			data:     {buffId: buffId, charId: charId},
+			heroId:   buffId,
+		});
+	},
 	"tap .inventoryItem": function(event){
 		var itemId = this._id;
 		var charId = Template.parentData()._id;