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

Improvement #6912: New achievement modal service and more achievement tests (#6943)

Browse Source 
* add tests for beastMaster, mountMaster, and triadBingo achievements

* add tests for challengeWon, streak, ultimateGear, rebirth, and contributor achievements

* add achievement service that has openModal function

* achievement test pass again

* fix indentation, rename openModal to more descriptive displayAchievement

* add unit tests for achievements service

* initialize user.preferences.suppressModals in specHelper.newUser

* update achievement tests to account for new notification service

* add new achievementServices file to manifest.json

* fix tests

* award wonChallenge achiev like other achievs

* differentiate between small and normal achiev modals

* refactor achievementService.displayAchievement() to take options param
This commit is contained in:
Kaitlin Hipkin
2016-09-09 08:58:44 -04:00
committed by Blade Barringer
parent 31a1a14bae
commit a3f83b9076
11 changed files with 267 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/client/js/controllers/inventoryCtrl.js
View File

@@ -1,6 +1,6 @@
habitrpg.controller("InventoryCtrl",
['$rootScope', '$scope', 'Shared', '$window', 'User', 'Content', 'Analytics', 'Quests', 'Stats', 'Social',
function($rootScope, $scope, Shared, $window, User, Content, Analytics, Quests, Stats, Social) {
['$rootScope', '$scope', 'Shared', '$window', 'User', 'Content', 'Analytics', 'Quests', 'Stats', 'Social', 'Achievement',
function($rootScope, $scope, Shared, $window, User, Content, Analytics, Quests, Stats, Social, Achievement) {
var user = User.user;
@@ -167,7 +167,7 @@ habitrpg.controller("InventoryCtrl",
if(!user.achievements.beastMaster
&& $scope.petCount >= 90) {
User.user.achievements.beastMaster = true;
$rootScope.openModal('achievements/beastMaster', {controller:'UserCtrl', size:'sm'});
Achievement.displayAchievement('beastMaster');
}
// Checks if Triad Bingo has been reached for the first time
@@ -175,7 +175,7 @@ habitrpg.controller("InventoryCtrl",
&& $scope.mountCount >= 90
&& Shared.count.dropPetsCurrentlyOwned(User.user.items.pets) >= 90) {
User.user.achievements.triadBingo = true;
$rootScope.openModal('achievements/triadBingo', {controller:'UserCtrl', size:'sm'});
Achievement.displayAchievement('triadBingo');
}
}
@@ -216,7 +216,7 @@ habitrpg.controller("InventoryCtrl",
if(!user.achievements.mountMaster
&& $scope.mountCount >= 90) {
User.user.achievements.mountMaster = true;
$rootScope.openModal('achievements/mountMaster', {controller:'UserCtrl', size:'sm'});
Achievement.displayAchievement('mountMaster');
}
// Selecting Pet

16
website/client/js/controllers/notificationCtrl.js
View File

@@ -1,8 +1,8 @@
'use strict';
habitrpg.controller('NotificationCtrl',
['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics',
function ($scope, $rootScope, Shared, Content, User, Guide, Notification, Analytics) {
['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', 'Achievement',
function ($scope, $rootScope, Shared, Content, User, Guide, Notification, Analytics, Achievement) {
$rootScope.$watch('user.stats.hp', function (after, before) {
if (after <= 0){
@@ -98,24 +98,24 @@ habitrpg.controller('NotificationCtrl',
break;
case 'WON_CHALLENGE':
User.sync().then( function() {
$rootScope.openModal('wonChallenge', {controller: 'UserCtrl', size: 'sm'});
Achievement.displayAchievement('wonChallenge');
});
break;
case 'STREAK_ACHIEVEMENT':
Notification.streak(User.user.achievements.streak);
$rootScope.playSound('Achievement_Unlocked');
if (!User.user.preferences.suppressModals.streak) {
$rootScope.openModal('achievements/streak', {controller:'UserCtrl'});
Achievement.displayAchievement('streak', {size: 'md'});
}
break;
case 'ULTIMATE_GEAR_ACHIEVEMENT':
$rootScope.openModal('achievements/ultimateGear', {controller:'UserCtrl'});
Achievement.displayAchievement('ultimateGear', {size: 'md'});
break;
case 'REBIRTH_ACHIEVEMENT':
$rootScope.openModal('achievements/rebirth', {controller:'UserCtrl', size: 'sm'});
Achievement.displayAchievement('rebirth');
break;
case 'NEW_CONTRIBUTOR_LEVEL':
$rootScope.openModal('achievements/contributor',{controller:'UserCtrl'});
Achievement.displayAchievement('contributor', {size: 'md'});
break;
case 'CRON':
if (notification.data) {
@@ -135,7 +135,7 @@ habitrpg.controller('NotificationCtrl',
}
// Since we don't use localStorage anymore, notifications for achievements and new contributor levels
// are now stored user.notifications.
// are now stored in user.notifications.
$rootScope.$watchCollection('userNotifications', function (after) {
if (!User.user._wrapped) return;
handleUserNotifications(after);

8
website/client/js/controllers/partyCtrl.js
View File

@@ -1,7 +1,7 @@
'use strict';
habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests','Social', 'Pusher',
function($rootScope, $scope, Groups, Chat, User, Challenges, $state, $compile, Analytics, Quests, Social, Pusher) {
habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests','Social','Pusher','Achievement',
function($rootScope, $scope, Groups, Chat, User, Challenges, $state, $compile, Analytics, Quests, Social, Pusher, Achievement) {
var PARTY_LOADING_MESSAGES = 4;
@@ -38,14 +38,14 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
if(!user.achievements.partyUp
&& $scope.group.memberCount >= 2) {
User.set({'achievements.partyUp':true});
$rootScope.openModal('achievements/partyUp', {controller:'UserCtrl', size:'sm'});
Achievement.displayAchievement('partyUp');
}
// Checks if user's party has reached 4 players for the first time.
if(!user.achievements.partyOn
&& $scope.group.memberCount >= 4) {
User.set({'achievements.partyOn':true});
$rootScope.openModal('achievements/partyOn', {controller:'UserCtrl', size:'sm'});
Achievement.displayAchievement('partyOn');
}
}