diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 7b52dbc7e1..bfb0691ada 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -422,11 +422,11 @@ questStart = function(req, res) { updates['$inc']['items.quests.'+key] = -1; if (group.quest.members[m] == true) { updates['$set']['party.quest.key'] = key; - updates['$set']['party.quest.tally'] = {up:0,down:0,collect:collectTally}; + updates['$set']['party.quest.progress'] = {up:0,down:0,collect:collectTally}; questMembers[m] = true; } else { updates['$unset'] = {'party.quest.key':1}; - updates['$set']['party.quest.tally'] = {}; + updates['$set']['party.quest.progress'] = {}; } parallel.push(function(cb2){ User.update({_id:m},updates,cb2); @@ -501,7 +501,7 @@ api.questAbort = function(req, res, next){ function(cb){ User.update({_id:{$in: _.keys(group.quest.members)}},{ $unset: {'party.quest.key':1}, - $set: {'party.quest.tally.collect':{}}, + $set: {'party.quest.progress.collect':{}}, $inc: {_v:1} },cb); }, diff --git a/src/controllers/user.js b/src/controllers/user.js index a92428cf2f..bb519cb5e0 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -194,7 +194,7 @@ api.update = function(req, res, next) { api.cron = function(req, res, next) { var user = res.locals.user, - tally = user.fns.cron(), + progress = user.fns.cron(), ranCron = user.isModified(), quest = shared.content.quests[user.party.quest.key]; @@ -213,7 +213,7 @@ api.cron = function(req, res, next) { }, function(group, cb){ var type = quest.boss ? 'boss' : 'collect'; - group[type+'Quest'](user,tally,cb); + group[type+'Quest'](user,progress,cb); }, function(){ var cb = arguments[arguments.length-1]; diff --git a/src/models/group.js b/src/models/group.js index 949afc5557..aecafa0968 100644 --- a/src/models/group.js +++ b/src/models/group.js @@ -146,15 +146,15 @@ GroupSchema.methods.finishQuest = function(quest, cb) { mongoose.models.User.update({_id:{$in:members}}, updates, {multi:true}, cb); } -GroupSchema.methods.collectQuest = function(user, tally, cb) { +GroupSchema.methods.collectQuest = function(user, progress, cb) { var group = this, quest = shared.content.quests[group.quest.key]; - _.each(tally.collect,function(v,k){ + _.each(progress.collect,function(v,k){ group.quest.progress.collect[k] += v; }); - var foundText = _.reduce(tally.collect, function(m,v,k){ + var foundText = _.reduce(progress.collect, function(m,v,k){ m.push(v + ' ' + quest.collect[k].text); return m; }, []); @@ -178,13 +178,13 @@ GroupSchema.methods.collectQuest = function(user, tally, cb) { ],cb); } -GroupSchema.methods.bossQuest = function(user, tally, cb) { +GroupSchema.methods.bossQuest = function(user, progress, cb) { var group = this; var quest = shared.content.quests[group.quest.key]; - var down = tally.down * quest.boss.str; // multiply by boss strength + var down = progress.down * quest.boss.str; // multiply by boss strength - group.quest.progress.hp -= tally.up; - group.sendChat("`<" + user.profile.name + "> attacks <" + quest.boss.name + "> for " + (tally.up.toFixed(1)) + " damage, <" + quest.boss.name + "> attacks party for " + (down.toFixed(1)) + " damage.`"); + group.quest.progress.hp -= progress.up; + group.sendChat("`<" + user.profile.name + "> attacks <" + quest.boss.name + "> for " + (progress.up.toFixed(1)) + " damage, <" + quest.boss.name + "> attacks party for " + (down.toFixed(1)) + " damage.`"); //var hp = group.quest.progress.hp; // Everyone takes damage diff --git a/src/models/user.js b/src/models/user.js index e089a9215a..b7f4cd6167 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -203,7 +203,7 @@ var UserSchema = new Schema({ order: {type:String, 'default':'level'}, quest: { key: String, - tally: { + progress: { up: {type: Number, 'default': 0}, down: {type: Number, 'default': 0}, collect: {type: Schema.Types.Mixed, 'default': {}} // {feather:1, ingot:2}