From d317bd1c41c0bf6467c658a169baba69b58e872b Mon Sep 17 00:00:00 2001 From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Mon, 9 May 2022 15:21:25 -0400 Subject: [PATCH] May 2022 Backgrounds and Enchanted Armoire (#13966) * 2022-05 backgrounds and enchanted armoire images * 2022-05 backgrounds and enchanted * chore(sprites): compile also fix a few string typos Co-authored-by: SabreCat --- habitica-images | 2 +- .../assets/css/sprites/spritesmith-main.css | 60 +++++++++++++++++++ website/common/locales/en/backgrounds.json | 8 +++ website/common/locales/en/gear.json | 6 ++ .../script/content/appearance/backgrounds.js | 5 ++ .../script/content/gear/sets/armoire.js | 15 +++++ 6 files changed, 95 insertions(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 05c7c19fa5..08edadc432 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 05c7c19fa56195bf722318196f821ada35c901cd +Subproject commit 08edadc432ca5b7d291f42f7c6c49faa1d9bfc30 diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 63a9de9cf9..6df4021598 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -675,6 +675,11 @@ width: 141px; height: 147px; } +.background_castle_gate { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_castle_gate.png'); + width: 141px; + height: 147px; +} .background_champions_colosseum { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_champions_colosseum.png'); width: 141px; @@ -860,6 +865,11 @@ width: 141px; height: 147px; } +.background_enchanted_music_room { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_enchanted_music_room.png'); + width: 141px; + height: 147px; +} .background_fairy_ring { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_fairy_ring.png'); width: 141px; @@ -1389,6 +1399,11 @@ width: 141px; height: 147px; } +.background_on_a_castle_wall { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_a_castle_wall.png'); + width: 141px; + height: 147px; +} .background_on_tree_branch { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_tree_branch.png'); width: 141px; @@ -2171,6 +2186,11 @@ width: 68px; height: 68px; } +.icon_background_castle_gate { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_castle_gate.png'); + width: 68px; + height: 68px; +} .icon_background_champions_colosseum { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_champions_colosseum.png'); width: 68px; @@ -2361,6 +2381,11 @@ width: 68px; height: 68px; } +.icon_background_enchanted_music_room { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_enchanted_music_room.png'); + width: 68px; + height: 68px; +} .icon_background_fairy_ring { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_fairy_ring.png'); width: 68px; @@ -2890,6 +2915,11 @@ width: 68px; height: 68px; } +.icon_background_on_a_castle_wall { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_a_castle_wall.png'); + width: 68px; + height: 68px; +} .icon_background_on_tree_branch { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_tree_branch.png'); width: 68px; @@ -19055,6 +19085,11 @@ width: 114px; height: 90px; } +.shield_armoire_snareDrum { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_snareDrum.png'); + width: 114px; + height: 90px; +} .shield_armoire_softBlackPillow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_softBlackPillow.png'); width: 114px; @@ -19085,6 +19120,11 @@ width: 114px; height: 90px; } +.shield_armoire_spanishGuitar { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_spanishGuitar.png'); + width: 114px; + height: 90px; +} .shield_armoire_strawberryFood { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_strawberryFood.png'); width: 90px; @@ -20240,6 +20280,11 @@ width: 68px; height: 68px; } +.shop_shield_armoire_snareDrum { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_snareDrum.png'); + width: 68px; + height: 68px; +} .shop_shield_armoire_softBlackPillow { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_softBlackPillow.png'); width: 68px; @@ -20270,6 +20315,11 @@ width: 68px; height: 68px; } +.shop_shield_armoire_spanishGuitar { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_spanishGuitar.png'); + width: 68px; + height: 68px; +} .shop_shield_armoire_strawberryFood { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_strawberryFood.png'); width: 68px; @@ -20485,6 +20535,11 @@ width: 68px; height: 68px; } +.shop_weapon_armoire_huntingHorn { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_huntingHorn.png'); + width: 68px; + height: 68px; +} .shop_weapon_armoire_ironCrook { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_ironCrook.png'); width: 68px; @@ -21315,6 +21370,11 @@ width: 90px; height: 90px; } +.weapon_armoire_huntingHorn { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_huntingHorn.png'); + width: 114px; + height: 90px; +} .weapon_armoire_ironCrook { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_ironCrook.png'); width: 90px; diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 8a4981682d..8218926222 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -779,6 +779,14 @@ "backgroundSpringtimeLakeText": "Springtime Lake", "backgroundSpringtimeLakeNotes": "Take in the sights along the shores of a Springtime Lake.", + "backgrounds052022": "SET 96: Released May 2022", + "backgroundOnACastleWallText": "On A Castle Wall", + "backgroundOnACastleWallNotes": "Look out from On a Castle Wall.", + "backgroundCastleGateText": "Castle Gate", + "backgroundCastleGateNotes": "Stand guard at the Castle Gate.", + "backgroundEnchantedMusicRoomText": "Enchanted Music Room", + "backgroundEnchantedMusicRoomNotes": "Play in an Enchanted Music Room.", + "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 2f134f7738..421ca19159 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -628,6 +628,8 @@ "weaponArmoirePinkLongbowNotes": "Be a cupid-in-training, mastering both archery and matters of the heart with this beautiful bow. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Independent Item.", "weaponArmoireGardenersWateringCanText": "Watering Can", "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)", "armor": "armor", "armorCapitalized": "Armor", @@ -2426,6 +2428,10 @@ "shieldArmoireSoftVioletPillowNotes": "The clever warrior packs a pillow for any expedition. Protect yourself from procrastination-induced panic... even while you nap. Increases Intelligence by <%= int %>. Enchanted Armoire: Violet Loungewear Set (Item 3 of 3).", "shieldArmoireGardenersSpadeText": "Gardener's Spade", "shieldArmoireGardenersSpadeNotes": "Whether you’re digging in the garden, searching for buried treasure, or creating a secret tunnel, this trusty spade is at your side. Increases Strength by <%= str %>. Enchanted Armoire: Gardener Set (Item 3 of 4).", + "shieldArmoireSpanishGuitarText": "Spanish Guitar", + "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)", "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 a7bb2d582e..20ac40b4b6 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -495,6 +495,11 @@ const backgrounds = { flower_shop: { }, springtime_lake: { }, }, + backgrounds052022: { + on_a_castle_wall: { }, + enchanted_music_room: { }, + castle_gate: { }, + }, 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 8a94df1d62..08a92cf612 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -1076,6 +1076,16 @@ const shield = { str: 8, set: 'gardenerSet', }, + spanishGuitar: { + per: 5, // this might need to go back to 6 + int: 6, + set: 'musicalInstrumentOne', + }, + snareDrum: { + con: 5, + int: 6, + set: 'musicalInstrumentOne', + }, }; const headAccessory = { @@ -1460,6 +1470,11 @@ const weapon = { int: 8, set: 'gardenerSet', }, + huntingHorn: { + str: 5, + int: 6, + set: 'musicalInstrumentOne', + }, }; forEach({