diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index 779338e4ed..f3fad90de9 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -489,5 +489,13 @@
"backgroundHalflingsHouseText": "Halfling's House",
"backgroundHalflingsHouseNotes": "Visit a charming Halfling's House.",
"backgroundBlossomingDesertText": "Blossoming Desert",
- "backgroundBlossomingDesertNotes": "Witness a rare superbloom in the Blossoming Desert."
+ "backgroundBlossomingDesertNotes": "Witness a rare superbloom in the Blossoming Desert.",
+
+ "backgrounds052019": "SET 60: Released May 2019",
+ "backgroundDojoText": "Dojo",
+ "backgroundDojoNotes": "Learn new moves in a Dojo.",
+ "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."
}
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 204afa3348..96dc8ca158 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -422,6 +422,8 @@
"weaponArmoireJugglingBallsNotes": "Habiticans are master multi-taskers, so you should have no trouble keeping all these balls in the air! Increases Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
"weaponArmoireSlingshotText": "Slingshot",
"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).",
"armor": "armor",
"armorCapitalized": "Armor",
@@ -912,6 +914,8 @@
"armorArmoireChefsJacketNotes": "This thick cotton jacket is double-breasted to protect you from spills (and conveniently reversible…). Increases Intelligence by <%= int %>. Enchanted Armoire: Chef Set (Item 2 of 4).",
"armorArmoireVernalVestmentText": "Vernal Vestment",
"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).",
"headgear": "helm",
"headgearCapitalized": "Headgear",
@@ -1416,6 +1420,8 @@
"headArmoireVernalHenninNotes": "More than just a pretty hat, this conical chapeau can also hold a rolled-up To-Do list inside. Increases Perception by <%= per %>. Enchanted Armoire: Vernal Vestments Set (Item 1 of 3).",
"headArmoireTricornHatText": "Tricorn Hat",
"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).",
"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 a81315dca0..521ce122ba 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -829,6 +829,20 @@ let backgrounds = {
notes: t('backgroundBirchForestNotes'),
},
},
+ backgrounds052019: {
+ dojo: {
+ text: t('backgroundDojoText'),
+ notes: t('backgroundDojoNotes'),
+ },
+ park_with_statue: {
+ text: t('backgroundParkWithStatueText'),
+ notes: t('backgroundParkWithStatueNotes'),
+ },
+ rainbow_meadow: {
+ text: t('backgroundRainbowMeadowText'),
+ notes: t('backgroundRainbowMeadowNotes'),
+ },
+ },
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 6eba545711..5c25db4e20 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -453,6 +453,15 @@ let armor = {
set: 'vernalVestments',
canOwn: ownsItem('armor_armoire_vernalVestment'),
},
+ nephriteArmor: {
+ text: t('armorArmoireNephriteArmorText'),
+ notes: t('armorArmoireNephriteArmorNotes', { str: 7, per: 6 }),
+ value: 100,
+ str: 7,
+ per: 6,
+ set: 'nephrite',
+ canOwn: ownsItem('armor_armoire_nephriteArmor'),
+ },
};
let body = {
@@ -931,6 +940,15 @@ let head = {
per: 10,
canOwn: ownsItem('head_armoire_tricornHat'),
},
+ nephriteHelm: {
+ text: t('headArmoireNephriteHelmText'),
+ notes: t('headArmoireNephriteHelmNotes', { per: 7, int: 6 }),
+ value: 100,
+ per: 7,
+ int: 6,
+ set: 'nephrite',
+ canOwn: ownsItem('head_armoire_nephriteHelm'),
+ },
};
let shield = {
@@ -1574,6 +1592,16 @@ let weapon = {
str: 10,
canOwn: ownsItem('weapon_armoire_slingshot'),
},
+ nephriteBow: {
+ text: t('weaponArmoireNephriteBowText'),
+ notes: t('weaponArmoireNephriteBowNotes', { int: 7, str: 6 }),
+ value: 100,
+ int: 7,
+ str: 6,
+ set: 'nephrite',
+ twoHanded: true,
+ canOwn: ownsItem('weapon_armoire_nephriteBow'),
+ },
};
let armoireSet = {
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_dojo.png b/website/raw_sprites/spritesmith/backgrounds/background_dojo.png
new file mode 100644
index 0000000000..6adec0c94f
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_dojo.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_park_with_statue.png b/website/raw_sprites/spritesmith/backgrounds/background_park_with_statue.png
new file mode 100644
index 0000000000..bb0b26d8a4
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_park_with_statue.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_rainbow_meadow.png b/website/raw_sprites/spritesmith/backgrounds/background_rainbow_meadow.png
new file mode 100644
index 0000000000..9cf722aa44
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_rainbow_meadow.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dojo.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dojo.png
new file mode 100644
index 0000000000..10ec484c1a
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dojo.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_park_with_statue.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_park_with_statue.png
new file mode 100644
index 0000000000..68766191a0
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_park_with_statue.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_rainbow_meadow.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_rainbow_meadow.png
new file mode 100644
index 0000000000..4a6bfc225f
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_rainbow_meadow.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_nephriteArmor.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_nephriteArmor.png
new file mode 100644
index 0000000000..fc8fe7a7d5
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_nephriteArmor.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_nephriteHelm.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_nephriteHelm.png
new file mode 100644
index 0000000000..48d8c48b53
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_nephriteHelm.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_nephriteArmor.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_nephriteArmor.png
new file mode 100644
index 0000000000..70c086fae7
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_nephriteArmor.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_nephriteHelm.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_nephriteHelm.png
new file mode 100644
index 0000000000..5dc71f6c46
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_nephriteHelm.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_nephriteBow.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_nephriteBow.png
new file mode 100644
index 0000000000..8a355ec374
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_nephriteBow.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_nephriteArmor.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_nephriteArmor.png
new file mode 100644
index 0000000000..ed6d876620
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_nephriteArmor.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_nephriteBow.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_nephriteBow.png
new file mode 100644
index 0000000000..01c58e68eb
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_nephriteBow.png differ
diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201904.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201904.png
deleted file mode 100644
index 8e7c5d3bd9..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201904.png and /dev/null 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
new file mode 100644
index 0000000000..4706f16629
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201905.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index eeaef8f0d9..6d83a1b42b 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 = 'MAY 2019 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE!';
+const LAST_ANNOUNCEMENT_TITLE = 'MAY BACKGROUNDS AND ARMOIRE ITEMS!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -30,18 +30,14 @@ api.getNews = {
${res.t('newStuff')}
- 4/30/2019 - ${LAST_ANNOUNCEMENT_TITLE}
+ 5/7/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, (Review Your Combat Tactics) [https://habitica.com/challenges/f64a1afa-ae00-4855-91af-b52e9bd6803f], we're focusing on refining your strategy to help you stay motivated and keep moving forward as we're almost halfway through the year!! It has a 15 Gem prize, which will be awarded to five lucky winners on June 3.
- Congratulations to the winners of April's Challenge: punkshep, Syntrillium, BardoVelho, Betsy, and Baileythebookworm!
- The next Take This Challenge has also launched, "Organize Your Inventory!", with a focus on decluttering your living space. 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, "Harder, Faster, Stronger!": grand prize winner Evan Cowan, and runners-up ResearcherLilly, corinnetags, Lucy, mrdarq, and Snarky. 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 learn new moves in the Dojo, stroll in a Park with a Statue, and admire a Rainbow Meadow. Check them out under User Icon > Backgrounds!
+ Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Nephrite Archer Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+ by Balduranne, QuartzFox, AnnDeLune, GeraldThePixel, Reesachan, and Mewrose
`,
});