krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(sharing): Remaining cheevo modals

Browse Source
This commit is contained in:
Sabe Jones
2015-11-10 13:43:37 -05:00
parent 875f2ac552
commit 23df5b608d
3 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ habitrpg.controller("InventoryCtrl",
if(!user.achievements.beastMaster if(!user.achievements.beastMaster
&& $scope.petCount >= 90) { && $scope.petCount >= 90) {
User.user.achievements.beastMaster = true; User.user.achievements.beastMaster = true;
$rootScope.openModal('achievements/beastMaster', {controller:'UserCtrl'}); $rootScope.openModal('achievements/beastMaster', {controller:'UserCtrl', size:'sm'});
} }
// Checks if Triad Bingo has been reached for the first time // Checks if Triad Bingo has been reached for the first time
@@ -136,7 +136,7 @@ habitrpg.controller("InventoryCtrl",
&& $scope.mountCount >= 90 && $scope.mountCount >= 90
&& Shared.count.dropPetsCurrentlyOwned(User.user.items.pets) >= 90) { && Shared.count.dropPetsCurrentlyOwned(User.user.items.pets) >= 90) {
User.user.achievements.triadBingo = true; User.user.achievements.triadBingo = true;
$rootScope.openModal('achievements/triadBingo'); $rootScope.openModal('achievements/triadBingo', {controller:'UserCtrl', size:'sm'});
} }
} }
@@ -169,7 +169,7 @@ habitrpg.controller("InventoryCtrl",
if(!user.achievements.mountMaster if(!user.achievements.mountMaster
&& $scope.mountCount >= 90) { && $scope.mountCount >= 90) {
User.user.achievements.mountMaster = true; User.user.achievements.mountMaster = true;
$rootScope.openModal('achievements/mountMaster'); $rootScope.openModal('achievements/mountMaster', {controller:'UserCtrl', size:'sm'});
} }
// Selecting Pet // Selecting Pet

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

@@ -154,12 +154,12 @@ habitrpg.controller('NotificationCtrl',
$rootScope.$watch('user.achievements.rebirths', function(after, before){ $rootScope.$watch('user.achievements.rebirths', function(after, before){
if(after === before) return; if(after === before) return;
$rootScope.openModal('achievements/rebirth'); $rootScope.openModal('achievements/rebirth', {controller:'UserCtrl', size: 'sm'});
}); });
$rootScope.$watch('user.flags.contributor', function(after, before){ $rootScope.$watch('user.flags.contributor', function(after, before){
if (after === before || after !== true) return; if (after === before || after !== true) return;
$rootScope.openModal('achievements/contributor'); $rootScope.openModal('achievements/contributor',{controller:'UserCtrl'});
}); });
// Completed quest modal // Completed quest modal

71
website/views/shared/modals/achievements.jade
View File

@@ -68,7 +68,7 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
.shop_armoire.pull-right .shop_armoire.pull-right
p!=env.t("armoireUnlocked") p!=env.t("armoireUnlocked")
br br
button.btn.btn-primary(ng-click='$close()')=env.t('ok') button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+achievementFooter +achievementFooter
// Beast Master // Beast Master
@@ -79,54 +79,55 @@ script(id='modals/achievements/beastMaster.html', type='text/ng-template')
+achievementAvatar('rat',0) +achievementAvatar('rat',0)
p=env.t('beastAchievement') p=env.t('beastAchievement')
br br
button.btn.btn-primary(ng-click='$close()')=env.t('ok') button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+achievementFooter +achievementFooter
// Mount Master // Mount Master
script(id='modals/achievements/mountMaster.html', type='text/ng-template') script(id='modals/achievements/mountMaster.html', type='text/ng-template')
.modal-header .modal-content(style='min-width:28em')
h4=env.t('modalAchievement') .modal-body.text-center
.modal-body h3(style='margin-bottom:0')=env.t('modalAchievement')
p +achievementAvatar('wolf',0)
.achievement.achievement-wolf p=env.t('mountAchievement')
=env.t('mountAchievement') br
.modal-footer button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
button.btn.btn-default(ng-click='$close()')=env.t('ok') +achievementFooter
// Triad Bingo // Triad Bingo
script(id='modals/achievements/triadBingo.html', type='text/ng-template') script(id='modals/achievements/triadBingo.html', type='text/ng-template')
.modal-header .modal-content(style='min-width:28em')
h4=env.t('modalAchievement') .modal-body.text-center
.modal-body h3(style='margin-bottom:0')=env.t('modalAchievement')
p +achievementAvatar('triadbingo',0)
.achievement.achievement-triadbingo p=env.t('triadBingoAchievement')
=env.t('triadBingoAchievement') br
.modal-footer button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
button.btn.btn-default(ng-click='$close()')=env.t('ok') +achievementFooter
// Contributor // Contributor
// activated by user.flags.contributor // activated by user.flags.contributor
script(id='modals/achievements/contributor.html', type='text/ng-template') script(id='modals/achievements/contributor.html', type='text/ng-template')
.modal-header .modal-content(style='min-width:28em')
h4=env.t('modalContribAchievement') .modal-body.text-center
.modal-body h3(style='margin-bottom:0')=env.t('modalContribAchievement')
div(class="#{env.worldDmg.guide ? 'npc_justin_broken.float-left' : 'npc_justin.float-left'}") +achievementAvatar('boot',0)
p
!=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' ' !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' '
a(href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink') a(href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')
.modal-footer br
button.btn.btn-default(ng-click='set({"flags.contributor":false}); $close()')=env.t('ok') button.btn.btn-primary(style='margin-top:1em' ng-click='set({"flags.contributor":false}); $close()')=env.t('huzzah')
+achievementFooter
//Rebirth //Rebirth
script(id='modals/achievements/rebirth.html', type='text/ng-template') script(id='modals/achievements/rebirth.html', type='text/ng-template')
.modal-header .modal-content(style='min-width:28em')
h4=env.t('modalAchievement') .modal-body.text-center
.modal-body h3(style='margin-bottom:0')=env.t('modalAchievement')
.achievement.achievement-sun +achievementAvatar('sun',0)
div(ng-if='user.achievements.rebirthLevel < 100') div(ng-if='user.achievements.rebirthLevel < 100')
=env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"}) =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
div(ng-if='user.achievements.rebirthLevel >= 100') div(ng-if='user.achievements.rebirthLevel >= 100')
=env.t('rebirthAchievement100', {number: "{{user.achievements.rebirths}}"}) =env.t('rebirthAchievement100', {number: "{{user.achievements.rebirths}}"})
.modal-footer br
button.btn.btn-default(ng-click='$close()')=env.t('ok') button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+achievementFooter