diff --git a/habitica-images b/habitica-images index 0d994d9344..4ab9833a58 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 0d994d9344be0f20d5ce09ca5edcbed0cb2d0518 +Subproject commit 4ab9833a58bbc85b7b0ad8dff1ee01535270dcfe diff --git a/website/client/src/components/creatorIntro.vue b/website/client/src/components/creatorIntro.vue index c2010f2953..31c6f445a7 100644 --- a/website/client/src/components/creatorIntro.vue +++ b/website/client/src/components/creatorIntro.vue @@ -121,7 +121,7 @@ v-if="editing" class="menu-container col-2" :class="{active: activeTopPage === 'backgrounds'}" - @click="changeTopPage('backgrounds', '2021')" + @click="changeTopPage('backgrounds', '2022')" >
({ + bgSubMenuItems: ['2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({ id: y, label: y, })), @@ -1212,6 +1212,7 @@ export default { 2019: [], 2020: [], 2021: [], + 2022: [], }; // Hack to force update for now until we restructure the data diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 03a23f6d3b..a83d153fe1 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -5,60 +5,60 @@ "noBackground": "No Background Selected", "backgrounds062014": "SET 1: Released June 2014", - "backgroundBeachText":"Beach", - "backgroundBeachNotes":"Lounge upon a warm beach.", - "backgroundFairyRingText":"Fairy Ring", - "backgroundFairyRingNotes":"Dance in a fairy ring.", - "backgroundForestText":"Forest", - "backgroundForestNotes":"Stroll through a summer forest.", + "backgroundBeachText": "Beach", + "backgroundBeachNotes": "Lounge upon a warm beach.", + "backgroundFairyRingText": "Fairy Ring", + "backgroundFairyRingNotes": "Dance in a fairy ring.", + "backgroundForestText": "Forest", + "backgroundForestNotes": "Stroll through a summer forest.", "backgrounds072014": "SET 2: Released July 2014", - "backgroundCoralReefText":"Coral Reef", - "backgroundCoralReefNotes":"Swim in a coral reef.", - "backgroundOpenWatersText":"Open Waters", - "backgroundOpenWatersNotes":"Enjoy the open waters.", - "backgroundSeafarerShipText":"Seafarer Ship", - "backgroundSeafarerShipNotes":"Sail aboard a Seafarer Ship.", + "backgroundCoralReefText": "Coral Reef", + "backgroundCoralReefNotes": "Swim in a coral reef.", + "backgroundOpenWatersText": "Open Waters", + "backgroundOpenWatersNotes": "Enjoy the open waters.", + "backgroundSeafarerShipText": "Seafarer Ship", + "backgroundSeafarerShipNotes": "Sail aboard a Seafarer Ship.", "backgrounds082014": "SET 3: Released August 2014", - "backgroundCloudsText":"Clouds", - "backgroundCloudsNotes":"Soar through the Clouds.", - "backgroundDustyCanyonsText":"Dusty Canyon", - "backgroundDustyCanyonsNotes":"Wander through a Dusty Canyon.", - "backgroundVolcanoText":"Volcano", - "backgroundVolcanoNotes":"Heat up inside a Volcano.", + "backgroundCloudsText": "Clouds", + "backgroundCloudsNotes": "Soar through the Clouds.", + "backgroundDustyCanyonsText": "Dusty Canyon", + "backgroundDustyCanyonsNotes": "Wander through a Dusty Canyon.", + "backgroundVolcanoText": "Volcano", + "backgroundVolcanoNotes": "Heat up inside a Volcano.", "backgrounds092014": "SET 4: Released September 2014", - "backgroundThunderstormText":"Thunderstorm", - "backgroundThunderstormNotes":"Conduct lightning in a Thunderstorm.", - "backgroundAutumnForestText":"Autumn Forest", - "backgroundAutumnForestNotes":"Stroll through an Autumn Forest.", - "backgroundHarvestFieldsText":"Harvest Fields", - "backgroundHarvestFieldsNotes":"Cultivate your Harvest Fields.", + "backgroundThunderstormText": "Thunderstorm", + "backgroundThunderstormNotes": "Conduct lightning in a Thunderstorm.", + "backgroundAutumnForestText": "Autumn Forest", + "backgroundAutumnForestNotes": "Stroll through an Autumn Forest.", + "backgroundHarvestFieldsText": "Harvest Fields", + "backgroundHarvestFieldsNotes": "Cultivate your Harvest Fields.", "backgrounds102014": "SET 5: Released October 2014", - "backgroundGraveyardText":"Graveyard", - "backgroundGraveyardNotes":"Visit a Creepy Graveyard.", - "backgroundHauntedHouseText":"Haunted House", - "backgroundHauntedHouseNotes":"Sneak through a Haunted House.", - "backgroundPumpkinPatchText":"Pumpkin Patch", - "backgroundPumpkinPatchNotes":"Carve jack-o-lanterns in a Pumpkin Patch.", + "backgroundGraveyardText": "Graveyard", + "backgroundGraveyardNotes": "Visit a Creepy Graveyard.", + "backgroundHauntedHouseText": "Haunted House", + "backgroundHauntedHouseNotes": "Sneak through a Haunted House.", + "backgroundPumpkinPatchText": "Pumpkin Patch", + "backgroundPumpkinPatchNotes": "Carve jack-o-lanterns in a Pumpkin Patch.", "backgrounds112014": "SET 6: Released November 2014", - "backgroundHarvestFeastText":"Harvest Feast", - "backgroundHarvestFeastNotes":"Enjoy a Harvest Feast.", - "backgroundStarrySkiesText":"Starry Skies", - "backgroundStarrySkiesNotes":"Gaze at the Starry Skies.", - "backgroundSunsetMeadowText":"Sunset Meadow", - "backgroundSunsetMeadowNotes":"Admire a Sunset Meadow.", + "backgroundHarvestFeastText": "Harvest Feast", + "backgroundHarvestFeastNotes": "Enjoy a Harvest Feast.", + "backgroundStarrySkiesText": "Starry Skies", + "backgroundStarrySkiesNotes": "Gaze at the Starry Skies.", + "backgroundSunsetMeadowText": "Sunset Meadow", + "backgroundSunsetMeadowNotes": "Admire a Sunset Meadow.", "backgrounds122014": "SET 7: Released December 2014", - "backgroundIcebergText":"Iceberg", - "backgroundIcebergNotes":"Drift upon an Iceberg.", - "backgroundTwinklyLightsText":"Winter Twinkly Lights", - "backgroundTwinklyLightsNotes":"Stroll between trees bedecked in festive lights.", - "backgroundSouthPoleText":"South Pole", - "backgroundSouthPoleNotes":"Visit the icy South Pole.", + "backgroundIcebergText": "Iceberg", + "backgroundIcebergNotes": "Drift upon an Iceberg.", + "backgroundTwinklyLightsText": "Winter Twinkly Lights", + "backgroundTwinklyLightsNotes": "Stroll between trees bedecked in festive lights.", + "backgroundSouthPoleText": "South Pole", + "backgroundSouthPoleNotes": "Visit the icy South Pole.", "backgrounds012015": "SET 8: Released January 2015", "backgroundIceCaveText": "Ice Cave", @@ -746,6 +746,14 @@ "backgroundFrozenPolarWatersText": "Frozen Polar Waters", "backgroundFrozenPolarWatersNotes": "Explore Frozen Polar Waters.", + "backgrounds012022": "SET 92: Released January 2022", + "backgroundMeteorShowerText": "Meteor Shower", + "backgroundMeteorShowerNotes": "Observe the dazzling nighttime display of a Meteor Shower.", + "backgroundPalmTreeWithFairyLightsText": "Palm Tree with Fairy Lights", + "backgroundPalmTreeWithFairyLightsNotes": "Pose by a Palm Tree bedecked with Fairy Lights.", + "backgroundSnowyFarmText": "Snowy Farm", + "backgroundSnowyFarmNotes": "Check that everyone is well and warm on your Snowy Farm.", + "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 d93d8f7f48..dbb4ef6484 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -613,6 +613,8 @@ "weaponArmoirePotionGoldenNotes": "With this potion, your pet can have a heart of gold… and ears of gold… and a tail of gold… Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Potion Set (Item 10 of 10)", "weaponArmoireRegalSceptreText": "Regal Sceptre", "weaponArmoireRegalSceptreNotes": "Display your regal authority by taking this bejeweled staff in hand. Increases Perception by <%= per %>. Enchanted Armoire: Regal Set (Item 2 of 2).", + "weaponArmoireShootingStarSpellText": "Stardust Sparkles", + "weaponArmoireShootingStarSpellNotes": "Surround yourself in a spell of stardust magic to help you make all your wishes come true. Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Stardust Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -1292,6 +1294,8 @@ "armorArmoireHeraldsTunicNotes": "Get ready to spread good news far and wide in this colorful, royal outfit. Increases Constitution by <%= con %>. Enchanted Armoire: Herald Set (Item 1 of 4).", "armorArmoireSoftBlackSuitText": "Soft Black Suit", "armorArmoireSoftBlackSuitNotes": "Black is a mysterious colour. It’s sure to inspire the most interesting dreams. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Black Loungewear Set (Item 2 of 3).", + "armorArmoireShootingStarCostumeText": "Star Gown", + "armorArmoireShootingStarCostumeNotes": "Rumored to have been spun out of the night sky itself, this flowy gown lets you rise above all obstacles in your path. Increases Constitution by <%= con %>. Enchanted Armoire: Stardust Set (Item 2 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1995,6 +1999,8 @@ "headArmoireBlackFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a bold black color. Increases Constitution, Perception, and Strength by <%= attrs %> each. Enchanted Armoire: Black Loungewear Set (Item 1 of 3).", "headArmoireRegalCrownText": "Regal Crown", "headArmoireRegalCrownNotes": "Any monarch would be lucky to have such a majestic, smart-looking crown. Increases Intelligence by <%= int %>. Enchanted Armoire: Regal Set (Item 1 of 2).", + "headArmoireShootingStarCrownText": "Star Crown", + "headArmoireShootingStarCrownNotes": "With this brightly shining headpiece, you will literally be the star of your own adventure! Increases Perception by <%= per %>. Enchanted Armoire: Stardust Set (Item 1 of 3).", "offhand": "off-hand item", "offHandCapitalized": "Off-Hand Item", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index b687b3c50f..9503ec7c24 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -475,6 +475,11 @@ const backgrounds = { ice_palace: { }, frozen_polar_waters: { }, }, + backgrounds012022: { + meteor_shower: { }, + palm_tree_with_fairy_lights: { }, + snowy_farm: { }, + }, 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 000d3634c6..0709c31b38 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -379,6 +379,10 @@ const armor = { per: 7, set: 'blackLoungewear', }, + shootingStarCostume: { + con: 10, + set: 'shootingStar', + }, }; const body = { @@ -773,6 +777,10 @@ const head = { int: 7, set: 'regal', }, + shootingStarCrown: { + per: 10, + set: 'shootingStar', + }, }; const shield = { @@ -1407,6 +1415,12 @@ const weapon = { per: 7, set: 'regal', }, + shootingStarSpell: { + str: 5, + int: 5, + set: 'shootingStar', + twoHanded: true, + }, }; forEach({