diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index f3fad90de9..bceb1cfd99 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -497,5 +497,13 @@
"backgroundParkWithStatueText": "Park with Statue",
"backgroundParkWithStatueNotes": "Follow a flower-lined path through a Park with a Statue.",
"backgroundRainbowMeadowText": "Rainbow Meadow",
- "backgroundRainbowMeadowNotes": "Find the pot of gold where a Rainbow ends in a Meadow."
+ "backgroundRainbowMeadowNotes": "Find the pot of gold where a Rainbow ends in a Meadow.",
+
+ "backgrounds062019": "SET 61: Released June 2019",
+ "backgroundSchoolOfFishText": "School of Fish",
+ "backgroundSchoolOfFishNotes": "Swim among a School of Fish.",
+ "backgroundSeasideCliffsText": "Seaside Cliffs",
+ "backgroundSeasideCliffsNotes": "Stand on a beach with the beauty of Seaside Cliffs above.",
+ "backgroundUnderwaterVentsText": "Underwater Vents",
+ "backgroundUnderwaterVentsNotes": "Take a deep dive down, down to the Underwater Vents."
}
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 4f8eead30d..6a51bab669 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -424,6 +424,8 @@
"weaponArmoireSlingshotNotes": "Take aim at your red Dailies! Increases Strength by <%= str %>. Enchanted Armoire: Independent Item.",
"weaponArmoireNephriteBowText": "Nephrite Bow",
"weaponArmoireNephriteBowNotes": "This bow shoots special jade-tipped arrows that will take down even your most stubborn bad habits! Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Nephrite Archer Set (Item 1 of 3).",
+ "weaponArmoireBambooCaneText": "Bamboo Cane",
+ "weaponArmoireBambooCaneNotes": "Perfect for assisting you in a stroll, or for dancing the Charleston. Increases Intelligence, Perception, and Constitution by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 3 of 3).",
"armor": "armor",
"armorCapitalized": "Armor",
@@ -916,6 +918,8 @@
"armorArmoireVernalVestmentNotes": "This silky garment is perfect for enjoying mild spring weather in style. Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Vernal Vestments Set (Item 2 of 3).",
"armorArmoireNephriteArmorText": "Nephrite Armor",
"armorArmoireNephriteArmorNotes": "Made from strong steel rings and decorated with jade, this armor will protect you from procrastination! Increases Strength by <%= str %> and Perception by <%= per %>. Enchanted Armoire: Nephrite Archer Set (Item 3 of 3).",
+ "armorArmoireBoatingJacketText": "Boating Jacket",
+ "armorArmoireBoatingJacketNotes": "Whether you're on a swanky yacht or in a jalopy, you'll be the cat's meow in this jacket and tie. Increases Strength, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 1 of 3).",
"headgear": "helm",
"headgearCapitalized": "Headgear",
@@ -1422,6 +1426,8 @@
"headArmoireTricornHatNotes": "Become a revolutionary jokester! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
"headArmoireNephriteHelmText": "Nephrite Helm",
"headArmoireNephriteHelmNotes": "The carved jade plume atop this helm is enchanted to enhance your aim. Increases Perception by <%= per %> and Intelligence by <%= int %>. Enchanted Armoire: Nephrite Archer Set (Item 2 of 3).",
+ "headArmoireBoaterHatText": "Boater Hat",
+ "headArmoireBoaterHatNotes": "This straw chapeau is the bee's knees! Increases Strength, Constitution, and Perception by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 2 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 521ce122ba..9a318ad78f 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -843,6 +843,20 @@ let backgrounds = {
notes: t('backgroundRainbowMeadowNotes'),
},
},
+ backgrounds062019: {
+ school_of_fish: {
+ text: t('backgroundSchoolOfFishText'),
+ notes: t('backgroundSchoolOfFishNotes'),
+ },
+ seaside_cliffs: {
+ text: t('backgroundSeasideCliffsText'),
+ notes: t('backgroundSeasideCliffsNotes'),
+ },
+ underwater_vents: {
+ text: t('backgroundUnderwaterVentsText'),
+ notes: t('backgroundUnderwaterVentsNotes'),
+ },
+ },
incentiveBackgrounds: {
violet: {
text: t('backgroundVioletText'),
diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js
index 5c25db4e20..1fdba83547 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -462,6 +462,16 @@ let armor = {
set: 'nephrite',
canOwn: ownsItem('armor_armoire_nephriteArmor'),
},
+ boatingJacket: {
+ text: t('armorArmoireBoatingJacketText'),
+ notes: t('armorArmoireBoatingJacketNotes', { attrs: 6 }),
+ value: 100,
+ int: 6,
+ per: 6,
+ str: 6,
+ set: 'boating',
+ canOwn: ownsItem('armor_armoire_boatingJacket'),
+ },
};
let body = {
@@ -949,6 +959,16 @@ let head = {
set: 'nephrite',
canOwn: ownsItem('head_armoire_nephriteHelm'),
},
+ boaterHat: {
+ text: t('headArmoireBoaterHatText'),
+ notes: t('headArmoireBoaterHatNotes', { attrs: 6 }),
+ value: 100,
+ str: 6,
+ con: 6,
+ per: 6,
+ set: 'boating',
+ canOwn: ownsItem('head_armoire_boaterHat'),
+ },
};
let shield = {
@@ -1602,6 +1622,16 @@ let weapon = {
twoHanded: true,
canOwn: ownsItem('weapon_armoire_nephriteBow'),
},
+ bambooCane: {
+ text: t('weaponArmoireBambooCaneText'),
+ notes: t('weaponArmoireBambooCaneNotes', { attrs: 6 }),
+ value: 100,
+ int: 6,
+ per: 6,
+ con: 6,
+ set: 'boating',
+ canOwn: ownsItem('weapon_armoire_bambooCane'),
+ },
};
let armoireSet = {
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_school_of_fish.png b/website/raw_sprites/spritesmith/backgrounds/background_school_of_fish.png
new file mode 100644
index 0000000000..d459e4f85c
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_school_of_fish.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_seaside_cliffs.png b/website/raw_sprites/spritesmith/backgrounds/background_seaside_cliffs.png
new file mode 100644
index 0000000000..28edf1de8d
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_seaside_cliffs.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_underwater_vents.png b/website/raw_sprites/spritesmith/backgrounds/background_underwater_vents.png
new file mode 100644
index 0000000000..ae5db67361
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_underwater_vents.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_school_of_fish.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_school_of_fish.png
new file mode 100644
index 0000000000..bfd26b1303
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_school_of_fish.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_seaside_cliffs.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_seaside_cliffs.png
new file mode 100644
index 0000000000..11d64b6481
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_seaside_cliffs.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_underwater_vents.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_underwater_vents.png
new file mode 100644
index 0000000000..3e0d62adb9
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_underwater_vents.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_boatingJacket.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_boatingJacket.png
new file mode 100644
index 0000000000..77435d88f8
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_boatingJacket.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_boaterHat.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_boaterHat.png
new file mode 100644
index 0000000000..19b1c3a0c0
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_boaterHat.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_boatingJacket.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_boatingJacket.png
new file mode 100644
index 0000000000..2c85965917
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_boatingJacket.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_boaterHat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_boaterHat.png
new file mode 100644
index 0000000000..899d328d79
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_boaterHat.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_bambooCane.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_bambooCane.png
new file mode 100644
index 0000000000..3db9752e7c
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_bambooCane.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_boatingJacket.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_boatingJacket.png
new file mode 100644
index 0000000000..cb9c8090e1
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_boatingJacket.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_bambooCane.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_bambooCane.png
new file mode 100644
index 0000000000..5401c6a0f3
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_bambooCane.png differ
diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201905.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201905.png
deleted file mode 100644
index 4706f16629..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201905.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201906.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201906.png
new file mode 100644
index 0000000000..45b75e38a9
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201906.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 50f26e14e4..96c37dbc38 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
let api = {};
// @TODO export this const, cannot export it from here because only routes are exported from controllers
-const LAST_ANNOUNCEMENT_TITLE = 'JUNE 2019 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE';
+const LAST_ANNOUNCEMENT_TITLE = 'JUNE BACKGROUNDS AND ARMOIRE ITEMS!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -30,19 +30,14 @@ api.getNews = {
${res.t('newStuff')}
- 6/3/2019 - ${LAST_ANNOUNCEMENT_TITLE}
+ 6/4/2019 - ${LAST_ANNOUNCEMENT_TITLE}
-
- The Habitica team has launched a special official Challenge series hosted in the Official New Year's Resolution Guild. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses.
- For this month's Challenge, Mark Your Journey, we're reflecting on your achievements since January and looking ahead to the rest of the year! It has a 15 Gem prize, which will be awarded to five lucky winners on July 1st.
- Congratulations to the winners of May's Challenge, @CamelliaLynne, @wespe, @bdwilson, @skyflower, and @Mawri!
- The next Take This Challenge has also launched, "You've Got a Friend in Me!", with a focus on expressing gratitude to people who improve our lives. Be sure to check it out to earn additional pieces of the Take This armor set!
- Take This is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.
- Congratulations to the winners of the last Take This Challenge, "Organize Your Inventory!": grand prize winner t3h5rC, and runners-up avogad-ro, DrearyDear, BlueSky, Riou, and Keeva! Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't completed it already. It is located in your Rewards column. Enjoy!
- by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
-
+
+ We’ve added three new backgrounds to the Background Shop! Now your avatar can take a deep dive to Underwater Vents, swim with a School of Fish, and enjoy the beauty of Seaside Cliffs. Check them out under User Icon > Backgrounds!
+ Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Boating Outfit. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+ by Tyche Alba, The Mushroom King, Manostion, FolleMente, Katy133, Chimera Liani, and SabreCat
`,
});