Skip to content

Commit

Permalink
Merge branch '2024-08-content-prebuild' into turtle
Browse files Browse the repository at this point in the history
  • Loading branch information
CuriousMagpie committed Jul 18, 2024
2 parents 08a6ad4 + 5ad6715 commit cfc4443
Show file tree
Hide file tree
Showing 12 changed files with 382 additions and 6 deletions.
285 changes: 285 additions & 0 deletions website/client/src/assets/css/sprites/spritesmith-main.css

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions website/common/locales/en/backgrounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,10 @@
"backgroundRiverBottomText": "River Bottom",
"backgroundRiverBottomNotes": "Explore a River Bottom.",

"backgrounds082024": "SET 123: Released August 2024",
"backgroundSavannaText": "Hazy Grasslands",
"backgroundSavannaNotes": "Hike through Hazy Grasslands.",

"timeTravelBackgrounds": "Steampunk Backgrounds",
"backgroundAirshipText": "Airship",
"backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
Expand Down
4 changes: 4 additions & 0 deletions website/common/locales/en/content.json
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@
"questEggChameleonMountText": "Chameleon",
"questEggChameleonAdjective": "a chaotic",

"questEggCrabText": "Crab",
"questEggCrabMountText": "Crab",
"questEggCrabAdjective": "a fiddling",

"eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",

"hatchingPotionBase": "Base",
Expand Down
14 changes: 12 additions & 2 deletions website/common/locales/en/gear.json
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@
"weaponMystery202403Notes": "Carrying the biggest sword around is surely a way to create your own luck! Confers no benefit. March 2024 Subscriber Item.",
"weaponMystery202404Text": "Mycelial Magus Staff",
"weaponMystery202404Notes": "This staff will bestow upon you an ancient wisdom as ageless as the rocks and trees. Confers no benefit. April 2024 Subscriber Item.",
"weaponMystery202408Text": "Arcane Aegis",
"weaponMystery202408Notes": "A magic bubble shield that protects you from enemy spells or helps you float in the air or water. Confers no benefit. August 2024 Subscriber Item.",

"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
Expand Down Expand Up @@ -768,10 +770,12 @@
"weaponArmoireOptimistsCloverNotes": "Well, would you look at what you found? It never hurts to have just a little extra good luck on your side. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Optimist Set (Item 4 of 4).",
"weaponArmoirePottersWheelText": "Potter's Wheel",
"weaponArmoirePottersWheelNotes": "Throw some clay on this wheel and make a bowl or a mug or a vase or a slightly different bowl. If you're lucky, a ghost might visit while you create! Increases Perception by <%= per %>. Enchanted Armoire: Potter Set (Item 4 of 4).",
"weaponArmoireShadyBeachUmbrellaText": "Beach Umbrella",
"weaponArmoireShadyBeachUmbrellaNotes": "The shade of this rainbow-colored umbrella conceals you briefly from the day star and any unwanted bothers. Increases Perception by <%= per %>. Enchanted Armoire: Beachside Set (Item 3 of 4).",
"weaponArmoireBeachUmbrellaText": "Beach Umbrella",
"weaponArmoireBeachUmbrellaNotes": "The shade of this rainbow-colored umbrella conceals you briefly from the day star and any unwanted bothers. Increases Perception by <%= per %>. Enchanted Armoire: Beachside Set (Item 3 of 4).",
"weaponArmoireCorsairsBladeText": "Corsair’s Blade",
"weaponArmoireCorsairsBladeNotes": "Whether you wield it to plunder or to protect, you can be glad you brought this fierce blade to sea with you. Just be sure to stow it safely when not in use. Increases Strength by <%= str %>. Enchanted Armoire: Corsair Set (Item 3 of 3)",
"weaponArmoireDragonKnightsLanceText": "Dragon Knight Lance",
"weaponArmoireDragonKnightsLanceNotes": "This red and silver lance has unseated many opponents from their mounts. Increases Constitution by <%= con %>. Enchanted Armoire: Dragon Knight Set (Item 3 of 3)",

