diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss index 3b1c2d17ba..573376536b 100644 --- a/website/client/src/assets/scss/variables.scss +++ b/website/client/src/assets/scss/variables.scss @@ -2,8 +2,8 @@ // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer // more to be added on future seasons -$npc_market_flavor: 'habitoween'; -$npc_quests_flavor: 'habitoween'; -$npc_seasonal_flavor: 'habitoween'; -$npc_timetravelers_flavor: 'fall'; -$npc_tavern_flavor: 'habitoween'; +$npc_market_flavor: 'normal'; +$npc_quests_flavor: 'normal'; +$npc_seasonal_flavor: 'normal'; +$npc_timetravelers_flavor: 'normal'; +$npc_tavern_flavor: 'normal'; diff --git a/website/client/src/components/achievements/chooseClass.vue b/website/client/src/components/achievements/chooseClass.vue index 51edd54f34..913abb1b1d 100644 --- a/website/client/src/components/achievements/chooseClass.vue +++ b/website/client/src/components/achievements/chooseClass.vue @@ -225,32 +225,30 @@ export default { classGear (heroClass) { if (heroClass === 'rogue') { return { - armor: 'armor_special_fall2019Rogue', - eyewear: 'eyewear_special_fall2019Rogue', - head: 'head_special_fall2019Rogue', - shield: 'shield_special_fall2019Rogue', - weapon: 'weapon_special_fall2019Rogue', + armor: 'armor_rogue_5', + head: 'head_rogue_5', + shield: 'shield_rogue_6', + weapon: 'weapon_rogue_6', }; } if (heroClass === 'wizard') { return { - armor: 'armor_special_fall2019Mage', - head: 'head_special_fall2019Mage', - weapon: 'weapon_special_fall2019Mage', + armor: 'armor_wizard_5', + head: 'head_wizard_5', + weapon: 'weapon_wizard_6', }; } if (heroClass === 'healer') { return { - armor: 'armor_special_fall2019Healer', - eyewear: 'eyewear_special_fall2019Healer', - head: 'head_special_fall2019Healer', - shield: 'shield_special_fall2019Healer', - weapon: 'weapon_special_fall2019Healer', + armor: 'armor_healer_5', + head: 'head_healer_5', + shield: 'shield_healer_5', + weapon: 'weapon_healer_6', }; } return { - armor: 'armor_special_fall2019Warrior', - head: 'head_special_fall2019Warrior', - shield: 'shield_special_fall2019Warrior', - weapon: 'weapon_special_fall2019Warrior', + armor: 'armor_warrior_5', + head: 'head_warrior_5', + shield: 'shield_warrior_5', + weapon: 'weapon_warrior_6', }; }, selectionBox (selectedClass, heroClass) { diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js index e505116e53..39e5e7b8d5 100644 --- a/website/common/script/content/gear/sets/special/index.js +++ b/website/common/script/content/gear/sets/special/index.js @@ -8,7 +8,7 @@ import * as takeThisGear from './special-takeThis'; import * as wonderconGear from './special-wondercon'; import t from '../../../translation'; -const CURRENT_SEASON = 'fall'; +const CURRENT_SEASON = '_NONE_'; const armor = { 0: backerGear.armorSpecial0, diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index b5c965a4a8..b9dc7ec9c0 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -8,22 +8,22 @@ const featuredItems = { path: 'armoire', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Glow', + type: 'eggs', + path: 'eggs.PandaCub', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Spooky', + type: 'hatchingPotions', + path: 'hatchingPotions.Shade', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Shadow', + type: 'food', + path: 'food.Potatoe', }, ], quests: [ { - type: 'bundles', - path: 'bundles.witchyFamiliars', + type: 'quests', + path: 'quests.sloth', }, { type: 'quests', diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index 1ffb23cd0b..19df0df620 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -1,25 +1,19 @@ -import { SEASONAL_SETS } from '../content/constants'; +// import { SEASONAL_SETS } from '../content/constants'; export default { - opened: true, + opened: false, - currentSeason: 'Fall', + currentSeason: 'Closed', dateRange: { start: '2019-09-24', end: '2019-10-31' }, availableSets: [ - ...SEASONAL_SETS.fall, ], pinnedSets: { - wizard: 'fall2019CyclopsSet', - warrior: 'fall2019RavenSet', - rogue: 'fall2019OperaticSpecterSet', - healer: 'fall2019LichSet', }, availableSpells: [ - 'spookySparkles', ], availableQuests: [ diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index 755699a1cb..d5940b986b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_bailey.png and b/website/raw_sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_justin.png b/website/raw_sprites/spritesmith/npcs/npc_justin.png index 97ce158c9f..08ba7025c2 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_justin.png and b/website/raw_sprites/spritesmith/npcs/npc_justin.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index 30e95d29f3..2531f1084b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_desert_pet_achievements.png b/website/raw_sprites/spritesmith_large/promo_desert_pet_achievements.png deleted file mode 100644 index a836c92263..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_desert_pet_achievements.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_fall_festival_2018.png b/website/raw_sprites/spritesmith_large/promo_fall_festival_2018.png deleted file mode 100644 index f4ae681ba9..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_fall_festival_2018.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_fall_festival_2019.png b/website/raw_sprites/spritesmith_large/promo_fall_festival_2019.png deleted file mode 100644 index 245e6ac2f0..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_fall_festival_2019.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_fall_skins.png b/website/raw_sprites/spritesmith_large/promo_fall_skins.png deleted file mode 100644 index 718c858b4b..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_fall_skins.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_habitoween_2019.png b/website/raw_sprites/spritesmith_large/promo_habitoween_2019.png deleted file mode 100644 index b8314eeb3f..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_habitoween_2019.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_seasonal_shop_fall.png b/website/raw_sprites/spritesmith_large/promo_seasonal_shop_fall.png deleted file mode 100644 index cfbcc5bddd..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_seasonal_shop_fall.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_shadow_spooky_potions.png b/website/raw_sprites/spritesmith_large/promo_shadow_spooky_potions.png deleted file mode 100644 index 86a819fdcb..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_shadow_spooky_potions.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_spooky_sparkles.png b/website/raw_sprites/spritesmith_large/promo_spooky_sparkles.png deleted file mode 100644 index b4ea81f9f1..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_spooky_sparkles.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_witchy_familiars.png b/website/raw_sprites/spritesmith_large/promo_witchy_familiars.png deleted file mode 100644 index c31d486f72..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_witchy_familiars.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_zombie_achievements.png b/website/raw_sprites/spritesmith_large/promo_zombie_achievements.png deleted file mode 100644 index 0ef72d7927..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_zombie_achievements.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_arts_crafts.png b/website/raw_sprites/spritesmith_large/scene_arts_crafts.png deleted file mode 100644 index 81ea5b011e..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_arts_crafts.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_quest_shop.png b/website/raw_sprites/spritesmith_large/scene_quest_shop.png deleted file mode 100644 index a787976921..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_quest_shop.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_seaserpent.png b/website/raw_sprites/spritesmith_large/scene_seaserpent.png new file mode 100644 index 0000000000..c18d9634fc Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_seaserpent.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_strength.png b/website/raw_sprites/spritesmith_large/scene_strength.png deleted file mode 100644 index 2ac7ef3828..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_strength.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 16086d8e19..132f6b8abc 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -4,7 +4,7 @@ const api = {}; // @TODO export this const, cannot export it from here because only routes are exported from // controllers -const LAST_ANNOUNCEMENT_TITLE = 'HABITOWEEN! AND LAST CHANCE FOR OCTOBER AND FALL FESTIVAL ITEMS'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW OFFICIAL HABITICA CHALLENGES! RESOLUTION SUCCESS AND TAKE THIS'; const worldDmg = { // @TODO bailey: false, }; @@ -31,49 +31,39 @@ api.getNews = {

