diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css index a76785765d..e738e6db35 100644 --- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,18 +1,18 @@ .promo_armoire_backgrounds_202001 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -175px; + background-position: -424px -175px; width: 423px; height: 147px; } .promo_g1g1_2019 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -471px; + background-position: -403px -471px; width: 357px; height: 144px; } .promo_mystery_202001 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -241px -616px; + background-position: -241px -619px; width: 279px; height: 147px; } @@ -24,25 +24,25 @@ } .promo_take_this { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -358px -471px; + background-position: -761px -471px; width: 96px; height: 69px; } .promo_winter_potions_2020 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -424px -175px; + background-position: 0px -323px; width: 423px; height: 147px; } .promo_winter_quests_bundle { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -323px; + background-position: 0px -175px; width: 423px; height: 147px; } .promo_winter_wonderland_2019 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -424px -323px; + background-position: 0px -471px; width: 402px; height: 147px; } @@ -52,9 +52,27 @@ width: 468px; height: 147px; } +.promo_wintery_hair { + background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -521px -619px; + width: 152px; + height: 75px; +} +.promo_wintery_skins { + background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -424px -323px; + width: 420px; + height: 147px; +} +.customize-option.promo_wintery_skins { + background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -449px -338px; + width: 60px; + height: 60px; +} .scene_list { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -616px; + background-position: 0px -619px; width: 240px; height: 195px; } diff --git a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png index 37957a57dc..1418399ac9 100644 Binary files a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js index 128a2c595f..0fce4e74b7 100644 --- a/website/common/script/content/appearance/sets.js +++ b/website/common/script/content/appearance/sets.js @@ -17,7 +17,7 @@ export default prefill({ setPrice: 5, availableFrom: '2019-10-08', availableUntil: '2019-11-02', text: t('hauntedColors'), }, winteryHairColors: { - setPrice: 5, availableFrom: '2019-01-08', availableUntil: '2019-02-02', text: t('winteryColors'), + setPrice: 5, availableFrom: '2020-01-10', availableUntil: '2020-02-02', text: t('winteryColors'), }, rainbowSkins: { setPrice: 5, text: t('rainbowSkins') }, animalSkins: { setPrice: 5, text: t('animalSkins') }, @@ -32,6 +32,6 @@ export default prefill({ setPrice: 5, availableFrom: '2019-07-02', availableUntil: '2019-08-02', text: t('splashySkins'), }, winterySkins: { - setPrice: 5, availableFrom: '2019-01-08', availableUntil: '2019-02-02', text: t('winterySkins'), + setPrice: 5, availableFrom: '2020-01-10', availableUntil: '2020-02-02', text: t('winterySkins'), }, }); diff --git a/website/raw_sprites/spritesmith_large/promo_wintery_hair.png b/website/raw_sprites/spritesmith_large/promo_wintery_hair.png new file mode 100644 index 0000000000..a23550ff04 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_wintery_hair.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_wintery_skins.png b/website/raw_sprites/spritesmith_large/promo_wintery_skins.png new file mode 100644 index 0000000000..65d8c6b38c Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_wintery_skins.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 54a0627476..d13acdd40b 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 = 'JANUARY BACKGROUNDS AND ARMOIRE ITEMS!'; +const LAST_ANNOUNCEMENT_TITLE = 'WINTERY SKINS AND HAIR COLORS!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,24 +31,26 @@ api.getNews = {

${res.t('newStuff')}

-

1/6/2020 - ${LAST_ANNOUNCEMENT_TITLE}

+

1/14/2020 - ${LAST_ANNOUNCEMENT_TITLE}


-
+

- We’ve added three new backgrounds to the Background Shop! Now your avatar can celebrate - at a Birthday Party, gaze at the quiet beauty of a Snowy Desert, and strike a festive - pose In A Snowglobe. Check them out under User Icon > Backgrounds! + The Seasonal Edition Wintery Hair Colors are now available for purchase! Now you can dye + your avatar's hair Snowy, Peppermint, Holly Green, Aurora, Winter Star, or Festive.

- Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the - Birthday Cake set. Better work hard on your real-life tasks to earn all the pieces! - Enjoy :) + Plus, the Seasonal Edition Wintery Skins are available, too! You can complete your winter + avatar look with Aurora, Dapper, Festive, Holly, Polar, Sugar, or Winter Star Skins.

-
- by FolleMente, Shine Caramia, Aspiring Advocate, gawrone, katieslug, and SabreCat -
+

+ Both of these Seasonal Edition customization sets will only be available to purchase + until January 31st, after which they'll be gone until next year, so be sure to scoop them + up now! You can find them in User>Edit Avatar! +

+
by Lemoness and tricksy.fox
+
`, });