"armor": "armor",
"armorCapitalized": "Armor",
Expand Down Expand Up @@ -1622,6 +1626,8 @@
"armorArmoireBlueStripedSwimsuitNotes": "What could be more exciting than battling sea monsters on the beach? Increases Constitution by <%= con %>. Enchanted Armoire: Beachside Set (Item 2 of 4).",
"armorArmoireCorsairsCoatAndCapeText": "Corsair’s Coat and Cape",
"armorArmoireCorsairsCoatAndCapeNotes": "Whether you’re biding your time on the docks or watching for danger on the open seas, these will surely keep you feeling dry and looking dramatic. Just keep your balance on deck. Increases Constitution by <%= con %>. Enchanted Armoire: Corsair Set (Item 1 of 3)",
"armorArmoireDragonKnightsArmorText": "Dragon Knight Armor",
"armorArmoireDragonKnightsArmorNotes": "Channel the strength and power of a dragon with this armor made of silver and shed scales. Increases Strength by <%= str %>. Enchanted Armoire: Dragon Knight Set (Item 2 of 3)",

"headgear": "helm",
"headgearCapitalized": "Headgear",
Expand Down Expand Up @@ -2485,6 +2491,8 @@
"headArmoirePottersBandanaNotes": "Look the part and keep your hair out of your face while you work. It’s a win-win! Increases Intelligence by <%= int %>. Enchanted Armoire: Potter Set (Item 2 of 4).",
"headArmoireCorsairsBandanaText": "Corsair’s Bandana",
"headArmoireCorsairsBandanaNotes": "Whether you’re keeping your head covered in case a seagull flies overhead or making sure your foes never see you sweat, this bandana is essential. Just add a decorative bead for every adventure you complete. Increases Intelligence by <%= int %>. Enchanted Armoire: Corsair Set (Item 2 of 3)",
"headArmoireDragonKnightsHelmText": "Dragon Knight Helm",
"headArmoireDragonKnightsHelmNotes": "With the fiery features on this helmet, dragons might mistake you for one of their own. Increases Intelligence by <%= int %>. Enchanted Armoire: Dragon Knight Set (Item 1 of 3)",

"offhand": "off-hand item",
"offHandCapitalized": "Off-Hand Item",
Expand Down Expand Up @@ -2783,6 +2791,8 @@
"shieldMystery202011Notes": "Harness the power of the autumn wind with this staff. Use for arcane magic or to make awesome leaf piles, the choice is yours! Confers no benefit. November 2020 Subscriber Item.",
"shieldMystery202209Text": "Mound o' Magic Books",
"shieldMystery202209Notes": "Building your sorcery knowledge takes a lot of reading, but you're sure to enjoy your education. Confers no benefit. September 2022 Subscriber Item.",
"shieldMystery202408Text": "Arcane Sparkles",
"shieldMystery202408Notes": "Magic lights will illuminate the inside of your bubble hideout, or anywhere else you need a little light! Confers no benefit. August 2024 Subscriber Item.",
"shieldMystery301405Text": "Clock Shield",
"shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
"shieldMystery301704Text": "Fluttery Fan",
Expand Down
16 changes: 13 additions & 3 deletions website/common/locales/en/questsContent.json
Original file line number Diff line number Diff line change
Expand Up @@ -887,21 +887,31 @@
"questPinkMarbleRageDescription": "This bar fills when you don't complete your Dailies. When it is full, Cupido will take away some of your party's pending damage!",
"questPinkMarbleRageEffect": "`Cupido uses Pink Punch!` That wasn't affectionate at all! Your partymates are taken aback. Pending damage reduced.",
"questPinkMarbleDropPinkMarblePotion": "Pink Marble Hatching Potion",
"QuestPinkMarbleUnlockText": "Unlocks Pink Marble Hatching Potions for purchase in the Market.",
"questPinkMarbleUnlockText": "Unlocks Pink Marble Hatching Potions for purchase in the Market.",

"questGiraffeText": "The Gear-affe",
"questGiraffeNotes": "You’re strolling across the tall grass of the Sloenstedi Savannah, enjoying a nice walk in nature as a break from your tasks. As you pass through the rolling landscape, you notice a collection of items in the distance. It’s a pile of musical instruments, art supplies, electronic equipment, and more! You venture near for a better look.<br><br>“Hey, what do you think you’re doing?” yells a voice from behind an acacia. A tall and imposing giraffe emerges, wearing a fancy pair of shades. a guitar, and a fancy camera around its long neck. “This is all my gear, be careful and don’t touch anything!”<br><br>You notice dust on many of the items. “Wow, you sure have a lot of hobbies!” you say. “Can you show me some art or play me a tune?”<br><br>The giraffe’s face falls as he looks at all his supplies. “I have so much of this stuff but don’t know where to begin! Why don't you give me some of your motivation so I can have the productive energy I need to finally get started!”",
"questGiraffeCompletion": "After helping the Gear-Affe with some basic organization of his stash, you’re both feeling more energized and upbeat!<br><br>He grabs his guitar and a book of beginner exercises and strums a few notes. “It feels good to take a step in the right direction, even a small one. Thanks for helping me out! Take these, I hear you have a stash of pets and these fellas could be a nice addition!”",
"questGiraffeBoss": "Gear-affe",
"questGiraffeDropGiraffeEgg": "Giraffe (Egg)",
"QuestGiraffeUnlockText": "Unlocks Giraffe Eggs for purchase in the Market.",
"questGiraffeUnlockText": "Unlocks Giraffe Eggs for purchase in the Market.",

