diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 2b2e91a798..8f67436c39 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -699,6 +699,14 @@ "backgroundWaterMillText": "Water Mill", "backgroundWaterMillNotes": "Watch the wheel of the Water Mill go round and round.", + "backgrounds072021": "SET 86: Released July 2021", + "backgroundUnderwaterAmongKoiText": "Underwater Among Koi", + "backgroundUnderwaterAmongKoiNotes": "Dazzle and be dazzled by glittering carp, Underwater Among Koi.", + "backgroundGhostShipText": "Ghost Ship", + "backgroundGhostShipNotes": "Prove tales and legends true when you step aboard a Ghost Ship.", + "backgroundRagingRiverText": "Raging River", + "backgroundRagingRiverNotes": "Stand amid the mighty current of a Raging River.", + "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 331236b96e..58cb097c92 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -401,7 +401,7 @@ "weaponSpecialSummer2021RogueText": "Anemone Tentacles", "weaponSpecialSummer2021RogueNotes": "Any predatory monster that dares approach will feel the sting of your protective friends! Increases Strength by <%= str %>. Limited Edition 2021 Summer Gear.", "weaponSpecialSummer2021WarriorText": "Watery Blade", - "weaponSpecialSummer2021WarriorNotes": "This shimmering blade may like flow like water, but it can cut to the heart of the trickiest problems! Increases Strength by <%= str %>. Limited Edition 2021 Summer Gear.", + "weaponSpecialSummer2021WarriorNotes": "This shimmering blade may flow like water, but it can cut to the heart of the trickiest problems! Increases Strength by <%= str %>. Limited Edition 2021 Summer Gear.", "weaponSpecialSummer2021MageText": "Nautiloid Cane", "weaponSpecialSummer2021MageNotes": "Whether your magical ambitions run twenty thousand leagues deep, or if you intend only to dip in the shallows of the art, this shining implement will serve you well! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2021 Summer Gear.", "weaponSpecialSummer2021HealerText": "Staff of Corn", @@ -560,6 +560,8 @@ "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).", "weaponArmoireMedievalWashboardText": "Washboard", "weaponArmoireMedievalWashboardNotes": "Scrub-a-dub-dub! It's time to apply some elbow grease and get that laundry clean. Increases Strength by <%= str %>. Enchanted Armoire: Medieval Launderers Set (Item 5 of 6).", + "weaponArmoireBuoyantBubblesText": "Buoyant Bubbles", + "weaponArmoireBuoyantBubblesNotes": "These bubbles just keep on floating forever, somehow... Increases Perception by <%= per %>. Enchanted Armoire: Bubble Bath Set (Item 3 of 4).", "armor": "armor", "armorCapitalized": "Armor", @@ -1208,7 +1210,9 @@ "armorArmoireMedievalLaundryOutfitText": "Laundry Outfit", "armorArmoireMedievalLaundryOutfitNotes": "Put on your working clothes and roll up your sleeves: it's time to get the laundry done! Increases Constitution by <%= con %>. Enchanted Armoire: Medieval Launderers Set (Item 1 of 6).", "armorArmoireMedievalLaundryDressText": "Laundry Dress", - "armorArmoireMedievalLaundryDressNotes": "Put on your apron roll up your sleeves: it's time to get the laundry done! Increases Constitution by <%= con %>. Enchanted Armoire: Medieval Launderers Set (Item 2 of 6).", + "armorArmoireMedievalLaundryDressNotes": "Put on your apron and roll up your sleeves: it's time to get the laundry done! Increases Constitution by <%= con %>. Enchanted Armoire: Medieval Launderers Set (Item 2 of 6).", + "armorArmoireBathtubText": "Bathtub", + "armorArmoireBathtubNotes": "Time for a little R&R? Here's your own personal bathtub -- and a guarantee that the water is always the right temperature! Increases Constitution by <%= con %>. Enchanted Armoire: Bubble Bath Set (Item 2 of 4).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1876,6 +1880,8 @@ "headArmoireMedievalLaundryCapNotes": "It's not quite a thinking cap, but for laundry, it will do... Increases Intelligence by <%= int %>. Enchanted Armoire: Medieval Launderers Set (Item 3 of 6).", "headArmoireMedievalLaundryHatText": "Laundry Hat", "headArmoireMedievalLaundryHatNotes": "It's not quite a thinking cap, but for laundry, it will do... Increases Intelligence by <%= int %>. Enchanted Armoire: Medieval Launderers Set (Item 4 of 6).", + "headArmoireRubberDuckyText": "Rubber Ducky", + "headArmoireRubberDuckyNotes": "The perfect companion for an indulgent spa day! Also surprisingly knowledgeable about a range of software issues. Increases Intelligence by <%= int %>. Enchanted Armoire: Bubble Bath Set (Item 1 of 4).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", @@ -2226,6 +2232,8 @@ "shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 10).", "shieldArmoireMedievalLaundryText": "Dirty Laundry", "shieldArmoireMedievalLaundryNotes": "It's going to be tough to get this clean, but you already know you can do anything. Increases Perception by <%= per %>. Enchanted Armoire: Medieval Launderers Set (Item 6 of 6).", + "shieldArmoireBouncyBubblesText": "Bouncy Bubbles", + "shieldArmoireBouncyBubblesNotes": "Complete your relaxing bath with these exuberant bubbles! Increases Strength by <%= str %>. Enchanted Armoire: Bubble Bath Set (Item 4 of 4).", "back": "Back Accessory", "backCapitalized": "Back Accessory", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index c8635034ff..95d3cd1e0d 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -445,6 +445,11 @@ const backgrounds = { forested_lakeshore: { }, water_mill: { }, }, + backgrounds072021: { + underwater_among_koi: { }, + ghost_ship: { }, + raging_river: { }, + }, 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 30533d707b..9c3666316e 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -362,6 +362,10 @@ const armor = { con: 6, set: 'medievalLaunderers', }, + bathtub: { + con: 8, + set: 'bath', + }, }; const body = { @@ -734,6 +738,10 @@ const head = { int: 6, set: 'medievalLaunderers', }, + rubberDucky: { + int: 10, + set: 'bath', + }, }; const shield = { @@ -982,6 +990,10 @@ const shield = { per: 6, set: 'medievalLaunderers', }, + bouncyBubbles: { + str: 5, + set: 'bath', + }, }; const headAccessory = { @@ -1284,6 +1296,10 @@ const weapon = { str: 6, set: 'medievalLaunderers', }, + buoyantBubbles: { + per: 5, + set: 'bath', + }, }; forEach({ diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js index f208c519a1..37a9a7c240 100644 --- a/website/common/script/content/spells.js +++ b/website/common/script/content/spells.js @@ -398,7 +398,7 @@ spells.special = { target: 'user', notes: t('spellSpecialSeafoamNotes'), canOwn () { - return false; + return moment().isBetween('2021-07-06T08:00-04:00', EVENTS.summer2021.end); }, cast (user, target, req) { if (!user.items.special.seafoam) throw new NotAuthorized(t('spellNotOwned')(req.language)); diff --git a/website/raw_sprites/spritesmith/backgrounds/background_ghost_ship.png b/website/raw_sprites/spritesmith/backgrounds/background_ghost_ship.png new file mode 100644 index 0000000000..9f6d224f10 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_ghost_ship.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_raging_river.png b/website/raw_sprites/spritesmith/backgrounds/background_raging_river.png new file mode 100644 index 0000000000..2d14d6636e Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_raging_river.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_underwater_among_koi.png b/website/raw_sprites/spritesmith/backgrounds/background_underwater_among_koi.png new file mode 100644 index 0000000000..e5fc63c4ba Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_underwater_among_koi.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_ghost_ship.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_ghost_ship.png new file mode 100644 index 0000000000..58c3e649ad Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_ghost_ship.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_raging_river.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_raging_river.png new file mode 100644 index 0000000000..8a87177496 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_raging_river.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_underwater_among_koi.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_underwater_among_koi.png new file mode 100644 index 0000000000..8b6d3a5fae Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_underwater_among_koi.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_bathtub.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_bathtub.png new file mode 100644 index 0000000000..1b61447c8f Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_bathtub.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_rubberDucky.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_rubberDucky.png new file mode 100644 index 0000000000..4f2e6a8252 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_rubberDucky.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_bouncyBubbles.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_bouncyBubbles.png new file mode 100644 index 0000000000..03e1ee96fc Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_bouncyBubbles.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_bathtub.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_bathtub.png new file mode 100644 index 0000000000..5e49ff636c Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_bathtub.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_rubberDucky.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_rubberDucky.png new file mode 100644 index 0000000000..0fd9851107 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_rubberDucky.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_bouncyBubbles.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_bouncyBubbles.png new file mode 100644 index 0000000000..c06326f2fd Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_bouncyBubbles.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_buoyantBubbles.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_buoyantBubbles.png new file mode 100644 index 0000000000..ada5cb7de9 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_buoyantBubbles.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_bathtub.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_bathtub.png new file mode 100644 index 0000000000..faba7d2130 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_bathtub.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_buoyantBubbles.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_buoyantBubbles.png new file mode 100644 index 0000000000..ef33334663 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_buoyantBubbles.png differ