Merge pull request #4708 from SabreCat/pet-rocks

Pet rocks

common/dist/scripts/habitrpg-shared.js

@@ -2924,6 +2924,11 @@ api.questEggs = {
     text: t('questEggTRexText'),
     adjective: t('questEggTRexAdjective'),
     canBuy: false
+  },
+  Rock: {
+    text: t('questEggRockText'),
+    adjective: t('questEggRockAdjective'),
+    canBuy: false
   }
 };
 
@@ -4307,6 +4312,36 @@ api.quests = {
       gp: 55,
       exp: 500
     }
+  },
+  rock: {
+    text: t('questRockText'),
+    notes: t('questRockNotes'),
+    completion: t('questRockCompletion'),
+    value: 4,
+    boss: {
+      name: t('questRockBoss'),
+      hp: 400,
+      str: 1.5
+    },
+    drop: {
+      items: [
+        {
+          type: 'eggs',
+          key: 'Rock',
+          text: t('questRockDropRockEgg')
+        }, {
+          type: 'eggs',
+          key: 'Rock',
+          text: t('questRockDropRockEgg')
+        }, {
+          type: 'eggs',
+          key: 'Rock',
+          text: t('questRockDropRockEgg')
+        }
+      ],
+      gp: 31,
+      exp: 200
+    }
   }
 };
 

common/dist/sprites/spritesmith4.css

