krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added dequip ability per ticket: 3730

Browse Source
This commit is contained in:
kholliday
2015-03-04 21:43:17 -06:00
parent 90fe516562
commit f28bc31a2c
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
website/public/js/controllers/inventoryCtrl.js
View File

@@ -1,4 +1,4 @@
habitrpg.controller("InventoryCtrl",
habitrpg.controller("InventoryCtrl",
['$rootScope', '$scope', 'Shared', '$window', 'User', 'Content',
function($rootScope, $scope, Shared, $window, User, Content) {
@@ -88,7 +88,7 @@ habitrpg.controller("InventoryCtrl",
$rootScope.petCount = Shared.countPets($rootScope.countExists(User.user.items.pets), User.user.items.pets);
// Checks if beastmaster has been reached for the first time
if(!User.user.achievements.beastMaster
if(!User.user.achievements.beastMaster
&& $rootScope.petCount >= 90) {
User.user.achievements.beastMaster = true;
$rootScope.openModal('achievements/beastMaster');
@@ -143,7 +143,7 @@ habitrpg.controller("InventoryCtrl",
$rootScope.mountCount = Shared.countMounts($rootScope.countExists(User.user.items.mounts), User.user.items.mounts);
// Checks if mountmaster has been reached for the first time
if(!User.user.achievements.mountMaster
if(!User.user.achievements.mountMaster
&& $rootScope.mountCount >= 90) {
User.user.achievements.mountMaster = true;
$rootScope.openModal('achievements/mountMaster');
@@ -215,23 +215,36 @@ habitrpg.controller("InventoryCtrl",
$rootScope.selectedQuest = item;
$rootScope.openModal('buyQuest', {controller:'InventoryCtrl'});
}
$scope.getSeasonalShopArray = function(set){
var flatGearArray = _.toArray(Content.gear.flat);
var filteredArray = _.where(flatGearArray, {index: set});
return filteredArray;
};
$scope.getSeasonalShopQuests = function(set){
var questArray = _.toArray(Content.quests);
var filteredArray = _.filter(questArray, function(q){
return q.key == "evilsanta" || q.key == "evilsanta2";
});
return filteredArray;
};
$scope.dequip = function(){
for ( item in user.items.gear.equipped ){
var itemKey = user.items.gear.equipped[item];
if ( user.items.gear.owned[itemKey] ) {
user.ops.equip({params: {key: itemKey}});
}
}
user.preferences.background = "";
}
}
]);