diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js index 79c41995eb..2ae60aad00 100644 --- a/test/api/unit/libs/payments/payments.test.js +++ b/test/api/unit/libs/payments/payments.test.js @@ -209,17 +209,6 @@ describe('payments/index', () => { expect(user.purchased.txnCount).to.eql(1); }); - it('sends a private message about the gift', async () => { - await api.createSubscription(data); - const msg = '`Hello recipient, sender has sent you 3 months of subscription!`'; - - expect(user.sendMessage).to.be.calledOnce; - expect(user.sendMessage).to.be.calledWith( - recipient, - { receiverMsg: msg, senderMsg: msg, save: false }, - ); - }); - it('sends an email about the gift', async () => { await api.createSubscription(data); @@ -255,6 +244,109 @@ describe('payments/index', () => { }, }); }); + + context('No Active Promotion', () => { + beforeEach(() => { + sinon.stub(worldState, 'getCurrentEvent').returns(null); + }); + + afterEach(() => { + worldState.getCurrentEvent.restore(); + }); + + it('sends a private message about the gift', async () => { + await api.createSubscription(data); + const msg = '`Hello recipient, sender has sent you 3 months of subscription!`'; + + expect(user.sendMessage).to.be.calledOnce; + expect(user.sendMessage).to.be.calledWith( + recipient, + { receiverMsg: msg, senderMsg: msg, save: false }, + ); + }); + }); + + context('Active Promotion', () => { + beforeEach(() => { + sinon.stub(worldState, 'getCurrentEvent').returns({ + ...common.content.events.winter2021, + event: 'winter2021', + }); + }); + + afterEach(() => { + worldState.getCurrentEvent.restore(); + }); + + 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); + const 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/src/assets/images/npc/birthday/market_background.png b/website/client/public/static/npc/birthday/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/market_background.png rename to website/client/public/static/npc/birthday/market_background.png diff --git a/website/client/src/assets/images/npc/birthday/market_banner_npc.png b/website/client/public/static/npc/birthday/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/market_banner_npc.png rename to website/client/public/static/npc/birthday/market_banner_npc.png diff --git a/website/client/src/assets/images/npc/birthday/quest_shop_background.png b/website/client/public/static/npc/birthday/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/quest_shop_background.png rename to website/client/public/static/npc/birthday/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/birthday/quest_shop_npc.png b/website/client/public/static/npc/birthday/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/quest_shop_npc.png rename to website/client/public/static/npc/birthday/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/birthday/seasonal_shop_opened_background.png b/website/client/public/static/npc/birthday/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/seasonal_shop_opened_background.png rename to website/client/public/static/npc/birthday/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/birthday/seasonal_shop_opened_npc.png b/website/client/public/static/npc/birthday/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/birthday/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/birthday/tavern_background.png b/website/client/public/static/npc/birthday/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/tavern_background.png rename to website/client/public/static/npc/birthday/tavern_background.png diff --git a/website/client/src/assets/images/npc/birthday/tavern_npc.png b/website/client/public/static/npc/birthday/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/tavern_npc.png rename to website/client/public/static/npc/birthday/tavern_npc.png diff --git a/website/client/src/assets/images/npc/birthday/time_travelers_background.png b/website/client/public/static/npc/birthday/time_travelers_background.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/time_travelers_background.png rename to website/client/public/static/npc/birthday/time_travelers_background.png diff --git a/website/client/src/assets/images/npc/birthday/time_travelers_open_banner.png b/website/client/public/static/npc/birthday/time_travelers_open_banner.png similarity index 100% rename from website/client/src/assets/images/npc/birthday/time_travelers_open_banner.png rename to website/client/public/static/npc/birthday/time_travelers_open_banner.png diff --git a/website/client/src/assets/images/npc/fall/market_background.png b/website/client/public/static/npc/fall/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/fall/market_background.png rename to website/client/public/static/npc/fall/market_background.png diff --git a/website/client/src/assets/images/npc/fall/market_banner_npc.png b/website/client/public/static/npc/fall/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/fall/market_banner_npc.png rename to website/client/public/static/npc/fall/market_banner_npc.png diff --git a/website/client/src/assets/images/npc/fall/quest_shop_background.png b/website/client/public/static/npc/fall/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/fall/quest_shop_background.png rename to website/client/public/static/npc/fall/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/fall/quest_shop_npc.png b/website/client/public/static/npc/fall/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/fall/quest_shop_npc.png rename to website/client/public/static/npc/fall/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/fall/seasonal_shop_opened_background.png b/website/client/public/static/npc/fall/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/fall/seasonal_shop_opened_background.png rename to website/client/public/static/npc/fall/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/fall/seasonal_shop_opened_npc.png b/website/client/public/static/npc/fall/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/fall/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/fall/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/fall/tavern_background.png b/website/client/public/static/npc/fall/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/fall/tavern_background.png rename to website/client/public/static/npc/fall/tavern_background.png diff --git a/website/client/src/assets/images/npc/fall/tavern_npc.png b/website/client/public/static/npc/fall/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/fall/tavern_npc.png rename to website/client/public/static/npc/fall/tavern_npc.png diff --git a/website/client/src/assets/images/npc/fall/time_travelers_background.png b/website/client/public/static/npc/fall/time_travelers_background.png similarity index 100% rename from website/client/src/assets/images/npc/fall/time_travelers_background.png rename to website/client/public/static/npc/fall/time_travelers_background.png diff --git a/website/client/src/assets/images/npc/fall/time_travelers_open_banner.png b/website/client/public/static/npc/fall/time_travelers_open_banner.png similarity index 100% rename from website/client/src/assets/images/npc/fall/time_travelers_open_banner.png rename to website/client/public/static/npc/fall/time_travelers_open_banner.png diff --git a/website/client/src/assets/images/npc/habitoween/market_background.png b/website/client/public/static/npc/habitoween/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/market_background.png rename to website/client/public/static/npc/habitoween/market_background.png diff --git a/website/client/src/assets/images/npc/habitoween/market_banner_npc.png b/website/client/public/static/npc/habitoween/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/market_banner_npc.png rename to website/client/public/static/npc/habitoween/market_banner_npc.png diff --git a/website/client/src/assets/images/npc/habitoween/quest_shop_background.png b/website/client/public/static/npc/habitoween/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/quest_shop_background.png rename to website/client/public/static/npc/habitoween/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/habitoween/quest_shop_npc.png b/website/client/public/static/npc/habitoween/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/quest_shop_npc.png rename to website/client/public/static/npc/habitoween/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/habitoween/seasonal_shop_opened_background.png b/website/client/public/static/npc/habitoween/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/seasonal_shop_opened_background.png rename to website/client/public/static/npc/habitoween/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/habitoween/seasonal_shop_opened_npc.png b/website/client/public/static/npc/habitoween/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/habitoween/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/habitoween/tavern_background.png b/website/client/public/static/npc/habitoween/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/tavern_background.png rename to website/client/public/static/npc/habitoween/tavern_background.png diff --git a/website/client/src/assets/images/npc/habitoween/tavern_npc.png b/website/client/public/static/npc/habitoween/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/habitoween/tavern_npc.png rename to website/client/public/static/npc/habitoween/tavern_npc.png diff --git a/website/client/public/static/npc/habitoween/time_travelers_background.png b/website/client/public/static/npc/habitoween/time_travelers_background.png new file mode 100644 index 0000000000..7bc283ea3c Binary files /dev/null and b/website/client/public/static/npc/habitoween/time_travelers_background.png differ diff --git a/website/client/public/static/npc/habitoween/time_travelers_open_banner.png b/website/client/public/static/npc/habitoween/time_travelers_open_banner.png new file mode 100644 index 0000000000..77f5c41313 Binary files /dev/null and b/website/client/public/static/npc/habitoween/time_travelers_open_banner.png differ diff --git a/website/client/src/assets/images/npc/normal/market_background.png b/website/client/public/static/npc/normal/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/normal/market_background.png rename to website/client/public/static/npc/normal/market_background.png diff --git a/website/client/src/assets/images/npc/normal/market_banner_npc.png b/website/client/public/static/npc/normal/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/normal/market_banner_npc.png rename to website/client/public/static/npc/normal/market_banner_npc.png diff --git a/website/client/public/static/npc/normal/npc_justin.png b/website/client/public/static/npc/normal/npc_justin.png new file mode 100644 index 0000000000..69d2fc879e Binary files /dev/null and b/website/client/public/static/npc/normal/npc_justin.png differ diff --git a/website/client/src/assets/images/npc/normal/quest_shop_background.png b/website/client/public/static/npc/normal/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/normal/quest_shop_background.png rename to website/client/public/static/npc/normal/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/normal/quest_shop_npc.png b/website/client/public/static/npc/normal/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/normal/quest_shop_npc.png rename to website/client/public/static/npc/normal/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/aprilfools/seasonal_shop_closed_background.png b/website/client/public/static/npc/normal/seasonal_shop_closed_background.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/seasonal_shop_closed_background.png rename to website/client/public/static/npc/normal/seasonal_shop_closed_background.png diff --git a/website/client/src/assets/images/npc/aprilfools/seasonal_shop_closed_npc.png b/website/client/public/static/npc/normal/seasonal_shop_closed_npc.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/seasonal_shop_closed_npc.png rename to website/client/public/static/npc/normal/seasonal_shop_closed_npc.png diff --git a/website/client/src/assets/images/npc/normal/tavern_background.png b/website/client/public/static/npc/normal/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/normal/tavern_background.png rename to website/client/public/static/npc/normal/tavern_background.png diff --git a/website/client/src/assets/images/npc/normal/tavern_npc.png b/website/client/public/static/npc/normal/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/normal/tavern_npc.png rename to website/client/public/static/npc/normal/tavern_npc.png diff --git a/website/client/src/assets/images/npc/normal/time_travelers_background.png b/website/client/public/static/npc/normal/time_travelers_background.png similarity index 100% rename from website/client/src/assets/images/npc/normal/time_travelers_background.png rename to website/client/public/static/npc/normal/time_travelers_background.png diff --git a/website/client/src/assets/images/npc/aprilfools/time_travelers_closed_banner.png b/website/client/public/static/npc/normal/time_travelers_closed_banner.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/time_travelers_closed_banner.png rename to website/client/public/static/npc/normal/time_travelers_closed_banner.png diff --git a/website/client/src/assets/images/npc/normal/time_travelers_open_banner.png b/website/client/public/static/npc/normal/time_travelers_open_banner.png similarity index 100% rename from website/client/src/assets/images/npc/normal/time_travelers_open_banner.png rename to website/client/public/static/npc/normal/time_travelers_open_banner.png diff --git a/website/client/src/assets/images/npc/nye/market_background.png b/website/client/public/static/npc/nye/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/nye/market_background.png rename to website/client/public/static/npc/nye/market_background.png diff --git a/website/client/src/assets/images/npc/nye/market_banner_npc.png b/website/client/public/static/npc/nye/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/nye/market_banner_npc.png rename to website/client/public/static/npc/nye/market_banner_npc.png diff --git a/website/client/src/assets/images/npc/nye/quest_shop_background.png b/website/client/public/static/npc/nye/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/nye/quest_shop_background.png rename to website/client/public/static/npc/nye/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/nye/quest_shop_npc.png b/website/client/public/static/npc/nye/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/nye/quest_shop_npc.png rename to website/client/public/static/npc/nye/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/nye/seasonal_shop_opened_background.png b/website/client/public/static/npc/nye/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/nye/seasonal_shop_opened_background.png rename to website/client/public/static/npc/nye/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/nye/seasonal_shop_opened_npc.png b/website/client/public/static/npc/nye/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/nye/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/nye/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/nye/tavern_background.png b/website/client/public/static/npc/nye/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/nye/tavern_background.png rename to website/client/public/static/npc/nye/tavern_background.png diff --git a/website/client/src/assets/images/npc/nye/tavern_npc.png b/website/client/public/static/npc/nye/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/nye/tavern_npc.png rename to website/client/public/static/npc/nye/tavern_npc.png diff --git a/website/client/src/assets/images/npc/winter/time_travelers_background.png b/website/client/public/static/npc/nye/time_travelers_background.png similarity index 100% rename from website/client/src/assets/images/npc/winter/time_travelers_background.png rename to website/client/public/static/npc/nye/time_travelers_background.png diff --git a/website/client/src/assets/images/npc/winter/time_travelers_open_banner.png b/website/client/public/static/npc/nye/time_travelers_open_banner.png similarity index 100% rename from website/client/src/assets/images/npc/winter/time_travelers_open_banner.png rename to website/client/public/static/npc/nye/time_travelers_open_banner.png diff --git a/website/client/src/assets/images/npc/aprilfools/market_background.png b/website/client/public/static/npc/spring/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/market_background.png rename to website/client/public/static/npc/spring/market_background.png diff --git a/website/client/src/assets/images/npc/spring/market_banner_npc.png b/website/client/public/static/npc/spring/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/spring/market_banner_npc.png rename to website/client/public/static/npc/spring/market_banner_npc.png diff --git a/website/client/src/assets/images/npc/aprilfools/quest_shop_background.png b/website/client/public/static/npc/spring/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/quest_shop_background.png rename to website/client/public/static/npc/spring/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/spring/quest_shop_npc.png b/website/client/public/static/npc/spring/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/spring/quest_shop_npc.png rename to website/client/public/static/npc/spring/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/aprilfools/seasonal_shop_opened_background.png b/website/client/public/static/npc/spring/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/seasonal_shop_opened_background.png rename to website/client/public/static/npc/spring/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/spring/seasonal_shop_opened_npc.png b/website/client/public/static/npc/spring/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/spring/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/spring/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/aprilfools/tavern_background.png b/website/client/public/static/npc/spring/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/tavern_background.png rename to website/client/public/static/npc/spring/tavern_background.png diff --git a/website/client/src/assets/images/npc/spring/tavern_npc.png b/website/client/public/static/npc/spring/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/spring/tavern_npc.png rename to website/client/public/static/npc/spring/tavern_npc.png diff --git a/website/client/src/assets/images/npc/aprilfools/time_travelers_background.png b/website/client/public/static/npc/spring/time_travelers_background.png similarity index 100% rename from website/client/src/assets/images/npc/aprilfools/time_travelers_background.png rename to website/client/public/static/npc/spring/time_travelers_background.png diff --git a/website/client/src/assets/images/npc/spring/time_travelers_open_banner.png b/website/client/public/static/npc/spring/time_travelers_open_banner.png similarity index 100% rename from website/client/src/assets/images/npc/spring/time_travelers_open_banner.png rename to website/client/public/static/npc/spring/time_travelers_open_banner.png diff --git a/website/client/src/assets/images/npc/summer/market_background.png b/website/client/public/static/npc/summer/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/summer/market_background.png rename to website/client/public/static/npc/summer/market_background.png diff --git a/website/client/src/assets/images/npc/summer/market_banner_npc.png b/website/client/public/static/npc/summer/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/summer/market_banner_npc.png rename to website/client/public/static/npc/summer/market_banner_npc.png diff --git a/website/client/src/assets/images/npc/summer/quest_shop_background.png b/website/client/public/static/npc/summer/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/summer/quest_shop_background.png rename to website/client/public/static/npc/summer/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/summer/quest_shop_npc.png b/website/client/public/static/npc/summer/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/summer/quest_shop_npc.png rename to website/client/public/static/npc/summer/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/summer/seasonal_shop_opened_background.png b/website/client/public/static/npc/summer/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/summer/seasonal_shop_opened_background.png rename to website/client/public/static/npc/summer/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/summer/seasonal_shop_opened_npc.png b/website/client/public/static/npc/summer/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/summer/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/summer/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/summer/tavern_background.png b/website/client/public/static/npc/summer/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/summer/tavern_background.png rename to website/client/public/static/npc/summer/tavern_background.png diff --git a/website/client/src/assets/images/npc/summer/tavern_npc.png b/website/client/public/static/npc/summer/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/summer/tavern_npc.png rename to website/client/public/static/npc/summer/tavern_npc.png diff --git a/website/client/src/assets/images/npc/summer/time_travelers_background.png b/website/client/public/static/npc/summer/time_travelers_background.png similarity index 100% rename from website/client/src/assets/images/npc/summer/time_travelers_background.png rename to website/client/public/static/npc/summer/time_travelers_background.png diff --git a/website/client/src/assets/images/npc/summer/time_travelers_open_banner.png b/website/client/public/static/npc/summer/time_travelers_open_banner.png similarity index 100% rename from website/client/src/assets/images/npc/summer/time_travelers_open_banner.png rename to website/client/public/static/npc/summer/time_travelers_open_banner.png diff --git a/website/client/src/assets/images/npc/thanksgiving/market_background.png b/website/client/public/static/npc/thanksgiving/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/market_background.png rename to website/client/public/static/npc/thanksgiving/market_background.png diff --git a/website/client/src/assets/images/npc/thanksgiving/market_banner_npc.png b/website/client/public/static/npc/thanksgiving/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/market_banner_npc.png rename to website/client/public/static/npc/thanksgiving/market_banner_npc.png diff --git a/website/client/src/assets/images/npc/thanksgiving/quest_shop_background.png b/website/client/public/static/npc/thanksgiving/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/quest_shop_background.png rename to website/client/public/static/npc/thanksgiving/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/thanksgiving/quest_shop_npc.png b/website/client/public/static/npc/thanksgiving/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/quest_shop_npc.png rename to website/client/public/static/npc/thanksgiving/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/thanksgiving/seasonal_shop_closed_background.png b/website/client/public/static/npc/thanksgiving/seasonal_shop_closed_background.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/seasonal_shop_closed_background.png rename to website/client/public/static/npc/thanksgiving/seasonal_shop_closed_background.png diff --git a/website/client/src/assets/images/npc/thanksgiving/seasonal_shop_closed_npc.png b/website/client/public/static/npc/thanksgiving/seasonal_shop_closed_npc.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/seasonal_shop_closed_npc.png rename to website/client/public/static/npc/thanksgiving/seasonal_shop_closed_npc.png diff --git a/website/client/src/assets/images/npc/thanksgiving/seasonal_shop_opened_background.png b/website/client/public/static/npc/thanksgiving/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/seasonal_shop_opened_background.png rename to website/client/public/static/npc/thanksgiving/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/thanksgiving/seasonal_shop_opened_npc.png b/website/client/public/static/npc/thanksgiving/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/thanksgiving/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/thanksgiving/tavern_background.png b/website/client/public/static/npc/thanksgiving/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/tavern_background.png rename to website/client/public/static/npc/thanksgiving/tavern_background.png diff --git a/website/client/src/assets/images/npc/thanksgiving/tavern_npc.png b/website/client/public/static/npc/thanksgiving/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/thanksgiving/tavern_npc.png rename to website/client/public/static/npc/thanksgiving/tavern_npc.png diff --git a/website/client/src/assets/images/npc/valentines/market_background.png b/website/client/public/static/npc/valentines/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/valentines/market_background.png rename to website/client/public/static/npc/valentines/market_background.png diff --git a/website/client/src/assets/images/npc/valentines/market_banner_npc.png b/website/client/public/static/npc/valentines/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/valentines/market_banner_npc.png rename to website/client/public/static/npc/valentines/market_banner_npc.png diff --git a/website/client/public/static/npc/valentines/quest_shop_background.png b/website/client/public/static/npc/valentines/quest_shop_background.png new file mode 100644 index 0000000000..aa595a0974 Binary files /dev/null and b/website/client/public/static/npc/valentines/quest_shop_background.png differ diff --git a/website/client/public/static/npc/valentines/quest_shop_npc.png b/website/client/public/static/npc/valentines/quest_shop_npc.png new file mode 100644 index 0000000000..8937bc47d2 Binary files /dev/null and b/website/client/public/static/npc/valentines/quest_shop_npc.png differ diff --git a/website/client/src/assets/images/npc/valentines/tavern_background.png b/website/client/public/static/npc/valentines/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/valentines/tavern_background.png rename to website/client/public/static/npc/valentines/tavern_background.png diff --git a/website/client/src/assets/images/npc/valentines/tavern_npc.png b/website/client/public/static/npc/valentines/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/valentines/tavern_npc.png rename to website/client/public/static/npc/valentines/tavern_npc.png diff --git a/website/client/src/assets/images/npc/broken/market_broken_background.png b/website/client/public/static/npc/valentines/time_travelers_background.png similarity index 53% rename from website/client/src/assets/images/npc/broken/market_broken_background.png rename to website/client/public/static/npc/valentines/time_travelers_background.png index a1000472c6..d88617d9dd 100644 Binary files a/website/client/src/assets/images/npc/broken/market_broken_background.png and b/website/client/public/static/npc/valentines/time_travelers_background.png differ diff --git a/website/client/public/static/npc/valentines/time_travelers_open_banner.png b/website/client/public/static/npc/valentines/time_travelers_open_banner.png new file mode 100644 index 0000000000..4fcd5e8d08 Binary files /dev/null and b/website/client/public/static/npc/valentines/time_travelers_open_banner.png differ diff --git a/website/client/src/assets/images/npc/winter/market_background.png b/website/client/public/static/npc/winter/market_background.png similarity index 100% rename from website/client/src/assets/images/npc/winter/market_background.png rename to website/client/public/static/npc/winter/market_background.png diff --git a/website/client/src/assets/images/npc/winter/market_banner_npc.png b/website/client/public/static/npc/winter/market_banner_npc.png similarity index 100% rename from website/client/src/assets/images/npc/winter/market_banner_npc.png rename to website/client/public/static/npc/winter/market_banner_npc.png diff --git a/website/client/public/static/npc/winter/npc_justin.png b/website/client/public/static/npc/winter/npc_justin.png new file mode 100644 index 0000000000..efd53b43e3 Binary files /dev/null and b/website/client/public/static/npc/winter/npc_justin.png differ diff --git a/website/client/src/assets/images/npc/winter/quest_shop_background.png b/website/client/public/static/npc/winter/quest_shop_background.png similarity index 100% rename from website/client/src/assets/images/npc/winter/quest_shop_background.png rename to website/client/public/static/npc/winter/quest_shop_background.png diff --git a/website/client/src/assets/images/npc/winter/quest_shop_npc.png b/website/client/public/static/npc/winter/quest_shop_npc.png similarity index 100% rename from website/client/src/assets/images/npc/winter/quest_shop_npc.png rename to website/client/public/static/npc/winter/quest_shop_npc.png diff --git a/website/client/src/assets/images/npc/winter/seasonal_shop_opened_background.png b/website/client/public/static/npc/winter/seasonal_shop_opened_background.png similarity index 100% rename from website/client/src/assets/images/npc/winter/seasonal_shop_opened_background.png rename to website/client/public/static/npc/winter/seasonal_shop_opened_background.png diff --git a/website/client/src/assets/images/npc/winter/seasonal_shop_opened_npc.png b/website/client/public/static/npc/winter/seasonal_shop_opened_npc.png similarity index 100% rename from website/client/src/assets/images/npc/winter/seasonal_shop_opened_npc.png rename to website/client/public/static/npc/winter/seasonal_shop_opened_npc.png diff --git a/website/client/src/assets/images/npc/winter/tavern_background.png b/website/client/public/static/npc/winter/tavern_background.png similarity index 100% rename from website/client/src/assets/images/npc/winter/tavern_background.png rename to website/client/public/static/npc/winter/tavern_background.png diff --git a/website/client/src/assets/images/npc/winter/tavern_npc.png b/website/client/public/static/npc/winter/tavern_npc.png similarity index 100% rename from website/client/src/assets/images/npc/winter/tavern_npc.png rename to website/client/public/static/npc/winter/tavern_npc.png diff --git a/website/client/public/static/npc/winter/time_travelers_background.png b/website/client/public/static/npc/winter/time_travelers_background.png new file mode 100644 index 0000000000..5c932a9949 Binary files /dev/null and b/website/client/public/static/npc/winter/time_travelers_background.png differ diff --git a/website/client/public/static/npc/winter/time_travelers_open_banner.png b/website/client/public/static/npc/winter/time_travelers_open_banner.png new file mode 100644 index 0000000000..1419f4e576 Binary files /dev/null and b/website/client/public/static/npc/winter/time_travelers_open_banner.png differ diff --git a/website/client/src/app.vue b/website/client/src/app.vue index 5ee9437eab..3bb518e491 100644 --- a/website/client/src/app.vue +++ b/website/client/src/app.vue @@ -39,6 +39,7 @@