Merge pull request #5692 from HabitRPG/sabrecat/habitica-day

Habitica Day

common/dist/sprites/spritesmith1.css

@@ -4966,3 +4966,15 @@
   width: 60px;
   height: 60px;
 }
+.hair_base_7_red {
+  background-image: url(spritesmith1.png);
+  background-position: -1820px -1274px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_7_red {
+  background-image: url(spritesmith1.png);
+  background-position: -1845px -1289px;
+  width: 60px;
+  height: 60px;
+}

common/locales/en/generic.json

@@ -64,6 +64,9 @@
     "habitBirthday": "HabitRPG Birthday Bash",
     "habitBirthdayText": "Celebrated the HabitRPG Birthday Bash!",
     "habitBirthdayPluralText": "Celebrated <%= number %> HabitRPG Birthday Bashes!",
+    "habiticaDay": "Habitica Naming Day",
+    "habiticaDaySingularText": "Celebrated Habitica's Naming Day! Thanks for being a fantastic user.",
+    "habiticaDayPluralText": "Celebrated <%= number %> Naming Days! Thanks for being a fantastic user.",
     "achievementDilatory": "Savior of Dilatory",
     "achievementDilatoryText": "Helped defeat the Dread Drag'on of Dilatory during the 2014 Summer Splash Event!",
     "costumeContest": "2014 Costume Contest",

common/locales/en/pets.json

@@ -9,11 +9,13 @@
     "rareMounts": "Rare Mounts",
     "etherealLion": "Ethereal Lion",
     "veteranWolf": "Veteran Wolf",
+    "veteranTiger": "Veteran Tiger",
     "cerberusPup": "Cerberus Pup",
     "hydra": "Hydra",
     "mantisShrimp": "Mantis Shrimp",
     "mammoth": "Woolly Mammoth",
     "orca": "Orca",
+    "royalPurpleGryphon": "Royal Purple Gryphon",
     "rarePetPop1": "Click the gold paw to learn more about how you can obtain this rare pet through contributing to HabitRPG!",
     "rarePetPop2": "How to Get this Pet!",
     "potion": "<%= potionType %> Potion",

common/script/content.coffee

@@ -1029,14 +1029,16 @@ api.specialPets =
   'MantisShrimp-Base':  'mantisShrimp'
   'JackOLantern-Base':  'jackolantern'
   'Mammoth-Base':       'mammoth'
+  'Tiger-Veteran':      'veteranTiger'
 
 api.specialMounts =
-  'BearCub-Polar':      'polarBear'
-  'LionCub-Ethereal':   'etherealLion'
-  'MantisShrimp-Base':  'mantisShrimp'
-  'Turkey-Base':        'turkey'
-  'Mammoth-Base':       'mammoth'
-  'Orca-Base':          'orca'
+  'BearCub-Polar':       'polarBear'
+  'LionCub-Ethereal':    'etherealLion'
+  'MantisShrimp-Base':   'mantisShrimp'
+  'Turkey-Base':         'turkey'
+  'Mammoth-Base':        'mammoth'
+  'Orca-Base':           'orca'
+  'Gryphon-RoyalPurple': 'royalPurpleGryphon'
 
 api.hatchingPotions =
   Base:             value: 2, text: t('hatchingPotionBase')

migrations/20150731_purple_gryphon.js

@@ -0,0 +1,5 @@
+db.users.update(
+  {},
+  {$set:{'items.mounts.Gryphon-RoyalPurple':true}},
+  {multi:true}
+);

migrations/20150731_veteran_tiger.js

@@ -0,0 +1,5 @@
+db.users.update(
+  {},
+  {$set:{'items.pets.Tiger-Veteran':5}},
+  {multi:true}
+);

migrations/habitica_day.js

@@ -0,0 +1,5 @@
+db.users.update(
+  {},
+  {$inc:{'achievements.habiticaDays':1}},
+  {multi:1}
+);

website/src/models/user.js

@@ -32,9 +32,7 @@ var UserSchema = new Schema({
   _v: { type: Number, 'default': 0 },
   achievements: {
     originalUser: Boolean,
-    helpedHabit: Boolean, //TODO: Deprecate this. Superseded by habitSurveys
     habitSurveys: Number,
-    ultimateGear: Boolean, //TODO: Deprecate this. Superseded by ultimateGearSets
     ultimateGearSets: Schema.Types.Mixed,
     beastMaster: Boolean,
     beastMasterCount: Number,
@@ -53,11 +51,11 @@ var UserSchema = new Schema({
     rebirths: Number,
     rebirthLevel: Number,
     perfect: Number,
-    habitBirthday: Boolean, // TODO: Deprecate this. Superseded by habitBirthdays
     habitBirthdays: Number,
     valentine: Number,
     costumeContest: Boolean,
-    nye: Number
+    nye: Number,
+    habiticaDays: Number
   },
   auth: {
     blocked: Boolean,

website/views/shared/new-stuff.jade

@@ -1,16 +1,42 @@
-h5 7/24/2015 - JULY SUBSCRIBER ITEM SET: RAD SURFER!
+h5 7/29/2015 - HABITICA NAMING DAY ON JULY 31ST!
   hr
   tr
     td
-      .promo_mystery_201507.pull-right
-      h5 July Subscriber Items Revealed!
-      p The July Subscriber Items have been revealed: the Rad Surfer Item Set! All July subscribers will receive the Rad Surfboard and the Rad Sunglasses. You still have six days to <a href='/#/options/settings/subscription'>subscribe</a> and receive the item set, along with the ability to buy Gems with Gold! Thank you so much for your support - we really do rely on you to keep HabitRPG free to use and running smoothly.
-      p.small.muted by Lemoness
+      h5 Habitica Naming Day is July 31st!
+      p We are pleased to announce that the final day of the Summer Splash Festival, July 31st, will be the inaugural Habitica Naming Day! On this day, HabitRPG will officially become Habitica. Our old name was unfortunately very confusing to people ("HabitZPR? HabitGRG?"), so we've decided to name our app and website after the land of Habitica, where all these adventures take place.
+      br
+      p We will be celebrating with some fun surprises, so get excited!
+  tr
+    td
+      h5 What will change?
+      p In almost all cases, your accounts will still stay exactly the same and work normally! Only some of the names and references will be different. Here is a list of the changes:
+      br
+      ul
+        li The URL will be changed from habitrpg.com to habitica.com for all links, and habitrpg.com will automatically redirect to habitica.com.
+        li All in-game references to HabitRPG will become references to Habitica.
+        li The HabitRPG chest logo will change to the new Habitica logo.
+        li Our affiliated sites, such as the Wiki, Trello, Twitter, etc. will use the new Habitica name.
+        li We don't anticipate any issues with third-party tools, but we will be actively working with developers to help them make any necessary updates. You can help us by reporting broken third-party tools at <a href='https://github.com/HabitRPG/habitrpg/issues/2760' target='_blank'>Help -&gt; Report a Bug</a>.
+  tr
+    td
+      h5 When will it change?
+      p Changing our name is a pretty enormous task, so it won't all happen in an instant! Some changes may start switching over slightly before the 31st, and some may take slightly longer, but the majority of the changes and all of the celebration will take place on July 31st. Thank you for being patient with us!
+  tr
+    td
+      h5 More questions?
+      p If you have any more questions, drop by <a href='/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a'>the Newbies Guild</a> and we'll be happy to answer them!
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h5 7/24/2015 - JULY SUBSCRIBER ITEM SET: RAD SURFER!
+    tr
+      td
+        .promo_mystery_201507.pull-right
+        h5 July Subscriber Items Revealed!
+        p The July Subscriber Items have been revealed: the Rad Surfer Item Set! All July subscribers will receive the Rad Surfboard and the Rad Sunglasses. You still have six days to <a href='/#/options/settings/subscription'>subscribe</a> and receive the item set, along with the ability to buy Gems with Gold! Thank you so much for your support - we really do rely on you to keep HabitRPG free to use and running smoothly.
+        p.small.muted by Lemoness
   h5 7/22/2015 - NEW iOS UPDATE, INCLUDING FACEBOOK LOGIN!
     tr
       td

website/views/shared/profiles/achievements.jade

@@ -138,7 +138,7 @@ div(ng-if='::profile.achievements.originalUser')
     h5=env.t('originalUser')
     small!=env.t('originalUserText')
   hr
-  
+
 div(ng-if='::profile.achievements.challenges.length || user._id == profile._id')
   // This is a very strange icon to use. revisit
   .achievement.achievement-karaoke(ng-if='::profile.achievements.challenges.length')
@@ -179,7 +179,7 @@ div(ng-if='::profile.achievements.shinySeed')
   small
     =env.t('agriculturalFriendsText', {seeds: "{{::profile.achievements.shinySeed}}"})
   hr
-  
+
 div(ng-if='::profile.achievements.seafoam')
   .achievement.achievement-seafoam
   h5=env.t('aquaticFriends')
@@ -187,6 +187,15 @@ div(ng-if='::profile.achievements.seafoam')
     =env.t('aquaticFriendsText', {seafoam: "{{::profile.achievements.seafoam}}"})
   hr
 
+div(ng-if='::profile.achievements.habiticaDays')
+  .achievement.achievement-habiticaDay
+  h5=env.t('habiticaDay')
+  small(ng-if='::profile.achievements.habiticaDays == 1')
+    =env.t('habiticaDaySingularText')
+  small(ng-if='::profile.achievements.habiticaDays > 1')
+    =env.t('habiticaDayPluralText', {number: "{{::profile.achievements.habiticaDays}}"})
+  hr
+
 div(ng-if='::profile.achievements.habitBirthdays')
   .achievement.achievement-habitBirthday
   h5=env.t('habitBirthday')