diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index a32a664302..779338e4ed 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -481,5 +481,13 @@ "backgroundFieldWithColoredEggsText": "Field with Colored Eggs", "backgroundFieldWithColoredEggsNotes": "Hunt for springtime treasure in a Field with Colored Eggs.", "backgroundFlowerMarketText": "Flower Market", - "backgroundFlowerMarketNotes": "Find the perfect colors for bouquet or garden in a Flower Market." + "backgroundFlowerMarketNotes": "Find the perfect colors for bouquet or garden in a Flower Market.", + + "backgrounds042019": "SET 59: Released April 2019", + "backgroundBirchForestText": "Birch Forest", + "backgroundBirchForestNotes": "Dally in a peaceful Birch Forest.", + "backgroundHalflingsHouseText": "Halfling's House", + "backgroundHalflingsHouseNotes": "Visit a charming Halfling's House.", + "backgroundBlossomingDesertText": "Blossoming Desert", + "backgroundBlossomingDesertNotes": "Witness a rare superbloom in the Blossoming Desert." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index aa2b1891d5..f6f88b64e2 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -418,6 +418,10 @@ "weaponArmoireChefsSpoonNotes": "Raise it as you release your battle cry: “SPOOOON!!” Increases Intelligence by <%= int %>. Enchanted Armoire: Chef Set (Item 3 of 4).", "weaponArmoireVernalTaperText": "Vernal Taper", "weaponArmoireVernalTaperNotes": "The days are getting longer, but this candle will help you find your way before sunrise. Increases Constitution by <%= con %>. Enchanted Armoire: Vernal Vestments Set (Item 3 of 3).", + "weaponArmoireJugglingBallsText": "Juggling Balls", + "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.", "armor": "armor", "armorCapitalized": "Armor", @@ -1406,6 +1410,8 @@ "headArmoireToqueBlancheNotes": "According to legend, the number of folds in this hat indicate the number of ways you know how to cook an egg! Is it accurate? Increases Perception by <%= per %>. Enchanted Armoire: Chef Set (Item 1 of 4).", "headArmoireVernalHenninText": "Vernal Hennin", "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.", "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 e1eef9cc7d..a81315dca0 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -815,6 +815,20 @@ let backgrounds = { notes: t('backgroundFlowerMarketNotes'), }, }, + backgrounds042019: { + halflings_house: { + text: t('backgroundHalflingsHouseText'), + notes: t('backgroundHalflingsHouseNotes'), + }, + blossoming_desert: { + text: t('backgroundBlossomingDesertText'), + notes: t('backgroundBlossomingDesertNotes'), + }, + birch_forest: { + text: t('backgroundBirchForestText'), + notes: t('backgroundBirchForestNotes'), + }, + }, 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 383fb4f6ac..6eba545711 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -924,6 +924,13 @@ let head = { set: 'vernalVestments', canOwn: ownsItem('head_armoire_vernalHennin'), }, + tricornHat: { + text: t('headArmoireTricornHatText'), + notes: t('headArmoireTricornHatNotes', { per: 10 }), + value: 100, + per: 10, + canOwn: ownsItem('head_armoire_tricornHat'), + }, }; let shield = { @@ -1553,6 +1560,20 @@ let weapon = { set: 'vernalVestments', canOwn: ownsItem('weapon_armoire_vernalTaper'), }, + jugglingBalls: { + text: t('weaponArmoireJugglingBallsText'), + notes: t('weaponArmoireJugglingBallsNotes', { int: 10 }), + value: 100, + int: 10, + canOwn: ownsItem('weapon_armoire_jugglingBalls'), + }, + slingshot: { + text: t('weaponArmoireSlingshotText'), + notes: t('weaponArmoireSlingshotNotes', { str: 10 }), + value: 100, + str: 10, + canOwn: ownsItem('weapon_armoire_slingshot'), + }, }; let armoireSet = { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 09c8c6ffa7..6db7d1a17a 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -8,12 +8,12 @@ const featuredItems = { path: 'armoire', }, { - type: 'hatchingPotions', - path: 'hatchingPotions.Golden', + type: 'premiumHatchingPotion', + path: 'premiumHatchingPotions.Celestial', }, { - type: 'eggs', - path: 'eggs.PandaCub', + type: 'premiumHatchingPotion', + path: 'premiumHatchingPotions.Rainbow', }, { type: 'card', diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index af78c532d3..8e7811f855 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -19,6 +19,7 @@ module.exports = { }, availableSpells: [ + 'shinySeed', ], availableQuests: [ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_birch_forest.png b/website/raw_sprites/spritesmith/backgrounds/background_birch_forest.png new file mode 100644 index 0000000000..394c0000a8 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_birch_forest.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_blossoming_desert.png b/website/raw_sprites/spritesmith/backgrounds/background_blossoming_desert.png new file mode 100644 index 0000000000..7b4b53469e Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_blossoming_desert.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_halflings_house.png b/website/raw_sprites/spritesmith/backgrounds/background_halflings_house.png new file mode 100644 index 0000000000..87cb48911b Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_halflings_house.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_birch_forest.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_birch_forest.png new file mode 100644 index 0000000000..5262644708 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_birch_forest.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_blossoming_desert.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_blossoming_desert.png new file mode 100644 index 0000000000..729cc02da8 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_blossoming_desert.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_halflings_house.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_halflings_house.png new file mode 100644 index 0000000000..6480984fd5 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_halflings_house.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_tricornHat.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_tricornHat.png new file mode 100644 index 0000000000..c8a8c8cdb4 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_tricornHat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_tricornHat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_tricornHat.png new file mode 100644 index 0000000000..2f41fd8164 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_tricornHat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jugglingBalls.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jugglingBalls.png new file mode 100644 index 0000000000..a6f237db56 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jugglingBalls.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_slingshot.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_slingshot.png new file mode 100644 index 0000000000..b287dab4c1 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_slingshot.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jugglingBalls.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jugglingBalls.png new file mode 100644 index 0000000000..ed47eafea3 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jugglingBalls.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_slingshot.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_slingshot.png new file mode 100644 index 0000000000..cd9ab3ccfe Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_slingshot.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index 6af5fb4c27..0fe6763311 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_bailey.png and b/website/raw_sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_justin.png b/website/raw_sprites/spritesmith/npcs/npc_justin.png index c84ad0c5f2..9365bc12c9 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_justin.png and b/website/raw_sprites/spritesmith/npcs/npc_justin.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index f4a28a00f2..e129d6e43e 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201903.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201903.png deleted file mode 100644 index e2971ff3dc..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201903.png and /dev/null 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 new file mode 100644 index 0000000000..8e7c5d3bd9 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201904.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_beffymaroo_wondercon.png b/website/raw_sprites/spritesmith_large/promo_beffymaroo_wondercon.png deleted file mode 100644 index a65532938a..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_beffymaroo_wondercon.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_shiny_seeds.png b/website/raw_sprites/spritesmith_large/promo_shiny_seeds.png new file mode 100644 index 0000000000..5f9848797e Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_shiny_seeds.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_dailies.png b/website/raw_sprites/spritesmith_large/scene_dailies.png deleted file mode 100644 index 6c6e0c9195..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_dailies.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_hat_guild.png b/website/raw_sprites/spritesmith_large/scene_hat_guild.png new file mode 100644 index 0000000000..1c432698ea Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_hat_guild.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_tavern.png b/website/raw_sprites/spritesmith_large/scene_tavern.png deleted file mode 100644 index 63078b9e28..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_tavern.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_todos.png b/website/raw_sprites/spritesmith_large/scene_todos.png deleted file mode 100644 index b8c52d399d..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_todos.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index f5df652d56..c5bcc25d74 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 = 'THE APRIL FOOL STRIKES AGAIN!'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS AND ARMOIRE ITEMS, MONTHLY CHALLENGES, AND SHINY SEEDS'; const worldDmg = { // @TODO bailey: false, }; @@ -30,21 +30,30 @@ api.getNews = {
The April Fool has appeared, and he's got a farmer's market's worth of produce in tow.
-"HAHA!" he cries, as a dragonfruit bounces along beside him. "I've always thought good humor should be healthful and nourishing, so I've gone back to my roots, if you will, to bring some plant-powered goodness into Habitica once again!"
-"He's replaced all our equipped pets with fruits and vegetables!" says QuartzFox, gently patting a contented-looking tomato. "Although to be fair, they are very cute fruits and vegetables!"
-Equipping different pets will show different fruits and veggies. Have fun discovering them all!
-The NPCs have also been turned into their fruit and vegetable forms as a tribute to Habitica's very first April Fool's prank back in 2014! Go check them out.
-For even more fun, check out the official Challenge posted especially for today! Share your avatar featuring your new fruit and veggie pet on social media between now and April 3, and you'll have a chance to win gems and have your avatar featured on the Habitica Blog!
-We’ve added three new backgrounds to the Background Shop! Now your avatar can visit a Halfling's House, dally through a peaceful Birch Forest, and take in the Superbloom in the Blossoming Desert. Check them out under User Icon > Backgrounds!
+Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including some fun joke props in honor of April Fool's Day! Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+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, Gather Your Party, we're focusing on finding encouraging allies to help you gain accountability for your goals! It has a 15 Gem prize, which will be awarded to five lucky winners on May 1st.
+Congratulations to the winners of March's Challenge, DcryptMart, LONEW0LF, Elcaracol, DungeonMasterful, and 7NationTpr!
+ +The next Take This Challenge has also launched, "Harder, Faster, Stronger!", with a focus on setting and meeting physical activity goals. 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, "Do One Thing Well!": grand prize winner Денис Кадников, and runners-up addone, alihenri, Hemogoblin3991, Kalu_Ienvru, and gabriellamara! 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!
+Throw a Shiny Seed at your friends and they will turn into a cheerful flower until their next cron! You can buy the Seeds in the Seasonal Shop for Gold. Plus, if you get transformed by a Shiny Seed, you'll receive the Agricultural Friends badge!
+Don't want to be a flower? Just buy some Petal-Free Potion from your Rewards column to reverse it.
+Shiny Seeds will be available in the Seasonal Shop until April 30th!
+