From 7465c8e4ed9def228dba6c23a18dfb917fcc20fc Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 26 Jan 2022 16:15:56 -0500 Subject: [PATCH 01/12] subproject commit --- habitica-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 4ab9833a58..403a25ad28 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 4ab9833a58bbc85b7b0ad8dff1ee01535270dcfe +Subproject commit 403a25ad28f0102a58cdfce3416f1954f3776e74 From 40588f5ca4d4ac9807f51afd289f11f0ad28a749 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 26 Jan 2022 16:33:57 -0500 Subject: [PATCH 02/12] 2022-02 backgrounds --- website/common/locales/en/backgrounds.json | 9 +++++++++ website/common/script/content/appearance/backgrounds.js | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index a83d153fe1..3ea64adcb5 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -754,6 +754,15 @@ "backgroundSnowyFarmText": "Snowy Farm", "backgroundSnowyFarmNotes": "Check that everyone is well and warm on your Snowy Farm.", + "backgrounds022012":"SET 93: Released February 2022", + "backgroundWinterWaterfallText": "Winter Waterfall", + "backgroundWinterWaterfallNotes": "Marvel at a Winter Waterfall", + "backgroundOrangeGroveText": "Orange Grove", + "backgroundOrangeGroveNotes": "Wander through a fragrant Orange Grove", + "backgroundIridescentCloudsText": "Iridescent Clouds", + "backgroundIridescentCloudsNotes": "Float in Iridescent Clouds", + + "timeTravelBackgrounds": "Steampunk Backgrounds", "backgroundAirshipText": "Airship", "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 9503ec7c24..ceae8bd7e7 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -480,6 +480,11 @@ const backgrounds = { palm_tree_with_fairy_lights: { }, snowy_farm: { }, }, + backgrounds022022: { + winter_waterfall: { }, + orange_grove: { }, + iridescent_clouds: { }, + }, timeTravelBackgrounds: { airship: { price: 1, From 412f9b7898c17006cdb59ff6d18dab101aeda4cc Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 26 Jan 2022 16:40:48 -0500 Subject: [PATCH 03/12] fix typo in string --- website/common/locales/en/backgrounds.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 3ea64adcb5..015b45622e 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -754,7 +754,7 @@ "backgroundSnowyFarmText": "Snowy Farm", "backgroundSnowyFarmNotes": "Check that everyone is well and warm on your Snowy Farm.", - "backgrounds022012":"SET 93: Released February 2022", + "backgrounds022022": "SET 93: Released February 2022", "backgroundWinterWaterfallText": "Winter Waterfall", "backgroundWinterWaterfallNotes": "Marvel at a Winter Waterfall", "backgroundOrangeGroveText": "Orange Grove", From 8637d55d2b400c10d957adadeb5918fb108b3107 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 26 Jan 2022 16:45:54 -0500 Subject: [PATCH 04/12] changed a few stray 2021s to 2022 --- website/client/src/components/appFooter.vue | 2 +- website/client/src/components/header/userDropdown.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index ad76bb6d47..61ba4d08e4 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -224,7 +224,7 @@
- © 2021 Habitica. All rights reserved. + © 2022 Habitica. All rights reserved.
{{ $t('editAvatar') }} {{ $t('backgrounds') }} Date: Wed, 26 Jan 2022 16:57:45 -0500 Subject: [PATCH 05/12] 2022-02 armoire items -- missing description strings & stats --- website/common/locales/en/gear.json | 6 ++++++ website/common/script/content/gear/sets/armoire.js | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index dbb4ef6484..e95079d889 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -615,6 +615,8 @@ "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).", + "weaponArmoirePinkLongbowText": "Pink Longbow", + "weaponArmoirePinkLongbowNotes": "PLACEHOLDER", "armor": "armor", "armorCapitalized": "Armor", @@ -1296,6 +1298,8 @@ "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).", + "armorArmoireSoftVioletSuitText": "Soft Violet Suit", + "armorArmoireSoftVioletSuitNotes":"PLACEHOLDER", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -2369,6 +2373,8 @@ "shieldArmoireHeraldsMessageScrollNotes": "What exciting news does this scroll contain? Could it be about a new pet or a long habit streak? Increases Perception by <%= per %>. Enchanted Armoire: Herald Set (Item 4 of 4)", "shieldArmoireSoftBlackPillowText": "Soft Black Pillow", "shieldArmoireSoftBlackPillowNotes": "The brave warrior packs a pillow for any expedition. Guard yourself from tiresome tasks... even while you nap. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Black Loungewear Set (Item 3 of 3).", + "shieldArmoireSoftVioletPillowText": "Soft Violet Pillow", + "shieldArmoireSoftVioletPillowNotes": "PLACEHOLDER", "back": "Back Accessory", "backBase0Text": "No Back Accessory", diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 0709c31b38..2a1180c028 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -383,6 +383,9 @@ const armor = { con: 10, set: 'shootingStar', }, + softVioletSuit: { + set: 'violetLoungewear', + }, }; const body = { @@ -1046,6 +1049,9 @@ const shield = { per: 5, set: 'blackLoungewear', }, + softVioletPillow: { + set: 'violetLoungewear', + }, }; const headAccessory = { @@ -1421,6 +1427,9 @@ const weapon = { set: 'shootingStar', twoHanded: true, }, + pinkLongbow: { + twoHanded: true, + }, }; forEach({ From a23522d51668cc5a7b43f54439e3e6be9af0e4be Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 26 Jan 2022 17:02:46 -0500 Subject: [PATCH 06/12] fix typo --- website/common/locales/en/gear.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index e95079d889..ea6fbe369c 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1299,7 +1299,7 @@ "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).", "armorArmoireSoftVioletSuitText": "Soft Violet Suit", - "armorArmoireSoftVioletSuitNotes":"PLACEHOLDER", + "armorArmoireSoftVioletSuitNotes": "PLACEHOLDER", "headgear": "helm", "headgearCapitalized": "Headgear", From 73a2552b30220ec3d49305fedc17fe90e0155f76 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 26 Jan 2022 17:07:24 -0500 Subject: [PATCH 07/12] subproject commit --- habitica-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 403a25ad28..e8343fc85f 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 403a25ad28f0102a58cdfce3416f1954f3776e74 +Subproject commit e8343fc85fde6563e9897714250a3a210bd88521 From 75e2261e3ed1d9b62dbd6548bc1836adb75678f5 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Thu, 27 Jan 2022 11:39:08 -0500 Subject: [PATCH 08/12] added Violet Loungewear Set information to hat, suit, and pillow --- website/common/locales/en/gear.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index ea6fbe369c..785e51ec9f 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1299,7 +1299,7 @@ "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).", "armorArmoireSoftVioletSuitText": "Soft Violet Suit", - "armorArmoireSoftVioletSuitNotes": "PLACEHOLDER", + "armorArmoireSoftVioletSuitNotes": "PLACEHOLDER. Violet Loungewear Set (Item 2 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1850,7 +1850,7 @@ "headArmoireRedHairbowText": "Red Hairbow", "headArmoireRedHairbowNotes": "Become strong, tough, and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Red Hairbow Set (Item 1 of 2).", "headArmoireVioletFloppyHatText": "Violet Floppy Hat", - "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.", + "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Violet Loungewear Set (Item 1 of 3).", "headArmoireGladiatorHelmText": "Gladiator Helm", "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).", "headArmoireRancherHatText": "Rancher Hat", @@ -2374,7 +2374,7 @@ "shieldArmoireSoftBlackPillowText": "Soft Black Pillow", "shieldArmoireSoftBlackPillowNotes": "The brave warrior packs a pillow for any expedition. Guard yourself from tiresome tasks... even while you nap. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Black Loungewear Set (Item 3 of 3).", "shieldArmoireSoftVioletPillowText": "Soft Violet Pillow", - "shieldArmoireSoftVioletPillowNotes": "PLACEHOLDER", + "shieldArmoireSoftVioletPillowNotes": "PLACEHOLDER. Violet Loungewear Set (Item 3 of 3).", "back": "Back Accessory", "backBase0Text": "No Back Accessory", From bd9911fe61db8c60a46609345e61603fb06928b7 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Thu, 27 Jan 2022 12:58:53 -0500 Subject: [PATCH 09/12] updated armoire item strings --- website/common/locales/en/gear.json | 6 +++--- website/common/script/content/gear/sets/armoire.js | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 785e51ec9f..ff8ea4078e 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -616,7 +616,7 @@ "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).", "weaponArmoirePinkLongbowText": "Pink Longbow", - "weaponArmoirePinkLongbowNotes": "PLACEHOLDER", + "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.", "armor": "armor", "armorCapitalized": "Armor", @@ -1299,7 +1299,7 @@ "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).", "armorArmoireSoftVioletSuitText": "Soft Violet Suit", - "armorArmoireSoftVioletSuitNotes": "PLACEHOLDER. Violet Loungewear Set (Item 2 of 3).", + "armorArmoireSoftVioletSuitNotes": "Purple is a luxurious color. Relax in style after you’ve accomplished all your daily tasks. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Violet Loungewear Set (Item 2 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -2374,7 +2374,7 @@ "shieldArmoireSoftBlackPillowText": "Soft Black Pillow", "shieldArmoireSoftBlackPillowNotes": "The brave warrior packs a pillow for any expedition. Guard yourself from tiresome tasks... even while you nap. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Black Loungewear Set (Item 3 of 3).", "shieldArmoireSoftVioletPillowText": "Soft Violet Pillow", - "shieldArmoireSoftVioletPillowNotes": "PLACEHOLDER. Violet Loungewear Set (Item 3 of 3).", + "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).", "back": "Back Accessory", "backBase0Text": "No Back Accessory", diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 2a1180c028..a7c23bf3c3 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -384,6 +384,8 @@ const armor = { set: 'shootingStar', }, softVioletSuit: { + con: 7, + str: 7, set: 'violetLoungewear', }, }; @@ -1050,6 +1052,7 @@ const shield = { set: 'blackLoungewear', }, softVioletPillow: { + int: 10, set: 'violetLoungewear', }, }; @@ -1428,6 +1431,8 @@ const weapon = { twoHanded: true, }, pinkLongbow: { + per: 6, + str: 5, twoHanded: true, }, }; From a32bde3ec2bf870a755d047228617cda290bdc06 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Thu, 27 Jan 2022 13:02:16 -0500 Subject: [PATCH 10/12] fix typo --- website/common/locales/en/gear.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index ff8ea4078e..848b435e1c 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -616,7 +616,7 @@ "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).", "weaponArmoirePinkLongbowText": "Pink Longbow", - "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.", + "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.", "armor": "armor", "armorCapitalized": "Armor", From 4d18169ebcc089123ba94071954a6fe3531a9a7c Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Thu, 27 Jan 2022 14:38:09 -0500 Subject: [PATCH 11/12] added set name to violetFloppyHat --- website/common/script/content/gear/sets/armoire.js | 1 + 1 file changed, 1 insertion(+) diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index a7c23bf3c3..58752c8ec6 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -442,6 +442,7 @@ const head = { per: 5, int: 5, con: 5, + set: 'violetLoungewear', }, gladiatorHelm: { notes: t('headArmoireGladiatorHelmNotes', { per: 7, int: 7 }), From a8859d51b10b198bf1eb5911b76dd4fe164123ce Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 7 Feb 2022 10:49:18 -0600 Subject: [PATCH 12/12] fix(backgrounds): string syntax consistency --- website/common/locales/en/backgrounds.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 015b45622e..18e47ea909 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -756,12 +756,11 @@ "backgrounds022022": "SET 93: Released February 2022", "backgroundWinterWaterfallText": "Winter Waterfall", - "backgroundWinterWaterfallNotes": "Marvel at a Winter Waterfall", + "backgroundWinterWaterfallNotes": "Marvel at a Winter Waterfall.", "backgroundOrangeGroveText": "Orange Grove", - "backgroundOrangeGroveNotes": "Wander through a fragrant Orange Grove", + "backgroundOrangeGroveNotes": "Wander through a fragrant Orange Grove.", "backgroundIridescentCloudsText": "Iridescent Clouds", - "backgroundIridescentCloudsNotes": "Float in Iridescent Clouds", - + "backgroundIridescentCloudsNotes": "Float in Iridescent Clouds.", "timeTravelBackgrounds": "Steampunk Backgrounds", "backgroundAirshipText": "Airship",