chore(event): end Spring Fling 2016

common/css/index.css

@@ -1,9 +1,9 @@
 /* Comment out for holiday events */
-/* .npc_ian {
+.npc_ian {
   background: url("/common/img/sprites/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-} */
+} 
 
 .quest_burnout {
   background: url("/common/img/sprites/quest_burnout.gif") no-repeat;

common/script/content/gear/sets/special/index.js

@@ -62,9 +62,6 @@ let armor = {
     notes: t('armorSpecialSpringRogueNotes', { per: 15 }),
     value: 90,
     per: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -73,9 +70,6 @@ let armor = {
     notes: t('armorSpecialSpringWarriorNotes', { con: 9 }),
     value: 90,
     con: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -84,9 +78,6 @@ let armor = {
     notes: t('armorSpecialSpringMageNotes', { int: 9 }),
     value: 90,
     int: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -95,9 +86,6 @@ let armor = {
     notes: t('armorSpecialSpringHealerNotes', { con: 15 }),
     value: 90,
     con: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -208,9 +196,6 @@ let armor = {
     notes: t('armorSpecialSpring2015RogueNotes', { per: 15 }),
     value: 90,
     per: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -219,9 +204,6 @@ let armor = {
     notes: t('armorSpecialSpring2015WarriorNotes', { con: 9 }),
     value: 90,
     con: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -230,9 +212,6 @@ let armor = {
     notes: t('armorSpecialSpring2015MageNotes', { int: 9 }),
     value: 90,
     int: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -241,9 +220,6 @@ let armor = {
     notes: t('armorSpecialSpring2015HealerNotes', { con: 15 }),
     value: 90,
     con: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,
@@ -515,9 +491,6 @@ let head = {
     notes: t('headSpecialSpringRogueNotes', { per: 9 }),
     value: 60,
     per: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -526,9 +499,6 @@ let head = {
     notes: t('headSpecialSpringWarriorNotes', { str: 9 }),
     value: 60,
     str: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -537,9 +507,6 @@ let head = {
     notes: t('headSpecialSpringMageNotes', { per: 7 }),
     value: 60,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -548,9 +515,6 @@ let head = {
     notes: t('headSpecialSpringHealerNotes', { int: 7 }),
     value: 60,
     int: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -661,9 +625,6 @@ let head = {
     notes: t('headSpecialSpring2015RogueNotes', { per: 9 }),
     value: 60,
     per: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -672,9 +633,6 @@ let head = {
     notes: t('headSpecialSpring2015WarriorNotes', { str: 9 }),
     value: 60,
     str: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -683,9 +641,6 @@ let head = {
     notes: t('headSpecialSpring2015MageNotes', { per: 7 }),
     value: 60,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -694,9 +649,6 @@ let head = {
     notes: t('headSpecialSpring2015HealerNotes', { int: 7 }),
     value: 60,
     int: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,
@@ -847,9 +799,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringRogueText'),
     notes: t('headAccessorySpecialSpringRogueNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -857,9 +806,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringWarriorText'),
     notes: t('headAccessorySpecialSpringWarriorNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -867,9 +813,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringMageText'),
     notes: t('headAccessorySpecialSpringMageNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -877,9 +820,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringHealerText'),
     notes: t('headAccessorySpecialSpringHealerNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Rogue: {
     event: EVENTS.spring2015,
@@ -887,9 +827,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015RogueText'),
     notes: t('headAccessorySpecialSpring2015RogueNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -897,9 +834,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015WarriorText'),
     notes: t('headAccessorySpecialSpring2015WarriorNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -907,9 +841,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015MageText'),
     notes: t('headAccessorySpecialSpring2015MageNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -917,9 +848,6 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015HealerText'),
     notes: t('headAccessorySpecialSpring2015HealerNotes'),
     value: 20,
-    canBuy: () => {
-      return true;
-    },
   },
   bearEars: {
     gearSet: 'animal',
@@ -1080,9 +1008,6 @@ let shield = {
     notes: t('shieldSpecialSpringRogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -1091,9 +1016,6 @@ let shield = {
     notes: t('shieldSpecialSpringWarriorNotes', { con: 7 }),
     value: 70,
     con: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -1102,9 +1024,6 @@ let shield = {
     notes: t('shieldSpecialSpringHealerNotes', { con: 9 }),
     value: 70,
     con: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -1137,9 +1056,6 @@ let shield = {
     notes: t('shieldSpecialFallRogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   fallWarrior: {
     event: EVENTS.fall,
@@ -1148,9 +1064,6 @@ let shield = {
     notes: t('shieldSpecialFallWarriorNotes', { con: 7 }),
     value: 70,
     con: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   fallHealer: {
     event: EVENTS.fall,
@@ -1159,9 +1072,6 @@ let shield = {
     notes: t('shieldSpecialFallHealerNotes', { con: 9 }),
     value: 70,
     con: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Rogue: {
     event: EVENTS.winter2015,
@@ -1194,9 +1104,6 @@ let shield = {
     notes: t('shieldSpecialSpring2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -1205,9 +1112,6 @@ let shield = {
     notes: t('shieldSpecialSpring2015WarriorNotes', { con: 7 }),
     value: 70,
     con: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -1216,9 +1120,6 @@ let shield = {
     notes: t('shieldSpecialSpring2015HealerNotes', { con: 9 }),
     value: 70,
     con: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,
@@ -1227,9 +1128,6 @@ let shield = {
     notes: t('shieldSpecialSummer2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   summer2015Warrior: {
     event: EVENTS.summer2015,
@@ -1375,9 +1273,6 @@ let weapon = {
     notes: t('weaponSpecialSpringRogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -1386,9 +1281,6 @@ let weapon = {
     notes: t('weaponSpecialSpringWarriorNotes', { str: 15 }),
     value: 90,
     str: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -1399,9 +1291,6 @@ let weapon = {
     value: 160,
     int: 15,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -1410,9 +1299,6 @@ let weapon = {
     notes: t('weaponSpecialSpringHealerNotes', { int: 9 }),
     value: 90,
     int: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -1523,9 +1409,6 @@ let weapon = {
     notes: t('weaponSpecialSpring2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -1534,9 +1417,6 @@ let weapon = {
     notes: t('weaponSpecialSpring2015WarriorNotes', { str: 15 }),
     value: 90,
     str: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -1547,9 +1427,6 @@ let weapon = {
     value: 160,
     int: 15,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -1558,9 +1435,6 @@ let weapon = {
     notes: t('weaponSpecialSpring2015HealerNotes', { int: 9 }),
     value: 90,
     int: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,

website/views/options/inventory/seasonal-shop.jade

@@ -1,16 +1,16 @@
 .container-fluid
   .stable.row: .col-xs-12
-    div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered
+    div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_closed'}").pull-left-sm.col-centered
     .popover.static-popover.fade.right.in.pull-left-sm.col-centered
       .arrow.hidden-xs
-      h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
+      h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
       .popover-content
-        p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopText')
-        p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopText')
+        p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText')
+        p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText')
 
-  .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
+  // .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
 
-  li.customize-menu.inventory-gear
+  // li.customize-menu.inventory-gear
     menu.pets-menu(label=env.t('quests'))
       div(ng-repeat='quest in ::getSeasonalShopQuests()')
         button.customize-option(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}}"'
@@ -30,7 +30,7 @@
           ng-click='purchase("special", Content.spells.special.shinySeed)')
         p {{::Content.spells.special.shinySeed.value}}
           span(class='shop_gold')
-      // div
+      div
         button.customize-option(class='Pet_HatchingPotion_Peppermint',
           popover='{{::Content.hatchingPotions.Peppermint.notes()}}',
           popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions.Peppermint.text()}}"}),
@@ -39,7 +39,7 @@
           ng-click='purchase("hatchingPotions", Content.hatchingPotions.Peppermint)')
         p {{::Content.hatchingPotions.Peppermint.value}}&nbsp;
           span.Pet_Currency_Gem1x.inline-gems
-      // 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}}
           span(class='shop_gold')

website/views/options/profile.jade

@@ -90,7 +90,7 @@ mixin customizeProfile(mobile)
               each color in ['pblue','pgreen','porange','ppink','ppurple','pyellow']
                 button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")', ng-class='{selectableInventory: user.preferences.hair.color == "#{color}"}')
           +buyPref('hair.color', ['rainbow','yellow','green','purple','blue','TRUred'], 'rainbowColors')
-          +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors')
+          +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors', 'disabled')
           +buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors', 'disabled')
           +buyPref('hair.color', ['aurora','festive','hollygreen','peppermint','snowy','winterstar'], 'winteryColors', 'disabled')
 
@@ -157,7 +157,7 @@ mixin customizeProfile(mobile)
           +buyPref('skin', ['bear','cactus','fox','lion','panda','pig','tiger','wolf'], 'animalSkins')
 
           // Seasonal event skins. Note that Spooky Skins are a legacy set and should always be disabled for purchase
-          +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins')
+          +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins', 'disabled')
           +buyPref('skin', ['monster','pumpkin','skeleton','zombie','ghost','shadow'], 'spookySkins', 'disabled')
           +buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins', 'disabled')
           +buyPref('skin', ['clownfish','deepocean','merblue','mergold','mergreen','merruby','shark','tropicalwater'], 'splashySkins', 'disabled')