diff --git a/habitica-images b/habitica-images index 896d1aedad..4f18c662a7 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 896d1aedaddcfb650f0fb67c01ab36c8a9b3ef97 +Subproject commit 4f18c662a7bc2ba49705f9efa67e0b10e0b0e52e diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 85380001cc..7c30e005ba 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -625,6 +625,11 @@ width: 141px; height: 147px; } +.background_bioluminescent_waves { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_bioluminescent_waves.png'); + width: 141px; + height: 147px; +} .background_birch_forest { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_birch_forest.png'); width: 141px; @@ -1884,11 +1889,21 @@ width: 141px; height: 147px; } +.background_underwater_cave { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_underwater_cave.png'); + width: 141px; + height: 147px; +} .background_underwater_ruins { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_underwater_ruins.png'); width: 141px; height: 147px; } +.background_underwater_statues { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_underwater_statues.png'); + width: 141px; + height: 147px; +} .background_underwater_vents { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_underwater_vents.png'); width: 141px; @@ -2151,6 +2166,11 @@ width: 68px; height: 68px; } +.icon_background_bioluminescent_waves { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_bioluminescent_waves.png'); + width: 68px; + height: 68px; +} .icon_background_birch_forest { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_birch_forest.png'); width: 68px; @@ -3420,11 +3440,21 @@ width: 68px; height: 68px; } +.icon_background_underwater_cave { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_underwater_cave.png'); + width: 68px; + height: 68px; +} .icon_background_underwater_ruins { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_underwater_ruins.png'); width: 68px; height: 68px; } +.icon_background_underwater_statues { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_underwater_statues.png'); + width: 68px; + height: 68px; +} .icon_background_underwater_vents { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_underwater_vents.png'); width: 68px; @@ -18145,6 +18175,11 @@ width: 90px; height: 90px; } +.broad_armor_armoire_fancyPirateSuit { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_fancyPirateSuit.png'); + width: 114px; + height: 90px; +} .broad_armor_armoire_farrierOutfit { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_farrierOutfit.png'); width: 90px; @@ -18590,6 +18625,11 @@ width: 90px; height: 90px; } +.head_armoire_fancyPirateHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_fancyPirateHat.png'); + width: 114px; + height: 90px; +} .head_armoire_fiddlersCap { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_fiddlersCap.png'); width: 114px; @@ -19175,6 +19215,11 @@ width: 114px; height: 87px; } +.shield_armoire_treasureMap { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_treasureMap.png'); + width: 114px; + height: 90px; +} .shield_armoire_trustyUmbrella { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_trustyUmbrella.png'); width: 114px; @@ -19325,6 +19370,11 @@ width: 68px; height: 68px; } +.shop_armor_armoire_fancyPirateSuit { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_fancyPirateSuit.png'); + width: 68px; + height: 68px; +} .shop_armor_armoire_farrierOutfit { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_farrierOutfit.png'); width: 68px; @@ -19785,6 +19835,11 @@ width: 68px; height: 68px; } +.shop_head_armoire_fancyPirateHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_fancyPirateHat.png'); + width: 68px; + height: 68px; +} .shop_head_armoire_fiddlersCap { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_fiddlersCap.png'); width: 68px; @@ -20370,6 +20425,11 @@ width: 68px; height: 68px; } +.shop_shield_armoire_treasureMap { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_treasureMap.png'); + width: 68px; + height: 68px; +} .shop_shield_armoire_trustyUmbrella { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_trustyUmbrella.png'); width: 68px; @@ -20960,6 +21020,11 @@ width: 90px; height: 90px; } +.slim_armor_armoire_fancyPirateSuit { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_fancyPirateSuit.png'); + width: 114px; + height: 90px; +} .slim_armor_armoire_farrierOutfit { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_farrierOutfit.png'); width: 90px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index d1d6106dd7..54814a37fc 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -795,6 +795,14 @@ "backgroundSailboatAtSunsetText": "Sailboat At Sunset", "backgroundSailboatAtSunsetNotes": "Enjoy the beauty of a sailboat at sunset.", + "backgrounds072022": "SET 98: Released July 2022", + "backgroundBioluminescentWavesText": "Bioluminescent Waves", + "backgroundBioluminescentWavesNotes": "Admire the glow of Bioluminescent Waves.", + "backgroundUnderwaterCaveText": "Underwater Cave", + "backgroundUnderwaterCaveNotes": "Explore an Underwater Cave.", + "backgroundUnderwaterStatuesText": "Underwater Statue Garden", + "backgroundUnderwaterStatuesNotes": "Try not to blink in an Underwater Statue Garden.", + "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 d394ab0fe9..d5d0c2f6b2 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1362,6 +1362,8 @@ "armorArmoireGardenersOverallsNotes": "Don’t be afraid to work down in the dirt when you’re wearing these durable overalls. Increases Constitution by <%= con %>. Enchanted Armoire: Gardener Set (Item 1 of 4).", "armorArmoireStrawRaincoatText": "Straw Raincoat", "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).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -2095,6 +2097,8 @@ "headArmoireGardenersSunHatNotes": "The bright light of the day star won’t shine in your eyes when you wear this wide-brimmed hat. Increases Perception by <%= per %>. Enchanted Armoire: Gardener Set (Item 2 of 4).", "headArmoireStrawRainHatText": "Straw Rain Hat", "headArmoireStrawRainHatNotes": "You’ll be able to spot every obstacle in your path when you wear this water-resistant, conical hat. Increases Perception by <%= per %>. Enchanted Armoire: Straw Raincoat Set (Item 2 of 2).", + "headArmoireFancyPirateHatText": "Fancy Pirate Hat", + "headArmoireFancyPirateHatNotes": "Be protected from the sun and any seagulls flying overhead as you drink tea on the deck of your ship. Increases Perception by <%= per %>. Enchanted Armoire: Fancy Pirate Set (Item 2 of 3).", "offhand": "off-hand item", "offHandCapitalized": "Off-Hand Item", @@ -2481,6 +2485,8 @@ "shieldArmoireSpanishGuitarNotes": "Tink! Tink! Thrummm! Gather your party for a concert or celebration by playing this guitar. Increases Perception by <%= per %> and Intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 2 of 3)", "shieldArmoireSnareDrumText": "Snare Drum", "shieldArmoireSnareDrumNotes": "Rat-a-tat-tat! Gather your party for a parade or march into battle by playing this drum. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 3 of 3)", + "shieldArmoireTreasureMapText": "Treasure Map", + "shieldArmoireTreasureMapNotes": "X marks the spot! You never know what you’ll find when you follow this handy map to fabled treasures: gold, jewels, relics, or perhaps a petrified orange? Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Fancy Pirate Set (Item 3 of 3).", "back": "Back Accessory", "backBase0Text": "No Back Accessory", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 54d3a7b570..534e83017d 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -505,6 +505,11 @@ const backgrounds = { mountain_waterfall: { }, sailboat_at_sunset: { }, }, + backgrounds072022: { + bioluminescent_waves: { }, + underwater_cave: { }, + underwater_statues: { }, + }, 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 ff543ad7dd..40b8c5a3b3 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -396,6 +396,11 @@ const armor = { con: 9, set: 'strawRaincoat', }, + fancyPirateSuit: { + con: 4, + int: 4, + set: 'fancyPirate', + }, }; const body = { @@ -803,6 +808,10 @@ const head = { per: 9, set: 'strawRaincoat', }, + fancyPirateHat: { + per: 8, + set: 'fancyPirate', + }, }; const shield = { @@ -1086,6 +1095,11 @@ const shield = { int: 6, set: 'musicalInstrumentOne', }, + treasureMap: { + int: 4, + str: 4, + set: 'fancyPirate', + }, }; const headAccessory = {