diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 2010f85926..47376b6838 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,6 +1,6 @@ .promo_armoire_background_201803 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -1172px 0px; + background-position: 0px -735px; width: 141px; height: 441px; } @@ -16,9 +16,15 @@ width: 730px; height: 170px; } +.promo_hippogriff { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -1172px -442px; + width: 105px; + height: 105px; +} .promo_hugabug_bundle { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -735px; + background-position: -1172px 0px; width: 141px; height: 441px; } @@ -36,7 +42,7 @@ } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -1172px -442px; + background-position: -1172px -548px; width: 114px; height: 87px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 7a54503bd3..8405b4e4d5 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss index 08962be760..879194b5d2 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 // 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/groups/tavern.vue b/website/client/components/groups/tavern.vue index ad195dc66e..efdb65ef4a 100644 --- a/website/client/components/groups/tavern.vue +++ b/website/client/components/groups/tavern.vue @@ -90,7 +90,7 @@ .toggle-up(v-if="sections.worldBoss") .svg-icon.boss-icon.reverse(v-html="icons.chevronIcon") .mt-3(v-if="sections.worldBoss", v-html="questData.notes()") - .text-center.mt-4 + // .text-center.mt-4 .world-boss-info-button(@click="showWorldBossInfo()") {{$t('whatIsWorldBoss') }} .sleep.below-header-sections diff --git a/website/client/components/shops/market/index.vue b/website/client/components/shops/market/index.vue index db3da6abda..f1e2f18035 100644 --- a/website/client/components/shops/market/index.vue +++ b/website/client/components/shops/market/index.vue @@ -496,7 +496,7 @@ export default { identifier: 'cards', text: this.$t('cards'), items: _map(_filter(this.content.cardTypes, (value, key) => { - return value.yearRound || key === 'valentine'; + return value.yearRound; }), (value) => { return { ...getItemInfo(this.user, 'card', value), diff --git a/website/common/script/content/stable.js b/website/common/script/content/stable.js index b4803099d4..72507a0049 100644 --- a/website/common/script/content/stable.js +++ b/website/common/script/content/stable.js @@ -70,7 +70,7 @@ let specialPets = { 'Jackalope-RoyalPurple': 'royalPurpleJackalope', 'Orca-Base': 'orca', 'Bear-Veteran': 'veteranBear', - // 'Hippogriff-Hopeful': 'hopefulHippogriffPet', + 'Hippogriff-Hopeful': 'hopefulHippogriffPet', }; let specialMounts = { @@ -88,7 +88,7 @@ let specialMounts = { 'Jackalope-RoyalPurple': 'royalPurpleJackalope', 'Aether-Invisible': 'invisibleAether', 'JackOLantern-Ghost': 'ghostJackolantern', - // 'Hippogriff-Hopeful': 'hopefulHippogriffMount', + 'Hippogriff-Hopeful': 'hopefulHippogriffMount', }; each(specialPets, (translationString, key) => { diff --git a/website/raw_sprites/spritesmith_large/promo_hippogriff.png b/website/raw_sprites/spritesmith_large/promo_hippogriff.png new file mode 100644 index 0000000000..511bd687aa Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_hippogriff.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 775bc9f31d..f0b087a1aa 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 = 'DYSHEARTENER THIRD RAGE STRIKE AND HUG A BUG QUEST BUNDLE'; +const LAST_ANNOUNCEMENT_TITLE = 'DYSHEARTENER DEFEATED!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,23 +31,18 @@ api.getNews = {

${res.t('newStuff')}

+
-

3/6/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

3/8/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-
-
-

World Boss: Dysheartener Attacks the Quest Shop!

-

Aaaah! We've left our Dailies undone again, and the Dysheartener has mustered the energy for one final blow against our beloved shopkeepers. The countryside around Ian the Quest Master is ripped apart by its Shattering Heartbreak attack, and Ian is struck to the core by the horrific vision. We're so close to defeating this monster.... Hurry! Don't stop now!

-
by Lemoness, Beffymaroo, SabreCat, viirus, piyorii, and Apollo
-

New Discounted Quest Bundle: Hug a Bug!

-

If you are looking to add some insect friends to your Habitica stable, you're in luck! From now until March 31, you can purchase the Hug a Bug Pet Quest Bundle and receive the Snail, Beetle, and Butterfly 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!

-

If you’d prefer not to see bugs in Habitica due to a phobia, check out the Phobia Protection Extension and enable the option for hiding "Beetles"!

-
by Lemoness, SabreCat, and Beffymaroo
-
Art by Pfeffernusse, Megan, Pocketmole, overomega, Misceo, UncommonCriminal, Zorella, Anna Glassman, Leephon, Lilith of Alfheim, Ac, starsystemic, and Karithina
-
Writing by: arachnidstardis, emiausti, and AnnDeLune
-
-
-
+

World Boss: Dysheartener Defeated!

+

Together, everyone in Habitica strikes a final blow to their tasks, and the Dysheartener rears back, shrieking with dismay. "What's wrong, Dysheartener?" AnnDeLune calls, eyes sparkling. "Feeling discouraged?"

+

Glowing pink fractures crack across the Dysheartener's carapace, and it shatters in a puff of pink smoke. As a renewed sense of vigor and determination sweeps across the land, a flurry of delightful sweets rains down upon everyone.

+

The crowd cheers wildly, hugging each other as their pets happily chew on the belated Valentine's treats. Suddenly, a joyful chorus of song cascades through the air, and gleaming silhouettes soar across the sky.

+

Our newly-invigorated optimism has attracted a flock of Hopeful Hippogriffs! The graceful creatures alight upon the ground, ruffling their feathers with interest and prancing about. "It looks like we've made some new friends to help keep our spirits high, even when our tasks are daunting," Lemoness says.

+

Beffymaroo already has her arms full with feathered fluffballs. "Maybe they'll help us rebuild the damaged areas of Habitica!"

+

Crooning and singing, the Hippogriffs lead the way as all the Habitcans work together to restore our beloved home.

+
by Lemoness, Beffymaroo, SabreCat, AnnDeLune, viirus, piyorii, and Apollo
`, });