Merge remote-tracking branch 'CuriousMagpie/2022-02-backgrounds-armoire' into develop

This commit is contained in:
SabreCat 2022-02-07 10:51:23 -06:00
commit fd4d139fc2
6 changed files with 37 additions and 3 deletions

View file

@ -224,7 +224,7 @@
</div>
<div class="row">
<div class="col-12 col-md-5 text-center text-md-left">
© 2021 Habitica. All rights reserved.
© 2022 Habitica. All rights reserved.
<div
v-if="!IS_PRODUCTION && isUserLoaded"
class="debug float-left"

View file

@ -40,7 +40,7 @@
>{{ $t('editAvatar') }}</a>
<a
class="topbar-dropdown-item dropdown-item dropdown-separated"
@click="showAvatar('backgrounds', '2021')"
@click="showAvatar('backgrounds', '2022')"
>{{ $t('backgrounds') }}</a>
<a
class="topbar-dropdown-item dropdown-item"

View file

@ -754,6 +754,14 @@
"backgroundSnowyFarmText": "Snowy Farm",
"backgroundSnowyFarmNotes": "Check that everyone is well and warm on your Snowy Farm.",
"backgrounds022022": "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.",

View file

@ -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": "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,6 +1301,8 @@
"armorArmoireSoftBlackSuitNotes": "Black is a mysterious colour. Its 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": "Purple is a luxurious color. Relax in style after youve 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",
@ -1851,7 +1855,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,6 +2378,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": "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",

View file

@ -480,6 +480,11 @@ const backgrounds = {
palm_tree_with_fairy_lights: { },
snowy_farm: { },
},
backgrounds022022: {
winter_waterfall: { },
orange_grove: { },
iridescent_clouds: { },
},
timeTravelBackgrounds: {
airship: {
price: 1,

View file

@ -383,6 +383,11 @@ const armor = {
con: 10,
set: 'shootingStar',
},
softVioletSuit: {
con: 7,
str: 7,
set: 'violetLoungewear',
},
};
const body = {
@ -437,6 +442,7 @@ const head = {
per: 5,
int: 5,
con: 5,
set: 'violetLoungewear',
},
gladiatorHelm: {
notes: t('headArmoireGladiatorHelmNotes', { per: 7, int: 7 }),
@ -1046,6 +1052,10 @@ const shield = {
per: 5,
set: 'blackLoungewear',
},
softVioletPillow: {
int: 10,
set: 'violetLoungewear',
},
};
const headAccessory = {
@ -1421,6 +1431,11 @@ const weapon = {
set: 'shootingStar',
twoHanded: true,
},
pinkLongbow: {
per: 6,
str: 5,
twoHanded: true,
},
};
forEach({