diff --git a/common/script/index.coffee b/common/script/index.coffee index ab1e23904b..56253d0706 100644 --- a/common/script/index.coffee +++ b/common/script/index.coffee @@ -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('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] message = '' diff --git a/website/public/js/controllers/footerCtrl.js b/website/public/js/controllers/footerCtrl.js index 356d00ccf7..8d15d4690c 100644 --- a/website/public/js/controllers/footerCtrl.js +++ b/website/public/js/controllers/footerCtrl.js @@ -115,10 +115,5 @@ function($scope, $rootScope, User, $http, Notification, ApiUrl) { '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 - }); - } } }]) diff --git a/website/views/options/inventory/stable.jade b/website/views/options/inventory/stable.jade index 27bc3f8ef0..69b8af5739 100644 --- a/website/views/options/inventory/stable.jade +++ b/website/views/options/inventory/stable.jade @@ -7,7 +7,7 @@ mixin petList(source) - 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') 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}}%') button(class="pet-button pet-not-owned", ng-if='!user.items.pets["#{pet}"]') .PixelPaw diff --git a/website/views/shared/footer.jade b/website/views/shared/footer.jade index cac84bbce1..caacfd09f4 100644 --- a/website/views/shared/footer.jade +++ b/website/views/shared/footer.jade @@ -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='addOneLevel()') +1 Level 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()')