@@ -1276,7 +1276,7 @@
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Rock-Gold {
+.Mount_Body_Rock-Golden {
   background-image: url(spritesmith4.png);
   background-position: -1604px -636px;
   width: 105px;

common/dist/sprites/spritesmith5.css

@@ -370,7 +370,7 @@
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Gold {
+.Mount_Head_Rock-Golden {
   background-image: url(spritesmith5.png);
   background-position: -106px -832px;
   width: 105px;
@@ -1846,7 +1846,7 @@
   width: 75px;
   height: 93px;
 }
-.Pet-Rock-Gold {
+.Pet-Rock-Golden {
   background-image: url(spritesmith5.png);
   background-position: -1860px -1476px;
   width: 75px;

common/locales/en/content.json

@@ -72,6 +72,9 @@
   "questEggTRexText": "Tyrannosaur",
   "questEggTRexAdjective": "tiny-armed",
 
+  "questEggRockText": "Rock",
+  "questEggRockAdjective": "lively",
+
   "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into a <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
 
   "hatchingPotionBase": "Base",

common/locales/en/questsContent.json

@@ -197,5 +197,11 @@
   "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!",
   "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",
 
-  "questTRexDropTRexEgg": "Tyrannosaur (Egg)"
+  "questTRexDropTRexEgg": "Tyrannosaur (Egg)",
+
+  "questRockText": "Escape the Cave Creature",
+  "questRockNotes": "Crossing Habitica's Meandering Mountains with some friends, you make camp one night in a beautiful cave laced with shining minerals. But when you wake up the next morning, the entrance has disappeared, and the floor of the cave is shifting underneath you.<br><br>\"The mountain's alive!\" shouts your companion @pfeffernusse. \"These aren't crystals - these are teeth!\"<br><br>@Painter de Cluster grabs your hand. \"We'll have to find another way out – stay with me and don't get distracted, or we could be trapped in here forever!\"",
+  "questRockBoss": "Crystal Colossus",
+  "questRockCompletion": "Your diligence has allowed you to find a safe path through the living mountain. Standing in the sunshine, your friend @intune notices something glinting on the ground by the cave’s exit. You stoop to pick it up, and see that it’s a small rock with a vein of gold running through it. Beside it are a number of other rocks with rather peculiar shapes. They almost look like… eggs?",
+  "questRockDropRockEgg": "Rock (Egg)"
 }

common/script/content.coffee

@@ -798,6 +798,7 @@ api.questEggs =
   Owl:              text: t('questEggOwlText'), adjective: t('questEggOwlAdjective'), canBuy: false
   Penguin:          text: t('questEggPenguinText'), adjective: t('questEggPenguinAdjective'), canBuy: false
   TRex:             text: t('questEggTRexText'), adjective: t('questEggTRexAdjective'), canBuy: false
+  Rock:             text: t('questEggRockText'), adjective: t('questEggRockAdjective'), canBuy: false
 
 _.each api.questEggs, (egg,key) ->
   _.defaults egg,
@@ -1511,6 +1512,24 @@ api.quests =
       gp: 55
       exp: 500
 
+  rock:
+    text: t('questRockText')
+    notes: t('questRockNotes')
+    completion: t('questRockCompletion')
+    value: 4
+    boss:
+      name: t('questRockBoss')
+      hp: 400
+      str: 1.5
+    drop:
+      items: [
+        {type: 'eggs', key: 'Rock', text: t('questRockDropRockEgg')}
+        {type: 'eggs', key: 'Rock', text: t('questRockDropRockEgg')}
+        {type: 'eggs', key: 'Rock', text: t('questRockDropRockEgg')}
+      ]
+      gp: 31
+      exp: 200
+
 _.each api.quests, (v,key) ->
   _.defaults v, {key,canBuy:true}
   b = v.boss

website/views/options/inventory/inventory.jade

@@ -183,7 +183,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
                     |  {{::egg.value}} 
                     span.Pet_Currency_Gem1x.inline-gems
                 //- buyable quest eggs
-                each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin'}
+                each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock'}
                   div(ng-show='user.achievements.quests.#{quest} > 1')
                     button.customize-option(popover='{{::Content.eggs.#{egg}.notes()}}', popover-title!=env.t("egg", {eggType: "{{::Content.eggs.#{egg}.text()}}"}), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', ng-click='purchase("eggs", Content.eggs.#{egg})', class='Pet_Egg_#{egg}')
                     p

website/views/shared/new-stuff.jade

@@ -1,21 +1,38 @@
-h5 2/12/2015 - VALENTINE'S DAY AND NEW HAIRSTYLES!
+h5 2/17/2015 - NEW PET QUEST AND COMMUNITY GUIDELINE UPDATES
   hr
   tr
     td
-      h5 Happy Valentine's Day!
-      p Help motivate all of the lovely people in your life by sending them a caring valentine. Valentines can be purchased for 10 gold from the Market. For spreading love and joy throughout the community, both the giver AND the receiver get a coveted "adoring friends" badge. Hooray!
-      p.small.muted by Lemoness and SabreCat
+      .quest_rock.pull-right
+      h5 New Pet Quest: Rocks!
+      p It seemed like a simple hike... until we discovered that the cave was alive! You can get the newest Pet Quest, "Escape the Cave Creature," in the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a>. If you defeat it, you'll get some cuddly pet rocks!
+      p.small.muted by itokro, Pfeffernusse, Painter de Cluster, and intone
   tr
     td
-      h5 New Hairstyles!
-      .promo_updos.pull-right
-      p There are a new set of updo hairstyles available in the <a href='https://habitrpg.com/#/options/profile/avatar' target='_blank'>Avatar Customization page</a>! Have fun customizing your characters.
-      p.small.muted by Crystalphoenix, Mariahm, Painter de Cluster, Leephon, Beffymaroo, Sungabraverday, Lemoness, and Bailey
+      h5 Community Guideline Updates
+      p We've updated the <a href='https://habitrpg.com/static/community-guidelines' target='_blank'>Community Guidelines</a> to include the following:
+      ul
+        li Blade, a new mod, is listed!
+        li Private Messages have been added to the guidelines for Private Spaces.
+        li Spamming is now expressly forbidden.
+        li Sexism has been added to the list of unacceptable behaviors.
+        li Making duplicate accounts to circumvent consequences is now expressly forbidden.
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h5 2/12/2015
+    tr
+      td
+        h5 Happy Valentine's Day!
+        p Help motivate all of the lovely people in your life by sending them a caring valentine. Valentines can be purchased for 10 gold from the Market. For spreading love and joy throughout the community, both the giver AND the receiver get a coveted "adoring friends" badge. Hooray!
+        p.small.muted by Lemoness and SabreCat
+    tr
+      td
+        h5 New Hairstyles!
+        .promo_updos.pull-right
+        p There are a new set of updo hairstyles available in the <a href='https://habitrpg.com/#/options/profile/avatar' target='_blank'>Avatar Customization page</a>! Have fun customizing your characters.
+        p.small.muted by Crystalphoenix, Mariahm, Painter de Cluster, Leephon, Beffymaroo, Sungabraverday, Lemoness, and Bailey
   h5 2/8/2015
     tr
       td