diff --git a/habitica-images b/habitica-images index d2919bc15f3..dedbcf0f24e 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit d2919bc15f38d7bd90c884447981cd5bcaaf6739 +Subproject commit dedbcf0f24e0147155c0782b3f3b3195f84b297e diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 3a5f534746d..e44c629f22a 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -2396,6 +2396,11 @@ width: 141px; height: 147px; } +.background_winter_landscape_with_cabin { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_winter_landscape_with_cabin.png'); + width: 141px; + height: 147px; +} .background_winter_mountain_range { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_winter_mountain_range.png'); width: 141px; @@ -29904,6 +29909,11 @@ width: 114px; height: 90px; } +.broad_armor_armoire_snowyFluffTrimmedCoat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_snowyFluffTrimmedCoat.png'); + width: 114px; + height: 90px; +} .broad_armor_armoire_softBlackSuit { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_softBlackSuit.png'); width: 114px; @@ -30469,6 +30479,11 @@ width: 117px; height: 120px; } +.head_armoire_snowyTrapperHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_snowyTrapperHat.png'); + width: 114px; + height: 90px; +} .head_armoire_stormKnightHelm { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_stormKnightHelm.png'); width: 114px; @@ -31389,6 +31404,11 @@ width: 114px; height: 90px; } +.slim_armor_armoire_snowyFluffTrimmedCoat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_snowyFluffTrimmedCoat.png'); + width: 114px; + height: 90px; +} .slim_armor_armoire_softBlackSuit { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_softBlackSuit.png'); width: 114px; @@ -33699,6 +33719,16 @@ width: 90px; height: 90px; } +.head_mystery_202501 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202501.png'); + width: 114px; + height: 90px; +} +.shield_mystery_202501 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_mystery_202501.png'); + width: 114px; + height: 90px; +} .back_mystery_201402 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_201402.png'); width: 90px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index d4e989adc52..96730340695 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -1007,6 +1007,10 @@ "backgroundFirstSnowForestText": "First Snow in the Forest", "backgroundFirstSnowForestNotes": "Step into the First Snow in the Forest.", + "backgrounds012025": "SET 128: Released January 2025", + "backgroundWinterLandscapeWithCabinText": "Winter Landscape with Cabin", + "backgroundWinterLandscapeWithCabinNotes": "Stay cozy in a Winter Landscape with a Cabin.", + "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 2b35806d56e..1e1b7449047 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1679,6 +1679,8 @@ "armorArmoireStormKnightArmorNotes": "In this armor, you are nearly invincible. Your enemies will never see the storm’s end. Increases Perception by <%= per %>. Enchanted Armoire: Storm Knight Set (Item 2 of 3)", "armorArmoireFestiveHelperOverallsText": "Festive Helper Overalls", "armorArmoireFestiveHelperOverallsNotes": "Durable and comfortable, these overalls are great for working, playing, and assisting others. Plus, it has pockets! Increases Constitution by <%= con %>. Enchanted Armoire: Festive Helper Set (Item 2 of 2)", + "armorArmoireSnowyFluffTrimmedCoatText": "Snowy Fluff-Trimmed Coat", + "armorArmoireSnowyFluffTrimmedCoatNotes": "As the first flakes fall around you, this coat will not only keep you toasty but also help you blend in perfectly with your snowy surroundings. Glide along the ice in style! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Snowy Trapper Hat Set (Item 2 of 2).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -2368,6 +2370,8 @@ "headMystery202411Notes": "This helm is quite intimidating to your tasks when you dive in headfirst! Confers no benefit. November 2024 Subscriber Item.", "headMystery202412Text": "Candy Cane Cottontail Hood", "headMystery202412Notes": "Warm and cozy, just like a cup of minty hot cocoa on a winter night! Confers no benefit. December 2024 Subscriber Item.", + "headMystery202501Text": "Frostbinder’s Hat", + "headMystery202501Notes": "This sparkling hat generates a light and festive flurry around you at all times. Confers no benefit. January 2025 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", @@ -2574,6 +2578,8 @@ "headArmoireStormKnightHelmNotes": "Harness lightning through these antlers as you storm the castle. Increases Constitution by <%= con %>. Enchanted Armoire: Storm Knight Set (Item 1 of 3)", "headArmoireFestiveHelperHatText": "Festive Helper Hat", "headArmoireFestiveHelperHatNotes": "Holiday tip #27: have a helper hat handy. This one is big enough to keep an emergency toy underneath! Increases Intelligence by <%= int %>. Enchanted Armoire: Festive Helper Set (Item 1 of 2)", + "headArmoireSnowyTrapperHatText": "Snowy Trapper Hat", + "headArmoireSnowyTrapperHatNotes": "Blue, frostbitten ears will be a thing of the past. Embrace cozy warmth in style! Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Snowy Trapper Hat Set (Item 1 of 2).", "offhand": "off-hand item", "offHandCapitalized": "Off-Hand Item", @@ -2887,6 +2893,8 @@ "shieldMystery202408Notes": "Magic lights will illuminate the inside of your bubble hideout, or anywhere else you need a little light! Confers no benefit. August 2024 Subscriber Item.", "shieldMystery202409Text": "Heliotrope Magus Staff", "shieldMystery202409Notes": "The glowing ruby on this staff draws its power from the late summer sun. Confers no benefit. September 2024 Subscriber Item.", + "shieldMystery202501Text": "Frostbinder's Staff", + "shieldMystery202501Notes": "Decorate any outdoor scenery with a diamond coat of shimmering frost. Confers no benefit. January 2025 Subscriber Item.", "shieldMystery301405Text": "Clock Shield", "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 394746ce8f1..fb78e994de7 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -169,6 +169,7 @@ "mysterySet202410": "Candy Corn Fox Set", "mysterySet202411": "Bristled Brawler Set", "mysterySet202412": "Candy Cane Cottontail Set", + "mysterySet202501": "Frostbinder Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySet301703": "Peacock Steampunk Set", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index d9329406ae6..13d61710a42 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -641,6 +641,9 @@ const backgrounds = { backgrounds122024: { first_snow_forest: { }, }, + backgrounds012025: { + winter_landscape_with_cabin: { }, + }, eventBackgrounds: { birthday_bash: { price: 0, diff --git a/website/common/script/content/constants/releaseDates.js b/website/common/script/content/constants/releaseDates.js index f519db780af..59e93ede047 100644 --- a/website/common/script/content/constants/releaseDates.js +++ b/website/common/script/content/constants/releaseDates.js @@ -14,6 +14,7 @@ export const ARMOIRE_RELEASE_DATES = { frightNightSet: { year: 2024, month: 10 }, stormKnightSet: { year: 2024, month: 11 }, festiveHelperSet: { year: 2024, month: 12 }, + snowyTrapperSet: { year: 2025, month: 1 }, }; export const EGGS_RELEASE_DATES = { diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index c5be7dfcd43..5b0531678b8 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -506,6 +506,11 @@ const armor = { con: 12, set: 'festiveHelperSet', }, + snowyFluffTrimmedCoat: { + str: 6, + int: 6, + set: 'snowyTrapperSet', + }, }; const body = { @@ -1035,6 +1040,11 @@ const head = { int: 12, set: 'festiveHelperSet', }, + snowyTrapperHat: { + con: 6, + per: 6, + set: 'snowyTrapperSet', + }, }; const shield = { diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index 3e15da24be9..65fb8e9f869 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -234,6 +234,7 @@ const head = { 202409: { }, 202411: { }, 202412: { }, + 202501: { }, 301404: { }, 301405: { }, 301703: { }, @@ -282,6 +283,7 @@ const shield = { 202209: { }, 202408: { }, 202409: { }, + 202501: { }, 301405: { }, 301704: { }, };