Skip to content

Commit

Permalink
feat(pets): Cuttlefishies
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreCat committed Jun 17, 2015
1 parent c404e5c commit ad7e5a6
Show file tree
Hide file tree
Showing 53 changed files with 3,700 additions and 3,459 deletions.
2 changes: 1 addition & 1 deletion common/dist/sprites/habitrpg-shared.css

Large diffs are not rendered by default.

270 changes: 159 additions & 111 deletions common/dist/sprites/spritesmith0.css

Large diffs are not rendered by default.

Binary file modified common/dist/sprites/spritesmith0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,620 changes: 840 additions & 780 deletions common/dist/sprites/spritesmith1.css

Large diffs are not rendered by default.

Binary file modified common/dist/sprites/spritesmith1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,516 changes: 746 additions & 770 deletions common/dist/sprites/spritesmith2.css

Large diffs are not rendered by default.

Binary file modified common/dist/sprites/spritesmith2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
956 changes: 514 additions & 442 deletions common/dist/sprites/spritesmith3.css

Large diffs are not rendered by default.

Binary file modified common/dist/sprites/spritesmith3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,006 changes: 494 additions & 512 deletions common/dist/sprites/spritesmith4.css

Large diffs are not rendered by default.

Binary file modified common/dist/sprites/spritesmith4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
894 changes: 462 additions & 432 deletions common/dist/sprites/spritesmith5.css

Large diffs are not rendered by default.

Binary file modified common/dist/sprites/spritesmith5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
814 changes: 422 additions & 392 deletions common/dist/sprites/spritesmith6.css

Large diffs are not rendered by default.

Binary file modified common/dist/sprites/spritesmith6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions common/locales/en/content.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@
"questEggSheepText": "Sheep",
"questEggSheepAdjective": "woolly",

"questEggCuttlefishText": "Cuttlefish",
"questEggCuttlefishAdjective": "cuddly",

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

"hatchingPotionBase": "Base",
Expand Down
9 changes: 8 additions & 1 deletion common/locales/en/questsContent.json
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@
"questSheepBoss": "Thunder Ram",
"questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
"questSheepDropSheepEgg": "Sheep (Egg)",
"questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
"questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market",

"questKrakenText": "The Kraken of Inkomplete",
"questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
"questKrakenBoss": "The Kraken of Inkomplete",
"questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
"questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
"questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"

}
20 changes: 20 additions & 0 deletions common/script/content.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,7 @@ api.questEggs =
Bunny: text: t('questEggBunnyText'), adjective: t('questEggBunnyAdjective'), canBuy: false
Slime: text: t('questEggSlimeText'), adjective: t('questEggSlimeAdjective'), canBuy: false
Sheep: text: t('questEggSheepText'), adjective: t('questEggSheepAdjective'), canBuy: false
Cuttlefish: text: t('questEggCuttlefishText'), adjective: t('questEggCuttlefishAdjective'), canBuy: false

_.each api.questEggs, (egg,key) ->
_.defaults egg,
Expand Down Expand Up @@ -1726,6 +1727,25 @@ api.quests =
exp: 125
unlock: t('questSheepUnlockText')

kraken:
text: t('questKrakenText')
notes: t('questKrakenNotes')
completion: t('questKrakenCompletion')
value: 4
boss:
name: t('questKrakenBoss')
hp: 800
str: 2
drop:
items: [
{type: 'eggs', key: 'Cuttlefish', text: t('questKrakenDropCuttlefishEgg')}
{type: 'eggs', key: 'Cuttlefish', text: t('questKrakenDropCuttlefishEgg')}
{type: 'eggs', key: 'Cuttlefish', text: t('questKrakenDropCuttlefishEgg')}
]
gp: 55
exp: 500
unlock: t('questKrakenUnlockText')

