From c6dd2a0d10735e02ee386e75be632fc679ee9ec6 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 15 Oct 2015 16:34:53 -0400 Subject: [PATCH] feat(modals): Hatch Pet modal Complete except for the planned addition of a heart sprite over the pet. --- .../spritesmith/misc/empty_bottles.png | Bin 0 -> 2979 bytes common/locales/en/pets.json | 4 ++++ .../public/js/controllers/inventoryCtrl.js | 2 ++ website/views/shared/modals/hatch-pet.jade | 20 ++++++++++++++++++ website/views/shared/modals/index.jade | 1 + 5 files changed, 27 insertions(+) create mode 100644 common/img/sprites/spritesmith/misc/empty_bottles.png create mode 100644 website/views/shared/modals/hatch-pet.jade diff --git a/common/img/sprites/spritesmith/misc/empty_bottles.png b/common/img/sprites/spritesmith/misc/empty_bottles.png new file mode 100644 index 0000000000000000000000000000000000000000..b7fb090f00cdec5261a24f2195fd331ab2ab8aab GIT binary patch literal 2979 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 Z0|2O8XU$ycL?r+K002ovPDHLkV1iFTdnEt> literal 0 HcmV?d00001 diff --git a/common/locales/en/pets.json b/common/locales/en/pets.json index 3dfd475547..f7aafa49d0 100644 --- a/common/locales/en/pets.json +++ b/common/locales/en/pets.json @@ -58,6 +58,10 @@ "firstDrop": "You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item, including eggs, potions, and food! You just found a <%= eggText %> Egg! <%= eggNotes %>", "useGems": "If you've got your eye on a pet, but can't wait any longer for it to drop, use Gems in Inventory > Market to buy one!", "hatchAPot": "Hatch a <%= potion %> <%= egg %>?", + "hatchedPet": "You hatched a <%= potion %> <%= egg %>!", + "displayNow": "Display Now", + "displayLater": "Display Later", + "earnedCompanion": "With all your productivity, you've earned a new companion. Feed it to make it grow!", "feedPet": "Feed <%= article %><%= text %> to your <%= name %>?", "useSaddle": "Saddle <%= pet %>?", "petName": "<%= potion %> <%= egg %>", diff --git a/website/public/js/controllers/inventoryCtrl.js b/website/public/js/controllers/inventoryCtrl.js index 8f683f8265..a7df7c8309 100644 --- a/website/public/js/controllers/inventoryCtrl.js +++ b/website/public/js/controllers/inventoryCtrl.js @@ -112,6 +112,8 @@ habitrpg.controller("InventoryCtrl", var potName = Content.hatchingPotions[potion.key].text(); if (!$window.confirm(window.env.t('hatchAPot', {potion: potName, egg: eggName}))) return; user.ops.hatch({params:{egg:egg.key, hatchingPotion:potion.key}}); + $rootScope.hatchedPet = {egg: eggName, potion: potName, pet: 'Pet-' + egg.key + '-' + potion.key}; + $rootScope.openModal('hatchPet', {controller: 'InventoryCtrl', size: 'sm'}); $scope.selectedEgg = null; $scope.selectedPotion = null; diff --git a/website/views/shared/modals/hatch-pet.jade b/website/views/shared/modals/hatch-pet.jade new file mode 100644 index 0000000000..54a3cb135f --- /dev/null +++ b/website/views/shared/modals/hatch-pet.jade @@ -0,0 +1,20 @@ +include ../avatar/generated_avatar + +script(type='text/ng-template', id='modals/hatchPet.html') + .modal-content(style='min-width:28em') + .modal-body.text-center + h3(style='margin-bottom: 0')=env.t('hatchedPet',{egg:'{{::hatchedPet.egg}}', potion:'{{::hatchedPet.potion}}'}) + .container-fluid + .row(style='margin-bottom:1em', ng-controller='UserCtrl') + .col-xs-4(style='padding:0') + div(class='{{::hatchedPet.pet}}').pull-right + .col-xs-3 + .empty_bottles(style='margin-top:2.8em') + .col-xs-5(style='padding:0') + .herobox(style='padding:0; width:0; height:0') + .character-sprites(style='width:0; margin-top:.5em') + +generatedAvatar + p=env.t('earnedCompanion') + .modal-footer(style='margin-top:0') + button.btn.btn-primary(ng-click='choosePet(hatchedPet.egg, hatchedPet.potion); $close()')=env.t('displayNow') + button.btn.btn-default(ng-click='$close()')=env.t('displayLater') diff --git a/website/views/shared/modals/index.jade b/website/views/shared/modals/index.jade index 688219e898..78658a0c18 100644 --- a/website/views/shared/modals/index.jade +++ b/website/views/shared/modals/index.jade @@ -15,6 +15,7 @@ include ./invite-friends include ./welcome.jade include ./low-health.jade include ./level-up.jade +include ./hatch-pet.jade //- Settings script(type='text/ng-template', id='modals/change-day-start.html')