mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
party.order set and cases added
This commit is contained in:
@@ -2,13 +2,29 @@
|
|||||||
|
|
||||||
habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User',
|
habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User',
|
||||||
function($scope, Groups, User) {
|
function($scope, Groups, User) {
|
||||||
|
|
||||||
|
|
||||||
$scope.party = Groups.party(function(){
|
$scope.party = Groups.party(function(){
|
||||||
$scope.partyMinusSelf = _.sortBy(
|
$scope.partyMinusSelf = _.sortBy(
|
||||||
_.filter($scope.party.members, function(member){
|
_.filter($scope.party.members, function(member){
|
||||||
return member._id !== User.user._id;
|
return member._id !== User.user._id;
|
||||||
}),
|
}),
|
||||||
function (member) {
|
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()
|
).reverse()
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -111,7 +111,6 @@ var UserSchema = new Schema({
|
|||||||
shield: Number,
|
shield: Number,
|
||||||
|
|
||||||
// -------------- Animals -------------------
|
// -------------- Animals -------------------
|
||||||
|
|
||||||
// Complex bit here. The result looks like:
|
// Complex bit here. The result looks like:
|
||||||
// pets: {
|
// pets: {
|
||||||
// 'Wolf-Desert': 0, // 0 means does not own
|
// 'Wolf-Desert': 0, // 0 means does not own
|
||||||
@@ -182,7 +181,8 @@ var UserSchema = new Schema({
|
|||||||
current: String, // party._id
|
current: String, // party._id
|
||||||
invitation: String, // party._id
|
invitation: String, // party._id
|
||||||
lastMessageSeen: String,
|
lastMessageSeen: String,
|
||||||
leader: Boolean
|
leader: Boolean,
|
||||||
|
order: {type:String, 'default':'level'}
|
||||||
},
|
},
|
||||||
preferences: {
|
preferences: {
|
||||||
armorSet: String,
|
armorSet: String,
|
||||||
|
|||||||
Reference in New Issue
Block a user