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

fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later

Browse Source
This commit is contained in:
Alys
2015-08-25 19:23:25 +10:00
parent 9ed1e2ba6d
commit bbcb9e6063
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/script/index.coffee
View File

@@ -1178,7 +1178,7 @@ api.wrap = (user, main=true) ->
item = content.gear.flat[item] item = content.gear.flat[item]
user.items.gear.owned[item.key] = true user.items.gear.owned[item.key] = true
user.markModified? 'purchased.plan.mysteryItems' user.markModified? 'purchased.plan.mysteryItems'
item.type = 'Mystery' item.notificationType = 'Mystery' # needed for website/public/js/controllers/notificationCtrl.js line 59 approx.
analyticsData = { analyticsData = {
uuid: user._id, uuid: user._id,
itemKey: item, itemKey: item,

7
website/public/js/controllers/notificationCtrl.js
View File

@@ -62,7 +62,10 @@ habitrpg.controller('NotificationCtrl',
var text, notes, type; var text, notes, type;
$rootScope.playSound('Item_Drop'); $rootScope.playSound('Item_Drop');
if (after.type !== 'gear' && after.type !== 'Quest' && after.type !== 'Mystery') { // Note: For Mystery Item gear, after.type will be 'head', 'armor', etc
// so we use after.notificationType below.
if (after.type !== 'gear' && after.type !== 'Quest' && after.notificationType !== 'Mystery') {
if (after.type === 'Food') { if (after.type === 'Food') {
type = 'food'; type = 'food';
} else if (after.type === 'HatchingPotion') { } else if (after.type === 'HatchingPotion') {
@@ -91,7 +94,7 @@ habitrpg.controller('NotificationCtrl',
} else if (after.type === 'Quest') { } else if (after.type === 'Quest') {
$rootScope.selectedQuest = Content.quests[after.key]; $rootScope.selectedQuest = Content.quests[after.key];
$rootScope.openModal('questDrop', {controller:'PartyCtrl'}); $rootScope.openModal('questDrop', {controller:'PartyCtrl'});
} else if (after.type === 'Mystery') { } else if (after.notificationType === 'Mystery') {
text = Content.gear.flat[after.key].text(); text = Content.gear.flat[after.key].text();
Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after); Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after);
} else { } else {