${res.t('newStuff')}

-

10/31/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

11/1/2019 - ${LAST_ANNOUNCEMENT_TITLE}

-

Happy Habitoween!

-

It's the last day of the Fall Festival, and all the NPCs are looking monstrous. Plus, - we have lots of fun things in store...

-
-

Jack O' Lantern Pets and Mounts!

-

The Flourishing Fields are full of cute carved pumpkins - and it looks like - one has followed you home! What kind of pumpkin? It all - depends on how many Habitoweens you've celebrated with us. Each Habitoween, you'll get a - new and exciting pumpkin variety!

-
by Lemoness and Beffymaroo
-

Candy for Everyone!

-

It's a feast for your pets and mounts! In honor of the end of the Fall Festival, we've - given everyone an assortment of candy. You can feed it to your pets in the - Stable! Enjoy.

-
by SabreCat and Lemoness
-
-

Last Chance for Fall Festival Items, Witchy Familiars Pet Quest Bundle, and Cryptic - Flame Set

-

This is your last chance to get all Fall Festival items before they vanish at the end - of October 31st! This includes Limited-Edition Outfits, Seasonal Shop purchases, Seasonal - Edition Skins and Hair Colors, and yes, even Glow-in-the-Dark, Spooky, and Shadow Hatching - Potions. Grab them all while you still can!

