diff --git a/website/client/src/assets/css/sprites.css b/website/client/src/assets/css/sprites.css index f3ba66580d..c3ec8d1608 100755 --- a/website/client/src/assets/css/sprites.css +++ b/website/client/src/assets/css/sprites.css @@ -4,16 +4,27 @@ height: 219px; } -.Pet_HatchingPotion_Dessert { - background: url("~@/assets/images/animated/Pet_HatchingPotion_Dessert.gif") no-repeat; +.quest_windup { + background: url("~@/assets/images/animated/quest_windup.gif") no-repeat; + width: 219px; + height: 219px; +} + +.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup { width: 68px; height: 68px; } +.Pet_HatchingPotion_Dessert { + background: url("~@/assets/images/animated/Pet_HatchingPotion_Dessert.gif") no-repeat; +} + .Pet_HatchingPotion_Veggie { background: url("~@/assets/images/animated/Pet_HatchingPotion_Veggie.gif") no-repeat; - width: 68px; - height: 68px; +} + +.Pet_HatchingPotion_Windup { + background: url("~@/assets/images/animated/Pet_HatchingPotion_Windup.gif") no-repeat; } .Gems { diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 6db242b69e..8bc35a0f14 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -302,6 +302,7 @@ "hatchingPotionDessert": "Confection", "hatchingPotionFluorite": "Fluorite", "hatchingPotionSandSculpture": "Sand Sculpture", + "hatchingPotionWindup": "Wind-Up", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.", diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index dbb80ff79b..66d6235aa2 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -816,5 +816,12 @@ "questFluoriteCompletion": "As you do battle, the crystal creature seems more and more distracted by the light show you are creating. “So shiny…” it mutters.

“Of course!” @nirbhao exclaims. “It must be a fluorite elemental. All they want is light to let them glow. Let’s help it shine.”

The elemental giggles happily and glows all the brighter as you light up torches and motes of magic. It’s so glad to be shining again that it leads you to a rich deposit of fluorite crystals.

“This is the perfect ingredient for a new hatching potion,” says @nirbhao. “One which will make our pets as bright as our new fluorescent friend.”", "questFluoriteBoss": "Fluorite Elemental", "questFluoriteDropFluoritePotion": "Fluorite Hatching Potion", - "questFluoriteUnlockText": "Unlocks Fluorite Hatching Potions for purchase in the Market" + "questFluoriteUnlockText": "Unlocks Fluorite Hatching Potions for purchase in the Market", + + "questWindupText": "A Whirl with a Wind-Up Warrior", + "questWindupNotes": "Habit City is seldom quiet, but you weren’t prepared for the cacophony of creaks, squeaks and screams escaping Good Timekeeping, Habitica’s finest clockwork emporium. You sigh--you just wanted your watch fixed. The proprietor, known only as “Great and Powerful”, tumbles out the door, pursued by a clanking copper colossus!

“Ki-! Ki-! Ki!” it clangs, arms smashing up and down. Its gears grind and screech in protest.

“My robot Clankton has gone mad! It’s trying to kill me!” the supposedly Powerful one shrieks.

Even with a broken watch, you can tell when it’s time to fight. You leap forward to defend the panicking watchmaker. @Vikte and @a_diamond also step up to help!

“Ki-! Ki-! Ki-!” Clankton chants with each blow. “Mew!”

Wait, was that mechanical mewling amidst the murderous monotone?", + "questWindupCompletion": "As you dodge the attacks, you notice something odd: a stripy brass tail sticking out of the robot’s chassis. You plunge a hand amid the grinding gears and pull out… a trembling wind-up tiger cub. It snuggles against your shirt.

The clockwork robot immediately stops flailing and smiles, its cogs clicking back into place. “Ki-Ki-Kitty! Kitty got in me!”

“Great!” the Powerful says, blushing. “I’ve been working hard on these wind-up pet potions. I guess I lost track of my new creations. I’ve been missing my ‘Tidy the workshop’ daily a lot lately…”

You follow the tinkerer and Clankton inside. Parts, tools and potions cover every surface. “Powerful” takes your watch, but hands you a few potions.

“Take these. Clearly they’ll be safer with you!”", + "questWindupBoss": "Clankton", + "questWindupDropWindupPotion": "Wind-Up Hatching Potion", + "questWindupUnlockText": "Unlocks Wind-Up Hatching Potions for purchase in the Market" } diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 2095d6b4ea..4bcf6d5b4f 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -333,6 +333,13 @@ const premium = { date: t('dateEndJuly'), }), }, + Windup: { + value: 2, + text: t('hatchingPotionWindup'), + limited: true, + canBuy: hasQuestAchievementFunction('windup'), + _addlNotes: t('premiumPotionUnlimitedNotes'), + }, }; const wacky = { diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js index 2034ed5f22..12d9ea190b 100644 --- a/website/common/script/content/quests.js +++ b/website/common/script/content/quests.js @@ -3647,6 +3647,41 @@ const quests = { unlock: t('questFluoriteUnlockText'), }, }, + windup: { + text: t('questWindupText'), + notes: t('questWindupNotes'), + completion: t('questWindupCompletion'), + value: 1, + category: 'timeTravelers', + canBuy () { + return false; + }, + boss: { + name: t('questWindupBoss'), + hp: 1000, + str: 1, + }, + drop: { + items: [ + { + type: 'hatchingPotions', + key: 'Windup', + text: t('questWindupDropWindupPotion'), + }, { + type: 'hatchingPotions', + key: 'Windup', + text: t('questWindupDropWindupPotion'), + }, { + type: 'hatchingPotions', + key: 'Windup', + text: t('questWindupDropWindupPotion'), + }, + ], + gp: 50, + exp: 425, + unlock: t('questWindupUnlockText'), + }, + }, }; each(quests, (v, key) => { diff --git a/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_windup.png b/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_windup.png new file mode 100644 index 0000000000..cd5116a3f0 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Windup.png new file mode 100644 index 0000000000..aaaf65b3ae Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Windup.png new file mode 100644 index 0000000000..7b4724a936 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Windup.png new file mode 100644 index 0000000000..2a5b8b85de Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Windup.png new file mode 100644 index 0000000000..72c9a6e3a6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Windup.png new file mode 100644 index 0000000000..3091239cc7 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Windup.png new file mode 100644 index 0000000000..715575ed8e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Windup.png new file mode 100644 index 0000000000..a43a3a6aee Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Windup.png new file mode 100644 index 0000000000..962971d3a9 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Windup.png new file mode 100644 index 0000000000..05b2a01e1d Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Windup.png new file mode 100644 index 0000000000..5e632e5701 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Windup.png new file mode 100644 index 0000000000..5b33b6a126 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Windup.png new file mode 100644 index 0000000000..f24c467020 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Windup.png new file mode 100644 index 0000000000..587a4fdf3c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Windup.png new file mode 100644 index 0000000000..39fed38090 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Windup.png new file mode 100644 index 0000000000..ba7f5c2030 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Windup.png new file mode 100644 index 0000000000..7050bf5dc5 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Windup.png new file mode 100644 index 0000000000..a05e65f46f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Windup.png new file mode 100644 index 0000000000..1b637bac7a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Windup.png new file mode 100644 index 0000000000..705df9bc61 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Windup.png new file mode 100644 index 0000000000..5c76d84799 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Windup.png new file mode 100644 index 0000000000..38e56e3622 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Windup.png new file mode 100644 index 0000000000..e6f85699e3 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Windup.png new file mode 100644 index 0000000000..70bdf13ff3 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Windup.png new file mode 100644 index 0000000000..78a87b4291 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Windup.png new file mode 100644 index 0000000000..dd2816d167 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Windup.png new file mode 100644 index 0000000000..9d3a44f186 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Windup.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Windup.png new file mode 100644 index 0000000000..02a1e124ad Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Windup.png new file mode 100644 index 0000000000..5023c1db27 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Windup.png new file mode 100644 index 0000000000..243951ae48 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Windup.png new file mode 100644 index 0000000000..777b7d5266 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Windup.png new file mode 100644 index 0000000000..976dd731ac Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Windup.png new file mode 100644 index 0000000000..0a91885263 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Windup.png new file mode 100644 index 0000000000..16af5b10d9 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Windup.png new file mode 100644 index 0000000000..b0b7dfc99c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Windup.png new file mode 100644 index 0000000000..7d6d4c64d4 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Windup.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Windup.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Windup.png new file mode 100644 index 0000000000..6ff7bcb0d0 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Windup.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 2759f95b84..43a91884c2 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 = 'BLOG POSTS: GUILD AND USE CASE SPOTLIGHTS!'; +const LAST_ANNOUNCEMENT_TITLE = 'SPECIAL TIME TRAVELERS’ QUEST: WIND-UP HATCHING POTIONS!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,43 +31,22 @@ api.getNews = {

${res.t('newStuff')}

-

8/20/2020 - ${LAST_ANNOUNCEMENT_TITLE}

+

8/25/2020 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

Use Case Spotlight: Supporting Your Loved Ones

+

- This month's Use Case Spotlight is about Supporting Your Loved Ones! It features - a number of great suggestions submitted by Habiticans in the Use Case Spotlights Guild. - We hope it helps any of you who might be looking for ways to be there for the people you - care about. + Hello Habiticans! We've released a brand-new quest in the Time Travelers' shop! It will + be available at the cost of one Mystic + Hourglass, and is not limited, so you can buy it anytime you like, and as many times + as you like. Have a Whirl with a Wind-Up Warrior, and earn some + wacky wind-up pets by completing your real-life tasks!

-

- Plus, we're collecting user submissions for the next spotlight! How do you use Habitica - to create positivity in your life? We’ll be featuring player-submitted examples in Use - Case Spotlights on the Habitica Blog next month, so post your suggestions in the Use Case - Spotlight Guild now. We look forward to learning more about how you use Habitica to - improve your life and get things done! -

-
by shanaqui
-
-

Guild Spotlight: CernyPie's Favorites

-

- For this year's Guild Spotlight series, we're highlighting some favorites from Habitica's - staff, moderators, and some high-level contributors! -

-

- This month we're sharing some picks from legendary socialite CernyPie! If you want to curate your - Habitica experience and join active, positive Guilds, this is a great way to pick up some - new ideas for Guilds to join. -

-
by shanaqui
- +
+ by Beffymaroo, Great and Powerful, Vikte, a_diamond, SphinxWithoutASecret, and SabreCat +
`, });