diff --git a/website/assets/img/project_files/npcs/valentine/npc_bailey.png b/website/assets/img/project_files/npcs/valentine/npc_bailey.png index a2b1ec3914..4957f1a3f9 100644 Binary files a/website/assets/img/project_files/npcs/valentine/npc_bailey.png and b/website/assets/img/project_files/npcs/valentine/npc_bailey.png differ diff --git a/website/assets/img/project_files/npcs/valentine/npc_daniel.png b/website/assets/img/project_files/npcs/valentine/npc_daniel.png new file mode 100644 index 0000000000..c669f2e7de Binary files /dev/null and b/website/assets/img/project_files/npcs/valentine/npc_daniel.png differ diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-1.css b/website/assets/sprites/dist/spritesmith-largeSprites-1.css index 5b316030c3..c1dc4bceab 100644 --- a/website/assets/sprites/dist/spritesmith-largeSprites-1.css +++ b/website/assets/sprites/dist/spritesmith-largeSprites-1.css @@ -1,6 +1,6 @@ .promo_summer_classes_2015 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -660px; + background-position: -853px -717px; width: 300px; height: 88px; } @@ -12,7 +12,7 @@ } .promo_takeThis_gear { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1214px -569px; + background-position: -723px -239px; width: 114px; height: 87px; } @@ -30,37 +30,43 @@ } .promo_turkey_day_2016 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -141px -365px; + background-position: 0px -365px; width: 140px; height: 441px; } .promo_unconventional_armor { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1257px -367px; + background-position: -1251px -515px; width: 60px; height: 60px; } .promo_unconventional_armor2 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1257px -292px; + background-position: -1251px -440px; width: 70px; height: 74px; } .promo_updos { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1100px -292px; + background-position: -1163px -292px; width: 156px; height: 147px; } +.promo_valentines { + background-image: url(/static/sprites/spritesmith-largeSprites-1.png); + background-position: -853px -292px; + width: 309px; + height: 147px; +} .promo_veteran_pets { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1154px -660px; + background-position: -1154px -717px; width: 146px; height: 75px; } .promo_winter_classes_2016 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -569px; + background-position: -452px -332px; width: 360px; height: 90px; } @@ -72,31 +78,31 @@ } .promo_winter_fireworks { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -452px -483px; + background-position: -603px -423px; width: 138px; height: 147px; } .promo_winterclasses2015 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -458px; + background-position: -853px -606px; width: 325px; height: 110px; } .promo_wintery_skins { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: 0px -365px; + background-position: -141px -365px; width: 140px; height: 441px; } .customize-option.promo_wintery_skins { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -25px -380px; + background-position: -166px -380px; width: 60px; height: 60px; } .promo_winteryhair { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1179px -458px; + background-position: -1179px -606px; width: 152px; height: 75px; } @@ -108,7 +114,7 @@ } .npc_viirus { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -723px -239px; + background-position: -742px -423px; width: 108px; height: 90px; } @@ -120,13 +126,13 @@ } .scene_coding { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -603px -332px; + background-position: -1100px -440px; width: 150px; height: 150px; } .scene_phone_peek { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -452px -332px; + background-position: -452px -423px; width: 150px; height: 150px; } @@ -144,7 +150,7 @@ } .welcome_sample_tasks { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -292px; + background-position: -853px -440px; width: 246px; height: 165px; } diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-1.png b/website/assets/sprites/dist/spritesmith-largeSprites-1.png index 6faf8965ff..9c82a5f141 100644 Binary files a/website/assets/sprites/dist/spritesmith-largeSprites-1.png and b/website/assets/sprites/dist/spritesmith-largeSprites-1.png differ diff --git a/website/assets/sprites/dist/spritesmith-main-7.css b/website/assets/sprites/dist/spritesmith-main-7.css index 18d167c501..e185edcd4c 100644 --- a/website/assets/sprites/dist/spritesmith-main-7.css +++ b/website/assets/sprites/dist/spritesmith-main-7.css @@ -768,7 +768,7 @@ } .shop_weapon_special_lunarScythe { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1635px -1563px; + background-position: -1638px -1563px; width: 40px; height: 40px; } @@ -1104,7 +1104,7 @@ } .GrimReaper { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -516px -1563px; + background-position: -519px -1563px; width: 57px; height: 66px; } @@ -1134,13 +1134,13 @@ } .PixelPaw { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1335px -1563px; + background-position: -1338px -1563px; width: 51px; height: 51px; } .PixelPaw002 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1387px -1563px; + background-position: -1390px -1563px; width: 51px; height: 51px; } @@ -1170,7 +1170,7 @@ } .empty_bottles { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -574px -1563px; + background-position: -577px -1563px; width: 64px; height: 54px; } @@ -1218,7 +1218,7 @@ } .inventory_present_06 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1439px -1563px; + background-position: -1442px -1563px; width: 48px; height: 51px; } @@ -1236,19 +1236,19 @@ } .inventory_present_09 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1586px -1563px; + background-position: -1589px -1563px; width: 48px; height: 51px; } .inventory_present_10 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1537px -1563px; + background-position: -1540px -1563px; width: 48px; height: 51px; } .inventory_present_11 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1488px -1563px; + background-position: -1491px -1563px; width: 48px; height: 51px; } @@ -1272,25 +1272,25 @@ } .inventory_special_birthday { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1277px -1563px; + background-position: -1280px -1563px; width: 57px; height: 54px; } .inventory_special_fortify { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -697px -1563px; + background-position: -700px -1563px; width: 57px; height: 54px; } .inventory_special_greeting { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1161px -1563px; + background-position: -1164px -1563px; width: 57px; height: 54px; } .inventory_special_nye { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1103px -1563px; + background-position: -1106px -1563px; width: 57px; height: 54px; } @@ -1302,31 +1302,31 @@ } .inventory_special_seafoam { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1045px -1563px; + background-position: -1048px -1563px; width: 57px; height: 54px; } .inventory_special_shinySeed { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -987px -1563px; + background-position: -990px -1563px; width: 57px; height: 54px; } .inventory_special_snowball { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -929px -1563px; + background-position: -932px -1563px; width: 57px; height: 54px; } .inventory_special_spookySparkles { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -871px -1563px; + background-position: -874px -1563px; width: 57px; height: 54px; } .inventory_special_thankyou { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -813px -1563px; + background-position: -816px -1563px; width: 57px; height: 54px; } @@ -1338,7 +1338,7 @@ } .inventory_special_valentine { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -755px -1563px; + background-position: -758px -1563px; width: 57px; height: 54px; } @@ -1350,13 +1350,13 @@ } .pet_key { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -639px -1563px; + background-position: -642px -1563px; width: 57px; height: 54px; } .rebirth_orb { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1219px -1563px; + background-position: -1222px -1563px; width: 57px; height: 54px; } @@ -1405,8 +1405,8 @@ .npc_bailey { background-image: url(/static/sprites/spritesmith-main-7.png); background-position: -455px -1563px; - width: 60px; - height: 72px; + width: 63px; + height: 66px; } .npc_daniel { background-image: url(/static/sprites/spritesmith-main-7.png); diff --git a/website/assets/sprites/dist/spritesmith-main-7.png b/website/assets/sprites/dist/spritesmith-main-7.png index 8ae17dffd8..6a16497fda 100644 Binary files a/website/assets/sprites/dist/spritesmith-main-7.png and b/website/assets/sprites/dist/spritesmith-main-7.png differ diff --git a/website/assets/sprites/spritesmith/npcs/npc_bailey.png b/website/assets/sprites/spritesmith/npcs/npc_bailey.png index d5940b986b..4957f1a3f9 100644 Binary files a/website/assets/sprites/spritesmith/npcs/npc_bailey.png and b/website/assets/sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/website/assets/sprites/spritesmith/npcs/npc_daniel.png b/website/assets/sprites/spritesmith/npcs/npc_daniel.png index b12dd9e254..c669f2e7de 100644 Binary files a/website/assets/sprites/spritesmith/npcs/npc_daniel.png and b/website/assets/sprites/spritesmith/npcs/npc_daniel.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_valentines.png b/website/assets/sprites/spritesmith_large/promo/promo_valentines.png new file mode 100644 index 0000000000..d65128389a Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_valentines.png differ diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-1.css b/website/client/assets/css/sprites/spritesmith-largeSprites-1.css index 5b316030c3..c1dc4bceab 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-1.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-1.css @@ -1,6 +1,6 @@ .promo_summer_classes_2015 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -660px; + background-position: -853px -717px; width: 300px; height: 88px; } @@ -12,7 +12,7 @@ } .promo_takeThis_gear { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1214px -569px; + background-position: -723px -239px; width: 114px; height: 87px; } @@ -30,37 +30,43 @@ } .promo_turkey_day_2016 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -141px -365px; + background-position: 0px -365px; width: 140px; height: 441px; } .promo_unconventional_armor { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1257px -367px; + background-position: -1251px -515px; width: 60px; height: 60px; } .promo_unconventional_armor2 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1257px -292px; + background-position: -1251px -440px; width: 70px; height: 74px; } .promo_updos { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1100px -292px; + background-position: -1163px -292px; width: 156px; height: 147px; } +.promo_valentines { + background-image: url(/static/sprites/spritesmith-largeSprites-1.png); + background-position: -853px -292px; + width: 309px; + height: 147px; +} .promo_veteran_pets { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1154px -660px; + background-position: -1154px -717px; width: 146px; height: 75px; } .promo_winter_classes_2016 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -569px; + background-position: -452px -332px; width: 360px; height: 90px; } @@ -72,31 +78,31 @@ } .promo_winter_fireworks { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -452px -483px; + background-position: -603px -423px; width: 138px; height: 147px; } .promo_winterclasses2015 { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -458px; + background-position: -853px -606px; width: 325px; height: 110px; } .promo_wintery_skins { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: 0px -365px; + background-position: -141px -365px; width: 140px; height: 441px; } .customize-option.promo_wintery_skins { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -25px -380px; + background-position: -166px -380px; width: 60px; height: 60px; } .promo_winteryhair { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -1179px -458px; + background-position: -1179px -606px; width: 152px; height: 75px; } @@ -108,7 +114,7 @@ } .npc_viirus { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -723px -239px; + background-position: -742px -423px; width: 108px; height: 90px; } @@ -120,13 +126,13 @@ } .scene_coding { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -603px -332px; + background-position: -1100px -440px; width: 150px; height: 150px; } .scene_phone_peek { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -452px -332px; + background-position: -452px -423px; width: 150px; height: 150px; } @@ -144,7 +150,7 @@ } .welcome_sample_tasks { background-image: url(/static/sprites/spritesmith-largeSprites-1.png); - background-position: -853px -292px; + background-position: -853px -440px; width: 246px; height: 165px; } diff --git a/website/client/assets/css/sprites/spritesmith-main-7.css b/website/client/assets/css/sprites/spritesmith-main-7.css index 18d167c501..e185edcd4c 100644 --- a/website/client/assets/css/sprites/spritesmith-main-7.css +++ b/website/client/assets/css/sprites/spritesmith-main-7.css @@ -768,7 +768,7 @@ } .shop_weapon_special_lunarScythe { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1635px -1563px; + background-position: -1638px -1563px; width: 40px; height: 40px; } @@ -1104,7 +1104,7 @@ } .GrimReaper { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -516px -1563px; + background-position: -519px -1563px; width: 57px; height: 66px; } @@ -1134,13 +1134,13 @@ } .PixelPaw { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1335px -1563px; + background-position: -1338px -1563px; width: 51px; height: 51px; } .PixelPaw002 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1387px -1563px; + background-position: -1390px -1563px; width: 51px; height: 51px; } @@ -1170,7 +1170,7 @@ } .empty_bottles { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -574px -1563px; + background-position: -577px -1563px; width: 64px; height: 54px; } @@ -1218,7 +1218,7 @@ } .inventory_present_06 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1439px -1563px; + background-position: -1442px -1563px; width: 48px; height: 51px; } @@ -1236,19 +1236,19 @@ } .inventory_present_09 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1586px -1563px; + background-position: -1589px -1563px; width: 48px; height: 51px; } .inventory_present_10 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1537px -1563px; + background-position: -1540px -1563px; width: 48px; height: 51px; } .inventory_present_11 { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1488px -1563px; + background-position: -1491px -1563px; width: 48px; height: 51px; } @@ -1272,25 +1272,25 @@ } .inventory_special_birthday { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1277px -1563px; + background-position: -1280px -1563px; width: 57px; height: 54px; } .inventory_special_fortify { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -697px -1563px; + background-position: -700px -1563px; width: 57px; height: 54px; } .inventory_special_greeting { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1161px -1563px; + background-position: -1164px -1563px; width: 57px; height: 54px; } .inventory_special_nye { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1103px -1563px; + background-position: -1106px -1563px; width: 57px; height: 54px; } @@ -1302,31 +1302,31 @@ } .inventory_special_seafoam { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1045px -1563px; + background-position: -1048px -1563px; width: 57px; height: 54px; } .inventory_special_shinySeed { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -987px -1563px; + background-position: -990px -1563px; width: 57px; height: 54px; } .inventory_special_snowball { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -929px -1563px; + background-position: -932px -1563px; width: 57px; height: 54px; } .inventory_special_spookySparkles { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -871px -1563px; + background-position: -874px -1563px; width: 57px; height: 54px; } .inventory_special_thankyou { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -813px -1563px; + background-position: -816px -1563px; width: 57px; height: 54px; } @@ -1338,7 +1338,7 @@ } .inventory_special_valentine { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -755px -1563px; + background-position: -758px -1563px; width: 57px; height: 54px; } @@ -1350,13 +1350,13 @@ } .pet_key { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -639px -1563px; + background-position: -642px -1563px; width: 57px; height: 54px; } .rebirth_orb { background-image: url(/static/sprites/spritesmith-main-7.png); - background-position: -1219px -1563px; + background-position: -1222px -1563px; width: 57px; height: 54px; } @@ -1405,8 +1405,8 @@ .npc_bailey { background-image: url(/static/sprites/spritesmith-main-7.png); background-position: -455px -1563px; - width: 60px; - height: 72px; + width: 63px; + height: 66px; } .npc_daniel { background-image: url(/static/sprites/spritesmith-main-7.png); diff --git a/website/static/sprites/spritesmith-largeSprites-1.png b/website/static/sprites/spritesmith-largeSprites-1.png index 6faf8965ff..9c82a5f141 100644 Binary files a/website/static/sprites/spritesmith-largeSprites-1.png and b/website/static/sprites/spritesmith-largeSprites-1.png differ diff --git a/website/static/sprites/spritesmith-main-7.png b/website/static/sprites/spritesmith-main-7.png index 8ae17dffd8..6a16497fda 100644 Binary files a/website/static/sprites/spritesmith-main-7.png and b/website/static/sprites/spritesmith-main-7.png differ diff --git a/website/views/options/inventory/drops.jade b/website/views/options/inventory/drops.jade index a0716bf0e2..85f591ec7e 100644 --- a/website/views/options/inventory/drops.jade +++ b/website/views/options/inventory/drops.jade @@ -159,7 +159,7 @@ p | 20  span.shop_gold - div(ng-repeat='type in Content.cardTypes', ng-show='type.yearRound') + div(ng-repeat='type in Content.cardTypes', ng-show='type.yearRound || type.key === "valentine"') button.customize-option(class='inventory_special_{{::type.key}}', popover='{{::Content.spells.special[type.key].notes()}}', popover-title='{{::Content.spells.special[type.key].text()}}', diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index b24a041ba0..8418f399ef 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,25 +1,34 @@ -h2 2/8/2017 - HABITICA BLOG: WIKI AND USE CASE SPOTLIGHTS +h2 2/14/2017 - HAPPY VALENTINE'S DAY! hr tr td - .promo_task_planning.pull-left.slight-right-margin - h3 Featured Wiki Article: Establishing Your Tasks - p This month's featured Wiki article is about Establishing your Tasks! We hope that it will help you as you create new Tasks and re-evaluate existing ones. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook. - p.small.muted by beffymaroo and the Wiki Wizards - tr - td - .promo_cooking.pull-right - h3 Use Case Spotlight: Food and Cooking - p This month's Use Case Spotlight is about Food and Cooking! It features a number of great suggestions submitted by Habiticans in the Use Case Spotlights Guild. We hope it helps any of you who might be re-evaluating your nutritional habits and routines. + .promo_valentines.center-block + h3 Valentine's Day in Habitica! + p Help motivate all of the lovely people in your life by sending them a caring valentine. For the next week only, Valentines can be purchased for 10 gold from the Market. For spreading love and joy throughout the community, both the giver AND the receiver get a coveted "adoring friends" badge. Hooray! br - p Plus, we're collecting user submissions for the next spotlight! How do you use Habitica to live more eco-friendly? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog at the start of next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done! - p.small.muted by Beffymaroo + p While you're there, why not check out the other cards that are available to send to your party? Each one gives a special achievement of its own... + p.small.muted By Lemoness and SabreCat if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 2/8/2017 - HABITICA BLOG: WIKI AND USE CASE SPOTLIGHTS + tr + td + .promo_task_planning.pull-left.slight-right-margin + h3 Featured Wiki Article: Establishing Your Tasks + p This month's featured Wiki article is about Establishing your Tasks! We hope that it will help you as you create new Tasks and re-evaluate existing ones. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook. + p.small.muted by beffymaroo and the Wiki Wizards + tr + td + .promo_cooking.pull-right + h3 Use Case Spotlight: Food and Cooking + p This month's Use Case Spotlight is about Food and Cooking! It features a number of great suggestions submitted by Habiticans in the Use Case Spotlights Guild. We hope it helps any of you who might be re-evaluating your nutritional habits and routines. + br + p Plus, we're collecting user submissions for the next spotlight! How do you use Habitica to live more eco-friendly? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog at the start of next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done! + p.small.muted by Beffymaroo h2 2/2/2017 - CUPID HATCHING POTIONS, SUBSCRIPTIONS ON ANDROID, NEW BACKGROUNDS, AND NEW ARMOIRE ITEMS tr td