From 099eadeafc714af4b1c328f04dd869dc6d397797 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 12 Sep 2017 20:17:49 +0000 Subject: [PATCH] feat(content): Farm Friends bundle Also tweaks some gear text to avoid multiple items being referred to as "battle-axes". --- .../scrolls/quest_bundle_farmFriends.png | Bin 0 -> 1213 bytes .../promo/promo_bundle_farm.png | Bin 0 -> 17979 bytes website/common/locales/en/gear.json | 4 +- website/common/locales/en/questsContent.json | 5 ++- website/common/script/content/index.js | 15 ++++++++ website/views/shared/new-stuff.jade | 35 ++++++++++++------ 6 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 website/assets/sprites/spritesmith/quests/scrolls/quest_bundle_farmFriends.png create mode 100644 website/assets/sprites/spritesmith_large/promo/promo_bundle_farm.png diff --git a/website/assets/sprites/spritesmith/quests/scrolls/quest_bundle_farmFriends.png b/website/assets/sprites/spritesmith/quests/scrolls/quest_bundle_farmFriends.png new file mode 100644 index 0000000000000000000000000000000000000000..a622ca0f52011116793af232117a11ecf36702dd GIT binary patch literal 1213 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 literal 0 HcmV?d00001 diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 1953bb776d..6d78e24260 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -16,7 +16,7 @@ "weaponWarrior1Text": "Sword", "weaponWarrior1Notes": "Common soldier's blade. Increases Strength by <%= str %>.", "weaponWarrior2Text": "Axe", - "weaponWarrior2Notes": "Double-bitted battle-axe. Increases Strength by <%= str %>", + "weaponWarrior2Notes": "Double-bitted chopping weapon. Increases Strength by <%= str %>", "weaponWarrior3Text": "Morning Star", "weaponWarrior3Notes": "Heavy club with brutal spikes. Increases Strength by <%= str %>.", "weaponWarrior4Text": "Sapphire Blade", @@ -304,7 +304,7 @@ "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).", "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray", "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).", - "weaponArmoireBattleAxeText": "Battle Axe", + "weaponArmoireBattleAxeText": "Ancient Axe", "weaponArmoireBattleAxeNotes": "This fine iron axe is well-suited to battling your fiercest foes or your most difficult tasks. Increases Intelligence by <%= int %> and Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "weaponArmoireHoofClippersText": "Hoof Clippers", "weaponArmoireHoofClippersNotes": "Trim the hooves of your hard-working mounts to help them stay healthy as they carry you to adventure! Increases Strength, Intelligence, and Constitution by <%= attrs %> each. Enchanted Armoire: Farrier Set (Item 1 of 3).", diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index e9f5b87719..9b7b872026 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -582,5 +582,8 @@ "questHippoCompletion": "The hippo bows in surrender. “I underestimated you. It seems you weren’t being lazy. My apologies. Truth be told, I may have been projecting a bit. Perhaps I should get some work done myself. Here, take these eggs as a sign of my gratitude.” Grabbing them, you settle down by the water, ready to relax at last.", "questHippoBoss": "The Hippo-Crite", "questHippoDropHippoEgg": "Hippo (Egg)", - "questHippoUnlockText": "Unlocks purchasable Hippo eggs in the Market" + "questHippoUnlockText": "Unlocks purchasable Hippo eggs in the Market", + + "farmFriendsText": "Farm Friends Quest Bundle", + "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until September 30." } diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 153c490248..63ac4f4bc2 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -85,6 +85,21 @@ api.bundles = { type: 'quests', value: 7, }, + farmFriends: { + key: 'farmFriends', + text: t('farmFriendsText'), + notes: t('farmFriendsNotes'), + bundleKeys: [ + 'cow', + 'horse', + 'sheep', + ], + canBuy () { + return moment().isBetween('2017-09-12', '2017-10-02'); + }, + type: 'quests', + value: 7, + }, }; /* diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 2b0c44e6b6..fd19dd9826 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,23 +1,36 @@ -h2 9/11/2017 - NEW TEESPRING CAMPAIGN! +h2 9/12/2017 - NEW QUEST BUNDLE AND NEW MODERATOR! + .promo_bundle_farm.pull-right hr tr td - .promo_teespring.pull-right - h3 Habitica T-Shirts Are Back! - p We're running another Teespring campaign! - br - p For a limited time, you can grab Habitica T-shirts! This U.S.-only Teespring campaign will only run until September 14, so hurry if you want to snap one up! - br - p Our Teespring campaigns are driven by demand, so if you'd like mugs, onesies, or other items for E.U. Habiticans, be sure to go to our Teespring store and reserve the item you want. Once enough items are reserved, the item will automatically be printed. - br - p Thanks for supporting Habitica! - p.small.muted by Redphoenix and Sara Olson + h3 New Discounted Pet Quest Bundle: Farm Friends + p If you are looking to add critters from the barnyard to your Habitica stable, you're in luck! From now until September 30, you can purchase the Farm Friends Pet Quest Bundle and receive the Sheep, Cow, and Horse quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the Quest Shop today! + p.small.muted by Lemoness and SabreCat + p.small.muted Art by UncommonCriminal, Soloana, fuzzytrees, Feralem Tau, Eevachu, Beffymaroo, JessicaChase, starsystemic, nonight, Misceo and Tocath + p.small.muted Writing by schizelle, VikingRunner, Salambander, Leephon, and Lemoness + tr + td + h3 Welcome to Our Newest Moderator: Fox_town! + p We're very excited to announce that we've added a new moderator to the team: a long-time Socialite, staple of the community, and friend to many of you... Fox_town! Head to the Tavern to congratulate them. if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 9/11/2017 - NEW TEESPRING CAMPAIGN! + tr + td + .promo_teespring.pull-right + h3 Habitica T-Shirts Are Back! + p We're running another Teespring campaign! + br + p For a limited time, you can grab Habitica T-shirts! This U.S.-only Teespring campaign will only run until September 14, so hurry if you want to snap one up! + br + p Our Teespring campaigns are driven by demand, so if you'd like mugs, onesies, or other items for E.U. Habiticans, be sure to go to our Teespring store and reserve the item you want. Once enough items are reserved, the item will automatically be printed. + br + p Thanks for supporting Habitica! + p.small.muted by Redphoenix and Sara Olson h2 9/8/2017 - USE CASE SPOTLIGHT: LEARNING LANGUAGES .scene_languages.pull-right tr