diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss
index 65f9ebf339..971f3eb4ec 100644
--- a/website/client/src/assets/scss/variables.scss
+++ b/website/client/src/assets/scss/variables.scss
@@ -1,12 +1,12 @@
// this variables are used to determine which shop npc/backgrounds should be loaded
-// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
+// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, summer
// more to be added on future seasons
-$npc_market_flavor: 'spring';
-$npc_quests_flavor: 'spring';
-$npc_seasonal_flavor: 'spring';
-$npc_timetravelers_flavor: 'spring';
-$npc_tavern_flavor: 'spring';
+$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 f911d6bb3b..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_spring2020Rogue',
- head: 'head_special_spring2020Rogue',
- shield: 'shield_special_spring2020Rogue',
- weapon: 'weapon_special_spring2020Rogue',
+ armor: 'armor_rogue_5',
+ head: 'head_rogue_5',
+ shield: 'shield_rogue_6',
+ weapon: 'weapon_rogue_6',
};
} if (heroClass === 'wizard') {
return {
- armor: 'armor_special_spring2020Mage',
- head: 'head_special_spring2020Mage',
- weapon: 'weapon_special_spring2020Mage',
+ armor: 'armor_wizard_5',
+ head: 'head_wizard_5',
+ weapon: 'weapon_wizard_6',
};
} if (heroClass === 'healer') {
return {
- armor: 'armor_special_spring2020Healer',
- head: 'head_special_spring2020Healer',
- shield: 'shield_special_spring2020Healer',
- weapon: 'weapon_special_spring2020Healer',
+ armor: 'armor_healer_5',
+ head: 'head_healer_5',
+ shield: 'shield_healer_5',
+ weapon: 'weapon_healer_6',
};
}
return {
- armor: 'armor_special_spring2020Warrior',
- head: 'head_special_spring2020Warrior',
- shield: 'shield_special_spring2020Warrior',
- weapon: 'weapon_special_spring2020Warrior',
+ 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/quests.js b/website/common/script/content/quests.js
index 9733ca8b5d..a5660a76e3 100644
--- a/website/common/script/content/quests.js
+++ b/website/common/script/content/quests.js
@@ -515,7 +515,7 @@ const quests = {
value: 1,
category: 'pet',
canBuy () {
- return true;
+ return false;
},
collect: {
plainEgg: {
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 026cdee820..19df0df620 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -1,30 +1,23 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
export default {
- opened: true,
+ opened: false,
- currentSeason: 'Spring',
+ currentSeason: 'Closed',
- dateRange: { start: '2020-03-19', end: '2020-04-30' },
+ dateRange: { start: '2019-09-24', end: '2019-10-31' },
availableSets: [
- ...SEASONAL_SETS.spring,
],
pinnedSets: {
- healer: 'spring2020IrisHealerSet',
- rogue: 'spring2020LapisLazuliRogueSet',
- warrior: 'spring2020BeetleWarriorSet',
- wizard: 'spring2020PuddleMageSet',
},
availableSpells: [
- 'shinySeed',
],
availableQuests: [
- 'egg',
],
- featuredSet: 'spring2020PuddleMageSet',
+ featuredSet: 'fall2018AlterEgoSet',
};
diff --git a/website/raw_sprites/spritesmith/npcs/npc_aprilFool.png b/website/raw_sprites/spritesmith/npcs/npc_aprilFool.png
deleted file mode 100644
index 207c6946b4..0000000000
Binary files a/website/raw_sprites/spritesmith/npcs/npc_aprilFool.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png
index 0fe6763311..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 9365bc12c9..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 e129d6e43e..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_april_fools_2020.png b/website/raw_sprites/spritesmith_large/promo_april_fools_2020.png
deleted file mode 100644
index 34146b5d17..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_april_fools_2020.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_egg_quest.png b/website/raw_sprites/spritesmith_large/promo_egg_quest.png
deleted file mode 100644
index 1852bd1046..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_egg_quest.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_mystery_202004.png b/website/raw_sprites/spritesmith_large/promo_mystery_202004.png
deleted file mode 100644
index 28d77d385e..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_mystery_202004.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_pastel_skin_hair.png b/website/raw_sprites/spritesmith_large/promo_pastel_skin_hair.png
deleted file mode 100644
index f3e413f25d..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_pastel_skin_hair.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_seasonal_shop_spring.png b/website/raw_sprites/spritesmith_large/promo_seasonal_shop_spring.png
deleted file mode 100644
index e1f811893e..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_seasonal_shop_spring.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_shiny_seeds.png b/website/raw_sprites/spritesmith_large/promo_shiny_seeds.png
deleted file mode 100644
index c22fdc2410..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_shiny_seeds.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_spring_2019.png b/website/raw_sprites/spritesmith_large/promo_spring_2019.png
deleted file mode 100644
index 18678fb1e2..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_spring_2019.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_spring_2020.png b/website/raw_sprites/spritesmith_large/promo_spring_2020.png
deleted file mode 100644
index c7195fec9c..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_spring_2020.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_spring_potions_2020.png b/website/raw_sprites/spritesmith_large/promo_spring_potions_2020.png
deleted file mode 100644
index 7fe1475101..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_spring_potions_2020.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/scene_casting_spells.png b/website/raw_sprites/spritesmith_large/scene_casting_spells.png
new file mode 100644
index 0000000000..ecdf7f70de
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_casting_spells.png differ
diff --git a/website/raw_sprites/spritesmith_large/scene_citrusella.png b/website/raw_sprites/spritesmith_large/scene_citrusella.png
deleted file mode 100644
index 448028e402..0000000000
Binary files a/website/raw_sprites/spritesmith_large/scene_citrusella.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/scene_hat_guild.png b/website/raw_sprites/spritesmith_large/scene_hat_guild.png
deleted file mode 100644
index 1c432698ea..0000000000
Binary files a/website/raw_sprites/spritesmith_large/scene_hat_guild.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/scene_meditation.png b/website/raw_sprites/spritesmith_large/scene_meditation.png
deleted file mode 100644
index f204f232ab..0000000000
Binary files a/website/raw_sprites/spritesmith_large/scene_meditation.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/scene_tasks.png b/website/raw_sprites/spritesmith_large/scene_tasks.png
deleted file mode 100644
index a3ab8074f2..0000000000
Binary files a/website/raw_sprites/spritesmith_large/scene_tasks.png and /dev/null differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 5c3b853453..c810446075 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 = 'LAST CHANCE FOR APRIL AND SPRING FLING GOODIES!';
+const LAST_ANNOUNCEMENT_TITLE = 'MAY SUBSCRIBER ITEMS AND OFFICIAL HABITICA CHALLENGES!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,73 +31,65 @@ api.getNews = {
${res.t('newStuff')}
- 4/30/2020 - ${LAST_ANNOUNCEMENT_TITLE}
+ 5/4/2020 - ${LAST_ANNOUNCEMENT_TITLE}
-
- Last Chance for Spring Fling Outfits, Spring Customizations, Spring Magic Hatching Potions, and Shiny Seeds
+
+ May Subscriber Items Revealed!
- Spring Fling 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 a
- Puddle Mage, Rhinoceros Beetle Warrior, Lapiz Lazuli Rogue, or Iris Healer! Don't miss
- these awesome gear sets, available to purchase with Gold for now!
+ The May Subscriber Item Set has been revealed: the Wondrous Wyvern Item Set! Subscribe to Habitica by May 31 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!
- by Vikte, gawrone, jjgame83, Shine Caramia, and SabreCat
-
- The Seasonal Shop will also be closing when the Gala ends.
- The Seasonal Sorceress is stocking the seasonal edition versions of previous spring
- outfits, now available for Gems instead of Gold, the seasonal Egg Quest, and Shiny Seeds.
+ 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.
-
- by Eslyn, Aspiring Advocate, OuttaMyMind, Lt. Cabel, Vikte, Lalaitha, DialFForFunky,
- Gerald the Pixel, Scarvia, Awesome kitty, usnbfs, Balduranne, PainterProphet,
- Beffymaroo, SabreCat and Lemoness
-
-
-
- It's also the final day to buy the Birch Bark, Celestial, and
- Shimmer Magic Hatching Potions! If they come back, it won't be until next year at the
- earliest, so don't delay!
-
-
- by Teto Forever, tricksy.fox, Bonogo, Mara, ravenlune, Ricardo, and SabreCat
-
-
-
- Don't miss the Pastel Skins and Shimmer Hair colors! They're also available in User >
- Customize Avatar until the Gala ends. But once you purchase them, you can use them
- year-round!
-
- by Lemoness and McCoyly
-
- Last Chance for Majestic Monarch Set
-
- Reminder: this is the final day to subscribe
- and receive the Majestic Monarch Set! Subscribing also lets you buy Gems with Gold. The
- longer your subscription, the more Gems you can get!
-
- Thanks so much for your support! You help keep Habitica running.
by Beffymaroo
-
- Last Chance for Confection Hatching Potion Quest and Garden Potions
+
+ May 2020 Resolution Success Challenge and Take This Challenge
- Have you had your eye on the sweet new Confection Hatching Potion Pets from this year's
- April Fool's festivities? Be sure to get the special Waffling with the Fool Quest from
- the Quest Shop! After today, it will not be available again
- for at least one year.
+ 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, Review Your Combat
+ Tactics, we're focusing on refining your strategy to help you stay motivated and keep
+ moving forward as we're almost halfway through the year! It has a 15 Gem prize, which
+ will be awarded to five lucky winners on June 1st.
- Garden Potions, which hatch the fruit and veggie pets from our 2019 April Fool's prank,
- will also disappear from the Market after today. Be sure to
- stock up if you haven't already!
+ Congratulations to the winners of April's Challenge: @Auralov, @organized_aspie,
+ @yasaminnb, @noblegeas and @Nodel!
- Note that Confection Pets and Garden Pets do not have mount forms, so plan your purchases
- accordingly!
+ The next Take This Challenge has also launched, "Don't Be a Completionist!",
+ with a focus on prioritization. Be sure to check it out to earn additional pieces of the
+ Take This armor set!
- by Beffymaroo, Piyo, SabreCat, and Viirus
+
+ 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, "This One Goes to 11!":
+ grand prize winner @Daphne36, and runners-up @aggripa, @Lily_of_the_valley,
+ @Mockingjayabi, @Cirth, and @KatieIrene! 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
+
`,
});