diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index 9498f21515..4e4c8a865b 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -537,5 +537,13 @@
"backgroundPumpkinCarriageText": "Pumpkin Carriage",
"backgroundPumpkinCarriageNotes": "Ride in an enchanted Pumpkin Carriage before the clock strikes midnight.",
"backgroundMonsterMakersWorkshopText": "Monster Maker's Workshop",
- "backgroundMonsterMakersWorkshopNotes": "Experiment with discredited sciences in a Monster Maker's Workshop."
+ "backgroundMonsterMakersWorkshopNotes": "Experiment with discredited sciences in a Monster Maker's Workshop.",
+
+ "backgrounds112019": "SET 66: Released November 2019",
+ "backgroundFarmersMarketText": "Farmer's Market",
+ "backgroundFarmersMarketNotes": "Shop for the freshest of foods at a Farmer's Market.",
+ "backgroundFlyingInAThunderstormText": "Tumultuous Thunderstorm",
+ "backgroundFlyingInAThunderstormNotes": "Chase a Tumultuous Thunderstorm as closely as you dare.",
+ "backgroundPotionShopText": "Potion Shop",
+ "backgroundPotionShopNotes": "Find an elixir for any ailment at a Potion Shop."
}
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index f79d02db4f..f7820afa4a 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -456,6 +456,8 @@
"weaponArmoireResplendentRapierNotes": "Demonstrate your swordsmanship with this sharply pointed weapon. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
"weaponArmoireShadowMastersMaceText": "Shadow Master's Mace",
"weaponArmoireShadowMastersMaceNotes": "Creatures of darkness will obey your every command when you wave this glowing mace. Increases Perception by <%= per %>. Enchanted Armoire: Shadow Master Set (Item 3 of 4).",
+ "weaponArmoireAlchemistsDistillerText": "Alchemist's Distiller",
+ "weaponArmoireAlchemistsDistillerNotes": "Purify metals and other magical compounds with this shiny brass instrument. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Alchemist Set (Item 3 of 4).",
"armor": "armor",
"armorCapitalized": "Armor",
@@ -986,6 +988,8 @@
"armorArmoireInvernessCapeNotes": "This sturdy garment will let you search for clues in any type of weather. Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Detective Set (Item 2 of 4).",
"armorArmoireShadowMastersRobeText": "Shadow Master's Robe",
"armorArmoireShadowMastersRobeNotes": "The fabric of this flowy robe is woven from the darkest shadows in the deepest caves of Habitica. Increases Constitution by <%= con %>. Enchanted Armoire: Shadow Master Set (Item 1 of 4).",
+ "armorArmoireAlchemistsRobeText": "Alchemist's Robe",
+ "armorArmoireAlchemistsRobeNotes": "Any number of dangerous elixirs are involved in creating arcane metals and gems, and these heavy robes will protect you from harm and unintended side effects! Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 1 of 4).",
"headgear": "helm",
"headgearCapitalized": "Headgear",
@@ -1526,6 +1530,8 @@
"headArmoireDeerstalkerCapNotes": "This cap is perfect for rural excursions, but also is acceptable gear for mystery-solving! Increases Intelligence by <%= int %>. Enchanted Armoire: Detective Set (Item 1 of 4).",
"headArmoireShadowMastersHoodText": "Shadow Master's Hood",
"headArmoireShadowMastersHoodNotes": "This hood grants you the power to see through even the deepest darkness. It may occasionally require eyedrops, though. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Shadow Master Set (Item 2 of 4).",
+ "headArmoireAlchemistsHatText": "Alchemist's Hat",
+ "headArmoireAlchemistsHatNotes": "While hats are not strictly necessary for alchemical practice, looking cool certainly doesn't hurt anything! Increases Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 2 of 4).",
"offhand": "off-hand item",
"offhandCapitalized": "Off-Hand Item",
@@ -1821,6 +1827,8 @@
"shieldArmoirePolishedPocketwatchNotes": "You've got the time. And it looks very nice on you. Increases Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
"shieldArmoireMasteredShadowText": "Mastered Shadow",
"shieldArmoireMasteredShadowNotes": "Your powers have brought these swirling shadows to your side to do your bidding. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Shadow Master Set (Item 4 of 4).",
+ "shieldArmoireAlchemistsScaleText": "Alchemist's Scale",
+ "shieldArmoireAlchemistsScaleNotes": "Ensure that your mystical ingredients are properly measured using this fine piece of equipment. Increases Intelligence by <%= int %>. Enchanted Armoire: Alchemist 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 7686f95ee9..2aa8799d54 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -913,6 +913,20 @@ const backgrounds = {
notes: t('backgroundPumpkinCarriageNotes'),
},
},
+ backgrounds112019: {
+ farmers_market: {
+ text: t('backgroundFarmersMarketText'),
+ notes: t('backgroundFarmersMarketNotes'),
+ },
+ flying_in_a_thunderstorm: {
+ text: t('backgroundFlyingInAThunderstormText'),
+ notes: t('backgroundFlyingInAThunderstormNotes'),
+ },
+ potion_shop: {
+ text: t('backgroundPotionShopText'),
+ notes: t('backgroundPotionShopNotes'),
+ },
+ },
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 a6c761c711..d19c2f4ebe 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -498,6 +498,15 @@ const armor = {
set: 'shadowMaster',
canOwn: ownsItem('armor_armoire_shadowMastersRobe'),
},
+ alchemistsRobe: {
+ text: t('armorArmoireAlchemistsRobeText'),
+ notes: t('armorArmoireAlchemistsRobeNotes', { con: 8, per: 5 }),
+ value: 100,
+ con: 8,
+ per: 5,
+ set: 'alchemist',
+ canOwn: ownsItem('armor_armoire_alchemistsRobe'),
+ },
};
const body = {
@@ -1020,6 +1029,14 @@ const head = {
set: 'shadowMaster',
canOwn: ownsItem('head_armoire_shadowMastersHood'),
},
+ alchemistsHat: {
+ text: t('headArmoireAlchemistsHatText'),
+ notes: t('headArmoireAlchemistsHatNotes', { per: 7 }),
+ value: 100,
+ per: 7,
+ set: 'alchemist',
+ canOwn: ownsItem('head_armoire_alchemistsHat'),
+ },
};
const shield = {
@@ -1299,6 +1316,14 @@ const shield = {
set: 'shadowMaster',
canOwn: ownsItem('shield_armoire_masteredShadow'),
},
+ alchemistsScale: {
+ text: t('shieldArmoireAlchemistsScaleText'),
+ notes: t('shieldArmoireAlchemistsScaleNotes', { int: 7 }),
+ value: 100,
+ int: 7,
+ set: 'alchemist',
+ canOwn: ownsItem('shield_armoire_alchemistsScale'),
+ },
};
const headAccessory = {
@@ -1745,6 +1770,15 @@ const weapon = {
set: 'shadowMaster',
canOwn: ownsItem('weapon_armoire_shadowMastersMace'),
},
+ alchemistsDistiller: {
+ text: t('weaponArmoireAlchemistsDistillerText'),
+ notes: t('weaponArmoireAlchemistsDistillerNotes', { str: 8, int: 5 }),
+ value: 100,
+ str: 8,
+ int: 5,
+ set: 'alchemist',
+ canOwn: ownsItem('weapon_armoire_alchemistsDistiller'),
+ },
};
export {
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index 90f2fce194..aa155c6027 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
import each from 'lodash/each';
import t from './translation';
-const CURRENT_SEASON = 'October';
+const CURRENT_SEASON = '_NONE_';
function hasQuestAchievementFunction (key) {
return user => user.achievements.quests
@@ -105,7 +105,7 @@ const premium = {
value: 2,
text: t('hatchingPotionSpooky'),
limited: true,
- _season: 'October',
+ _season: '_PENDING_',
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndOctober'),
previousDate: t('september2017'),
@@ -155,7 +155,7 @@ const premium = {
value: 2,
text: t('hatchingPotionGlow'),
limited: true,
- _season: 'October',
+ _season: '_PENDING_',
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndOctober'),
previousDate: t('september2018'),
@@ -215,7 +215,7 @@ const premium = {
value: 2,
text: t('hatchingPotionShadow'),
limited: true,
- _season: 'October',
+ _season: '_PENDING_',
},
};
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_farmers_market.png b/website/raw_sprites/spritesmith/backgrounds/background_farmers_market.png
new file mode 100644
index 0000000000..a1fef61881
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_farmers_market.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_flying_in_a_thunderstorm.png b/website/raw_sprites/spritesmith/backgrounds/background_flying_in_a_thunderstorm.png
new file mode 100644
index 0000000000..7c0692dd58
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_flying_in_a_thunderstorm.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/background_potion_shop.png b/website/raw_sprites/spritesmith/backgrounds/background_potion_shop.png
new file mode 100644
index 0000000000..dbbe3de4f9
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_potion_shop.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_farmers_market.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_farmers_market.png
new file mode 100644
index 0000000000..6018b3c903
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_farmers_market.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_in_a_thunderstorm.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_in_a_thunderstorm.png
new file mode 100644
index 0000000000..5de8635179
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_in_a_thunderstorm.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_potion_shop.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_potion_shop.png
new file mode 100644
index 0000000000..f26a83fa6e
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_potion_shop.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_alchemistsRobe.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_alchemistsRobe.png
new file mode 100644
index 0000000000..9ec370e99d
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_alchemistsRobe.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_alchemistsHat.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_alchemistsHat.png
new file mode 100644
index 0000000000..28dd7b589f
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_alchemistsHat.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_alchemistsScale.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_alchemistsScale.png
new file mode 100644
index 0000000000..2d4630a115
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_alchemistsScale.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_alchemistsRobe.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_alchemistsRobe.png
new file mode 100644
index 0000000000..6c91c13cfd
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_alchemistsRobe.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_alchemistsHat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_alchemistsHat.png
new file mode 100644
index 0000000000..9d1955e960
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_alchemistsHat.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_alchemistsScale.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_alchemistsScale.png
new file mode 100644
index 0000000000..fe59e4726a
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_alchemistsScale.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_alchemistsDistiller.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_alchemistsDistiller.png
new file mode 100644
index 0000000000..aa3674bcb5
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_alchemistsDistiller.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_alchemistsRobe.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_alchemistsRobe.png
new file mode 100644
index 0000000000..e91df7f496
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_alchemistsRobe.png differ
diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_alchemistsDistiller.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_alchemistsDistiller.png
new file mode 100644
index 0000000000..8d1f22dd5c
Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_alchemistsDistiller.png differ
diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201910.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201910.png
deleted file mode 100644
index 8b50c47ead..0000000000
Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201910.png and /dev/null differ
diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201911.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201911.png
new file mode 100644
index 0000000000..cc15edf187
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201911.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 132f6b8abc..83b48c12fd 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from
// controllers
-const LAST_ANNOUNCEMENT_TITLE = 'NEW OFFICIAL HABITICA CHALLENGES! RESOLUTION SUCCESS AND TAKE THIS';
+const LAST_ANNOUNCEMENT_TITLE = 'NOVEMBER BACKGROUNDS AND ARMOIRE ITEMS!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,39 +31,24 @@ api.getNews = {
${res.t('newStuff')}
- 11/1/2019 - ${LAST_ANNOUNCEMENT_TITLE}
+ 11/5/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, 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 2nd.
- Congratulations to the winners of October's Challenge, @boxofdelights, @aethelflaeda,
- @pygy, @threethreethree, and @ScarlettJill!
-
- The next Take This Challenge has also launched,
- "Cast of Characters",
- with a focus on processing our feelings by turning them into characters in a game or
- story. 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, "Check Your HP!": grand
- prize winner @shadowdancer16, and runners-up @kuumathebronze, Ras Algathier, @OldMan76,
- @JuanaTango, and @Khontis! 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 fly
+ through a Tumultuous Thunderstorm, find only the strongest elixirs at the Potion Shop,
+ and wander through a colorful Farmer's Market. Check them out under User Icon >
+ Backgrounds!
+
+
+ Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the
+ Alchemist Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+
+
+ by Vikte, QuartzFox, Gully, Aspiring Advocate, Lt. Cabel, and SabreCat
+
`,
});