diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index d81865a72a..69876cef29 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -643,6 +643,14 @@ "backgroundRiverOfLavaText": "River of Lava", "backgroundRiverOfLavaNotes": "Defy convection taking a stroll along a River of Lava.", + "backgrounds122020": "SET 79: Released December 2020", + "backgroundGingerbreadHouseText": "Gingerbread House", + "backgroundGingerbreadHouseNotes": "Take in the sights, scents, and (if you dare) flavors of a Gingerbread House.", + "backgroundHolidayHearthText": "Holiday Hearth", + "backgroundHolidayHearthNotes": "Relax, warm up, and dry off beside a Holiday Hearth.", + "backgroundInsideAnOrnamentText": "Inside an Ornament", + "backgroundInsideAnOrnamentNotes": "Let your festive cheer shine out from Inside an Ornament.", + "timeTravelBackgrounds": "Steampunk Backgrounds", "backgroundAirshipText": "Airship", "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.", diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 0e63e518e1..fe002d36e1 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -518,6 +518,8 @@ "weaponArmoireEnchantersStaffNotes": "The green stones on this staff are filled with the power of change that flows strong through the autumn wind. Increases Perception by <%= per %>. Enchanted Armoire: Autumn Enchanter Set (Item 3 of 4).", "weaponArmoireClubOfClubsText": "Club of... Clubs", "weaponArmoireClubOfClubsNotes": "This stylish club won't tip your hand too early about your intentions toward those sneaky old tasks. Increases Strength by <%= str %>. Enchanted Armoire: Jack of Clubs Set (Item 2 of 3).", + "weaponArmoireEveningTeaText": "Cup of Tea", + "weaponArmoireEveningTeaNotes": "This panacea will help you relax so those big tasks don't look so threatening. Increases Intelligence by <%= int %>. Enchanted Armoire: Dressing Gown Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -1114,6 +1116,8 @@ "armorArmoireAutumnEnchantersCloakNotes": "A sorcerer as skilled as you needs to look as powerful as they feel. Increases Intelligence by 12. Enchanted Armoire: Autumn Enchanter Set (Item 2 of 4).", "armorArmoireDoubletOfClubsText": "Doublet Of Clubs", "armorArmoireDoubletOfClubsNotes": "Who knows what's in the cards, but you'll look stylish at any event in this doublet and cape! Increases Constitution by <%= con %>. Enchanted Armoire: Jack of Clubs Set (Item 3 of 3).", + "armorArmoireDressingGownText": "Comfy Dressing Gown", + "armorArmoireDressingGownNotes": "Relax in style with this beautiful traditional dressing gown. Increases Constitution by <%= con %>. Enchanted Armoire: Dressing Gown Set (Item 1 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1732,6 +1736,8 @@ "headArmoireHornsOfAutumnNotes": "Draw the power of the season's brisk air and channel it through your magic! Increases Strength by <%= str %>. Enchanted Armoire: Autumn Enchanter Set (Item 1 of 4).", "headArmoireCapOfClubsText": "Cap of Clubs", "headArmoireCapOfClubsNotes": "Let everyone know about your latest achievements with this literal feather in your cap! Increases Intelligence by <%= int %>. Enchanted Armoire: Jack of Clubs Set (Item 1 of 3).", + "headArmoireNightcapText": "Nightcap", + "headArmoireNightcapNotes": "Your new nightcap even has a nice bouncy pompom! Increases Perception by <%= per %>. Enchanted Armoire: Dressing Gown Set (Item 2 of 3).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index cbd697a2d9..74acc1b9db 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -410,6 +410,11 @@ const backgrounds = { resting_in_the_inn: { }, river_of_lava: { }, }, + backgrounds122020: { + gingerbread_house: { }, + holiday_hearth: { }, + inside_an_ornament: { }, + }, timeTravelBackgrounds: { airship: { price: 1, diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index fd251d076c..9e2e61789e 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -334,6 +334,10 @@ const armor = { con: 10, set: 'jackOfClubs', }, + dressingGown: { + con: 12, + set: 'dressingGown', + }, }; const body = { @@ -668,6 +672,10 @@ const head = { int: 10, set: 'jackOfClubs', }, + nightcap: { + per: 12, + set: 'dressingGown', + }, }; const shield = { @@ -1143,6 +1151,10 @@ const weapon = { str: 10, set: 'jackOfClubs', }, + eveningTea: { + int: 12, + set: 'dressingGown', + }, }; forEach({ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_gingerbread_house.png b/website/raw_sprites/spritesmith/backgrounds/background_gingerbread_house.png new file mode 100644 index 0000000000..90d7cee9c5 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_gingerbread_house.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_holiday_hearth.png b/website/raw_sprites/spritesmith/backgrounds/background_holiday_hearth.png new file mode 100644 index 0000000000..56712de4ec Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_holiday_hearth.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_inside_an_ornament.png b/website/raw_sprites/spritesmith/backgrounds/background_inside_an_ornament.png new file mode 100644 index 0000000000..5ed268e0e9 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_inside_an_ornament.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_gingerbread_house.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_gingerbread_house.png new file mode 100644 index 0000000000..f5ffa79379 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_gingerbread_house.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_hearth.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_hearth.png new file mode 100644 index 0000000000..1d0ed251ae Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_hearth.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_inside_an_ornament.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_inside_an_ornament.png new file mode 100644 index 0000000000..19a40edb08 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_inside_an_ornament.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_dressingGown.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_dressingGown.png new file mode 100644 index 0000000000..c091058cfb Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_dressingGown.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_nightcap.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_nightcap.png new file mode 100644 index 0000000000..0517d64661 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_nightcap.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_dressingGown.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_dressingGown.png new file mode 100644 index 0000000000..bc695c3036 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_dressingGown.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_nightcap.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_nightcap.png new file mode 100644 index 0000000000..d706b41024 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_nightcap.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_eveningTea.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_eveningTea.png new file mode 100644 index 0000000000..0d99a710a9 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_eveningTea.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_dressingGown.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_dressingGown.png new file mode 100644 index 0000000000..0d361c7530 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_dressingGown.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_eveningTea.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_eveningTea.png new file mode 100644 index 0000000000..e6cdf55936 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_eveningTea.png differ