"questChameleonText": "The Chaotic Chameleon",
"questChameleonNotes": "It’s a beautiful day in a warm, rainy corner of the Taskwoods. You’re on the hunt for new additions to your leaf collection when a branch in front of you changes color without warning! Then it moves!<br><br>Stumbling backwards, you realize this is not a branch at all, but a huge chameleon! Each part of his body keeps changing colors as his eyes dart in different directions.<br><br>“Are you all right?” you ask the chameleon.<br><br>“Ahhh, well,” he says, looking a little flustered. “I’ve been trying to blend in… but it’s so overwhelming… the colors keep coming and going! It’s hard to focus on just one....”<br><br>“Aha,” you say, “I think I can help. We’ll sharpen your focus with a little challenge! Get your colors ready!”<br><br>“You’re on!” replied the chameleon.",
"questChameleonCompletion": "After a few lively turns the Chameleon went through every color of the rainbow, perfectly matching each color you requested.<br><br>“Wow,” he says, “working together and making it into a game really helped me concentrate! Please take these as a reward, you’re earned them! Teach these little guys how to change all the colors of the rainbow when they hatch.”",
"questChameleonBoss": "Chaotic Chameleon",
"questChameleonDropChameleonEgg": "Chameleon (Egg)",
"QuestChameleonUnlockText": "Unlocks Chameleon Eggs for purchase in the Market",
"questChameleonUnlockText": "Unlocks Chameleon Eggs for purchase in the Market",

"questCrabText": "The Fiddling Crab",
"questCrabNotes": "It’s a warm sunny morning, and you’re enjoying a visit to the beach to catch up on some of the books on your summer reading list. You’re startled when you nearly step on a shiny crystal near a shallow hole in the sand.<br><br>“Ey, watch where you’re goin’! I’m makin’ a burrow here!” says a voice. A surprisingly large crab with a decorative shell runs out in front of your toes, snapping her claw as she speaks.<br><br>“Hm, is this a burrow?” you ask, looking at the shallow depression. There are shells and crystals arranged around it, but it’s not much in the way of a hiding place.<br><br>The crab stammers.\"Ey, this is a judgment free zone! I'm gettin' to it, I'm gettin' to it... I just got caught up on decorating. Sometimes a crab's gotta fiddle,\" she says, adjusting a shell.<br><br>\"Why don't you lend a claw and help if you've got some big ideas on what a burrow should look like?\"",
"questCrabCompletion": "You and the crab figure out how to work together to get everything in just the right place, ending up with a fine sandy burrow. The crab happily nestles in.<br><br>\"Thank ya!\" she says, making herself comfy. \"Now this is a hole that's made just for me. I can finally enjoy all my perfectly placed decorations. Here, take these lil guys as a token of my appreciation. It's an offer you can't refuse!\"",
"questCrabBoss": "Fiddling Crab",
"questCrabRageTitle": "Distracting Fiddling",
"questCrabRageDescription": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
"questCrabRageEffect": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
"questCrabDropCrabEgg": "Crab (Egg)",
"questCrabUnlockText": "Unlocks Crab Eggs for purchase in the Market.",

