From e94a3a8aecb6751e2a809a0bb1881afbe9527368 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Sun, 18 Aug 2013 20:29:27 -0500
Subject: [PATCH 1/3] Spice up descriptions of death and rerolls

Fleshes out the text in a couple of modals to be more informative and flavorful. ("Habiteer" is totally a thing, right?)
---
 views/app/modals.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/app/modals.html b/views/app/modals.html
index 254c13dcf0..42c7d7d381 100644
--- a/views/app/modals.html
+++ b/views/app/modals.html
@@ -25,7 +25,7 @@
                     <p><a x-bind=click:revive class="btn btn-danger btn-large notification-action">Continue</a></p>
                 </div>
                 <div class='span8'>
-                    <p>You've lost your GP, 1 level and 1 gear piece. Be sure to complete your dailies to prevent this from happening again!</p>
+                    <p>You've lost a level, all your gold, and a random piece of equipment. Arise, Habiteer, and try again! Curb those negative Habits, be vigilant in completion of Dailies, and hold death at arm's length with a Potion if you falter!</p>
                 </div>
             </div>
 
@@ -35,7 +35,7 @@
     <!-- Re-Roll modal -->
     <app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
         <app:rewards:user-gems />
-        <p>Highly discouraged because red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). However, this becomes necessary after long bouts of bad habits.</p>
+        <p>Purchasing a Re-Roll will reset all your tasks to a neutral (yellow) state, as if you'd just added them. Consider this an option of last resort! Red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). But if all that red fills you with despair, and the beginning of each new day proves lethal, spend the Gems and catch a reprieve!</p>
         <@footer>   
             {#if lt(_user.balance,1)}
             <a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Gems</a><span class='gem-cost'>Not enough Gems</span>
@@ -48,7 +48,7 @@
     <!-- Buy more Gems modal -->
     <app:modals:modal modalId='more-gems-modal' header="Out Of Gems">
         <app:rewards:user-gems />
-        <p>Oops, out of Gems, which are used to buy special items! Habit is an open source project, and can use all the help it can get - buy more Gems to receive this pet, and consider it a donation to the contributors</p>
+        <p>Oops, out of Gems, which are used to buy special items! Habit is an open source project, and can use all the help it can get - buy more Gems to receive this pet, and consider it a donation to the contributors.</p>
         <@footer>
         <a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Gems</a><span class='gem-cost'>Not enough Gems</span>
     </@footer>

From 3299e9cddd3f9ad0ba13c23fb7bf118e39dff07e Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Sun, 18 Aug 2013 20:35:15 -0500
Subject: [PATCH 2/3] Groups.html wording tweaks

Fix English syntax in the Tavern for real this time
Mild wording update for new guild buy-in
---
 views/app/groups.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/app/groups.html b/views/app/groups.html
index 6cd9c97600..a82a39e694 100644
--- a/views/app/groups.html
+++ b/views/app/groups.html
@@ -111,7 +111,7 @@
                             <input type='radio' name='new-group-privacy' checked="{equal('private',_new.group.privacy)}" > Invite Only
                         </label>
                         <input type="submit" class="btn {#unless and(_new.group.privacy,_new.group.name)}disabled{/}" value="Create" /><span class='gem-cost'>4 Gems</span>
-                        <p><small>The Gem cost promotes high quality guilds and is transferred into your guild's bank so you can use as rewards in the upcoming challenges feature!</small></p>
+                        <p><small>The Gem cost promotes high quality guilds, and is transferred into your guild's bank for use as rewards in the upcoming Challenges feature!</small></p>
                     </div>
                 </div>
             {{else}}
@@ -151,7 +151,7 @@
                         </td>
                     </tr></table>
                 </div>
-                <div class='alert alert-info {#unless _user.flags.rest}hidden{/}'>Whilst resting your dailies are saved and aren't affected by day turn-over. Whether you check out tomorrow or in a weeks time you'll continue in the same state as when you checked in.</div>
+                <div class='alert alert-info {#unless _user.flags.rest}hidden{/}'>Whilst resting, your dailies are saved and aren't affected by day turn-over. Whether you check out tomorrow or in a week's time, you'll continue in the same state as when you checked in.</div>
 
                 <div class=well>
                     <h3>Resources</h3>

From 3069c3baf930f4c765f9b3fd0848d6b012c5630f Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Sun, 18 Aug 2013 20:42:21 -0500
Subject: [PATCH 3/3] Move red tasks explanation link inline

Shortens up the message a bit.
---
 views/app/modals.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/modals.html b/views/app/modals.html
index 42c7d7d381..cb2c1ae8b1 100644
--- a/views/app/modals.html
+++ b/views/app/modals.html
@@ -35,7 +35,7 @@
     <!-- Re-Roll modal -->
     <app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
         <app:rewards:user-gems />
-        <p>Purchasing a Re-Roll will reset all your tasks to a neutral (yellow) state, as if you'd just added them. Consider this an option of last resort! Red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). But if all that red fills you with despair, and the beginning of each new day proves lethal, spend the Gems and catch a reprieve!</p>
+        <p>Purchasing a Re-Roll will reset all your tasks to a neutral (yellow) state, as if you'd just added them. Consider this an option of last resort! <a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">Red tasks provide good incentive to improve</a>. But if all that red fills you with despair, and the beginning of each new day proves lethal, spend the Gems and catch a reprieve!</p>
         <@footer>   
             {#if lt(_user.balance,1)}
             <a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Gems</a><span class='gem-cost'>Not enough Gems</span>