-
by gawrone, jjgame83, AnnDeLune, ʂʈєƒąʃųƥągųʂ, Katy133, Lilith of - Alfheim, Definitely not a villain, ShoGirlGeek. cataclysms, maxpendragon, Vikte, mariahm, - crystalphoenix, AaronTheTwin, tricksy.fox, QuartzFox, Lemoness, Beffymaroo and - SabreCat
-

It's also the last day to get the Witchy Familiars Pet Quest Bundle and receive the - Rat, Spider, and Frog quests, all for only 7 Gems! That's a discount of 5 Gems from the - price of purchasing them separately. Check it out in the Quest - Shop before it crawls away!

-
by Lemoness and SabreCat
-
Art by Pandah, UncommonCriminal, Arcosine, starsystemic, RosemonkeyCT, - Jon Arjinborn, and Breadstrings
-
Writing by Token, Arcosine, and Fluitare
-

Plus, today is the final day to subscribe and - receive the Cryptic Flame set along with other rad subscriber perks!

-

Thanks so much for your supporting the site -- you're helping us keep Habitica alive. - Happy Habitoween!

-
by Beffymaroo
+
+

The Habitica team has launched a special official Challenge series hosted in the + Official + New Year's Resolution Guild. These Challenges are designed to help you build and + maintain goals that are destined for success and then stick with them as the year + progresses. For this month's Challenge, Here Be Dragons, we're + focusing on obstacles that arise as you reach the end of the year! It has a 15 Gem + prize, which will be awarded to five lucky winners on December 2nd.

+

Congratulations to the winners of October's Challenge, @boxofdelights, @aethelflaeda, + @pygy, @threethreethree, and @ScarlettJill!

+
+

The next Take This Challenge has also launched, + "Cast of Characters", + with a focus on processing our feelings by turning them into characters in a game or + story. Be sure to check it out to earn additional pieces of the Take This armor set!

+

Take This is a nonprofit that + seeks to inform the gamer community about mental health issues, to provide education + about mental disorders and mental illness prevention, and to reduce the stigma of mental + illness.

+

Congratulations to the winners of the last Take This Challenge, "Check Your HP!": grand + prize winner @shadowdancer16, and runners-up @kuumathebronze, Ras Algathier, @OldMan76, + @JuanaTango, and @Khontis! Plus, all participants in that Challenge have received a + piece of the + Take This item set if they hadn't completed it already. It is + located in your Rewards column. Enjoy!

+
by Doctor B, the Take This team, Lemoness, Beffymaroo, and + SabreCat
`, }); diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index 3ce6d98fee..2d3e9cf554 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -129,9 +129,6 @@ function _setUpNewUser (user) { user.items.quests.dustbunnies = 1; user.purchased.background.violet = true; user.preferences.background = 'violet'; - user.items.pets['JackOLantern-Base'] = 5; - user.items.currentPet = 'JackOLantern-Base'; - user.migration = '20191031_habitoween_ladder'; user.markModified('items');