diff --git a/habitica-images b/habitica-images index 58b8905b08..4f18c662a7 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 58b8905b0825159b6ba4eb5a37459b97bca79947 +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 93c00a507a..7c30e005ba 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -690,11 +690,6 @@ width: 141px; height: 147px; } -.background_by_a_campfire { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_by_a_campfire.png'); - width: 141px; - height: 147px; -} .background_camping_out { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_camping_out.png'); width: 141px; @@ -1359,11 +1354,6 @@ width: 141px; height: 147px; } -.background_messy_room { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_messy_room.png'); - width: 141px; - height: 147px; -} .background_meteor_shower { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_meteor_shower.png'); width: 141px; @@ -1519,11 +1509,6 @@ width: 141px; height: 147px; } -.background_rainbow_eucalyptus { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_rainbow_eucalyptus.png'); - width: 141px; - height: 147px; -} .background_rainbow_meadow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_rainbow_meadow.png'); width: 141px; @@ -2246,11 +2231,6 @@ width: 68px; height: 68px; } -.icon_background_by_a_campfire { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_by_a_campfire.png'); - width: 68px; - height: 68px; -} .icon_background_camping_out { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_camping_out.png'); width: 68px; @@ -2920,11 +2900,6 @@ width: 68px; height: 68px; } -.icon_background_messy_room { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_messy_room.png'); - width: 68px; - height: 68px; -} .icon_background_meteor_shower { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_meteor_shower.png'); width: 68px; @@ -3080,11 +3055,6 @@ width: 68px; height: 68px; } -.icon_background_rainbow_eucalyptus { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_rainbow_eucalyptus.png'); - width: 68px; - height: 68px; -} .icon_background_rainbow_meadow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_rainbow_meadow.png'); width: 68px; @@ -19000,11 +18970,6 @@ width: 90px; height: 90px; } -.shield_armoire_dustpan { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_dustpan.png'); - width: 114px; - height: 90px; -} .shield_armoire_fancyBlownGlassVase { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_fancyBlownGlassVase.png'); width: 114px; @@ -20215,11 +20180,6 @@ width: 68px; height: 68px; } -.shop_shield_armoire_dustpan { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_dustpan.png'); - width: 68px; - height: 68px; -} .shop_shield_armoire_fancyBlownGlassVase { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_fancyBlownGlassVase.png'); width: 68px; @@ -20605,11 +20565,6 @@ width: 68px; height: 68px; } -.shop_weapon_armoire_featherDuster { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_featherDuster.png'); - width: 68px; - height: 68px; -} .shop_weapon_armoire_festivalFirecracker { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_festivalFirecracker.png'); width: 68px; @@ -20850,11 +20805,6 @@ width: 68px; height: 68px; } -.shop_weapon_armoire_pushBroom { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_pushBroom.png'); - width: 68px; - height: 68px; -} .shop_weapon_armoire_rancherLasso { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_rancherLasso.png'); width: 68px; @@ -21480,11 +21430,6 @@ width: 114px; height: 90px; } -.weapon_armoire_featherDuster { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_featherDuster.png'); - width: 114px; - height: 90px; -} .weapon_armoire_festivalFirecracker { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_festivalFirecracker.png'); width: 90px; @@ -21725,11 +21670,6 @@ width: 114px; height: 90px; } -.weapon_armoire_pushBroom { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_pushBroom.png'); - width: 114px; - height: 90px; -} .weapon_armoire_rancherLasso { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_rancherLasso.png'); width: 90px; @@ -26985,31 +26925,6 @@ width: 117px; height: 120px; } -.eyewear_mystery_202208 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202208.png'); - width: 114px; - height: 90px; -} -.head_mystery_202208 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202208.png'); - width: 114px; - height: 90px; -} -.shop_eyewear_mystery_202208 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202208.png'); - width: 68px; - height: 68px; -} -.shop_head_mystery_202208 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202208.png'); - width: 68px; - height: 68px; -} -.shop_set_mystery_202208 { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202208.png'); - width: 68px; - height: 68px; -} .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 a4747e70c6..54814a37fc 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -803,14 +803,6 @@ "backgroundUnderwaterStatuesText": "Underwater Statue Garden", "backgroundUnderwaterStatuesNotes": "Try not to blink in an Underwater Statue Garden.", - "backgrounds082022": "SET 99: Released August 2022", - "backgroundRainbowEucalyptusText": "Rainbow Eucalyptus", - "backgroundRainbowEucalyptusNotes": "Admire a Rainbow Eucalyptus grove.", - "backgroundMessyRoomText": "Messy Room", - "backgroundMessyRoomNotes": "Tidy up a Messy Room.", - "backgroundByACampfireText": "By A Campfire", - "backgroundByACampfireNotes": "Bask in the glow By a Campfire.", - "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 6e0857865e..9a792e799a 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -640,20 +640,16 @@ "weaponArmoireGardenersWateringCanNotes": "You can’t get far without water! Have an infinite supply on hand with this magic, refilling watering can. Increases Intelligence by <%= int %>. Enchanted Armoire: Gardener Set (Item 4 of 4).", "weaponArmoireHuntingHornText": "Hunting Horn", "weaponArmoireHuntingHornNotes": "Twooooo! Twoo! Twoo! Gather your party for an adventure or quest by playing this horn. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Musical Instrument Set 1 (Item 1 of 3)", - "weaponArmoireBlueKiteText": "Blue Kite", - "weaponArmoireBlueKiteNotes": "Sailing high up in the blue, what tricks can you make your kite do? Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 1 of 5)", - "weaponArmoireGreenKiteText": "Green Kite", - "weaponArmoireGreenKiteNotes": "A more stunning kite you’ve never seen, with its shades of yellow and green. Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 2 of 5)", - "weaponArmoireOrangeKiteText": "Orange Kite", - "weaponArmoireOrangeKiteNotes": "With colors like sunrise and sunset, let’s see how high your kite can get! Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 3 of 5)", - "weaponArmoirePinkKiteText": "Pink Kite", - "weaponArmoirePinkKiteNotes": "Diving, twirling, soaring high, your kite stands out against the sky. Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 4 of 5)", - "weaponArmoireYellowKiteText": "Yellow Kite", - "weaponArmoireYellowKiteNotes": "Swooping and swerving to and fro, watch your cheerful kite go. Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 5 of 5)", - "weaponArmoirePushBroomText": "Push Broom", - "weaponArmoirePushBroomNotes": "Take this tidying tool on your adventures and always be able to sweep a sooty stoop or clear cobwebs from corners. Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set (Item 1 of 3)", - "weaponArmoireFeatherDusterText": "Feather Duster", - "weaponArmoireFeatherDusterNotes": "Let these fancy feathers fly over all your old objects to make them shine like new. Just beware of the disturbed dust so you don’t sneeze! Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set (Item 2 of 3)", + "weaponArmoireBlueKiteText":"Blue Kite", + "weaponArmoireBlueKiteNotes":"Sailing high up in the blue, what tricks can you make your kite do? Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 1 of 5)", + "weaponArmoireGreenKiteText":"Green Kite", + "weaponArmoireGreenKiteNotes":"A more stunning kite you’ve never seen, with its shades of yellow and green. Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 2 of 5)", + "weaponArmoireOrangeKiteText":"Orange Kite", + "weaponArmoireOrangeKiteNotes":"With colors like sunrise and sunset, let’s see how high your kite can get! Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 3 of 5)", + "weaponArmoirePinkKiteText":"Pink Kite", + "weaponArmoirePinkKiteNotes":"Diving, twirling, soaring high, your kite stands out against the sky. Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 4 of 5)", + "weaponArmoireYellowKiteText":"Yellow Kite", + "weaponArmoireYellowKiteNotes":"Swooping and swerving to and fro, watch your cheerful kite go. Increases all stats by <%= attrs %> each. Enchanted Armoire: Kite Set (Item 5 of 5)", "armor": "armor", "armorCapitalized": "Armor", @@ -2494,8 +2490,6 @@ "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).", - "shieldArmoireDustpanText": "Dustpan", - "shieldArmoireDustpanNotes": "Have this handy handheld dustpan ready every time you clean. A vanishing spell cast on it means you never have to search for a trash can to empty it into. Increases Intelligence and Constitution by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies 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 414c008c4a..534e83017d 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -510,11 +510,6 @@ const backgrounds = { underwater_cave: { }, underwater_statues: { }, }, - backgrounds082022: { - rainbow_eucalyptus: { }, - messy_room: { }, - by_a_campfire: { }, - }, 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 96e78b2e11..40b8c5a3b3 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -1100,11 +1100,6 @@ const shield = { str: 4, set: 'fancyPirate', }, - dustpan: { - int: 4, - con: 4, - set: 'cleaningSupplies', - }, }; const headAccessory = { @@ -1529,16 +1524,6 @@ const weapon = { per: 3, set: 'kite', }, - pushBroom: { - str: 4, - int: 4, - set: 'cleaningSupplies', - }, - featherDuster: { - con: 4, - per: 4, - set: 'cleaningSupplies', - }, }; forEach({