From c02bb9132ff6bef2c3c40adf27d2d5d6f9d1733a Mon Sep 17 00:00:00 2001 From: Matthew Olker Date: Fri, 14 Jun 2024 13:40:14 -0400 Subject: [PATCH] Update Date to UTC and Time to include days --- src/timed-event-manager.ts | 4 ++-- src/ui/title-ui-handler.ts | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts index 6cd0c640d21..18ff40aec50 100644 --- a/src/timed-event-manager.ts +++ b/src/timed-event-manager.ts @@ -17,8 +17,8 @@ const timedEvents: TimedEvent[] = [ name: "Pride Update", eventType: EventType.SHINY, shinyMultiplier: 2, - startDate: new Date(2024, 5, 14), - endDate: new Date(2024, 5, 21), + startDate: new Date(Date.UTC(2024, 5, 14, 0)), + endDate: new Date(Date.UTC(2024, 5, 21, 0)), bannerFilename: "pride-update" }, ]; diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts index 2729f68d1d3..54c478a7ad7 100644 --- a/src/ui/title-ui-handler.ts +++ b/src/ui/title-ui-handler.ts @@ -55,7 +55,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler { bannerShadow.setOrigin(0,0); this.eventTimerText = addTextObject( this.scene, - banner.x + 22, + banner.x + 8, banner.y + 100, this.timeToGo(event.endDate), TextStyle.WINDOW @@ -102,12 +102,13 @@ export default class TitleUiHandler extends OptionSelectUiHandler { diff = Math.abs(diff); // Get time components - const hours = diff/3.6e6 | 0; + const days = diff/8.64e7 | 0; + const hours = diff%8.64e7 / 3.6e6 | 0; const mins = diff%3.6e6 / 6e4 | 0; const secs = Math.round(diff%6e4 / 1e3); // Return formatted string - return "Event Ends in : " + z(hours) + ":" + z(mins) + ":" + z(secs); + return "Event Ends in : " + z(days) + "d " + z(hours) + "h " + z(mins) + "m " + z(secs)+ "s"; } updateCountdown() {