diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 2cdb022989..59196df1a9 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -441,5 +441,13 @@ "backgroundCreepyCastleText": "Creepy Castle", "backgroundCreepyCastleNotes": "Dare to approach a Creepy Castle.", "backgroundDungeonText": "Dungeon", - "backgroundDungeonNotes": "Rescue the prisoners of a spooky Dungeon." + "backgroundDungeonNotes": "Rescue the prisoners of a spooky Dungeon.", + + "backgrounds112018": "SET 54: Released November 2018", + "backgroundBackAlleyText": "Back Alley", + "backgroundBackAlleyNotes": "Look shady loitering in a Back Alley.", + "backgroundGlowingMushroomCaveText": "Glowing Mushroom Cave", + "backgroundGlowingMushroomCaveNotes": "Stare in awe at a Glowing Mushroom Cave.", + "backgroundCozyBedroomText": "Cozy Bedroom", + "backgroundCozyBedroomNotes": "Curl up in a Cozy Bedroom." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 4823970d80..5bb20fe3b9 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -844,6 +844,8 @@ "armorArmoireCoverallsOfBookbindingNotes": "Everything you need in a set of coveralls, including pockets for everything. A pair of goggles, loose change, a golden ring... Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Bookbinder Set (Item 2 of 4).", "armorArmoireRobeOfSpadesText": "Robe of Spades", "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).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1241,7 +1243,7 @@ "headArmoireOrangeCatText": "Orange Cat Hat", "headArmoireOrangeCatNotes": "This orange hat is... purring. And twitching its tail. And breathing? Yeah, you just have a sleeping cat on your head. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Independent Item.", "headArmoireBlueFloppyHatText": "Blue Floppy Hat", - "headArmoireBlueFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a brilliant blue color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.", + "headArmoireBlueFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a brilliant blue color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Blue Loungewear Set (Item 1 of 3).", "headArmoireShepherdHeaddressText": "Shepherd Headdress", "headArmoireShepherdHeaddressNotes": "Sometimes the gryphons that you herd like to chew on this headdress, but it makes you seem more intelligent nonetheless. Increases Intelligence by <%= int %>. Enchanted Armoire: Shepherd Set (Item 3 of 3).", "headArmoireCrystalCrescentHatText": "Crystal Crescent Hat", @@ -1561,6 +1563,8 @@ "shieldArmoirePiraticalSkullShieldNotes": "This enchanted shield will whisper the secret locations of your enemies' treasures- listen closely! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Piratical Princess Set (Item 4 of 4).", "shieldArmoireUnfinishedTomeText": "Unfinished Tome", "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).", "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 f17fe9e254..bd10cf9014 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -745,6 +745,20 @@ let backgrounds = { notes: t('backgroundDungeonNotes'), }, }, + backgrounds112018: { + back_alley: { + text: t('backgroundBackAlleyText'), + notes: t('backgroundBackAlleyNotes'), + }, + glowing_mushroom_cave: { + text: t('backgroundGlowingMushroomCaveText'), + notes: t('backgroundGlowingMushroomCaveNotes'), + }, + cozy_bedroom: { + text: t('backgroundCozyBedroomText'), + notes: t('backgroundCozyBedroomNotes'), + }, + }, 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 e8c101f7dd..a897a8511f 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -400,6 +400,15 @@ let armor = { set: 'aceOfSpades', canOwn: ownsItem('armor_armoire_robeOfSpades'), }, + softBlueSuit: { + text: t('armorArmoireSoftBlueSuitText'), + notes: t('armorArmoireSoftBlueSuitNotes', { int: 10, per: 5 }), + value: 100, + int: 10, + per: 5, + set: 'blueLoungewear', + canOwn: ownsItem('armor_armoire_softBlueSuit'), + }, }; let body = { @@ -569,6 +578,7 @@ let head = { per: 7, int: 7, con: 7, + set: 'blueLoungewear', canOwn: ownsItem('head_armoire_blueFloppyHat'), }, shepherdHeaddress: { @@ -1065,6 +1075,14 @@ let shield = { set: 'bookbinder', canOwn: ownsItem('shield_armoire_unfinishedTome'), }, + softBluePillow: { + text: t('shieldArmoireSoftBluePillowText'), + notes: t('shieldArmoireSoftBluePillowNotes', { con: 10 }), + value: 100, + con: 10, + set: 'blueLoungewear', + canOwn: ownsItem('shield_armoire_softBluePillow'), + }, }; let headAccessory = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_back_alley.png b/website/raw_sprites/spritesmith/backgrounds/background_back_alley.png new file mode 100644 index 0000000000..c9d91a55a2 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_back_alley.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_cozy_bedroom.png b/website/raw_sprites/spritesmith/backgrounds/background_cozy_bedroom.png new file mode 100644 index 0000000000..58a924ef67 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_cozy_bedroom.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_glowing_mushroom_cave.png b/website/raw_sprites/spritesmith/backgrounds/background_glowing_mushroom_cave.png new file mode 100644 index 0000000000..8aac0a6002 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_glowing_mushroom_cave.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_back_alley.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_back_alley.png new file mode 100644 index 0000000000..0ae8b69a3c Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_back_alley.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_cozy_bedroom.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_cozy_bedroom.png new file mode 100644 index 0000000000..fff83e2d2d Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_cozy_bedroom.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_glowing_mushroom_cave.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_glowing_mushroom_cave.png new file mode 100644 index 0000000000..41460cdcec Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_glowing_mushroom_cave.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softBlueSuit.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softBlueSuit.png new file mode 100644 index 0000000000..b160f5ac4b Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_softBlueSuit.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softBluePillow.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softBluePillow.png new file mode 100644 index 0000000000..8082c27cf4 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_softBluePillow.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softBlueSuit.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softBlueSuit.png new file mode 100644 index 0000000000..9f5058be99 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_softBlueSuit.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softBluePillow.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softBluePillow.png new file mode 100644 index 0000000000..c882aafdfc Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_softBluePillow.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softBlueSuit.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softBlueSuit.png new file mode 100644 index 0000000000..7b7d87f5ab Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_softBlueSuit.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201810.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201810.png deleted file mode 100644 index ee5749aae6..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201810.png and /dev/null 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 new file mode 100644 index 0000000000..40541440e3 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201811.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_fall_avatar_customizations.png b/website/raw_sprites/spritesmith_large/promo_fall_avatar_customizations.png deleted file mode 100644 index 8dbe955467..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_fall_avatar_customizations.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_fall_festival_2017.png b/website/raw_sprites/spritesmith_large/promo_fall_festival_2017.png deleted file mode 100644 index 44ccccc8cc..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_fall_festival_2017.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_fall_festival_2018.png b/website/raw_sprites/spritesmith_large/promo_fall_festival_2018.png deleted file mode 100644 index 641d468138..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_fall_festival_2018.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_forest_friends_bundle.png b/website/raw_sprites/spritesmith_large/promo_forest_friends_bundle.png deleted file mode 100644 index 072193d723..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_forest_friends_bundle.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_ghost_potions.png b/website/raw_sprites/spritesmith_large/promo_ghost_potions.png deleted file mode 100644 index a985b78953..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_ghost_potions.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_jackolanterns.png b/website/raw_sprites/spritesmith_large/promo_jackolanterns.png deleted file mode 100644 index 23ee2da51c..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_jackolanterns.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_seasonal_shop.png b/website/raw_sprites/spritesmith_large/promo_seasonal_shop.png deleted file mode 100644 index cfbcc5bddd..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_seasonal_shop.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_spooky_sparkles.png b/website/raw_sprites/spritesmith_large/promo_spooky_sparkles.png deleted file mode 100644 index 514abddd90..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_spooky_sparkles.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_positivity.png b/website/raw_sprites/spritesmith_large/scene_positivity.png deleted file mode 100644 index e5268b8fb3..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_positivity.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index ad3459948f..36a1a6a64f 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 = 'NOVEMBER 2018 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE'; +const LAST_ANNOUNCEMENT_TITLE = 'NOVEMBER BACKGROUNDS AND ARMOIRE ITEMS'; const worldDmg = { // @TODO bailey: false, }; @@ -30,17 +30,14 @@ api.getNews = {
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, Here be Dragons!, we're focusing on obstacles that arise as you reach the end of the year! It has a 15 Gem prize, which will be awarded to five lucky winners on December 3rd.
-Congratulations to the winners of October's Challenge, REN, drcaptainmaria, Helengoesrogue, Mistress Cerny- Cerny Pie, and Taichi1!
-The next Take This Challenge has also launched, "This One Goes to 11!", with a focus on pausing for calm and focus amid feelings of pressure or overwhelm. 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, "+2 Intelligence Bonus!": grand prize winner PrimordialDream, and runners-up Marieke Bresseleers, Supertest, Keri-Ann Moore, Jobber, and Xaina the ???. 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!
-We’ve added three new backgrounds to the Background Shop! Now your avatar can look shady in a Back Alley, stare in awe at a Glowing Mushroom Cave, or curl up in a Cozy Bedroom. Check them out under User Icon > Backgrounds!
+Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Blue Loungewear Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+