diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss index 1b29e6ba45..b1cb63ed59 100644 --- a/website/client/src/assets/scss/variables.scss +++ b/website/client/src/assets/scss/variables.scss @@ -1,11 +1,11 @@ // this variables are used to determine which shop npc/backgrounds should be loaded -// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, normal +// possible values are: normal, fall, habitoween, normal, winter, nye, birthday, valentines, normal, normal // more to be added on future seasons -$npc_market_flavor: 'thanksgiving'; -$npc_quests_flavor: 'thanksgiving'; -$npc_seasonal_flavor: 'thanksgiving'; +$npc_market_flavor: 'normal'; +$npc_quests_flavor: 'normal'; +$npc_seasonal_flavor: 'normal'; $npc_timetravelers_flavor: 'normal'; -$npc_tavern_flavor: 'thanksgiving'; +$npc_tavern_flavor: 'normal'; $menuToolbarHeight: 56px; diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 57523fee76..0e63e518e1 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1587,6 +1587,8 @@ "headMystery202010Notes": "We'll spare you another joke about echolocation... cation... cation. Confers no benefit. October 2020 Subscriber Item.", "headMystery202011Text": "Foliated Magus Hat", "headMystery202011Notes": "Wield the power of the changing seasons while also looking very stylish! Confers no benefit. November 2020 Subscriber Item.", + "headMystery202012Text": "Frostfire Mask", + "headMystery202012Notes": "This imposing mask features piercing eyes that will blind foes like the glare of sunlight on fresh snow. Confers no benefit. December 2020 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", @@ -2092,6 +2094,8 @@ "backMystery202009Notes": "Let these huge wings take you to new heights! Confers no benefit. September 2020 Subscriber Item.", "backMystery202010Text": "Beguiling Bat Wings", "backMystery202010Notes": "You are the night! So fly as silently as a midnight cloud with these swift purple wings. Confers no benefit. October 2020 Subscriber Item.", + "backMystery202012Text": "Frostfire Wings", + "backMystery202012Notes": "The snowy feathers of these wings will grant you the speed of a wintry gale. Confers no benefit. December 2020 Subscriber Item.", "backSpecialWonderconRedText": "Mighty Cape", "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 2eacdf5008..335be6dfdb 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -117,6 +117,7 @@ "mysterySet202009": "Marvelous Moth Set", "mysterySet202010": "Beguilingly Batty Set", "mysterySet202011": "Foliated Magus Set", + "mysterySet202012": "Frostfire Phoenix Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySet301703": "Peacock Steampunk Set", diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index fbe718a521..2235d7c7b2 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -79,6 +79,7 @@ const back = { 202005: { }, 202009: { }, 202010: { }, + 202012: { }, }; const body = { @@ -159,6 +160,7 @@ const head = { 202008: { }, 202010: { }, 202011: { }, + 202012: { }, 301404: { }, 301405: { }, 301703: { }, diff --git a/website/raw_sprites/spritesmith/gear/events/mystery_202012/back_mystery_202012.png b/website/raw_sprites/spritesmith/gear/events/mystery_202012/back_mystery_202012.png new file mode 100644 index 0000000000..7d0c5542d0 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/events/mystery_202012/back_mystery_202012.png differ diff --git a/website/raw_sprites/spritesmith/gear/events/mystery_202012/head_mystery_202012.png b/website/raw_sprites/spritesmith/gear/events/mystery_202012/head_mystery_202012.png new file mode 100644 index 0000000000..4ed6af67b0 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/events/mystery_202012/head_mystery_202012.png differ diff --git a/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_back_mystery_202012.png b/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_back_mystery_202012.png new file mode 100644 index 0000000000..7c42cb28a5 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_back_mystery_202012.png differ diff --git a/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_head_mystery_202012.png b/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_head_mystery_202012.png new file mode 100644 index 0000000000..27c0c62061 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_head_mystery_202012.png differ diff --git a/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_set_mystery_202012.png b/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_set_mystery_202012.png new file mode 100644 index 0000000000..94fb664787 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/events/mystery_202012/shop_set_mystery_202012.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index ee18cd560d..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_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index ef720ee718..2531f1084b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