Merge pull request #4895 from SabreCat/spring2015

Spring Fling 2015

website/public/js/controllers/inventoryCtrl.js

@@ -108,8 +108,8 @@ habitrpg.controller("InventoryCtrl",
 
       var gems = User.user.balance * 4;
 
-      var string = (type == 'weapon') ? window.env.t('weapon') : (type == 'armor') ? window.env.t('armor') : (type == 'head') ? window.env.t('headgear') : (type == 'shield') ? window.env.t('offhand') : (type == 'hatchingPotions') ? window.env.t('hatchingPotion') : (type == 'eggs') ? window.env.t('eggSingular') : (type == 'quests') ? window.env.t('quest') : (item.key == 'Saddle') ? window.env.t('foodSaddleText').toLowerCase() : type; // this is ugly but temporary, once the purchase modal is done this will be removed
-      if (type == 'weapon' || type == 'armor' || type == 'head' || type == 'shield') {
+      var string = (type == 'weapon') ? window.env.t('weapon') : (type == 'armor') ? window.env.t('armor') : (type == 'head') ? window.env.t('headgear') : (type == 'shield') ? window.env.t('offhand') : (type == 'headAccessory') ? window.env.t('headAccessory') : (type == 'hatchingPotions') ? window.env.t('hatchingPotion') : (type == 'eggs') ? window.env.t('eggSingular') : (type == 'quests') ? window.env.t('quest') : (item.key == 'Saddle') ? window.env.t('foodSaddleText').toLowerCase() : type; // this is ugly but temporary, once the purchase modal is done this will be removed
+      if (type == 'weapon' || type == 'armor' || type == 'head' || type == 'shield' || type == 'headAccessory') {
         if (gems < ((item.specialClass == "wizard") && (item.type == "weapon")) + 1) return $rootScope.openModal('buyGems');
         var message = window.env.t('buyThis', {text: string, price: ((item.specialClass == "wizard") && (item.type == "weapon")) + 1, gems: gems})
         if($window.confirm(message))
@@ -228,7 +228,7 @@ habitrpg.controller("InventoryCtrl",
       var questArray = _.toArray(Content.quests);
 
       var filteredArray = _.filter(questArray, function(q){
-        return q.key == "evilsanta" || q.key == "evilsanta2";
+        return q.key == "egg";
       });
 
       return filteredArray;

website/public/js/services/guideServices.js

@@ -187,7 +187,7 @@ function($rootScope, User, $timeout, $state) {
           '<div class="popover-content"></div> ' +
           '<div class="popover-navigation"> ' +
           //'<button class="btn btn-sm btn-default" data-role="end" style="float:none;">' + (step.final ? 'Finish Tour' : 'Hide') + '</button>'+
-          (step.final ? '<button class="btn btn-sm btn-default" data-role="end" style="float:none;">Finish Tour</button>' : '')+
+          ((step.final || k == 'classes') ? '<button class="btn btn-sm btn-default" data-role="end" style="float:none;">Finish Tour</button>' : '')+
           '<div class="btn-group"> ' +
           '<button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> ' +
           '<button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> ' +

website/views/options/inventory/inventory.jade

@@ -28,39 +28,38 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html
   .container-fluid
     .stable.row
       .col-md-2
-        .seasonalshop_closed
+        .seasonalshop_spring2015
       .col-md-10
         .popover.static-popover.fade.right.in
           .arrow
-          h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
+          h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
           .popover-content
-            p!=env.t('seasonalShopClosedText', {linkStart:"<a href='http://habitrpg.wikia.com/wiki/Grand_Galas' target='_blank'>", linkEnd: "</a>"})
-  // br
+            p!=env.t('seasonalShopText')
     .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
     li.customize-menu.inventory-gear
-      menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{candycane:env.t("candycaneSet"), ski:env.t("skiSet"), snowflake:env.t("snowflakeSet"), yeti:env.t("yetiSet")}')
+      menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{springWarrior:env.t("mightyBunnySet"), springMage:env.t("magicMouseSet"), springHealer:env.t("lovingPupSet"), springRogue:env.t("stealthyKittySet")}')
         // The `if true || false` conditional for applying the transparent class is necessary because
         // when a user activates the orb of rebirth, the seasonal items are still in their inventory, but
         // they have each have a value of false. The item can be purchased for gold in the rewards column,
         // not the seasonal shop. This makes that more clear.
         div(ng-repeat='item in ::getSeasonalShopArray(set)' ng-class="{transparent: user.items.gear.owned[item.key] === true ||user.items.gear.owned[item.key] === false}")
           button.customize-option(popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase(item.type,item)', class='shop_{{::item.key}}')
-          .text-center
+          .text-left
             | {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}&nbsp;
             span.Pet_Currency_Gem1x.inline-gems
-      menu.pets-menu(label=env.t('quests'))
+      // menu.pets-menu(label=env.t('quests'))
         div(ng-repeat='quest in ::getSeasonalShopQuests()')
           button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"')
           p
             | {{::quest.value}}&nbsp;
             span.Pet_Currency_Gem1x.inline-gems
-      menu.pets-menu(label=env.t('seasonalItems'))
+      // menu.pets-menu(label=env.t('seasonalItems'))
         div
           button.customize-option(popover='{{::Content.spells.special.snowball.notes()}}', popover-title='{{::Content.spells.special.snowball.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.snowball)', class='inventory_special_snowball')
           p
             | {{::Content.spells.special.snowball.value}}
             span(class='shop_gold')
-        // div
+        div
           button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye')
           p
             | {{Content.spells.special.nye.value}}

website/views/shared/new-stuff.jade

@@ -1,30 +1,53 @@
-h5 3/17/2015 - BUNNY PET QUEST, EGG PURCHASING CHANGE, LAST DAY FOR SURVEY AND ACHIEVEMENT, AND UNEQUIP BUTTONS
+h5 3/20/2015 - SPRING FLING EVENT! LIMITED EDITION OUTFITS, SEASONAL SHOP OPENS, AND SPRING NPCS
   hr
   tr
     td
-      h5 New Pet Quest: Killer Bunny
-      p There's a new quest scroll in the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a>! Deep within Mount Procrastination lies a once-sweet beast grown horrifying with neglect. Can you rally your strength to defeat the Killer Bunny? If so, you'll get some bunny eggs!
-      p.small.muted by Draayder, Gully, and TetoIsGreat
+      h5 Spring Fling!
+      p The Spring Fling is here! From today until April 30th, join Habitica in its sweet celebration.
   tr
     td
-      h5 Egg Purchasing Change
-      p You can now purchase quest eggs from the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a> after defeating the corresponding boss at least once! Previously, you had to defeat the boss at least twice before being able to purchase the eggs.
-      p.small.muted by Blade
+      .promo_springclasses2015.pull-right
+      h5 Limited Edition Class Outfits
+      p From now until April 30th, limited edition outfits are available in the Rewards column. Depending on your class, you can be a Beware Dog, Magician's Bunny, Sneaky Squeaker, or Comforting Kitty! You'd better get productive to earn enough gold before they disappear. Good luck!
+      p.small.muted by Lemoness
   tr
     td
-      h5 Last Day for Survey and Achievement
-      p March 18th is the final day to complete <a href='https://www.surveymonkey.com/s/62RXRF3' target='_blank'>this survey</a> to receive or stack the Helped Habit Grow survey! After it is closed, it will take us several days to award the badges. Thanks so much for sharing your feedback with us!
-      p.small.muted by sugarfiend and SabreCat
+      .promo_springclasses2014.pull-right
+      h5 Seasonal Shop Opens
+      p The <a href='https://habitrpg.com/#/options/inventory/seasonalshop' target='_blank'>Seasonal Shop</a> has opened! It's stocking springtime Seasonal Edition goodies at the moment, including last year's spring outfits. Everything there will be available to purchase during the Spring Fling event each year, but it's only open until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these items again.
+      p.small.muted by Lemoness
   tr
     td
-      h5 Unequip Buttons
-      p It’s now easier to switch your avatar’s costume! You can now unequip all your battle gear, costume pieces, and/or pets from the Equipment page using the new Unequip buttons.
-      p.small.muted by TheHolidayInn
+      .seasonalshop_spring2015.pull-left
+      h5 Spring NPCs
+      p Looks like the NPCs are really getting in to the springtime fun around the site. Who wouldn't? After all, there's plenty more to come!
+      p.small.muted by Lemoness and Shaner
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h5 3/17/2015 - BUNNY PET QUEST, EGG PURCHASING CHANGE, LAST DAY FOR SURVEY AND ACHIEVEMENT, AND UNEQUIP BUTTONS
+    tr
+      td
+        h5 New Pet Quest: Killer Bunny
+        p There's a new quest scroll in the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a>! Deep within Mount Procrastination lies a once-sweet beast grown horrifying with neglect. Can you rally your strength to defeat the Killer Bunny? If so, you'll get some bunny eggs!
+        p.small.muted by Draayder, Gully, and TetoIsGreat
+    tr
+      td
+        h5 Egg Purchasing Change
+        p You can now purchase quest eggs from the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a> after defeating the corresponding boss at least once! Previously, you had to defeat the boss at least twice before being able to purchase the eggs.
+        p.small.muted by Blade
+    tr
+      td
+        h5 Last Day for Survey and Achievement
+        p March 18th is the final day to complete <a href='https://www.surveymonkey.com/s/62RXRF3' target='_blank'>this survey</a> to receive or stack the Helped Habit Grow survey! After it is closed, it will take us several days to award the badges. Thanks so much for sharing your feedback with us!
+        p.small.muted by sugarfiend and SabreCat
+    tr
+      td
+        h5 Unequip Buttons
+        p It’s now easier to switch your avatar’s costume! You can now unequip all your battle gear, costume pieces, and/or pets from the Equipment page using the new Unequip buttons.
+        p.small.muted by TheHolidayInn
   h5 3/10/2015 - SURVEY, TESTIMONIALS GUILD, AND CHAT EXTENSION
     hr
     tr