Merge pull request #1847 from HabitRPG/sabe_tweak_3

Work on standardizing terminology

locales/en/app.json

@@ -353,7 +353,7 @@
 
 "_commentdeathstuff" : "DEATH",
   "deathTitle" : "You Died!",
-  "deathText" : "You've lost your GP, 1 level and 1 gear piece. Be sure to complete your dailies to prevent this from happening again!",
+  "deathText" : "You've lost your Gold, 1 Level, and 1 piece of Equipment. Be sure to complete your Dailies to prevent this from happening again!",
 
 "_commentgems" : "GEMS",
   "gems" : "Gems",
@@ -375,7 +375,7 @@
     "legalTerms" : "Terms",
   "footerCommunity" : "Community",
     "communityBugs" : "Submit Bugs",
-    "communityFeatures" : "Request Feautres",
+    "communityFeatures" : "Request Features",
     "communityExtensions" : "Add-ons / Extensions",
     "communityForum" : "Community Forum",
   "footerSocial" : "Social",

public/js/controllers/tasksCtrl.js

@@ -6,7 +6,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
 
     $scope.score = function(task, direction) {
       if (task.type === "reward" && User.user.stats.gp < task.value){
-        return Notification.text('Not enough GP.');
+        return Notification.text('Not enough Gold!');
       }
       Algos.score(User.user, task, direction);
       User.log({op: "score",data: task, dir: direction});
@@ -123,7 +123,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
         Notification.text("Item purchased.");
         updateStore();
       } else {
-        Notification.text("Not enough GP.");
+        Notification.text("Not enough Gold!");
       }
     };
 

views/options/inventory/inventory.jade

@@ -47,11 +47,11 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html')
                     | Welcome to the Market. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here! If you have unwanted drops, sell them to me.
                   p
                     button.btn.btn-primary(ng-show='selectedEgg', ng-click='sellInventory()')
-                      | Sell {{selectedEgg.name}} for {{selectedEgg.value}} GP
+                      | Sell {{selectedEgg.name}} for {{selectedEgg.value}} Gold
                     button.btn.btn-primary(ng-show='selectedPotion', ng-click='sellInventory()')
-                      | Sell {{selectedPotion.name}} for {{selectedPotion.value}} GP
+                      | Sell {{selectedPotion.name}} for {{selectedPotion.value}} Gold
                     button.btn.btn-primary(ng-show='selectedFood', ng-click='sellInventory()')
-                      | Sell {{selectedFood.name}} for {{selectedFood.value}} GP
+                      | Sell {{selectedFood.name}} for {{selectedFood.value}} Gold
 
         menu.inventory-list(type='list')
           li.customize-menu

views/shared/modals/death.jade

@@ -12,4 +12,4 @@ div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdro
           a.btn.btn-danger.btn-large.notification-action(ng-click='User.revive()') Continue
       .span8
         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!
+          | 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 Health Potion if you falter!

views/shared/profiles/stats.jade

@@ -1,42 +1,42 @@
-h4 Items
+h4 Equipment
 p
   strong {{itemText('weapon',profile.items.weapon)}}
-  | : {{itemStat('weapon',profile.items.weapon)}}% Exp gain
+  | : {{itemStat('weapon',profile.items.weapon)}} Attack
 p
   strong {{itemText('armor',profile.items.armor)}}
-  | : {{itemStat('armor',profile.items.armor)}}% Defense
+  | : {{itemStat('armor',profile.items.armor)}} Protection
 p
   strong {{itemText('head',profile.items.head)}}
-  | : {{itemStat('head',profile.items.head)}}% Defense
+  | : {{itemStat('head',profile.items.head)}} Protection
 p
   strong {{itemText('shield',profile.items.shield)}}
-  | : {{itemStat('shield',profile.items.shield)}}% Defense
+  | : {{itemStat('shield',profile.items.shield)}} Protection
 h4 Stats
 p
-  strong HP
+  strong Health
   | : {{profile.stats.hp | number:0}} / 50
 p
-  strong GP
+  strong Gold
   | : {{profile.stats.gp | number:0}}
 p
-  strong Lvl
+  strong Level
   | : {{profile.stats.lvl}}
 p
-  strong Exp
+  strong Experience
   | : {{profile.stats.exp | number:0}} / {{tnl(profile.stats.lvl)}}
 p
   strong Strength
-  | : {{userStr(profile.stats.lvl)}}
+  | (Level-1)/2: {{userStr(profile.stats.lvl)}}
 p
   strong Defense
-  | : {{userDef(profile.stats.lvl)}}
+  | (Level-1)/2: {{userDef(profile.stats.lvl)}}
 p
   strong Pets Found
   | : {{countExists(profile.items.pets)}}
 hr
 p
-  strong Total Strength
-  | : {{totalStr(profile.stats.lvl, profile.items.weapon)}} %
+  strong Total Experience Boost
+  | (Attack + Strength): {{totalStr(profile.stats.lvl, profile.items.weapon)}} %
 p
-  strong Total Defense
-  | : {{totalDef(profile.stats.lvl, profile.items.armor, profile.items.head, profile.items.shield)}} %
+  strong Total Damage Reduction
+  | (Defense + Protection): {{totalDef(profile.stats.lvl, profile.items.armor, profile.items.head, profile.items.shield)}} %