diff --git a/test/api/v3/integration/world-state/GET-world-state.test.js b/test/api/v3/integration/world-state/GET-world-state.test.js index 6c33296921b..ad696b13cfa 100644 --- a/test/api/v3/integration/world-state/GET-world-state.test.js +++ b/test/api/v3/integration/world-state/GET-world-state.test.js @@ -123,7 +123,7 @@ describe('GET /world-state', () => { const res = await requester().get('/world-state'); - expect(res.npcImageSuffix).to.equal('winter'); + expect(res.npcImageSuffix).to.equal('fall'); }); }); }); diff --git a/test/content/schedule.test.js b/test/content/schedule.test.js index cfb0b5862c6..5731a81cdd5 100644 --- a/test/content/schedule.test.js +++ b/test/content/schedule.test.js @@ -123,6 +123,12 @@ describe('Content Schedule', () => { expect(matchers.seasonalGear.end).to.eql(moment.utc(`2024-06-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate()); }); + it('sets the end date for a winter gala', () => { + const date = new Date('2024-12-22'); + const matchers = getAllScheduleMatchingGroups(date); + expect(matchers.seasonalGear.end).to.eql(moment.utc(`2025-03-21T${String(switchoverTime).padStart(2, '0')}:00:00.000Z`).toDate()); + }); + it('contains content for repeating events', () => { const date = new Date('2024-04-15'); const matchers = getAllScheduleMatchingGroups(date); diff --git a/website/client/public/static/npc/birthday/customizations_background.png b/website/client/public/static/npc/birthday/customizations_background.png new file mode 100644 index 00000000000..18b396609b9 Binary files /dev/null and b/website/client/public/static/npc/birthday/customizations_background.png differ diff --git a/website/client/public/static/npc/birthday/customizations_npc.png b/website/client/public/static/npc/birthday/customizations_npc.png new file mode 100644 index 00000000000..6097030284d Binary files /dev/null and b/website/client/public/static/npc/birthday/customizations_npc.png differ diff --git a/website/client/public/static/npc/fall/customizations_background.png b/website/client/public/static/npc/fall/customizations_background.png new file mode 100644 index 00000000000..02298922657 Binary files /dev/null and b/website/client/public/static/npc/fall/customizations_background.png differ diff --git a/website/client/public/static/npc/fall/customizations_npc.png b/website/client/public/static/npc/fall/customizations_npc.png new file mode 100644 index 00000000000..1c0fc11d9ca Binary files /dev/null and b/website/client/public/static/npc/fall/customizations_npc.png differ diff --git a/website/client/public/static/npc/habitoween/customizations_background.png b/website/client/public/static/npc/habitoween/customizations_background.png new file mode 100644 index 00000000000..02298922657 Binary files /dev/null and b/website/client/public/static/npc/habitoween/customizations_background.png differ diff --git a/website/client/public/static/npc/habitoween/customizations_npc.png b/website/client/public/static/npc/habitoween/customizations_npc.png new file mode 100644 index 00000000000..1c0fc11d9ca Binary files /dev/null and b/website/client/public/static/npc/habitoween/customizations_npc.png differ diff --git a/website/client/public/static/npc/normal/customizations_background.png b/website/client/public/static/npc/normal/customizations_background.png index 0d1cc9c2731..ba571fcf4e2 100644 Binary files a/website/client/public/static/npc/normal/customizations_background.png and b/website/client/public/static/npc/normal/customizations_background.png differ diff --git a/website/client/public/static/npc/normal/customizations_npc.png b/website/client/public/static/npc/normal/customizations_npc.png index 6f0d4830623..454ed0cf68e 100644 Binary files a/website/client/public/static/npc/normal/customizations_npc.png and b/website/client/public/static/npc/normal/customizations_npc.png differ diff --git a/website/client/public/static/npc/nye/customizations_background.png b/website/client/public/static/npc/nye/customizations_background.png new file mode 100644 index 00000000000..18b396609b9 Binary files /dev/null and b/website/client/public/static/npc/nye/customizations_background.png differ diff --git a/website/client/public/static/npc/nye/customizations_npc.png b/website/client/public/static/npc/nye/customizations_npc.png new file mode 100644 index 00000000000..6097030284d Binary files /dev/null and b/website/client/public/static/npc/nye/customizations_npc.png differ diff --git a/website/client/public/static/npc/spring/customizations_background.png b/website/client/public/static/npc/spring/customizations_background.png new file mode 100644 index 00000000000..4214bd691c0 Binary files /dev/null and b/website/client/public/static/npc/spring/customizations_background.png differ diff --git a/website/client/public/static/npc/spring/customizations_npc.png b/website/client/public/static/npc/spring/customizations_npc.png new file mode 100644 index 00000000000..2edd7c0573f Binary files /dev/null and b/website/client/public/static/npc/spring/customizations_npc.png differ diff --git a/website/client/public/static/npc/summer/customizations_background.png b/website/client/public/static/npc/summer/customizations_background.png new file mode 100644 index 00000000000..ba571fcf4e2 Binary files /dev/null and b/website/client/public/static/npc/summer/customizations_background.png differ diff --git a/website/client/public/static/npc/summer/customizations_npc.png b/website/client/public/static/npc/summer/customizations_npc.png new file mode 100644 index 00000000000..454ed0cf68e Binary files /dev/null and b/website/client/public/static/npc/summer/customizations_npc.png differ diff --git a/website/client/public/static/npc/thanksgiving/customizations_background.png b/website/client/public/static/npc/thanksgiving/customizations_background.png new file mode 100644 index 00000000000..02298922657 Binary files /dev/null and b/website/client/public/static/npc/thanksgiving/customizations_background.png differ diff --git a/website/client/public/static/npc/thanksgiving/customizations_npc.png b/website/client/public/static/npc/thanksgiving/customizations_npc.png new file mode 100644 index 00000000000..1c0fc11d9ca Binary files /dev/null and b/website/client/public/static/npc/thanksgiving/customizations_npc.png differ diff --git a/website/client/public/static/npc/valentines/customizations_background.png b/website/client/public/static/npc/valentines/customizations_background.png new file mode 100644 index 00000000000..18b396609b9 Binary files /dev/null and b/website/client/public/static/npc/valentines/customizations_background.png differ diff --git a/website/client/public/static/npc/valentines/customizations_npc.png b/website/client/public/static/npc/valentines/customizations_npc.png new file mode 100644 index 00000000000..6097030284d Binary files /dev/null and b/website/client/public/static/npc/valentines/customizations_npc.png differ diff --git a/website/client/public/static/npc/winter/customizations_background.png b/website/client/public/static/npc/winter/customizations_background.png new file mode 100644 index 00000000000..18b396609b9 Binary files /dev/null and b/website/client/public/static/npc/winter/customizations_background.png differ diff --git a/website/client/public/static/npc/winter/customizations_npc.png b/website/client/public/static/npc/winter/customizations_npc.png new file mode 100644 index 00000000000..6097030284d Binary files /dev/null and b/website/client/public/static/npc/winter/customizations_npc.png differ diff --git a/website/client/src/components/shops/customizations/index.vue b/website/client/src/components/shops/customizations/index.vue index ad8b4d2ef03..70c3803651c 100644 --- a/website/client/src/components/shops/customizations/index.vue +++ b/website/client/src/components/shops/customizations/index.vue @@ -109,6 +109,7 @@