From adacd25ba648095bdcdac3ea61d479b94d7ed200 Mon Sep 17 00:00:00 2001
From: Alice Harris <alice.harris@oldgods.net>
Date: Sun, 13 Jul 2014 16:28:42 +1000
Subject: [PATCH] put content.coffee and habitrpg-shared.js back the way
 they're meant to be

---
 dist/habitrpg-shared.js | 10 +++++++---
 script/content.coffee   |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js
index be4b76b99e..6a6fe1610b 100644
--- a/dist/habitrpg-shared.js
+++ b/dist/habitrpg-shared.js
@@ -11017,7 +11017,9 @@ api.spells = {
         target.value += diminishingReturns(bonus * .02, 4);
         bonus *= Math.ceil((target.value < 0 ? 1 : target.value + 1) * .075);
         user.stats.exp += diminishingReturns(bonus, 75);
-        return user.party.quest.progress.up += diminishingReturns(bonus * .1, 50, 30);
+        if (user.party.quest.key) {
+          return user.party.quest.progress.up += diminishingReturns(bonus * .1, 50, 30);
+        }
       }
     },
     mpheal: {
@@ -11073,7 +11075,9 @@ api.spells = {
       notes: t('spellWarriorSmashNotes'),
       cast: function(user, target) {
         target.value += 2.5 * (user._statsComputed.str / (user._statsComputed.str + 50)) * user.fns.crit('con');
-        return user.party.quest.progress.up += Math.ceil(user._statsComputed.str * .2);
+        if (user.party.quest.key) {
+          return user.party.quest.progress.up += Math.ceil(user._statsComputed.str * .2);
+        }
       }
     },
     defensiveStance: {
@@ -14216,4 +14220,4 @@ api.wrap = function(user, main) {
 
 
 }).call(this,require("/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
-},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
+},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
\ No newline at end of file
diff --git a/script/content.coffee b/script/content.coffee
index 766e11c1bc..c40663f606 100644
--- a/script/content.coffee
+++ b/script/content.coffee
@@ -395,7 +395,7 @@ api.spells =
         bonus *= Math.ceil ((if target.value < 0 then 1 else target.value+1) *.075)
         #console.log {bonus, expBonus:bonus,upBonus:bonus*.1}
         user.stats.exp += diminishingReturns(bonus,75)
-        user.party.quest.progress.up += diminishingReturns(bonus*.1,50,30)
+        user.party.quest.progress.up += diminishingReturns(bonus*.1,50,30) if user.party.quest.key
 
     mpheal:
       text: t('spellWizardMPHealText')
@@ -438,7 +438,7 @@ api.spells =
       notes: t('spellWarriorSmashNotes')
       cast: (user, target) ->
         target.value += 2.5 * (user._statsComputed.str / (user._statsComputed.str + 50)) * user.fns.crit('con')
-        user.party.quest.progress.up += Math.ceil(user._statsComputed.str * .2)
+        user.party.quest.progress.up += Math.ceil(user._statsComputed.str * .2) if user.party.quest.key
     defensiveStance:
       text: t('spellWarriorDefensiveStanceText')
       mana: 25