diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss
index 41c1a9f313..e73fd5ec8d 100644
--- a/website/client/src/assets/scss/variables.scss
+++ b/website/client/src/assets/scss/variables.scss
@@ -2,11 +2,11 @@
// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
// more to be added on future seasons
-$npc_market_flavor: 'birthday';
-$npc_quests_flavor: 'birthday';
-$npc_seasonal_flavor: 'birthday';
-$npc_timetravelers_flavor: 'birthday';
-$npc_tavern_flavor: 'birthday';
+$npc_market_flavor: 'normal';
+$npc_quests_flavor: 'normal';
+$npc_seasonal_flavor: 'normal';
+$npc_timetravelers_flavor: 'normal';
+$npc_tavern_flavor: 'normal';
$restingToolbarHeight: 40px;
$menuToolbarHeight: 56px;
diff --git a/website/client/src/components/achievements/chooseClass.vue b/website/client/src/components/achievements/chooseClass.vue
index 5485a7e9b8..913abb1b1d 100644
--- a/website/client/src/components/achievements/chooseClass.vue
+++ b/website/client/src/components/achievements/chooseClass.vue
@@ -225,30 +225,30 @@ export default {
classGear (heroClass) {
if (heroClass === 'rogue') {
return {
- armor: 'armor_special_winter2020Rogue',
- head: 'head_special_winter2020Rogue',
- shield: 'shield_special_winter2020Rogue',
- weapon: 'weapon_special_winter2020Rogue',
+ armor: 'armor_rogue_5',
+ head: 'head_rogue_5',
+ shield: 'shield_rogue_6',
+ weapon: 'weapon_rogue_6',
};
} if (heroClass === 'wizard') {
return {
- armor: 'armor_special_winter2020Mage',
- head: 'head_special_winter2020Mage',
- weapon: 'weapon_special_winter2020Mage',
+ armor: 'armor_wizard_5',
+ head: 'head_wizard_5',
+ weapon: 'weapon_wizard_6',
};
} if (heroClass === 'healer') {
return {
- armor: 'armor_special_winter2020Healer',
- head: 'head_special_winter2020Healer',
- shield: 'shield_special_winter2020Healer',
- weapon: 'weapon_special_winter2020Healer',
+ armor: 'armor_healer_5',
+ head: 'head_healer_5',
+ shield: 'shield_healer_5',
+ weapon: 'weapon_healer_6',
};
}
return {
- armor: 'armor_special_winter2020Warrior',
- head: 'head_special_winter2020Warrior',
- shield: 'shield_special_winter2020Warrior',
- weapon: 'weapon_special_winter2020Warrior',
+ 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/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 99356badff..19df0df620 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -1,31 +1,23 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
export default {
- opened: true,
+ opened: false,
- currentSeason: 'Winter',
+ currentSeason: 'Closed',
- dateRange: { start: '2019-12-19', end: '2020-01-31' },
+ dateRange: { start: '2019-09-24', end: '2019-10-31' },
availableSets: [
- ...SEASONAL_SETS.winter,
],
pinnedSets: {
- healer: 'winter2020WinterSpiceSet',
- rogue: 'winter2020LanternSet',
- warrior: 'winter2020EvergreenSet',
- wizard: 'winter2020CarolOfTheMageSet',
},
availableSpells: [
- 'snowball',
],
availableQuests: [
- 'evilsanta',
- 'evilsanta2',
],
- featuredSet: 'winter2018GiftWrappedSet',
+ featuredSet: 'fall2018AlterEgoSet',
};
diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png
index 77347e3749..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 08ad42e374..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 056b638cdc..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/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 5e33804743..02799ee1d0 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 = 'HABITICA BIRTHDAY PARTY! AND LAST CHANCE FOR WINTER WONDERLAND';
+const LAST_ANNOUNCEMENT_TITLE = 'FEBRUARY SUBSCRIBER ITEMS REVEALED!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,85 +31,24 @@ api.getNews = {
${res.t('newStuff')}
- 1/31/2020 - ${LAST_ANNOUNCEMENT_TITLE}
+ 2/1/2020 - ${LAST_ANNOUNCEMENT_TITLE}
-
- Habitica Birthday Bash
+
- January 31st is Habitica's Birthday! Thank you so much for being a part of our
- community - it means a lot.
+ The February Subscriber Item has been revealed: the Stylish Sweetheart Item Set!
+ Subscribe to Habitica by February 29 to receive
+ this exciting set! If you're already an active subscriber, reload the site and then head
+ to Inventory > Items to claim your gear!
- Now come join us and the NPCs as we celebrate!
- Cake for Everybody!
- In honor of the festivities, everyone has been awarded an assortment of yummy cake to
- feed to your pets! Plus, for the next two days Alexander the
- Merchant is selling cake in his shop, and cake will sometimes drop when you complete
- your tasks. Cake works just like normal pet food, but if you want to know what type of
- pet likes each slice, the
- wiki has spoilers.
+ Subscribers also receive the ability to buy Gems with Gold -- the longer you subscribe,
+ the more Gems you can buy per month! There are other perks as well, such as longer access
+ to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep
+ Habitica running. Thank you very much for your support -- it means a lot to us.
- Party Robes
- There are Party Robes available for free in the Rewards column! Don them with pride.
- Birthday Bash Achievement
-
- In honor of Habitica's birthday, everyone has been awarded the Habitica Birthday Bash
- achievement! This achievement stacks for each Birthday Bash you celebrate with us.
-
-
- Last Chance for Fabled Fox Set
-
- Reminder: this is the final day to subscribe
- and receive the Fabled Fox Set! Subscribing also lets you buy Gems with Gold and get
- other great perks like a special Jackalope Pet!
-
- Thanks so much for your support! You help keep Habitica running.
by Beffymaroo
-
- Last Chance for Winter Wonderland Goodies!
-
- Winter Wonderland is coming to a close in Habitica. It's the last day to snag this year's
- limited edition outfits from your Rewards column. Depending on your class, you can be an
- Evergreen Warrior, Bell Mage, Winter Spice Healer, or Lantern Rogue! Don't miss these
- awesome gear sets, available to purchase with Gold!
-
- by Vikte, gawrone, jjgame83, Aspiring Advocate, and SabreCat
-
- The Seasonal Shop will also be closing when the Gala ends.
- The Seasonal Sorceress is stocking the seasonal edition versions of previous winter
- outfits, now available for Gems instead of Gold, and the Trapper Santa and Find the Cub
- Quests.
-
-
- by Lt Cabel, Vikte, AnnDeLune, Persephone, WeeWitch, katy133, yayannabelle, Stefalupagus,
- Io Breese, foreverender, Podcod, Beffymaroo, SabreCat and Lemoness
-
-
- It's also the final day to buy Starry Night, Holly, and new
- Aurora Magic Hatching Potions! If they come back, it won't be until next year at the
- earliest, so don't delay!
-
-
- by QuartzFox, Archeia, Willow The Witty, JinjooHat, Tyche Alba, and SabreCat
-
-
- This is also the final day to buy our special Winter Quests! You can purchase Find the
- Cub and Trapper Santa quests in the Seasonal Shop individually for four Gems each, or you
- can get the discounted Winter Pet Quest Bundle, featuring Trapper Santa, Find the Cub and
- the Penguin quest all for seven Gems in the Quest Shop!
-
-
- Please note that the Find the Cub and Trapper Santa quests only need to be completed once
- each to obtain the rare Polar Bear pet and mount.
-
- by Lemoness and SabreCat
-
- Art by UncommonCriminal, Shaner, Eevachu, Pandoro, melynnrose, Breadstrings, Rattify, and
- PainterProphet
-
- Writing by Lefnire, Leephon, and Daniel the Bard
`,
});
diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js
index d878f3abf3..5b9e5fe8f2 100644
--- a/website/server/models/user/hooks.js
+++ b/website/server/models/user/hooks.js
@@ -131,7 +131,7 @@ function _setUpNewUser (user) {
user.items.quests.dustbunnies = 1;
user.purchased.background.violet = true;
user.preferences.background = 'violet';
- if (moment().isBefore('2020-02-03')) {
+ if (moment().isBefore('2020-02-02')) {
user.achievements.habitBirthdays = 1;
user.items.gear.owned.armor_special_birthday = true;
user.items.gear.equipped.armor = 'armor_special_birthday';