From 6df4ce251c132019124178d356e11cf9ce4e7f5e Mon Sep 17 00:00:00 2001 From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Tue, 6 Sep 2022 13:31:55 -0400 Subject: [PATCH] chore(content): add September 2022 Backgrounds and Enchanted Armoire Items (#14200) * chore(submodule): add August 2022 Mystery Items * chore(content): add September 2022 Backgrounds and Enchanted Armoire Items * fix(typo): periods so people don't grumble * fix(typo): consistent caps Co-authored-by: Sabe Jones --- .../assets/css/sprites/spritesmith-main.css | 50 +++++++++++++++++++ website/common/locales/en/backgrounds.json | 8 +++ website/common/locales/en/gear.json | 4 ++ .../script/content/appearance/backgrounds.js | 5 ++ .../script/content/gear/sets/armoire.js | 6 +++ 5 files changed, 73 insertions(+) diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 4944d95ed6..277ff3f148 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -570,6 +570,11 @@ width: 141px; height: 147px; } +.background_autumn_picnic { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_autumn_picnic.png'); + width: 141px; + height: 147px; +} .background_autumn_poplars { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_autumn_poplars.png'); width: 141px; @@ -1439,6 +1444,11 @@ width: 141px; height: 147px; } +.background_old_photo { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_old_photo.png'); + width: 141px; + height: 147px; +} .background_on_a_castle_wall { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_a_castle_wall.png'); width: 141px; @@ -1839,6 +1849,11 @@ width: 141px; height: 147px; } +.background_theatre_stage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_theatre_stage.png'); + width: 141px; + height: 147px; +} .background_throne_room { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_throne_room.png'); width: 141px; @@ -2126,6 +2141,11 @@ width: 68px; height: 68px; } +.icon_background_autumn_picnic { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_autumn_picnic.png'); + width: 68px; + height: 68px; +} .icon_background_autumn_poplars { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_autumn_poplars.png'); width: 68px; @@ -3000,6 +3020,11 @@ width: 68px; height: 68px; } +.icon_background_old_photo { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_old_photo.png'); + width: 68px; + height: 68px; +} .icon_background_on_a_castle_wall { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_a_castle_wall.png'); width: 68px; @@ -3405,6 +3430,11 @@ width: 68px; height: 68px; } +.icon_background_theatre_stage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_theatre_stage.png'); + width: 68px; + height: 68px; +} .icon_background_throne_room { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_throne_room.png'); width: 68px; @@ -18510,6 +18540,11 @@ width: 114px; height: 87px; } +.eyewear_armoire_comedyMask { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_armoire_comedyMask.png'); + width: 114px; + height: 90px; +} .eyewear_armoire_goofyGlasses { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_armoire_goofyGlasses.png'); width: 90px; @@ -18520,6 +18555,11 @@ width: 90px; height: 90px; } +.eyewear_armoire_tragedyMask { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_armoire_tragedyMask.png'); + width: 114px; + height: 90px; +} .headAccessory_armoire_comicalArrow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_armoire_comicalArrow.png'); width: 90px; @@ -19725,6 +19765,11 @@ width: 68px; height: 68px; } +.shop_eyewear_armoire_comedyMask { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_armoire_comedyMask.png'); + width: 68px; + height: 68px; +} .shop_eyewear_armoire_goofyGlasses { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_armoire_goofyGlasses.png'); width: 68px; @@ -19735,6 +19780,11 @@ width: 68px; height: 68px; } +.shop_eyewear_armoire_tragedyMask { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_armoire_tragedyMask.png'); + width: 68px; + height: 68px; +} .shop_headAccessory_armoire_comicalArrow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_armoire_comicalArrow.png'); width: 68px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index a4747e70c6..bf0dd191e6 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -811,6 +811,14 @@ "backgroundByACampfireText": "By A Campfire", "backgroundByACampfireNotes": "Bask in the glow By a Campfire.", + "backgrounds092022": "SET 100: Released September 2022", + "backgroundTheatreStageText": "Theatre Stage", + "backgroundTheatreStageNotes": "Perform on a Theatre Stage.", + "backgroundAutumnPicnicText": "Autumn Picnic", + "backgroundAutumnPicnicNotes": "Enjoy an Autumn Picnic.", + "backgroundOldPhotoText": "Old Photo", + "backgroundOldPhotoNotes": "Strike a pose in an Old Photo.", + "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 c2678b12cd..3c81c01acf 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -2867,6 +2867,10 @@ "eyewearArmoireGoofyGlassesNotes": "Perfect for going incognito or just making your partymates giggle. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", "eyewearArmoireClownsNoseText": "Clown's Nose", "eyewearArmoireClownsNoseNotes": "This accessory will make sure everyone 'nose' you're a clown! Increases Intelligence by <%= int %>. Enchanted Armoire: Clown Set (Item 2 of 5).", + "eyewearArmoireComedyMaskText": "Comedy Mask", + "eyewearArmoireComedyMaskNotes": "Cheerily! Here is a quaint mask for thine happy heart, playing, heralding joy, and expressing merriment and mirth upon the stage. Increases Constitution by <%= con %>. Enchanted Armoire: Theatre Masks Set (Item 1 of 2).", + "eyewearArmoireTragedyMaskText": "Tragedy Mask", + "eyewearArmoireTragedyMaskNotes": "Alas! Here sits a heavy mask for thine poor player, strutting, fretting, and expressing woe and sorrow upon the stage. Increases Intelligence by <%= int %>. Enchanted Armoire: Theatre Masks Set (Item 2 of 2).", "twoHandedItem": "Two-handed item." } diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 414c008c4a..d19d007e72 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -515,6 +515,11 @@ const backgrounds = { messy_room: { }, by_a_campfire: { }, }, + backgrounds092022: { + theatre_stage: { }, + autumn_picnic: { }, + old_photo: { }, + }, 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 96e78b2e11..326b2efa13 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -434,6 +434,12 @@ const eyewear = { clownsNose: { int: 5, }, + tragedyMask: { + int: 10, + }, + comedyMask: { + con: 10, + }, }; const head = {