diff --git a/public/img/sprites/PetEggs.css b/public/img/sprites/PetEggs.css index 818752b301..9927bb3531 100644 --- a/public/img/sprites/PetEggs.css +++ b/public/img/sprites/PetEggs.css @@ -1,4 +1,4 @@ -.Pet_Egg_Wolf, .Pet_Egg_TigerCub, .Pet_Egg_PolarBear, .Pet_Egg_PandaCub, .Pet_Egg_LionCub, .Pet_Egg_Fox, .Pet_Egg_FlyingPig, .Pet_Egg_Dragon, .Pet_Egg_Cactus, .Pet_Egg_BearCub, .Item_HatchingPotion_Basic, .Item_HatchingPotion_White, .Item_HatchingPotion_Desert, .Item_HatchingPotion_Red, .Item_HatchingPotion_Shade, .Item_HatchingPotion_Skeleton {background: url("/img/sprites/Egg_Sprite_Sheet.png") no-repeat} +.Pet_Egg_Wolf, .Pet_Egg_TigerCub, .Pet_Egg_PolarBear, .Pet_Egg_PandaCub, .Pet_Egg_LionCub, .Pet_Egg_Fox, .Pet_Egg_FlyingPig, .Pet_Egg_Dragon, .Pet_Egg_Cactus, .Pet_Egg_BearCub, .Pet_HatchingPotion_Base, .Pet_HatchingPotion_White, .Pet_HatchingPotion_Desert, .Pet_HatchingPotion_Red, .Pet_HatchingPotion_Shade, .Pet_HatchingPotion_Skeleton, .Pet_HatchingPotion_Zombie, .Pet_HatchingPotion_CottonCandyPink, .Pet_HatchingPotion_CottonCandyBlue, .Pet_HatchingPotion_Golden {background: url("/img/sprites/Egg_Sprite_Sheet.png") no-repeat} .Pet_Egg_Wolf {background-position: 0px 0px; width: 48px; height: 51px} .Pet_Egg_TigerCub {background-position: 0px -51px; width: 48px; height: 51px} .Pet_Egg_PolarBear {background-position: 0px -102px; width: 48px; height: 51px} @@ -9,9 +9,25 @@ .Pet_Egg_Dragon {background-position: 0px -357px; width: 48px; height: 51px} .Pet_Egg_Cactus {background-position: 0px -408px; width: 48px; height: 51px} .Pet_Egg_BearCub {background-position: 0px -459px; width: 48px; height: 51px} -.Item_HatchingPotion_Basic {background-position: -48px -0px; width: 48px; height: 51px} -.Item_HatchingPotion_White {background-position: -48px -51px; width: 48px; height: 51px} -.Item_HatchingPotion_Desert {background-position: -48px -102px; width: 48px; height: 51px} -.Item_HatchingPotion_Red {background-position: -48px -153px; width: 48px; height: 51px} -.Item_HatchingPotion_Shade {background-position: -48px -204px; width: 48px; height: 51px} -.Item_HatchingPotion_Skeleton {background-position: -48px -255px; width: 48px; height: 51px} + +.Pet_HatchingPotion_Base {background-position: -48px -0px; width: 48px; height: 51px} +.Pet_HatchingPotion_White {background-position: -48px -51px; width: 48px; height: 51px} +.Pet_HatchingPotion_Desert {background-position: -48px -102px; width: 48px; height: 51px} +.Pet_HatchingPotion_Red {background-position: -48px -153px; width: 48px; height: 51px} +.Pet_HatchingPotion_Shade {background-position: -48px -204px; width: 48px; height: 51px} +.Pet_HatchingPotion_Skeleton {background-position: -48px -255px; width: 48px; height: 51px} + +/* Temporary until we get the other hatching potions */ +.Pet_HatchingPotion_Zombie, .Pet_HatchingPotion_CottonCandyPink, .Pet_HatchingPotion_CottonCandyBlue, .Pet_HatchingPotion_Golden {background-position: -48px -0px; width: 48px; height: 51px} +.Pet_HatchingPotion_Zombie { + -webkit-filter: invert(1); +} +.Pet_HatchingPotion_CottonCandyPink { + -webkit-filter: hue-rotate(120deg); +} +.Pet_HatchingPotion_CottonCandyBlue { + -webkit-filter: saturate(3); +} +.Pet_HatchingPotion_Golden { + -webkit-filter: hue-rotate(220deg); +} diff --git a/src/app/items.coffee b/src/app/items.coffee index 0a0ee7aa70..3b7b1ab7ef 100644 --- a/src/app/items.coffee +++ b/src/app/items.coffee @@ -67,7 +67,7 @@ items = module.exports.items = _.each ['weapon', 'armor', 'head', 'shield'], (key) -> _.each items[key], (item) -> item.type = key -_.each items.pets, (pet) -> pet.notes = 'Find some Hatching Powder to sprinkle on this egg, and one day it will hatch into a loyal pet.' +_.each items.pets, (pet) -> pet.notes = 'Find some Hatching Potion to sprinkle on this egg, and one day it will hatch into a loyal pet.' _.each items.food, (food) -> food.notes = "Sprinkle this on an egg, and it will hatch as a #{food.text} pet." ### diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index 1877f34266..709d861d75 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -65,8 +65,8 @@ randomDrop = (model, delta) -> acceptableDrops = _.filter(food, (foodItem) -> foodItem.name in acceptableDrops) drop = randomVal acceptableDrops user.push 'items.food', drop.name - drop.type = 'Food' - drop.dialog = "You've found #{drop.text} Hatching Powder! #{drop.notes}" + drop.type = 'HatchingPotion' + drop.dialog = "You've found a #{drop.text} Hatching Potion! #{drop.notes}" model.set '_drop', drop $('#item-dropped-modal').modal 'show' diff --git a/views/app/avatar.html b/views/app/avatar.html index 0755694ff2..10896ed24c 100644 --- a/views/app/avatar.html +++ b/views/app/avatar.html @@ -249,7 +249,7 @@ {/} -

Hatching Powder

+

Hatching Potions

{#with _view.items.food as :food} diff --git a/views/app/pets.html b/views/app/pets.html index 173f43c899..e1e486423b 100644 --- a/views/app/pets.html +++ b/views/app/pets.html @@ -23,7 +23,7 @@ @@ -52,12 +52,12 @@
  • {#if not(_user.items.food)} -

    You don't have any hatching powder yet.

    +

    You don't have any hatching potions yet.

    {/if} - + {#each _user.items.food as :food}
    - +

    {:food}

    {/each} @@ -69,7 +69,7 @@

    Hatch Your Egg

    {#if not(_user.items.food)} -

    You don't have any hatching powder yet.

    +

    You don't have any hatching potions yet.

    {else}

    What would you like to sprinkle on your {_feedEgg.text} egg?

  • -
    +
    {.text}