From 823b339d27ea378e25cea2520be9261e973815b1 Mon Sep 17 00:00:00 2001 From: Natalie <78037386+CuriousMagpie@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:34:57 -0400 Subject: [PATCH] chore: July 2025 content build (#15449) * chore: July 2025 content build * chore: add release dates to armoire * fix(sprites): correct Cryptid typo * fix(grammar): missing comma --------- Co-authored-by: Kalista Payne --- habitica-images | 2 +- .../assets/css/sprites/spritesmith-main.css | 35 +++++++++++++++++++ website/common/locales/en/backgrounds.json | 4 +++ 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 | 15 ++++++++ .../script/content/gear/sets/mystery.js | 2 ++ 9 files changed, 72 insertions(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index cf18a04339..8b0cae9e63 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit cf18a0433939aa3d41b87c5fee9a07083f7309fd +Subproject commit 8b0cae9e63a901a2a426924a082e27a64765ba36 diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 468c678286..4480a8f538 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -2001,6 +2001,11 @@ width: 141px; height: 147px; } +.background_sirens_lair { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_sirens_lair.png'); + width: 141px; + height: 147px; +} .background_slimy_swamp { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_slimy_swamp.png'); width: 141px; @@ -29685,6 +29690,11 @@ width: 114px; height: 90px; } +.broad_armor_armoire_flyFishingWaders { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_flyFishingWaders.png'); + width: 114px; + height: 90px; +} .broad_armor_armoire_funnyFoolCostume { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_funnyFoolCostume.png'); width: 114px; @@ -30300,6 +30310,11 @@ width: 114px; height: 90px; } +.head_armoire_flyFishingHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_flyFishingHat.png'); + width: 114px; + height: 90px; +} .head_armoire_frostedHelm { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_frostedHelm.png'); width: 114px; @@ -30765,6 +30780,11 @@ width: 114px; height: 90px; } +.shield_armoire_flyFishingRod { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_flyFishingRod.png'); + width: 114px; + height: 90px; +} .shield_armoire_gardenersSpade { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_gardenersSpade.png'); width: 114px; @@ -31245,6 +31265,11 @@ width: 114px; height: 90px; } +.slim_armor_armoire_flyFishingWaders { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_flyFishingWaders.png'); + width: 114px; + height: 90px; +} .slim_armor_armoire_funnyFoolCostume { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_funnyFoolCostume.png'); width: 114px; @@ -35600,6 +35625,16 @@ width: 114px; height: 90px; } +.back_mystery_202507 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202507.png'); + width: 117px; + height: 120px; +} +.head_mystery_202507 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202507.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; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 8ddc4cbbcd..f8d1b582ff 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -1031,6 +1031,10 @@ "backgroundSummerSeashoreText": "Summer Seashore", "backgroundSummerSeashoreNotes": "Catch a wave at a Summer Seashore.", + "backgrounds072025": "SET 134: Released July 2025", + "backgroundSirensLairText": "Siren's Lair", + "backgroundSirensLairNotes": "Dare to dive into a Siren’s Lair.", + "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 ce6ef903c2..2ae38371a5 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1734,6 +1734,8 @@ "armorArmoireGildedKnightsPlateNotes": "In this armor, you are nearly invincible. Your enemies will surely hear you roar! Increases Perception by <%= per %>. Enchanted Armoire: Gilded Knight Set (Item 2 of 3)", "armorArmoireBeekeepersSuitText": "Beekeeping Suit", "armorArmoireBeekeepersSuitNotes": "Keep yourself safe as you look after your busy bumbles. Increases Constitution by <%= con %>. Enchanted Armoire: Beekeeper Set (Item 2 of 4)", + "armorArmoireFlyFishingWadersText": "Fly Fishing Waders", + "armorArmoireFlyFishingWadersNotes": "Stay perfectly warm and dry when you wade into a stream, pond, lake, or river. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Fly Fishing Set (Item 2 of 3)", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -2449,6 +2451,8 @@ "headMystery202503Notes": "This verdant hairdo perfectly suits a brave warrior and defender of the planet. Confers no benefit. March 2025 Subscriber Item.", "headMystery202504Text": "Elusive Yeti Cowl", "headMystery202504Notes": "Wear this mysterious visage to dwell undetected among the world’s most obscure cyptids. Confers no benefit. April 2025 Subscriber Item.", + "headMystery202507Text": "Spunky Skater Cap", + "headMystery202507Notes": "Backwards hats are still cool, right? Confers no benefit. July 2025 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", @@ -2667,6 +2671,8 @@ "headArmoireGildedKnightsHelmNotes": "Shine as bright as the sun through the darkness of any battle. Increases Constitution by <%= con %>. Enchanted Armoire: Gilded Knight Set (Item 1 of 3)", "headArmoireBeekeepersHatText": "Beekeeping Helmet and Veil", "headArmoireBeekeepersHatNotes": "Keep your face safe as you tend to your buzzing buddies. Increases Perception by <%= per %>. Enchanted Armoire: Beekeeper Set (Item 1 of 4)", + "headArmoireFlyFishingHatText": "Fly Fishing Hat", + "headArmoireFlyFishingHatNotes": "With a wide brim and spot to hold a spare lure, don’t go fly fishing without this beauty. Increases Strength and Perception by <%= attrs %> each. Enchanted Armoire: Fly Fishing Set (Item 1 of 3)", "offhand": "off-hand item", "offHandCapitalized": "Off-Hand Item", @@ -3174,6 +3180,8 @@ "shieldArmoireSpringPetalUchiwaNotes": "This handheld fan featuring a beautiful petal pattern creates a small breeze just for you as the weather warms. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Spring Petal Set (Item 2 of 2).", "shieldArmoireBeekeepersHiveText": "Beehive", "shieldArmoireBeekeepersHiveNotes": "Beehives serve as both homes and worksites. You might need to talk to your bees about a good work-life balance. Increases Strength by <%= str %>. Enchanted Armoire: Beekeeper Set (Item 4 of 4)", + "shieldArmoireFlyFishingRodText": "Fly Fishing Rod", + "shieldArmoireFlyFishingRodNotes": "Put a lure on this long and flexible rod and fish will mistake it for an insect every single time. Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Fly Fishing Set (Item 3 of 3)", "back": "Back Accessory", "backBase0Text": "No Back Accessory", @@ -3260,6 +3268,8 @@ "backMystery202505Notes": "Earn your stripes swooping and soaring on these aerodynamic wings. Confers no benefit. May 2025 Subscriber Item.", "backMystery202506Text": "Solar Shine Aureole", "backMystery202506Notes": "Bring a warm glow with you as you go about your daily tasks. Confers no benefit. June 2025 Subscriber Item.", + "backMystery202507Text": "Spunky Skateboard", + "backMystery202507Notes": "Your steed for the sidewalks and halfpipes. Confers no benefit. July 2025 Subscriber Item.", "backSpecialWonderconRedText": "Mighty Cape", "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 1bba9a9037..f4eba78f95 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -175,6 +175,7 @@ "mysterySet202504": "Elusive Yeti Set", "mysterySet202505": "Soaring Swallowtail Set", "mysterySet202506": "Solar Shine Set", + "mysterySet202507": "Spunky Skater 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 8483631976..3034db2013 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -659,6 +659,9 @@ const backgrounds = { backgrounds062025: { summer_seashore: { }, }, + backgrounds072025: { + sirens_lair: { }, + }, eventBackgrounds: { birthday_bash: { price: 0, diff --git a/website/common/script/content/constants/releaseDates.js b/website/common/script/content/constants/releaseDates.js index b5b87bcc5e..9dfc37d63f 100644 --- a/website/common/script/content/constants/releaseDates.js +++ b/website/common/script/content/constants/releaseDates.js @@ -21,6 +21,7 @@ export const ARMOIRE_RELEASE_DATES = { sillierTuxedoSet: { year: 2025, month: 4 }, gildedKnightSet: { year: 2025, month: 5 }, beekeepersSet: { year: 2025, month: 6 }, + flyFishingSet: { year: 2025, month: 7 }, }; 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 aa19171a2f..e79764f14f 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -532,6 +532,11 @@ const armor = { con: 12, set: 'beekeepersSet', }, + flyFishingWaders: { + str: 7, + con: 7, + set: 'flyFishingSet', + }, }; const body = { @@ -1088,6 +1093,11 @@ const head = { per: 12, set: 'beekeepersSet', }, + flyFishingHat: { + str: 7, + per: 7, + set: 'flyFishingSet', + }, }; const shield = { @@ -1456,6 +1466,11 @@ const shield = { str: 12, set: 'beekeepersSet', }, + flyFishingRod: { + str: 7, + int: 7, + set: 'flyFishingSet', + }, }; const headAccessory = { diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index 2201ac2257..7f2752ddf3 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -116,6 +116,7 @@ const back = { 202410: { }, 202505: { }, 202506: { }, + 202507: { }, }; const body = { @@ -243,6 +244,7 @@ const head = { 202502: { }, 202503: { }, 202504: { }, + 202507: { }, 301404: { }, 301405: { }, 301703: { },