From 6f3d958a211ce10095cbd5cd160f7702b2f6f0bf Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 8 Feb 2013 16:08:45 -0500
Subject: [PATCH] add in missing first shield (@Pandoro I just got what you did
 there, clever)

---
 src/app/items.coffee   | 17 +++++++++--------
 src/app/scoring.coffee |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/app/items.coffee b/src/app/items.coffee
index 5b9a69eb74..1c69806f57 100644
--- a/src/app/items.coffee
+++ b/src/app/items.coffee
@@ -2,7 +2,7 @@ _ = require 'underscore'
 
 items = module.exports.items =
   weapon: [
-    {index: 0, text: "Training Sword", classes: "weapon_0", notes:'Training weapon.', modifier: 0.01, value:0}
+    {index: 0, text: "Training Sword", classes: "weapon_0", notes:'Training weapon.', modifier: 0.00, value:0}
     {index: 1, text: "Sword", classes:'weapon_1', notes:'Increases experience gain by 3%.', modifier: 0.03, value:20}
     {index: 2, text: "Axe", classes:'weapon_2', notes:'Increases experience gain by 6%.', modifier: 0.06, value:30}
     {index: 3, text: "Morningstar", classes:'weapon_3', notes:'Increases experience gain by 9%.', modifier: 0.09, value:45}
@@ -11,7 +11,7 @@ items = module.exports.items =
     {index: 6, text: "Golden Sword", classes:'weapon_6', notes:'Increases experience gain by 18%.', modifier: 0.18, value:120}
   ]
   armor: [
-    {index: 0, text: "Cloth Armor", classes: 'armor_0', notes:'Training armor.', modifier: 0.01, value:0}
+    {index: 0, text: "Cloth Armor", classes: 'armor_0', notes:'Training armor.', modifier: 0.00, value:0}
     {index: 1, text: "Leather Armor", classes: 'armor_1', notes:'Decreases HP loss by 2%.', modifier: 0.02, value:30}
     {index: 2, text: "Chain Mail", classes: 'armor_2', notes:'Decreases HP loss by 3%.', modifier: 0.03, value:45}
     {index: 3, text: "Plate Mail", classes: 'armor_3', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:65}
@@ -19,7 +19,7 @@ items = module.exports.items =
     {index: 5, text: "Golden Armor", classes: 'armor_5', notes:'Decreases HP loss by 6%.', modifier: 0.06, value:120}
   ]
   head: [
-    {index: 0, text: "No Helm", classes: 'head_0', notes:'Training helm.', modifier: 0.01, value:0}
+    {index: 0, text: "No Helm", classes: 'head_0', notes:'Training helm.', modifier: 0.00, value:0}
     {index: 1, text: "Leather Helm", classes: 'head_1', notes:'Decreases HP loss by 2%.', modifier: 0.02, value:30}
     {index: 2, text: "Chain Coif", classes: 'head_2', notes:'Decreases HP loss by 3%.', modifier: 0.03, value:45}
     {index: 3, text: "Plate Helm", classes: 'head_3', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:65}
@@ -27,11 +27,12 @@ items = module.exports.items =
     {index: 5, text: "Golden Helm", classes: 'head_5', notes:'Decreases HP loss by 6%.', modifier: 0.06, value:120}
   ]
   shield: [
-    {index: 0, text: "Wooden Shield", classes: 'shield_0', notes:'Training shield.', modifier: 0.01, value:0}
-    {index: 1, text: "Buckler", classes: 'shield_1', notes:'Decreases HP loss by 2%.', modifier: 0.02, value:30}
-    {index: 2, text: "Enforced Shield", classes: 'shield_2', notes:'Decreases HP loss by 3%.', modifier: 0.3, value:45}
-    {index: 3, text: "Red Shield", classes: 'shield_3', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:65}
-    {index: 4, text: "Golden Shield", classes: 'shield_4', notes:'Decreases HP loss by 5%.', modifier: 0.05, value:90}
+    {index: 0, text: "No Shield", classes: 'shield_0', notes:'No Shield.', modifier: 0.00, value:0}
+    {index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Training shield.', modifier: 0.01, value:30}
+    {index: 2, text: "Buckler", classes: 'shield_2', notes:'Decreases HP loss by 2%.', modifier: 0.02, value:45}
+    {index: 3, text: "Enforced Shield", classes: 'shield_3', notes:'Decreases HP loss by 3%.', modifier: 0.3, value:65}
+    {index: 4, text: "Red Shield", classes: 'shield_4', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:90}
+    {index: 5, text: "Golden Shield", classes: 'shield_5', notes:'Decreases HP loss by 5%.', modifier: 0.05, value:120}
   ]
   potion: {type: 'potion', text: "Potion", notes: "Recover 15 HP", value: 25, classes: 'potion'}
   reroll: {type: 'reroll', text: "Re-Roll", classes: 'reroll', notes: "Resets your tasks. When you're struggling and everything's red, use for a clean slate.", value:0 }
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 7b2e24b149..5ac6cfbf59 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -25,6 +25,7 @@ expModifier = (value, modifiers = {}) ->
   dmg = items.items.weapon[weapon].modifier # each new weapon increases exp gain
   dmg += (lvl-1) * MODIFIER # same for lvls
   modified = value + (value * dmg)
+  debugger
   return modified
 
 ### 
@@ -39,6 +40,7 @@ hpModifier = (value, modifiers = {}) ->
   lvl = modifiers.lvl || user.get('stats.lvl')
   ac = items.items.armor[armor].modifier + items.items.head[head].modifier + items.items.shield[shield].modifier # each new armor decreases HP loss
   ac += (lvl-1) * MODIFIER # same for lvls
+  debugger
   modified = value - (value * ac)
   return modified