diff --git a/package-lock.json b/package-lock.json index 83b2f35162..01de0224e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.13.4", + "version": "4.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 34f8fa9316..41b6fffcd9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.13.4", + "version": "4.14.0", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", diff --git a/test/api/v3/unit/libs/payments.test.js b/test/api/v3/unit/libs/payments.test.js index fbe82377ac..058f312125 100644 --- a/test/api/v3/unit/libs/payments.test.js +++ b/test/api/v3/unit/libs/payments.test.js @@ -191,7 +191,7 @@ describe('payments/index', () => { await api.createSubscription(data); let msg = '\`Hello recipient, sender has sent you 3 months of subscription!\`'; - expect(user.sendMessage).to.be.calledOnce; + expect(user.sendMessage).to.be.calledTwice; expect(user.sendMessage).to.be.calledWith(recipient, { receiverMsg: msg, senderMsg: msg }); }); @@ -229,6 +229,77 @@ describe('payments/index', () => { }, }); }); + + context('Winter 2017-18 Gift-1-Get-1 Promotion', async () => { + it('creates a gift subscription for purchaser and recipient if none exist', async () => { + await api.createSubscription(data); + + expect(user.items.pets['Jackalope-RoyalPurple']).to.eql(5); + expect(user.purchased.plan.customerId).to.eql('Gift'); + expect(user.purchased.plan.dateTerminated).to.exist; + expect(user.purchased.plan.dateUpdated).to.exist; + expect(user.purchased.plan.dateCreated).to.exist; + + expect(recipient.items.pets['Jackalope-RoyalPurple']).to.eql(5); + expect(recipient.purchased.plan.customerId).to.eql('Gift'); + expect(recipient.purchased.plan.dateTerminated).to.exist; + expect(recipient.purchased.plan.dateUpdated).to.exist; + expect(recipient.purchased.plan.dateCreated).to.exist; + }); + + it('adds extraMonths to existing subscription for purchaser and creates a gift subscription for recipient without sub', async () => { + user.purchased.plan = plan; + + expect(user.purchased.plan.extraMonths).to.eql(0); + + await api.createSubscription(data); + + expect(user.purchased.plan.extraMonths).to.eql(3); + + expect(recipient.items.pets['Jackalope-RoyalPurple']).to.eql(5); + expect(recipient.purchased.plan.customerId).to.eql('Gift'); + expect(recipient.purchased.plan.dateTerminated).to.exist; + expect(recipient.purchased.plan.dateUpdated).to.exist; + expect(recipient.purchased.plan.dateCreated).to.exist; + }); + + it('adds extraMonths to existing subscription for recipient and creates a gift subscription for purchaser without sub', async () => { + recipient.purchased.plan = plan; + + expect(recipient.purchased.plan.extraMonths).to.eql(0); + + await api.createSubscription(data); + + expect(recipient.purchased.plan.extraMonths).to.eql(3); + + expect(user.items.pets['Jackalope-RoyalPurple']).to.eql(5); + expect(user.purchased.plan.customerId).to.eql('Gift'); + expect(user.purchased.plan.dateTerminated).to.exist; + expect(user.purchased.plan.dateUpdated).to.exist; + expect(user.purchased.plan.dateCreated).to.exist; + }); + + it('adds extraMonths to existing subscriptions for purchaser and recipient', async () => { + user.purchased.plan = plan; + recipient.purchased.plan = plan; + + expect(user.purchased.plan.extraMonths).to.eql(0); + expect(recipient.purchased.plan.extraMonths).to.eql(0); + + await api.createSubscription(data); + + expect(user.purchased.plan.extraMonths).to.eql(3); + expect(recipient.purchased.plan.extraMonths).to.eql(3); + }); + + it('sends a private message about the promotion', async () => { + await api.createSubscription(data); + let msg = '\`Hello sender, you received 3 months of subscription as part of our holiday gift-giving promotion!\`'; + + expect(user.sendMessage).to.be.calledTwice; + expect(user.sendMessage).to.be.calledWith(user, { senderMsg: msg }); + }); + }); }); context('Purchasing a subscription for self', () => { diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index bc6e77dc53..e8cab0d619 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,12 +1,30 @@ .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -437px 0px; + background-position: -741px -442px; width: 114px; height: 87px; } -.scene_calendar { +.promo_winter_quests { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -741px 0px; + width: 141px; + height: 441px; +} +.promo_winter_retreat { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: 0px 0px; + width: 740px; + height: 309px; +} +.promo_winter_subscriptions { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -437px -310px; + width: 237px; + height: 150px; +} +.scene_calendar { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px -310px; width: 436px; height: 368px; } diff --git a/website/client/assets/css/sprites/spritesmith-main-10.css b/website/client/assets/css/sprites/spritesmith-main-10.css index f15179ddd6..2f5f91f71c 100644 --- a/website/client/assets/css/sprites/spritesmith-main-10.css +++ b/website/client/assets/css/sprites/spritesmith-main-10.css @@ -1042,102 +1042,108 @@ width: 68px; height: 68px; } -.quest_bundle_witchyFamiliars { +.quest_bundle_winterQuests { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1035px -1603px; width: 68px; height: 68px; } -.shop_gem { +.quest_bundle_witchyFamiliars { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1104px -1603px; width: 68px; height: 68px; } -.shop_opaquePotion { +.shop_gem { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1173px -1603px; width: 68px; height: 68px; } -.shop_potion { +.shop_opaquePotion { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1242px -1603px; width: 68px; height: 68px; } -.shop_seafoam { +.shop_potion { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1311px -1603px; width: 68px; height: 68px; } -.shop_shinySeed { +.shop_seafoam { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1380px -1603px; width: 68px; height: 68px; } -.shop_snowball { +.shop_shinySeed { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1449px -1603px; width: 68px; height: 68px; } -.shop_spookySparkles { +.shop_snowball { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1518px -1603px; width: 68px; height: 68px; } -.shop_mounts_MagicalBee-Base { +.shop_spookySparkles { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1587px -1603px; width: 68px; height: 68px; } -.shop_mounts_Mammoth-Base { +.shop_mounts_MagicalBee-Base { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1672px 0px; width: 68px; height: 68px; } -.shop_mounts_MantisShrimp-Base { +.shop_mounts_Mammoth-Base { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1672px -69px; width: 68px; height: 68px; } -.shop_mounts_Phoenix-Base { +.shop_mounts_MantisShrimp-Base { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1672px -138px; width: 68px; height: 68px; } -.shop_pets_MagicalBee-Base { +.shop_mounts_Phoenix-Base { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1672px -207px; width: 68px; height: 68px; } -.shop_pets_Mammoth-Base { +.shop_pets_MagicalBee-Base { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1672px -276px; width: 68px; height: 68px; } -.shop_pets_MantisShrimp-Base { +.shop_pets_Mammoth-Base { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1672px -345px; width: 68px; height: 68px; } -.shop_pets_Phoenix-Base { +.shop_pets_MantisShrimp-Base { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1672px -414px; width: 68px; height: 68px; } +.shop_pets_Phoenix-Base { + background-image: url('~assets/images/sprites/spritesmith-main-10.png'); + background-position: -1672px -483px; + width: 68px; + height: 68px; +} .shop_backStab { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1468px -1121px; @@ -1236,91 +1242,91 @@ } .Pet_Egg_Armadillo { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1672px -1587px; + background-position: 0px -1672px; width: 68px; height: 68px; } .Pet_Egg_Axolotl { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: 0px -1672px; + background-position: -69px -1672px; width: 68px; height: 68px; } .Pet_Egg_BearCub { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -69px -1672px; + background-position: -138px -1672px; width: 68px; height: 68px; } .Pet_Egg_Beetle { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -138px -1672px; + background-position: -207px -1672px; width: 68px; height: 68px; } .Pet_Egg_Bunny { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -207px -1672px; + background-position: -276px -1672px; width: 68px; height: 68px; } .Pet_Egg_Butterfly { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -276px -1672px; + background-position: -345px -1672px; width: 68px; height: 68px; } .Pet_Egg_Cactus { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -345px -1672px; + background-position: -414px -1672px; width: 68px; height: 68px; } .Pet_Egg_Cheetah { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -414px -1672px; + background-position: -483px -1672px; width: 68px; height: 68px; } .Pet_Egg_Cow { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -483px -1672px; + background-position: -552px -1672px; width: 68px; height: 68px; } .Pet_Egg_Cuttlefish { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -552px -1672px; + background-position: -621px -1672px; width: 68px; height: 68px; } .Pet_Egg_Deer { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -621px -1672px; + background-position: -690px -1672px; width: 68px; height: 68px; } .Pet_Egg_Dragon { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -690px -1672px; + background-position: -759px -1672px; width: 68px; height: 68px; } .Pet_Egg_Egg { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -759px -1672px; + background-position: -828px -1672px; width: 68px; height: 68px; } .Pet_Egg_Falcon { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -828px -1672px; + background-position: -897px -1672px; width: 68px; height: 68px; } .Pet_Egg_Ferret { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -897px -1672px; + background-position: -1672px -1587px; width: 68px; height: 68px; } @@ -1416,137 +1422,131 @@ } .Pet_Egg_Peacock { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1672px -483px; + background-position: -1534px -828px; width: 68px; height: 68px; } .Pet_Egg_Penguin { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1534px -828px; + background-position: -1148px -1354px; width: 68px; height: 68px; } .Pet_Egg_PolarBear { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1148px -1354px; + background-position: -1079px -1354px; width: 68px; height: 68px; } .Pet_Egg_Rat { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1079px -1354px; + background-position: -1010px -1354px; width: 68px; height: 68px; } .Pet_Egg_Rock { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1010px -1354px; + background-position: -941px -1354px; width: 68px; height: 68px; } .Pet_Egg_Rooster { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -941px -1354px; + background-position: -872px -1354px; width: 68px; height: 68px; } .Pet_Egg_Sabretooth { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -872px -1354px; + background-position: -803px -1354px; width: 68px; height: 68px; } .Pet_Egg_Seahorse { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -803px -1354px; + background-position: -734px -1354px; width: 68px; height: 68px; } .Pet_Egg_Sheep { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -734px -1354px; + background-position: -665px -1354px; width: 68px; height: 68px; } .Pet_Egg_Slime { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -665px -1354px; + background-position: -596px -1354px; width: 68px; height: 68px; } .Pet_Egg_Sloth { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -596px -1354px; + background-position: -527px -1354px; width: 68px; height: 68px; } .Pet_Egg_Snail { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -527px -1354px; + background-position: -458px -1354px; width: 68px; height: 68px; } .Pet_Egg_Snake { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -458px -1354px; + background-position: -389px -1354px; width: 68px; height: 68px; } .Pet_Egg_Spider { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -389px -1354px; + background-position: -320px -1354px; width: 68px; height: 68px; } .Pet_Egg_TRex { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1455px -1237px; + background-position: -1386px -1237px; width: 68px; height: 68px; } .Pet_Egg_TigerCub { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -320px -1354px; + background-position: -251px -1354px; width: 68px; height: 68px; } .Pet_Egg_Treeling { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -251px -1354px; + background-position: -1455px -1237px; width: 68px; height: 68px; } .Pet_Egg_Triceratops { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1386px -1237px; + background-position: -1317px -1237px; width: 68px; height: 68px; } .Pet_Egg_Turtle { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1317px -1237px; + background-position: -1455px -1168px; width: 68px; height: 68px; } .Pet_Egg_Unicorn { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1455px -1168px; + background-position: -1386px -1168px; width: 68px; height: 68px; } .Pet_Egg_Whale { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1386px -1168px; + background-position: -1317px -1168px; width: 68px; height: 68px; } .Pet_Egg_Wolf { - background-image: url('~assets/images/sprites/spritesmith-main-10.png'); - background-position: -1317px -1168px; - width: 68px; - height: 68px; -} -.Pet_Egg_Yarn { background-image: url('~assets/images/sprites/spritesmith-main-10.png'); background-position: -1104px -1534px; width: 68px; diff --git a/website/client/assets/css/sprites/spritesmith-main-11.css b/website/client/assets/css/sprites/spritesmith-main-11.css index 362ae39bd8..03dfe023f2 100644 --- a/website/client/assets/css/sprites/spritesmith-main-11.css +++ b/website/client/assets/css/sprites/spritesmith-main-11.css @@ -1,12 +1,18 @@ +.Pet_Egg_Yarn { + background-image: url('~assets/images/sprites/spritesmith-main-11.png'); + background-position: -1696px -1104px; + width: 68px; + height: 68px; +} .Pet_Food_Cake_Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1696px -1035px; + background-position: -705px -1547px; width: 68px; height: 68px; } .Pet_Food_Cake_CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -705px -1547px; + background-position: -1696px -1035px; width: 68px; height: 68px; } @@ -90,13 +96,13 @@ } .Pet_Food_Candy_Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1696px -69px; + background-position: -636px -1547px; width: 68px; height: 68px; } .Pet_Food_Candy_Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -1547px; + background-position: -1696px 0px; width: 68px; height: 68px; } @@ -180,385 +186,385 @@ } .Pet_Food_Strawberry { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1696px 0px; + background-position: -1696px -69px; width: 68px; height: 68px; } .Mount_Body_Armadillo-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -106px; + background-position: -636px -212px; width: 105px; height: 105px; } .Mount_Body_Armadillo-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -212px; + background-position: -636px -318px; width: 105px; height: 105px; } .Mount_Body_Armadillo-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -318px; + background-position: -636px -424px; width: 105px; height: 105px; } .Mount_Body_Armadillo-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -424px; + background-position: 0px -593px; width: 105px; height: 105px; } .Mount_Body_Armadillo-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -593px; + background-position: -106px -593px; width: 105px; height: 105px; } .Mount_Body_Armadillo-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -593px; + background-position: -212px -593px; width: 105px; height: 105px; } .Mount_Body_Armadillo-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -593px; + background-position: -318px -593px; width: 105px; height: 105px; } .Mount_Body_Armadillo-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -593px; + background-position: -424px -593px; width: 105px; height: 105px; } .Mount_Body_Armadillo-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -593px; + background-position: -530px -593px; width: 105px; height: 105px; } .Mount_Body_Armadillo-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -593px; + background-position: -636px -593px; width: 105px; height: 105px; } .Mount_Body_Axolotl-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -593px; + background-position: -742px 0px; width: 105px; height: 105px; } .Mount_Body_Axolotl-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px 0px; + background-position: -742px -106px; width: 105px; height: 105px; } .Mount_Body_Axolotl-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -106px; + background-position: -742px -212px; width: 105px; height: 105px; } .Mount_Body_Axolotl-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -212px; + background-position: -742px -318px; width: 105px; height: 105px; } .Mount_Body_Axolotl-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -318px; + background-position: -742px -424px; width: 105px; height: 105px; } .Mount_Body_Axolotl-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -424px; + background-position: -742px -530px; width: 105px; height: 105px; } .Mount_Body_Axolotl-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -530px; + background-position: 0px -699px; width: 105px; height: 105px; } .Mount_Body_Axolotl-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -699px; + background-position: -106px -699px; width: 105px; height: 105px; } .Mount_Body_Axolotl-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -699px; + background-position: -212px -699px; width: 105px; height: 105px; } .Mount_Body_Axolotl-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -699px; + background-position: -318px -699px; width: 105px; height: 105px; } .Mount_Body_BearCub-Aquatic { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -699px; + background-position: -424px -699px; width: 105px; height: 105px; } .Mount_Body_BearCub-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -699px; + background-position: -530px -699px; width: 105px; height: 105px; } .Mount_Body_BearCub-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -699px; + background-position: -636px -699px; width: 105px; height: 105px; } .Mount_Body_BearCub-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -699px; + background-position: -742px -699px; width: 105px; height: 105px; } .Mount_Body_BearCub-Cupid { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -699px; + background-position: -848px 0px; width: 105px; height: 105px; } .Mount_Body_BearCub-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px 0px; + background-position: -848px -106px; width: 105px; height: 105px; } .Mount_Body_BearCub-Ember { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -106px; + background-position: -848px -212px; width: 105px; height: 105px; } .Mount_Body_BearCub-Fairy { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -212px; + background-position: -848px -318px; width: 105px; height: 105px; } .Mount_Body_BearCub-Floral { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -318px; + background-position: -848px -424px; width: 105px; height: 105px; } .Mount_Body_BearCub-Ghost { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -424px; + background-position: -848px -530px; width: 105px; height: 105px; } .Mount_Body_BearCub-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -530px; + background-position: -848px -636px; width: 105px; height: 105px; } .Mount_Body_BearCub-Holly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -636px; + background-position: 0px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Peppermint { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -805px; + background-position: -106px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Polar { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -805px; + background-position: -212px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -805px; + background-position: -318px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-RoyalPurple { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -805px; + background-position: -424px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -805px; + background-position: -530px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Shimmer { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -805px; + background-position: -636px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -805px; + background-position: -742px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Spooky { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -805px; + background-position: -848px -805px; width: 105px; height: 105px; } .Mount_Body_BearCub-Thunderstorm { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -805px; + background-position: -954px 0px; width: 105px; height: 105px; } .Mount_Body_BearCub-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px 0px; + background-position: -954px -106px; width: 105px; height: 105px; } .Mount_Body_BearCub-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -106px; + background-position: -954px -212px; width: 105px; height: 105px; } .Mount_Body_Beetle-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -212px; + background-position: -954px -318px; width: 105px; height: 105px; } .Mount_Body_Beetle-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -318px; + background-position: -954px -424px; width: 105px; height: 105px; } .Mount_Body_Beetle-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -424px; + background-position: -954px -530px; width: 105px; height: 105px; } .Mount_Body_Beetle-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -530px; + background-position: -954px -636px; width: 105px; height: 105px; } .Mount_Body_Beetle-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -636px; + background-position: -954px -742px; width: 105px; height: 105px; } .Mount_Body_Beetle-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -742px; + background-position: 0px -911px; width: 105px; height: 105px; } .Mount_Body_Beetle-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -911px; + background-position: -106px -911px; width: 105px; height: 105px; } .Mount_Body_Beetle-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -911px; + background-position: -212px -911px; width: 105px; height: 105px; } .Mount_Body_Beetle-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -911px; + background-position: -318px -911px; width: 105px; height: 105px; } .Mount_Body_Beetle-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -911px; + background-position: -424px -911px; width: 105px; height: 105px; } .Mount_Body_Bunny-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -911px; + background-position: -530px -911px; width: 105px; height: 105px; } .Mount_Body_Bunny-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -911px; + background-position: -636px -911px; width: 105px; height: 105px; } .Mount_Body_Bunny-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -911px; + background-position: -742px -911px; width: 105px; height: 105px; } .Mount_Body_Bunny-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -911px; + background-position: -848px -911px; width: 105px; height: 105px; } .Mount_Body_Bunny-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -911px; + background-position: -954px -911px; width: 105px; height: 105px; } .Mount_Body_Bunny-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -911px; + background-position: -1060px 0px; width: 105px; height: 105px; } .Mount_Body_Bunny-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px 0px; + background-position: -1060px -106px; width: 105px; height: 105px; } .Mount_Body_Bunny-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -106px; + background-position: -1060px -212px; width: 105px; height: 105px; } .Mount_Body_Bunny-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -212px; + background-position: -1060px -318px; width: 105px; height: 105px; } .Mount_Body_Bunny-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -318px; + background-position: -1060px -424px; width: 105px; height: 105px; } @@ -624,157 +630,157 @@ } .Mount_Body_Cactus-Aquatic { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -1017px; + background-position: -636px -1017px; width: 105px; height: 105px; } .Mount_Body_Cactus-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -1017px; + background-position: -742px -1017px; width: 105px; height: 105px; } .Mount_Body_Cactus-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -1017px; + background-position: -848px -1017px; width: 105px; height: 105px; } .Mount_Body_Cactus-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -1017px; + background-position: -954px -1017px; width: 105px; height: 105px; } .Mount_Body_Cactus-Cupid { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -1017px; + background-position: -1060px -1017px; width: 105px; height: 105px; } .Mount_Body_Cactus-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -1017px; + background-position: -1166px 0px; width: 105px; height: 105px; } .Mount_Body_Cactus-Ember { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px 0px; + background-position: -1166px -106px; width: 105px; height: 105px; } .Mount_Body_Cactus-Fairy { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -106px; + background-position: -1166px -212px; width: 105px; height: 105px; } .Mount_Body_Cactus-Floral { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -212px; + background-position: -1166px -318px; width: 105px; height: 105px; } .Mount_Body_Cactus-Ghost { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -318px; + background-position: -1166px -424px; width: 105px; height: 105px; } .Mount_Body_Cactus-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -424px; + background-position: -1166px -530px; width: 105px; height: 105px; } .Mount_Body_Cactus-Holly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -530px; + background-position: -1166px -636px; width: 105px; height: 105px; } .Mount_Body_Cactus-Peppermint { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -636px; + background-position: -1166px -742px; width: 105px; height: 105px; } .Mount_Body_Cactus-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -742px; + background-position: -1166px -848px; width: 105px; height: 105px; } .Mount_Body_Cactus-RoyalPurple { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -848px; + background-position: -1166px -954px; width: 105px; height: 105px; } .Mount_Body_Cactus-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -954px; + background-position: 0px -1123px; width: 105px; height: 105px; } .Mount_Body_Cactus-Shimmer { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1123px; + background-position: -106px -1123px; width: 105px; height: 105px; } .Mount_Body_Cactus-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -1123px; + background-position: -212px -1123px; width: 105px; height: 105px; } .Mount_Body_Cactus-Spooky { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -1123px; + background-position: -318px -1123px; width: 105px; height: 105px; } .Mount_Body_Cactus-Thunderstorm { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -1123px; + background-position: -424px -1123px; width: 105px; height: 105px; } .Mount_Body_Cactus-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -1123px; + background-position: -530px -1123px; width: 105px; height: 105px; } .Mount_Body_Cactus-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -1123px; + background-position: -636px -1123px; width: 105px; height: 105px; } .Mount_Body_Cheetah-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -1123px; + background-position: -742px -1123px; width: 105px; height: 105px; } .Mount_Body_Cheetah-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -1123px; + background-position: -848px -1123px; width: 105px; height: 105px; } .Mount_Body_Cheetah-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -1123px; + background-position: -954px -1123px; width: 105px; height: 105px; } .Mount_Body_Cheetah-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -1123px; + background-position: -1060px -1123px; width: 105px; height: 105px; } @@ -786,91 +792,91 @@ } .Mount_Body_Cheetah-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -1123px; + background-position: -1272px 0px; width: 105px; height: 105px; } .Mount_Body_Cheetah-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px 0px; + background-position: -1272px -106px; width: 105px; height: 105px; } .Mount_Body_Cheetah-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -106px; + background-position: -1272px -212px; width: 105px; height: 105px; } .Mount_Body_Cheetah-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -212px; + background-position: -1272px -318px; width: 105px; height: 105px; } .Mount_Body_Cheetah-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -318px; + background-position: -1272px -424px; width: 105px; height: 105px; } .Mount_Body_Cow-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -424px; + background-position: -1272px -530px; width: 105px; height: 105px; } .Mount_Body_Cow-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -530px; + background-position: -1272px -636px; width: 105px; height: 105px; } .Mount_Body_Cow-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -636px; + background-position: -1272px -742px; width: 105px; height: 105px; } .Mount_Body_Cow-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -742px; + background-position: -1272px -848px; width: 105px; height: 105px; } .Mount_Body_Cow-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -848px; + background-position: -1272px -954px; width: 105px; height: 105px; } .Mount_Body_Cow-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -954px; + background-position: -1272px -1060px; width: 105px; height: 105px; } .Mount_Body_Cow-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -1060px; + background-position: 0px -1229px; width: 105px; height: 105px; } .Mount_Body_Cow-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1229px; + background-position: -106px -1229px; width: 105px; height: 105px; } .Mount_Body_Cow-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -1229px; + background-position: -212px -1229px; width: 105px; height: 105px; } .Mount_Body_Cow-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -1229px; + background-position: -318px -1229px; width: 105px; height: 105px; } @@ -936,451 +942,451 @@ } .Mount_Body_Deer-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px 0px; + background-position: -1378px -106px; width: 105px; height: 105px; } .Mount_Body_Deer-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -106px; + background-position: -1378px -212px; width: 105px; height: 105px; } .Mount_Body_Deer-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -212px; + background-position: -1378px -318px; width: 105px; height: 105px; } .Mount_Body_Deer-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -318px; + background-position: -1378px -424px; width: 105px; height: 105px; } .Mount_Body_Deer-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -424px; + background-position: -1378px -530px; width: 105px; height: 105px; } .Mount_Body_Deer-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -530px; + background-position: -1378px -636px; width: 105px; height: 105px; } .Mount_Body_Deer-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -636px; + background-position: -1378px -742px; width: 105px; height: 105px; } .Mount_Body_Deer-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -742px; + background-position: -1378px -848px; width: 105px; height: 105px; } .Mount_Body_Deer-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -848px; + background-position: -1378px -954px; width: 105px; height: 105px; } .Mount_Body_Deer-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -954px; + background-position: -1378px -1060px; width: 105px; height: 105px; } .Mount_Body_Dragon-Aquatic { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -1060px; + background-position: -1378px -1166px; width: 105px; height: 105px; } .Mount_Body_Dragon-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -1166px; + background-position: 0px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1335px; + background-position: -106px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -1335px; + background-position: -212px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Cupid { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -1335px; + background-position: -318px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -1335px; + background-position: -424px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Ember { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -1335px; + background-position: -530px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Fairy { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -1335px; + background-position: -636px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Floral { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -1335px; + background-position: -742px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Ghost { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -1335px; + background-position: -848px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -1335px; + background-position: -954px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Holly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -1335px; + background-position: -1060px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Peppermint { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -1335px; + background-position: -1166px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -1335px; + background-position: -1272px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-RoyalPurple { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -1335px; + background-position: -1378px -1335px; width: 105px; height: 105px; } .Mount_Body_Dragon-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -1335px; + background-position: -1484px 0px; width: 105px; height: 105px; } .Mount_Body_Dragon-Shimmer { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px 0px; + background-position: -1484px -106px; width: 105px; height: 105px; } .Mount_Body_Dragon-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -106px; + background-position: -1484px -212px; width: 105px; height: 105px; } .Mount_Body_Dragon-Spooky { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -212px; + background-position: -1484px -318px; width: 105px; height: 105px; } .Mount_Body_Dragon-Thunderstorm { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -318px; + background-position: -1484px -424px; width: 105px; height: 105px; } .Mount_Body_Dragon-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -424px; + background-position: -1484px -530px; width: 105px; height: 105px; } .Mount_Body_Dragon-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -530px; + background-position: -1484px -636px; width: 105px; height: 105px; } .Mount_Body_Egg-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -636px; + background-position: -1484px -742px; width: 105px; height: 105px; } .Mount_Body_Egg-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -742px; + background-position: -1484px -848px; width: 105px; height: 105px; } .Mount_Body_Egg-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -848px; + background-position: -1484px -954px; width: 105px; height: 105px; } .Mount_Body_Egg-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -954px; + background-position: -1484px -1060px; width: 105px; height: 105px; } .Mount_Body_Egg-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -1060px; + background-position: -1484px -1166px; width: 105px; height: 105px; } .Mount_Body_Egg-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -1166px; + background-position: -1484px -1272px; width: 105px; height: 105px; } .Mount_Body_Egg-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -1272px; + background-position: 0px -1441px; width: 105px; height: 105px; } .Mount_Body_Egg-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1441px; + background-position: -106px -1441px; width: 105px; height: 105px; } .Mount_Body_Egg-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -1441px; + background-position: -212px -1441px; width: 105px; height: 105px; } .Mount_Body_Egg-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -1441px; + background-position: -318px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -1441px; + background-position: -424px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -1441px; + background-position: -530px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -1441px; + background-position: -636px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -1441px; + background-position: -742px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -1441px; + background-position: -848px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -1441px; + background-position: -954px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -1441px; + background-position: -1060px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -1441px; + background-position: -1166px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -1441px; + background-position: -1272px -1441px; width: 105px; height: 105px; } .Mount_Body_Falcon-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -1441px; + background-position: -1378px -1441px; width: 105px; height: 105px; } .Mount_Body_Ferret-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1378px -1441px; + background-position: -1484px -1441px; width: 105px; height: 105px; } .Mount_Body_Ferret-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1484px -1441px; + background-position: -1590px 0px; width: 105px; height: 105px; } .Mount_Body_Ferret-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px 0px; + background-position: -1590px -106px; width: 105px; height: 105px; } .Mount_Body_Ferret-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -106px; + background-position: -1590px -212px; width: 105px; height: 105px; } .Mount_Body_Ferret-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -212px; + background-position: -1590px -318px; width: 105px; height: 105px; } .Mount_Body_Ferret-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -318px; + background-position: -1590px -424px; width: 105px; height: 105px; } .Mount_Body_Ferret-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -424px; + background-position: -1590px -530px; width: 105px; height: 105px; } .Mount_Body_Ferret-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -530px; + background-position: -1590px -636px; width: 105px; height: 105px; } .Mount_Body_Ferret-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -636px; + background-position: -1590px -742px; width: 105px; height: 105px; } .Mount_Body_Ferret-Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -742px; + background-position: -1590px -848px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Aquatic { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -848px; + background-position: -1590px -954px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -954px; + background-position: -1590px -1060px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -1060px; + background-position: -1590px -1166px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -1166px; + background-position: -1590px -1272px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Cupid { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -1272px; + background-position: -1590px -1378px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1590px -1378px; + background-position: 0px -1547px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Ember { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1547px; + background-position: -106px -1547px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Fairy { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -1547px; + background-position: -212px -1547px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Floral { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -1547px; + background-position: -318px -1547px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Ghost { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -1547px; + background-position: -424px -1547px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -1547px; + background-position: -530px -1547px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Holly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -1547px; + background-position: -1166px -1123px; width: 105px; height: 105px; } .Mount_Body_FlyingPig-Peppermint { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -1123px; + background-position: -636px -106px; width: 105px; height: 105px; } @@ -1446,121 +1452,121 @@ } .Mount_Body_Fox-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1272px -1229px; + background-position: -1378px 0px; width: 105px; height: 105px; } .Mount_Body_Fox-CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1166px -1229px; + background-position: -1272px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -1229px; + background-position: -1166px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Cupid { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -954px -1229px; + background-position: -1060px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -848px -1229px; + background-position: -954px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Ember { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -742px -1229px; + background-position: -848px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Fairy { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -636px -1229px; + background-position: -742px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Floral { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -530px -1229px; + background-position: -636px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Ghost { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -1229px; + background-position: -530px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -1229px; + background-position: -424px -1229px; width: 105px; height: 105px; } .Mount_Body_Fox-Holly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -424px -1017px; + background-position: -530px -1017px; width: 105px; height: 105px; } .Mount_Body_Fox-Peppermint { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -318px -1017px; + background-position: -424px -1017px; width: 105px; height: 105px; } .Mount_Body_Fox-Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -212px -1017px; + background-position: -318px -1017px; width: 105px; height: 105px; } .Mount_Body_Fox-RoyalPurple { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -106px -1017px; + background-position: -212px -1017px; width: 105px; height: 105px; } .Mount_Body_Fox-Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1017px; + background-position: -106px -1017px; width: 105px; height: 105px; } .Mount_Body_Fox-Shimmer { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -848px; + background-position: 0px -1017px; width: 105px; height: 105px; } .Mount_Body_Fox-Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -742px; + background-position: -1060px -848px; width: 105px; height: 105px; } .Mount_Body_Fox-Spooky { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -636px; + background-position: -1060px -742px; width: 105px; height: 105px; } .Mount_Body_Fox-Thunderstorm { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -530px; + background-position: -1060px -636px; width: 105px; height: 105px; } .Mount_Body_Fox-White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -424px; + background-position: -1060px -530px; width: 105px; height: 105px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 08b583245d..9b5649366e 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/assets/images/sprites/spritesmith-main-10.png b/website/client/assets/images/sprites/spritesmith-main-10.png index 32a828dea2..93e88fb6e3 100644 Binary files a/website/client/assets/images/sprites/spritesmith-main-10.png and b/website/client/assets/images/sprites/spritesmith-main-10.png differ diff --git a/website/client/assets/images/sprites/spritesmith-main-11.png b/website/client/assets/images/sprites/spritesmith-main-11.png index 7b07bb8b30..163d7f5c94 100644 Binary files a/website/client/assets/images/sprites/spritesmith-main-11.png and b/website/client/assets/images/sprites/spritesmith-main-11.png differ diff --git a/website/client/components/payments/sendGemsModal.vue b/website/client/components/payments/sendGemsModal.vue index c1b10acf98..fe227d2440 100644 --- a/website/client/components/payments/sendGemsModal.vue +++ b/website/client/components/payments/sendGemsModal.vue @@ -31,11 +31,17 @@ b-modal#send-gems(:title="title", :hide-footer="true", size='lg') ) h3.panel-heading {{ $t('subscription') }} .panel-body - .form-group - .radio(v-for='block in subscriptionBlocks', v-if="block.target !== 'group' && block.canSubscribe === true") - label - input(type="radio", name="subRadio", :value="block.key", v-model='gift.subscription.key') - | {{ $t('sendGiftSubscription', {price: block.price, months: block.months}) }} + .row + .col-md-4 + .form-group + .radio(v-for='block in subscriptionBlocks', v-if="block.target !== 'group' && block.canSubscribe === true") + label + input(type="radio", name="subRadio", :value="block.key", v-model='gift.subscription.key') + | {{ $t('sendGiftSubscription', {price: block.price, months: block.months}) }} + .col-md-8 + h4 {{ $t('winterPromoGiftHeader') }} + p {{ $t('winterPromoGiftDetails1') }} + p {{ $t('winterPromoGiftDetails2') }} textarea.form-control(rows='3', v-model='gift.message', :placeholder="$t('sendGiftMessagePlaceholder')") //include ../formatting-help diff --git a/website/client/components/settings/subscription.vue b/website/client/components/settings/subscription.vue index b0723561cd..7146df024b 100644 --- a/website/client/components/settings/subscription.vue +++ b/website/client/components/settings/subscription.vue @@ -90,6 +90,11 @@ li {{ $t('giftSubscriptionText2') }} li {{ $t('giftSubscriptionText3') }} h4 {{ $t('giftSubscriptionText4') }} + .col-6 + h2 {{ $t('winterPromoGiftHeader') }} + p {{ $t('winterPromoGiftDetails1') }} + p {{ $t('winterPromoGiftDetails2') }} +