diff --git a/src/app/pets.coffee b/src/app/pets.coffee index 027b819fc2..5087171981 100644 --- a/src/app/pets.coffee +++ b/src/app/pets.coffee @@ -1,5 +1,5 @@ { randomProp } = require './helpers' -{ pets } = require('./items').items +{ pets, food } = require('./items').items ### app exports @@ -10,14 +10,15 @@ module.exports.app = (appExports, model) -> user.on 'set', 'flags.dropsEnabled', (captures, args) -> return unless captures == true - egg = randomProp pets + droppedEgg = randomProp pets + droppedFood = randomProp pets - user.push 'items.eggs', egg.name + user.push 'items.eggs', droppedEgg.name + user.push 'items.food', droppedFood.name # do drops enabled stuff $('#dropsEnabled-modal').show() - appExports.selectPet = (e, el) -> name = $(el).attr('data-pet') pet = _.findWhere pets, {name:name} diff --git a/views/app/avatar.html b/views/app/avatar.html index e98014939f..c3dca413f4 100644 --- a/views/app/avatar.html +++ b/views/app/avatar.html @@ -7,6 +7,7 @@
  • Profile
  • {#if _user.flags.dropsEnabled}
  • Inventory
  • +
  • Stable
  • {/if} @@ -22,6 +23,9 @@
    +
    + +
    {/} {else} @@ -201,3 +205,17 @@ {/each} + + +
    +
    +

    Stable

    + {#if not(_user.items.pets)} +

    You don't have any pets yet.

    + {/if} + {#each _user.items.pets as :pet} +

    {:pet}

    + {/each} +
    +
    +