diff --git a/habitica-images b/habitica-images index c17cf70c40..bb5f371ec4 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit c17cf70c407e0b8d7e0b0cd84f7aecfea295d568 +Subproject commit bb5f371ec4b5963b9476944f7d7785b2cd83ca39 diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 9f65aa4c73..f94855687a 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -715,6 +715,11 @@ width: 141px; height: 147px; } +.background_cemetery_gate { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_cemetery_gate.png'); + width: 141px; + height: 147px; +} .background_champions_colosseum { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_champions_colosseum.png'); width: 141px; @@ -1359,6 +1364,11 @@ width: 141px; height: 147px; } +.background_mask_makers_workshop { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_mask_makers_workshop.png'); + width: 141px; + height: 147px; +} .background_meandering_cave { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_meandering_cave.png'); width: 141px; @@ -1714,6 +1724,11 @@ width: 141px; height: 147px; } +.background_spooky_ruins { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_spooky_ruins.png'); + width: 141px; + height: 147px; +} .background_spooky_scarecrow_field { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_spooky_scarecrow_field.png'); width: 141px; @@ -2286,6 +2301,11 @@ width: 68px; height: 68px; } +.icon_background_cemetery_gate { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_cemetery_gate.png'); + width: 60px; + height: 60px; +} .icon_background_champions_colosseum { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_champions_colosseum.png'); width: 68px; @@ -2935,6 +2955,11 @@ width: 68px; height: 68px; } +.icon_background_mask_makers_workshop { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_mask_makers_workshop.png'); + width: 68px; + height: 68px; +} .icon_background_meandering_cave { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_meandering_cave.png'); width: 68px; @@ -3290,6 +3315,11 @@ width: 68px; height: 68px; } +.icon_background_spooky_ruins { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_spooky_ruins.png'); + width: 68px; + height: 68px; +} .icon_background_spooky_scarecrow_field { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_spooky_scarecrow_field.png'); width: 68px; @@ -18450,6 +18480,11 @@ width: 114px; height: 90px; } +.broad_armor_armoire_sheetGhostCostume { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_sheetGhostCostume.png'); + width: 114px; + height: 90px; +} .broad_armor_armoire_shepherdRobes { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_shepherdRobes.png'); width: 90px; @@ -19660,6 +19695,11 @@ width: 68px; height: 68px; } +.shop_armor_armoire_sheetGhostCostume { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_sheetGhostCostume.png'); + width: 68px; + height: 68px; +} .shop_armor_armoire_shepherdRobes { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_shepherdRobes.png'); width: 68px; @@ -21335,6 +21375,11 @@ width: 114px; height: 90px; } +.slim_armor_armoire_sheetGhostCostume { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_sheetGhostCostume.png'); + width: 114px; + height: 90px; +} .slim_armor_armoire_shepherdRobes { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_shepherdRobes.png'); width: 90px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index bf0dd191e6..f8f6ab0fcc 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -819,6 +819,14 @@ "backgroundOldPhotoText": "Old Photo", "backgroundOldPhotoNotes": "Strike a pose in an Old Photo.", + "backgrounds102022": "SET 101: Released October 2022", + "backgroundSpookyRuinsText": "Spooky Ruins", + "backgroundSpookyRuinsNotes": "Explore some Spooky Ruins.", + "backgroundMaskMakersWorkshopText": "Mask Maker's Workshop", + "backgroundMaskMakersWorkshopNotes": "Try on a new face at the Mask Maker's Workshop.", + "backgroundCemeteryGateText": "Cemetery Gate", + "backgroundCemeteryGateNotes": "Haunt a Cemetery Gate.", + "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 f1f95ffc08..7a1d3226e3 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1390,6 +1390,8 @@ "armorArmoireStrawRaincoatNotes": "This woven straw cape will keep you dry and your armor from rusting while on your quest. Just don’t venture too near a candle! Increases Constitution by <%= con %>. Enchanted Armoire: Straw Raincoat Set (Item 1 of 2).", "armorArmoireFancyPirateSuitText": "Fancy Pirate Jacket", "armorArmoireFancyPirateSuitNotes": "Wear this fine jacket well as you organize your ship’s library or talk it through as a crew. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Fancy Pirate Set (Item 1 of 3).", + "armorArmoireSheetGhostCostumeText": "Sheet Ghost Costume", + "armorArmoireSheetGhostCostumeNotes": "Boo! This is the scariest costume in all of Habitica, so wear it wisely... and watch your step so you don’t trip. Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "headgear": "helm", "headgearCapitalized": "Headgear", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index d19d007e72..da811e7ea9 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -520,6 +520,11 @@ const backgrounds = { autumn_picnic: { }, old_photo: { }, }, + backgrounds102022: { + spooky_ruins: { }, + mask_makers_workshop: { }, + cemetery_gate: { }, + }, 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 326b2efa13..1f5eccefa6 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -401,6 +401,9 @@ const armor = { int: 4, set: 'fancyPirate', }, + sheetGhostCostume: { + con: 10, + }, }; const body = {