Merge pull request #5036 from SabreCat/slime

Slime pet

common/dist/sprites/spritesmith3.css

@@ -6,7 +6,7 @@
 }
 .shop_armor_special_birthday2015 {
   background-image: url(spritesmith3.png);
-  background-position: -1107px -1416px;
+  background-position: -1148px -1416px;
   width: 40px;
   height: 40px;
 }
@@ -1104,13 +1104,13 @@
 }
 .shop_shield_special_spring2015Rogue {
   background-image: url(spritesmith3.png);
-  background-position: -1325px -1274px;
+  background-position: -1107px -1416px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_spring2015Warrior {
   background-image: url(spritesmith3.png);
-  background-position: -1148px -1416px;
+  background-position: -1325px -1274px;
   width: 40px;
   height: 40px;
 }
@@ -2218,3 +2218,9 @@
   width: 40px;
   height: 40px;
 }
+.shop_head_healer_3 {
+  background-image: url(spritesmith3.png);
+  background-position: -1457px -1353px;
+  width: 40px;
+  height: 40px;
+}

common/locales/en/content.json

@@ -79,6 +79,9 @@
   "questEggBunnyText": "Bunny",
   "questEggBunnyAdjective": "snuggly",
 
+  "questEggSlimeText": "Marshmallow Slime",
+  "questEggSlimeAdjective": "sweet",
+
   "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

@@ -223,6 +223,13 @@
   "questBunnyBoss": "Killer Bunny",
   "questBunnyCompletion": "With one final blow the killer rabbit sinks to the ground. A sparkly mist rises from her body as she shrinks down into a tiny bunny... nothing like the cruel beast you faced a moment before. Her nose twitches adorably and she hops away, leaving some eggs behind. @Gully laughs. \"Mount Procrastination has a way of making even the smallest challenges seem insurmountable. Let's gather these eggs and head for home.\"",
   "questBunnyDropBunnyEgg": "Bunny (Egg)",
-  "questBunnyUnlockText": "Unlocks purchasable bunny eggs in the Market"
+  "questBunnyUnlockText": "Unlocks purchasable bunny eggs in the Market",
+
+  "questSlimeText": "The Jelly Regent",
+  "questSlimeNotes": "As you work on your tasks, you notice you are moving slower and slower. \"It's like walking through molasses,\" @Leephon grumbles. \"No, like walking through jelly!\" @starsystemic says. \"That slimy Jelly Regent has slathered his stuff all over Habitica. It's gumming up the works. Everybody is slowing down.\" You look around. The streets are slowly filling with clear, colorful ooze, and Habiticans are struggling to get anything done. As others flee the area, you grab a mop and prepare for battle!",
+  "questSlimeBoss": "Jelly Regent",
+  "questSlimeCompletion": "With a final jab, you trap the Jelly Regent in an over-sized donut, rushed in by @Overomega, @LordDarkly, and @Shaner, the quick-thinking leaders of the pastry club. As everyone is patting you on the back, you feel someone slip something into your pocket. It’s the reward for your sweet success: three Marshmallow Slime eggs.",
+  "questSlimeDropSlimeEgg": "Marshmallow Slime (Egg)",
+  "questSlimeUnlockText": "Unlocks purchasable slime eggs in the Market"
 
 }

common/script/content.coffee

@@ -866,6 +866,7 @@ api.questEggs =
   TRex:             text: t('questEggTRexText'), adjective: t('questEggTRexAdjective'), canBuy: false
   Rock:             text: t('questEggRockText'), adjective: t('questEggRockAdjective'), canBuy: false
   Bunny:            text: t('questEggBunnyText'), adjective: t('questEggBunnyAdjective'), canBuy: false
+  Slime:            text: t('questEggSlimeText'), adjective: t('questEggSlimeAdjective'), canBuy: false
 
 _.each api.questEggs, (egg,key) ->
   _.defaults egg,
@@ -1628,6 +1629,25 @@ api.quests =
       exp: 125
       unlock: t('questBunnyUnlockText')
 
+  slime:
+    text: t('questSlimeText')
+    notes: t('questSlimeNotes')
+    completion: t('questSlimeCompletion')
+    value: 4
+    boss:
+      name: t('questSlimeBoss')
+      hp: 400
+      str: 1.5
+    drop:
+      items: [
+        {type: 'eggs', key: 'Slime', text: t('questSlimeDropSlimeEgg')}
+        {type: 'eggs', key: 'Slime', text: t('questSlimeDropSlimeEgg')}
+        {type: 'eggs', key: 'Slime', text: t('questSlimeDropSlimeEgg')}
+      ]
+      gp: 31
+      exp: 200
+      unlock: t('questSlimeUnlockText')
+
 _.each api.quests, (v,key) ->
   _.defaults v, {key,canBuy:true}
   b = v.boss

website/views/options/inventory/inventory.jade

@@ -194,7 +194,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',rock:'Rock',bunny:'Bunny'}
+                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',bunny:'Bunny',slime:'Slime'}
                   div(ng-show='user.achievements.quests.#{quest} > 0')
                     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,16 +1,35 @@
-h5 4/7/2015 - APRIL BACKGROUNDS REVEALED
+h5 4/15/2015 - MARSHMALLOW SLIMES, KEY TO THE KENNELS CHANGE, AND CHALLENGE IMPROVEMENTS
   hr
   tr
     td
-      .background_cherry_trees.pull-right
-      h5 April Backgrounds
-      p There are three new avatar backgrounds in the <a href='https://habitrpg.com/#/options/profile/backgrounds' target='_blank'>Background Shop</a>! Now your avatar can picnic in a Flowering Meadow, nibble the scenery of Gumdrop Land, or admire the Cherry Trees!
-      p.small.muted by Rattify, Painter de Cluster, and kmcallah
+      .Pet-Slime-Base.pull-right
+      h5 Marshmallow Slime Pet Quest!
+      p There is a new Pet Quest available in the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a>: The Jelly Regent! Gooey slime is gumming up the works, and Habiticans are having a tough time finishing their tasks. Can you mop the floor with the Jelly Regent? If so, you'll get some adorable Marshmallow Slime pets!
+      p.small.muted art by Starsystemic, Leephon, LordDarkly, Overomega, and Shaner
+      p.small.muted writing by Bethany Woll and Theothermeme
+  tr
+    td
+      h5 Key to the Kennels Free with Triad Bingo
+      .pet_key.pull-right
+      p The Key to the Kennels is now free if you have the Triad Bingo achievement and if you choose to release your pets and mounts together! Rejoice, collectors! Note that the Key will not be free if you release only pets or only mounts.
+      p.small.muted by gisikw
+  tr
+    td
+      h5 Challenge Improvements
+      p Now Challenge links take you directly to that Challenge, instead of the top of the list, and when you edit a Challenge, the name is automatically updated!
+      p.small.muted by gisikw, chrisdotcode, and TheHollidayInn
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h5 4/7/2015 - APRIL BACKGROUNDS REVEALED
+    tr
+      td
+        .background_cherry_trees.pull-right
+        h5 April Backgrounds
+        p There are three new avatar backgrounds in the <a href='https://habitrpg.com/#/options/profile/backgrounds' target='_blank'>Background Shop</a>! Now your avatar can picnic in a Flowering Meadow, nibble the scenery of Gumdrop Land, or admire the Cherry Trees!
+        p.small.muted by Rattify, Painter de Cluster, and kmcallah
   h5 4/2/2015 - MARCH AND APRIL ITEM SETS; SHINY SEEDS; MESSAGE CHALLENGE CREATORS; ITEM DROP ICONS
     tr
       td