diff --git a/common/img/sprites/spritesmith/quests/bosses/quest_armadillo.png b/common/img/sprites/spritesmith/quests/bosses/quest_armadillo.png new file mode 100644 index 0000000000..5435e805e0 Binary files /dev/null and b/common/img/sprites/spritesmith/quests/bosses/quest_armadillo.png differ diff --git a/common/img/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_armadillo.png b/common/img/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_armadillo.png new file mode 100644 index 0000000000..509a3d1143 Binary files /dev/null and b/common/img/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_armadillo.png differ diff --git a/common/img/sprites/spritesmith/stable/eggs/Pet_Egg_Armadillo.png b/common/img/sprites/spritesmith/stable/eggs/Pet_Egg_Armadillo.png new file mode 100644 index 0000000000..e8378290c6 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/eggs/Pet_Egg_Armadillo.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Base.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Base.png new file mode 100644 index 0000000000..ba8a1b913c Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-CottonCandyBlue.png new file mode 100644 index 0000000000..c8c881ce59 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-CottonCandyPink.png new file mode 100644 index 0000000000..3bdb7f9336 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Desert.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Desert.png new file mode 100644 index 0000000000..cfd54f3b82 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Golden.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Golden.png new file mode 100644 index 0000000000..858f8a1848 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Red.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Red.png new file mode 100644 index 0000000000..3f56f9a5e3 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Shade.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Shade.png new file mode 100644 index 0000000000..6f15cdb693 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Skeleton.png new file mode 100644 index 0000000000..75467038fd Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-White.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-White.png new file mode 100644 index 0000000000..d4d300877f Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Zombie.png new file mode 100644 index 0000000000..10f150c296 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/body/Mount_Body_Armadillo-Zombie.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Base.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Base.png new file mode 100644 index 0000000000..8b6b72bdba Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-CottonCandyBlue.png new file mode 100644 index 0000000000..fbac10065e Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-CottonCandyPink.png new file mode 100644 index 0000000000..538124de2d Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Desert.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Desert.png new file mode 100644 index 0000000000..d87ed7cf17 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Golden.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Golden.png new file mode 100644 index 0000000000..21b14ae524 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Red.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Red.png new file mode 100644 index 0000000000..2659232853 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Shade.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Shade.png new file mode 100644 index 0000000000..be1d1cc2b4 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Skeleton.png new file mode 100644 index 0000000000..7a2cd5765b Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-White.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-White.png new file mode 100644 index 0000000000..5ba105d11c Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Zombie.png new file mode 100644 index 0000000000..6f08782f50 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/head/Mount_Head_Armadillo-Zombie.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Base.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Base.png new file mode 100644 index 0000000000..5dfdff1942 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-CottonCandyBlue.png new file mode 100644 index 0000000000..b12e18a77f Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-CottonCandyPink.png new file mode 100644 index 0000000000..8393b6c72f Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Desert.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Desert.png new file mode 100644 index 0000000000..6938c7df33 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Golden.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Golden.png new file mode 100644 index 0000000000..760e0bfeff Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Red.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Red.png new file mode 100644 index 0000000000..1ecee9961e Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Shade.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Shade.png new file mode 100644 index 0000000000..25835fdd88 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Skeleton.png new file mode 100644 index 0000000000..eb983170e9 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-White.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-White.png new file mode 100644 index 0000000000..bc2edc170d Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Zombie.png new file mode 100644 index 0000000000..8ed8102e60 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Armadillo-Zombie.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Base.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Base.png new file mode 100644 index 0000000000..ad785805cb Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-CottonCandyBlue.png new file mode 100644 index 0000000000..52b5969ca8 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-CottonCandyPink.png new file mode 100644 index 0000000000..2e641b3249 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Desert.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Desert.png new file mode 100644 index 0000000000..ffe1bda218 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Golden.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Golden.png new file mode 100644 index 0000000000..9707cede57 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Red.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Red.png new file mode 100644 index 0000000000..d93224debd Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Shade.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Shade.png new file mode 100644 index 0000000000..a4e2c25f85 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Skeleton.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Skeleton.png new file mode 100644 index 0000000000..52b98cfc9d Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-White.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-White.png new file mode 100644 index 0000000000..6b0ac4d75d Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-White.png differ diff --git a/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Zombie.png b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Zombie.png new file mode 100644 index 0000000000..43a5694577 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/pets/Pet-Armadillo-Zombie.png differ diff --git a/common/locales/en/content.json b/common/locales/en/content.json index e8eb5066ed..ca45d4fba8 100644 --- a/common/locales/en/content.json +++ b/common/locales/en/content.json @@ -175,6 +175,10 @@ "questEggTurtleMountText": "Giant Sea Turtle", "questEggTurtleAdjective": "a peaceful", + "questEggArmadilloText": "Armadillo", + "questEggArmadilloMountText": "Armadillo", + "questEggArmadilloAdjective": "an armored", + "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", diff --git a/common/locales/en/questsContent.json b/common/locales/en/questsContent.json index a272cdc289..5d8627322e 100644 --- a/common/locales/en/questsContent.json +++ b/common/locales/en/questsContent.json @@ -389,5 +389,12 @@ "questTurtleCompletion": "Your valiant work has cleared the waters for our sea turtle to find her beach. You, @Bambin, and @JaizakAripaik watch as she buries her brood of eggs deep in the sand so they can grow and hatch into hundreds of little sea turtles. Ever the lady, she gives you three eggs each, asking that you feed and nurture them so one day they become big sea turtles themselves.", "questTurtleBoss": "Task Flotsam", "questTurtleDropTurtleEgg": "Turtle (Egg)", - "questTurtleUnlockText": "Unlocks purchasable Turtle eggs in the Market" + "questTurtleUnlockText": "Unlocks purchasable Turtle eggs in the Market", + + "questArmadilloText": "The Indulgent Armadillo", + "questArmadilloNotes": "It's time to get outside and start your day. You swing open your door only to be met with what looks like a sheet of rock. \"I'm just giving you the day off!\" says a muffled voice through the blocked door. \"Don't be such a bummer, just relax today!\"

