krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow users to purchase quest scrolls even if they haven't finished the previous quest

Browse Source
This commit is contained in:
Cole Gleason
2014-01-10 15:43:44 -06:00
parent 36d32d6b16
commit 58803773d2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/js/controllers/inventoryCtrl.js
View File

@@ -84,9 +84,6 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', '$window', 'User',
} }
$scope.purchase = function(type, item){ $scope.purchase = function(type, item){
var completedPrevious = !item.previous || (User.user.achievements.quests && User.user.achievements.quests[item.previous]);
if (!completedPrevious)
return alert("You must first complete " + $rootScope.Content.quests[item.previous].text + '.');
var gems = User.user.balance * 4; var gems = User.user.balance * 4;
if(gems < item.value) return $rootScope.modals.buyGems = true; if(gems < item.value) return $rootScope.modals.buyGems = true;
var string = (type == 'hatchingPotion') ? 'hatching potion' : type; // give hatchingPotion a space var string = (type == 'hatchingPotion') ? 'hatching potion' : type; // give hatchingPotion a space
@@ -120,7 +117,11 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', '$window', 'User',
} }
$scope.showQuest = function(quest) { $scope.showQuest = function(quest) {
$rootScope.selectedQuest = Content.quests[quest]; var item = Content.quests[quest];
var completedPrevious = !item.previous || (User.user.achievements.quests && User.user.achievements.quests[item.previous]);
if (!completedPrevious)
return alert("You must first complete " + $rootScope.Content.quests[item.previous].text + '.');
$rootScope.selectedQuest = item;
$rootScope.modals.showQuest = true; $rootScope.modals.showQuest = true;
} }
$scope.closeQuest = function(){ $scope.closeQuest = function(){

4
views/options/inventory/inventory.jade
View File

@@ -46,8 +46,8 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
menu.pets-menu(label='Quest Scrolls ({{questCount}})') menu.pets-menu(label='Quest Scrolls ({{questCount}})')
p.muted(ng-show='questCount < 1') You don't have any quest scrolls. p.muted(ng-show='questCount < 1') You don't have any quest scrolls.
p.muted Quests require parties. If you want to quest solo, <a href="/#/options/groups/party">create an empty party</a> p.muted Quests require parties. If you want to quest solo, <a href="/#/options/groups/party">create an empty party</a>
div(ng-repeat='(quest,points) in ownedItems(user.items.quests)') div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]')
button.customize-option(popover='{{Content.quests[quest].notes}}', popover-title='{{Content.quests[quest].text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest)', class='inventory_quest_scroll') button.customize-option(popover='{{quest.previous && !user.achievements.quests[quest.previous] ? "You need to complete the previous quest to start this one!" : quest.notes}}', popover-title='{{quest.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}')
.badge.badge-info.stack-count {{points}} .badge.badge-info.stack-count {{points}}
li.customize-menu li.customize-menu