diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 125a39c7be..cd98c2b5b1 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -24,7 +24,7 @@ } .promo_g1g1 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -241px -871px; + background-position: -482px -871px; width: 237px; height: 150px; } @@ -78,7 +78,7 @@ } .promo_todos { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -871px; + background-position: -241px -871px; width: 240px; height: 195px; } @@ -94,3 +94,9 @@ width: 512px; height: 208px; } +.scene_todo_list { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px -871px; + width: 240px; + height: 195px; +} diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 57bd82a7af..8525984a81 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/components/shops/market/index.vue b/website/client/components/shops/market/index.vue index d2717c4758..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 === 'nye'; + items: _map(_filter(this.content.cardTypes, (value) => { + return value.yearRound; }), (value) => { return { ...getItemInfo(this.user, 'card', value), diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 964936f0be..ab47dd8158 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -112,7 +112,7 @@ let premium = { value: 2, text: t('hatchingPotionHolly'), limited: true, - _season: 'January', + _season: '_PENDING_', }, Peppermint: { value: 2, diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 804f0955a1..53b2835960 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -30,8 +30,8 @@ const featuredItems = { path: 'quests.evilsanta2', }, { - type: 'bundles', - path: 'bundles.birdBuddies', + type: 'quests', + path: 'quests.penguin', }, ], seasonal: '', diff --git a/website/raw_sprites/spritesmith_large/scene_todo_list.png b/website/raw_sprites/spritesmith_large/scene_todo_list.png new file mode 100644 index 0000000000..a3ab8074f2 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_todo_list.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index c2883c2181..36ff081fda 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 = 'HAPPY NEW YEAR! PARTY HATS, NEW YEAR’S GREETING CARDS, SNOWBALLS, AND LAST CHANCE FOR DECEMBER ITEMS'; +const LAST_ANNOUNCEMENT_TITLE = 'JANUARY RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE'; const worldDmg = { // @TODO bailey: false, }; @@ -30,31 +30,19 @@ api.getNews = {

${res.t('newStuff')}

-

12/31/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

1/2/2019 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

Party Hats

-

In honor of the new year, some free Party Hats are available in the Rewards column! Each year you celebrate New Year's with Habitica, you unlock a new hat. Enjoy, and stay tuned for the matching robes in late January during our annual Habitica Birthday Bash!

-
by Lemoness and SabreCat
-
-

New Year's Cards

-

Through January 1st only, the Market is stocking New Year's Cards! Now you can send cards to your friends (and yourself) to wish them a Happy Habit New Year. All senders and recipients will receive the Auld Acquaintance badge!

-
by Lemoness and SabreCat
-

Snowballs

-

The Seasonal Shop is also stocking Snowballs for Gold! Throw them at your friends to have an exciting effect. If you get hit with a snowball, you earn the Annoying Friends badge. The results of being hit with a Snowball will last until the end of your day, but you can also reverse them early by buying Salt from the Rewards column. Snowballs are available until January 31st.

-
by Shaner and Lemoness
-
-

Last Chance for Arctic Fox Set

-

Reminder: this is the final day to subscribe and receive the Arctic Fox Set! Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems you get!

-

Thanks so much for your support! You help keep Habitica running.

-
by Beffymaroo
-
-

Last Chance for Bird Buddies Pet Quest Bundle

-

This is also the final day to buy the discounted Bird Buddies Pet Quest Bundle, featuring the Peacock, Penguin, and Rooster quests all for seven Gems! Be sure to snag it before it flaps away from the Quest Shop!

-
Art by UncommonCriminal, Eevachu, PainterProphet, Lilith of Alfheim, Pfeffernusse, Draayder, Podcod, Fire Fire Fire, Pandoro, RBrinks, EmeraldOx, extrajordanary, melynnrose, Rattify, McCoyly, Breadstrings, and Darkly
-
Writing by Elizabeth Queenan, Leephon, playgroundgiraffe, and Daniel the Bard
+
+

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 2019 progresses.

+

Check out the first New Year's Resolution Challenge of the year to start your path to resolution success! In Begin Your Quest, we're focusing on choosing realistic and achievable resolutions! Five lucky winners will get a 15 gem prize when it closes on February 1st.

+

Congratulations to the winners of December's Challenge: Drosera, Dan O'Dea, StefanieFreige, N5t5lie, and DeLauraen!

+
+

The next Take This Challenge has also launched, "Feed Me, Seymour!", with a focus on developing healthy food habits. 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, "Don't Be a Completionist!": grand prize winner grand prize winner Hoofter, and runners-up mvchelle, Phosphor, agentdwib, KSPanda, and fghberius. 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
`, }); diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index 556399b5a0..020dd59ebe 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -127,8 +127,6 @@ function _setUpNewUser (user) { user.items.quests.dustbunnies = 1; user.purchased.background.violet = true; user.preferences.background = 'violet'; - user.items.gear.owned.head_special_nye = true; // eslint-disable-line camelcase - user.items.gear.equipped.head = 'head_special_nye'; if (user.registeredThrough === 'habitica-web') { taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];