Suddenly, @Beffymaroo and @PainterProphet knock on your window. \"Looks like the Indulgence Armadillo has taken a liking to you! C'mon, we'll help you get her out of your way!\"", + "questArmadilloCompletion": "Finally, after a long morning of convincing the Indulgence Armadillo that you do, in fact, want to work, she caves. \"I'm sorry!\" She apologizes. \"I just wanted to help. I thought everyone liked lazy days!\"

You smile, and let her know that next time you've earned a day off you'll invite her over. She grins back at you. Passers-by @Tipsy and @krajzega congratulate you on the good work as she rolls away, leaving a few eggs as an apology.", + "questArmadilloBoss": "Indulgence Armadillo", + "questArmadilloDropArmadilloEgg": "Armadillo (Egg)", + "questArmadilloUnlockText": "Unlocks purchasable Armadillo eggs in the Market" } diff --git a/common/script/content/index.js b/common/script/content/index.js index a1e24d58ba..86d2bec965 100644 --- a/common/script/content/index.js +++ b/common/script/content/index.js @@ -408,6 +408,13 @@ api.questEggs = { return u.achievements.quests && (u.achievements.quests.turtle != null) > 0; }), }, + Armadillo: { + text: t('questEggArmadilloText'), + adjective: t('questEggArmadilloAdjective'), + canBuy: (function(u) { + return u.achievements.quests && (u.achievements.quests.armadillo != null) > 0; + }), + }, }; _.each(api.questEggs, function(egg, key) { @@ -2793,6 +2800,38 @@ api.quests = { unlock: t('questTurtleUnlockText'), }, }, + armadillo: { + text: t('questArmadilloText'), + notes: t('questArmadilloNotes'), + completion: t('questArmadilloCompletion'), + value: 4, + category: 'pet', + boss: { + name: t('questArmadilloBoss'), + hp: 600, + str: 1.5, + }, + drop: { + items: [ + { + type: 'eggs', + key: 'Armadillo', + text: t('questArmadilloDropArmadilloEgg'), + }, { + type: 'eggs', + key: 'Armadillo', + text: t('questArmadilloDropArmadilloEgg'), + }, { + type: 'eggs', + key: 'Armadillo', + text: t('questArmadilloDropArmadilloEgg'), + } + ], + gp: 43, + exp: 350, + unlock: t('questArmadilloUnlockText'), + }, + }, }; _.each(api.quests, function(v, key) {