chore(event): End Fall Festival

common/css/index.css

@@ -1,9 +1,9 @@
-/* Comment out for holiday events
+/* Comment out for holiday events */
 .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/index.coffee

@@ -1181,13 +1181,13 @@ api.dropHatchingPotions =
   Golden:           value: 5, text: t('hatchingPotionGolden')
 
 api.premiumHatchingPotions =
-  Spooky:           value: 2, text: t('hatchingPotionSpooky'), addlNotes: t('premiumPotionAddlNotes'), premium: true, limited: true
+  Spooky:           value: 2, text: t('hatchingPotionSpooky'), limited: true, canBuy: (()->false)
 
 _.each api.dropHatchingPotions, (pot,key) ->
   _.defaults pot, {key, value: 2, notes: t('hatchingPotionNotes', {potText: pot.text}), premium: false, limited: false, canBuy: (()->true)}
 
 _.each api.premiumHatchingPotions, (pot,key) ->
-  _.defaults pot, {key, value: 2, notes: t('hatchingPotionNotes', {potText: pot.text}), premium: true, limited: false, canBuy: (()->true)}
+  _.defaults pot, {key, value: 2, notes: t('hatchingPotionNotes', {potText: pot.text}), addlNotes: t('premiumPotionAddlNotes'), premium: true, limited: false, canBuy: (()->true)}
 
 api.hatchingPotions = {}
 _.merge(api.hatchingPotions, api.dropHatchingPotions)
@@ -1220,16 +1220,16 @@ api.questMounts = _.transform api.questEggs, (m, egg) ->
 
 api.food =
   # Base
-  Meat:                 text: t('foodMeat'), target: 'Base', article: ''
-  Milk:                 text: t('foodMilk'), target: 'White', article: ''
-  Potatoe:              text: t('foodPotatoe'), target: 'Desert', article: 'a '
-  Strawberry:           text: t('foodStrawberry'), target: 'Red', article: 'a '
-  Chocolate:            text: t('foodChocolate'), target: 'Shade', article: ''
-  Fish:                 text: t('foodFish'), target: 'Skeleton', article: 'a '
-  RottenMeat:           text: t('foodRottenMeat'), target: 'Zombie', article: ''
-  CottonCandyPink:      text: t('foodCottonCandyPink'), target: 'CottonCandyPink', article: ''
-  CottonCandyBlue:      text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', article: ''
-  Honey:                text: t('foodHoney'), target: 'Golden', article: ''
+  Meat:                 text: t('foodMeat'),            canBuy:(()->true), canDrop:true, target: 'Base', article: ''
+  Milk:                 text: t('foodMilk'),            canBuy:(()->true), canDrop:true, target: 'White', article: ''
+  Potatoe:              text: t('foodPotatoe'),         canBuy:(()->true), canDrop:true, target: 'Desert', article: 'a '
+  Strawberry:           text: t('foodStrawberry'),      canBuy:(()->true), canDrop:true, target: 'Red', article: 'a '
+  Chocolate:            text: t('foodChocolate'),       canBuy:(()->true), canDrop:true, target: 'Shade', article: ''
+  Fish:                 text: t('foodFish'),            canBuy:(()->true), canDrop:true, target: 'Skeleton', article: 'a '
+  RottenMeat:           text: t('foodRottenMeat'),      canBuy:(()->true), canDrop:true, target: 'Zombie', article: ''
+  CottonCandyPink:      text: t('foodCottonCandyPink'), canBuy:(()->true), canDrop:true, target: 'CottonCandyPink', article: ''
+  CottonCandyBlue:      text: t('foodCottonCandyBlue'), canBuy:(()->true), canDrop:true, target: 'CottonCandyBlue', article: ''
+  Honey:                text: t('foodHoney'),           canBuy:(()->true), canDrop:true, target: 'Golden', article: ''
 
   Saddle:               canBuy:(()->true), text: t('foodSaddleText'), value: 5, notes: t('foodSaddleNotes')
 
@@ -1246,16 +1246,16 @@ api.food =
   Cake_Red:             text: t('foodCakeRed'), target: 'Red', article: ''
 
   # Fall
