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

fix(pets): Eggy eggy feed

Browse Source
This commit is contained in:
Sabe Jones
2015-03-25 22:01:42 -05:00
parent 54778a5d0c
commit 77cc05a668
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/script/index.coffee
View File

@@ -682,7 +682,7 @@ api.wrap = (user, main=true) ->
return cb?({code:404, message:i18n.t('messagePetNotFound', req.language)}) unless userPets[pet] return cb?({code:404, message:i18n.t('messagePetNotFound', req.language)}) unless userPets[pet]
return cb?({code:404, message:i18n.t('messageFoodNotFound', req.language)}) unless user.items.food?[food.key] return cb?({code:404, message:i18n.t('messageFoodNotFound', req.language)}) unless user.items.food?[food.key]
return cb?({code:401, message:i18n.t('messageCannotFeedPet', req.language)}) if content.specialPets[pet] or (egg is "Egg") return cb?({code:401, message:i18n.t('messageCannotFeedPet', req.language)}) if content.specialPets[pet]
return cb?({code:401, message:i18n.t('messageAlreadyMount', req.language)}) if user.items.mounts[pet] return cb?({code:401, message:i18n.t('messageAlreadyMount', req.language)}) if user.items.mounts[pet]
message = '' message = ''

5
website/public/js/controllers/footerCtrl.js
View File

@@ -115,10 +115,5 @@ function($scope, $rootScope, User, $http, Notification, ApiUrl) {
'party.quest.progress.up': User.user.party.quest.progress.up + 1000 'party.quest.progress.up': User.user.party.quest.progress.up + 1000
}); });
} }
$scope.addCollectQuestProgress = function(){
User.set({
'party.quest.progress.collect.plainEgg': User.user.party.quest.progress.collect.plainEgg + 100
});
}
} }
}]) }])

2
website/views/options/inventory/stable.jade
View File

@@ -7,7 +7,7 @@ mixin petList(source)
- pet = egg.key+"-"+potion.key - pet = egg.key+"-"+potion.key
div(popover-trigger='mouseenter', popover=env.t('petName', {potion: potion.text(env.language.code), egg: egg.text(env.language.code)}), popover-placement='bottom') div(popover-trigger='mouseenter', popover=env.t('petName', {potion: potion.text(env.language.code), egg: egg.text(env.language.code)}), popover-placement='bottom')
button(class="pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]>0', ng-class='{active: user.items.currentPet == "#{pet}", selectableInventory: #{!egg.noMount} && selectedFood && !user.items.mounts["#{pet}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")') button(class="pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]>0', ng-class='{active: user.items.currentPet == "#{pet}", selectableInventory: #{!egg.noMount} && selectedFood && !user.items.mounts["#{pet}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")')
.progress(ng-show='!user.items.mounts["#{pet}"] && "#{egg.key}"!="Egg"') .progress(ng-show='!user.items.mounts["#{pet}"])
.progress-bar.progress-bar-success(style='width:{{user.items.pets["#{pet}"]/.5}}%') .progress-bar.progress-bar-success(style='width:{{user.items.pets["#{pet}"]/.5}}%')
button(class="pet-button pet-not-owned", ng-if='!user.items.pets["#{pet}"]') button(class="pet-button pet-not-owned", ng-if='!user.items.pets["#{pet}"]')
.PixelPaw .PixelPaw

1
website/views/shared/footer.jade
View File

@@ -85,7 +85,6 @@ footer.footer(ng-controller='FooterCtrl')
a.btn.btn-default(ng-click='addLevelsAndGold()') +Exp +GP +MP a.btn.btn-default(ng-click='addLevelsAndGold()') +Exp +GP +MP
a.btn.btn-default(ng-click='addOneLevel()') +1 Level a.btn.btn-default(ng-click='addOneLevel()') +1 Level
a.btn.btn-default(ng-click='addBossQuestProgressUp()') +1000 Boss Quest Progress Up a.btn.btn-default(ng-click='addBossQuestProgressUp()') +1000 Boss Quest Progress Up
a.btn.btn-default(ng-click='addCollectQuestProgress()') +100 Collect Quest Progress
div(ng-init='deferredScripts()') div(ng-init='deferredScripts()')