diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index 59196df1a9..8b19917f51 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -449,5 +449,13 @@
"backgroundGlowingMushroomCaveText": "Glowing Mushroom Cave",
"backgroundGlowingMushroomCaveNotes": "Stare in awe at a Glowing Mushroom Cave.",
"backgroundCozyBedroomText": "Cozy Bedroom",
- "backgroundCozyBedroomNotes": "Curl up in a Cozy Bedroom."
+ "backgroundCozyBedroomNotes": "Curl up in a Cozy Bedroom.",
+
+ "backgrounds122018": "SET 55: Released December 2018",
+ "backgroundFlyingOverSnowyMountainsText": "Snowy Mountains",
+ "backgroundFlyingOverSnowyMountainsNotes": "Soar over Snowy Mountains at night.",
+ "backgroundFrostyForestText": "Frosty Forest",
+ "backgroundFrostyForestNotes": "Bundle up to hike through a Frosty Forest.",
+ "backgroundSnowyDayFireplaceText": "Snowy Day Fireplace",
+ "backgroundSnowyDayFireplaceNotes": "Snuggle up next to a Fireplace on a Snowy Day."
}
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 61f611c0aa..b3423e2640 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -850,6 +850,10 @@
"armorArmoireRobeOfSpadesNotes": "These luxuriant robes conceal hidden pockets for treasures or weapons--your choice! Increases Strength by <%= str %>. Enchanted Armoire: Ace of Spades Set (Item 2 of 3).",
"armorArmoireSoftBlueSuitText": "Soft Blue Suit",
"armorArmoireSoftBlueSuitNotes": "Blue is a calming colour. So calming, some even wear this soft outfit to sleep... zZz. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Blue Loungewear Set (Item 2 of 3).",
+ "armorArmoireSoftGreenSuitText": "Soft Green Suit",
+ "armorArmoireSoftGreenSuitNotes": "Green is the most refreshing color! Ideal for resting those tired eyes... mmm, or even a nap... Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Green Loungewear Set (Item 2 of 3).",
+ "armorArmoireSoftRedSuitText": "Soft Red Suit",
+ "armorArmoireSoftRedSuitNotes": "Red is such an invigorating color. If you need to wake up bright and early, this suit could make the perfect pajamas... Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Red Loungewear Set (Item 2 of 3).",
"headgear": "helm",
"headgearCapitalized": "Headgear",
@@ -1243,7 +1247,7 @@
"headArmoireYellowHairbowText": "Yellow Hairbow",
"headArmoireYellowHairbowNotes": "Become perceptive, strong, and smart while wearing this beautiful Yellow Hairbow! Increases Perception, Strength, and Intelligence by <%= attrs %> each. Enchanted Armoire: Yellow Hairbow Set (Item 1 of 2).",
"headArmoireRedFloppyHatText": "Red Floppy Hat",
- "headArmoireRedFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a radiant red color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+ "headArmoireRedFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a radiant red color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Red Loungewear Set (Item 1 of 3).",
"headArmoirePlagueDoctorHatText": "Plague Doctor Hat",
"headArmoirePlagueDoctorHatNotes": "An authentic hat worn by the doctors who battle the Plague of Procrastination! Increases Strength by <%= str %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Plague Doctor Set (Item 1 of 3).",
"headArmoireBlackCatText": "Black Cat Hat",
@@ -1269,7 +1273,7 @@
"headArmoireGraduateCapText": "Graduate Cap",
"headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).",
"headArmoireGreenFloppyHatText": "Green Floppy Hat",
- "headArmoireGreenFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a gorgeous green color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+ "headArmoireGreenFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a gorgeous green color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Green Loungewear Set (Item 1 of 3).",
"headArmoireCannoneerBandannaText": "Cannoneer Bandanna",
"headArmoireCannoneerBandannaNotes": "'Tis a cannoneer's life for me! Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Cannoneer Set (Item 3 of 3).",
"headArmoireFalconerCapText": "Falconer Cap",
@@ -1573,6 +1577,10 @@
"shieldArmoireUnfinishedTomeNotes": "You simply can't procrastinate when you're holding this! The binding needs to be finished so people can read the book! Increases Intelligence by <%= int %>. Enchanted Armoire: Bookbinder Set (Item 4 of 4).",
"shieldArmoireSoftBluePillowText": "Soft Blue Pillow",
"shieldArmoireSoftBluePillowNotes": "The sensible warrior packs a pillow for any expedition. Shield yourself from sharp tasks... even while you nap. Increases Constitution by <%= con %>. Enchanted Armoire: Blue Loungewear Set (Item 3 of 3).",
+ "shieldArmoireSoftRedPillowText": "Soft Red Pillow",
+ "shieldArmoireSoftRedPillowNotes": "The prepared warrior packs a pillow for any expedition. Protect yourself from those tough tasks... even while you nap. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Red Loungewear Set (Item 3 of 3).",
+ "shieldArmoireSoftGreenPillowText": "Soft Green Pillow",
+ "shieldArmoireSoftGreenPillowNotes": "The practical warrior packs a pillow for any expedition. Ward off those pesky chores... even while you nap. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Green Loungewear Set (Item 3 of 3).",
"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 bd10cf9014..bebf9fa0e0 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -759,6 +759,20 @@ let backgrounds = {
notes: t('backgroundCozyBedroomNotes'),
},
},
+ backgrounds122018: {
+ flying_over_snowy_mountains: {
+ text: t('backgroundFlyingOverSnowyMountainsText'),
+ notes: t('backgroundFlyingOverSnowyMountainsNotes'),
+ },
+ frosty_forest: {
+ text: t('backgroundFrostyForestText'),
+ notes: t('backgroundFrostyForestNotes'),
+ },
+ snowy_day_fireplace: {
+ text: t('backgroundSnowyDayFireplaceText'),
+ notes: t('backgroundSnowyDayFireplaceNotes'),
+ },
+ },
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 a897a8511f..3f36bfdd57 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -409,6 +409,24 @@ let armor = {
set: 'blueLoungewear',
canOwn: ownsItem('armor_armoire_softBlueSuit'),
},
+ softGreenSuit: {
+ text: t('armorArmoireSoftGreenSuitText'),
+ notes: t('armorArmoireSoftGreenSuitNotes', { attrs: 7 }),
+ value: 100,
+ int: 7,
+ con: 7,
+ set: 'greenLoungewear',
+ canOwn: ownsItem('armor_armoire_softGreenSuit'),
+ },
+ softRedSuit: {
+ text: t('armorArmoireSoftRedSuitText'),
+ notes: t('armorArmoireSoftRedSuitNotes', { int: 8, str: 5 }),
+ value: 100,
+ int: 8,
+ str: 5,
+ set: 'redLoungewear',
+ canOwn: ownsItem('armor_armoire_softRedSuit'),
+ },
};
let body = {
@@ -544,6 +562,7 @@ let head = {
int: 6,
per: 6,
canOwn: ownsItem('head_armoire_redFloppyHat'),
+ set: 'redLoungewear',
},
plagueDoctorHat: {
text: t('headArmoirePlagueDoctorHatText'),
@@ -654,6 +673,7 @@ let head = {
int: 8,
con: 8,
canOwn: ownsItem('head_armoire_greenFloppyHat'),
+ set: 'greenLoungewear',
},
cannoneerBandanna: {
text: t('headArmoireCannoneerBandannaText'),
@@ -1083,6 +1103,24 @@ let shield = {
set: 'blueLoungewear',
canOwn: ownsItem('shield_armoire_softBluePillow'),
},
+ softGreenPillow: {
+ text: t('shieldArmoireSoftGreenPillowText'),
+ notes: t('shieldArmoireSoftGreenPillowNotes', { con: 8, int: 6 }),
+ value: 100,
+ con: 8,
+ int: 6,
+ set: 'greenLoungewear',
+ canOwn: ownsItem('shield_armoire_softGreenPillow'),
+ },
+ softRedPillow: {
+ text: t('shieldArmoireSoftRedPillowText'),
+ notes: t('shieldArmoireSoftRedPillowNotes', { attrs: 5 }),
+ value: 100,
+ con: 5,
+ str: 5,
+ set: 'redLoungewear',
+ canOwn: ownsItem('shield_armoire_softRedPillow'),
+ },
};
let headAccessory = {
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_flying_over_snowy_mountains.png b/website/raw_sprites/spritesmith/backgrounds/background_flying_over_snowy_mountains.png
new file mode 100644
index 0000000000..0b3dc20e0b
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_flying_over_snowy_mountains.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_frosty_forest.png b/website/raw_sprites/spritesmith/backgrounds/background_frosty_forest.png
new file mode 100644
index 0000000000..d2e6c8e068
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_frosty_forest.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_snowy_day_fireplace.png b/website/raw_sprites/spritesmith/backgrounds/background_snowy_day_fireplace.png
new file mode 100644
index 0000000000..71de0b15ef
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_snowy_day_fireplace.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_snowy_mountains.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_snowy_mountains.png
new file mode 100644
index 0000000000..cc5de9fb17
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_snowy_mountains.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_frosty_forest.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_frosty_forest.png
new file mode 100644
index 0000000000..09e64f6af8
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_frosty_forest.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_snowy_day_fireplace.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_snowy_day_fireplace.png
new file mode 100644
index 0000000000..5f7a22891e
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_snowy_day_fireplace.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softGreenSuit.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softGreenSuit.png
new file mode 100644
index 0000000000..684f9c30c5
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softGreenSuit.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softRedSuit.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softRedSuit.png
new file mode 100644
index 0000000000..95a0f702c4
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softRedSuit.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softGreenPillow.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softGreenPillow.png
new file mode 100644
index 0000000000..63ff1aea4b
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softGreenPillow.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softRedPillow.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softRedPillow.png
new file mode 100644
index 0000000000..242e86cb9a
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softRedPillow.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softGreenSuit.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softGreenSuit.png
new file mode 100644
index 0000000000..6f014c7d17
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softGreenSuit.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softRedSuit.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softRedSuit.png
new file mode 100644
index 0000000000..59bdf1740d
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softRedSuit.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softGreenPillow.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softGreenPillow.png
new file mode 100644
index 0000000000..dd984ffa86
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softGreenPillow.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softRedPillow.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softRedPillow.png
new file mode 100644
index 0000000000..3b35e85a7f
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softRedPillow.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softGreenSuit.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softGreenSuit.png
new file mode 100644
index 0000000000..b3a48ac358
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softGreenSuit.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softRedSuit.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softRedSuit.png
new file mode 100644
index 0000000000..c26f081f67
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softRedSuit.png differ
diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201811.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201811.png
deleted file mode 100644
index 40541440e3..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201811.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201812.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201812.png
new file mode 100644
index 0000000000..517469db0f
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201812.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 4e7d4e1bdf..19425c99e7 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 = 'DECEMBER 2018 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE';
+const LAST_ANNOUNCEMENT_TITLE = 'DECEMBER BACKGROUNDS AND ARMOIRE ITEMS';
const worldDmg = { // @TODO
bailey: false,
};
@@ -30,17 +30,14 @@ api.getNews = {
${res.t('newStuff')}
- 12/3/2018 - ${LAST_ANNOUNCEMENT_TITLE}
+ 12/5/2018 - ${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, Journey's End and New Beginnings, we're focusing on reviewing your 2018 resolution successes and planning for an even better 2019! It has a 15 gem prize, which will be awarded to five lucky winners on January 2.
- Congratulations to the winners of the November Challenge, misketti, CamelliaLynne, DrearyDear, Mikachu, and Zsuzsa!
- The next Take This Challenge has also launched, "Don't Be a Completionist!" with a focus on setting priorities. 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, "This One Goes to 11!": grand prize winner digitalkitty isawesome, and runners-up jtm119, Jicaffo, Azburn, Snowdesert, and Hicholyta. 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 soar over Snowy Mountains at night, bundle up to hike through a Frosty Forest, or snuggle up next to a Snowy Day Fireplace. Check them out under User Icon > Backgrounds!
+ Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Green and Red Loungewear Sets. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+ by eyenne, Vikte, wykedcrafty, GeraldThePixel, shanaqui, and SabreCat
+
`,
});