_.each api.quests, (v,key) ->
_.defaults v, {key,canBuy:true}
b = v.boss
Expand Down
2 changes: 1 addition & 1 deletion website/views/options/inventory/inventory.jade
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
| {{::egg.value}}&nbsp;
span.Pet_Currency_Gem1x.inline-gems
//- buyable quest eggs. TODO: Get this from a collection so we don't have to maintain this ridiculous comma-delimited list
each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime',sheep:'Sheep'}
each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime',sheep:'Sheep',kraken:'Cuttlefish'}
div(ng-show='user.achievements.quests.#{quest} > 0')
button.customize-option(popover='{{::Content.eggs.#{egg}.notes()}}', popover-title!=env.t("egg", {eggType: "{{::Content.eggs.#{egg}.text()}}"}), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', ng-click='purchase("eggs", Content.eggs.#{egg})', class='Pet_Egg_#{egg}')
p
Expand Down
47 changes: 30 additions & 17 deletions website/views/shared/new-stuff.jade
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
h5 6/16/2015 - SEARCH BAR, CHALLENGES FILTER, INTERMITTENT REFRESH, AND VISUAL TWEAKS
h5 6/17/2015 - CUTTLEFISH PET QUEST AND QUEST DISPLAY IMPROVEMENTS
hr
tr
td
h5 Search Bar
p You can now easily search for a specific task by using the handy search bar on the upper right of the task page!
p.small.muted by Jiří Chára
.quest_kraken.pull-right
h5 Cuttlefish Pet Quest
p A new pet quest is available in the <a href='/#/options/inventory/drops' target='_blank'>Market</a>: The Kraken of Inkomplete! A pleasant day sailing is ruined when a Kraken attacks. Can you strike down the tasks and tentacles that keep cropping up? If so, you'll be awarded with some cuttlefish eggs!
p.small.muted art by Lemoness and Wolvenhalo
p.small.muted writing by Lemoness
tr
td
h5 New Challenges Filter
p Now you can filter Challenges based on whether or not you own the Challenge! Easily see all the Challenges that you've created with a single click.
p.small.muted by theHollidayInn
tr
td
h5 Intermittent Refresh
p To improve performance, HabitRPG now refreshes automatically after 6 hours of inactivity to combat bugs and make sure that you have the most up-to-date code. You're always welcome to refresh more frequently, of course.
p.small.muted by cheerskevin
tr
td
h5 Visual Tweaks
p We now have a highlighted Help button, to remind people about those resources, and a denser task edit style!
p.small.muted by excentris and nthomsn
h5 Quest Display Improvements
p Now you can see the details of a pending quest on the Party Page by clicking the new "Quest Details" tab above the quest invitations. We hope this helps you decide whether or not you want to accept the quest!
p.small.muted by hairlessbear

hr
a(href='/static/old-news', target='_blank') Read older news

mixin oldNews

h5 6/16/2015 - SEARCH BAR, CHALLENGES FILTER, INTERMITTENT REFRESH, AND VISUAL TWEAKS
tr
td
h5 Search Bar
p You can now easily search for a specific task by using the handy search bar on the upper right of the task page!
p.small.muted by Jiří Chára
tr
td
h5 New Challenges Filter
p Now you can filter Challenges based on whether or not you own the Challenge! Easily see all the Challenges that you've created with a single click.
p.small.muted by theHollidayInn
tr
td
h5 Intermittent Refresh
p To improve performance, HabitRPG now refreshes automatically after 6 hours of inactivity to combat bugs and make sure that you have the most up-to-date code. You're always welcome to refresh more frequently, of course.
p.small.muted by cheerskevin
tr
td
h5 Visual Tweaks
p We now have a highlighted Help button, to remind people about those resources, and a denser task edit style!
p.small.muted by excentris and nthomsn
h5 6/11/2015 - REPEATING TASKS, START DATE, AND MOBILE APP UPDATES!
p
br
Expand Down

0 comments on commit ad7e5a6

Please sign in to comment.