diff --git a/habitica-images b/habitica-images index 03fd45756b..941bf731d6 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 03fd45756b21970e758a2b9c6fec43fc1b5ff038 +Subproject commit 941bf731d61b21288e5453705d5718cae02f8af0 diff --git a/package-lock.json b/package-lock.json index 8eb6585db4..14d90a9688 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.248.2", + "version": "4.248.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -12537,13 +12537,12 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, "passport": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz", - "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.0.tgz", + "integrity": "sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg==", "requires": { "passport-strategy": "1.x.x", - "pause": "0.0.1", - "utils-merge": "^1.0.1" + "pause": "0.0.1" } }, "passport-facebook": { diff --git a/package.json b/package.json index a15da61239..ce0e0bd840 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.248.2", + "version": "4.248.4", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.19.6", @@ -54,7 +54,7 @@ "nconf": "^0.12.0", "node-gcm": "^1.0.5", "on-headers": "^1.0.2", - "passport": "^0.6.0", + "passport": "^0.5.0", "passport-facebook": "^3.0.0", "passport-google-oauth2": "^0.2.0", "passport-google-oauth20": "2.0.0", diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 6ac842053b..8d02728540 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -514,6 +514,11 @@ width: 60px; height: 60px; } +.background_among_giant_mushrooms { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_among_giant_mushrooms.png'); + width: 141px; + height: 147px; +} .background_animal_clouds { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_animal_clouds.png'); width: 141px; @@ -554,6 +559,11 @@ width: 141px; height: 147px; } +.background_autumn_bridge { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_autumn_bridge.png'); + width: 141px; + height: 147px; +} .background_autumn_flower_garden { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_autumn_flower_garden.png'); width: 141px; @@ -1419,6 +1429,11 @@ width: 141px; height: 147px; } +.background_misty_autumn_forest { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_misty_autumn_forest.png'); + width: 141px; + height: 147px; +} .background_monster_makers_workshop { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_monster_makers_workshop.png'); width: 141px; @@ -2100,6 +2115,11 @@ width: 60px; height: 60px; } +.icon_background_among_giant_mushrooms { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_among_giant_mushrooms.png'); + width: 68px; + height: 68px; +} .icon_background_animal_clouds { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_animal_clouds.png'); width: 68px; @@ -2140,6 +2160,11 @@ width: 68px; height: 68px; } +.icon_background_autumn_bridge { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_autumn_bridge.png'); + width: 68px; + height: 68px; +} .icon_background_autumn_flower_garden { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_autumn_flower_garden.png'); width: 68px; @@ -3010,6 +3035,11 @@ width: 68px; height: 68px; } +.icon_background_misty_autumn_forest { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_misty_autumn_forest.png'); + width: 68px; + height: 68px; +} .icon_background_monster_makers_workshop { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_monster_makers_workshop.png'); width: 68px; @@ -19065,6 +19095,11 @@ width: 114px; height: 90px; } +.shield_armoire_bubblingCauldron { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_bubblingCauldron.png'); + width: 114px; + height: 90px; +} .shield_armoire_chocolateFood { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_chocolateFood.png'); width: 90px; @@ -20295,6 +20330,11 @@ width: 68px; height: 68px; } +.shop_shield_armoire_bubblingCauldron { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_bubblingCauldron.png'); + width: 68px; + height: 68px; +} .shop_shield_armoire_chocolateFood { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_chocolateFood.png'); width: 68px; @@ -20835,6 +20875,11 @@ width: 68px; height: 68px; } +.shop_weapon_armoire_magicSpatula { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_magicSpatula.png'); + width: 68px; + height: 68px; +} .shop_weapon_armoire_magnifyingGlass { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_magnifyingGlass.png'); width: 68px; @@ -21715,6 +21760,11 @@ width: 90px; height: 90px; } +.weapon_armoire_magicSpatula { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_magicSpatula.png'); + width: 114px; + height: 90px; +} .weapon_armoire_magnifyingGlass { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_magnifyingGlass.png'); width: 114px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index f8f6ab0fcc..4e7a443e3a 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -827,6 +827,14 @@ "backgroundCemeteryGateText": "Cemetery Gate", "backgroundCemeteryGateNotes": "Haunt a Cemetery Gate.", + "backgrounds112022": "SET 102: Released November 2022", + "backgroundAmongGiantMushroomsText": "Among Giant Mushrooms", + "backgroundAmongGiantMushroomsNotes": "Marvel at Giant Mushrooms.", + "backgroundMistAutumnForestText": "Misty Autumn Forest", + "backgroundMistAutumnForestNotes": "Wander through a Misty Autumn Forest.", + "backgroundAutumnBridgeText": "Bridge in Autumn", + "backgroundAutumnBridgeNotes": "Admire the beauty of a Bridge in Autumn.", + "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 05f0c78206..adaa3ad001 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -667,6 +667,9 @@ "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)", + "weaponArmoireMagicSpatulaText": "Magic Spatula", + "weaponArmoireMagicSpatulaNotes": "Watch your food fly and flip in the air. You get good luck for the day if it magically flips over three times and then lands back on your spatula. Increases Perception by <%= per %>. Enchanted Armoire: Cooking Implements Set (Item 1 of 2).", + "armor": "armor", "armorCapitalized": "Armor", @@ -2542,6 +2545,9 @@ "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).", + "shieldArmoireBubblingCauldronText": "Bubbling Cauldron", + "shieldArmoireBubblingCauldronNotes": "The perfect cauldron for brewing up a productivity potion or cooking a savory soup. In fact, there is little difference between the two! Increases Constitution by <%= con %>. Enchanted Armoire: Cooking Implements Set (Item 2 of 2).", + "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 da811e7ea9..10f7612dd7 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -525,6 +525,11 @@ const backgrounds = { mask_makers_workshop: { }, cemetery_gate: { }, }, + backgrounds112022: { + among_giant_mushrooms: { }, + misty_autumn_forest: { }, + autumn_bridge: { }, + }, 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 1f5eccefa6..aa6cfef6c8 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -1114,6 +1114,10 @@ const shield = { con: 4, set: 'cleaningSupplies', }, + bubblingCauldron: { + con: 8, + set: 'cookingImplements', + }, }; const headAccessory = { @@ -1548,6 +1552,10 @@ const weapon = { per: 4, set: 'cleaningSupplies', }, + magicSpatula: { + per: 8, + set: 'cookingImplements', + }, }; forEach({