-  Candy_Skeleton:        canBuy:(()->true), canDrop:true, text: t('foodCandySkeleton'), target: 'Skeleton', article: ''
-  Candy_Base:            canBuy:(()->true), canDrop:true, text: t('foodCandyBase'), target: 'Base', article: ''
-  Candy_CottonCandyBlue: canBuy:(()->true), canDrop:true, text: t('foodCandyCottonCandyBlue'), target: 'CottonCandyBlue', article: ''
-  Candy_CottonCandyPink: canBuy:(()->true), canDrop:true, text: t('foodCandyCottonCandyPink'), target: 'CottonCandyPink', article: ''
-  Candy_Shade:           canBuy:(()->true), canDrop:true, text: t('foodCandyShade'), target: 'Shade', article: ''
-  Candy_White:           canBuy:(()->true), canDrop:true, text: t('foodCandyWhite'), target: 'White', article: ''
-  Candy_Golden:          canBuy:(()->true), canDrop:true, text: t('foodCandyGolden'), target: 'Golden', article: ''
-  Candy_Zombie:          canBuy:(()->true), canDrop:true, text: t('foodCandyZombie'), target: 'Zombie', article: ''
-  Candy_Desert:          canBuy:(()->true), canDrop:true, text: t('foodCandyDesert'), target: 'Desert', article: ''
-  Candy_Red:             canBuy:(()->true), canDrop:true, text: t('foodCandyRed'), target: 'Red', article: ''
+  Candy_Skeleton:        text: t('foodCandySkeleton'), target: 'Skeleton', article: ''
+  Candy_Base:            text: t('foodCandyBase'), target: 'Base', article: ''
+  Candy_CottonCandyBlue: text: t('foodCandyCottonCandyBlue'), target: 'CottonCandyBlue', article: ''
+  Candy_CottonCandyPink: text: t('foodCandyCottonCandyPink'), target: 'CottonCandyPink', article: ''
+  Candy_Shade:           text: t('foodCandyShade'), target: 'Shade', article: ''
+  Candy_White:           text: t('foodCandyWhite'), target: 'White', article: ''
+  Candy_Golden:          text: t('foodCandyGolden'), target: 'Golden', article: ''
+  Candy_Zombie:          text: t('foodCandyZombie'), target: 'Zombie', article: ''
+  Candy_Desert:          text: t('foodCandyDesert'), target: 'Desert', article: ''
+  Candy_Red:             text: t('foodCandyRed'), target: 'Red', article: ''
 
 _.each api.food, (food,key) ->
   _.defaults food, {value: 1, key, notes: t('foodNotes'), canBuy:(()->false), canDrop:false}

common/script/src/content/food/base.js

@@ -3,8 +3,8 @@ import {
   setFoodDefaults
 } from '../helpers';
 
-const CAN_BUY = false;
-const CAN_DROP = false;
+const CAN_BUY = true;
+const CAN_DROP = true;
 
 let baseFood = {
   Meat: {

common/script/src/content/food/fall.js

@@ -3,8 +3,8 @@ import {
   setFoodDefaults
 } from '../helpers';
 
-const CAN_BUY = true;
-const CAN_DROP = true;
+const CAN_BUY = false;
+const CAN_DROP = false;
 
 let candy = {
   Candy_Skeleton: {

common/script/src/content/hatching-potions.js

@@ -43,6 +43,7 @@ let premiumPotions = {
     addlNotes: t('premiumPotionAddlNotes'),
     premium: true,
     limited: true,
+    canBuy: () => { return false },
   },
 };
 

website/views/options/inventory/drops.jade

@@ -136,19 +136,6 @@
                 |  {{::pot.value}} 
                 span.Pet_Currency_Gem1x.inline-gems
 
-        li.customize-menu
-          menu.pets-menu!=env.t('magicHatchingPotions') + " - " + env.t('fallEventAvailability')
-            p.muted=env.t('premiumPotionNoDropExplanation')
-            div(ng-repeat='pot in Content.hatchingPotions', ng-if='pot.premium && pot.canBuy(user)')
-              button.customize-option(class='Pet_HatchingPotion_{{::pot.key}}',
-                popover='{{::pot.notes()}} {{::pot.addlNotes()}}', popover-append-to-body='true',
-                popover-title!=env.t("potion", {potionType: "{{::pot.text()}}"}),
-                popover-trigger='mouseenter', popover-placement='top',
-                ng-click='purchase("hatchingPotions", pot)')
-              p
-                |  {{::pot.value}} 
-                span.Pet_Currency_Gem1x.inline-gems
-
         li.customize-menu
           menu.pets-menu(label=env.t('food'))
             p.muted!=env.t('dropsExplanation')

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('seasonalShopFallText')
+        p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText')
         p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopFallTextBroken')
 
-  .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='{{::label}}', ng-repeat='(set,label) in ::{fallWarrior:env.t("monsterOfScienceSet"), fallMage:env.t("witchyWizardSet"), fallHealer:env.t("mummyMedicSet"), fallRogue:env.t("vampireSmiterSet")}')
       div(ng-repeat='item in ::getSeasonalShopArray(set)',
         ng-class="{transparent: user.items.gear.owned[item.key] !== undefined}")
@@ -23,7 +23,7 @@
           | {{((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(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}}"'
           data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}",

website/views/options/profile.jade

@@ -84,7 +84,7 @@ mixin customizeProfile(mobile)
                 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', 'disabled')
-          +buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors')
+          +buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors', 'disabled')
           +buyPref('hair.color', ['aurora','festive','hollygreen','peppermint','snowy','winterstar'], 'winteryColors', 'disabled')
 
           li.customize-menu
@@ -152,7 +152,7 @@ mixin customizeProfile(mobile)
           // 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', 'disabled')
           +buyPref('skin', ['monster','pumpkin','skeleton','zombie','ghost','shadow'], 'spookySkins', 'disabled')
-          +buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins')
+          +buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins', 'disabled')
           +buyPref('skin', ['clownfish','deepocean','merblue','mergold','mergreen','merruby','shark','tropicalwater'], 'splashySkins', 'disabled')