From 5579030d204b417165e98dbe2e4fb40ef15e15af Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Sat, 23 Nov 2013 20:52:36 +1100 Subject: [PATCH] party.order set and cases added --- public/js/controllers/headerCtrl.js | 18 +++++++++++++++++- src/models/user.js | 6 +++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/public/js/controllers/headerCtrl.js b/public/js/controllers/headerCtrl.js index a5f96ad311..369f0bfc85 100644 --- a/public/js/controllers/headerCtrl.js +++ b/public/js/controllers/headerCtrl.js @@ -2,13 +2,29 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User', function($scope, Groups, User) { + + $scope.party = Groups.party(function(){ $scope.partyMinusSelf = _.sortBy( _.filter($scope.party.members, function(member){ return member._id !== User.user._id; }), function (member) { - return member.stats.lvl + switch(User.user.party.order) + { + case 'level': + return member.stats.lvl; + break; + case 'random': + return Math.random(); + break; + case 'pets': + return member.items.pets.length; + break; + default: + // party date joined + return true; + } } ).reverse() }); diff --git a/src/models/user.js b/src/models/user.js index 9b6adc8dc8..6a336cd4bd 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -110,8 +110,7 @@ var UserSchema = new Schema({ head: Number, shield: Number, - // -------------- Animals ------------------- - + // -------------- Animals ------------------- // Complex bit here. The result looks like: // pets: { // 'Wolf-Desert': 0, // 0 means does not own @@ -182,7 +181,8 @@ var UserSchema = new Schema({ current: String, // party._id invitation: String, // party._id lastMessageSeen: String, - leader: Boolean + leader: Boolean, + order: {type:String, 'default':'level'} }, preferences: { armorSet: String,