diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss
index 68b5c4ae28..573376536b 100644
--- a/website/client/assets/scss/variables.scss
+++ b/website/client/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: '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';
diff --git a/website/client/components/achievements/chooseClass.vue b/website/client/components/achievements/chooseClass.vue
index b3cd97a670..d6dcccf56d 100644
--- a/website/client/components/achievements/chooseClass.vue
+++ b/website/client/components/achievements/chooseClass.vue
@@ -164,30 +164,30 @@ export default {
classGear (heroClass) {
if (heroClass === 'rogue') {
return {
- armor: 'armor_special_spring2019Rogue',
- head: 'head_special_spring2019Rogue',
- shield: 'shield_special_spring2019Rogue',
- weapon: 'weapon_special_spring2019Rogue',
+ armor: 'armor_rogue_5',
+ head: 'head_rogue_5',
+ shield: 'shield_rogue_6',
+ weapon: 'weapon_rogue_6',
};
} else if (heroClass === 'wizard') {
return {
- armor: 'armor_special_spring2019Mage',
- head: 'head_special_spring2019Mage',
- weapon: 'weapon_special_spring2019Mage',
+ armor: 'armor_wizard_5',
+ head: 'head_wizard_5',
+ weapon: 'weapon_wizard_6',
};
} else if (heroClass === 'healer') {
return {
- armor: 'armor_special_spring2019Healer',
- head: 'head_special_spring2019Healer',
- shield: 'shield_special_spring2019Healer',
- weapon: 'weapon_special_spring2019Healer',
+ armor: 'armor_healer_5',
+ head: 'head_healer_5',
+ shield: 'shield_healer_5',
+ weapon: 'weapon_healer_6',
};
} else {
return {
- armor: 'armor_special_spring2019Warrior',
- head: 'head_special_spring2019Warrior',
- shield: 'shield_special_spring2019Warrior',
- weapon: 'weapon_special_spring2019Warrior',
+ armor: 'armor_warrior_5',
+ head: 'head_warrior_5',
+ shield: 'shield_warrior_5',
+ weapon: 'weapon_warrior_6',
};
}
},
diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js
index ee65b82750..af2caf0ebd 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 takeThisGear from './special-takeThis';
import wonderconGear from './special-wondercon';
import t from '../../../translation';
-const CURRENT_SEASON = 'spring';
+const CURRENT_SEASON = '_NONE_';
let armor = {
0: backerGear.armorSpecial0,
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index dfc0790eb3..cc65eff886 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
import each from 'lodash/each';
import t from './translation';
-const CURRENT_SEASON = 'March';
+const CURRENT_SEASON = '_NONE_';
let drops = {
Base: {
diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js
index 80e8f14f2a..8c903681fa 100644
--- a/website/common/script/content/quests.js
+++ b/website/common/script/content/quests.js
@@ -511,7 +511,7 @@ let quests = {
value: 1,
category: 'pet',
canBuy () {
- return true;
+ return false;
},
collect: {
plainEgg: {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 6db7d1a17a..a2cc0d992f 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -8,16 +8,16 @@ const featuredItems = {
path: 'armoire',
},
{
- type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Celestial',
+ type: 'eggs',
+ path: 'eggs.Dragon',
},
{
- type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Rainbow',
+ type: 'hatchingPotions',
+ path: 'hatchingPotions.Red',
},
{
type: 'card',
- path: 'cardTypes.goodluck',
+ path: 'cardTypes.congrats',
},
],
quests: [
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 8e7811f855..4f38ef5b53 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';
module.exports = {
- opened: true,
+ opened: false,
- currentSeason: 'Spring',
+ currentSeason: 'Closed',
- dateRange: { start: '2019-03-19', end: '2019-04-30' },
+ dateRange: { start: '2018-09-20', end: '2018-10-31' },
availableSets: [
- ...SEASONAL_SETS.spring,
],
pinnedSets: {
- wizard: 'spring2019AmberMageSet',
- warrior: 'spring2019OrchidWarriorSet',
- rogue: 'spring2019CloudRogueSet',
- healer: 'spring2019RobinHealerSet',
},
availableSpells: [
- 'shinySeed',
],
availableQuests: [
- 'egg',
],
- featuredSet: 'spring2018DucklingRogueSet',
+ featuredSet: 'mummyMedicSet',
};
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 32f1094469..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_2019.png b/website/raw_sprites/spritesmith_large/promo_april_fools_2019.png
deleted file mode 100644
index 737fd68a72..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_april_fools_2019.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_butterflies.png b/website/raw_sprites/spritesmith_large/promo_butterflies.png
deleted file mode 100644
index 032aa50527..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_butterflies.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_celestial_rainbow_potions.png b/website/raw_sprites/spritesmith_large/promo_celestial_rainbow_potions.png
deleted file mode 100644
index 913d48a27d..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_celestial_rainbow_potions.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_classes_spring2019.png b/website/raw_sprites/spritesmith_large/promo_classes_spring2019.png
deleted file mode 100644
index 18678fb1e2..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_classes_spring2019.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_egg_hunt.png b/website/raw_sprites/spritesmith_large/promo_egg_hunt.png
deleted file mode 100644
index cafc89723b..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_egg_hunt.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_seasonalshop_spring.png b/website/raw_sprites/spritesmith_large/promo_seasonalshop_spring.png
deleted file mode 100644
index e1f811893e..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_seasonalshop_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 5f9848797e..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_avatar_customizations.png b/website/raw_sprites/spritesmith_large/promo_spring_avatar_customizations.png
deleted file mode 100644
index bda1f1c7cd..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_spring_avatar_customizations.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/scene_spells.png b/website/raw_sprites/spritesmith_large/scene_spells.png
new file mode 100644
index 0000000000..ecdf7f70de
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_spells.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index a73aeb0146..eeaef8f0d9 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
let 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 GOODIES!';
+const LAST_ANNOUNCEMENT_TITLE = 'MAY 2019 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -34,17 +34,14 @@ api.getNews = {
-
- Last Chance for Spring Fling Outfits, Customizations, Magic Hatching Potions, and Shiny Seeds
- Today is the final day of the Spring Fling Festival, so if you still have any remaining Spring Fling Items that you want to buy, you'd better do it now! The special Spring Fling Equipment will not return for at least one year and will be available for gems instead of gold when it returns.
- Pastel Skins and Shimmer Hair colors will also vanish when the Gala ends, so be sure to grab them from User > Edit Avatar!
- Rainbow, Celestial, and Garden Magic Hatching Potions are also disappearing from the Market when the Gala ends. Make sure you snag all the potions you need before they're gone!
- Plus, the Seasonal Shop will be closing down, so now's the time to seize those final items and stock up on Shiny Seeds!
-
- Last Chance for Opulent Opal Set
- Reminder: this is the final day to subscribe and receive the Opulent Opal Set! Subscribing also lets you buy Gems with Gold. The longer your subscription, the more Gems you get!
- Thanks so much for your support! You help keep Habitica running.
- 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, (Review Your Combat Tactics) [https://habitica.com/challenges/f64a1afa-ae00-4855-91af-b52e9bd6803f], 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 3.
+ Congratulations to the winners of April's Challenge: punkshep, Syntrillium, BardoVelho, Betsy, and Baileythebookworm!
+ The next Take This Challenge has also launched, "Organize Your Inventory!", with a focus on decluttering your living space. 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, "Harder, Faster, Stronger!": grand prize winner Evan Cowan, and runners-up ResearcherLilly, corinnetags, Lucy, mrdarq, and Snarky. 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
+
`,
});