From f1993db0fa66929c48f33ef09203bfa099ce79f7 Mon Sep 17 00:00:00 2001 From: Natalie <78037386+CuriousMagpie@users.noreply.github.com> Date: Wed, 23 Oct 2024 10:49:35 -0400 Subject: [PATCH] November Content Update (#15342) * add sprites * November 2024 Content Release * update November content * chore(git): reset spritesheet * updated spritesheet * fix(backgrounds): typo --------- Co-authored-by: Kalista Payne --- habitica-images | 2 +- .../assets/css/sprites/spritesmith-main.css | 40 +++++++++++++++++++ website/common/locales/en/backgrounds.json | 6 ++- website/common/locales/en/gear.json | 10 +++++ website/common/locales/en/subscriber.json | 1 + .../script/content/appearance/backgrounds.js | 3 ++ .../script/content/constants/releaseDates.js | 1 + .../script/content/gear/sets/armoire.js | 12 ++++++ .../script/content/gear/sets/mystery.js | 2 + 9 files changed, 75 insertions(+), 2 deletions(-) diff --git a/habitica-images b/habitica-images index 88511f3603..ba9df7ea78 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 88511f3603b41da9d1dccd39350dbb58bc90d61a +Subproject commit ba9df7ea78129e7041fa603d4210ef9aa6a5e2ec diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 2590e8e8f6..22331c380e 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -805,6 +805,11 @@ width: 141px; height: 147px; } +.background_castle_hall_with_hearth { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_castle_hall_with_hearth.png'); + width: 141px; + height: 147px; +} .background_cemetery_gate { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_cemetery_gate.png'); width: 141px; @@ -29924,6 +29929,11 @@ width: 114px; height: 90px; } +.broad_armor_armoire_stormKnightArmor { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_stormKnightArmor.png'); + width: 114px; + height: 90px; +} .broad_armor_armoire_strawRaincoat { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_strawRaincoat.png'); width: 114px; @@ -30444,6 +30454,11 @@ width: 117px; height: 120px; } +.head_armoire_stormKnightHelm { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_stormKnightHelm.png'); + width: 114px; + height: 90px; +} .head_armoire_strawRainHat { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_strawRainHat.png'); width: 114px; @@ -31389,6 +31404,11 @@ width: 114px; height: 90px; } +.slim_armor_armoire_stormKnightArmor { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_stormKnightArmor.png'); + width: 114px; + height: 90px; +} .slim_armor_armoire_strawRaincoat { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_strawRaincoat.png'); width: 114px; @@ -31949,6 +31969,11 @@ width: 114px; height: 90px; } +.weapon_armoire_stormKnightAxe { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_stormKnightAxe.png'); + width: 114px; + height: 90px; +} .weapon_armoire_vermilionArcherBow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_vermilionArcherBow.png'); width: 90px; @@ -35304,6 +35329,16 @@ width: 114px; height: 90px; } +.body_mystery_202411 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/body_mystery_202411.png'); + width: 114px; + height: 90px; +} +.head_mystery_202411 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202411.png'); + width: 114px; + height: 90px; +} .broad_armor_mystery_301404 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png'); width: 90px; @@ -40397,6 +40432,11 @@ width: 219px; height: 219px; } +.quest_lostMasterclasser4 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_lostMasterclasser4.png'); + width: 219px; + height: 219px; +} .quest_mayhemMistiflying1 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_mayhemMistiflying1.png'); width: 150px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 218f8e9950..5c6fae7bad 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -995,10 +995,14 @@ "backgroundMagicDoorInForestText": "Magic Door in the Forest", "backgroundMagicDoorInForestNotes": "Dare to step through the Magic Door in the Forest.", - "backgrounds102024": "SET 124: Released September 2024", + "backgrounds102024": "SET 125: Released October 2024", "backgroundSurroundedByGhostsText": "Surrounded by Ghosts", "backgroundSurroundedByGhostsNotes": "Spend a spooky evening Surrounded by Ghosts.", + "backgrounds112024": "SET 126: Released November 2024", + "backgroundCastleHallWithHearthText": "Castle Hall with Hearth", + "backgroundCastleHallWithHearthNotes": "Bask in the warmth of a Castle Hall with a Hearth.", + "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 c157bd3889..e2bee90ba3 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -789,6 +789,8 @@ "weaponArmoireFunnyFoolBatonNotes": "With a wave of your baton you can deliver a punchline, redirect attention, or summon applause. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Funny Fool Set (Item 3 of 3)", "weaponArmoireSpookyCandyBucketText": "Spooky Candy Bucket", "weaponArmoireSpookyCandyBucketNotes": "With an epic costume like that, you’re going to get so much candy! Good thing you’ve got this bottomless bucket to hold it all. Try not to snack on any until you get home. Increases Intelligence by <%= int %>. Enchanted Armoire: Fright Night Set (Item 2 of 2)", + "weaponArmoireStormKnightAxeText": "Storm Knight Axe", + "weaponArmoireStormKnightAxeNotes": "Gather your fury and strike a blow like thunder! Increases Strength by <%= str %>. Enchanted Armoire: Storm Knight Set (Item 3 of 3)", "armor": "armor", "armorCapitalized": "Armor", @@ -1652,6 +1654,8 @@ "armorArmoireDragonKnightsArmorNotes": "Channel the strength and power of a dragon with this armor made of silver and shed scales. Increases Strength by <%= str %>. Enchanted Armoire: Dragon Knight Set (Item 2 of 3)", "armorArmoireFunnyFoolCostumeText": "Funny Fool Costume", "armorArmoireFunnyFoolCostumeNotes": "Dum-de-dum! Surely you jest. This colorful outfit looks amazing on you! Increases Strength by <%= str %>. Enchanted Armoire: Funny Fool Set (Item 2 of 3)", + "armorArmoireStormKnightArmorText": "Storm Knight Armor", + "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)", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -2328,6 +2332,8 @@ "headMystery202407Notes": "These magical gills will let you breathe underwater! Confers no benefit. July 2024 Subscriber Item.", "headMystery202409Text": "Heliotrope Magus Hat", "headMystery202409Notes": "More than just jaunty decorations, the enchanted sunflowers on this hat fill the wearer with powerful magic energy. Confers no benefit. September 2024 Subscriber Item.", + "headMystery202411Text": "Bristled Helm", + "headMystery202411Notes": "This helm is quite intimidating to your tasks when you dive in headfirst! Confers no benefit. November 2024 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", @@ -2530,6 +2536,8 @@ "headArmoireDragonKnightsHelmNotes": "With the fiery features on this helmet, dragons might mistake you for one of their own. Increases Intelligence by <%= int %>. Enchanted Armoire: Dragon Knight Set (Item 1 of 3)", "headArmoireFunnyFoolCapText": "Funny Fool Cap", "headArmoireFunnyFoolCapNotes": "The bells on this hat might make your opponents burst into giggles, but they just help you concentrate. Increases Constitution by <%= con %>. Enchanted Armoire: Funny Fool Set (Item 1 of 3)", + "headArmoireStormKnightHelmText": "Storm Knight Helm", + "headArmoireStormKnightHelmNotes": "Harness lightning through these antlers as you storm the castle. Increases Constitution by <%= con %>. Enchanted Armoire: Storm Knight Set (Item 1 of 3)", "offhand": "off-hand item", "offHandCapitalized": "Off-Hand Item", @@ -3177,6 +3185,8 @@ "bodyMystery202008Notes": "For now, your wings lie furled. But when you have concluded dispensing your wisdom, or you sight your prey in the grass, watch out! Confers no benefit. August 2020 Subscriber Item.", "bodyMystery202107Text": "Far-Out Floaty Flamingo", "bodyMystery202107Notes": "This trusty companion will never let you down and will always keep your spirits buoyant! Confers no benefit. July 2021 Subscriber Item.", + "bodyMystery202411Text": "Bristled Pauldrons", + "bodyMystery202411Notes": "The formidable spikes on these pauldrons are perfect for charging ahead with your to-do list. Confers no benefit. November 2024 Subscriber Item.", "bodyArmoireCozyScarfText": "Cozy Scarf", "bodyArmoireCozyScarfNotes": "This fine scarf will keep you warm as you go about your wintry business. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Lamplighter's Set (Item 4 of 4).", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 4a805882b8..766dd2ea36 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -167,6 +167,7 @@ "mysterySet202408": "Arcane Aegis Set", "mysterySet202409": "Heliotrope Magus Set", "mysterySet202410": "Candy Corn Fox Set", + "mysterySet202411": "Bristled Brawler 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 2fd856910a..84bc2354a7 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -635,6 +635,9 @@ const backgrounds = { backgrounds102024: { surrounded_by_ghosts: { }, }, + backgrounds112024: { + castle_hall_with_hearth: { }, + }, eventBackgrounds: { birthday_bash: { price: 0, diff --git a/website/common/script/content/constants/releaseDates.js b/website/common/script/content/constants/releaseDates.js index d528c117a0..fddf41b510 100644 --- a/website/common/script/content/constants/releaseDates.js +++ b/website/common/script/content/constants/releaseDates.js @@ -12,6 +12,7 @@ export const ARMOIRE_RELEASE_DATES = { dragonKnightSet: { year: 2024, month: 8 }, funnyFoolSet: { year: 2024, month: 9 }, frightNightSet: { year: 2024, month: 10 }, + stormKnightSet: { year: 2024, month: 11 }, }; 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 d89d7359bb..341b973b76 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -498,6 +498,10 @@ const armor = { str: 15, set: 'funnyFoolSet', }, + stormKnightArmor: { + per: 11, + set: 'stormKnightSet', + }, }; const body = { @@ -1019,6 +1023,10 @@ const head = { con: 15, set: 'funnyFoolSet', }, + stormKnightHelm: { + con: 11, + set: 'stormKnightSet', + }, }; const shield = { @@ -1877,6 +1885,10 @@ const weapon = { int: 10, set: 'frightNightSet', }, + stormKnightAxe: { + str: 11, + set: 'stormKnightSet', + }, }; const releaseDay = 7; diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index 02aa072a5c..75f28b041d 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -122,6 +122,7 @@ const body = { 202003: { }, 202008: { }, 202107: { }, + 202411: { }, }; const eyewear = { @@ -230,6 +231,7 @@ const head = { 202406: { }, 202407: { }, 202409: { }, + 202411: { }, 301404: { }, 301405: { }, 301703: { },