diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 96f94b643a..e0d067baa4 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -667,6 +667,14 @@ "backgroundThroneRoomText": "Throne Room", "backgroundThroneRoomNotes": "Grant an audience in your luxurious Throne Room.", + "backgrounds032021": "SET 82: Released March 2021", + "backgroundInTheArmoryText": "In the Armory", + "backgroundInTheArmoryNotes": "Gear up In the Armory.", + "backgroundSplashInAPuddleText": "Splashing in a Puddle", + "backgroundSplashInAPuddleNotes": "Enjoy the sequel to the storm by Splashing in a Puddle.", + "backgroundSpringThawText": "Spring Thaw", + "backgroundSpringThawNotes": "Watch winter yield to the Spring Thaw.", + "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 d2947f4ac9..811a718e92 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -536,6 +536,8 @@ "weaponArmoireEveningTeaNotes": "This panacea will help you relax so those big tasks don't look so threatening. Increases Intelligence by <%= int %>. Enchanted Armoire: Dressing Gown Set (Item 3 of 3).", "weaponArmoireBlueMoonSaiText": "Dark Lunar Sai", "weaponArmoireBlueMoonSaiNotes": "This sai is a traditional weapon, imbued with the powers of the dark side of the moon. Increases Strength by <%= str %>. Enchanted Armoire: Blue Moon Rogue Set (item 1 of 4).", + "weaponArmoireJadeGlaiveText": "Jade Glaive", + "weaponArmoireJadeGlaiveNotes": "The reach of this glaive will keep you far from your enemies! Also, you can knock things off high shelves. Increases Strength by <%= str %>. Enchanted Armoire: Jade Warrior Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -1155,6 +1157,8 @@ "armorArmoireBlueMoonShozokuNotes": "A strange serenity surrounds the wearer of this armor. Increases Constitution by <%= con %>. Enchanted Armoire: Blue Moon Rogue Set (item 4 of 4).", "armorArmoireSoftPinkSuitText": "Soft Pink Suit", "armorArmoireSoftPinkSuitNotes": "Pink is a soothing color. Slip into this loungewear set for a bit of peace during the daily grind! Increases Perception by <%= per %>. Enchanted Armoire: Pink Loungewear Set (item 2 of 3).", + "armorArmoireJadeArmorText": "Jade Armor", + "armorArmoireJadeArmorNotes": "This jade armor is both beautiful and functional. Protect yourself, and know that you look fabulous! Increases Perception by <%= per %>. Enchanted Armoire: Jade Warrior Set (Item 2 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1792,6 +1796,8 @@ "headArmoireBlueMoonHelmNotes": "This helm offers an astonishing amount of luck to its wearer, and exceptional events follow its use. Increases Intelligence by <%= int %>. Enchanted Armoire: Blue Moon Rogue Set (item 3 of 4).", "headArmoirePinkFloppyHatText": "Pink Floppy Hat", "headArmoirePinkFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a perfect pink color. Increases Intelligence by <%= int %>. Enchanted Armoire: Pink Loungewear Set (item 1 of 3).", + "headArmoireJadeHelmText": "Jade Helm", + "headArmoireJadeHelmNotes": "Some say jade decreases fear and anxiety. With this beautiful helm, you definitely have no cause to worry! Increases Constitution by <%= con %>. Enchanted Armoire: Jade Warrior 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 236bad5d56..75c05defdf 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -425,6 +425,11 @@ const backgrounds = { heart_shaped_bubbles: { }, throne_room: { }, }, + backgrounds032021: { + in_the_armory: { }, + splash_in_a_puddle: { }, + spring_thaw: { }, + }, 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 5cd158335b..2ccb393328 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -346,6 +346,10 @@ const armor = { per: 12, set: 'pinkLoungewear', }, + jadeArmor: { + per: 8, + set: 'jadeWarrior', + }, }; const body = { @@ -692,6 +696,10 @@ const head = { int: 12, set: 'pinkLoungewear', }, + jadeHelm: { + con: 8, + set: 'jadeWarrior', + }, }; const shield = { @@ -1184,6 +1192,10 @@ const weapon = { str: 8, set: 'blueMoon', }, + jadeGlaive: { + str: 10, + set: 'jadeWarrior', + }, }; forEach({ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_in_the_armory.png b/website/raw_sprites/spritesmith/backgrounds/background_in_the_armory.png new file mode 100644 index 0000000000..57e9f56368 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_in_the_armory.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_splash_in_a_puddle.png b/website/raw_sprites/spritesmith/backgrounds/background_splash_in_a_puddle.png new file mode 100644 index 0000000000..8d6c8124e9 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_splash_in_a_puddle.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_spring_thaw.png b/website/raw_sprites/spritesmith/backgrounds/background_spring_thaw.png new file mode 100644 index 0000000000..536f225d31 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_spring_thaw.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_in_the_armory.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_in_the_armory.png new file mode 100644 index 0000000000..9496c9cd8d Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_in_the_armory.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_splash_in_a_puddle.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_splash_in_a_puddle.png new file mode 100644 index 0000000000..48e11e71d2 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_splash_in_a_puddle.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_spring_thaw.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_spring_thaw.png new file mode 100644 index 0000000000..824f0a62a5 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_spring_thaw.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_jadeArmor.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_jadeArmor.png new file mode 100644 index 0000000000..fc762d8e26 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_jadeArmor.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_jadeHelm.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_jadeHelm.png new file mode 100644 index 0000000000..ffb11c4477 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_jadeHelm.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_jadeArmor.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_jadeArmor.png new file mode 100644 index 0000000000..b016617b42 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_jadeArmor.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_jadeHelm.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_jadeHelm.png new file mode 100644 index 0000000000..039609b809 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_jadeHelm.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jadeGlaive.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jadeGlaive.png new file mode 100644 index 0000000000..e41f5ab297 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jadeGlaive.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_jadeArmor.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_jadeArmor.png new file mode 100644 index 0000000000..c291b4fcaf Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_jadeArmor.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jadeGlaive.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jadeGlaive.png new file mode 100644 index 0000000000..8e0927964c Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jadeGlaive.png differ