From 0e53f157d200fe0ffe9881eba229b808e70730dc Mon Sep 17 00:00:00 2001
From: Jacob <handsjacob@gmail.com>
Date: Wed, 19 Jul 2017 12:13:49 +0100
Subject: [PATCH] Spell attack bonus and DC are now available in spell attacks.

---
 .../attacks/attackView/attackView.html        |  8 +--
 .../attacks/attackView/attackView.js          | 28 ++++++++++
 .../attacksViewList/attacksViewList.html      |  4 +-
 .../views/character/features/features.html    | 52 ++++++++++---------
 .../views/character/features/features.js      | 46 +++++++++++++---
 rpg-docs/lib/functions/evaluate.js            |  6 +++
 6 files changed, 107 insertions(+), 37 deletions(-)
 create mode 100644 rpg-docs/client/views/character/attacks/attackView/attackView.js

diff --git a/rpg-docs/client/views/character/attacks/attackView/attackView.html b/rpg-docs/client/views/character/attacks/attackView/attackView.html
index d06683af..abbd7c22 100644
--- a/rpg-docs/client/views/character/attacks/attackView/attackView.html
+++ b/rpg-docs/client/views/character/attacks/attackView/attackView.html
@@ -1,15 +1,15 @@
 <template name="attackView">
 	<div class="attackView layout horizontal">
 		<div class="paper-font-headline layout horizontal center" style="margin-right: 16px;">
-			{{evaluateSigned charId attackBonus}}
+			{{evaluateAttackBonus charId attack}}
 		</div>
 		<div class="layout vertical">
 			<div>
-				{{evaluateString charId damage}}&nbsp;{{damageType}}
+				{{evaluateDamage charId attack}}&nbsp;{{damageType}}
 			</div>
