From 436d92cd7eaed2ac267814a8c35e09707f85bd3f Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Sat, 8 Jul 2023 22:18:41 +1000
Subject: [PATCH] fix MezFes Tickets not resetting & cleanup

---
 server/signserver/dsgn_resp.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/server/signserver/dsgn_resp.go b/server/signserver/dsgn_resp.go
index 0f5f6f129..948a5a011 100644
--- a/server/signserver/dsgn_resp.go
+++ b/server/signserver/dsgn_resp.go
@@ -145,12 +145,13 @@ func (s *Session) makeSignResponse(uid int) []byte {
 	bf.WriteUint16(0x4E20)
 	ps.Uint16(bf, "", false) // unk ipv4
 	bf.WriteUint32(uint32(s.server.getReturnExpiry(uid).Unix()))
-	bf.WriteUint32(0x00000000)
-	bf.WriteUint32(0x0A5197DF) // unk id
+	bf.WriteUint32(0)
 
 	mezfes := s.server.erupeConfig.DevModeOptions.MezFesEvent
 	alt := s.server.erupeConfig.DevModeOptions.MezFesAlt
 	if mezfes {
+		// We can just use the start timestamp as the event ID
+		bf.WriteUint32(uint32(channelserver.TimeWeekStart().Unix()))
 		// Start time
 		bf.WriteUint32(uint32(channelserver.TimeWeekStart().Unix()))
 		// End time
@@ -158,22 +159,23 @@ func (s *Session) makeSignResponse(uid int) []byte {
 		bf.WriteUint8(2) // Unk
 		bf.WriteUint32(s.server.erupeConfig.GameplayOptions.MezfesSoloTickets)
 		bf.WriteUint32(s.server.erupeConfig.GameplayOptions.MezfesGroupTickets)
-		bf.WriteUint8(8)   // Stalls open
-		bf.WriteUint8(0xA) // Unk
-		bf.WriteUint8(0x3) // Pachinko
-		bf.WriteUint8(0x6) // Nyanrendo
-		bf.WriteUint8(0x9) // Point stall
+		bf.WriteUint8(8)  // Stalls open
+		bf.WriteUint8(10) // Stall Map
+		bf.WriteUint8(3)  // Pachinko
+		bf.WriteUint8(6)  // Nyanrendo
+		bf.WriteUint8(9)  // Point stall
 		if alt {
-			bf.WriteUint8(0x2) // Tokotoko
+			bf.WriteUint8(2) // Tokotoko Partnya
 		} else {
-			bf.WriteUint8(0x4) // Volpakkun
+			bf.WriteUint8(4) // Volpakkun Together
 		}
-		bf.WriteUint8(0x8) // Battle cats
-		bf.WriteUint8(0x5) // Gook
-		bf.WriteUint8(0x7) // Honey
+		bf.WriteUint8(8) // Dokkan Battle Cats
+		bf.WriteUint8(5) // Goocoo Scoop
+		bf.WriteUint8(7) // Honey Panic
 	} else {
 		bf.WriteUint32(0)
 		bf.WriteUint32(0)
+		bf.WriteUint32(0)
 	}
 	return bf.Data()
 }