diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss index 13be632c09..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: 'valentines'; +$npc_market_flavor: 'normal'; $npc_quests_flavor: 'normal'; $npc_seasonal_flavor: 'normal'; $npc_timetravelers_flavor: 'normal'; -$npc_tavern_flavor: 'valentines'; +$npc_tavern_flavor: 'normal'; diff --git a/website/client/components/shops/market/index.vue b/website/client/components/shops/market/index.vue index 6bacb9ee65..ccf3f432de 100644 --- a/website/client/components/shops/market/index.vue +++ b/website/client/components/shops/market/index.vue @@ -246,8 +246,8 @@ export default { categories.push({ identifier: 'cards', text: this.$t('cards'), - items: _map(_filter(this.content.cardTypes, (value, key) => { - return value.yearRound || key === 'valentine'; + items: _map(_filter(this.content.cardTypes, (value) => { + return value.yearRound; }), (value) => { return { ...getItemInfo(this.user, 'card', value), diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index fa4d6e8ed6..581c6248ad 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -737,5 +737,8 @@ "questVelociraptorCompletion": "You burst through the grass, confronting the Veloci-Rapper.

See here, rapper, you’re no quitter,
You’re Bad Habits' hardest hitter!
Check off your To-Dos like a boss,
Don’t mourn over one day’s loss!

Filled with renewed confidence, it bounds off to freestyle another day, leaving behind three eggs where it sat.", "questVelociraptorBoss": "Veloci-Rapper", "questVelociraptorDropVelociraptorEgg": "Velociraptor (Egg)", - "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market" + "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market", + + "mythicalMarvelsText": "Mythical Marvels Quest Bundle", + "mythicalMarvelsNotes": "Contains 'Convincing the Unicorn Queen,' 'The Fiery Gryphon,' and 'Danger in the Depths: Sea Serpent Strike!' Available until February 28." } diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 4d131a0a0e..e87ace6cbd 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -227,6 +227,21 @@ api.bundles = { type: 'quests', value: 7, }, + mythicalMarvels: { + key: 'mythicalMarvels', + text: t('mythicalMarvelsText'), + notes: t('mythicalMarvelsNotes'), + bundleKeys: [ + 'unicorn', + 'seaserpent', + 'gryphon', + ], + canBuy () { + return moment().isBetween('2019-02-19', '2019-03-02'); + }, + type: 'quests', + value: 7, + }, }; /* diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index 4957f1a3f9..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/quests/scrolls/quest_bundle_mythicalMarvels.png b/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_mythicalMarvels.png new file mode 100644 index 0000000000..cb58bd9319 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_mythicalMarvels.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_bird_buddies_bundle.png b/website/raw_sprites/spritesmith_large/promo_bird_buddies_bundle.png deleted file mode 100644 index ff28c1fc95..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_bird_buddies_bundle.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_mythical_marvels_bundle.png b/website/raw_sprites/spritesmith_large/promo_mythical_marvels_bundle.png new file mode 100644 index 0000000000..b49fc1fc41 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_mythical_marvels_bundle.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_valentines.png b/website/raw_sprites/spritesmith_large/promo_valentines.png deleted file mode 100644 index d65128389a..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_valentines.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_valentines_potions.png b/website/raw_sprites/spritesmith_large/promo_valentines_potions.png deleted file mode 100644 index 1f9ebf596e..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_valentines_potions.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 56daf405b5..a195899109 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 = 'BLOG POSTS! WIKI AND GUILD SPOTLIGHTS'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW DISCOUNTED PET QUEST BUNDLE: MYTHICAL MARVELS!'; const worldDmg = { // @TODO bailey: false, }; @@ -30,18 +30,14 @@ api.getNews = {

${res.t('newStuff')}

-

2/14/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

2/19/2019 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

Blog Post: Group Plans

-

This month's featured Wiki article is about Group Plans! We hope that it will help you as share tasks with friends and family. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.

-
by shanaqui and the Wiki Wizards
-
-

Guild Spotlight: More New and Notable Guilds

-

There's a new Guild Spotlight on the blog that highlights some of the new movers and shakers in our community! Check it out now to find some cool new places to hang out in Habitica with folks who share your interests and goals.

-
by shanaqui
+
+

If you're looking to add some magical pets to your Habitica stable, you're in luck! From now until February 28, you can purchase the Mythical Marvels Pet Quest Bundle and receive the Gryphon, Sea Serpent, and Unicorn 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 today!

+
Art by greenpencil, UncommonCriminal, RosieSully, Lukreja, Baconsaur, Witticaster, Aries Faries, Mara, Seraphina, 1920-kun, RBrinks, and Erikari
+
Writing by Laurel, Daniel the Bard, and gwyllgi
`, });