diff --git a/src/app/index.coffee b/src/app/index.coffee index eabdfbde0e..8aafc86d14 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -14,6 +14,7 @@ browser = require './browser' party = require './party' items = require './items' profile = require './profile' +pets = require './pets' helpers.viewHelpers view character.view view @@ -58,6 +59,7 @@ ready (model) -> items.app(exports, model) party.app(exports, model) profile.app(exports, model) + pets.app(exports, model) require('../server/private').app(exports, model) require('./debug').app(exports, model) if model.get('_view.nodeEnv') != 'production' browser.app(exports, model, app) diff --git a/src/app/items.coffee b/src/app/items.coffee index d9633fe81e..5990a24412 100644 --- a/src/app/items.coffee +++ b/src/app/items.coffee @@ -197,10 +197,6 @@ module.exports.app = (appExports, model) -> content: html $('#rewardsTabs').popover 'show' - user.on 'set', 'flags.dropsEnabled', (captures, args) -> - return unless captures == true - # do drops enabled stuff - ### update store ### diff --git a/src/app/pets.coffee b/src/app/pets.coffee new file mode 100644 index 0000000000..7a86cf436e --- /dev/null +++ b/src/app/pets.coffee @@ -0,0 +1,11 @@ +### + app exports +### +module.exports.app = (appExports, model) -> + user = model.at '_user' + + user.on 'set', 'flags.dropsEnabled', (captures, args) -> + console.log 'hi!' + return unless captures == true + # do drops enabled stuff + $('#dropsEnabled-modal').show() diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index cd9002a989..331b88b230 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -170,8 +170,7 @@ updateStats = (model, newStats, batch) -> batch.set 'flags.itemsEnabled', obj.flags.itemsEnabled = true if !obj.flags.partyEnabled and obj.stats.lvl >= 3 batch.set 'flags.partyEnabled', obj.flags.partyEnabled = true - if !obj.flags.petsEnabled and obj.stats.lvl >= 4 - batch.set 'flags.petsEnabled', obj.flags.petsEnabled = true + if !obj.flags.dropsEnabled and obj.stats.lvl >= 4 batch.set 'flags.dropsEnabled', obj.flags.dropsEnabled = true if newStats.gp? diff --git a/views/app/index.html b/views/app/index.html index 9d66e2fd2b..fc4e9b71f4 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -7,6 +7,7 @@ + HabitRPG | Gamify Your Life diff --git a/views/app/pets.html b/views/app/pets.html new file mode 100644 index 0000000000..9663bc3961 --- /dev/null +++ b/views/app/pets.html @@ -0,0 +1,5 @@ + + + +

Highly discouraged because red tasks provide good incentive to improve (read more). However, this becomes necessary after long bouts of bad habits.

+
\ No newline at end of file