-			{{#if details}}
+			{{#if attack.details}}
 			<div class="paper-font-caption">
-				{{details}}
+				{{attack.details}}
 			</div>
 			{{/if}}
 		</div>
diff --git a/rpg-docs/client/views/character/attacks/attackView/attackView.js b/rpg-docs/client/views/character/attacks/attackView/attackView.js
new file mode 100644
index 00000000..5f8bf096
--- /dev/null
+++ b/rpg-docs/client/views/character/attacks/attackView/attackView.js
@@ -0,0 +1,28 @@
+Template.attackView.helpers ({
+	evaluateAttackBonus: function(charId, attack) {
+		if (attack.parent.collection == "Spells") {
+			var spell = Spells.findOne(attack.parent.id);
+			if (spell) {
+				bonus = evaluate(charId, attack.attackBonus, {"spellListId": spell.parent.id});
+			}
+		} else {
+			var bonus = evaluate(charId, attack.attackBonus);
+		}
+
+		if (_.isFinite(bonus)) {
+			return bonus > 0 ? "+" + bonus : "" + bonus;
+		} else {
+			return bonus;
+		}
+	},
+	evaluateDamage: function(charId, attack) {
+		if (attack.parent.collection == "Spells") {
+			var spell = Spells.findOne(attack.parent.id);
+			if (spell) {
+				return evaluateSpellString(charId, spell.parent.id, attack.damage);
+			}
+		} else {
+			return evaluateString(charId, attack.damage);
+		}
+	},
+})
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.html b/rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.html
index 80d8ec76..8954daca 100644
--- a/rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.html
+++ b/rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.html
@@ -3,8 +3,8 @@
 		<hr style="margin: 16px 0 16px 0;">
 		<div class="attacks">
 			<div class="spaceAfter paper-font-title">Attacks</div>
-			{{#each attacks}}
-				{{> attackView}}
+			{{#each attack in attacks}}
+				{{> attackView attack=attack charId=charId}}
 			{{/each}}
 		</div>
 	{{/if}}
diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html
index 066ae33d..b3499845 100644
--- a/rpg-docs/client/views/character/features/features.html
+++ b/rpg-docs/client/views/character/features/features.html
@@ -19,30 +19,8 @@
 						Attacks
 					</div>
 					<div class="bottom list">
-						{{#each attacks}}
-							<div class="item-slot">
-								<div class="flexible attack item">
-									<div class="layout horizontal">
-										<div class="paper-font-headline layout horizontal center"
-											 style="margin-right: 16px;">
-											{{evaluateSigned ../_id attackBonus}}
-										</div>
-										<div class="flex layout vertical">
-											<div class="paper-font-body2">
-												{{name}}
-											</div>
-											<div>
-												{{evaluateString ../_id damage}}&nbsp;{{damageType}}
-											</div>
-											{{#if details}}
-												<div>
-													{{details}}
-												</div>
-											{{/if}}
-										</div>
-									</div>
-								</div>
-							</div>
+						{{#each attack in attacks}}
+							{{>attackListItem attack=attack charId=_id}}
 						{{/each}}
 					</div>
 				</paper-material>
@@ -156,3 +134,29 @@
 	</div>
 	{{/if}}
 </template>
+
+<template name="attackListItem">
+	<div class="item-slot">
+		<div class="flexible attack item">
+			<div class="layout horizontal">
+				<div class="paper-font-headline layout horizontal center"
+					 style="margin-right: 16px;">
+					{{evaluateAttackBonus charId attack}}
+				</div>
+				<div class="flex layout vertical">
+					<div class="paper-font-body2">
+						{{attack.name}}
+					</div>
+					<div>
+						{{evaluateDamage charId attack}}&nbsp;{{attack.damageType}}
+					</div>
+					{{#if attack.details}}
+						<div>
+							{{attack.details}}
+						</div>
+					{{/if}}
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/features/features.js b/rpg-docs/client/views/character/features/features.js
index 33c0e459..2ab8f277 100644
--- a/rpg-docs/client/views/character/features/features.js
+++ b/rpg-docs/client/views/character/features/features.js
@@ -82,13 +82,6 @@ Template.features.events({
 			element:   event.currentTarget.parentElement,
 		});
 	},
-	"click .attack": function(event){
-		openParentDialog({
-			parent: this.parent,
-			charId: this.charId,
-			element: event.currentTarget,
-		});
-	},
 	"click .useFeature": function(event){
 		var featureId = this._id;
 		Features.update(featureId, {$inc: {used: 1}});
@@ -154,3 +147,42 @@ Template.resource.events({
 		});
 	},
 });
+
+Template.attackListItem.helpers({
+	evaluateAttackBonus: function(charId, attack) {
+		if (attack.parent.collection == "Spells") {
+			var spell = Spells.findOne(attack.parent.id);
+			if (spell) {
+				bonus = evaluate(charId, attack.attackBonus, {"spellListId": spell.parent.id});
+			}
+		} else {
+			var bonus = evaluate(charId, attack.attackBonus);
+		}
+
+		if (_.isFinite(bonus)) {
+			return bonus > 0 ? "+" + bonus : "" + bonus;
+		} else {
+			return bonus;
+		}
+	},
+	evaluateDamage: function(charId, attack) {
+		if (attack.parent.collection == "Spells") {
+			var spell = Spells.findOne(attack.parent.id);
+			if (spell) {
+				return evaluateSpellString(charId, spell.parent.id, attack.damage);
+			}
+		} else {
+			return evaluateString(charId, attack.damage);
+		}
+	},
+});
+
+Template.attackListItem.events({
+	"click .attack": function(event, instance){
+		openParentDialog({
+			parent: instance.data.attack.parent,
+			charId: instance.data.charId,
+			element: event.currentTarget,
+		});
+	},
+});
diff --git a/rpg-docs/lib/functions/evaluate.js b/rpg-docs/lib/functions/evaluate.js
index a66eed27..83778e8a 100644
--- a/rpg-docs/lib/functions/evaluate.js
+++ b/rpg-docs/lib/functions/evaluate.js
@@ -49,6 +49,12 @@ evaluate = function(charId, string, opts){
             if (list && list.saveDC){
                 return evaluate(charId, list.saveDC);
             }
+        }
+        if (spellListId && sub.toUpperCase() === "ATTACKBONUS") {
+            var list = SpellLists.findOne(spellListId);
+            if (list && list.attackBonus){
+                return evaluate(charId, list.attackBonus);
+            }
         }
 		return sub;
 	});