"questFungiText": "The Moody Mushroom",
"questFungiNotes": "It’s been a rainy spring in Habitica and the ground around the stables is spongy and damp. You notice quite a few mushrooms have appeared along the wooden stable walls and fences. There’s a fog hanging about, not quite letting the sun peek through, and it’s a bit dispiriting.<br><br>Out of the mist you see the outline of the April Fool, not at all his usual bouncy self.<br><br>”I’d hoped to bring you all some delightful Fungi Magic Hatching Potions so that you can keep your mushroom friends from my special day forever,” he says, his expression alarmingly unsmiling. “But this cold fog is really getting to me, it’s making me feel too tired and dismal to work my usual magic.”<br><br>“Oh no, sorry to hear that,” you say, noticing your own increasingly somber mood. “This fog is really making the day gloomy. I wonder where it came from…”<br><br>A low rumble sounds across the fields, and you see an outline emerging from the mist. You’re alarmed to see a gigantic and unhappy looking mushroom creature, and the mist appears to be emanating from it.<br><br>“Aha,” says the Fool, “I think this fungal fellow may be the source of our blues. Let’s see if we can summon a little cheer for our friend here and ourselves.”",
Expand Down
1 change: 1 addition & 0 deletions website/common/locales/en/subscriber.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
"mysterySet202405": "Gilded Dragon Set",
"mysterySet202406": "Phantom Buccaneer Set",
"mysterySet202407": "Amiable Axolotl Set",
"mysterySet202408": "Arcane Aegis Set",
"mysterySet301404": "Steampunk Standard Set",
"mysterySet301405": "Steampunk Accessories Set",
"mysterySet301703": "Peacock Steampunk Set",
Expand Down
3 changes: 3 additions & 0 deletions website/common/script/content/appearance/backgrounds.js
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,9 @@ const backgrounds = {
backgrounds072024: {
river_bottom: { },
},
backgrounds082024: {
savanna: { },
},
eventBackgrounds: {
birthday_bash: {
price: 0,
Expand Down
1 change: 1 addition & 0 deletions website/common/script/content/constants/schedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ export const MONTHLY_SCHEDULE = {
'penguin',
'butterfly',
'cheetah',
'crab',
],
},
{
Expand Down
6 changes: 6 additions & 0 deletions website/common/script/content/eggs.js
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,12 @@ const quests = {
adjective: t('questEggChameleonAdjective'),
canBuy: hasQuestAchievementFunction('chameleon'),
},
Crab: {
text: t('questEggCrabText'),
mountText: t('questEggCrabMountText'),
adjective: t('questEggCrabAdjective'),
canBuy: hasQuestAchievementFunction('crab'),
},
};

applyEggDefaults(drops, {
Expand Down
14 changes: 13 additions & 1 deletion website/common/script/content/gear/sets/armoire.js
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,10 @@ const armor = {
con: 14,
set: 'corsairSet',
},
dragonKnightsArmor: {
str: 8,
set: 'dragonKnightSet',
},
};

const body = {
Expand Down Expand Up @@ -1003,6 +1007,10 @@ const head = {
int: 7,
set: 'corsairSet',
},
dragonKnightsHelm: {
int: 8,
set: 'dragonKnightSet',
},
};

const shield = {
Expand Down Expand Up @@ -1836,14 +1844,18 @@ const weapon = {
per: 8,
set: 'pottersSet',
},
shadyBeachUmbrella: {
beachUmbrella: {
per: 12,
set: 'beachsideSet',
},
corsairsBlade: {
str: 7,
set: 'corsairSet',
},
dragonKnightsLance: {
con: 8,
set: 'dragonKnightSet',
},
};

const releaseDay = 7;
Expand Down
2 changes: 2 additions & 0 deletions website/common/script/content/gear/sets/mystery.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ const shield = {
201902: { },
202011: { },
202209: { },
202408: { },
301405: { },
301704: { },
};
Expand All @@ -297,6 +298,7 @@ const weapon = {
202311: { },
202403: { },
202404: { twoHanded: true },
202408: { },
301404: { },
};

Expand Down
38 changes: 38 additions & 0 deletions website/common/script/content/quests/pets.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,44 @@ const QUEST_PETS = {
unlock: t('questCowUnlockText'),
},
},
crab: {
text: t('questCrabText'),
notes: t('questCrabNotes'),
completion: t('questCrabCompletion'),
value: 4,
category: 'pet',
boss: {
name: t('questCrabBoss'),
hp: 1200,
str: 2.5,
rage: {
title: t('questCrabRageTitle'),
description: t('questCrabRageDescription'),
value: 25, // placeholder
healing: 0.5, // placeholder
effect: t('questCrabRageEffect'),
},
},
drop: {
items: [
{
type: 'eggs',
key: 'Crab',
text: t('questCrabDropCrabEgg'),
}, {
type: 'eggs',
key: 'Crab',
text: t('questCrabDropCrabEgg'),
}, {
type: 'eggs',
key: 'Crab',
text: t('questCrabDropCrabEgg'),
},
],
gp: 90,
exp: 900,
},
},
dilatory_derby: { // eslint-disable-line camelcase
text: t('questSeahorseText'),
notes: t('questSeahorseNotes'),
Expand Down

0 comments on commit cfc4443

Please sign in to comment.