From 6601285218c1724d5ece633a196ee68e51084a1a Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Apr 2023 01:32:38 +1000 Subject: [PATCH 01/66] unfinished proof of concept --- patch-schema/psn-link.sql | 11 +++ server/signserver/dbutils.go | 91 +++++++++++++++--------- server/signserver/dsgn_resp.go | 13 ++-- server/signserver/session.go | 122 ++++++++++++++++++++++----------- 4 files changed, 158 insertions(+), 79 deletions(-) create mode 100644 patch-schema/psn-link.sql diff --git a/patch-schema/psn-link.sql b/patch-schema/psn-link.sql new file mode 100644 index 000000000..fc22e9046 --- /dev/null +++ b/patch-schema/psn-link.sql @@ -0,0 +1,11 @@ +BEGIN; + +ALTER TABLE public.sign_sessions ADD COLUMN id SERIAL; + +ALTER TABLE public.sign_sessions ADD CONSTRAINT sign_sessions_pkey PRIMARY KEY (id); + +ALTER TABLE public.sign_sessions ALTER COLUMN user_id DROP NOT NULL; + +ALTER TABLE public.sign_sessions ADD COLUMN psn_id TEXT; + +END; \ No newline at end of file diff --git a/server/signserver/dbutils.go b/server/signserver/dbutils.go index ee4dcc493..d66d85731 100644 --- a/server/signserver/dbutils.go +++ b/server/signserver/dbutils.go @@ -1,10 +1,12 @@ package signserver import ( + "errors" "erupe-ce/common/mhfcourse" "strings" "time" + "go.uber.org/zap" "golang.org/x/crypto/bcrypt" ) @@ -41,22 +43,19 @@ func (s *Server) newUserChara(username string) error { return nil } -func (s *Server) registerDBAccount(username string, password string) error { +func (s *Server) registerDBAccount(username string, password string) (uint32, error) { + var uid uint32 + s.logger.Info("Creating user", zap.String("User", username)) + // Create salted hash of user password passwordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) if err != nil { - return err + return 0, err } - _, err = s.db.Exec("INSERT INTO users (username, password, return_expires) VALUES ($1, $2, $3)", username, string(passwordHash), time.Now().Add(time.Hour*24*30)) + err = s.db.QueryRow("INSERT INTO users (username, password, return_expires) VALUES ($1, $2, $3) RETURNING id", username, string(passwordHash), time.Now().Add(time.Hour*24*30)).Scan(&uid) if err != nil { - return err - } - - var id int - err = s.db.QueryRow("SELECT id FROM users WHERE username = $1", username).Scan(&id) - if err != nil { - return err + return 0, err } // Create a base new character. @@ -65,14 +64,14 @@ func (s *Server) registerDBAccount(username string, password string) error { user_id, is_female, is_new_character, name, unk_desc_string, hrp, gr, weapon_type, last_login) VALUES($1, False, True, '', '', 0, 0, 0, $2)`, - id, + uid, uint32(time.Now().Unix()), ) if err != nil { - return err + return 0, err } - return nil + return uid, nil } type character struct { @@ -87,7 +86,7 @@ type character struct { LastLogin uint32 `db:"last_login"` } -func (s *Server) getCharactersForUser(uid int) ([]character, error) { +func (s *Server) getCharactersForUser(uid uint32) ([]character, error) { characters := make([]character, 0) err := s.db.Select(&characters, "SELECT id, is_female, is_new_character, name, unk_desc_string, hrp, gr, weapon_type, last_login FROM characters WHERE user_id = $1 AND deleted = false ORDER BY id ASC", uid) if err != nil { @@ -96,7 +95,7 @@ func (s *Server) getCharactersForUser(uid int) ([]character, error) { return characters, nil } -func (s *Server) getReturnExpiry(uid int) time.Time { +func (s *Server) getReturnExpiry(uid uint32) time.Time { var returnExpiry, lastLogin time.Time s.db.Get(&lastLogin, "SELECT COALESCE(last_login, now()) FROM users WHERE id=$1", uid) if time.Now().Add((time.Hour * 24) * -90).After(lastLogin) { @@ -113,16 +112,18 @@ func (s *Server) getReturnExpiry(uid int) time.Time { return returnExpiry } -func (s *Server) getLastCID(uid int) uint32 { +func (s *Server) getLastCID(uid uint32) uint32 { var lastPlayed uint32 _ = s.db.QueryRow("SELECT last_character FROM users WHERE id=$1", uid).Scan(&lastPlayed) return lastPlayed } -func (s *Server) getUserRights(uid int) uint32 { - rights := uint32(2) - _ = s.db.QueryRow("SELECT rights FROM users WHERE id=$1", uid).Scan(&rights) - _, rights = mhfcourse.GetCourseStruct(rights) +func (s *Server) getUserRights(uid uint32) uint32 { + var rights uint32 + if uid != 0 { + _ = s.db.QueryRow("SELECT rights FROM users WHERE id=$1", uid).Scan(&rights) + _, rights = mhfcourse.GetCourseStruct(rights) + } return rights } @@ -189,14 +190,12 @@ func (s *Server) getGuildmatesForCharacters(chars []character) []members { return guildmates } -func (s *Server) deleteCharacter(cid int, token string) error { - var verify int - err := s.db.QueryRow("SELECT count(*) FROM sign_sessions WHERE token = $1", token).Scan(&verify) - if err != nil { - return err // Invalid token +func (s *Server) deleteCharacter(cid int, token string, tokenID uint32) error { + if !s.validateToken(token, tokenID) { + return errors.New("invalid token") } var isNew bool - err = s.db.QueryRow("SELECT is_new_character FROM characters WHERE id = $1", cid).Scan(&isNew) + err := s.db.QueryRow("SELECT is_new_character FROM characters WHERE id = $1", cid).Scan(&isNew) if isNew { _, err = s.db.Exec("DELETE FROM characters WHERE id = $1", cid) } else { @@ -209,7 +208,7 @@ func (s *Server) deleteCharacter(cid int, token string) error { } // Unused -func (s *Server) checkToken(uid int) (bool, error) { +func (s *Server) checkToken(uid uint32) (bool, error) { var exists int err := s.db.QueryRow("SELECT count(*) FROM sign_sessions WHERE user_id = $1", uid).Scan(&exists) if err != nil { @@ -221,10 +220,36 @@ func (s *Server) checkToken(uid int) (bool, error) { return false, nil } -func (s *Server) registerToken(uid int, token string) error { - _, err := s.db.Exec("INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2)", uid, token) - if err != nil { - return err - } - return nil +func (s *Server) registerToken(uid uint32, token string) (uint32, error) { + var id uint32 + var err error + err = s.db.QueryRow("INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2) RETURNING id", uid, token).Scan(&id) + return id, err +} + +func (s *Server) validateToken(token string, tokenID uint32) bool { + query := `SELECT count(*) FROM sign_sessions WHERE token = $1` + if tokenID > 0 { + query += ` AND id = $2` + } + var exists int + err := s.db.QueryRow(query, token, tokenID).Scan(&exists) + if err != nil || exists == 0 { + return false + } + return true +} + +func (s *Server) validateLogin(user string, pass string) (uint32, error) { + var uid uint32 + var passDB string + err := s.db.QueryRow(`SELECT id, password FROM users WHERE username = $1`, user).Scan(&uid, &passDB) + if err != nil { + return 0, err + } else { + if bcrypt.CompareHashAndPassword([]byte(passDB), []byte(pass)) == nil { + return uid, nil + } + return 0, nil + } } diff --git a/server/signserver/dsgn_resp.go b/server/signserver/dsgn_resp.go index b39a2901c..f07161e7e 100644 --- a/server/signserver/dsgn_resp.go +++ b/server/signserver/dsgn_resp.go @@ -11,17 +11,20 @@ import ( "strings" ) -func (s *Session) makeSignResponse(uid int) []byte { +func (s *Session) makeSignResponse(uid uint32) []byte { // Get the characters from the DB. chars, err := s.server.getCharactersForUser(uid) if err != nil { s.logger.Warn("Error getting characters from DB", zap.Error(err)) } - sessToken := token.Generate(16) - _ = s.server.registerToken(uid, sessToken) - bf := byteframe.NewByteFrame() + sessToken := token.Generate(16) + tokenID, err := s.server.registerToken(uid, sessToken) + if err != nil { + bf.WriteUint8(uint8(SIGN_EABORT)) + return bf.Data() + } bf.WriteUint8(1) // resp_code if (s.server.erupeConfig.PatchServerManifest != "" && s.server.erupeConfig.PatchServerFile != "") || s.client == PS3 { @@ -31,7 +34,7 @@ func (s *Session) makeSignResponse(uid int) []byte { } bf.WriteUint8(1) // entrance server count bf.WriteUint8(uint8(len(chars))) - bf.WriteUint32(0xFFFFFFFF) // login_token_number + bf.WriteUint32(tokenID) bf.WriteBytes([]byte(sessToken)) bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix())) if s.client == PS3 { diff --git a/server/signserver/session.go b/server/signserver/session.go index 3eb914c93..3ade1426a 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -3,20 +3,21 @@ package signserver import ( "database/sql" "encoding/hex" + "erupe-ce/common/stringsupport" "fmt" "net" + "strings" "sync" "erupe-ce/common/byteframe" "erupe-ce/network" "go.uber.org/zap" - "golang.org/x/crypto/bcrypt" ) -type Client int +type client int const ( - PC100 Client = iota + PC100 client = iota VITA PS3 WIIU @@ -29,7 +30,7 @@ type Session struct { server *Server rawConn net.Conn cryptConn *network.CryptConn - client Client + client client } func (s *Session) work() { @@ -63,11 +64,14 @@ func (s *Session) handlePacket(pkt []byte) error { case "WIIUSGN:100": s.client = WIIU s.handleWIIUSGN(bf) + case "VITACOGLNK:100": + s.client = VITA + s.handlePSNLink(bf) case "DELETE:100": - loginTokenString := string(bf.ReadNullTerminatedBytes()) + token := string(bf.ReadNullTerminatedBytes()) characterID := int(bf.ReadUint32()) - _ = int(bf.ReadUint32()) // login_token_number - err := s.server.deleteCharacter(characterID, loginTokenString) + tokenID := bf.ReadUint32() + err := s.server.deleteCharacter(characterID, token, tokenID) if err == nil { s.logger.Info("Deleted character", zap.Int("CharacterID", characterID)) s.cryptConn.SendPacket([]byte{0x01}) // DEL_SUCCESS @@ -89,45 +93,30 @@ func (s *Session) authenticate(username string, password string) { newCharaReq = true } - var id int - var hash string bf := byteframe.NewByteFrame() - err := s.server.db.QueryRow("SELECT id, password FROM users WHERE username = $1", username).Scan(&id, &hash) + uid, err := s.server.validateLogin(username, password) switch { case err == sql.ErrNoRows: s.logger.Info("User not found", zap.String("Username", username)) if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.AutoCreateAccount { - s.logger.Info("Creating user", zap.String("Username", username)) - err = s.server.registerDBAccount(username, password) - if err == nil { - bf.WriteBytes(s.makeSignResponse(id)) + uid, err = s.server.registerDBAccount(username, password) + if err == nil && uid > 0 { + bf.WriteBytes(s.makeSignResponse(uid)) } } else { bf.WriteUint8(uint8(SIGN_EAUTH)) } case err != nil: - bf.WriteUint8(uint8(SIGN_EABORT)) s.logger.Error("Error getting user details", zap.Error(err)) + bf.WriteUint8(uint8(SIGN_EABORT)) default: - if bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)) == nil || s.client == VITA || s.client == PS3 || s.client == WIIU { + if uid > 0 { s.logger.Debug("Passwords match!") if newCharaReq { - err = s.server.newUserChara(username) - if err != nil { - s.logger.Error("Error adding new character to user", zap.Error(err)) - bf.WriteUint8(uint8(SIGN_EABORT)) - break - } + _ = s.server.newUserChara(username) } - // TODO: Need to auto delete user tokens after inactivity - // exists, err := s.server.checkToken(id) - // if err != nil { - // s.logger.Info("Error checking for live tokens", zap.Error(err)) - // serverRespBytes = makeSignInFailureResp(SIGN_EABORT) - // break - // } - bf.WriteBytes(s.makeSignResponse(id)) + bf.WriteBytes(s.makeSignResponse(uid)) } else { s.logger.Warn("Incorrect password") bf.WriteUint8(uint8(SIGN_EPASS)) @@ -138,7 +127,7 @@ func (s *Session) authenticate(username string, password string) { fmt.Printf("\n[Server] -> [Client]\nData [%d bytes]:\n%s\n", len(bf.Data()), hex.Dump(bf.Data())) } - err = s.cryptConn.SendPacket(bf.Data()) + _ = s.cryptConn.SendPacket(bf.Data()) } func (s *Session) handleWIIUSGN(bf *byteframe.ByteFrame) { @@ -160,20 +149,71 @@ func (s *Session) handlePSSGN(bf *byteframe.ByteFrame) { _ = bf.ReadBytes(2) // VITA = 1, PS3 = ! _ = bf.ReadBytes(82) psnUser := string(bf.ReadNullTerminatedBytes()) - var reqUsername string - err := s.server.db.QueryRow(`SELECT username FROM users WHERE psn_id = $1`, psnUser).Scan(&reqUsername) - if err == sql.ErrNoRows { - resp := byteframe.NewByteFrame() - resp.WriteUint8(uint8(SIGN_ECOGLINK)) - s.cryptConn.SendPacket(resp.Data()) + var uid uint32 + err := s.server.db.QueryRow(`SELECT id FROM users WHERE psn_id = $1`, psnUser).Scan(&uid) + if err != nil { + if err == sql.ErrNoRows { + s.cryptConn.SendPacket(s.makeSignResponse(0)) + return + } + s.sendCode(SIGN_EABORT) return } - s.authenticate(reqUsername, "") + s.cryptConn.SendPacket(s.makeSignResponse(uid)) +} + +func (s *Session) handlePSNLink(bf *byteframe.ByteFrame) { + _ = bf.ReadNullTerminatedBytes() // Client ID + credentials := strings.Split(stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()), "\n") + token := string(bf.ReadNullTerminatedBytes()) + if s.server.erupeConfig.DevModeOptions.DisableTokenCheck || !s.server.validateToken(token, 0) { + uid, err := s.server.validateLogin(credentials[0], credentials[1]) + if err == nil && uid > 0 { + var psn string + err = s.server.db.QueryRow(`SELECT psn_id FROM sign_sessions WHERE token = $1`, token).Scan(&psn) + if err != nil { + s.sendCode(SIGN_ECOGLINK) + return + } + + var exists int + err = s.server.db.QueryRow(`SELECT count(*) FROM users WHERE psn_id = $1`, psn).Scan(&exists) + if err != nil { + s.sendCode(SIGN_ECOGLINK) + return + } else if exists > 0 { + s.sendCode(SIGN_EPSI) + return + } + + var currentPSN string + err = s.server.db.QueryRow(`SELECT psn_id FROM users WHERE username = $1`, credentials[0]).Scan(¤tPSN) + if err != nil { + s.sendCode(SIGN_ECOGLINK) + return + } else if psn != currentPSN { + s.sendCode(SIGN_EMBID) + return + } + + _, err = s.server.db.Exec(`UPDATE users SET psn_id = $1 WHERE username = $2`, psn, credentials[0]) + if err == nil { + s.sendCode(SIGN_SUCCESS) + } + } else { + s.sendCode(SIGN_ECOGLINK) + } + + } } func (s *Session) handleDSGN(bf *byteframe.ByteFrame) { - reqUsername := string(bf.ReadNullTerminatedBytes()) - reqPassword := string(bf.ReadNullTerminatedBytes()) + user := stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()) + pass := stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()) _ = string(bf.ReadNullTerminatedBytes()) // Unk - s.authenticate(reqUsername, reqPassword) + s.authenticate(user, pass) +} + +func (s *Session) sendCode(id RespID) { + s.cryptConn.SendPacket([]byte{byte(id)}) } From a260500bb56142f3f1ff31eb8740169017bd1ab5 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Apr 2023 13:51:30 +1000 Subject: [PATCH 02/66] further sign server rewrite --- server/signserver/dbutils.go | 39 +++++++++--- server/signserver/dsgn_resp.go | 10 ++- server/signserver/session.go | 109 +++++++++++++-------------------- 3 files changed, 80 insertions(+), 78 deletions(-) diff --git a/server/signserver/dbutils.go b/server/signserver/dbutils.go index d66d85731..0410f351d 100644 --- a/server/signserver/dbutils.go +++ b/server/signserver/dbutils.go @@ -1,8 +1,10 @@ package signserver import ( + "database/sql" "errors" "erupe-ce/common/mhfcourse" + "erupe-ce/common/token" "strings" "time" @@ -220,11 +222,18 @@ func (s *Server) checkToken(uid uint32) (bool, error) { return false, nil } -func (s *Server) registerToken(uid uint32, token string) (uint32, error) { - var id uint32 - var err error - err = s.db.QueryRow("INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2) RETURNING id", uid, token).Scan(&id) - return id, err +func (s *Server) registerUidToken(uid uint32) (uint32, string, error) { + token := token.Generate(16) + var tid uint32 + err := s.db.QueryRow(`INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2) RETURNING id`, uid, token).Scan(&tid) + return tid, token, err +} + +func (s *Server) registerPsnToken(psn string) (uint32, string, error) { + token := token.Generate(16) + var tid uint32 + err := s.db.QueryRow(`INSERT INTO sign_sessions (psn_id, token) VALUES ($1, $2) RETURNING id`, psn, token).Scan(&tid) + return tid, token, err } func (s *Server) validateToken(token string, tokenID uint32) bool { @@ -240,16 +249,28 @@ func (s *Server) validateToken(token string, tokenID uint32) bool { return true } -func (s *Server) validateLogin(user string, pass string) (uint32, error) { +func (s *Server) validateLogin(user string, pass string) (uint32, RespID) { var uid uint32 var passDB string err := s.db.QueryRow(`SELECT id, password FROM users WHERE username = $1`, user).Scan(&uid, &passDB) if err != nil { - return 0, err + if err == sql.ErrNoRows { + s.logger.Info("User not found", zap.String("User", user)) + if s.erupeConfig.DevMode && s.erupeConfig.DevModeOptions.AutoCreateAccount { + uid, err = s.registerDBAccount(user, pass) + if err == nil { + return uid, SIGN_SUCCESS + } else { + return 0, SIGN_EABORT + } + } + return 0, SIGN_EAUTH + } + return 0, SIGN_EABORT } else { if bcrypt.CompareHashAndPassword([]byte(passDB), []byte(pass)) == nil { - return uid, nil + return uid, SIGN_SUCCESS } - return 0, nil + return 0, SIGN_EPASS } } diff --git a/server/signserver/dsgn_resp.go b/server/signserver/dsgn_resp.go index f07161e7e..03f9b8aee 100644 --- a/server/signserver/dsgn_resp.go +++ b/server/signserver/dsgn_resp.go @@ -4,7 +4,6 @@ import ( "erupe-ce/common/byteframe" ps "erupe-ce/common/pascalstring" "erupe-ce/common/stringsupport" - "erupe-ce/common/token" "erupe-ce/server/channelserver" "fmt" "go.uber.org/zap" @@ -19,8 +18,13 @@ func (s *Session) makeSignResponse(uid uint32) []byte { } bf := byteframe.NewByteFrame() - sessToken := token.Generate(16) - tokenID, err := s.server.registerToken(uid, sessToken) + var tokenID uint32 + var sessToken string + if uid == 0 && s.psn != "" { + tokenID, sessToken, err = s.server.registerPsnToken(s.psn) + } else { + tokenID, sessToken, err = s.server.registerUidToken(uid) + } if err != nil { bf.WriteUint8(uint8(SIGN_EABORT)) return bf.Data() diff --git a/server/signserver/session.go b/server/signserver/session.go index 3ade1426a..532998054 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -31,6 +31,7 @@ type Session struct { rawConn net.Conn cryptConn *network.CryptConn client client + psn string } func (s *Session) work() { @@ -87,46 +88,24 @@ func (s *Session) handlePacket(pkt []byte) error { func (s *Session) authenticate(username string, password string) { newCharaReq := false - if username[len(username)-1] == 43 { // '+' username = username[:len(username)-1] newCharaReq = true } - bf := byteframe.NewByteFrame() - - uid, err := s.server.validateLogin(username, password) - switch { - case err == sql.ErrNoRows: - s.logger.Info("User not found", zap.String("Username", username)) - if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.AutoCreateAccount { - uid, err = s.server.registerDBAccount(username, password) - if err == nil && uid > 0 { - bf.WriteBytes(s.makeSignResponse(uid)) - } - } else { - bf.WriteUint8(uint8(SIGN_EAUTH)) + uid, resp := s.server.validateLogin(username, password) + switch resp { + case SIGN_SUCCESS: + if newCharaReq { + _ = s.server.newUserChara(username) } - case err != nil: - s.logger.Error("Error getting user details", zap.Error(err)) - bf.WriteUint8(uint8(SIGN_EABORT)) + bf.WriteBytes(s.makeSignResponse(uid)) default: - if uid > 0 { - s.logger.Debug("Passwords match!") - if newCharaReq { - _ = s.server.newUserChara(username) - } - bf.WriteBytes(s.makeSignResponse(uid)) - } else { - s.logger.Warn("Incorrect password") - bf.WriteUint8(uint8(SIGN_EPASS)) - } + bf.WriteUint8(uint8(resp)) } - if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.LogOutboundMessages { fmt.Printf("\n[Server] -> [Client]\nData [%d bytes]:\n%s\n", len(bf.Data()), hex.Dump(bf.Data())) } - _ = s.cryptConn.SendPacket(bf.Data()) } @@ -148,9 +127,9 @@ func (s *Session) handlePSSGN(bf *byteframe.ByteFrame) { _ = bf.ReadNullTerminatedBytes() // VITA = 0000000256, PS3 = 0000000255 _ = bf.ReadBytes(2) // VITA = 1, PS3 = ! _ = bf.ReadBytes(82) - psnUser := string(bf.ReadNullTerminatedBytes()) + s.psn = string(bf.ReadNullTerminatedBytes()) var uid uint32 - err := s.server.db.QueryRow(`SELECT id FROM users WHERE psn_id = $1`, psnUser).Scan(&uid) + err := s.server.db.QueryRow(`SELECT id FROM users WHERE psn_id = $1`, s.psn).Scan(&uid) if err != nil { if err == sql.ErrNoRows { s.cryptConn.SendPacket(s.makeSignResponse(0)) @@ -166,45 +145,43 @@ func (s *Session) handlePSNLink(bf *byteframe.ByteFrame) { _ = bf.ReadNullTerminatedBytes() // Client ID credentials := strings.Split(stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()), "\n") token := string(bf.ReadNullTerminatedBytes()) - if s.server.erupeConfig.DevModeOptions.DisableTokenCheck || !s.server.validateToken(token, 0) { - uid, err := s.server.validateLogin(credentials[0], credentials[1]) - if err == nil && uid > 0 { - var psn string - err = s.server.db.QueryRow(`SELECT psn_id FROM sign_sessions WHERE token = $1`, token).Scan(&psn) - if err != nil { - s.sendCode(SIGN_ECOGLINK) - return - } - - var exists int - err = s.server.db.QueryRow(`SELECT count(*) FROM users WHERE psn_id = $1`, psn).Scan(&exists) - if err != nil { - s.sendCode(SIGN_ECOGLINK) - return - } else if exists > 0 { - s.sendCode(SIGN_EPSI) - return - } - - var currentPSN string - err = s.server.db.QueryRow(`SELECT psn_id FROM users WHERE username = $1`, credentials[0]).Scan(¤tPSN) - if err != nil { - s.sendCode(SIGN_ECOGLINK) - return - } else if psn != currentPSN { - s.sendCode(SIGN_EMBID) - return - } - - _, err = s.server.db.Exec(`UPDATE users SET psn_id = $1 WHERE username = $2`, psn, credentials[0]) - if err == nil { - s.sendCode(SIGN_SUCCESS) - } - } else { + uid, resp := s.server.validateLogin(credentials[0], credentials[1]) + if resp == SIGN_SUCCESS && uid > 0 { + var psn string + err := s.server.db.QueryRow(`SELECT psn_id FROM sign_sessions WHERE token = $1`, token).Scan(&psn) + if err != nil { s.sendCode(SIGN_ECOGLINK) + return } + // Since we check for the psn_id, this will never run + var exists int + err = s.server.db.QueryRow(`SELECT count(*) FROM users WHERE psn_id = $1`, psn).Scan(&exists) + if err != nil { + s.sendCode(SIGN_ECOGLINK) + return + } else if exists > 0 { + s.sendCode(SIGN_EPSI) + return + } + + var currentPSN string + err = s.server.db.QueryRow(`SELECT COALESCE(psn_id, '') FROM users WHERE username = $1`, credentials[0]).Scan(¤tPSN) + if err != nil { + s.sendCode(SIGN_ECOGLINK) + return + } else if currentPSN != "" { + s.sendCode(SIGN_EMBID) + return + } + + _, err = s.server.db.Exec(`UPDATE users SET psn_id = $1 WHERE username = $2`, psn, credentials[0]) + if err == nil { + s.sendCode(SIGN_SUCCESS) + return + } } + s.sendCode(SIGN_ECOGLINK) } func (s *Session) handleDSGN(bf *byteframe.ByteFrame) { From a065643783a34ba7e41c664895d13a2f66dcb95b Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 02:50:38 -0400 Subject: [PATCH 03/66] feature: JPK encryption and databased events --- common/byteframe/byteframe.go | 4 + common/decryption/jpk.go | 117 +++++++++++++++++ patch-schema/event_quests.sql | 11 ++ server/channelserver/handlers_quest.go | 166 +++++++++++++++++++++++-- 4 files changed, 285 insertions(+), 13 deletions(-) create mode 100644 common/decryption/jpk.go create mode 100644 patch-schema/event_quests.sql diff --git a/common/byteframe/byteframe.go b/common/byteframe/byteframe.go index ffeb66dc1..357595fe0 100644 --- a/common/byteframe/byteframe.go +++ b/common/byteframe/byteframe.go @@ -138,6 +138,10 @@ func (b *ByteFrame) DataFromCurrent() []byte { return b.buf[b.index:b.usedSize] } +func (b *ByteFrame) Index() uint { + return b.index +} + // SetLE sets the byte order to litte endian. func (b *ByteFrame) SetLE() { b.byteOrder = binary.LittleEndian diff --git a/common/decryption/jpk.go b/common/decryption/jpk.go new file mode 100644 index 000000000..e40c97a43 --- /dev/null +++ b/common/decryption/jpk.go @@ -0,0 +1,117 @@ +package decryption + +/* + This code is HEAVILY based from + https://github.com/Chakratos/ReFrontier/blob/master/ReFrontier/Unpack.cs +*/ + +import ( + "erupe-ce/common/byteframe" + "io" +) + +var m_shiftIndex int = 0 +var m_flag byte = byte(0) + +func UnpackSimple(data []byte) []byte { + m_shiftIndex = 0 + m_flag = byte(0) + + bf := byteframe.NewByteFrameFromBytes(data) + bf.SetLE() + header := bf.ReadUint32() + + println("Decrypting") + + if header == 0x1A524B4A { + bf.Seek(0x2, io.SeekCurrent) + jpkType := bf.ReadUint16() + println("JPK Type: ", jpkType) + + switch jpkType { + case 3: + startOffset := bf.ReadInt32() + outSize := bf.ReadInt32() + outBuffer := make([]byte, outSize) + bf.Seek(int64(startOffset), io.SeekStart) + ProcessDecode(bf, outBuffer) + + return outBuffer + } + } + + println("Skipping") + + return data +} + +func ProcessDecode(data *byteframe.ByteFrame, outBuffer []byte) { + outIndex := 0 + + for int(data.Index()) < len(data.Data()) && outIndex < len(outBuffer)-1 { + if JPKBitshift(data) == 0 { + outBuffer[outIndex] = ReadByte(data) + outIndex++ + continue + } else { + if JPKBitshift(data) == 0 { + len := (JPKBitshift(data) << 1) | JPKBitshift(data) + off := ReadByte(data) + JPKCopy(outBuffer, int(off), int(len)+3, &outIndex) + continue + } else { + hi := ReadByte(data) + lo := ReadByte(data) + var len int = int((hi & 0xE0)) >> 5 + var off int = ((int(hi) & 0x1F) << 8) | int(lo) + if len != 0 { + JPKCopy(outBuffer, off, len+2, &outIndex) + continue + } else { + if JPKBitshift(data) == 0 { + len := (JPKBitshift(data) << 3) | (JPKBitshift(data) << 2) | (JPKBitshift(data) << 1) | JPKBitshift(data) + JPKCopy(outBuffer, off, int(len)+2+8, &outIndex) + continue + } else { + temp := ReadByte(data) + if temp == 0xFF { + for i := 0; i < off+0x1B; i++ { + outBuffer[outIndex] = ReadByte(data) + outIndex++ + continue + } + } else { + JPKCopy(outBuffer, off, int(temp)+0x1a, &outIndex) + } + } + } + } + } + } +} + +func JPKBitshift(data *byteframe.ByteFrame) byte { + m_shiftIndex-- + + if m_shiftIndex < 0 { + m_shiftIndex = 7 + m_flag = ReadByte(data) + } + + return (byte)((m_flag >> m_shiftIndex) & 1) +} + +func JPKCopy(outBuffer []byte, offset int, length int, index *int) { + for i := 0; i < length; i++ { + outBuffer[*index] = outBuffer[*index-offset-1] + *index++ + } +} + +func ReadByte(bf *byteframe.ByteFrame) byte { + value := bf.ReadUint8() + if value < 0 { + println("Not implemented") + } + return byte(value) +} diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql new file mode 100644 index 000000000..85e7bccfe --- /dev/null +++ b/patch-schema/event_quests.sql @@ -0,0 +1,11 @@ +BEGIN; + +create table if not exists event_quests +( + id serial, + max_players integer, + quest_type integer, + quest_id uint16 not null +); + +END; \ No newline at end of file diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 8f40f7539..eb984f028 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -1,14 +1,17 @@ package channelserver import ( + "database/sql" "erupe-ce/common/byteframe" + "erupe-ce/common/decryption" "erupe-ce/network/mhfpacket" "fmt" - "go.uber.org/zap" "io" "os" "path/filepath" "time" + + "go.uber.org/zap" ) func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { @@ -79,34 +82,170 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } +func readOriginalPointers(string_pointer int32, quest []byte) []byte { + file_bytes := byteframe.NewByteFrameFromBytes(quest) + file_bytes.SetLE() + file_bytes.Seek(int64(string_pointer), io.SeekStart) + + quest_name_pointer := file_bytes.ReadInt32() + quest_main_pointer := file_bytes.ReadInt32() + quest_a_pointer := file_bytes.ReadInt32() + quest_b_pointer := file_bytes.ReadInt32() + quest_clear_pointer := file_bytes.ReadInt32() + quest_failure_pointer := file_bytes.ReadInt32() + quest_contractor_pointer := file_bytes.ReadInt32() + quest_description_pointer := file_bytes.ReadInt32() + //Use String header pointers to seek to string and then read null terminated string + file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) + quest_name_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) + quest_main_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_a_pointer), io.SeekStart) + quest_a_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_b_pointer), io.SeekStart) + quest_b_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_clear_pointer), io.SeekStart) + quest_clear_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_failure_pointer), io.SeekStart) + quest_failure_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_contractor_pointer), io.SeekStart) + quest_contractor_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_description_pointer), io.SeekStart) + quest_description_string := file_bytes.ReadNullTerminatedBytes() + + new_pointers := byteframe.NewByteFrame() + new_pointers.SetLE() + pointer_start := 352 + + new_pointers.WriteInt32(int32(pointer_start)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + 1)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + 2)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + 3)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + 26)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + 5)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + 6)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + len(quest_contractor_string) + 7)) + + new_pointers.WriteNullTerminatedBytes(quest_name_string) + new_pointers.WriteNullTerminatedBytes(quest_main_string) + new_pointers.WriteNullTerminatedBytes(quest_a_string) + new_pointers.WriteNullTerminatedBytes(quest_b_string) + new_pointers.WriteNullTerminatedBytes(quest_clear_string) + new_pointers.WriteNullTerminatedBytes(quest_failure_string) + new_pointers.WriteNullTerminatedBytes(quest_contractor_string) + new_pointers.WriteNullTerminatedBytes(quest_description_string) + new_pointers.WriteUint8(18) + new_pointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) + + return new_pointers.Data() +} + +func loadQuestFile(s *Session, quest_id string) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", quest_id))) + + if err != nil { + s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, quest_id)) + return nil + } + + println(fmt.Sprintf("quests/%s.bin", quest_id)) + decrypted := decryption.UnpackSimple(file) + os.WriteFile(fmt.Sprintf("%s.bin", quest_id), decrypted, 0644) + + println("Reading quest file " + quest_id) + + file_bytes := byteframe.NewByteFrameFromBytes(decrypted) + file_bytes.SetLE() + file_bytes.Seek(0, io.SeekStart) + + data_pointer := file_bytes.ReadInt32() + file_bytes.Seek(int64(data_pointer), io.SeekStart) + + // Read the quest data. + quest_body := file_bytes.ReadBytes(320) + + quest_pointer := byteframe.NewByteFrameFromBytes(quest_body) + quest_pointer.SetLE() + + quest_pointer.Seek(40, io.SeekStart) + string_pointer := quest_pointer.ReadInt32() + + strings := readOriginalPointers(string_pointer, decrypted) + + body := byteframe.NewByteFrame() + body.WriteBytes(quest_body) + body.Seek(0, io.SeekEnd) + body.WriteBytes(strings) + + return body.Data() +} + +func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { + var id int32 + var max_players, quest_type, quest_id uint16 + rows.Scan(&id, &max_players, &quest_type, &quest_id) + + bf := byteframe.NewByteFrame() + bf.SetLE() + bf.WriteInt32(id) + bf.WriteInt32(0) + bf.WriteBytes([]byte{0x0F, byte(max_players), byte(quest_type), 0x01}) + bf.WriteUint16(0) + bf.WriteUint16(0) + bf.WriteBytes([]byte{0x00, 0x01}) + bf.WriteUint16(0) + bf.WriteBytes([]byte{0x02, 0x00}) + + data := loadQuestFile(s, fmt.Sprintf("%d", quest_id)+"d0") + + if data == nil { + return nil, fmt.Errorf("failed to load quest file") + } + + bf.WriteBytes(data) + + // update checksum + bf.Seek(21, io.SeekStart) + bf.WriteUint8(uint8(len(bf.Data()) - 553)) + + // overwrite bytes at pos 62 + bf.Seek(62, io.SeekStart) + bf.WriteInt16(320) + + return bf.Data(), nil +} + func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfEnumerateQuest) var totalCount, returnedCount uint16 bf := byteframe.NewByteFrame() bf.WriteUint16(0) - filepath.Walk(fmt.Sprintf("%s/events/", s.server.erupeConfig.BinPath), func(path string, info os.FileInfo, err error) error { + + rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id ASC") + + // Loop through each row and load the quest entry if it exists. + for rows.Next() { + var pointer []byte + var max_players, quest_type, checksum, quest_id uint16 + rows.Scan(&pointer, &max_players, &quest_type, &checksum, &quest_id) + + data, err := makeEventQuest(s, rows) + if err != nil { - return err - } else if info.IsDir() { - return nil - } - data, err := os.ReadFile(path) - if err != nil { - return err + continue } else { if len(data) > 850 || len(data) < 400 { - return nil // Could be more or less strict with size limits + continue } else { totalCount++ if totalCount > pkt.Offset && len(bf.Data()) < 60000 { returnedCount++ bf.WriteBytes(data) - return nil + continue } } } - return nil - }) + } type tuneValue struct { ID uint16 @@ -549,6 +688,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(pkt.Offset) bf.Seek(0, io.SeekStart) bf.WriteUint16(returnedCount) + doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } From 99bbb08758b10fa7aa05308ba113ae01e84eac31 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 02:53:45 -0400 Subject: [PATCH 04/66] refactor: Remove debug coded --- config.json | 4 ++-- server/channelserver/handlers_quest.go | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config.json b/config.json index 1e09daddd..1b5d46ff9 100644 --- a/config.json +++ b/config.json @@ -110,9 +110,9 @@ ], "Database": { "Host": "localhost", - "Port": 5432, + "Port": 5433, "User": "postgres", - "Password": "", + "Password": "admin", "Database": "erupe" }, "Sign": { diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index eb984f028..42868577c 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -144,15 +144,10 @@ func loadQuestFile(s *Session, quest_id string) []byte { file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", quest_id))) if err != nil { - s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, quest_id)) return nil } - println(fmt.Sprintf("quests/%s.bin", quest_id)) decrypted := decryption.UnpackSimple(file) - os.WriteFile(fmt.Sprintf("%s.bin", quest_id), decrypted, 0644) - - println("Reading quest file " + quest_id) file_bytes := byteframe.NewByteFrameFromBytes(decrypted) file_bytes.SetLE() From c3fb6aa821fcb67e9267b96650750c619d87f5b9 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 02:58:10 -0400 Subject: [PATCH 05/66] refactor: Remove more debug code --- common/decryption/jpk.go | 8 -------- server/channelserver/handlers_quest.go | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/common/decryption/jpk.go b/common/decryption/jpk.go index e40c97a43..08f756d28 100644 --- a/common/decryption/jpk.go +++ b/common/decryption/jpk.go @@ -21,12 +21,9 @@ func UnpackSimple(data []byte) []byte { bf.SetLE() header := bf.ReadUint32() - println("Decrypting") - if header == 0x1A524B4A { bf.Seek(0x2, io.SeekCurrent) jpkType := bf.ReadUint16() - println("JPK Type: ", jpkType) switch jpkType { case 3: @@ -40,8 +37,6 @@ func UnpackSimple(data []byte) []byte { } } - println("Skipping") - return data } @@ -110,8 +105,5 @@ func JPKCopy(outBuffer []byte, offset int, length int, index *int) { func ReadByte(bf *byteframe.ByteFrame) byte { value := bf.ReadUint8() - if value < 0 { - println("Not implemented") - } return byte(value) } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 42868577c..fe7eef115 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -95,7 +95,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { quest_failure_pointer := file_bytes.ReadInt32() quest_contractor_pointer := file_bytes.ReadInt32() quest_description_pointer := file_bytes.ReadInt32() - //Use String header pointers to seek to string and then read null terminated string + file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) quest_name_string := file_bytes.ReadNullTerminatedBytes() file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) @@ -134,6 +134,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { new_pointers.WriteNullTerminatedBytes(quest_failure_string) new_pointers.WriteNullTerminatedBytes(quest_contractor_string) new_pointers.WriteNullTerminatedBytes(quest_description_string) + new_pointers.WriteUint8(18) new_pointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) From 43b7418558da11ffe819b93b0d12a235015eb54b Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 03:08:35 -0400 Subject: [PATCH 06/66] refactor: General code clean up --- server/channelserver/handlers_quest.go | 27 +++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index fe7eef115..22c7823ca 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -96,6 +96,8 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { quest_contractor_pointer := file_bytes.ReadInt32() quest_description_pointer := file_bytes.ReadInt32() + // Read the strings in order to determine the length of the new string pointers for use in the new offsets + // It must seek to each initial pointer since the order is not consistent. file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) quest_name_string := file_bytes.ReadNullTerminatedBytes() file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) @@ -113,9 +115,10 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { file_bytes.Seek(int64(quest_description_pointer), io.SeekStart) quest_description_string := file_bytes.ReadNullTerminatedBytes() + pointer_start := 352 + new_pointers := byteframe.NewByteFrame() new_pointers.SetLE() - pointer_start := 352 new_pointers.WriteInt32(int32(pointer_start)) new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + 1)) @@ -157,19 +160,15 @@ func loadQuestFile(s *Session, quest_id string) []byte { data_pointer := file_bytes.ReadInt32() file_bytes.Seek(int64(data_pointer), io.SeekStart) - // Read the quest data. - quest_body := file_bytes.ReadBytes(320) + // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. + quest_body := byteframe.NewByteFrameFromBytes(file_bytes.ReadBytes(320)) + quest_body.SetLE() + quest_body.Seek(40, io.SeekStart) - quest_pointer := byteframe.NewByteFrameFromBytes(quest_body) - quest_pointer.SetLE() - - quest_pointer.Seek(40, io.SeekStart) - string_pointer := quest_pointer.ReadInt32() - - strings := readOriginalPointers(string_pointer, decrypted) + strings := readOriginalPointers(quest_body.ReadInt32(), decrypted) body := byteframe.NewByteFrame() - body.WriteBytes(quest_body) + body.WriteBytes(quest_body.Data()) body.Seek(0, io.SeekEnd) body.WriteBytes(strings) @@ -183,6 +182,8 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf := byteframe.NewByteFrame() bf.SetLE() + + // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. bf.WriteInt32(id) bf.WriteInt32(0) bf.WriteBytes([]byte{0x0F, byte(max_players), byte(quest_type), 0x01}) @@ -200,11 +201,11 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteBytes(data) - // update checksum + // Update the checksum at pos 21, the checksum is determined the total length of the file minus 553 turned into a single byte. bf.Seek(21, io.SeekStart) bf.WriteUint8(uint8(len(bf.Data()) - 553)) - // overwrite bytes at pos 62 + // Overwrite the string-pointer at 62 to point at 320. This is always 320 and does not count the 22 from the event header. bf.Seek(62, io.SeekStart) bf.WriteInt16(320) From b16ec769ced363ead229899cb49228168dd52fc9 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 03:15:57 -0400 Subject: [PATCH 07/66] Forgot to clear config --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 1b5d46ff9..1e09daddd 100644 --- a/config.json +++ b/config.json @@ -110,9 +110,9 @@ ], "Database": { "Host": "localhost", - "Port": 5433, + "Port": 5432, "User": "postgres", - "Password": "admin", + "Password": "", "Database": "erupe" }, "Sign": { From 0bd4658a23fd1661d3b80fbc6e58efa4e2da73ee Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 3 Jul 2023 20:31:53 +1000 Subject: [PATCH 08/66] golang formatting pass --- common/decryption/jpk.go | 44 ++++---- server/channelserver/handlers_quest.go | 136 ++++++++++++------------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/common/decryption/jpk.go b/common/decryption/jpk.go index 08f756d28..99011b625 100644 --- a/common/decryption/jpk.go +++ b/common/decryption/jpk.go @@ -10,12 +10,12 @@ import ( "io" ) -var m_shiftIndex int = 0 -var m_flag byte = byte(0) +var mShiftIndex = 0 +var mFlag = byte(0) func UnpackSimple(data []byte) []byte { - m_shiftIndex = 0 - m_flag = byte(0) + mShiftIndex = 0 + mFlag = byte(0) bf := byteframe.NewByteFrameFromBytes(data) bf.SetLE() @@ -44,28 +44,28 @@ func ProcessDecode(data *byteframe.ByteFrame, outBuffer []byte) { outIndex := 0 for int(data.Index()) < len(data.Data()) && outIndex < len(outBuffer)-1 { - if JPKBitshift(data) == 0 { + if JPKBitShift(data) == 0 { outBuffer[outIndex] = ReadByte(data) outIndex++ continue } else { - if JPKBitshift(data) == 0 { - len := (JPKBitshift(data) << 1) | JPKBitshift(data) + if JPKBitShift(data) == 0 { + length := (JPKBitShift(data) << 1) | JPKBitShift(data) off := ReadByte(data) - JPKCopy(outBuffer, int(off), int(len)+3, &outIndex) + JPKCopy(outBuffer, int(off), int(length)+3, &outIndex) continue } else { hi := ReadByte(data) lo := ReadByte(data) - var len int = int((hi & 0xE0)) >> 5 - var off int = ((int(hi) & 0x1F) << 8) | int(lo) - if len != 0 { - JPKCopy(outBuffer, off, len+2, &outIndex) + length := int(hi&0xE0) >> 5 + off := ((int(hi) & 0x1F) << 8) | int(lo) + if length != 0 { + JPKCopy(outBuffer, off, length+2, &outIndex) continue } else { - if JPKBitshift(data) == 0 { - len := (JPKBitshift(data) << 3) | (JPKBitshift(data) << 2) | (JPKBitshift(data) << 1) | JPKBitshift(data) - JPKCopy(outBuffer, off, int(len)+2+8, &outIndex) + if JPKBitShift(data) == 0 { + length := (JPKBitShift(data) << 3) | (JPKBitShift(data) << 2) | (JPKBitShift(data) << 1) | JPKBitShift(data) + JPKCopy(outBuffer, off, int(length)+2+8, &outIndex) continue } else { temp := ReadByte(data) @@ -85,15 +85,15 @@ func ProcessDecode(data *byteframe.ByteFrame, outBuffer []byte) { } } -func JPKBitshift(data *byteframe.ByteFrame) byte { - m_shiftIndex-- +func JPKBitShift(data *byteframe.ByteFrame) byte { + mShiftIndex-- - if m_shiftIndex < 0 { - m_shiftIndex = 7 - m_flag = ReadByte(data) + if mShiftIndex < 0 { + mShiftIndex = 7 + mFlag = ReadByte(data) } - return (byte)((m_flag >> m_shiftIndex) & 1) + return (byte)((mFlag >> mShiftIndex) & 1) } func JPKCopy(outBuffer []byte, offset int, length int, index *int) { @@ -105,5 +105,5 @@ func JPKCopy(outBuffer []byte, offset int, length int, index *int) { func ReadByte(bf *byteframe.ByteFrame) byte { value := bf.ReadUint8() - return byte(value) + return value } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 22c7823ca..dfa8bea0e 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -83,69 +83,69 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { } func readOriginalPointers(string_pointer int32, quest []byte) []byte { - file_bytes := byteframe.NewByteFrameFromBytes(quest) - file_bytes.SetLE() - file_bytes.Seek(int64(string_pointer), io.SeekStart) + fileBytes := byteframe.NewByteFrameFromBytes(quest) + fileBytes.SetLE() + fileBytes.Seek(int64(string_pointer), io.SeekStart) - quest_name_pointer := file_bytes.ReadInt32() - quest_main_pointer := file_bytes.ReadInt32() - quest_a_pointer := file_bytes.ReadInt32() - quest_b_pointer := file_bytes.ReadInt32() - quest_clear_pointer := file_bytes.ReadInt32() - quest_failure_pointer := file_bytes.ReadInt32() - quest_contractor_pointer := file_bytes.ReadInt32() - quest_description_pointer := file_bytes.ReadInt32() + questNamePointer := fileBytes.ReadInt32() + questMainPointer := fileBytes.ReadInt32() + questAPointer := fileBytes.ReadInt32() + questBPointer := fileBytes.ReadInt32() + questClearPointer := fileBytes.ReadInt32() + questFailurePointer := fileBytes.ReadInt32() + questContractorPointer := fileBytes.ReadInt32() + questDescriptionPointer := fileBytes.ReadInt32() // Read the strings in order to determine the length of the new string pointers for use in the new offsets // It must seek to each initial pointer since the order is not consistent. - file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) - quest_name_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) - quest_main_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_a_pointer), io.SeekStart) - quest_a_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_b_pointer), io.SeekStart) - quest_b_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_clear_pointer), io.SeekStart) - quest_clear_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_failure_pointer), io.SeekStart) - quest_failure_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_contractor_pointer), io.SeekStart) - quest_contractor_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_description_pointer), io.SeekStart) - quest_description_string := file_bytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questNamePointer), io.SeekStart) + questNameString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questMainPointer), io.SeekStart) + questMainString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questAPointer), io.SeekStart) + questAString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questBPointer), io.SeekStart) + questBString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questClearPointer), io.SeekStart) + questClearString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questFailurePointer), io.SeekStart) + questFailureString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questContractorPointer), io.SeekStart) + questContractorString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questDescriptionPointer), io.SeekStart) + questDescriptionString := fileBytes.ReadNullTerminatedBytes() - pointer_start := 352 + pointerStart := 352 - new_pointers := byteframe.NewByteFrame() - new_pointers.SetLE() + newPointers := byteframe.NewByteFrame() + newPointers.SetLE() - new_pointers.WriteInt32(int32(pointer_start)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + 1)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + 2)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + 3)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + 26)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + 5)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + 6)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + len(quest_contractor_string) + 7)) + newPointers.WriteInt32(int32(pointerStart)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + 1)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + 2)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + 3)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 26)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + 5)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + 6)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + len(questContractorString) + 7)) - new_pointers.WriteNullTerminatedBytes(quest_name_string) - new_pointers.WriteNullTerminatedBytes(quest_main_string) - new_pointers.WriteNullTerminatedBytes(quest_a_string) - new_pointers.WriteNullTerminatedBytes(quest_b_string) - new_pointers.WriteNullTerminatedBytes(quest_clear_string) - new_pointers.WriteNullTerminatedBytes(quest_failure_string) - new_pointers.WriteNullTerminatedBytes(quest_contractor_string) - new_pointers.WriteNullTerminatedBytes(quest_description_string) + newPointers.WriteNullTerminatedBytes(questNameString) + newPointers.WriteNullTerminatedBytes(questMainString) + newPointers.WriteNullTerminatedBytes(questAString) + newPointers.WriteNullTerminatedBytes(questBString) + newPointers.WriteNullTerminatedBytes(questClearString) + newPointers.WriteNullTerminatedBytes(questFailureString) + newPointers.WriteNullTerminatedBytes(questContractorString) + newPointers.WriteNullTerminatedBytes(questDescriptionString) - new_pointers.WriteUint8(18) - new_pointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) + newPointers.WriteUint8(18) + newPointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) - return new_pointers.Data() + return newPointers.Data() } -func loadQuestFile(s *Session, quest_id string) []byte { - file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", quest_id))) +func loadQuestFile(s *Session, questId string) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questId))) if err != nil { return nil @@ -153,22 +153,22 @@ func loadQuestFile(s *Session, quest_id string) []byte { decrypted := decryption.UnpackSimple(file) - file_bytes := byteframe.NewByteFrameFromBytes(decrypted) - file_bytes.SetLE() - file_bytes.Seek(0, io.SeekStart) + fileBytes := byteframe.NewByteFrameFromBytes(decrypted) + fileBytes.SetLE() + fileBytes.Seek(0, io.SeekStart) - data_pointer := file_bytes.ReadInt32() - file_bytes.Seek(int64(data_pointer), io.SeekStart) + dataPointer := fileBytes.ReadInt32() + fileBytes.Seek(int64(dataPointer), io.SeekStart) // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. - quest_body := byteframe.NewByteFrameFromBytes(file_bytes.ReadBytes(320)) - quest_body.SetLE() - quest_body.Seek(40, io.SeekStart) + questBody := byteframe.NewByteFrameFromBytes(fileBytes.ReadBytes(320)) + questBody.SetLE() + questBody.Seek(40, io.SeekStart) - strings := readOriginalPointers(quest_body.ReadInt32(), decrypted) + strings := readOriginalPointers(questBody.ReadInt32(), decrypted) body := byteframe.NewByteFrame() - body.WriteBytes(quest_body.Data()) + body.WriteBytes(questBody.Data()) body.Seek(0, io.SeekEnd) body.WriteBytes(strings) @@ -177,8 +177,8 @@ func loadQuestFile(s *Session, quest_id string) []byte { func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { var id int32 - var max_players, quest_type, quest_id uint16 - rows.Scan(&id, &max_players, &quest_type, &quest_id) + var maxPlayers, questType, questId uint16 + rows.Scan(&id, &maxPlayers, &questType, &questId) bf := byteframe.NewByteFrame() bf.SetLE() @@ -186,14 +186,14 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. bf.WriteInt32(id) bf.WriteInt32(0) - bf.WriteBytes([]byte{0x0F, byte(max_players), byte(quest_type), 0x01}) + bf.WriteBytes([]byte{0x0F, byte(maxPlayers), byte(questType), 0x01}) bf.WriteUint16(0) bf.WriteUint16(0) bf.WriteBytes([]byte{0x00, 0x01}) bf.WriteUint16(0) bf.WriteBytes([]byte{0x02, 0x00}) - data := loadQuestFile(s, fmt.Sprintf("%d", quest_id)+"d0") + data := loadQuestFile(s, fmt.Sprintf("%d", questId)+"d0") if data == nil { return nil, fmt.Errorf("failed to load quest file") @@ -218,13 +218,13 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() bf.WriteUint16(0) - rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id ASC") + rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id") // Loop through each row and load the quest entry if it exists. for rows.Next() { var pointer []byte - var max_players, quest_type, checksum, quest_id uint16 - rows.Scan(&pointer, &max_players, &quest_type, &checksum, &quest_id) + var maxPlayers, questType, checksum, questId uint16 + rows.Scan(&pointer, &maxPlayers, &questType, &checksum, &questId) data, err := makeEventQuest(s, rows) From e29ce1d82f5132b7e68e7468915904489c454416 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 3 Jul 2023 20:33:03 +1000 Subject: [PATCH 09/66] fix events_quests id missing PK flag --- patch-schema/event_quests.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql index 85e7bccfe..8350d0a70 100644 --- a/patch-schema/event_quests.sql +++ b/patch-schema/event_quests.sql @@ -2,7 +2,7 @@ BEGIN; create table if not exists event_quests ( - id serial, + id serial primary key, max_players integer, quest_type integer, quest_id uint16 not null From 414eb3da908c6cb309bdccf0051fc4ff74d92aea Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 4 Jul 2023 20:34:00 +1000 Subject: [PATCH 10/66] fix Quest ID padding --- server/channelserver/handlers_quest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index dfa8bea0e..69f9e2e9a 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -193,7 +193,7 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint16(0) bf.WriteBytes([]byte{0x02, 0x00}) - data := loadQuestFile(s, fmt.Sprintf("%d", questId)+"d0") + data := loadQuestFile(s, fmt.Sprintf("%05d", questId)+"d0") if data == nil { return nil, fmt.Errorf("failed to load quest file") From f487db83dacee4c6c0a7d841c724799dda80b412 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 5 Jul 2023 00:03:16 +1000 Subject: [PATCH 11/66] change Enumerated Quest format --- patch-schema/event_quests.sql | 7 ++++--- server/channelserver/handlers_quest.go | 17 ++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql index 8350d0a70..b2566e50d 100644 --- a/patch-schema/event_quests.sql +++ b/patch-schema/event_quests.sql @@ -2,10 +2,11 @@ BEGIN; create table if not exists event_quests ( - id serial primary key, + id serial primary key, max_players integer, - quest_type integer, - quest_id uint16 not null + quest_type integer not null, + quest_id integer not null, + mark integer ); END; \ No newline at end of file diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 69f9e2e9a..5e6cb83a9 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -177,8 +177,9 @@ func loadQuestFile(s *Session, questId string) []byte { func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { var id int32 - var maxPlayers, questType, questId uint16 - rows.Scan(&id, &maxPlayers, &questType, &questId) + var questId uint16 + var maxPlayers, questType, mark uint8 + rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) bf := byteframe.NewByteFrame() bf.SetLE() @@ -186,12 +187,14 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. bf.WriteInt32(id) bf.WriteInt32(0) - bf.WriteBytes([]byte{0x0F, byte(maxPlayers), byte(questType), 0x01}) + bf.WriteUint8(0) // Indexer + bf.WriteUint8(maxPlayers) + bf.WriteUint8(questType) + bf.WriteUint8(mark) + bf.WriteUint16(0) + bf.WriteUint32(0) bf.WriteUint16(0) bf.WriteUint16(0) - bf.WriteBytes([]byte{0x00, 0x01}) - bf.WriteUint16(0) - bf.WriteBytes([]byte{0x02, 0x00}) data := loadQuestFile(s, fmt.Sprintf("%05d", questId)+"d0") @@ -218,7 +221,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() bf.WriteUint16(0) - rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id") + rows, _ := s.server.db.Query("SELECT id, COALESCE(max_players, 4) AS max_players, quest_type, quest_id, COALESCE(mark, 0) AS mark FROM event_quests ORDER BY quest_id") // Loop through each row and load the quest entry if it exists. for rows.Next() { From ba20d2da849520819bbedb910486393e1b09cfa8 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Tue, 4 Jul 2023 21:12:08 -0400 Subject: [PATCH 12/66] fix: Fix quest success check --- config.json | 4 ++-- server/channelserver/handlers_quest.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.json b/config.json index 1e09daddd..1b5d46ff9 100644 --- a/config.json +++ b/config.json @@ -110,9 +110,9 @@ ], "Database": { "Host": "localhost", - "Port": 5432, + "Port": 5433, "User": "postgres", - "Password": "", + "Password": "admin", "Database": "erupe" }, "Sign": { diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index dfa8bea0e..2baf6fb17 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -124,7 +124,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { newPointers.WriteInt32(int32(pointerStart + len(questNameString) + 1)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + 2)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + 3)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 26)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 4)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + 5)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + 6)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + len(questContractorString) + 7)) From 35f9d5ac187099abe8851bd419948e98ffcfc59f Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Wed, 5 Jul 2023 19:29:39 -0400 Subject: [PATCH 13/66] feature: Season implementation --- config/config.go | 1 + server/channelserver/handlers_quest.go | 48 ++++++++++++++++++++++++-- server/entranceserver/make_resp.go | 10 ++---- 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/config/config.go b/config/config.go index 7ef6c9bad..5c4ee693d 100644 --- a/config/config.go +++ b/config/config.go @@ -110,6 +110,7 @@ type DevModeOptions struct { QuestDebugTools bool // Enable various quest debug logs EarthStatusOverride int32 EarthIDOverride int32 + DynamicSeasons bool // Enables dynamic seasons EarthMonsterOverride int32 SaveDumps SaveDumpOptions } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 99002afe0..0da70b21d 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -51,8 +51,19 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { zap.String("Filename", pkt.Filename), ) } - // Get quest file. - data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + + // Get quest file and convert to season if the option is enabled + var data []byte + var err error + + if s.server.erupeConfig.DevModeOptions.DynamicSeasons { + data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + } else { + data, err = os.ReadFile(seasonConversion(s, filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))) + } + + // convert based on season + if err != nil { s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) // This will crash the game. @@ -64,6 +75,39 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { } } +// Convert the file to load based on the season +func seasonConversion(s *Session, questPath string) string { + + // remove the last 6 from the quest path + newQuestPath := questPath[:len(questPath)-6] + + // Calculate the current day of the season in order to determine time scale + currentDayOfSeason := (time.Now().Unix()/6000)%15 + 1 + // Determine if it is day or night based on the current day of the season + timeCycle := uint8(((currentDayOfSeason % 1) * 24)) < 12 + + // Determine the current season based on a modulus of the current time + season := uint8((int(float64((time.Now().Unix() * int64(s.server.ID)) / (6000 * 15)))) % 3) + + var timeSet string + + // Determine the letter to append for day / night + if timeCycle { + timeSet = "n" + } else { + timeSet = "d" + } + + fileName := fmt.Sprintf("%s%s%d.bin", newQuestPath, timeSet, season) + + // Return the original if the season-based file does not exist for some reason + if _, err := os.Stat(fileName); err == nil { + return fileName + } else { + return questPath + } +} + func handleMsgMhfLoadFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfLoadFavoriteQuest) var data []byte diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index 0e2466865..cd4b97cdb 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -6,6 +6,7 @@ import ( _config "erupe-ce/config" "fmt" "net" + "time" "erupe-ce/common/stringsupport" @@ -13,9 +14,6 @@ import ( "erupe-ce/server/channelserver" ) -// Server Entries -var season uint8 - // Server Channels var currentplayers uint16 @@ -36,10 +34,8 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { } } sid := (4096 + serverIdx*256) + 16 - err := s.db.QueryRow("SELECT season FROM servers WHERE server_id=$1", sid).Scan(&season) - if err != nil { - season = 0 - } + //season := (uint8(float64((time.Now().Unix() + int64(sid)) / 1000))) % 3 + season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) if si.IP == "" { si.IP = config.Host } From 830bee8c6ff88e1ec2d99fc24f7d9eeb18f500f0 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Wed, 5 Jul 2023 19:31:26 -0400 Subject: [PATCH 14/66] config: Add config options for seasons --- config.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 1b5d46ff9..f9a092487 100644 --- a/config.json +++ b/config.json @@ -29,6 +29,7 @@ "QuestDebugTools": false, "EarthStatusOverride": 0, "EarthIDOverride": 0, + "DynamicSeasons": false, "EarthMonsterOverride": 0, "SaveDumps": { "Enabled": true, @@ -110,9 +111,9 @@ ], "Database": { "Host": "localhost", - "Port": 5433, + "Port": 5432, "User": "postgres", - "Password": "admin", + "Password": "", "Database": "erupe" }, "Sign": { From 6938b57a60ff661d79e7a756c33fa4ed01746339 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Thu, 6 Jul 2023 17:00:17 -0400 Subject: [PATCH 15/66] fix: Timescale fixes for seasons --- bin/quests/desktop.ini | 2372 +++++++++++++++++++++ config.json | 17 +- server/channelserver/handlers_distitem.go | 1 + server/channelserver/handlers_quest.go | 10 +- server/entranceserver/make_resp.go | 2 +- 5 files changed, 2391 insertions(+), 11 deletions(-) create mode 100644 bin/quests/desktop.ini diff --git a/bin/quests/desktop.ini b/bin/quests/desktop.ini new file mode 100644 index 000000000..a71744976 --- /dev/null +++ b/bin/quests/desktop.ini @@ -0,0 +1,2372 @@ +[LocalizedFileNames] +23484d1.bin=@23484d1.bin,0 +23484d2.bin=@23484d2.bin,0 +23484n0.bin=@23484n0.bin,0 +23484n1.bin=@23484n1.bin,0 +23484n2.bin=@23484n2.bin,0 +23485d0.bin=@23485d0.bin,0 +23485d1.bin=@23485d1.bin,0 +23485d2.bin=@23485d2.bin,0 +23485n0.bin=@23485n0.bin,0 +23485n1.bin=@23485n1.bin,0 +23485n2.bin=@23485n2.bin,0 +23486d0.bin=@23486d0.bin,0 +23486d1.bin=@23486d1.bin,0 +23486d2.bin=@23486d2.bin,0 +23486n0.bin=@23486n0.bin,0 +23486n1.bin=@23486n1.bin,0 +23486n2.bin=@23486n2.bin,0 +23487d0.bin=@23487d0.bin,0 +23487d1.bin=@23487d1.bin,0 +23487d2.bin=@23487d2.bin,0 +23487n0.bin=@23487n0.bin,0 +23487n1.bin=@23487n1.bin,0 +23487n2.bin=@23487n2.bin,0 +23488d0.bin=@23488d0.bin,0 +23488d1.bin=@23488d1.bin,0 +23488d2.bin=@23488d2.bin,0 +23488n0.bin=@23488n0.bin,0 +23488n1.bin=@23488n1.bin,0 +23488n2.bin=@23488n2.bin,0 +23489d0.bin=@23489d0.bin,0 +23489d1.bin=@23489d1.bin,0 +23489d2.bin=@23489d2.bin,0 +23489n0.bin=@23489n0.bin,0 +23489n1.bin=@23489n1.bin,0 +23489n2.bin=@23489n2.bin,0 +23490d0.bin=@23490d0.bin,0 +23490d1.bin=@23490d1.bin,0 +23490d2.bin=@23490d2.bin,0 +23490n0.bin=@23490n0.bin,0 +23490n1.bin=@23490n1.bin,0 +23490n2.bin=@23490n2.bin,0 +23491d0.bin=@23491d0.bin,0 +23491d1.bin=@23491d1.bin,0 +23491d2.bin=@23491d2.bin,0 +23491n0.bin=@23491n0.bin,0 +23491n1.bin=@23491n1.bin,0 +23491n2.bin=@23491n2.bin,0 +23492d0.bin=@23492d0.bin,0 +23492d1.bin=@23492d1.bin,0 +23492d2.bin=@23492d2.bin,0 +23492n0.bin=@23492n0.bin,0 +23492n1.bin=@23492n1.bin,0 +23492n2.bin=@23492n2.bin,0 +23484d0.bin=@23484d0.bin,0 +23585d0.bin=@23585d0.bin,0 +23585d1.bin=@23585d1.bin,0 +23585d2.bin=@23585d2.bin,0 +23585n0.bin=@23585n0.bin,0 +23585n1.bin=@23585n1.bin,0 +23585n2.bin=@23585n2.bin,0 +23586d0.bin=@23586d0.bin,0 +23586d1.bin=@23586d1.bin,0 +23586d2.bin=@23586d2.bin,0 +23586n0.bin=@23586n0.bin,0 +23586n1.bin=@23586n1.bin,0 +23586n2.bin=@23586n2.bin,0 +23587d0.bin=@23587d0.bin,0 +23587d1.bin=@23587d1.bin,0 +23587d2.bin=@23587d2.bin,0 +23587n0.bin=@23587n0.bin,0 +23587n1.bin=@23587n1.bin,0 +23587n2.bin=@23587n2.bin,0 +23588d0.bin=@23588d0.bin,0 +23588d1.bin=@23588d1.bin,0 +23588d2.bin=@23588d2.bin,0 +23588n0.bin=@23588n0.bin,0 +23588n1.bin=@23588n1.bin,0 +23588n2.bin=@23588n2.bin,0 +23589d0.bin=@23589d0.bin,0 +23589d1.bin=@23589d1.bin,0 +23589d2.bin=@23589d2.bin,0 +23589n0.bin=@23589n0.bin,0 +23589n1.bin=@23589n1.bin,0 +23589n2.bin=@23589n2.bin,0 +23590d0.bin=@23590d0.bin,0 +23590d1.bin=@23590d1.bin,0 +23590d2.bin=@23590d2.bin,0 +23590n0.bin=@23590n0.bin,0 +23590n1.bin=@23590n1.bin,0 +23590n2.bin=@23590n2.bin,0 +23591d0.bin=@23591d0.bin,0 +23591d1.bin=@23591d1.bin,0 +23591d2.bin=@23591d2.bin,0 +23591n0.bin=@23591n0.bin,0 +23591n1.bin=@23591n1.bin,0 +23591n2.bin=@23591n2.bin,0 +23592d0.bin=@23592d0.bin,0 +23592d1.bin=@23592d1.bin,0 +23592d2.bin=@23592d2.bin,0 +23592n0.bin=@23592n0.bin,0 +23592n1.bin=@23592n1.bin,0 +23592n2.bin=@23592n2.bin,0 +23593d0.bin=@23593d0.bin,0 +23593d1.bin=@23593d1.bin,0 +23593d2.bin=@23593d2.bin,0 +23593n0.bin=@23593n0.bin,0 +23593n1.bin=@23593n1.bin,0 +23593n2.bin=@23593n2.bin,0 +23594d0.bin=@23594d0.bin,0 +23594d1.bin=@23594d1.bin,0 +23594d2.bin=@23594d2.bin,0 +23594n0.bin=@23594n0.bin,0 +23594n1.bin=@23594n1.bin,0 +23594n2.bin=@23594n2.bin,0 +23595d0.bin=@23595d0.bin,0 +23595d1.bin=@23595d1.bin,0 +23595d2.bin=@23595d2.bin,0 +23595n0.bin=@23595n0.bin,0 +23595n1.bin=@23595n1.bin,0 +23595n2.bin=@23595n2.bin,0 +23596d0.bin=@23596d0.bin,0 +23596d1.bin=@23596d1.bin,0 +23596d2.bin=@23596d2.bin,0 +23596n0.bin=@23596n0.bin,0 +23596n1.bin=@23596n1.bin,0 +23596n2.bin=@23596n2.bin,0 +23597d0.bin=@23597d0.bin,0 +23597d1.bin=@23597d1.bin,0 +23597d2.bin=@23597d2.bin,0 +23597n0.bin=@23597n0.bin,0 +23597n1.bin=@23597n1.bin,0 +23597n2.bin=@23597n2.bin,0 +23598d0.bin=@23598d0.bin,0 +23598d1.bin=@23598d1.bin,0 +23598d2.bin=@23598d2.bin,0 +23598n0.bin=@23598n0.bin,0 +23598n1.bin=@23598n1.bin,0 +23598n2.bin=@23598n2.bin,0 +23599d0.bin=@23599d0.bin,0 +23599d1.bin=@23599d1.bin,0 +23599d2.bin=@23599d2.bin,0 +23599n0.bin=@23599n0.bin,0 +23599n1.bin=@23599n1.bin,0 +23599n2.bin=@23599n2.bin,0 +23601d0.bin=@23601d0.bin,0 +23601d1.bin=@23601d1.bin,0 +23601d2.bin=@23601d2.bin,0 +23601n0.bin=@23601n0.bin,0 +23601n1.bin=@23601n1.bin,0 +23601n2.bin=@23601n2.bin,0 +23602d0.bin=@23602d0.bin,0 +23602d1.bin=@23602d1.bin,0 +23602d2.bin=@23602d2.bin,0 +23602n0.bin=@23602n0.bin,0 +23602n1.bin=@23602n1.bin,0 +23602n2.bin=@23602n2.bin,0 +23603d0.bin=@23603d0.bin,0 +23603d1.bin=@23603d1.bin,0 +23603d2.bin=@23603d2.bin,0 +23603n0.bin=@23603n0.bin,0 +23603n1.bin=@23603n1.bin,0 +23603n2.bin=@23603n2.bin,0 +23604d0.bin=@23604d0.bin,0 +23604d1.bin=@23604d1.bin,0 +23604d2.bin=@23604d2.bin,0 +23604n0.bin=@23604n0.bin,0 +23604n1.bin=@23604n1.bin,0 +23604n2.bin=@23604n2.bin,0 +23605d0.bin=@23605d0.bin,0 +23605d1.bin=@23605d1.bin,0 +23605d2.bin=@23605d2.bin,0 +23605n0.bin=@23605n0.bin,0 +23605n1.bin=@23605n1.bin,0 +23605n2.bin=@23605n2.bin,0 +40241n0.bin=@40241n0.bin,0 +40241n1.bin=@40241n1.bin,0 +40241n2.bin=@40241n2.bin,0 +54594d0.bin=@54594d0.bin,0 +54594d1.bin=@54594d1.bin,0 +54594d2.bin=@54594d2.bin,0 +54594n0.bin=@54594n0.bin,0 +54594n1.bin=@54594n1.bin,0 +54594n2.bin=@54594n2.bin,0 +54603d0.bin=@54603d0.bin,0 +54603d1.bin=@54603d1.bin,0 +54603d2.bin=@54603d2.bin,0 +54603n0.bin=@54603n0.bin,0 +54603n1.bin=@54603n1.bin,0 +54603n2.bin=@54603n2.bin,0 +40241d0.bin=@40241d0.bin,0 +40241d1.bin=@40241d1.bin,0 +40241d2.bin=@40241d2.bin,0 +23493n0.bin=@23493n0.bin,0 +23493n1.bin=@23493n1.bin,0 +23493n2.bin=@23493n2.bin,0 +23494d0.bin=@23494d0.bin,0 +23494d1.bin=@23494d1.bin,0 +23494d2.bin=@23494d2.bin,0 +23494n0.bin=@23494n0.bin,0 +23494n1.bin=@23494n1.bin,0 +23494n2.bin=@23494n2.bin,0 +23495d0.bin=@23495d0.bin,0 +23495d1.bin=@23495d1.bin,0 +23495d2.bin=@23495d2.bin,0 +23495n0.bin=@23495n0.bin,0 +23495n1.bin=@23495n1.bin,0 +23495n2.bin=@23495n2.bin,0 +23496d0.bin=@23496d0.bin,0 +23496d1.bin=@23496d1.bin,0 +23496d2.bin=@23496d2.bin,0 +23496n0.bin=@23496n0.bin,0 +23496n1.bin=@23496n1.bin,0 +23496n2.bin=@23496n2.bin,0 +23497d0.bin=@23497d0.bin,0 +23497d1.bin=@23497d1.bin,0 +23497d2.bin=@23497d2.bin,0 +23497n0.bin=@23497n0.bin,0 +23497n1.bin=@23497n1.bin,0 +23497n2.bin=@23497n2.bin,0 +23498d0.bin=@23498d0.bin,0 +23498d1.bin=@23498d1.bin,0 +23498d2.bin=@23498d2.bin,0 +23498n0.bin=@23498n0.bin,0 +23498n1.bin=@23498n1.bin,0 +23498n2.bin=@23498n2.bin,0 +23499d0.bin=@23499d0.bin,0 +23499d1.bin=@23499d1.bin,0 +23499d2.bin=@23499d2.bin,0 +23499n0.bin=@23499n0.bin,0 +23499n1.bin=@23499n1.bin,0 +23499n2.bin=@23499n2.bin,0 +23513d0.bin=@23513d0.bin,0 +23513d1.bin=@23513d1.bin,0 +23513d2.bin=@23513d2.bin,0 +23513n0.bin=@23513n0.bin,0 +23513n1.bin=@23513n1.bin,0 +23513n2.bin=@23513n2.bin,0 +23528d0.bin=@23528d0.bin,0 +23528d1.bin=@23528d1.bin,0 +23528d2.bin=@23528d2.bin,0 +23528n0.bin=@23528n0.bin,0 +23528n1.bin=@23528n1.bin,0 +23528n2.bin=@23528n2.bin,0 +23643d0.bin=@23643d0.bin,0 +23643d1.bin=@23643d1.bin,0 +23643d2.bin=@23643d2.bin,0 +23643n0.bin=@23643n0.bin,0 +23643n1.bin=@23643n1.bin,0 +23643n2.bin=@23643n2.bin,0 +23667d0.bin=@23667d0.bin,0 +23667d1.bin=@23667d1.bin,0 +23667d2.bin=@23667d2.bin,0 +23667n0.bin=@23667n0.bin,0 +23667n1.bin=@23667n1.bin,0 +23667n2.bin=@23667n2.bin,0 +55679d0.bin=@55679d0.bin,0 +55679d1.bin=@55679d1.bin,0 +55679d2.bin=@55679d2.bin,0 +55679n0.bin=@55679n0.bin,0 +55679n1.bin=@55679n1.bin,0 +55679n2.bin=@55679n2.bin,0 +55680d0.bin=@55680d0.bin,0 +55680d1.bin=@55680d1.bin,0 +55680d2.bin=@55680d2.bin,0 +55680n0.bin=@55680n0.bin,0 +55680n1.bin=@55680n1.bin,0 +55680n2.bin=@55680n2.bin,0 +55772d0.bin=@55772d0.bin,0 +55772d1.bin=@55772d1.bin,0 +55772d2.bin=@55772d2.bin,0 +55772n0.bin=@55772n0.bin,0 +55772n1.bin=@55772n1.bin,0 +55772n2.bin=@55772n2.bin,0 +55916d0.bin=@55916d0.bin,0 +55916d1.bin=@55916d1.bin,0 +55916d2.bin=@55916d2.bin,0 +55916n0.bin=@55916n0.bin,0 +55916n1.bin=@55916n1.bin,0 +55916n2.bin=@55916n2.bin,0 +23493d0.bin=@23493d0.bin,0 +23493d1.bin=@23493d1.bin,0 +23493d2.bin=@23493d2.bin,0 +23199n2.bin=@23199n2.bin,0 +23201d0.bin=@23201d0.bin,0 +23201d1.bin=@23201d1.bin,0 +23201d2.bin=@23201d2.bin,0 +23201n0.bin=@23201n0.bin,0 +23201n1.bin=@23201n1.bin,0 +23201n2.bin=@23201n2.bin,0 +23202d0.bin=@23202d0.bin,0 +23202d1.bin=@23202d1.bin,0 +23202d2.bin=@23202d2.bin,0 +23202n0.bin=@23202n0.bin,0 +23202n1.bin=@23202n1.bin,0 +23202n2.bin=@23202n2.bin,0 +23203d0.bin=@23203d0.bin,0 +23203d1.bin=@23203d1.bin,0 +23203d2.bin=@23203d2.bin,0 +23203n0.bin=@23203n0.bin,0 +23203n1.bin=@23203n1.bin,0 +23203n2.bin=@23203n2.bin,0 +23204d0.bin=@23204d0.bin,0 +23204d1.bin=@23204d1.bin,0 +23204d2.bin=@23204d2.bin,0 +23204n0.bin=@23204n0.bin,0 +23204n1.bin=@23204n1.bin,0 +23204n2.bin=@23204n2.bin,0 +23205d0.bin=@23205d0.bin,0 +23205d1.bin=@23205d1.bin,0 +23205d2.bin=@23205d2.bin,0 +23205n0.bin=@23205n0.bin,0 +23205n1.bin=@23205n1.bin,0 +23205n2.bin=@23205n2.bin,0 +23206d0.bin=@23206d0.bin,0 +23206d1.bin=@23206d1.bin,0 +23206d2.bin=@23206d2.bin,0 +23206n0.bin=@23206n0.bin,0 +23206n1.bin=@23206n1.bin,0 +23206n2.bin=@23206n2.bin,0 +23207d0.bin=@23207d0.bin,0 +23207d1.bin=@23207d1.bin,0 +23207d2.bin=@23207d2.bin,0 +23207n0.bin=@23207n0.bin,0 +23207n1.bin=@23207n1.bin,0 +23207n2.bin=@23207n2.bin,0 +23208d0.bin=@23208d0.bin,0 +23208d1.bin=@23208d1.bin,0 +23208d2.bin=@23208d2.bin,0 +23208n0.bin=@23208n0.bin,0 +23208n1.bin=@23208n1.bin,0 +23208n2.bin=@23208n2.bin,0 +23209d0.bin=@23209d0.bin,0 +23209d1.bin=@23209d1.bin,0 +23209d2.bin=@23209d2.bin,0 +23209n0.bin=@23209n0.bin,0 +23209n1.bin=@23209n1.bin,0 +23209n2.bin=@23209n2.bin,0 +23210d0.bin=@23210d0.bin,0 +23210d1.bin=@23210d1.bin,0 +23210d2.bin=@23210d2.bin,0 +23210n0.bin=@23210n0.bin,0 +23210n1.bin=@23210n1.bin,0 +23210n2.bin=@23210n2.bin,0 +23253d0.bin=@23253d0.bin,0 +23253d1.bin=@23253d1.bin,0 +23253d2.bin=@23253d2.bin,0 +23253n0.bin=@23253n0.bin,0 +23253n1.bin=@23253n1.bin,0 +23253n2.bin=@23253n2.bin,0 +23254d0.bin=@23254d0.bin,0 +23254d1.bin=@23254d1.bin,0 +23254d2.bin=@23254d2.bin,0 +23254n0.bin=@23254n0.bin,0 +23254n1.bin=@23254n1.bin,0 +23254n2.bin=@23254n2.bin,0 +23269d0.bin=@23269d0.bin,0 +23269d1.bin=@23269d1.bin,0 +23269d2.bin=@23269d2.bin,0 +23269n0.bin=@23269n0.bin,0 +23269n1.bin=@23269n1.bin,0 +23269n2.bin=@23269n2.bin,0 +23270d0.bin=@23270d0.bin,0 +23270d1.bin=@23270d1.bin,0 +23270d2.bin=@23270d2.bin,0 +23270n0.bin=@23270n0.bin,0 +23270n1.bin=@23270n1.bin,0 +23270n2.bin=@23270n2.bin,0 +23271d0.bin=@23271d0.bin,0 +23271d1.bin=@23271d1.bin,0 +23271d2.bin=@23271d2.bin,0 +23271n0.bin=@23271n0.bin,0 +23271n1.bin=@23271n1.bin,0 +23271n2.bin=@23271n2.bin,0 +23272d0.bin=@23272d0.bin,0 +23272d1.bin=@23272d1.bin,0 +23272d2.bin=@23272d2.bin,0 +23272n0.bin=@23272n0.bin,0 +23272n1.bin=@23272n1.bin,0 +23272n2.bin=@23272n2.bin,0 +23273d0.bin=@23273d0.bin,0 +23273d1.bin=@23273d1.bin,0 +23273d2.bin=@23273d2.bin,0 +23273n0.bin=@23273n0.bin,0 +23273n1.bin=@23273n1.bin,0 +23273n2.bin=@23273n2.bin,0 +23274d0.bin=@23274d0.bin,0 +23274d1.bin=@23274d1.bin,0 +23274d2.bin=@23274d2.bin,0 +23274n0.bin=@23274n0.bin,0 +23274n1.bin=@23274n1.bin,0 +23274n2.bin=@23274n2.bin,0 +23280d0.bin=@23280d0.bin,0 +23280d1.bin=@23280d1.bin,0 +23280d2.bin=@23280d2.bin,0 +23280n0.bin=@23280n0.bin,0 +23280n1.bin=@23280n1.bin,0 +23280n2.bin=@23280n2.bin,0 +23281d0.bin=@23281d0.bin,0 +23281d1.bin=@23281d1.bin,0 +23281d2.bin=@23281d2.bin,0 +23281n0.bin=@23281n0.bin,0 +23281n1.bin=@23281n1.bin,0 +23281n2.bin=@23281n2.bin,0 +23303d0.bin=@23303d0.bin,0 +23303d1.bin=@23303d1.bin,0 +23303d2.bin=@23303d2.bin,0 +23303n0.bin=@23303n0.bin,0 +23303n1.bin=@23303n1.bin,0 +23303n2.bin=@23303n2.bin,0 +23304d0.bin=@23304d0.bin,0 +23304d1.bin=@23304d1.bin,0 +23304d2.bin=@23304d2.bin,0 +23304n0.bin=@23304n0.bin,0 +23304n1.bin=@23304n1.bin,0 +23304n2.bin=@23304n2.bin,0 +23323d0.bin=@23323d0.bin,0 +23323d1.bin=@23323d1.bin,0 +23323d2.bin=@23323d2.bin,0 +23323n0.bin=@23323n0.bin,0 +23323n1.bin=@23323n1.bin,0 +23323n2.bin=@23323n2.bin,0 +23326d0.bin=@23326d0.bin,0 +23326d1.bin=@23326d1.bin,0 +23326d2.bin=@23326d2.bin,0 +23326n0.bin=@23326n0.bin,0 +23326n1.bin=@23326n1.bin,0 +23326n2.bin=@23326n2.bin,0 +23199d0.bin=@23199d0.bin,0 +23199d1.bin=@23199d1.bin,0 +23199d2.bin=@23199d2.bin,0 +23199n0.bin=@23199n0.bin,0 +23199n1.bin=@23199n1.bin,0 +23211d2.bin=@23211d2.bin,0 +23211n0.bin=@23211n0.bin,0 +23211n1.bin=@23211n1.bin,0 +23211n2.bin=@23211n2.bin,0 +23212d0.bin=@23212d0.bin,0 +23212d1.bin=@23212d1.bin,0 +23212d2.bin=@23212d2.bin,0 +23212n0.bin=@23212n0.bin,0 +23212n1.bin=@23212n1.bin,0 +23212n2.bin=@23212n2.bin,0 +23213d0.bin=@23213d0.bin,0 +23213d1.bin=@23213d1.bin,0 +23213d2.bin=@23213d2.bin,0 +23213n0.bin=@23213n0.bin,0 +23213n1.bin=@23213n1.bin,0 +23213n2.bin=@23213n2.bin,0 +23214d0.bin=@23214d0.bin,0 +23214d1.bin=@23214d1.bin,0 +23214d2.bin=@23214d2.bin,0 +23214n0.bin=@23214n0.bin,0 +23214n1.bin=@23214n1.bin,0 +23214n2.bin=@23214n2.bin,0 +23215d0.bin=@23215d0.bin,0 +23215d1.bin=@23215d1.bin,0 +23215d2.bin=@23215d2.bin,0 +23215n0.bin=@23215n0.bin,0 +23215n1.bin=@23215n1.bin,0 +23215n2.bin=@23215n2.bin,0 +23216d0.bin=@23216d0.bin,0 +23216d1.bin=@23216d1.bin,0 +23216d2.bin=@23216d2.bin,0 +23216n0.bin=@23216n0.bin,0 +23216n1.bin=@23216n1.bin,0 +23216n2.bin=@23216n2.bin,0 +23217d0.bin=@23217d0.bin,0 +23217d1.bin=@23217d1.bin,0 +23217d2.bin=@23217d2.bin,0 +23217n0.bin=@23217n0.bin,0 +23217n1.bin=@23217n1.bin,0 +23217n2.bin=@23217n2.bin,0 +23218d0.bin=@23218d0.bin,0 +23218d1.bin=@23218d1.bin,0 +23218d2.bin=@23218d2.bin,0 +23218n0.bin=@23218n0.bin,0 +23218n1.bin=@23218n1.bin,0 +23218n2.bin=@23218n2.bin,0 +23219d0.bin=@23219d0.bin,0 +23219d1.bin=@23219d1.bin,0 +23219d2.bin=@23219d2.bin,0 +23219n0.bin=@23219n0.bin,0 +23219n1.bin=@23219n1.bin,0 +23219n2.bin=@23219n2.bin,0 +23220d0.bin=@23220d0.bin,0 +23220d1.bin=@23220d1.bin,0 +23220d2.bin=@23220d2.bin,0 +23220n0.bin=@23220n0.bin,0 +23220n1.bin=@23220n1.bin,0 +23220n2.bin=@23220n2.bin,0 +23221d0.bin=@23221d0.bin,0 +23221d1.bin=@23221d1.bin,0 +23221d2.bin=@23221d2.bin,0 +23221n0.bin=@23221n0.bin,0 +23221n1.bin=@23221n1.bin,0 +23221n2.bin=@23221n2.bin,0 +23223d0.bin=@23223d0.bin,0 +23223d1.bin=@23223d1.bin,0 +23223d2.bin=@23223d2.bin,0 +23223n0.bin=@23223n0.bin,0 +23223n1.bin=@23223n1.bin,0 +23223n2.bin=@23223n2.bin,0 +23255d0.bin=@23255d0.bin,0 +23255d1.bin=@23255d1.bin,0 +23255d2.bin=@23255d2.bin,0 +23255n0.bin=@23255n0.bin,0 +23255n1.bin=@23255n1.bin,0 +23255n2.bin=@23255n2.bin,0 +23256d0.bin=@23256d0.bin,0 +23256d1.bin=@23256d1.bin,0 +23256d2.bin=@23256d2.bin,0 +23256n0.bin=@23256n0.bin,0 +23256n1.bin=@23256n1.bin,0 +23256n2.bin=@23256n2.bin,0 +23282d0.bin=@23282d0.bin,0 +23282d1.bin=@23282d1.bin,0 +23282d2.bin=@23282d2.bin,0 +23282n0.bin=@23282n0.bin,0 +23282n1.bin=@23282n1.bin,0 +23282n2.bin=@23282n2.bin,0 +23283d0.bin=@23283d0.bin,0 +23283d1.bin=@23283d1.bin,0 +23283d2.bin=@23283d2.bin,0 +23283n0.bin=@23283n0.bin,0 +23283n1.bin=@23283n1.bin,0 +23283n2.bin=@23283n2.bin,0 +23305d0.bin=@23305d0.bin,0 +23305d1.bin=@23305d1.bin,0 +23305d2.bin=@23305d2.bin,0 +23305n0.bin=@23305n0.bin,0 +23305n1.bin=@23305n1.bin,0 +23305n2.bin=@23305n2.bin,0 +23320d0.bin=@23320d0.bin,0 +23320d1.bin=@23320d1.bin,0 +23320d2.bin=@23320d2.bin,0 +23320n0.bin=@23320n0.bin,0 +23320n1.bin=@23320n1.bin,0 +23320n2.bin=@23320n2.bin,0 +23321d0.bin=@23321d0.bin,0 +23321d1.bin=@23321d1.bin,0 +23321d2.bin=@23321d2.bin,0 +23321n0.bin=@23321n0.bin,0 +23321n1.bin=@23321n1.bin,0 +23321n2.bin=@23321n2.bin,0 +23324d0.bin=@23324d0.bin,0 +23324d1.bin=@23324d1.bin,0 +23324d2.bin=@23324d2.bin,0 +23324n0.bin=@23324n0.bin,0 +23324n1.bin=@23324n1.bin,0 +23324n2.bin=@23324n2.bin,0 +23350d0.bin=@23350d0.bin,0 +23350d1.bin=@23350d1.bin,0 +23350d2.bin=@23350d2.bin,0 +23350n0.bin=@23350n0.bin,0 +23350n1.bin=@23350n1.bin,0 +23350n2.bin=@23350n2.bin,0 +23351d0.bin=@23351d0.bin,0 +23351d1.bin=@23351d1.bin,0 +23351d2.bin=@23351d2.bin,0 +23351n0.bin=@23351n0.bin,0 +23351n1.bin=@23351n1.bin,0 +23351n2.bin=@23351n2.bin,0 +23369d0.bin=@23369d0.bin,0 +23369d1.bin=@23369d1.bin,0 +23369d2.bin=@23369d2.bin,0 +23369n0.bin=@23369n0.bin,0 +23369n1.bin=@23369n1.bin,0 +23369n2.bin=@23369n2.bin,0 +23370d0.bin=@23370d0.bin,0 +23370d1.bin=@23370d1.bin,0 +23370d2.bin=@23370d2.bin,0 +23370n0.bin=@23370n0.bin,0 +23370n1.bin=@23370n1.bin,0 +23370n2.bin=@23370n2.bin,0 +23399d0.bin=@23399d0.bin,0 +23399d1.bin=@23399d1.bin,0 +23399d2.bin=@23399d2.bin,0 +23399n0.bin=@23399n0.bin,0 +23399n1.bin=@23399n1.bin,0 +23399n2.bin=@23399n2.bin,0 +23401d0.bin=@23401d0.bin,0 +23401d1.bin=@23401d1.bin,0 +23401d2.bin=@23401d2.bin,0 +23401n0.bin=@23401n0.bin,0 +23401n1.bin=@23401n1.bin,0 +23401n2.bin=@23401n2.bin,0 +23211d0.bin=@23211d0.bin,0 +23211d1.bin=@23211d1.bin,0 +23224n1.bin=@23224n1.bin,0 +23224n2.bin=@23224n2.bin,0 +23225d0.bin=@23225d0.bin,0 +23225d1.bin=@23225d1.bin,0 +23225d2.bin=@23225d2.bin,0 +23225n0.bin=@23225n0.bin,0 +23225n1.bin=@23225n1.bin,0 +23225n2.bin=@23225n2.bin,0 +23226d0.bin=@23226d0.bin,0 +23226d1.bin=@23226d1.bin,0 +23226d2.bin=@23226d2.bin,0 +23226n0.bin=@23226n0.bin,0 +23226n1.bin=@23226n1.bin,0 +23226n2.bin=@23226n2.bin,0 +23227d0.bin=@23227d0.bin,0 +23227d1.bin=@23227d1.bin,0 +23227d2.bin=@23227d2.bin,0 +23227n0.bin=@23227n0.bin,0 +23227n1.bin=@23227n1.bin,0 +23227n2.bin=@23227n2.bin,0 +23228d0.bin=@23228d0.bin,0 +23228d1.bin=@23228d1.bin,0 +23228d2.bin=@23228d2.bin,0 +23228n0.bin=@23228n0.bin,0 +23228n1.bin=@23228n1.bin,0 +23228n2.bin=@23228n2.bin,0 +23229d0.bin=@23229d0.bin,0 +23229d1.bin=@23229d1.bin,0 +23229d2.bin=@23229d2.bin,0 +23229n0.bin=@23229n0.bin,0 +23229n1.bin=@23229n1.bin,0 +23229n2.bin=@23229n2.bin,0 +23230d0.bin=@23230d0.bin,0 +23230d1.bin=@23230d1.bin,0 +23230d2.bin=@23230d2.bin,0 +23230n0.bin=@23230n0.bin,0 +23230n1.bin=@23230n1.bin,0 +23230n2.bin=@23230n2.bin,0 +23231d0.bin=@23231d0.bin,0 +23231d1.bin=@23231d1.bin,0 +23231d2.bin=@23231d2.bin,0 +23231n0.bin=@23231n0.bin,0 +23231n1.bin=@23231n1.bin,0 +23231n2.bin=@23231n2.bin,0 +23232d0.bin=@23232d0.bin,0 +23232d1.bin=@23232d1.bin,0 +23232d2.bin=@23232d2.bin,0 +23232n0.bin=@23232n0.bin,0 +23232n1.bin=@23232n1.bin,0 +23232n2.bin=@23232n2.bin,0 +23233d0.bin=@23233d0.bin,0 +23233d1.bin=@23233d1.bin,0 +23233d2.bin=@23233d2.bin,0 +23233n0.bin=@23233n0.bin,0 +23233n1.bin=@23233n1.bin,0 +23233n2.bin=@23233n2.bin,0 +23238d0.bin=@23238d0.bin,0 +23238d1.bin=@23238d1.bin,0 +23238d2.bin=@23238d2.bin,0 +23238n0.bin=@23238n0.bin,0 +23238n1.bin=@23238n1.bin,0 +23238n2.bin=@23238n2.bin,0 +23239d0.bin=@23239d0.bin,0 +23239d1.bin=@23239d1.bin,0 +23239d2.bin=@23239d2.bin,0 +23239n0.bin=@23239n0.bin,0 +23239n1.bin=@23239n1.bin,0 +23239n2.bin=@23239n2.bin,0 +23257d0.bin=@23257d0.bin,0 +23257d1.bin=@23257d1.bin,0 +23257d2.bin=@23257d2.bin,0 +23257n0.bin=@23257n0.bin,0 +23257n1.bin=@23257n1.bin,0 +23257n2.bin=@23257n2.bin,0 +23258d0.bin=@23258d0.bin,0 +23258d1.bin=@23258d1.bin,0 +23258d2.bin=@23258d2.bin,0 +23258n0.bin=@23258n0.bin,0 +23258n1.bin=@23258n1.bin,0 +23258n2.bin=@23258n2.bin,0 +23284d0.bin=@23284d0.bin,0 +23284d1.bin=@23284d1.bin,0 +23284d2.bin=@23284d2.bin,0 +23284n0.bin=@23284n0.bin,0 +23284n1.bin=@23284n1.bin,0 +23284n2.bin=@23284n2.bin,0 +23285d0.bin=@23285d0.bin,0 +23285d1.bin=@23285d1.bin,0 +23285d2.bin=@23285d2.bin,0 +23285n0.bin=@23285n0.bin,0 +23285n1.bin=@23285n1.bin,0 +23285n2.bin=@23285n2.bin,0 +23311d0.bin=@23311d0.bin,0 +23311d1.bin=@23311d1.bin,0 +23311d2.bin=@23311d2.bin,0 +23311n0.bin=@23311n0.bin,0 +23311n1.bin=@23311n1.bin,0 +23311n2.bin=@23311n2.bin,0 +23346d0.bin=@23346d0.bin,0 +23346d1.bin=@23346d1.bin,0 +23346d2.bin=@23346d2.bin,0 +23346n0.bin=@23346n0.bin,0 +23346n1.bin=@23346n1.bin,0 +23346n2.bin=@23346n2.bin,0 +23347d0.bin=@23347d0.bin,0 +23347d1.bin=@23347d1.bin,0 +23347d2.bin=@23347d2.bin,0 +23347n0.bin=@23347n0.bin,0 +23347n1.bin=@23347n1.bin,0 +23347n2.bin=@23347n2.bin,0 +23371d0.bin=@23371d0.bin,0 +23371d1.bin=@23371d1.bin,0 +23371d2.bin=@23371d2.bin,0 +23371n0.bin=@23371n0.bin,0 +23371n1.bin=@23371n1.bin,0 +23371n2.bin=@23371n2.bin,0 +23372d0.bin=@23372d0.bin,0 +23372d1.bin=@23372d1.bin,0 +23372d2.bin=@23372d2.bin,0 +23372n0.bin=@23372n0.bin,0 +23372n1.bin=@23372n1.bin,0 +23372n2.bin=@23372n2.bin,0 +23386d0.bin=@23386d0.bin,0 +23386d1.bin=@23386d1.bin,0 +23386d2.bin=@23386d2.bin,0 +23386n0.bin=@23386n0.bin,0 +23386n1.bin=@23386n1.bin,0 +23386n2.bin=@23386n2.bin,0 +23387d0.bin=@23387d0.bin,0 +23387d1.bin=@23387d1.bin,0 +23387d2.bin=@23387d2.bin,0 +23387n0.bin=@23387n0.bin,0 +23387n1.bin=@23387n1.bin,0 +23387n2.bin=@23387n2.bin,0 +23224d0.bin=@23224d0.bin,0 +23224d1.bin=@23224d1.bin,0 +23224d2.bin=@23224d2.bin,0 +23224n0.bin=@23224n0.bin,0 +23236n0.bin=@23236n0.bin,0 +23236n1.bin=@23236n1.bin,0 +23236n2.bin=@23236n2.bin,0 +23237d0.bin=@23237d0.bin,0 +23237d1.bin=@23237d1.bin,0 +23237d2.bin=@23237d2.bin,0 +23237n0.bin=@23237n0.bin,0 +23237n1.bin=@23237n1.bin,0 +23237n2.bin=@23237n2.bin,0 +23240d0.bin=@23240d0.bin,0 +23240d1.bin=@23240d1.bin,0 +23240d2.bin=@23240d2.bin,0 +23240n0.bin=@23240n0.bin,0 +23240n1.bin=@23240n1.bin,0 +23240n2.bin=@23240n2.bin,0 +23241d0.bin=@23241d0.bin,0 +23241d1.bin=@23241d1.bin,0 +23241d2.bin=@23241d2.bin,0 +23241n0.bin=@23241n0.bin,0 +23241n1.bin=@23241n1.bin,0 +23241n2.bin=@23241n2.bin,0 +23250d0.bin=@23250d0.bin,0 +23250d1.bin=@23250d1.bin,0 +23250d2.bin=@23250d2.bin,0 +23250n0.bin=@23250n0.bin,0 +23250n1.bin=@23250n1.bin,0 +23250n2.bin=@23250n2.bin,0 +23251d0.bin=@23251d0.bin,0 +23251d1.bin=@23251d1.bin,0 +23251d2.bin=@23251d2.bin,0 +23251n0.bin=@23251n0.bin,0 +23251n1.bin=@23251n1.bin,0 +23251n2.bin=@23251n2.bin,0 +23252d0.bin=@23252d0.bin,0 +23252d1.bin=@23252d1.bin,0 +23252d2.bin=@23252d2.bin,0 +23252n0.bin=@23252n0.bin,0 +23252n1.bin=@23252n1.bin,0 +23252n2.bin=@23252n2.bin,0 +23259d0.bin=@23259d0.bin,0 +23259d1.bin=@23259d1.bin,0 +23259d2.bin=@23259d2.bin,0 +23259n0.bin=@23259n0.bin,0 +23259n1.bin=@23259n1.bin,0 +23259n2.bin=@23259n2.bin,0 +23260d0.bin=@23260d0.bin,0 +23260d1.bin=@23260d1.bin,0 +23260d2.bin=@23260d2.bin,0 +23260n0.bin=@23260n0.bin,0 +23260n1.bin=@23260n1.bin,0 +23260n2.bin=@23260n2.bin,0 +23286d0.bin=@23286d0.bin,0 +23286d1.bin=@23286d1.bin,0 +23286d2.bin=@23286d2.bin,0 +23286n0.bin=@23286n0.bin,0 +23286n1.bin=@23286n1.bin,0 +23286n2.bin=@23286n2.bin,0 +23287d0.bin=@23287d0.bin,0 +23287d1.bin=@23287d1.bin,0 +23287d2.bin=@23287d2.bin,0 +23287n0.bin=@23287n0.bin,0 +23287n1.bin=@23287n1.bin,0 +23287n2.bin=@23287n2.bin,0 +23288d0.bin=@23288d0.bin,0 +23288d1.bin=@23288d1.bin,0 +23288d2.bin=@23288d2.bin,0 +23288n0.bin=@23288n0.bin,0 +23288n1.bin=@23288n1.bin,0 +23288n2.bin=@23288n2.bin,0 +23289d0.bin=@23289d0.bin,0 +23289d1.bin=@23289d1.bin,0 +23289d2.bin=@23289d2.bin,0 +23289n0.bin=@23289n0.bin,0 +23289n1.bin=@23289n1.bin,0 +23289n2.bin=@23289n2.bin,0 +23325d0.bin=@23325d0.bin,0 +23325d1.bin=@23325d1.bin,0 +23325d2.bin=@23325d2.bin,0 +23325n0.bin=@23325n0.bin,0 +23325n1.bin=@23325n1.bin,0 +23325n2.bin=@23325n2.bin,0 +23327d0.bin=@23327d0.bin,0 +23327d1.bin=@23327d1.bin,0 +23327d2.bin=@23327d2.bin,0 +23327n0.bin=@23327n0.bin,0 +23327n1.bin=@23327n1.bin,0 +23327n2.bin=@23327n2.bin,0 +23348d0.bin=@23348d0.bin,0 +23348d1.bin=@23348d1.bin,0 +23348d2.bin=@23348d2.bin,0 +23348n0.bin=@23348n0.bin,0 +23348n1.bin=@23348n1.bin,0 +23348n2.bin=@23348n2.bin,0 +23349d0.bin=@23349d0.bin,0 +23349d1.bin=@23349d1.bin,0 +23349d2.bin=@23349d2.bin,0 +23349n0.bin=@23349n0.bin,0 +23349n1.bin=@23349n1.bin,0 +23349n2.bin=@23349n2.bin,0 +23382d0.bin=@23382d0.bin,0 +23382d1.bin=@23382d1.bin,0 +23382d2.bin=@23382d2.bin,0 +23382n0.bin=@23382n0.bin,0 +23382n1.bin=@23382n1.bin,0 +23382n2.bin=@23382n2.bin,0 +23383d0.bin=@23383d0.bin,0 +23383d1.bin=@23383d1.bin,0 +23383d2.bin=@23383d2.bin,0 +23383n0.bin=@23383n0.bin,0 +23383n1.bin=@23383n1.bin,0 +23383n2.bin=@23383n2.bin,0 +23384d0.bin=@23384d0.bin,0 +23384d1.bin=@23384d1.bin,0 +23384d2.bin=@23384d2.bin,0 +23384n0.bin=@23384n0.bin,0 +23384n1.bin=@23384n1.bin,0 +23384n2.bin=@23384n2.bin,0 +23385d0.bin=@23385d0.bin,0 +23385d1.bin=@23385d1.bin,0 +23385d2.bin=@23385d2.bin,0 +23385n0.bin=@23385n0.bin,0 +23385n1.bin=@23385n1.bin,0 +23385n2.bin=@23385n2.bin,0 +23394d0.bin=@23394d0.bin,0 +23394d1.bin=@23394d1.bin,0 +23394d2.bin=@23394d2.bin,0 +23394n0.bin=@23394n0.bin,0 +23394n1.bin=@23394n1.bin,0 +23394n2.bin=@23394n2.bin,0 +23395d0.bin=@23395d0.bin,0 +23395d1.bin=@23395d1.bin,0 +23395d2.bin=@23395d2.bin,0 +23395n0.bin=@23395n0.bin,0 +23395n1.bin=@23395n1.bin,0 +23395n2.bin=@23395n2.bin,0 +23396d0.bin=@23396d0.bin,0 +23396d1.bin=@23396d1.bin,0 +23396d2.bin=@23396d2.bin,0 +23396n0.bin=@23396n0.bin,0 +23396n1.bin=@23396n1.bin,0 +23396n2.bin=@23396n2.bin,0 +23236d0.bin=@23236d0.bin,0 +23236d1.bin=@23236d1.bin,0 +23236d2.bin=@23236d2.bin,0 +23234d2.bin=@23234d2.bin,0 +23234n0.bin=@23234n0.bin,0 +23234n1.bin=@23234n1.bin,0 +23234n2.bin=@23234n2.bin,0 +23235d0.bin=@23235d0.bin,0 +23235d1.bin=@23235d1.bin,0 +23235d2.bin=@23235d2.bin,0 +23235n0.bin=@23235n0.bin,0 +23235n1.bin=@23235n1.bin,0 +23235n2.bin=@23235n2.bin,0 +23246d0.bin=@23246d0.bin,0 +23246d1.bin=@23246d1.bin,0 +23246d2.bin=@23246d2.bin,0 +23246n0.bin=@23246n0.bin,0 +23246n1.bin=@23246n1.bin,0 +23246n2.bin=@23246n2.bin,0 +23247d0.bin=@23247d0.bin,0 +23247d1.bin=@23247d1.bin,0 +23247d2.bin=@23247d2.bin,0 +23247n0.bin=@23247n0.bin,0 +23247n1.bin=@23247n1.bin,0 +23247n2.bin=@23247n2.bin,0 +23248d0.bin=@23248d0.bin,0 +23248d1.bin=@23248d1.bin,0 +23248d2.bin=@23248d2.bin,0 +23248n0.bin=@23248n0.bin,0 +23248n1.bin=@23248n1.bin,0 +23248n2.bin=@23248n2.bin,0 +23249d0.bin=@23249d0.bin,0 +23249d1.bin=@23249d1.bin,0 +23249d2.bin=@23249d2.bin,0 +23249n0.bin=@23249n0.bin,0 +23249n1.bin=@23249n1.bin,0 +23249n2.bin=@23249n2.bin,0 +23261d0.bin=@23261d0.bin,0 +23261d1.bin=@23261d1.bin,0 +23261d2.bin=@23261d2.bin,0 +23261n0.bin=@23261n0.bin,0 +23261n1.bin=@23261n1.bin,0 +23261n2.bin=@23261n2.bin,0 +23262d0.bin=@23262d0.bin,0 +23262d1.bin=@23262d1.bin,0 +23262d2.bin=@23262d2.bin,0 +23262n0.bin=@23262n0.bin,0 +23262n1.bin=@23262n1.bin,0 +23262n2.bin=@23262n2.bin,0 +23267d0.bin=@23267d0.bin,0 +23267d1.bin=@23267d1.bin,0 +23267d2.bin=@23267d2.bin,0 +23267n0.bin=@23267n0.bin,0 +23267n1.bin=@23267n1.bin,0 +23267n2.bin=@23267n2.bin,0 +23268d0.bin=@23268d0.bin,0 +23268d1.bin=@23268d1.bin,0 +23268d2.bin=@23268d2.bin,0 +23268n0.bin=@23268n0.bin,0 +23268n1.bin=@23268n1.bin,0 +23268n2.bin=@23268n2.bin,0 +23275d0.bin=@23275d0.bin,0 +23275d1.bin=@23275d1.bin,0 +23275d2.bin=@23275d2.bin,0 +23275n0.bin=@23275n0.bin,0 +23275n1.bin=@23275n1.bin,0 +23275n2.bin=@23275n2.bin,0 +23309d0.bin=@23309d0.bin,0 +23309d1.bin=@23309d1.bin,0 +23309d2.bin=@23309d2.bin,0 +23309n0.bin=@23309n0.bin,0 +23309n1.bin=@23309n1.bin,0 +23309n2.bin=@23309n2.bin,0 +23310d0.bin=@23310d0.bin,0 +23310d1.bin=@23310d1.bin,0 +23310d2.bin=@23310d2.bin,0 +23310n0.bin=@23310n0.bin,0 +23310n1.bin=@23310n1.bin,0 +23310n2.bin=@23310n2.bin,0 +23345d0.bin=@23345d0.bin,0 +23345d1.bin=@23345d1.bin,0 +23345d2.bin=@23345d2.bin,0 +23345n0.bin=@23345n0.bin,0 +23345n1.bin=@23345n1.bin,0 +23345n2.bin=@23345n2.bin,0 +23397d0.bin=@23397d0.bin,0 +23397d1.bin=@23397d1.bin,0 +23397d2.bin=@23397d2.bin,0 +23397n0.bin=@23397n0.bin,0 +23397n1.bin=@23397n1.bin,0 +23397n2.bin=@23397n2.bin,0 +23398d0.bin=@23398d0.bin,0 +23398d1.bin=@23398d1.bin,0 +23398d2.bin=@23398d2.bin,0 +23398n0.bin=@23398n0.bin,0 +23398n1.bin=@23398n1.bin,0 +23398n2.bin=@23398n2.bin,0 +23403d0.bin=@23403d0.bin,0 +23403d1.bin=@23403d1.bin,0 +23403d2.bin=@23403d2.bin,0 +23403n0.bin=@23403n0.bin,0 +23403n1.bin=@23403n1.bin,0 +23403n2.bin=@23403n2.bin,0 +23404d0.bin=@23404d0.bin,0 +23404d1.bin=@23404d1.bin,0 +23404d2.bin=@23404d2.bin,0 +23404n0.bin=@23404n0.bin,0 +23404n1.bin=@23404n1.bin,0 +23404n2.bin=@23404n2.bin,0 +23425d0.bin=@23425d0.bin,0 +23425d1.bin=@23425d1.bin,0 +23425d2.bin=@23425d2.bin,0 +23425n0.bin=@23425n0.bin,0 +23425n1.bin=@23425n1.bin,0 +23425n2.bin=@23425n2.bin,0 +23426d0.bin=@23426d0.bin,0 +23426d1.bin=@23426d1.bin,0 +23426d2.bin=@23426d2.bin,0 +23426n0.bin=@23426n0.bin,0 +23426n1.bin=@23426n1.bin,0 +23426n2.bin=@23426n2.bin,0 +23433d0.bin=@23433d0.bin,0 +23433d1.bin=@23433d1.bin,0 +23433d2.bin=@23433d2.bin,0 +23433n0.bin=@23433n0.bin,0 +23433n1.bin=@23433n1.bin,0 +23433n2.bin=@23433n2.bin,0 +23434d0.bin=@23434d0.bin,0 +23434d1.bin=@23434d1.bin,0 +23434d2.bin=@23434d2.bin,0 +23434n0.bin=@23434n0.bin,0 +23434n1.bin=@23434n1.bin,0 +23434n2.bin=@23434n2.bin,0 +23234d0.bin=@23234d0.bin,0 +23234d1.bin=@23234d1.bin,0 +23242n0.bin=@23242n0.bin,0 +23242n1.bin=@23242n1.bin,0 +23242n2.bin=@23242n2.bin,0 +23243d0.bin=@23243d0.bin,0 +23243d1.bin=@23243d1.bin,0 +23243d2.bin=@23243d2.bin,0 +23243n0.bin=@23243n0.bin,0 +23243n1.bin=@23243n1.bin,0 +23243n2.bin=@23243n2.bin,0 +23244d0.bin=@23244d0.bin,0 +23244d1.bin=@23244d1.bin,0 +23244d2.bin=@23244d2.bin,0 +23244n0.bin=@23244n0.bin,0 +23244n1.bin=@23244n1.bin,0 +23244n2.bin=@23244n2.bin,0 +23245d0.bin=@23245d0.bin,0 +23245d1.bin=@23245d1.bin,0 +23245d2.bin=@23245d2.bin,0 +23245n0.bin=@23245n0.bin,0 +23245n1.bin=@23245n1.bin,0 +23245n2.bin=@23245n2.bin,0 +23263d0.bin=@23263d0.bin,0 +23263d1.bin=@23263d1.bin,0 +23263d2.bin=@23263d2.bin,0 +23263n0.bin=@23263n0.bin,0 +23263n1.bin=@23263n1.bin,0 +23263n2.bin=@23263n2.bin,0 +23264d0.bin=@23264d0.bin,0 +23264d1.bin=@23264d1.bin,0 +23264d2.bin=@23264d2.bin,0 +23264n0.bin=@23264n0.bin,0 +23264n1.bin=@23264n1.bin,0 +23264n2.bin=@23264n2.bin,0 +23277d0.bin=@23277d0.bin,0 +23277d1.bin=@23277d1.bin,0 +23277d2.bin=@23277d2.bin,0 +23277n0.bin=@23277n0.bin,0 +23277n1.bin=@23277n1.bin,0 +23277n2.bin=@23277n2.bin,0 +23278d0.bin=@23278d0.bin,0 +23278d1.bin=@23278d1.bin,0 +23278d2.bin=@23278d2.bin,0 +23278n0.bin=@23278n0.bin,0 +23278n1.bin=@23278n1.bin,0 +23278n2.bin=@23278n2.bin,0 +23279d0.bin=@23279d0.bin,0 +23279d1.bin=@23279d1.bin,0 +23279d2.bin=@23279d2.bin,0 +23279n0.bin=@23279n0.bin,0 +23279n1.bin=@23279n1.bin,0 +23279n2.bin=@23279n2.bin,0 +23307d0.bin=@23307d0.bin,0 +23307d1.bin=@23307d1.bin,0 +23307d2.bin=@23307d2.bin,0 +23307n0.bin=@23307n0.bin,0 +23307n1.bin=@23307n1.bin,0 +23307n2.bin=@23307n2.bin,0 +23312d0.bin=@23312d0.bin,0 +23312d1.bin=@23312d1.bin,0 +23312d2.bin=@23312d2.bin,0 +23312n0.bin=@23312n0.bin,0 +23312n1.bin=@23312n1.bin,0 +23312n2.bin=@23312n2.bin,0 +23313d0.bin=@23313d0.bin,0 +23313d1.bin=@23313d1.bin,0 +23313d2.bin=@23313d2.bin,0 +23313n0.bin=@23313n0.bin,0 +23313n1.bin=@23313n1.bin,0 +23313n2.bin=@23313n2.bin,0 +23318d0.bin=@23318d0.bin,0 +23318d1.bin=@23318d1.bin,0 +23318d2.bin=@23318d2.bin,0 +23318n0.bin=@23318n0.bin,0 +23318n1.bin=@23318n1.bin,0 +23318n2.bin=@23318n2.bin,0 +23319d0.bin=@23319d0.bin,0 +23319d1.bin=@23319d1.bin,0 +23319d2.bin=@23319d2.bin,0 +23319n0.bin=@23319n0.bin,0 +23319n1.bin=@23319n1.bin,0 +23319n2.bin=@23319n2.bin,0 +23322d0.bin=@23322d0.bin,0 +23322d1.bin=@23322d1.bin,0 +23322d2.bin=@23322d2.bin,0 +23322n0.bin=@23322n0.bin,0 +23322n1.bin=@23322n1.bin,0 +23322n2.bin=@23322n2.bin,0 +23342d0.bin=@23342d0.bin,0 +23342d1.bin=@23342d1.bin,0 +23342d2.bin=@23342d2.bin,0 +23342n0.bin=@23342n0.bin,0 +23342n1.bin=@23342n1.bin,0 +23342n2.bin=@23342n2.bin,0 +23343d0.bin=@23343d0.bin,0 +23343d1.bin=@23343d1.bin,0 +23343d2.bin=@23343d2.bin,0 +23343n0.bin=@23343n0.bin,0 +23343n1.bin=@23343n1.bin,0 +23343n2.bin=@23343n2.bin,0 +23344d0.bin=@23344d0.bin,0 +23344d1.bin=@23344d1.bin,0 +23344d2.bin=@23344d2.bin,0 +23344n0.bin=@23344n0.bin,0 +23344n1.bin=@23344n1.bin,0 +23344n2.bin=@23344n2.bin,0 +23373d0.bin=@23373d0.bin,0 +23373d1.bin=@23373d1.bin,0 +23373d2.bin=@23373d2.bin,0 +23373n0.bin=@23373n0.bin,0 +23373n1.bin=@23373n1.bin,0 +23373n2.bin=@23373n2.bin,0 +23429d0.bin=@23429d0.bin,0 +23429d1.bin=@23429d1.bin,0 +23429d2.bin=@23429d2.bin,0 +23429n0.bin=@23429n0.bin,0 +23429n1.bin=@23429n1.bin,0 +23429n2.bin=@23429n2.bin,0 +23430d0.bin=@23430d0.bin,0 +23430d1.bin=@23430d1.bin,0 +23430d2.bin=@23430d2.bin,0 +23430n0.bin=@23430n0.bin,0 +23430n1.bin=@23430n1.bin,0 +23430n2.bin=@23430n2.bin,0 +23431d0.bin=@23431d0.bin,0 +23431d1.bin=@23431d1.bin,0 +23431d2.bin=@23431d2.bin,0 +23431n0.bin=@23431n0.bin,0 +23431n1.bin=@23431n1.bin,0 +23431n2.bin=@23431n2.bin,0 +23432d0.bin=@23432d0.bin,0 +23432d1.bin=@23432d1.bin,0 +23432d2.bin=@23432d2.bin,0 +23432n0.bin=@23432n0.bin,0 +23432n1.bin=@23432n1.bin,0 +23432n2.bin=@23432n2.bin,0 +23242d0.bin=@23242d0.bin,0 +23242d1.bin=@23242d1.bin,0 +23242d2.bin=@23242d2.bin,0 +23265n2.bin=@23265n2.bin,0 +23266d0.bin=@23266d0.bin,0 +23266d1.bin=@23266d1.bin,0 +23266d2.bin=@23266d2.bin,0 +23266n0.bin=@23266n0.bin,0 +23266n1.bin=@23266n1.bin,0 +23266n2.bin=@23266n2.bin,0 +23306d0.bin=@23306d0.bin,0 +23306d1.bin=@23306d1.bin,0 +23306d2.bin=@23306d2.bin,0 +23306n0.bin=@23306n0.bin,0 +23306n1.bin=@23306n1.bin,0 +23306n2.bin=@23306n2.bin,0 +23308d0.bin=@23308d0.bin,0 +23308d1.bin=@23308d1.bin,0 +23308d2.bin=@23308d2.bin,0 +23308n0.bin=@23308n0.bin,0 +23308n1.bin=@23308n1.bin,0 +23308n2.bin=@23308n2.bin,0 +23314d0.bin=@23314d0.bin,0 +23314d1.bin=@23314d1.bin,0 +23314d2.bin=@23314d2.bin,0 +23314n0.bin=@23314n0.bin,0 +23314n1.bin=@23314n1.bin,0 +23314n2.bin=@23314n2.bin,0 +23367d0.bin=@23367d0.bin,0 +23367d1.bin=@23367d1.bin,0 +23367d2.bin=@23367d2.bin,0 +23367n0.bin=@23367n0.bin,0 +23367n1.bin=@23367n1.bin,0 +23367n2.bin=@23367n2.bin,0 +23368d0.bin=@23368d0.bin,0 +23368d1.bin=@23368d1.bin,0 +23368d2.bin=@23368d2.bin,0 +23368n0.bin=@23368n0.bin,0 +23368n1.bin=@23368n1.bin,0 +23368n2.bin=@23368n2.bin,0 +23380d0.bin=@23380d0.bin,0 +23380d1.bin=@23380d1.bin,0 +23380d2.bin=@23380d2.bin,0 +23380n0.bin=@23380n0.bin,0 +23380n1.bin=@23380n1.bin,0 +23380n2.bin=@23380n2.bin,0 +23381d0.bin=@23381d0.bin,0 +23381d1.bin=@23381d1.bin,0 +23381d2.bin=@23381d2.bin,0 +23381n0.bin=@23381n0.bin,0 +23381n1.bin=@23381n1.bin,0 +23381n2.bin=@23381n2.bin,0 +23392d0.bin=@23392d0.bin,0 +23392d1.bin=@23392d1.bin,0 +23392d2.bin=@23392d2.bin,0 +23392n0.bin=@23392n0.bin,0 +23392n1.bin=@23392n1.bin,0 +23392n2.bin=@23392n2.bin,0 +23393d0.bin=@23393d0.bin,0 +23393d1.bin=@23393d1.bin,0 +23393d2.bin=@23393d2.bin,0 +23393n0.bin=@23393n0.bin,0 +23393n1.bin=@23393n1.bin,0 +23393n2.bin=@23393n2.bin,0 +23402d0.bin=@23402d0.bin,0 +23402d1.bin=@23402d1.bin,0 +23402d2.bin=@23402d2.bin,0 +23402n0.bin=@23402n0.bin,0 +23402n1.bin=@23402n1.bin,0 +23402n2.bin=@23402n2.bin,0 +23424d0.bin=@23424d0.bin,0 +23424d1.bin=@23424d1.bin,0 +23424d2.bin=@23424d2.bin,0 +23424n0.bin=@23424n0.bin,0 +23424n1.bin=@23424n1.bin,0 +23424n2.bin=@23424n2.bin,0 +23427d0.bin=@23427d0.bin,0 +23427d1.bin=@23427d1.bin,0 +23427d2.bin=@23427d2.bin,0 +23427n0.bin=@23427n0.bin,0 +23427n1.bin=@23427n1.bin,0 +23427n2.bin=@23427n2.bin,0 +23428d0.bin=@23428d0.bin,0 +23428d1.bin=@23428d1.bin,0 +23428d2.bin=@23428d2.bin,0 +23428n0.bin=@23428n0.bin,0 +23428n1.bin=@23428n1.bin,0 +23428n2.bin=@23428n2.bin,0 +23514d0.bin=@23514d0.bin,0 +23514d1.bin=@23514d1.bin,0 +23514d2.bin=@23514d2.bin,0 +23514n0.bin=@23514n0.bin,0 +23514n1.bin=@23514n1.bin,0 +23514n2.bin=@23514n2.bin,0 +23515d0.bin=@23515d0.bin,0 +23515d1.bin=@23515d1.bin,0 +23515d2.bin=@23515d2.bin,0 +23515n0.bin=@23515n0.bin,0 +23515n1.bin=@23515n1.bin,0 +23515n2.bin=@23515n2.bin,0 +23626d0.bin=@23626d0.bin,0 +23626d1.bin=@23626d1.bin,0 +23626d2.bin=@23626d2.bin,0 +23626n0.bin=@23626n0.bin,0 +23626n1.bin=@23626n1.bin,0 +23626n2.bin=@23626n2.bin,0 +55016d0.bin=@55016d0.bin,0 +55016d1.bin=@55016d1.bin,0 +55016d2.bin=@55016d2.bin,0 +55016n0.bin=@55016n0.bin,0 +55016n1.bin=@55016n1.bin,0 +55016n2.bin=@55016n2.bin,0 +55202d0.bin=@55202d0.bin,0 +55202d1.bin=@55202d1.bin,0 +55202d2.bin=@55202d2.bin,0 +55202n0.bin=@55202n0.bin,0 +55202n1.bin=@55202n1.bin,0 +55202n2.bin=@55202n2.bin,0 +58073d0.bin=@58073d0.bin,0 +58073d1.bin=@58073d1.bin,0 +58073d2.bin=@58073d2.bin,0 +58073n0.bin=@58073n0.bin,0 +58073n1.bin=@58073n1.bin,0 +58073n2.bin=@58073n2.bin,0 +64551d0.bin=@64551d0.bin,0 +64551d1.bin=@64551d1.bin,0 +64551d2.bin=@64551d2.bin,0 +23265d0.bin=@23265d0.bin,0 +23265d1.bin=@23265d1.bin,0 +23265d2.bin=@23265d2.bin,0 +23265n0.bin=@23265n0.bin,0 +23265n1.bin=@23265n1.bin,0 +23648n1.bin=@23648n1.bin,0 +23648n2.bin=@23648n2.bin,0 +23649d0.bin=@23649d0.bin,0 +23649d1.bin=@23649d1.bin,0 +23649d2.bin=@23649d2.bin,0 +23649n0.bin=@23649n0.bin,0 +23649n1.bin=@23649n1.bin,0 +23649n2.bin=@23649n2.bin,0 +54926d0.bin=@54926d0.bin,0 +54926d1.bin=@54926d1.bin,0 +54926d2.bin=@54926d2.bin,0 +54926n0.bin=@54926n0.bin,0 +54926n1.bin=@54926n1.bin,0 +54926n2.bin=@54926n2.bin,0 +55195d0.bin=@55195d0.bin,0 +55195d1.bin=@55195d1.bin,0 +55195d2.bin=@55195d2.bin,0 +55195n0.bin=@55195n0.bin,0 +55195n1.bin=@55195n1.bin,0 +55195n2.bin=@55195n2.bin,0 +55529d0.bin=@55529d0.bin,0 +55529d1.bin=@55529d1.bin,0 +55529d2.bin=@55529d2.bin,0 +55529n0.bin=@55529n0.bin,0 +55529n1.bin=@55529n1.bin,0 +55529n2.bin=@55529n2.bin,0 +55530d0.bin=@55530d0.bin,0 +55530d1.bin=@55530d1.bin,0 +55530d2.bin=@55530d2.bin,0 +55530n0.bin=@55530n0.bin,0 +55530n1.bin=@55530n1.bin,0 +55530n2.bin=@55530n2.bin,0 +55531d0.bin=@55531d0.bin,0 +55531d1.bin=@55531d1.bin,0 +55531d2.bin=@55531d2.bin,0 +55531n0.bin=@55531n0.bin,0 +55531n1.bin=@55531n1.bin,0 +55531n2.bin=@55531n2.bin,0 +55532d0.bin=@55532d0.bin,0 +55532d1.bin=@55532d1.bin,0 +55532d2.bin=@55532d2.bin,0 +55532n0.bin=@55532n0.bin,0 +55532n1.bin=@55532n1.bin,0 +55532n2.bin=@55532n2.bin,0 +55534d0.bin=@55534d0.bin,0 +55534d1.bin=@55534d1.bin,0 +55534d2.bin=@55534d2.bin,0 +55534n0.bin=@55534n0.bin,0 +55534n1.bin=@55534n1.bin,0 +55534n2.bin=@55534n2.bin,0 +55535d0.bin=@55535d0.bin,0 +55535d1.bin=@55535d1.bin,0 +55535d2.bin=@55535d2.bin,0 +55535n0.bin=@55535n0.bin,0 +55535n1.bin=@55535n1.bin,0 +55535n2.bin=@55535n2.bin,0 +55714d0.bin=@55714d0.bin,0 +55714d1.bin=@55714d1.bin,0 +55714d2.bin=@55714d2.bin,0 +55714n0.bin=@55714n0.bin,0 +55714n1.bin=@55714n1.bin,0 +55714n2.bin=@55714n2.bin,0 +55917d0.bin=@55917d0.bin,0 +55917d1.bin=@55917d1.bin,0 +55917d2.bin=@55917d2.bin,0 +55917n0.bin=@55917n0.bin,0 +55917n1.bin=@55917n1.bin,0 +55917n2.bin=@55917n2.bin,0 +55918d0.bin=@55918d0.bin,0 +55918d1.bin=@55918d1.bin,0 +55918d2.bin=@55918d2.bin,0 +55918n0.bin=@55918n0.bin,0 +55918n1.bin=@55918n1.bin,0 +55918n2.bin=@55918n2.bin,0 +55920d0.bin=@55920d0.bin,0 +55920d1.bin=@55920d1.bin,0 +55920d2.bin=@55920d2.bin,0 +55920n0.bin=@55920n0.bin,0 +55920n1.bin=@55920n1.bin,0 +55920n2.bin=@55920n2.bin,0 +55921d0.bin=@55921d0.bin,0 +55921d1.bin=@55921d1.bin,0 +55921d2.bin=@55921d2.bin,0 +55921n0.bin=@55921n0.bin,0 +55921n1.bin=@55921n1.bin,0 +55921n2.bin=@55921n2.bin,0 +55922d0.bin=@55922d0.bin,0 +55922d1.bin=@55922d1.bin,0 +55922d2.bin=@55922d2.bin,0 +55922n0.bin=@55922n0.bin,0 +55922n1.bin=@55922n1.bin,0 +55922n2.bin=@55922n2.bin,0 +55935d0.bin=@55935d0.bin,0 +55935d1.bin=@55935d1.bin,0 +55935d2.bin=@55935d2.bin,0 +55935n0.bin=@55935n0.bin,0 +55935n1.bin=@55935n1.bin,0 +55935n2.bin=@55935n2.bin,0 +55936d0.bin=@55936d0.bin,0 +55936d1.bin=@55936d1.bin,0 +55936d2.bin=@55936d2.bin,0 +55936n0.bin=@55936n0.bin,0 +55936n1.bin=@55936n1.bin,0 +55936n2.bin=@55936n2.bin,0 +55948d0.bin=@55948d0.bin,0 +55948d1.bin=@55948d1.bin,0 +55948d2.bin=@55948d2.bin,0 +55948n0.bin=@55948n0.bin,0 +55948n1.bin=@55948n1.bin,0 +55948n2.bin=@55948n2.bin,0 +55949d0.bin=@55949d0.bin,0 +55949d1.bin=@55949d1.bin,0 +55949d2.bin=@55949d2.bin,0 +55949n0.bin=@55949n0.bin,0 +55949n1.bin=@55949n1.bin,0 +55949n2.bin=@55949n2.bin,0 +55950d0.bin=@55950d0.bin,0 +55950d1.bin=@55950d1.bin,0 +55950d2.bin=@55950d2.bin,0 +55950n0.bin=@55950n0.bin,0 +55950n1.bin=@55950n1.bin,0 +55950n2.bin=@55950n2.bin,0 +55951d0.bin=@55951d0.bin,0 +55951d1.bin=@55951d1.bin,0 +55951d2.bin=@55951d2.bin,0 +55951n0.bin=@55951n0.bin,0 +55951n1.bin=@55951n1.bin,0 +55951n2.bin=@55951n2.bin,0 +56106d0.bin=@56106d0.bin,0 +56106d1.bin=@56106d1.bin,0 +56106d2.bin=@56106d2.bin,0 +56106n0.bin=@56106n0.bin,0 +56106n1.bin=@56106n1.bin,0 +56106n2.bin=@56106n2.bin,0 +56115d0.bin=@56115d0.bin,0 +56115d1.bin=@56115d1.bin,0 +56115d2.bin=@56115d2.bin,0 +56115n0.bin=@56115n0.bin,0 +56115n1.bin=@56115n1.bin,0 +56115n2.bin=@56115n2.bin,0 +56126d0.bin=@56126d0.bin,0 +56126d1.bin=@56126d1.bin,0 +56126d2.bin=@56126d2.bin,0 +56126n0.bin=@56126n0.bin,0 +56126n1.bin=@56126n1.bin,0 +56126n2.bin=@56126n2.bin,0 +56127d0.bin=@56127d0.bin,0 +56127d1.bin=@56127d1.bin,0 +56127d2.bin=@56127d2.bin,0 +56127n0.bin=@56127n0.bin,0 +56127n1.bin=@56127n1.bin,0 +56127n2.bin=@56127n2.bin,0 +56128d0.bin=@56128d0.bin,0 +56128d1.bin=@56128d1.bin,0 +56128d2.bin=@56128d2.bin,0 +56128n0.bin=@56128n0.bin,0 +56128n1.bin=@56128n1.bin,0 +56128n2.bin=@56128n2.bin,0 +56130d0.bin=@56130d0.bin,0 +56130d1.bin=@56130d1.bin,0 +56130d2.bin=@56130d2.bin,0 +56130n0.bin=@56130n0.bin,0 +56130n1.bin=@56130n1.bin,0 +56130n2.bin=@56130n2.bin,0 +56131d0.bin=@56131d0.bin,0 +56131d1.bin=@56131d1.bin,0 +56131d2.bin=@56131d2.bin,0 +56131n0.bin=@56131n0.bin,0 +56131n1.bin=@56131n1.bin,0 +56131n2.bin=@56131n2.bin,0 +56133d0.bin=@56133d0.bin,0 +56133d1.bin=@56133d1.bin,0 +56133d2.bin=@56133d2.bin,0 +56133n0.bin=@56133n0.bin,0 +56133n1.bin=@56133n1.bin,0 +56133n2.bin=@56133n2.bin,0 +56152d0.bin=@56152d0.bin,0 +56152d1.bin=@56152d1.bin,0 +56152d2.bin=@56152d2.bin,0 +56152n0.bin=@56152n0.bin,0 +56152n1.bin=@56152n1.bin,0 +56152n2.bin=@56152n2.bin,0 +56153d0.bin=@56153d0.bin,0 +56153d1.bin=@56153d1.bin,0 +56153d2.bin=@56153d2.bin,0 +56153n0.bin=@56153n0.bin,0 +56153n1.bin=@56153n1.bin,0 +56153n2.bin=@56153n2.bin,0 +56158d0.bin=@56158d0.bin,0 +56158d1.bin=@56158d1.bin,0 +56158d2.bin=@56158d2.bin,0 +56158n0.bin=@56158n0.bin,0 +56158n1.bin=@56158n1.bin,0 +56158n2.bin=@56158n2.bin,0 +23648d0.bin=@23648d0.bin,0 +23648d1.bin=@23648d1.bin,0 +23648d2.bin=@23648d2.bin,0 +23648n0.bin=@23648n0.bin,0 +23468n0.bin=@23468n0.bin,0 +23468n1.bin=@23468n1.bin,0 +23468n2.bin=@23468n2.bin,0 +23472d0.bin=@23472d0.bin,0 +23472d1.bin=@23472d1.bin,0 +23472d2.bin=@23472d2.bin,0 +23472n0.bin=@23472n0.bin,0 +23472n1.bin=@23472n1.bin,0 +23472n2.bin=@23472n2.bin,0 +23476d0.bin=@23476d0.bin,0 +23476d1.bin=@23476d1.bin,0 +23476d2.bin=@23476d2.bin,0 +23476n0.bin=@23476n0.bin,0 +23476n1.bin=@23476n1.bin,0 +23476n2.bin=@23476n2.bin,0 +23480d0.bin=@23480d0.bin,0 +23480d1.bin=@23480d1.bin,0 +23480d2.bin=@23480d2.bin,0 +23480n0.bin=@23480n0.bin,0 +23480n1.bin=@23480n1.bin,0 +23480n2.bin=@23480n2.bin,0 +23516d0.bin=@23516d0.bin,0 +23516d1.bin=@23516d1.bin,0 +23516d2.bin=@23516d2.bin,0 +23516n0.bin=@23516n0.bin,0 +23516n1.bin=@23516n1.bin,0 +23516n2.bin=@23516n2.bin,0 +23520d0.bin=@23520d0.bin,0 +23520d1.bin=@23520d1.bin,0 +23520d2.bin=@23520d2.bin,0 +23520n0.bin=@23520n0.bin,0 +23520n1.bin=@23520n1.bin,0 +23520n2.bin=@23520n2.bin,0 +23536d0.bin=@23536d0.bin,0 +23536d1.bin=@23536d1.bin,0 +23536d2.bin=@23536d2.bin,0 +23536n0.bin=@23536n0.bin,0 +23536n1.bin=@23536n1.bin,0 +23536n2.bin=@23536n2.bin,0 +23540d0.bin=@23540d0.bin,0 +23540d1.bin=@23540d1.bin,0 +23540d2.bin=@23540d2.bin,0 +23540n0.bin=@23540n0.bin,0 +23540n1.bin=@23540n1.bin,0 +23540n2.bin=@23540n2.bin,0 +23606d0.bin=@23606d0.bin,0 +23606d1.bin=@23606d1.bin,0 +23606d2.bin=@23606d2.bin,0 +23606n0.bin=@23606n0.bin,0 +23606n1.bin=@23606n1.bin,0 +23606n2.bin=@23606n2.bin,0 +23610d0.bin=@23610d0.bin,0 +23610d1.bin=@23610d1.bin,0 +23610d2.bin=@23610d2.bin,0 +23610n0.bin=@23610n0.bin,0 +23610n1.bin=@23610n1.bin,0 +23610n2.bin=@23610n2.bin,0 +23614d0.bin=@23614d0.bin,0 +23614d1.bin=@23614d1.bin,0 +23614d2.bin=@23614d2.bin,0 +23614n0.bin=@23614n0.bin,0 +23614n1.bin=@23614n1.bin,0 +23614n2.bin=@23614n2.bin,0 +23618d0.bin=@23618d0.bin,0 +23618d1.bin=@23618d1.bin,0 +23618d2.bin=@23618d2.bin,0 +23618n0.bin=@23618n0.bin,0 +23618n1.bin=@23618n1.bin,0 +23618n2.bin=@23618n2.bin,0 +23622d0.bin=@23622d0.bin,0 +23622d1.bin=@23622d1.bin,0 +23622d2.bin=@23622d2.bin,0 +23622n0.bin=@23622n0.bin,0 +23622n1.bin=@23622n1.bin,0 +23622n2.bin=@23622n2.bin,0 +23644d0.bin=@23644d0.bin,0 +23644d1.bin=@23644d1.bin,0 +23644d2.bin=@23644d2.bin,0 +23644n0.bin=@23644n0.bin,0 +23644n1.bin=@23644n1.bin,0 +23644n2.bin=@23644n2.bin,0 +23655d0.bin=@23655d0.bin,0 +23655d1.bin=@23655d1.bin,0 +23655d2.bin=@23655d2.bin,0 +23655n0.bin=@23655n0.bin,0 +23655n1.bin=@23655n1.bin,0 +23655n2.bin=@23655n2.bin,0 +23659d0.bin=@23659d0.bin,0 +23659d1.bin=@23659d1.bin,0 +23659d2.bin=@23659d2.bin,0 +23659n0.bin=@23659n0.bin,0 +23659n1.bin=@23659n1.bin,0 +23659n2.bin=@23659n2.bin,0 +23668d0.bin=@23668d0.bin,0 +23668d1.bin=@23668d1.bin,0 +23668d2.bin=@23668d2.bin,0 +23668n0.bin=@23668n0.bin,0 +23668n1.bin=@23668n1.bin,0 +23668n2.bin=@23668n2.bin,0 +23705d0.bin=@23705d0.bin,0 +23705d1.bin=@23705d1.bin,0 +23705d2.bin=@23705d2.bin,0 +23705n0.bin=@23705n0.bin,0 +23705n1.bin=@23705n1.bin,0 +23705n2.bin=@23705n2.bin,0 +23709d0.bin=@23709d0.bin,0 +23709d1.bin=@23709d1.bin,0 +23709d2.bin=@23709d2.bin,0 +23709n0.bin=@23709n0.bin,0 +23709n1.bin=@23709n1.bin,0 +23709n2.bin=@23709n2.bin,0 +23713d0.bin=@23713d0.bin,0 +23713d1.bin=@23713d1.bin,0 +23713d2.bin=@23713d2.bin,0 +23713n0.bin=@23713n0.bin,0 +23713n1.bin=@23713n1.bin,0 +23713n2.bin=@23713n2.bin,0 +23718d0.bin=@23718d0.bin,0 +23718d1.bin=@23718d1.bin,0 +23718d2.bin=@23718d2.bin,0 +23718n0.bin=@23718n0.bin,0 +23718n1.bin=@23718n1.bin,0 +23718n2.bin=@23718n2.bin,0 +40236d0.bin=@40236d0.bin,0 +40236d1.bin=@40236d1.bin,0 +40236d2.bin=@40236d2.bin,0 +40236n0.bin=@40236n0.bin,0 +40236n1.bin=@40236n1.bin,0 +40236n2.bin=@40236n2.bin,0 +55691d0.bin=@55691d0.bin,0 +55691d1.bin=@55691d1.bin,0 +55691d2.bin=@55691d2.bin,0 +55691n0.bin=@55691n0.bin,0 +55691n1.bin=@55691n1.bin,0 +55691n2.bin=@55691n2.bin,0 +55692d0.bin=@55692d0.bin,0 +55692d1.bin=@55692d1.bin,0 +55692d2.bin=@55692d2.bin,0 +55692n0.bin=@55692n0.bin,0 +55692n1.bin=@55692n1.bin,0 +55692n2.bin=@55692n2.bin,0 +55693d0.bin=@55693d0.bin,0 +55693d1.bin=@55693d1.bin,0 +55693d2.bin=@55693d2.bin,0 +55693n0.bin=@55693n0.bin,0 +55693n1.bin=@55693n1.bin,0 +55693n2.bin=@55693n2.bin,0 +55694d0.bin=@55694d0.bin,0 +55694d1.bin=@55694d1.bin,0 +55694d2.bin=@55694d2.bin,0 +55694n0.bin=@55694n0.bin,0 +55694n1.bin=@55694n1.bin,0 +55694n2.bin=@55694n2.bin,0 +55695d0.bin=@55695d0.bin,0 +55695d1.bin=@55695d1.bin,0 +55695d2.bin=@55695d2.bin,0 +55695n0.bin=@55695n0.bin,0 +55695n1.bin=@55695n1.bin,0 +55695n2.bin=@55695n2.bin,0 +55696d0.bin=@55696d0.bin,0 +55696d1.bin=@55696d1.bin,0 +55696d2.bin=@55696d2.bin,0 +55696n0.bin=@55696n0.bin,0 +55696n1.bin=@55696n1.bin,0 +55696n2.bin=@55696n2.bin,0 +55697d0.bin=@55697d0.bin,0 +55697d1.bin=@55697d1.bin,0 +55697d2.bin=@55697d2.bin,0 +55697n0.bin=@55697n0.bin,0 +55697n1.bin=@55697n1.bin,0 +55697n2.bin=@55697n2.bin,0 +55698d0.bin=@55698d0.bin,0 +55698d1.bin=@55698d1.bin,0 +55698d2.bin=@55698d2.bin,0 +55698n0.bin=@55698n0.bin,0 +55698n1.bin=@55698n1.bin,0 +55698n2.bin=@55698n2.bin,0 +55728d0.bin=@55728d0.bin,0 +55728d1.bin=@55728d1.bin,0 +55728d2.bin=@55728d2.bin,0 +55728n0.bin=@55728n0.bin,0 +55728n1.bin=@55728n1.bin,0 +55728n2.bin=@55728n2.bin,0 +55738d0.bin=@55738d0.bin,0 +55738d1.bin=@55738d1.bin,0 +55738d2.bin=@55738d2.bin,0 +55738n0.bin=@55738n0.bin,0 +55738n1.bin=@55738n1.bin,0 +55738n2.bin=@55738n2.bin,0 +55923d0.bin=@55923d0.bin,0 +55923d1.bin=@55923d1.bin,0 +55923d2.bin=@55923d2.bin,0 +55923n0.bin=@55923n0.bin,0 +55923n1.bin=@55923n1.bin,0 +55923n2.bin=@55923n2.bin,0 +55929d0.bin=@55929d0.bin,0 +55929d1.bin=@55929d1.bin,0 +55929d2.bin=@55929d2.bin,0 +55929n0.bin=@55929n0.bin,0 +55929n1.bin=@55929n1.bin,0 +55929n2.bin=@55929n2.bin,0 +56076d0.bin=@56076d0.bin,0 +56076d1.bin=@56076d1.bin,0 +56076d2.bin=@56076d2.bin,0 +56076n0.bin=@56076n0.bin,0 +56076n1.bin=@56076n1.bin,0 +56076n2.bin=@56076n2.bin,0 +56077d0.bin=@56077d0.bin,0 +56077d1.bin=@56077d1.bin,0 +56077d2.bin=@56077d2.bin,0 +56077n0.bin=@56077n0.bin,0 +56077n1.bin=@56077n1.bin,0 +56077n2.bin=@56077n2.bin,0 +56078d0.bin=@56078d0.bin,0 +56078d1.bin=@56078d1.bin,0 +56078d2.bin=@56078d2.bin,0 +56078n0.bin=@56078n0.bin,0 +56078n1.bin=@56078n1.bin,0 +56078n2.bin=@56078n2.bin,0 +56079d0.bin=@56079d0.bin,0 +56079d1.bin=@56079d1.bin,0 +56079d2.bin=@56079d2.bin,0 +56079n0.bin=@56079n0.bin,0 +56079n1.bin=@56079n1.bin,0 +56079n2.bin=@56079n2.bin,0 +56080d0.bin=@56080d0.bin,0 +56080d1.bin=@56080d1.bin,0 +56080d2.bin=@56080d2.bin,0 +56080n0.bin=@56080n0.bin,0 +56080n1.bin=@56080n1.bin,0 +56080n2.bin=@56080n2.bin,0 +56125d0.bin=@56125d0.bin,0 +56125d1.bin=@56125d1.bin,0 +56125d2.bin=@56125d2.bin,0 +56125n0.bin=@56125n0.bin,0 +56125n1.bin=@56125n1.bin,0 +56125n2.bin=@56125n2.bin,0 +56144d0.bin=@56144d0.bin,0 +56144d1.bin=@56144d1.bin,0 +56144d2.bin=@56144d2.bin,0 +56144n0.bin=@56144n0.bin,0 +56144n1.bin=@56144n1.bin,0 +56144n2.bin=@56144n2.bin,0 +56145d0.bin=@56145d0.bin,0 +56145d1.bin=@56145d1.bin,0 +56145d2.bin=@56145d2.bin,0 +56145n0.bin=@56145n0.bin,0 +56145n1.bin=@56145n1.bin,0 +56145n2.bin=@56145n2.bin,0 +56150d0.bin=@56150d0.bin,0 +56150d1.bin=@56150d1.bin,0 +56150d2.bin=@56150d2.bin,0 +56150n0.bin=@56150n0.bin,0 +56150n1.bin=@56150n1.bin,0 +56150n2.bin=@56150n2.bin,0 +56151d0.bin=@56151d0.bin,0 +56151d1.bin=@56151d1.bin,0 +56151d2.bin=@56151d2.bin,0 +56151n0.bin=@56151n0.bin,0 +56151n1.bin=@56151n1.bin,0 +56151n2.bin=@56151n2.bin,0 +56154d0.bin=@56154d0.bin,0 +56154d1.bin=@56154d1.bin,0 +56154d2.bin=@56154d2.bin,0 +56154n0.bin=@56154n0.bin,0 +56154n1.bin=@56154n1.bin,0 +56154n2.bin=@56154n2.bin,0 +56155d0.bin=@56155d0.bin,0 +56155d1.bin=@56155d1.bin,0 +56155d2.bin=@56155d2.bin,0 +56155n0.bin=@56155n0.bin,0 +56155n1.bin=@56155n1.bin,0 +56155n2.bin=@56155n2.bin,0 +56156d0.bin=@56156d0.bin,0 +56156d1.bin=@56156d1.bin,0 +56156d2.bin=@56156d2.bin,0 +56156n0.bin=@56156n0.bin,0 +56156n1.bin=@56156n1.bin,0 +56156n2.bin=@56156n2.bin,0 +23468d0.bin=@23468d0.bin,0 +23468d1.bin=@23468d1.bin,0 +23468d2.bin=@23468d2.bin,0 +23469n2.bin=@23469n2.bin,0 +23473d0.bin=@23473d0.bin,0 +23473d1.bin=@23473d1.bin,0 +23473d2.bin=@23473d2.bin,0 +23473n0.bin=@23473n0.bin,0 +23473n1.bin=@23473n1.bin,0 +23473n2.bin=@23473n2.bin,0 +23477d0.bin=@23477d0.bin,0 +23477d1.bin=@23477d1.bin,0 +23477d2.bin=@23477d2.bin,0 +23477n0.bin=@23477n0.bin,0 +23477n1.bin=@23477n1.bin,0 +23477n2.bin=@23477n2.bin,0 +23481d0.bin=@23481d0.bin,0 +23481d1.bin=@23481d1.bin,0 +23481d2.bin=@23481d2.bin,0 +23481n0.bin=@23481n0.bin,0 +23481n1.bin=@23481n1.bin,0 +23481n2.bin=@23481n2.bin,0 +23517d0.bin=@23517d0.bin,0 +23517d1.bin=@23517d1.bin,0 +23517d2.bin=@23517d2.bin,0 +23517n0.bin=@23517n0.bin,0 +23517n1.bin=@23517n1.bin,0 +23517n2.bin=@23517n2.bin,0 +23521d0.bin=@23521d0.bin,0 +23521d1.bin=@23521d1.bin,0 +23521d2.bin=@23521d2.bin,0 +23521n0.bin=@23521n0.bin,0 +23521n1.bin=@23521n1.bin,0 +23521n2.bin=@23521n2.bin,0 +23537d0.bin=@23537d0.bin,0 +23537d1.bin=@23537d1.bin,0 +23537d2.bin=@23537d2.bin,0 +23537n0.bin=@23537n0.bin,0 +23537n1.bin=@23537n1.bin,0 +23537n2.bin=@23537n2.bin,0 +23541d0.bin=@23541d0.bin,0 +23541d1.bin=@23541d1.bin,0 +23541d2.bin=@23541d2.bin,0 +23541n0.bin=@23541n0.bin,0 +23541n1.bin=@23541n1.bin,0 +23541n2.bin=@23541n2.bin,0 +23607d0.bin=@23607d0.bin,0 +23607d1.bin=@23607d1.bin,0 +23607d2.bin=@23607d2.bin,0 +23607n0.bin=@23607n0.bin,0 +23607n1.bin=@23607n1.bin,0 +23607n2.bin=@23607n2.bin,0 +23611d0.bin=@23611d0.bin,0 +23611d1.bin=@23611d1.bin,0 +23611d2.bin=@23611d2.bin,0 +23611n0.bin=@23611n0.bin,0 +23611n1.bin=@23611n1.bin,0 +23611n2.bin=@23611n2.bin,0 +23615d0.bin=@23615d0.bin,0 +23615d1.bin=@23615d1.bin,0 +23615d2.bin=@23615d2.bin,0 +23615n0.bin=@23615n0.bin,0 +23615n1.bin=@23615n1.bin,0 +23615n2.bin=@23615n2.bin,0 +23619d0.bin=@23619d0.bin,0 +23619d1.bin=@23619d1.bin,0 +23619d2.bin=@23619d2.bin,0 +23619n0.bin=@23619n0.bin,0 +23619n1.bin=@23619n1.bin,0 +23619n2.bin=@23619n2.bin,0 +23623d0.bin=@23623d0.bin,0 +23623d1.bin=@23623d1.bin,0 +23623d2.bin=@23623d2.bin,0 +23623n0.bin=@23623n0.bin,0 +23623n1.bin=@23623n1.bin,0 +23623n2.bin=@23623n2.bin,0 +23645d0.bin=@23645d0.bin,0 +23645d1.bin=@23645d1.bin,0 +23645d2.bin=@23645d2.bin,0 +23645n0.bin=@23645n0.bin,0 +23645n1.bin=@23645n1.bin,0 +23645n2.bin=@23645n2.bin,0 +23656d0.bin=@23656d0.bin,0 +23656d1.bin=@23656d1.bin,0 +23656d2.bin=@23656d2.bin,0 +23656n0.bin=@23656n0.bin,0 +23656n1.bin=@23656n1.bin,0 +23656n2.bin=@23656n2.bin,0 +23660d0.bin=@23660d0.bin,0 +23660d1.bin=@23660d1.bin,0 +23660d2.bin=@23660d2.bin,0 +23660n0.bin=@23660n0.bin,0 +23660n1.bin=@23660n1.bin,0 +23660n2.bin=@23660n2.bin,0 +23669d0.bin=@23669d0.bin,0 +23669d1.bin=@23669d1.bin,0 +23669d2.bin=@23669d2.bin,0 +23669n0.bin=@23669n0.bin,0 +23669n1.bin=@23669n1.bin,0 +23669n2.bin=@23669n2.bin,0 +23706d0.bin=@23706d0.bin,0 +23706d1.bin=@23706d1.bin,0 +23706d2.bin=@23706d2.bin,0 +23706n0.bin=@23706n0.bin,0 +23706n1.bin=@23706n1.bin,0 +23706n2.bin=@23706n2.bin,0 +23710d0.bin=@23710d0.bin,0 +23710d1.bin=@23710d1.bin,0 +23710d2.bin=@23710d2.bin,0 +23710n0.bin=@23710n0.bin,0 +23710n1.bin=@23710n1.bin,0 +23710n2.bin=@23710n2.bin,0 +23714d0.bin=@23714d0.bin,0 +23714d1.bin=@23714d1.bin,0 +23714d2.bin=@23714d2.bin,0 +23714n0.bin=@23714n0.bin,0 +23714n1.bin=@23714n1.bin,0 +23714n2.bin=@23714n2.bin,0 +23719d0.bin=@23719d0.bin,0 +23719d1.bin=@23719d1.bin,0 +23719d2.bin=@23719d2.bin,0 +23719n0.bin=@23719n0.bin,0 +23719n1.bin=@23719n1.bin,0 +23719n2.bin=@23719n2.bin,0 +55513d0.bin=@55513d0.bin,0 +55513d1.bin=@55513d1.bin,0 +55513d2.bin=@55513d2.bin,0 +55513n0.bin=@55513n0.bin,0 +55513n1.bin=@55513n1.bin,0 +55513n2.bin=@55513n2.bin,0 +55924d0.bin=@55924d0.bin,0 +55924d1.bin=@55924d1.bin,0 +55924d2.bin=@55924d2.bin,0 +55924n0.bin=@55924n0.bin,0 +55924n1.bin=@55924n1.bin,0 +55924n2.bin=@55924n2.bin,0 +55930d0.bin=@55930d0.bin,0 +55930d1.bin=@55930d1.bin,0 +55930d2.bin=@55930d2.bin,0 +55930n0.bin=@55930n0.bin,0 +55930n1.bin=@55930n1.bin,0 +55930n2.bin=@55930n2.bin,0 +23469d0.bin=@23469d0.bin,0 +23469d1.bin=@23469d1.bin,0 +23469d2.bin=@23469d2.bin,0 +23469n0.bin=@23469n0.bin,0 +23469n1.bin=@23469n1.bin,0 +23470n2.bin=@23470n2.bin,0 +23474d0.bin=@23474d0.bin,0 +23474d1.bin=@23474d1.bin,0 +23474d2.bin=@23474d2.bin,0 +23474n0.bin=@23474n0.bin,0 +23474n1.bin=@23474n1.bin,0 +23474n2.bin=@23474n2.bin,0 +23478d0.bin=@23478d0.bin,0 +23478d1.bin=@23478d1.bin,0 +23478d2.bin=@23478d2.bin,0 +23478n0.bin=@23478n0.bin,0 +23478n1.bin=@23478n1.bin,0 +23478n2.bin=@23478n2.bin,0 +23482d0.bin=@23482d0.bin,0 +23482d1.bin=@23482d1.bin,0 +23482d2.bin=@23482d2.bin,0 +23482n0.bin=@23482n0.bin,0 +23482n1.bin=@23482n1.bin,0 +23482n2.bin=@23482n2.bin,0 +23518d0.bin=@23518d0.bin,0 +23518d1.bin=@23518d1.bin,0 +23518d2.bin=@23518d2.bin,0 +23518n0.bin=@23518n0.bin,0 +23518n1.bin=@23518n1.bin,0 +23518n2.bin=@23518n2.bin,0 +23522d0.bin=@23522d0.bin,0 +23522d1.bin=@23522d1.bin,0 +23522d2.bin=@23522d2.bin,0 +23522n0.bin=@23522n0.bin,0 +23522n1.bin=@23522n1.bin,0 +23522n2.bin=@23522n2.bin,0 +23538d0.bin=@23538d0.bin,0 +23538d1.bin=@23538d1.bin,0 +23538d2.bin=@23538d2.bin,0 +23538n0.bin=@23538n0.bin,0 +23538n1.bin=@23538n1.bin,0 +23538n2.bin=@23538n2.bin,0 +23542d0.bin=@23542d0.bin,0 +23542d1.bin=@23542d1.bin,0 +23542d2.bin=@23542d2.bin,0 +23542n0.bin=@23542n0.bin,0 +23542n1.bin=@23542n1.bin,0 +23542n2.bin=@23542n2.bin,0 +23608d0.bin=@23608d0.bin,0 +23608d1.bin=@23608d1.bin,0 +23608d2.bin=@23608d2.bin,0 +23608n0.bin=@23608n0.bin,0 +23608n1.bin=@23608n1.bin,0 +23608n2.bin=@23608n2.bin,0 +23612d0.bin=@23612d0.bin,0 +23612d1.bin=@23612d1.bin,0 +23612d2.bin=@23612d2.bin,0 +23612n0.bin=@23612n0.bin,0 +23612n1.bin=@23612n1.bin,0 +23612n2.bin=@23612n2.bin,0 +23616d0.bin=@23616d0.bin,0 +23616d1.bin=@23616d1.bin,0 +23616d2.bin=@23616d2.bin,0 +23616n0.bin=@23616n0.bin,0 +23616n1.bin=@23616n1.bin,0 +23616n2.bin=@23616n2.bin,0 +23620d0.bin=@23620d0.bin,0 +23620d1.bin=@23620d1.bin,0 +23620d2.bin=@23620d2.bin,0 +23620n0.bin=@23620n0.bin,0 +23620n1.bin=@23620n1.bin,0 +23620n2.bin=@23620n2.bin,0 +23624d0.bin=@23624d0.bin,0 +23624d1.bin=@23624d1.bin,0 +23624d2.bin=@23624d2.bin,0 +23624n0.bin=@23624n0.bin,0 +23624n1.bin=@23624n1.bin,0 +23624n2.bin=@23624n2.bin,0 +23646d0.bin=@23646d0.bin,0 +23646d1.bin=@23646d1.bin,0 +23646d2.bin=@23646d2.bin,0 +23646n0.bin=@23646n0.bin,0 +23646n1.bin=@23646n1.bin,0 +23646n2.bin=@23646n2.bin,0 +23657d0.bin=@23657d0.bin,0 +23657d1.bin=@23657d1.bin,0 +23657d2.bin=@23657d2.bin,0 +23657n0.bin=@23657n0.bin,0 +23657n1.bin=@23657n1.bin,0 +23657n2.bin=@23657n2.bin,0 +23661d0.bin=@23661d0.bin,0 +23661d1.bin=@23661d1.bin,0 +23661d2.bin=@23661d2.bin,0 +23661n0.bin=@23661n0.bin,0 +23661n1.bin=@23661n1.bin,0 +23661n2.bin=@23661n2.bin,0 +23670d0.bin=@23670d0.bin,0 +23670d1.bin=@23670d1.bin,0 +23670d2.bin=@23670d2.bin,0 +23670n0.bin=@23670n0.bin,0 +23670n1.bin=@23670n1.bin,0 +23670n2.bin=@23670n2.bin,0 +23707d0.bin=@23707d0.bin,0 +23707d1.bin=@23707d1.bin,0 +23707d2.bin=@23707d2.bin,0 +23707n0.bin=@23707n0.bin,0 +23707n1.bin=@23707n1.bin,0 +23707n2.bin=@23707n2.bin,0 +23711d0.bin=@23711d0.bin,0 +23711d1.bin=@23711d1.bin,0 +23711d2.bin=@23711d2.bin,0 +23711n0.bin=@23711n0.bin,0 +23711n1.bin=@23711n1.bin,0 +23711n2.bin=@23711n2.bin,0 +23715d0.bin=@23715d0.bin,0 +23715d1.bin=@23715d1.bin,0 +23715d2.bin=@23715d2.bin,0 +23715n0.bin=@23715n0.bin,0 +23715n1.bin=@23715n1.bin,0 +23715n2.bin=@23715n2.bin,0 +23720d0.bin=@23720d0.bin,0 +23720d1.bin=@23720d1.bin,0 +23720d2.bin=@23720d2.bin,0 +23720n0.bin=@23720n0.bin,0 +23720n1.bin=@23720n1.bin,0 +23720n2.bin=@23720n2.bin,0 +55925d0.bin=@55925d0.bin,0 +55925d1.bin=@55925d1.bin,0 +55925d2.bin=@55925d2.bin,0 +55925n0.bin=@55925n0.bin,0 +55925n1.bin=@55925n1.bin,0 +55925n2.bin=@55925n2.bin,0 +55931d0.bin=@55931d0.bin,0 +55931d1.bin=@55931d1.bin,0 +55931d2.bin=@55931d2.bin,0 +55931n0.bin=@55931n0.bin,0 +55931n1.bin=@55931n1.bin,0 +55931n2.bin=@55931n2.bin,0 +56042d0.bin=@56042d0.bin,0 +56042d1.bin=@56042d1.bin,0 +56042d2.bin=@56042d2.bin,0 +56042n0.bin=@56042n0.bin,0 +56042n1.bin=@56042n1.bin,0 +56042n2.bin=@56042n2.bin,0 +56063d0.bin=@56063d0.bin,0 +56063d1.bin=@56063d1.bin,0 +56063d2.bin=@56063d2.bin,0 +56063n0.bin=@56063n0.bin,0 +56063n1.bin=@56063n1.bin,0 +56063n2.bin=@56063n2.bin,0 +56064d0.bin=@56064d0.bin,0 +56064d1.bin=@56064d1.bin,0 +56064d2.bin=@56064d2.bin,0 +56064n0.bin=@56064n0.bin,0 +56064n1.bin=@56064n1.bin,0 +56064n2.bin=@56064n2.bin,0 +23470d0.bin=@23470d0.bin,0 +23470d1.bin=@23470d1.bin,0 +23470d2.bin=@23470d2.bin,0 +23470n0.bin=@23470n0.bin,0 +23470n1.bin=@23470n1.bin,0 +23475d0.bin=@23475d0.bin,0 +23475d1.bin=@23475d1.bin,0 +23475d2.bin=@23475d2.bin,0 +23475n0.bin=@23475n0.bin,0 +23475n1.bin=@23475n1.bin,0 +23475n2.bin=@23475n2.bin,0 +23479d0.bin=@23479d0.bin,0 +23479d1.bin=@23479d1.bin,0 +23479d2.bin=@23479d2.bin,0 +23479n0.bin=@23479n0.bin,0 +23479n1.bin=@23479n1.bin,0 +23479n2.bin=@23479n2.bin,0 +23483d0.bin=@23483d0.bin,0 +23483d1.bin=@23483d1.bin,0 +23483d2.bin=@23483d2.bin,0 +23483n0.bin=@23483n0.bin,0 +23483n1.bin=@23483n1.bin,0 +23483n2.bin=@23483n2.bin,0 +23519d0.bin=@23519d0.bin,0 +23519d1.bin=@23519d1.bin,0 +23519d2.bin=@23519d2.bin,0 +23519n0.bin=@23519n0.bin,0 +23519n1.bin=@23519n1.bin,0 +23519n2.bin=@23519n2.bin,0 +23523d0.bin=@23523d0.bin,0 +23523d1.bin=@23523d1.bin,0 +23523d2.bin=@23523d2.bin,0 +23523n0.bin=@23523n0.bin,0 +23523n1.bin=@23523n1.bin,0 +23523n2.bin=@23523n2.bin,0 +23539d0.bin=@23539d0.bin,0 +23539d1.bin=@23539d1.bin,0 +23539d2.bin=@23539d2.bin,0 +23539n0.bin=@23539n0.bin,0 +23539n1.bin=@23539n1.bin,0 +23539n2.bin=@23539n2.bin,0 +23543d0.bin=@23543d0.bin,0 +23543d1.bin=@23543d1.bin,0 +23543d2.bin=@23543d2.bin,0 +23543n0.bin=@23543n0.bin,0 +23543n1.bin=@23543n1.bin,0 +23543n2.bin=@23543n2.bin,0 +23609d0.bin=@23609d0.bin,0 +23609d1.bin=@23609d1.bin,0 +23609d2.bin=@23609d2.bin,0 +23609n0.bin=@23609n0.bin,0 +23609n1.bin=@23609n1.bin,0 +23609n2.bin=@23609n2.bin,0 +23613d0.bin=@23613d0.bin,0 +23613d1.bin=@23613d1.bin,0 +23613d2.bin=@23613d2.bin,0 +23613n0.bin=@23613n0.bin,0 +23613n1.bin=@23613n1.bin,0 +23613n2.bin=@23613n2.bin,0 +23617d0.bin=@23617d0.bin,0 +23617d1.bin=@23617d1.bin,0 +23617d2.bin=@23617d2.bin,0 +23617n0.bin=@23617n0.bin,0 +23617n1.bin=@23617n1.bin,0 +23617n2.bin=@23617n2.bin,0 +23621d0.bin=@23621d0.bin,0 +23621d1.bin=@23621d1.bin,0 +23621d2.bin=@23621d2.bin,0 +23621n0.bin=@23621n0.bin,0 +23621n1.bin=@23621n1.bin,0 +23621n2.bin=@23621n2.bin,0 +23625d0.bin=@23625d0.bin,0 +23625d1.bin=@23625d1.bin,0 +23625d2.bin=@23625d2.bin,0 +23625n0.bin=@23625n0.bin,0 +23625n1.bin=@23625n1.bin,0 +23625n2.bin=@23625n2.bin,0 +23647d0.bin=@23647d0.bin,0 +23647d1.bin=@23647d1.bin,0 +23647d2.bin=@23647d2.bin,0 +23647n0.bin=@23647n0.bin,0 +23647n1.bin=@23647n1.bin,0 +23647n2.bin=@23647n2.bin,0 +23658d0.bin=@23658d0.bin,0 +23658d1.bin=@23658d1.bin,0 +23658d2.bin=@23658d2.bin,0 +23658n0.bin=@23658n0.bin,0 +23658n1.bin=@23658n1.bin,0 +23658n2.bin=@23658n2.bin,0 +23662d0.bin=@23662d0.bin,0 +23662d1.bin=@23662d1.bin,0 +23662d2.bin=@23662d2.bin,0 +23662n0.bin=@23662n0.bin,0 +23662n1.bin=@23662n1.bin,0 +23662n2.bin=@23662n2.bin,0 +23671d0.bin=@23671d0.bin,0 +23671d1.bin=@23671d1.bin,0 +23671d2.bin=@23671d2.bin,0 +23671n0.bin=@23671n0.bin,0 +23671n1.bin=@23671n1.bin,0 +23671n2.bin=@23671n2.bin,0 +23708d0.bin=@23708d0.bin,0 +23708d1.bin=@23708d1.bin,0 +23708d2.bin=@23708d2.bin,0 +23708n0.bin=@23708n0.bin,0 +23708n1.bin=@23708n1.bin,0 +23708n2.bin=@23708n2.bin,0 +23712d0.bin=@23712d0.bin,0 +23712d1.bin=@23712d1.bin,0 +23712d2.bin=@23712d2.bin,0 +23712n0.bin=@23712n0.bin,0 +23712n1.bin=@23712n1.bin,0 +23712n2.bin=@23712n2.bin,0 +23716d0.bin=@23716d0.bin,0 +23716d1.bin=@23716d1.bin,0 +23716d2.bin=@23716d2.bin,0 +23716n0.bin=@23716n0.bin,0 +23716n1.bin=@23716n1.bin,0 +23716n2.bin=@23716n2.bin,0 +23721d0.bin=@23721d0.bin,0 +23721d1.bin=@23721d1.bin,0 +23721d2.bin=@23721d2.bin,0 +23721n0.bin=@23721n0.bin,0 +23721n1.bin=@23721n1.bin,0 +23721n2.bin=@23721n2.bin,0 +55926d0.bin=@55926d0.bin,0 +55926d1.bin=@55926d1.bin,0 +55926d2.bin=@55926d2.bin,0 +55926n0.bin=@55926n0.bin,0 +55926n1.bin=@55926n1.bin,0 +55926n2.bin=@55926n2.bin,0 +55932d0.bin=@55932d0.bin,0 +55932d1.bin=@55932d1.bin,0 +55932d2.bin=@55932d2.bin,0 +55932n0.bin=@55932n0.bin,0 +55932n1.bin=@55932n1.bin,0 +55932n2.bin=@55932n2.bin,0 +23471d0.bin=@23471d0.bin,0 +23471d1.bin=@23471d1.bin,0 +23471d2.bin=@23471d2.bin,0 +23471n0.bin=@23471n0.bin,0 +23471n1.bin=@23471n1.bin,0 +23471n2.bin=@23471n2.bin,0 +21731n0.bin=@21731n0.bin,0 +21731n1.bin=@21731n1.bin,0 +21731n2.bin=@21731n2.bin,0 +21746d0.bin=@21746d0.bin,0 +21746d1.bin=@21746d1.bin,0 +21746d2.bin=@21746d2.bin,0 +21746n0.bin=@21746n0.bin,0 +21746n1.bin=@21746n1.bin,0 +21746n2.bin=@21746n2.bin,0 +21731d0.bin=@21731d0.bin,0 +21731d1.bin=@21731d1.bin,0 +21731d2.bin=@21731d2.bin,0 +54633d0.bin=@54633d0.bin,0 +54633d1.bin=@54633d1.bin,0 +54633d2.bin=@54633d2.bin,0 +54633n0.bin=@54633n0.bin,0 +54633n1.bin=@54633n1.bin,0 +54633n2.bin=@54633n2.bin,0 +54801d0.bin=@54801d0.bin,0 +54801d1.bin=@54801d1.bin,0 +54801d2.bin=@54801d2.bin,0 +54801n0.bin=@54801n0.bin,0 +54801n1.bin=@54801n1.bin,0 +54801n2.bin=@54801n2.bin,0 +55203d0.bin=@55203d0.bin,0 +55203d1.bin=@55203d1.bin,0 +55203d2.bin=@55203d2.bin,0 +55203n0.bin=@55203n0.bin,0 +55203n1.bin=@55203n1.bin,0 +55203n2.bin=@55203n2.bin,0 +55204d0.bin=@55204d0.bin,0 +55204d1.bin=@55204d1.bin,0 +55204d2.bin=@55204d2.bin,0 +55204n0.bin=@55204n0.bin,0 +55204n1.bin=@55204n1.bin,0 +55204n2.bin=@55204n2.bin,0 +55464d0.bin=@55464d0.bin,0 +55464d1.bin=@55464d1.bin,0 +55464d2.bin=@55464d2.bin,0 +55464n0.bin=@55464n0.bin,0 +55464n1.bin=@55464n1.bin,0 +55464n2.bin=@55464n2.bin,0 +55619d0.bin=@55619d0.bin,0 +55619d1.bin=@55619d1.bin,0 +55619d2.bin=@55619d2.bin,0 +55619n0.bin=@55619n0.bin,0 +55619n1.bin=@55619n1.bin,0 +55619n2.bin=@55619n2.bin,0 +55730d0.bin=@55730d0.bin,0 +55730d1.bin=@55730d1.bin,0 +55730d2.bin=@55730d2.bin,0 +55730n0.bin=@55730n0.bin,0 +55730n1.bin=@55730n1.bin,0 +55730n2.bin=@55730n2.bin,0 +55771d0.bin=@55771d0.bin,0 +55771d1.bin=@55771d1.bin,0 +55771d2.bin=@55771d2.bin,0 +55771n0.bin=@55771n0.bin,0 +55771n1.bin=@55771n1.bin,0 +55771n2.bin=@55771n2.bin,0 +55896d0.bin=@55896d0.bin,0 +55896d1.bin=@55896d1.bin,0 +55896d2.bin=@55896d2.bin,0 +55896n0.bin=@55896n0.bin,0 +55896n1.bin=@55896n1.bin,0 +55896n2.bin=@55896n2.bin,0 +55937d0.bin=@55937d0.bin,0 +55937d1.bin=@55937d1.bin,0 +55937d2.bin=@55937d2.bin,0 +55937n0.bin=@55937n0.bin,0 +55937n1.bin=@55937n1.bin,0 +55937n2.bin=@55937n2.bin,0 +55938d0.bin=@55938d0.bin,0 +55938d1.bin=@55938d1.bin,0 +55938d2.bin=@55938d2.bin,0 +55938n0.bin=@55938n0.bin,0 +55938n1.bin=@55938n1.bin,0 +55938n2.bin=@55938n2.bin,0 +55939d0.bin=@55939d0.bin,0 +55939d1.bin=@55939d1.bin,0 +55939d2.bin=@55939d2.bin,0 +55939n0.bin=@55939n0.bin,0 +55939n1.bin=@55939n1.bin,0 +55939n2.bin=@55939n2.bin,0 +55964d0.bin=@55964d0.bin,0 +55964d1.bin=@55964d1.bin,0 +55964d2.bin=@55964d2.bin,0 +55964n0.bin=@55964n0.bin,0 +55964n1.bin=@55964n1.bin,0 +55964n2.bin=@55964n2.bin,0 +55967d0.bin=@55967d0.bin,0 +55967d1.bin=@55967d1.bin,0 +55967d2.bin=@55967d2.bin,0 +55967n0.bin=@55967n0.bin,0 +55967n1.bin=@55967n1.bin,0 +55967n2.bin=@55967n2.bin,0 +56109d0.bin=@56109d0.bin,0 +56109d1.bin=@56109d1.bin,0 +56109d2.bin=@56109d2.bin,0 +56109n0.bin=@56109n0.bin,0 +56109n1.bin=@56109n1.bin,0 +56109n2.bin=@56109n2.bin,0 +56110d0.bin=@56110d0.bin,0 +56110d1.bin=@56110d1.bin,0 +56110d2.bin=@56110d2.bin,0 +56110n0.bin=@56110n0.bin,0 +56110n1.bin=@56110n1.bin,0 +56110n2.bin=@56110n2.bin,0 +56143d0.bin=@56143d0.bin,0 +56143d1.bin=@56143d1.bin,0 +56143d2.bin=@56143d2.bin,0 +56143n0.bin=@56143n0.bin,0 +56143n1.bin=@56143n1.bin,0 +56143n2.bin=@56143n2.bin,0 +56147d0.bin=@56147d0.bin,0 +56147d1.bin=@56147d1.bin,0 +56147d2.bin=@56147d2.bin,0 +56147n0.bin=@56147n0.bin,0 +56147n1.bin=@56147n1.bin,0 +56147n2.bin=@56147n2.bin,0 +56157d0.bin=@56157d0.bin,0 +56157d1.bin=@56157d1.bin,0 +56157d2.bin=@56157d2.bin,0 +56157n0.bin=@56157n0.bin,0 +56157n1.bin=@56157n1.bin,0 +56157n2.bin=@56157n2.bin,0 +56159d0.bin=@56159d0.bin,0 +56159d1.bin=@56159d1.bin,0 +56159d2.bin=@56159d2.bin,0 +56159n0.bin=@56159n0.bin,0 +56159n1.bin=@56159n1.bin,0 +56159n2.bin=@56159n2.bin,0 +64552d0.bin=@64552d0.bin,0 +64552d1.bin=@64552d1.bin,0 +64552d2.bin=@64552d2.bin,0 +64555d0.bin=@64555d0.bin,0 +64555d1.bin=@64555d1.bin,0 +64555d2.bin=@64555d2.bin,0 +64556d0.bin=@64556d0.bin,0 +64556d1.bin=@64556d1.bin,0 +64556d2.bin=@64556d2.bin,0 +51122d0.bin=@51122d0.bin,0 +51122d1.bin=@51122d1.bin,0 +51122d2.bin=@51122d2.bin,0 +51122n0.bin=@51122n0.bin,0 +51122n1.bin=@51122n1.bin,0 +51122n2.bin=@51122n2.bin,0 +55732d0.bin=@55732d0.bin,0 +55732d1.bin=@55732d1.bin,0 +55732d2.bin=@55732d2.bin,0 +55732n0.bin=@55732n0.bin,0 +55732n1.bin=@55732n1.bin,0 +55732n2.bin=@55732n2.bin,0 +55731d0.bin=@55731d0.bin,0 +55731d1.bin=@55731d1.bin,0 +55731d2.bin=@55731d2.bin,0 +55731n0.bin=@55731n0.bin,0 +55731n1.bin=@55731n1.bin,0 +55731n2.bin=@55731n2.bin,0 +55818d0.bin=@55818d0.bin,0 +55818d1.bin=@55818d1.bin,0 +55818d2.bin=@55818d2.bin,0 +55818n0.bin=@55818n0.bin,0 +55818n1.bin=@55818n1.bin,0 +55818n2.bin=@55818n2.bin,0 +56112d0.bin=@56112d0.bin,0 +56112d1.bin=@56112d1.bin,0 +56112d2.bin=@56112d2.bin,0 +56112n0.bin=@56112n0.bin,0 +56112n1.bin=@56112n1.bin,0 +56112n2.bin=@56112n2.bin,0 +56105d0.bin=@56105d0.bin,0 +56105d1.bin=@56105d1.bin,0 +56105d2.bin=@56105d2.bin,0 +56105n0.bin=@56105n0.bin,0 +56105n1.bin=@56105n1.bin,0 +56105n2.bin=@56105n2.bin,0 +58007d2.bin=@58007d2.bin,0 +58008d2.bin=@58008d2.bin,0 +58009d2.bin=@58009d2.bin,0 +58010d2.bin=@58010d2.bin,0 +58129d0.bin=@58129d0.bin,0 +58130d0.bin=@58130d0.bin,0 +58139d0.bin=@58139d0.bin,0 diff --git a/config.json b/config.json index f9a092487..912a448f9 100644 --- a/config.json +++ b/config.json @@ -17,8 +17,8 @@ "AutoCreateAccount": true, "CleanDB": false, "MaxLauncherHR": false, - "LogInboundMessages": false, - "LogOutboundMessages": false, + "LogInboundMessages": true, + "LogOutboundMessages": true, "MaxHexdumpLength": 256, "DivaEvent": 0, "FestaEvent": -1, @@ -29,7 +29,7 @@ "QuestDebugTools": false, "EarthStatusOverride": 0, "EarthIDOverride": 0, - "DynamicSeasons": false, + "DynamicSeasons": true, "EarthMonsterOverride": 0, "SaveDumps": { "Enabled": true, @@ -111,9 +111,9 @@ ], "Database": { "Host": "localhost", - "Port": 5432, + "Port": 5433, "User": "postgres", - "Password": "", + "Password": "admin", "Database": "erupe" }, "Sign": { @@ -137,6 +137,13 @@ { "Port": 54001, "MaxPlayers": 100 }, { "Port": 54002, "MaxPlayers": 100 } ] + }, + { + "Name": "Newbie 2", "Description": "", "IP": "", "Type": 3, "Recommended": 2, "AllowedClientFlags": 0, + "Channels": [ + { "Port": 54009, "MaxPlayers": 100 }, + { "Port": 54010, "MaxPlayers": 100 } + ] }, { "Name": "Normal", "Description": "", "IP": "", "Type": 1, "Recommended": 0, "AllowedClientFlags": 0, "Channels": [ diff --git a/server/channelserver/handlers_distitem.go b/server/channelserver/handlers_distitem.go index 0da9347fa..a2979756f 100644 --- a/server/channelserver/handlers_distitem.go +++ b/server/channelserver/handlers_distitem.go @@ -4,6 +4,7 @@ import ( "erupe-ce/common/byteframe" ps "erupe-ce/common/pascalstring" "erupe-ce/network/mhfpacket" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 0da70b21d..132ae61e5 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -81,18 +81,18 @@ func seasonConversion(s *Session, questPath string) string { // remove the last 6 from the quest path newQuestPath := questPath[:len(questPath)-6] - // Calculate the current day of the season in order to determine time scale - currentDayOfSeason := (time.Now().Unix()/6000)%15 + 1 // Determine if it is day or night based on the current day of the season - timeCycle := uint8(((currentDayOfSeason % 1) * 24)) < 12 + timeCycle := uint8(time.Now().Unix()/3000) % 2 // Determine the current season based on a modulus of the current time - season := uint8((int(float64((time.Now().Unix() * int64(s.server.ID)) / (6000 * 15)))) % 3) + sid := (4096 + s.server.ID*256) * 6000 + + season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) var timeSet string // Determine the letter to append for day / night - if timeCycle { + if timeCycle == 0 { timeSet = "n" } else { timeSet = "d" diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index cd4b97cdb..473b3c74b 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -33,7 +33,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { continue } } - sid := (4096 + serverIdx*256) + 16 + sid := (4096 + serverIdx*256) * 6000 //season := (uint8(float64((time.Now().Unix() + int64(sid)) / 1000))) % 3 season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) if si.IP == "" { From 411477f9b3dd068e2f916c294171cb0f0ed3620e Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 16 Jul 2023 21:14:44 +1000 Subject: [PATCH 16/66] fix time calculations & undo config changes --- config.json | 11 +-- server/channelserver/handlers_quest.go | 97 ++++++++++---------------- server/channelserver/sys_time.go | 4 ++ server/entranceserver/make_resp.go | 9 +-- 4 files changed, 47 insertions(+), 74 deletions(-) diff --git a/config.json b/config.json index 912a448f9..647440201 100644 --- a/config.json +++ b/config.json @@ -111,9 +111,9 @@ ], "Database": { "Host": "localhost", - "Port": 5433, + "Port": 5432, "User": "postgres", - "Password": "admin", + "Password": "", "Database": "erupe" }, "Sign": { @@ -137,13 +137,6 @@ { "Port": 54001, "MaxPlayers": 100 }, { "Port": 54002, "MaxPlayers": 100 } ] - }, - { - "Name": "Newbie 2", "Description": "", "IP": "", "Type": 3, "Recommended": 2, "AllowedClientFlags": 0, - "Channels": [ - { "Port": 54009, "MaxPlayers": 100 }, - { "Port": 54010, "MaxPlayers": 100 } - ] }, { "Name": "Normal", "Description": "", "IP": "", "Type": 1, "Recommended": 0, "AllowedClientFlags": 0, "Channels": [ diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 132ae61e5..df6e76b50 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -38,73 +38,52 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { } doAckBufSucceed(s, pkt.AckHandle, data) } else { - if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin")); err == nil { - data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin")) - if err != nil { - panic(err) - } - doAckBufSucceed(s, pkt.AckHandle, data) - } else { - if s.server.erupeConfig.DevModeOptions.QuestDebugTools && s.server.erupeConfig.DevMode { - s.logger.Debug( - "Quest", - zap.String("Filename", pkt.Filename), - ) - } - - // Get quest file and convert to season if the option is enabled - var data []byte - var err error - - if s.server.erupeConfig.DevModeOptions.DynamicSeasons { - data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) - } else { - data, err = os.ReadFile(seasonConversion(s, filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))) - } - - // convert based on season - - if err != nil { - s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) - // This will crash the game. - doAckBufSucceed(s, pkt.AckHandle, data) - return - } - doAckBufSucceed(s, pkt.AckHandle, data) + if s.server.erupeConfig.DevModeOptions.QuestDebugTools && s.server.erupeConfig.DevMode { + s.logger.Debug( + "Quest", + zap.String("Filename", pkt.Filename), + ) } + + // Get quest file and convert to season if the option is enabled + var data []byte + var err error + + if s.server.erupeConfig.DevModeOptions.DynamicSeasons && s.server.erupeConfig.DevMode { + seasonConversion(s, pkt.Filename) + } + + data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + if err != nil { + s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) + // This will crash the game. + doAckBufSucceed(s, pkt.AckHandle, data) + return + } + doAckBufSucceed(s, pkt.AckHandle, data) } } -// Convert the file to load based on the season -func seasonConversion(s *Session, questPath string) string { - - // remove the last 6 from the quest path - newQuestPath := questPath[:len(questPath)-6] - - // Determine if it is day or night based on the current day of the season - timeCycle := uint8(time.Now().Unix()/3000) % 2 - - // Determine the current season based on a modulus of the current time - sid := (4096 + s.server.ID*256) * 6000 - - season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) - - var timeSet string - +func seasonConversion(s *Session, questFile string) string { // Determine the letter to append for day / night - if timeCycle == 0 { - timeSet = "n" - } else { + var timeSet string + if TimeGameAbsolute() > 2880 { timeSet = "d" + } else { + timeSet = "n" } - fileName := fmt.Sprintf("%s%s%d.bin", newQuestPath, timeSet, season) + // Determine the current season based on a modulus of the current time + sid := int64(((s.server.ID & 0xFF00) - 4096) / 256) + season := ((TimeAdjusted().Unix() / 86400) + sid) % 3 - // Return the original if the season-based file does not exist for some reason - if _, err := os.Stat(fileName); err == nil { - return fileName + filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, season) + + // Return original file if file doesn't exist + if _, err := os.Stat(filename); err == nil { + return filename } else { - return questPath + return questFile } } @@ -126,10 +105,10 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -func readOriginalPointers(string_pointer int32, quest []byte) []byte { +func readOriginalPointers(stringPointer int32, quest []byte) []byte { fileBytes := byteframe.NewByteFrameFromBytes(quest) fileBytes.SetLE() - fileBytes.Seek(int64(string_pointer), io.SeekStart) + fileBytes.Seek(int64(stringPointer), io.SeekStart) questNamePointer := fileBytes.ReadInt32() questMainPointer := fileBytes.ReadInt32() diff --git a/server/channelserver/sys_time.go b/server/channelserver/sys_time.go index 396ae4cf5..a41b18b2e 100644 --- a/server/channelserver/sys_time.go +++ b/server/channelserver/sys_time.go @@ -23,3 +23,7 @@ func TimeWeekStart() time.Time { func TimeWeekNext() time.Time { return TimeWeekStart().Add(time.Hour * 24 * 7) } + +func TimeGameAbsolute() uint32 { + return uint32((TimeAdjusted().Unix() - 2160) % 5760) +} diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index 473b3c74b..5f4135d88 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -3,12 +3,10 @@ package entranceserver import ( "encoding/binary" "encoding/hex" + "erupe-ce/common/stringsupport" _config "erupe-ce/config" "fmt" "net" - "time" - - "erupe-ce/common/stringsupport" "erupe-ce/common/byteframe" "erupe-ce/server/channelserver" @@ -33,9 +31,8 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { continue } } + sid := (4096 + serverIdx*256) * 6000 - //season := (uint8(float64((time.Now().Unix() + int64(sid)) / 1000))) % 3 - season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) if si.IP == "" { si.IP = config.Host } @@ -48,7 +45,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { bf.WriteUint16(0x0000) bf.WriteUint16(uint16(len(si.Channels))) bf.WriteUint8(si.Type) - bf.WriteUint8(season) + bf.WriteUint8(uint8(((channelserver.TimeAdjusted().Unix() / 86400) + int64(serverIdx)) % 3)) bf.WriteUint8(si.Recommended) if s.erupeConfig.RealClientMode <= _config.GG { From 568fa5e1162bd611e903c89ed033961b4c14d207 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 16 Jul 2023 21:16:44 +1000 Subject: [PATCH 17/66] fix not reading from quest file --- server/channelserver/handlers_quest.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index df6e76b50..6d12d1a11 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -45,15 +45,11 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { ) } - // Get quest file and convert to season if the option is enabled - var data []byte - var err error - if s.server.erupeConfig.DevModeOptions.DynamicSeasons && s.server.erupeConfig.DevMode { - seasonConversion(s, pkt.Filename) + pkt.Filename = seasonConversion(s, pkt.Filename) } - data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) if err != nil { s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) // This will crash the game. From a98ebf5d529ede0b09a24fbcee095a4977ae0507 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 16 Jul 2023 21:57:29 +1000 Subject: [PATCH 18/66] rewrite into SeasonOverride --- config.json | 4 ++-- config/config.go | 2 +- server/channelserver/handlers_quest.go | 8 ++------ server/channelserver/sys_channel_server.go | 5 +++++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/config.json b/config.json index 647440201..83d1ee480 100644 --- a/config.json +++ b/config.json @@ -29,7 +29,6 @@ "QuestDebugTools": false, "EarthStatusOverride": 0, "EarthIDOverride": 0, - "DynamicSeasons": true, "EarthMonsterOverride": 0, "SaveDumps": { "Enabled": true, @@ -58,7 +57,8 @@ "DisableHunterNavi": false, "EnableHiganjimaEvent": false, "EnableNierEvent": false, - "DisableRoad": false + "DisableRoad": false, + "SeasonOverride": false }, "Discord": { "Enabled": false, diff --git a/config/config.go b/config/config.go index 5c4ee693d..b8b52ee06 100644 --- a/config/config.go +++ b/config/config.go @@ -110,7 +110,6 @@ type DevModeOptions struct { QuestDebugTools bool // Enable various quest debug logs EarthStatusOverride int32 EarthIDOverride int32 - DynamicSeasons bool // Enables dynamic seasons EarthMonsterOverride int32 SaveDumps SaveDumpOptions } @@ -144,6 +143,7 @@ type GameplayOptions struct { EnableHiganjimaEvent bool // Enables the Higanjima event in the Rasta Bar EnableNierEvent bool // Enables the Nier event in the Rasta Bar DisableRoad bool // Disables the Hunting Road + SeasonOverride bool // Overrides the Quest Season with the current Mezeporta Season } // Discord holds the discord integration config. diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 6d12d1a11..63828da6f 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -45,7 +45,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { ) } - if s.server.erupeConfig.DevModeOptions.DynamicSeasons && s.server.erupeConfig.DevMode { + if s.server.erupeConfig.GameplayOptions.SeasonOverride { pkt.Filename = seasonConversion(s, pkt.Filename) } @@ -69,11 +69,7 @@ func seasonConversion(s *Session, questFile string) string { timeSet = "n" } - // Determine the current season based on a modulus of the current time - sid := int64(((s.server.ID & 0xFF00) - 4096) / 256) - season := ((TimeAdjusted().Unix() / 86400) + sid) % 3 - - filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, season) + filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, s.server.Season()) // Return original file if file doesn't exist if _, err := os.Stat(filename); err == nil { diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go index dccece844..b362c911e 100644 --- a/server/channelserver/sys_channel_server.go +++ b/server/channelserver/sys_channel_server.go @@ -405,3 +405,8 @@ func (s *Server) NextSemaphoreID() uint32 { } return s.semaphoreIndex } + +func (s *Server) Season() uint8 { + sid := int64(((s.ID & 0xFF00) - 4096) / 256) + return uint8(((TimeAdjusted().Unix() / 86400) + sid) % 3) +} From a497eaf4deffddf5683ea4ab57fea359a9d857a1 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Sun, 16 Jul 2023 19:00:25 -0400 Subject: [PATCH 19/66] refactor: Enumerate quests turned into a struct and loops --- server/channelserver/handlers_quest.go | 74 ++++++++++---------------- 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 63828da6f..d1b5ae960 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -97,64 +97,48 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } +type QuestMeta struct { + pointers []int32 + strings [][]byte +} + func readOriginalPointers(stringPointer int32, quest []byte) []byte { fileBytes := byteframe.NewByteFrameFromBytes(quest) fileBytes.SetLE() fileBytes.Seek(int64(stringPointer), io.SeekStart) - questNamePointer := fileBytes.ReadInt32() - questMainPointer := fileBytes.ReadInt32() - questAPointer := fileBytes.ReadInt32() - questBPointer := fileBytes.ReadInt32() - questClearPointer := fileBytes.ReadInt32() - questFailurePointer := fileBytes.ReadInt32() - questContractorPointer := fileBytes.ReadInt32() - questDescriptionPointer := fileBytes.ReadInt32() + stringMeta := QuestMeta{ + pointers: make([]int32, 8), + strings: make([][]byte, 8), + } - // Read the strings in order to determine the length of the new string pointers for use in the new offsets - // It must seek to each initial pointer since the order is not consistent. - fileBytes.Seek(int64(questNamePointer), io.SeekStart) - questNameString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questMainPointer), io.SeekStart) - questMainString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questAPointer), io.SeekStart) - questAString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questBPointer), io.SeekStart) - questBString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questClearPointer), io.SeekStart) - questClearString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questFailurePointer), io.SeekStart) - questFailureString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questContractorPointer), io.SeekStart) - questContractorString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questDescriptionPointer), io.SeekStart) - questDescriptionString := fileBytes.ReadNullTerminatedBytes() + for i := 0; i < 8; i++ { + stringMeta.pointers[i] = fileBytes.ReadInt32() + } - pointerStart := 352 + for i := 0; i < 8; i++ { + fileBytes.Seek(int64(stringMeta.pointers[i]), io.SeekStart) + stringMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() + } newPointers := byteframe.NewByteFrame() newPointers.SetLE() - newPointers.WriteInt32(int32(pointerStart)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + 1)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + 2)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + 3)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 4)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + 5)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + 6)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + len(questContractorString) + 7)) + // write the new string pointers + for i := 0; i < 8; i++ { + length := 352 + for j := 0; j < i; j++ { + length += len(stringMeta.strings[j]) + 1 + } + newPointers.WriteInt32(int32(length)) + } - newPointers.WriteNullTerminatedBytes(questNameString) - newPointers.WriteNullTerminatedBytes(questMainString) - newPointers.WriteNullTerminatedBytes(questAString) - newPointers.WriteNullTerminatedBytes(questBString) - newPointers.WriteNullTerminatedBytes(questClearString) - newPointers.WriteNullTerminatedBytes(questFailureString) - newPointers.WriteNullTerminatedBytes(questContractorString) - newPointers.WriteNullTerminatedBytes(questDescriptionString) + for i := 0; i < 8; i++ { + newPointers.WriteNullTerminatedBytes(stringMeta.strings[i]) + } - newPointers.WriteUint8(18) - newPointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) + newPointers.WriteUint8(1) + newPointers.WriteInt8(0x00) return newPointers.Data() } From c6618b7688a540c5b2278cecf85690c89216f7f7 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 17 Jul 2023 19:48:54 +1000 Subject: [PATCH 20/66] squash Quest Enumeration functions --- server/channelserver/handlers_quest.go | 60 +++++++++----------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index d1b5ae960..86cd0c972 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -4,6 +4,7 @@ import ( "database/sql" "erupe-ce/common/byteframe" "erupe-ce/common/decryption" + ps "erupe-ce/common/pascalstring" "erupe-ce/network/mhfpacket" "fmt" "io" @@ -97,81 +98,62 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -type QuestMeta struct { - pointers []int32 - strings [][]byte -} - -func readOriginalPointers(stringPointer int32, quest []byte) []byte { +func readOriginalPointers(pointer int64, quest []byte) []byte { fileBytes := byteframe.NewByteFrameFromBytes(quest) fileBytes.SetLE() - fileBytes.Seek(int64(stringPointer), io.SeekStart) + fileBytes.Seek(pointer, 0) - stringMeta := QuestMeta{ - pointers: make([]int32, 8), - strings: make([][]byte, 8), + questMeta := struct { + pointers []int64 + strings [][]byte + }{ + make([]int64, 8), + make([][]byte, 8), } for i := 0; i < 8; i++ { - stringMeta.pointers[i] = fileBytes.ReadInt32() + questMeta.pointers[i] = int64(fileBytes.ReadUint32()) } - for i := 0; i < 8; i++ { - fileBytes.Seek(int64(stringMeta.pointers[i]), io.SeekStart) - stringMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(questMeta.pointers[i], 0) + questMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() } newPointers := byteframe.NewByteFrame() newPointers.SetLE() - - // write the new string pointers for i := 0; i < 8; i++ { length := 352 for j := 0; j < i; j++ { - length += len(stringMeta.strings[j]) + 1 + length += len(questMeta.strings[j]) + 1 } - newPointers.WriteInt32(int32(length)) + newPointers.WriteUint32(uint32(length)) } - for i := 0; i < 8; i++ { - newPointers.WriteNullTerminatedBytes(stringMeta.strings[i]) + newPointers.WriteNullTerminatedBytes(questMeta.strings[i]) } - - newPointers.WriteUint8(1) - newPointers.WriteInt8(0x00) - + ps.Uint8(newPointers, "", true) // Unused developer comment section? return newPointers.Data() } func loadQuestFile(s *Session, questId string) []byte { file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questId))) - if err != nil { return nil } decrypted := decryption.UnpackSimple(file) - fileBytes := byteframe.NewByteFrameFromBytes(decrypted) fileBytes.SetLE() - fileBytes.Seek(0, io.SeekStart) - - dataPointer := fileBytes.ReadInt32() - fileBytes.Seek(int64(dataPointer), io.SeekStart) + fileBytes.Seek(int64(fileBytes.ReadInt32()), io.SeekStart) // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. questBody := byteframe.NewByteFrameFromBytes(fileBytes.ReadBytes(320)) questBody.SetLE() questBody.Seek(40, io.SeekStart) - - strings := readOriginalPointers(questBody.ReadInt32(), decrypted) - - body := byteframe.NewByteFrame() - body.WriteBytes(questBody.Data()) - body.Seek(0, io.SeekEnd) - body.WriteBytes(strings) - - return body.Data() + strings := readOriginalPointers(int64(questBody.ReadUint32()), decrypted) + questBody.Seek(0, 2) + questBody.WriteBytes(strings) + return questBody.Data() } func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { From 2ae42d59af9da88be5b06ecf2d9f215c16e7ab22 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 18 Jul 2023 21:40:42 +1000 Subject: [PATCH 21/66] refactor Quest Enumeration --- server/channelserver/handlers_quest.go | 103 +++++++++---------------- 1 file changed, 36 insertions(+), 67 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 86cd0c972..b43f6c83c 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -98,45 +98,8 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -func readOriginalPointers(pointer int64, quest []byte) []byte { - fileBytes := byteframe.NewByteFrameFromBytes(quest) - fileBytes.SetLE() - fileBytes.Seek(pointer, 0) - - questMeta := struct { - pointers []int64 - strings [][]byte - }{ - make([]int64, 8), - make([][]byte, 8), - } - - for i := 0; i < 8; i++ { - questMeta.pointers[i] = int64(fileBytes.ReadUint32()) - } - for i := 0; i < 8; i++ { - fileBytes.Seek(questMeta.pointers[i], 0) - questMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() - } - - newPointers := byteframe.NewByteFrame() - newPointers.SetLE() - for i := 0; i < 8; i++ { - length := 352 - for j := 0; j < i; j++ { - length += len(questMeta.strings[j]) + 1 - } - newPointers.WriteUint32(uint32(length)) - } - for i := 0; i < 8; i++ { - newPointers.WriteNullTerminatedBytes(questMeta.strings[i]) - } - ps.Uint8(newPointers, "", true) // Unused developer comment section? - return newPointers.Data() -} - -func loadQuestFile(s *Session, questId string) []byte { - file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questId))) +func loadQuestFile(s *Session, questFile string) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questFile))) if err != nil { return nil } @@ -144,30 +107,50 @@ func loadQuestFile(s *Session, questId string) []byte { decrypted := decryption.UnpackSimple(file) fileBytes := byteframe.NewByteFrameFromBytes(decrypted) fileBytes.SetLE() - fileBytes.Seek(int64(fileBytes.ReadInt32()), io.SeekStart) + fileBytes.Seek(int64(fileBytes.ReadUint32()), 0) // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. questBody := byteframe.NewByteFrameFromBytes(fileBytes.ReadBytes(320)) questBody.SetLE() - questBody.Seek(40, io.SeekStart) - strings := readOriginalPointers(int64(questBody.ReadUint32()), decrypted) + // Find the master quest string pointer + questBody.Seek(40, 0) + fileBytes.Seek(int64(questBody.ReadUint32()), 0) + // Overwrite it + questBody.WriteUint32(320) questBody.Seek(0, 2) - questBody.WriteBytes(strings) + + // Rewrite the quest strings and their pointers + var tempString []byte + newStrings := byteframe.NewByteFrame() + tempPointer := 352 + for i := 0; i < 8; i++ { + temp := int64(fileBytes.Index()) + fileBytes.Seek(int64(fileBytes.ReadUint32()), 0) + tempString = fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(temp, 0) + questBody.WriteUint32(uint32(tempPointer + len(tempString) + 1)) + tempPointer += len(tempString) + 1 + newStrings.WriteNullTerminatedBytes(tempString) + } + questBody.WriteBytes(newStrings.Data()) + return questBody.Data() } func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { - var id int32 - var questId uint16 + var id uint32 + var questId int var maxPlayers, questType, mark uint8 rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) - bf := byteframe.NewByteFrame() - bf.SetLE() + data := loadQuestFile(s, fmt.Sprintf("%05dd0", questId)) + if data == nil { + return nil, fmt.Errorf("failed to load quest file") + } - // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. - bf.WriteInt32(id) - bf.WriteInt32(0) + bf := byteframe.NewByteFrame() + bf.WriteUint32(id) + bf.WriteUint32(0) bf.WriteUint8(0) // Indexer bf.WriteUint8(maxPlayers) bf.WriteUint8(questType) @@ -175,23 +158,9 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint16(0) bf.WriteUint32(0) bf.WriteUint16(0) - bf.WriteUint16(0) - - data := loadQuestFile(s, fmt.Sprintf("%05d", questId)+"d0") - - if data == nil { - return nil, fmt.Errorf("failed to load quest file") - } - + bf.WriteUint16(uint16(len(data))) bf.WriteBytes(data) - - // Update the checksum at pos 21, the checksum is determined the total length of the file minus 553 turned into a single byte. - bf.Seek(21, io.SeekStart) - bf.WriteUint8(uint8(len(bf.Data()) - 553)) - - // Overwrite the string-pointer at 62 to point at 320. This is always 320 and does not count the 22 from the event header. - bf.Seek(62, io.SeekStart) - bf.WriteInt16(320) + ps.Uint8(bf, "", true) // What is this string for? return bf.Data(), nil } @@ -215,7 +184,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { if err != nil { continue } else { - if len(data) > 850 || len(data) < 400 { + if len(data) > 896 || len(data) < 352 { continue } else { totalCount++ From f2cd6b7edbd30d3e5debbaa1917a85466b253c86 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 18 Jul 2023 21:53:58 +1000 Subject: [PATCH 22/66] refactor loadQuestFile --- server/channelserver/handlers_quest.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index b43f6c83c..39642900e 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -98,8 +98,8 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -func loadQuestFile(s *Session, questFile string) []byte { - file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questFile))) +func loadQuestFile(s *Session, questId int) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%05dd0.bin", questId))) if err != nil { return nil } @@ -143,7 +143,7 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { var maxPlayers, questType, mark uint8 rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) - data := loadQuestFile(s, fmt.Sprintf("%05dd0", questId)) + data := loadQuestFile(s, questId) if data == nil { return nil, fmt.Errorf("failed to load quest file") } From f23da6fba5bfd09b6ef5ca564ee52011382a9675 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 18 Jul 2023 23:00:00 +1000 Subject: [PATCH 23/66] remove Season from database --- main.go | 2 +- patch-schema/event_quests.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index dacd0dd18..f549f4bc8 100644 --- a/main.go +++ b/main.go @@ -222,7 +222,7 @@ func main() { if err != nil { preventClose(fmt.Sprintf("Channel: Failed to start, %s", err.Error())) } else { - channelQuery += fmt.Sprintf(`INSERT INTO servers (server_id, season, current_players, world_name, world_description, land) VALUES (%d, %d, 0, '%s', '%s', %d);`, sid, si%3, ee.Name, ee.Description, i+1) + channelQuery += fmt.Sprintf(`INSERT INTO servers (server_id, current_players, world_name, world_description, land) VALUES (%d, 0, '%s', '%s', %d);`, sid, ee.Name, ee.Description, i+1) channels = append(channels, &c) logger.Info(fmt.Sprintf("Channel %d (%d): Started successfully", count, ce.Port)) ci++ diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql index b2566e50d..94aac0c65 100644 --- a/patch-schema/event_quests.sql +++ b/patch-schema/event_quests.sql @@ -9,4 +9,6 @@ create table if not exists event_quests mark integer ); +ALTER TABLE IF EXISTS public.servers DROP COLUMN IF EXISTS season; + END; \ No newline at end of file From ab3acecce638d3d0831977dcae1b0101f7fb7634 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 00:00:40 +1000 Subject: [PATCH 24/66] fix Quest Enumeration strings --- server/channelserver/handlers_quest.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 39642900e..b41338bf6 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -124,11 +124,11 @@ func loadQuestFile(s *Session, questId int) []byte { newStrings := byteframe.NewByteFrame() tempPointer := 352 for i := 0; i < 8; i++ { + questBody.WriteUint32(uint32(tempPointer)) temp := int64(fileBytes.Index()) fileBytes.Seek(int64(fileBytes.ReadUint32()), 0) tempString = fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(temp, 0) - questBody.WriteUint32(uint32(tempPointer + len(tempString) + 1)) + fileBytes.Seek(temp+4, 0) tempPointer += len(tempString) + 1 newStrings.WriteNullTerminatedBytes(tempString) } From 064659c8292169e1486617fe5e2e72e7338453ae Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 00:03:09 +1000 Subject: [PATCH 25/66] split into questSuffix function --- server/channelserver/handlers_quest.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index b41338bf6..65a6a9288 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -61,7 +61,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { } } -func seasonConversion(s *Session, questFile string) string { +func questSuffix(s *Session) string { // Determine the letter to append for day / night var timeSet string if TimeGameAbsolute() > 2880 { @@ -69,8 +69,11 @@ func seasonConversion(s *Session, questFile string) string { } else { timeSet = "n" } + return fmt.Sprintf("%s%d", timeSet, s.server.Season()) +} - filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, s.server.Season()) +func seasonConversion(s *Session, questFile string) string { + filename := fmt.Sprintf("%s%s", questFile[:5], questSuffix(s)) // Return original file if file doesn't exist if _, err := os.Stat(filename); err == nil { From 452e8433be950a7b1bb2bfc43e23a2bff783c8d3 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 00:17:17 +1000 Subject: [PATCH 26/66] fix Quests not enumerating --- server/channelserver/handlers_quest.go | 1 + 1 file changed, 1 insertion(+) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 65a6a9288..f8f219092 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -118,6 +118,7 @@ func loadQuestFile(s *Session, questId int) []byte { // Find the master quest string pointer questBody.Seek(40, 0) fileBytes.Seek(int64(questBody.ReadUint32()), 0) + questBody.Seek(40, 0) // Overwrite it questBody.WriteUint32(320) questBody.Seek(0, 2) From 06892439ac2acf06d60a72bf0b84c360b41d7dfa Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 21:40:36 +1000 Subject: [PATCH 27/66] remove unused code --- server/channelserver/handlers_quest.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index f8f219092..1b1c469ae 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -176,15 +176,8 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(0) rows, _ := s.server.db.Query("SELECT id, COALESCE(max_players, 4) AS max_players, quest_type, quest_id, COALESCE(mark, 0) AS mark FROM event_quests ORDER BY quest_id") - - // Loop through each row and load the quest entry if it exists. for rows.Next() { - var pointer []byte - var maxPlayers, questType, checksum, questId uint16 - rows.Scan(&pointer, &maxPlayers, &questType, &checksum, &questId) - data, err := makeEventQuest(s, rows) - if err != nil { continue } else { From 893e89937faabbd77a9e4ec1a1c9e69952f8756c Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 23:23:31 +1000 Subject: [PATCH 28/66] fix Quest Mark being labelled incorrectly --- server/channelserver/handlers_quest.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 1b1c469ae..754a4ce28 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -142,9 +142,9 @@ func loadQuestFile(s *Session, questId int) []byte { } func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { - var id uint32 + var id, mark uint32 var questId int - var maxPlayers, questType, mark uint8 + var maxPlayers, questType uint8 rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) data := loadQuestFile(s, questId) @@ -158,9 +158,9 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint8(0) // Indexer bf.WriteUint8(maxPlayers) bf.WriteUint8(questType) - bf.WriteUint8(mark) + bf.WriteUint8(0) bf.WriteUint16(0) - bf.WriteUint32(0) + bf.WriteUint32(mark) bf.WriteUint16(0) bf.WriteUint16(uint16(len(data))) bf.WriteBytes(data) From eb969f1cdc119be48ada8c74a3309b5c25c3a802 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 24 Jul 2023 23:16:40 +1000 Subject: [PATCH 29/66] add VITASGN:000 to valid login requests --- server/signserver/session.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/signserver/session.go b/server/signserver/session.go index d836b8c10..9207dda4b 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -57,7 +57,7 @@ func (s *Session) handlePacket(pkt []byte) error { case "PS3SGN:100": s.client = PS3 s.handlePSSGN(bf) - case "VITASGN:100": + case "VITASGN:100", "VITASGN:000": s.client = VITA s.handlePSSGN(bf) case "WIIUSGN:100", "WIIUSGN:000": From a3e1207dfd0428ccaf98d9c81b3604f0778a809f Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 24 Jul 2023 23:42:51 +1000 Subject: [PATCH 30/66] fix conflicts --- server/signserver/dbutils.go | 2 +- server/signserver/session.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/signserver/dbutils.go b/server/signserver/dbutils.go index da1e37843..751862a49 100644 --- a/server/signserver/dbutils.go +++ b/server/signserver/dbutils.go @@ -12,7 +12,7 @@ import ( "golang.org/x/crypto/bcrypt" ) -func (s *Server) newUserChara(uid int) error { +func (s *Server) newUserChara(uid uint32) error { var numNewChars int err := s.db.QueryRow("SELECT COUNT(*) FROM characters WHERE user_id = $1 AND is_new_character = true", uid).Scan(&numNewChars) if err != nil { diff --git a/server/signserver/session.go b/server/signserver/session.go index 475203cc6..7a76fb23b 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -97,7 +97,7 @@ func (s *Session) authenticate(username string, password string) { switch resp { case SIGN_SUCCESS: if newCharaReq { - _ = s.server.newUserChara(username) + _ = s.server.newUserChara(uid) } bf.WriteBytes(s.makeSignResponse(uid)) default: From 7edf07d853ad41577fce4c6831470c98dcd6cf5f Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 25 Jul 2023 00:44:19 +1000 Subject: [PATCH 31/66] use universal Sign request names --- server/signserver/session.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/signserver/session.go b/server/signserver/session.go index 7a76fb23b..e2c2475c7 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -53,22 +53,22 @@ func (s *Session) work() { func (s *Session) handlePacket(pkt []byte) error { bf := byteframe.NewByteFrameFromBytes(pkt) reqType := string(bf.ReadNullTerminatedBytes()) - switch reqType { - case "DLTSKEYSIGN:100", "DSGN:100": + switch reqType[:len(reqType)-3] { + case "DLTSKEYSIGN:", "DSGN:": s.handleDSGN(bf) - case "PS3SGN:100": + case "PS3SGN:": s.client = PS3 s.handlePSSGN(bf) - case "VITASGN:100": + case "VITASGN:": s.client = VITA s.handlePSSGN(bf) - case "WIIUSGN:100", "WIIUSGN:000": + case "WIIUSGN:": s.client = WIIU s.handleWIIUSGN(bf) - case "VITACOGLNK:100": + case "VITACOGLNK:": s.client = VITA s.handlePSNLink(bf) - case "DELETE:100": + case "DELETE:": token := string(bf.ReadNullTerminatedBytes()) characterID := int(bf.ReadUint32()) tokenID := bf.ReadUint32() From 2eeab72c1c6d50d53e28ca72c1ee41f1d60664a3 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 25 Jul 2023 00:45:11 +1000 Subject: [PATCH 32/66] update legacy WIIU code --- server/signserver/session.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/server/signserver/session.go b/server/signserver/session.go index e2c2475c7..f2c99f22e 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -112,23 +112,24 @@ func (s *Session) authenticate(username string, password string) { func (s *Session) handleWIIUSGN(bf *byteframe.ByteFrame) { _ = bf.ReadBytes(1) wiiuKey := string(bf.ReadBytes(64)) - var reqUsername string - err := s.server.db.QueryRow(`SELECT username FROM users WHERE wiiu_key = $1`, wiiuKey).Scan(&reqUsername) - if err == sql.ErrNoRows { - resp := byteframe.NewByteFrame() - resp.WriteUint8(uint8(SIGN_ECOGLINK)) - s.cryptConn.SendPacket(resp.Data()) + var uid uint32 + err := s.server.db.QueryRow(`SELECT id FROM users WHERE wiiu_key = $1`, wiiuKey).Scan(&uid) + if err != nil { + if err == sql.ErrNoRows { + s.logger.Info("Unlinked Wii U attempted to authenticate", zap.String("Key", wiiuKey)) + s.sendCode(SIGN_ECOGLINK) + return + } + s.sendCode(SIGN_EABORT) return } - s.authenticate(reqUsername, "") + s.cryptConn.SendPacket(s.makeSignResponse(uid)) } func (s *Session) handlePSSGN(bf *byteframe.ByteFrame) { // Prevent reading malformed request if len(bf.DataFromCurrent()) < 128 { - resp := byteframe.NewByteFrame() - resp.WriteUint8(uint8(SIGN_EABORT)) - s.cryptConn.SendPacket(resp.Data()) + s.sendCode(SIGN_EABORT) return } _ = bf.ReadNullTerminatedBytes() // VITA = 0000000256, PS3 = 0000000255 From c80afa60058a741ab5e02c91bc98cd1da9e45615 Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 29 Jul 2023 17:15:53 +1000 Subject: [PATCH 33/66] add customisable Raviente max players --- config.json | 5 +++ config/config.go | 51 ++++++++++++++------------ server/channelserver/handlers_quest.go | 15 +++++++- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/config.json b/config.json index 83d1ee480..6d519c763 100644 --- a/config.json +++ b/config.json @@ -47,6 +47,11 @@ "DailyQuestAllowance": 1, "MezfesSoloTickets": 10, "MezfesGroupTickets": 4, + "RegularRavienteMaxPlayers": 8, + "ViolentRavienteMaxPlayers": 8, + "BerserkRavienteMaxPlayers": 32, + "ExtremeRavienteMaxPlayers": 32, + "SmallBerserkRavienteMaxPlayers": 8, "GUrgentRate": 10, "GCPMultiplier": 1.00, "GRPMultiplier": 1.00, diff --git a/config/config.go b/config/config.go index b8b52ee06..f084e3e5e 100644 --- a/config/config.go +++ b/config/config.go @@ -121,29 +121,34 @@ type SaveDumpOptions struct { // GameplayOptions has various gameplay modifiers type GameplayOptions struct { - FeaturedWeapons int // Number of Active Feature weapons to generate daily - MaximumNP int // Maximum number of NP held by a player - MaximumRP uint16 // Maximum number of RP held by a player - DisableLoginBoost bool // Disables the Login Boost system - DisableBoostTime bool // Disables the daily NetCafe Boost Time - BoostTimeDuration int // The number of minutes NetCafe Boost Time lasts for - GuildMealDuration int // The number of minutes a Guild Meal can be activated for after cooking - BonusQuestAllowance uint32 // Number of Bonus Point Quests to allow daily - DailyQuestAllowance uint32 // Number of Daily Quests to allow daily - MezfesSoloTickets uint32 // Number of solo tickets given weekly - MezfesGroupTickets uint32 // Number of group tickets given weekly - GUrgentRate uint16 // Adjusts the rate of G Urgent quests spawning - GCPMultiplier float32 // Adjusts the multiplier of GCP rewarded for quest completion - GRPMultiplier float32 // Adjusts the multiplier of G Rank Points rewarded for quest completion - GSRPMultiplier float32 // Adjusts the multiplier of G Skill Rank Points rewarded for quest completion - GZennyMultiplier float32 // Adjusts the multiplier of G Zenny rewarded for quest completion - MaterialMultiplier float32 // Adjusts the multiplier of Monster Materials rewarded for quest completion - ExtraCarves uint16 // Grant n extra chances to carve ALL carcasses - DisableHunterNavi bool // Disables the Hunter Navi - EnableHiganjimaEvent bool // Enables the Higanjima event in the Rasta Bar - EnableNierEvent bool // Enables the Nier event in the Rasta Bar - DisableRoad bool // Disables the Hunting Road - SeasonOverride bool // Overrides the Quest Season with the current Mezeporta Season + FeaturedWeapons int // Number of Active Feature weapons to generate daily + MaximumNP int // Maximum number of NP held by a player + MaximumRP uint16 // Maximum number of RP held by a player + DisableLoginBoost bool // Disables the Login Boost system + DisableBoostTime bool // Disables the daily NetCafe Boost Time + BoostTimeDuration int // The number of minutes NetCafe Boost Time lasts for + GuildMealDuration int // The number of minutes a Guild Meal can be activated for after cooking + BonusQuestAllowance uint32 // Number of Bonus Point Quests to allow daily + DailyQuestAllowance uint32 // Number of Daily Quests to allow daily + MezfesSoloTickets uint32 // Number of solo tickets given weekly + MezfesGroupTickets uint32 // Number of group tickets given weekly + RegularRavienteMaxPlayers uint8 + ViolentRavienteMaxPlayers uint8 + BerserkRavienteMaxPlayers uint8 + ExtremeRavienteMaxPlayers uint8 + SmallBerserkRavienteMaxPlayers uint8 + GUrgentRate uint16 // Adjusts the rate of G Urgent quests spawning + GCPMultiplier float32 // Adjusts the multiplier of GCP rewarded for quest completion + GRPMultiplier float32 // Adjusts the multiplier of G Rank Points rewarded for quest completion + GSRPMultiplier float32 // Adjusts the multiplier of G Skill Rank Points rewarded for quest completion + GZennyMultiplier float32 // Adjusts the multiplier of G Zenny rewarded for quest completion + MaterialMultiplier float32 // Adjusts the multiplier of Monster Materials rewarded for quest completion + ExtraCarves uint16 // Grant n extra chances to carve ALL carcasses + DisableHunterNavi bool // Disables the Hunter Navi + EnableHiganjimaEvent bool // Enables the Higanjima event in the Rasta Bar + EnableNierEvent bool // Enables the Nier event in the Rasta Bar + DisableRoad bool // Disables the Hunting Road + SeasonOverride bool // Overrides the Quest Season with the current Mezeporta Season } // Discord holds the discord integration config. diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 754a4ce28..64041d8a5 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -156,7 +156,20 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint32(id) bf.WriteUint32(0) bf.WriteUint8(0) // Indexer - bf.WriteUint8(maxPlayers) + switch questType { + case 16: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.RegularRavienteMaxPlayers) + case 22: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.ViolentRavienteMaxPlayers) + case 40: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.BerserkRavienteMaxPlayers) + case 50: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.ExtremeRavienteMaxPlayers) + case 51: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.SmallBerserkRavienteMaxPlayers) + default: + bf.WriteUint8(maxPlayers) + } bf.WriteUint8(questType) bf.WriteUint8(0) bf.WriteUint16(0) From 4f5a876b577c5a5f41c1098ac1f05a1f825dd584 Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 29 Jul 2023 17:25:28 +1000 Subject: [PATCH 34/66] Revert "simplify and expand Stage Object indexer" This reverts commit 19e1eae5e2fc3302bd3639c92a642f45ca00bb6c. --- server/channelserver/sys_stage.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/server/channelserver/sys_stage.go b/server/channelserver/sys_stage.go index 7b8fb15eb..b69995724 100644 --- a/server/channelserver/sys_stage.go +++ b/server/channelserver/sys_stage.go @@ -30,7 +30,7 @@ type Stage struct { // Objects objects map[uint32]*Object - objectIndex uint16 + objectIndex uint8 // Map of session -> charID. // These are clients that are CURRENTLY in the stage @@ -56,6 +56,7 @@ func NewStage(ID string) *Stage { clients: make(map[*Session]uint32), reservedClientSlots: make(map[uint32]bool), objects: make(map[uint32]*Object), + objectIndex: 0, rawBinaryData: make(map[stageBinaryKey][]byte), maxPlayers: 4, } @@ -96,10 +97,16 @@ func (s *Stage) isQuest() bool { } func (s *Stage) NextObjectID() uint32 { - s.objectIndex++ + s.objectIndex = s.objectIndex + 1 + // Objects beyond 127 do not duplicate correctly + // Indexes 0 and 127 does not update position correctly + if s.objectIndex == 127 { + s.objectIndex = 1 + } bf := byteframe.NewByteFrame() - bf.WriteUint16(127) - bf.WriteUint16(s.objectIndex) - bf.Seek(0, 0) - return bf.ReadUint32() + bf.WriteUint8(0) + bf.WriteUint8(s.objectIndex) + bf.WriteUint16(0) + obj := uint32(bf.Data()[3]) | uint32(bf.Data()[2])<<8 | uint32(bf.Data()[1])<<16 | uint32(bf.Data()[0])<<24 + return obj } From 69cc64b3b8691c0a319edd757510fc1a1d491291 Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 29 Jul 2023 21:37:01 +1000 Subject: [PATCH 35/66] add EventQuests Bundled Schema --- bundled-schema/EventQuests.sql | 292 +++++++++++++++++++++++++++++++++ 1 file changed, 292 insertions(+) create mode 100644 bundled-schema/EventQuests.sql diff --git a/bundled-schema/EventQuests.sql b/bundled-schema/EventQuests.sql new file mode 100644 index 000000000..23b4277c7 --- /dev/null +++ b/bundled-schema/EventQuests.sql @@ -0,0 +1,292 @@ +BEGIN; + +-- Ripped quests +INSERT INTO public.event_quests (max_players, quest_type, quest_id, mark) VALUES + (0,9,40060,0), + (0,9,40079,0), + (0,9,40080,0), + (0,9,40081,0), + (0,9,40133,0), + (0,9,40134,0), + (0,9,40135,0), + (0,9,40136,0), + (0,9,40137,0), + (0,9,40138,0), + (0,9,40142,0), + (0,9,40143,0), + (0,9,40161,0), + (0,9,40162,0), + (4,9,40173,0), + (4,9,40174,0), + (0,9,40201,0), + (0,9,40218,0), + (4,43,40236,1), + (4,28,40241,1), + (0,8,50534,0), + (4,18,50852,1), + (4,18,50940,1), + (4,18,51024,1), + (4,18,51025,1), + (4,18,51026,1), + (4,18,51027,1), + (4,38,51052,9), + (4,38,51053,9), + (4,18,51059,1), + (4,38,51107,9), + (4,24,51125,0), + (1,24,51126,0), + (4,24,51127,0), + (4,24,51128,0), + (4,24,51129,0), + (4,26,53034,1), + (4,18,53140,1), + (4,18,53187,1), + (4,18,53201,1), + (1,18,53253,1), + (4,26,53307,1), + (4,24,53314,0), + (4,24,53315,0), + (4,24,53316,0), + (4,24,53317,0), + (4,24,53318,0), + (4,24,53319,0), + (4,24,53320,0), + (4,24,53321,0), + (4,24,53324,0), + (1,18,53326,2), + (4,31,54244,0), + (0,8,54425,0), + (4,28,54449,1), + (4,28,54593,1), + (4,28,54594,1), + (4,28,54603,1), + (4,28,54604,1), + (4,28,54605,1), + (4,28,54606,1), + (1,28,54608,0), + (1,28,54609,0), + (32,40,54751,0), + (32,40,54752,0), + (32,40,54753,0), + (32,40,54754,0), + (32,40,54755,0), + (32,40,54756,0), + (32,40,54757,0), + (32,40,54758,0), + (32,40,54759,0), + (32,40,54760,0), + (32,40,54761,0), + (4,28,54801,0), + (4,28,55002,1), + (4,28,55195,0), + (4,28,55202,0), + (4,28,55203,0), + (4,28,55204,0), + (0,8,55369,0), + (4,28,55464,1), + (4,43,55513,1), + (4,28,55529,0), + (4,28,55532,0), + (1,28,55536,0), + (1,28,55537,0), + (32,50,55596,0), + (32,50,55597,0), + (32,50,55598,0), + (32,50,55599,0), + (32,50,55601,0), + (32,50,55602,0), + (32,50,55603,0), + (32,50,55604,0), + (32,50,55605,0), + (32,50,55606,0), + (32,50,55607,0), + (4,28,55619,0), + (4,28,55670,1), + (4,39,55679,9), + (4,39,55680,9), + (4,43,55691,1), + (4,43,55692,1), + (4,43,55693,1), + (4,43,55694,1), + (4,43,55695,1), + (4,43,55696,1), + (4,43,55697,1), + (4,43,55698,1), + (1,43,55728,1), + (4,43,55738,1), + (0,8,55767,0), + (0,8,55768,0), + (4,28,55771,1), + (4,39,55772,9), + (8,51,55796,0), + (8,51,55797,0), + (8,51,55798,0), + (8,51,55799,0), + (8,51,55801,0), + (8,51,55802,0), + (8,51,55803,0), + (8,51,55804,0), + (8,51,55805,0), + (8,51,55806,0), + (8,51,55807,0), + (1,28,55808,0), + (0,8,55870,0), + (0,8,55872,0), + (0,8,55879,0), + (0,8,55880,0), + (0,8,55881,0), + (0,8,55882,0), + (4,28,55896,1), + (0,8,55897,0), + (0,8,55899,0), + (0,8,55901,0), + (0,8,55902,0), + (0,8,55903,0), + (0,8,55904,0), + (0,8,55905,0), + (0,8,55906,0), + (0,8,55907,0), + (0,8,55908,0), + (0,8,55909,0), + (0,8,55910,0), + (0,8,55911,0), + (0,8,55912,0), + (4,39,55916,9), + (4,39,55917,9), + (4,39,55918,9), + (4,39,55919,9), + (4,28,55920,0), + (4,39,55921,9), + (4,39,55922,9), + (4,43,55923,1), + (4,43,55924,1), + (4,43,55925,1), + (4,43,55926,1), + (4,43,55929,1), + (4,43,55930,1), + (4,43,55931,1), + (4,43,55932,1), + (4,28,55935,0), + (4,28,55936,0), + (4,28,55937,0), + (4,28,55938,0), + (4,28,55939,0), + (4,28,55948,0), + (4,28,55949,0), + (4,28,55950,0), + (4,28,55951,0), + (1,28,55963,0), + (4,28,55964,1), + (4,28,55967,1), + (4,43,56042,1), + (4,43,56056,1), + (4,43,56058,1), + (4,43,56059,1), + (4,43,56063,1), + (4,43,56064,1), + (4,43,56076,4), + (4,43,56077,4), + (4,43,56078,4), + (4,43,56079,4), + (4,43,56080,4), + (4,43,56125,1), + (4,24,56134,0), + (4,24,56135,0), + (4,24,56138,0), + (4,24,56139,0), + (4,24,56141,0), + (4,24,56142,0), + (4,28,56143,1), + (4,43,56144,1), + (4,43,56145,1), + (0,8,56146,0), + (4,28,56147,1), + (4,24,56148,0), + (1,24,56149,0), + (4,43,56150,1), + (4,43,56151,1), + (4,43,56154,1), + (4,43,56155,1), + (4,43,56156,1), + (4,28,56157,1), + (1,28,56158,1), + (4,28,56159,1), + (4,48,58043,1), + (4,46,58050,0), + (4,46,58051,0), + (4,46,58052,0), + (4,46,58053,0), + (4,46,58054,0), + (4,46,58055,0), + (4,46,58056,0), + (4,46,58057,0), + (4,46,58058,0), + (4,46,58059,0), + (4,46,58060,0), + (4,46,58061,0), + (4,46,58062,0), + (4,46,58063,0), + (4,46,58064,0), + (4,46,58065,0), + (4,46,58066,0), + (4,46,58067,0), + (4,46,58068,0), + (4,46,58069,0), + (4,46,58070,0), + (4,46,58071,0), + (4,46,58072,0), + (4,46,58074,0), + (4,46,58075,0), + (4,46,58076,0), + (4,46,58077,0), + (4,46,58078,0), + (4,47,58079,0), + (4,47,58080,0), + (4,47,58081,0), + (4,47,58082,0), + (4,47,58083,0), + (4,46,58088,0), + (4,46,58089,0), + (4,46,58090,0), + (4,46,58091,0), + (4,46,58096,0), + (4,46,58097,0), + (4,46,58098,0), + (4,46,58099,0), + (4,46,58101,0), + (4,46,58102,1), + (4,46,58103,1), + (4,46,58104,1), + (4,46,58105,1), + (4,46,58106,1), + (4,46,58107,1), + (4,46,58108,1), + (4,46,58109,1), + (4,46,58112,1), + (4,46,58113,1), + (4,46,58114,1), + (4,46,58115,1), + (4,46,58118,0), + (4,46,58119,0), + (4,46,58120,0), + (4,46,58121,0), + (4,46,58122,0), + (4,46,58123,0), + (4,46,58125,1), + (4,46,58126,1), + (4,46,58127,1), + (4,46,58128,1), + (4,13,61050,0), + (4,13,61051,0), + (4,13,61053,0), + (4,13,61055,0), + (2,13,61067,0), + (4,13,61068,0), + (2,13,61070,0), + (4,13,61071,0), + (8,22,62101,0), + (8,16,62104,0), + (8,16,62105,0), + (8,16,62108,0), + (1,18,62910,1); +END; \ No newline at end of file From 9642787631704d9b79b1104d8183bcdf77d7fbba Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 29 Jul 2023 22:35:08 +1000 Subject: [PATCH 36/66] rework Stage Object IDs --- server/channelserver/handlers.go | 1 + server/channelserver/handlers_object.go | 18 +------------- server/channelserver/sys_channel_server.go | 2 ++ server/channelserver/sys_session.go | 28 ++++++++++++++++++++++ server/channelserver/sys_stage.go | 15 ------------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index 81cd1838a..c12ab4cc6 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -177,6 +177,7 @@ func logoutPlayer(s *Session) { delete(s.server.sessions, s.rawConn) } s.rawConn.Close() + delete(s.server.objectIDs, s) s.server.Unlock() for _, stage := range s.server.stages { diff --git a/server/channelserver/handlers_object.go b/server/channelserver/handlers_object.go index 520b6fef7..241505c0d 100644 --- a/server/channelserver/handlers_object.go +++ b/server/channelserver/handlers_object.go @@ -10,25 +10,9 @@ import ( func handleMsgSysCreateObject(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgSysCreateObject) - // Prevent reusing an object index - var nextID uint32 - for { - exists := false - nextID = s.stage.NextObjectID() - for _, object := range s.stage.objects { - if object.id == nextID { - exists = true - break - } - } - if exists == false { - break - } - } - s.stage.Lock() newObj := &Object{ - id: nextID, + id: s.NextObjectID(), ownerCharID: s.charID, x: pkt.X, y: pkt.Y, diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go index b362c911e..cad64bbe4 100644 --- a/server/channelserver/sys_channel_server.go +++ b/server/channelserver/sys_channel_server.go @@ -47,6 +47,7 @@ type Server struct { acceptConns chan net.Conn deleteConns chan net.Conn sessions map[net.Conn]*Session + objectIDs map[*Session]uint16 listener net.Listener // Listener that is created when Server.Start is called. isShuttingDown bool @@ -152,6 +153,7 @@ func NewServer(config *Config) *Server { acceptConns: make(chan net.Conn), deleteConns: make(chan net.Conn), sessions: make(map[net.Conn]*Session), + objectIDs: make(map[*Session]uint16), stages: make(map[string]*Stage), userBinaryParts: make(map[userBinaryPartID][]byte), semaphore: make(map[string]*Semaphore), diff --git a/server/channelserver/sys_session.go b/server/channelserver/sys_session.go index 40d54fdb3..406ea4384 100644 --- a/server/channelserver/sys_session.go +++ b/server/channelserver/sys_session.go @@ -34,6 +34,7 @@ type Session struct { clientContext *clientctx.ClientContext lastPacket time.Time + objectIndex uint16 userEnteredStage bool // If the user has entered a stage before stageID string stage *Stage @@ -78,6 +79,7 @@ func NewSession(server *Server, conn net.Conn) *Session { sessionStart: TimeAdjusted().Unix(), stageMoveStack: stringstack.New(), } + s.SetObjectID() return s } @@ -268,3 +270,29 @@ func (s *Session) logMessage(opcode uint16, data []byte, sender string, recipien fmt.Printf("Data [%d bytes]:\n(Too long!)\n\n", len(data)) } } + +func (s *Session) SetObjectID() { + for i := uint16(1); i < 127; i++ { + exists := false + for _, j := range s.server.objectIDs { + if i == j { + exists = true + break + } + } + if !exists { + s.server.objectIDs[s] = i + return + } + } + s.server.objectIDs[s] = 0 +} + +func (s *Session) NextObjectID() uint32 { + bf := byteframe.NewByteFrame() + bf.WriteUint16(s.server.objectIDs[s]) + s.objectIndex++ + bf.WriteUint16(s.objectIndex) + bf.Seek(0, 0) + return bf.ReadUint32() +} diff --git a/server/channelserver/sys_stage.go b/server/channelserver/sys_stage.go index b69995724..ae8ddd149 100644 --- a/server/channelserver/sys_stage.go +++ b/server/channelserver/sys_stage.go @@ -95,18 +95,3 @@ func (s *Stage) isCharInQuestByID(charID uint32) bool { func (s *Stage) isQuest() bool { return len(s.reservedClientSlots) > 0 } - -func (s *Stage) NextObjectID() uint32 { - s.objectIndex = s.objectIndex + 1 - // Objects beyond 127 do not duplicate correctly - // Indexes 0 and 127 does not update position correctly - if s.objectIndex == 127 { - s.objectIndex = 1 - } - bf := byteframe.NewByteFrame() - bf.WriteUint8(0) - bf.WriteUint8(s.objectIndex) - bf.WriteUint16(0) - obj := uint32(bf.Data()[3]) | uint32(bf.Data()[2])<<8 | uint32(bf.Data()[1])<<16 | uint32(bf.Data()[0])<<24 - return obj -} From 8a7eb12a0c6ac7ea53d05ac9f3b886c9d908400b Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 18:04:16 +1000 Subject: [PATCH 37/66] fix Event Quests not being selectable --- server/channelserver/handlers_quest.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index d58b59542..e054e3e8b 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -171,7 +171,11 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint8(maxPlayers) } bf.WriteUint8(questType) - bf.WriteUint8(0) + if questType == 9 { + bf.WriteBool(false) + } else { + bf.WriteBool(true) + } bf.WriteUint16(0) bf.WriteUint32(mark) bf.WriteUint16(0) @@ -636,7 +640,8 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { {false, 10000}, } bf.WriteUint16(uint16(len(vsQuestItems))) - bf.WriteUint32(uint32(len(vsQuestBets))) + bf.WriteUint16(0) // Unk array of uint16s + bf.WriteUint16(uint16(len(vsQuestBets))) bf.WriteUint16(0) // Unk for i := range vsQuestItems { From 1912e1d68bf618f5c649f9a84e71f48fd6d4ca41 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 18:04:49 +1000 Subject: [PATCH 38/66] increase maximum capacity of Semaphores --- server/channelserver/handlers_semaphore.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers_semaphore.go b/server/channelserver/handlers_semaphore.go index be9e7ff87..503df5110 100644 --- a/server/channelserver/handlers_semaphore.go +++ b/server/channelserver/handlers_semaphore.go @@ -85,13 +85,13 @@ func handleMsgSysCreateAcquireSemaphore(s *Session, p mhfpacket.MHFPacket) { if !exists { s.server.semaphoreLock.Lock() if strings.HasPrefix(SemaphoreID, "hs_l0u3B5") { - suffix, _ := strconv.ParseUint(pkt.SemaphoreID[len(pkt.SemaphoreID)-1:], 10, 32) + suffix, _ := strconv.Atoi(pkt.SemaphoreID[len(pkt.SemaphoreID)-1:]) s.server.semaphore[SemaphoreID] = &Semaphore{ id_semaphore: pkt.SemaphoreID, id: uint32(suffix + 1), clients: make(map[*Session]uint32), reservedClientSlots: make(map[uint32]interface{}), - maxPlayers: 32, + maxPlayers: 127, } } else { s.server.semaphore[SemaphoreID] = NewSemaphore(s.server, SemaphoreID, 1) From 385a672c3d5801ac533eb4975882fc2cc88f3885 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 18:05:33 +1000 Subject: [PATCH 39/66] rewrite Channel response structure --- server/entranceserver/make_resp.go | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index 94471e49d..eaa023c5b 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -12,9 +12,6 @@ import ( "erupe-ce/server/channelserver" ) -// Server Channels -var currentplayers uint16 - func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { serverInfos := config.Entrance.Entries bf := byteframe.NewByteFrame() @@ -75,18 +72,19 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { bf.WriteUint16(ci.Port) bf.WriteUint16(16 + uint16(channelIdx)) bf.WriteUint16(ci.MaxPlayers) - err := s.db.QueryRow("SELECT current_players FROM servers WHERE server_id=$1", sid).Scan(¤tplayers) - if err != nil { - currentplayers = 0 - } - bf.WriteUint16(currentplayers) - bf.WriteUint32(0) - bf.WriteUint32(0) - bf.WriteUint32(0) - bf.WriteUint16(319) // Unk - bf.WriteUint16(252) // Unk - bf.WriteUint16(248) // Unk - bf.WriteUint16(0x3039) + var currentPlayers uint16 + s.db.QueryRow("SELECT current_players FROM servers WHERE server_id=$1", sid).Scan(¤tPlayers) + bf.WriteUint16(currentPlayers) + bf.WriteUint16(0) // Unk + bf.WriteUint16(0) // Unk + bf.WriteUint16(0) // Unk + bf.WriteUint16(0) // Unk + bf.WriteUint16(0) // Unk + bf.WriteUint16(0) // Unk + bf.WriteUint16(319) // Unk + bf.WriteUint16(252) // Unk + bf.WriteUint16(248) // Unk + bf.WriteUint16(12345) // Unk } } bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix())) From d0db775c11527cbad929948bc6469d9a2af54f08 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 18:43:28 +1000 Subject: [PATCH 40/66] parse TerminalLog correctly --- network/mhfpacket/msg_sys_terminal_log.go | 20 +++++++++++++------- server/channelserver/handlers.go | 7 ++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/network/mhfpacket/msg_sys_terminal_log.go b/network/mhfpacket/msg_sys_terminal_log.go index 079ba5bd6..bc8f3f7c5 100644 --- a/network/mhfpacket/msg_sys_terminal_log.go +++ b/network/mhfpacket/msg_sys_terminal_log.go @@ -14,7 +14,11 @@ type TerminalLogEntry struct { Index uint32 Type1 uint8 Type2 uint8 - Data []int16 + Unk0 int16 + Unk1 int32 + Unk2 int32 + Unk3 int32 + Unk4 []int32 } // MsgSysTerminalLog represents the MSG_SYS_TERMINAL_LOG @@ -38,17 +42,19 @@ func (m *MsgSysTerminalLog) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Client m.EntryCount = bf.ReadUint16() m.Unk0 = bf.ReadUint16() - values := 15 - if _config.ErupeConfig.RealClientMode <= _config.F5 { - values = 7 - } for i := 0; i < int(m.EntryCount); i++ { e := &TerminalLogEntry{} e.Index = bf.ReadUint32() e.Type1 = bf.ReadUint8() e.Type2 = bf.ReadUint8() - for j := 0; j < values; j++ { - e.Data = append(e.Data, bf.ReadInt16()) + e.Unk0 = bf.ReadInt16() + e.Unk1 = bf.ReadInt32() + e.Unk2 = bf.ReadInt32() + e.Unk3 = bf.ReadInt32() + if _config.ErupeConfig.RealClientMode >= _config.G1 { + for j := 0; j < 4; j++ { + e.Unk4 = append(e.Unk4, bf.ReadInt32()) + } } m.Entries = append(m.Entries, e) } diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index c12ab4cc6..d923f5970 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -111,7 +111,12 @@ func handleMsgSysTerminalLog(s *Session, p mhfpacket.MHFPacket) { s.server.logger.Info("SysTerminalLog", zap.Uint8("Type1", pkt.Entries[i].Type1), zap.Uint8("Type2", pkt.Entries[i].Type2), - zap.Int16s("Data", pkt.Entries[i].Data)) + zap.Int16("Unk0", pkt.Entries[i].Unk0), + zap.Int32("Unk1", pkt.Entries[i].Unk1), + zap.Int32("Unk2", pkt.Entries[i].Unk2), + zap.Int32("Unk3", pkt.Entries[i].Unk3), + zap.Int32s("Unk4", pkt.Entries[i].Unk4), + ) } resp := byteframe.NewByteFrame() resp.WriteUint32(pkt.LogID + 1) // LogID to use for requests after this. From 00a06fab17a57009375783018949ac85af95cb6c Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 19:05:51 +1000 Subject: [PATCH 41/66] order 9.3 Patch Schema files --- patch-schema/{psn-id.sql => 00-psn-id.sql} | 0 patch-schema/{wiiu-key.sql => 01-wiiu-key.sql} | 0 patch-schema/{tower.sql => 02-tower.sql} | 0 patch-schema/{event_quests.sql => 03-event_quests.sql} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename patch-schema/{psn-id.sql => 00-psn-id.sql} (100%) rename patch-schema/{wiiu-key.sql => 01-wiiu-key.sql} (100%) rename patch-schema/{tower.sql => 02-tower.sql} (100%) rename patch-schema/{event_quests.sql => 03-event_quests.sql} (100%) diff --git a/patch-schema/psn-id.sql b/patch-schema/00-psn-id.sql similarity index 100% rename from patch-schema/psn-id.sql rename to patch-schema/00-psn-id.sql diff --git a/patch-schema/wiiu-key.sql b/patch-schema/01-wiiu-key.sql similarity index 100% rename from patch-schema/wiiu-key.sql rename to patch-schema/01-wiiu-key.sql diff --git a/patch-schema/tower.sql b/patch-schema/02-tower.sql similarity index 100% rename from patch-schema/tower.sql rename to patch-schema/02-tower.sql diff --git a/patch-schema/event_quests.sql b/patch-schema/03-event_quests.sql similarity index 100% rename from patch-schema/event_quests.sql rename to patch-schema/03-event_quests.sql From d79481f0c82f19586689277fc64836faca98277e Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 19:40:11 +1000 Subject: [PATCH 42/66] implement Trend Weapons --- .../msg_mhf_update_use_trend_weapon_log.go | 18 ++++---- patch-schema/04-trend-weapons.sql | 7 +++ server/channelserver/handlers.go | 45 ++++++++++++++----- 3 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 patch-schema/04-trend-weapons.sql diff --git a/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go b/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go index d4321444d..952ee85ec 100644 --- a/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go +++ b/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go @@ -1,18 +1,18 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" - "erupe-ce/network" "erupe-ce/common/byteframe" + "erupe-ce/network" + "erupe-ce/network/clientctx" ) // MsgMhfUpdateUseTrendWeaponLog represents the MSG_MHF_UPDATE_USE_TREND_WEAPON_LOG type MsgMhfUpdateUseTrendWeaponLog struct { - AckHandle uint32 - Unk0 uint8 - Unk1 uint16 // Weapon/item ID probably? + AckHandle uint32 + WeaponType uint8 + WeaponID uint16 } // Opcode returns the ID associated with this packet type. @@ -23,8 +23,8 @@ func (m *MsgMhfUpdateUseTrendWeaponLog) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfUpdateUseTrendWeaponLog) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() - m.Unk0 = bf.ReadUint8() - m.Unk1 = bf.ReadUint16() + m.WeaponType = bf.ReadUint8() + m.WeaponID = bf.ReadUint16() return nil } diff --git a/patch-schema/04-trend-weapons.sql b/patch-schema/04-trend-weapons.sql new file mode 100644 index 000000000..15a7b86c4 --- /dev/null +++ b/patch-schema/04-trend-weapons.sql @@ -0,0 +1,7 @@ +CREATE TABLE public.trend_weapons +( + weapon_id integer NOT NULL, + weapon_type integer NOT NULL, + count integer DEFAULT 0, + PRIMARY KEY (weapon_id) +); \ No newline at end of file diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index d923f5970..f1a45d3cf 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -1951,20 +1951,45 @@ func handleMsgMhfGetLobbyCrowd(s *Session, p mhfpacket.MHFPacket) { doAckBufSucceed(s, pkt.AckHandle, make([]byte, 0x320)) } +type TrendWeapon struct { + WeaponType uint8 + WeaponID uint16 +} + func handleMsgMhfGetTrendWeapon(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetTrendWeapon) - // TODO (Fist): Work out actual format limitations, seems to be final upgrade - // for weapons and it traverses its upgrade tree to recommend base as final - // 423C correlates with most popular magnet spike in use on JP - // 2A 00 3C 44 00 3C 76 00 3F EA 01 0F 20 01 0F 50 01 0F F8 02 3C 7E 02 3D - // F3 02 40 2A 03 3D 65 03 3F 2A 03 40 36 04 3D 59 04 41 E7 04 43 3E 05 0A - // ED 05 0F 4C 05 0F F2 06 3A FE 06 41 E8 06 41 FA 07 3B 02 07 3F ED 07 40 - // 24 08 3D 37 08 3F 66 08 41 EC 09 3D 38 09 3F 8A 09 41 EE 0A 0E 78 0A 0F - // AA 0A 0F F9 0B 3E 2E 0B 41 EF 0B 42 FB 0C 41 F0 0C 43 3F 0C 43 EE 0D 41 F1 0D 42 10 0D 42 3C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - doAckBufSucceed(s, pkt.AckHandle, make([]byte, 0xA9)) + trendWeapons := [14][3]TrendWeapon{} + for i := uint8(0); i < 14; i++ { + rows, err := s.server.db.Query(`SELECT weapon_id FROM trend_weapons WHERE weapon_type=$1 ORDER BY count DESC LIMIT 3`, i) + if err != nil { + continue + } + j := 0 + for rows.Next() { + trendWeapons[i][j].WeaponType = i + rows.Scan(&trendWeapons[i][j].WeaponID) + j++ + } + } + + x := uint8(0) + bf := byteframe.NewByteFrame() + bf.WriteUint8(0) + for _, weaponType := range trendWeapons { + for _, weapon := range weaponType { + bf.WriteUint8(weapon.WeaponType) + bf.WriteUint16(weapon.WeaponID) + x++ + } + } + bf.Seek(0, 0) + bf.WriteUint8(x) + doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } func handleMsgMhfUpdateUseTrendWeaponLog(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfUpdateUseTrendWeaponLog) - doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) + s.server.db.Exec(`INSERT INTO trend_weapons (weapon_id, weapon_type, count) VALUES ($1, $2, 1) ON CONFLICT (weapon_id) DO + UPDATE SET count = trend_weapons.count+1`, pkt.WeaponID, pkt.WeaponType) + doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) } From 357ba57f16a56a43d77a1c76b3783fc704214c6b Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 20:14:41 +1000 Subject: [PATCH 43/66] fix EquipSkinHist in Z1 & Z2 --- server/channelserver/handlers.go | 63 ++++++++++++++------------------ 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index f1a45d3cf..548918b8f 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -1855,59 +1855,50 @@ func handleMsgMhfSetDailyMissionPersonal(s *Session, p mhfpacket.MHFPacket) {} func handleMsgMhfGetEquipSkinHist(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetEquipSkinHist) - // Transmog / reskin system, bitmask of 3200 bytes length - // presumably divided by 5 sections for 5120 armour IDs covered - // +10,000 for actual ID to be unlocked by each bit - // Returning 3200 bytes of FF just unlocks everything for now + size := 3200 + if _config.ErupeConfig.RealClientMode <= _config.Z2 { + size = 2560 + } + if _config.ErupeConfig.RealClientMode <= _config.Z1 { + size = 1280 + } + var data []byte - err := s.server.db.QueryRow("SELECT COALESCE(skin_hist::bytea, $2::bytea) FROM characters WHERE id = $1", s.charID, make([]byte, 0xC80)).Scan(&data) + err := s.server.db.QueryRow("SELECT COALESCE(skin_hist::bytea, $2::bytea) FROM characters WHERE id = $1", s.charID, make([]byte, size)).Scan(&data) if err != nil { s.logger.Error("Failed to load skin_hist", zap.Error(err)) - data = make([]byte, 3200) + data = make([]byte, size) } doAckBufSucceed(s, pkt.AckHandle, data) } func handleMsgMhfUpdateEquipSkinHist(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfUpdateEquipSkinHist) - // sends a raw armour ID back that needs to be mapped into the persistent bitmask above (-10,000) + size := 3200 + if _config.ErupeConfig.RealClientMode <= _config.Z2 { + size = 2560 + } + if _config.ErupeConfig.RealClientMode <= _config.Z1 { + size = 1280 + } + var data []byte - err := s.server.db.QueryRow("SELECT COALESCE(skin_hist, $2) FROM characters WHERE id = $1", s.charID, make([]byte, 0xC80)).Scan(&data) + err := s.server.db.QueryRow("SELECT COALESCE(skin_hist, $2) FROM characters WHERE id = $1", s.charID, make([]byte, size)).Scan(&data) if err != nil { - s.logger.Error("Failed to save skin_hist", zap.Error(err)) - doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) + s.logger.Error("Failed to get skin_hist", zap.Error(err)) + doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) return } - var bit int - var startByte int - switch pkt.MogType { - case 0: // legs - bit = int(pkt.ArmourID) - 10000 - startByte = 0 - case 1: - bit = int(pkt.ArmourID) - 10000 - startByte = 640 - case 2: - bit = int(pkt.ArmourID) - 10000 - startByte = 1280 - case 3: - bit = int(pkt.ArmourID) - 10000 - startByte = 1920 - case 4: - bit = int(pkt.ArmourID) - 10000 - startByte = 2560 - } + bit := int(pkt.ArmourID) - 10000 + startByte := (size / 5) * int(pkt.MogType) // psql set_bit could also work but I couldn't get it working - byteInd := (bit / 8) + byteInd := bit / 8 bitInByte := bit % 8 - data[startByte+byteInd] |= bits.Reverse8((1 << uint(bitInByte))) + data[startByte+byteInd] |= bits.Reverse8(1 << uint(bitInByte)) dumpSaveData(s, data, "skinhist") - _, err = s.server.db.Exec("UPDATE characters SET skin_hist=$1 WHERE id=$2", data, s.charID) - if err != nil { - panic(err) - } - doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) + s.server.db.Exec("UPDATE characters SET skin_hist=$1 WHERE id=$2", data, s.charID) + doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) } func handleMsgMhfGetUdShopCoin(s *Session, p mhfpacket.MHFPacket) { From 559ce45f05609e075490691a9258848be182a21f Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 20:31:07 +1000 Subject: [PATCH 44/66] simplify EquipSkinHist --- server/channelserver/handlers.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index 548918b8f..9a71f1f7d 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -1853,8 +1853,7 @@ func handleMsgMhfGetDailyMissionPersonal(s *Session, p mhfpacket.MHFPacket) {} func handleMsgMhfSetDailyMissionPersonal(s *Session, p mhfpacket.MHFPacket) {} -func handleMsgMhfGetEquipSkinHist(s *Session, p mhfpacket.MHFPacket) { - pkt := p.(*mhfpacket.MsgMhfGetEquipSkinHist) +func equipSkinHistSize() int { size := 3200 if _config.ErupeConfig.RealClientMode <= _config.Z2 { size = 2560 @@ -1862,7 +1861,12 @@ func handleMsgMhfGetEquipSkinHist(s *Session, p mhfpacket.MHFPacket) { if _config.ErupeConfig.RealClientMode <= _config.Z1 { size = 1280 } + return size +} +func handleMsgMhfGetEquipSkinHist(s *Session, p mhfpacket.MHFPacket) { + pkt := p.(*mhfpacket.MsgMhfGetEquipSkinHist) + size := equipSkinHistSize() var data []byte err := s.server.db.QueryRow("SELECT COALESCE(skin_hist::bytea, $2::bytea) FROM characters WHERE id = $1", s.charID, make([]byte, size)).Scan(&data) if err != nil { @@ -1874,14 +1878,7 @@ func handleMsgMhfGetEquipSkinHist(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUpdateEquipSkinHist(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfUpdateEquipSkinHist) - size := 3200 - if _config.ErupeConfig.RealClientMode <= _config.Z2 { - size = 2560 - } - if _config.ErupeConfig.RealClientMode <= _config.Z1 { - size = 1280 - } - + size := equipSkinHistSize() var data []byte err := s.server.db.QueryRow("SELECT COALESCE(skin_hist, $2) FROM characters WHERE id = $1", s.charID, make([]byte, size)).Scan(&data) if err != nil { From 872459e7bdf0d6bbc3bf13955392adc9b12c9f31 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 22:39:31 +1000 Subject: [PATCH 45/66] fix dumpSaveData not recursively creating folders --- server/channelserver/handlers_data.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/channelserver/handlers_data.go b/server/channelserver/handlers_data.go index bf8ed7a29..2d95e97d0 100644 --- a/server/channelserver/handlers_data.go +++ b/server/channelserver/handlers_data.go @@ -239,19 +239,19 @@ func dumpSaveData(s *Session, data []byte, suffix string) { _, err := os.Stat(dir) if err != nil { if os.IsNotExist(err) { - err = os.Mkdir(dir, os.ModePerm) + err = os.MkdirAll(dir, os.ModePerm) if err != nil { - s.logger.Warn("Error dumping savedata, could not create folder") + s.logger.Error("Error dumping savedata, could not create folder") return } } else { - s.logger.Warn("Error dumping savedata") + s.logger.Error("Error dumping savedata") return } } err = os.WriteFile(path, data, 0644) if err != nil { - s.logger.Warn("Error dumping savedata, could not write file", zap.Error(err)) + s.logger.Error("Error dumping savedata, could not write file", zap.Error(err)) } } } From ade4d7ea21dc68e53ad094cc7cc0ad027e378feb Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 23:25:31 +1000 Subject: [PATCH 46/66] additional Gacha functionality --- patch-schema/05-gacha-roll-name.sql | 6 ++++++ server/channelserver/handlers_shop_gacha.go | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 patch-schema/05-gacha-roll-name.sql diff --git a/patch-schema/05-gacha-roll-name.sql b/patch-schema/05-gacha-roll-name.sql new file mode 100644 index 000000000..ee4b11269 --- /dev/null +++ b/patch-schema/05-gacha-roll-name.sql @@ -0,0 +1,6 @@ +BEGIN; + +ALTER TABLE IF EXISTS public.gacha_entries + ADD COLUMN name text; + +END; \ No newline at end of file diff --git a/server/channelserver/handlers_shop_gacha.go b/server/channelserver/handlers_shop_gacha.go index 1341e341c..0fe48ac03 100644 --- a/server/channelserver/handlers_shop_gacha.go +++ b/server/channelserver/handlers_shop_gacha.go @@ -40,13 +40,14 @@ type GachaEntry struct { EntryType uint8 `db:"entry_type"` ID uint32 `db:"id"` ItemType uint8 `db:"item_type"` - ItemNumber uint16 `db:"item_number"` + ItemNumber uint32 `db:"item_number"` ItemQuantity uint16 `db:"item_quantity"` Weight float64 `db:"weight"` Rarity uint8 `db:"rarity"` Rolls uint8 `db:"rolls"` FrontierPoints uint16 `db:"frontier_points"` DailyLimit uint8 `db:"daily_limit"` + Name string `db:"name"` } type GachaItem struct { @@ -151,7 +152,7 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint32(pkt.ShopID) var gachaType int s.server.db.QueryRow(`SELECT gacha_type FROM gacha_shop WHERE id = $1`, pkt.ShopID).Scan(&gachaType) - entries, err := s.server.db.Queryx(`SELECT entry_type, id, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points FROM gacha_entries WHERE gacha_id = $1 ORDER BY weight DESC`, pkt.ShopID) + entries, err := s.server.db.Queryx(`SELECT entry_type, id, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points, name FROM gacha_entries WHERE gacha_id = $1 ORDER BY weight DESC`, pkt.ShopID) if err != nil { doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) return @@ -168,8 +169,7 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint8(gachaEntry.EntryType) bf.WriteUint32(gachaEntry.ID) bf.WriteUint8(gachaEntry.ItemType) - bf.WriteUint16(0) - bf.WriteUint16(gachaEntry.ItemNumber) + bf.WriteUint32(gachaEntry.ItemNumber) bf.WriteUint16(gachaEntry.ItemQuantity) if gachaType >= 4 { // If box bf.WriteUint16(1) @@ -197,7 +197,11 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(gachaEntry.FrontierPoints) bf.WriteUint8(gachaEntry.DailyLimit) - bf.WriteUint8(0) + if gachaEntry.EntryType < 10 { + ps.Uint8(bf, gachaEntry.Name, true) + } else { + bf.WriteUint8(0) + } bf.WriteBytes(temp.Data()) } bf.Seek(4, 0) From b0f642821699ef2c18f0ed98e0c65717b6819211 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 30 Jul 2023 23:26:06 +1000 Subject: [PATCH 47/66] decode & stub GetRandFromTable --- .../mhfpacket/msg_mhf_get_rand_from_table.go | 17 +++++++++++------ server/channelserver/handlers.go | 9 ++++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/network/mhfpacket/msg_mhf_get_rand_from_table.go b/network/mhfpacket/msg_mhf_get_rand_from_table.go index 6411a6f79..dac9bf14e 100644 --- a/network/mhfpacket/msg_mhf_get_rand_from_table.go +++ b/network/mhfpacket/msg_mhf_get_rand_from_table.go @@ -1,15 +1,18 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" - "erupe-ce/network" "erupe-ce/common/byteframe" + "erupe-ce/network" + "erupe-ce/network/clientctx" ) // MsgMhfGetRandFromTable represents the MSG_MHF_GET_RAND_FROM_TABLE -type MsgMhfGetRandFromTable struct{} +type MsgMhfGetRandFromTable struct { + AckHandle uint32 + Results uint16 +} // Opcode returns the ID associated with this packet type. func (m *MsgMhfGetRandFromTable) Opcode() network.PacketID { @@ -18,7 +21,9 @@ func (m *MsgMhfGetRandFromTable) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfGetRandFromTable) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - return errors.New("NOT IMPLEMENTED") + m.AckHandle = bf.ReadUint32() + m.Results = bf.ReadUint16() + return nil } // Build builds a binary packet from the current data. diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index 9a71f1f7d..c48a0ea6d 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -1697,7 +1697,14 @@ func handleMsgMhfGetEarthValue(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfDebugPostValue(s *Session, p mhfpacket.MHFPacket) {} -func handleMsgMhfGetRandFromTable(s *Session, p mhfpacket.MHFPacket) {} +func handleMsgMhfGetRandFromTable(s *Session, p mhfpacket.MHFPacket) { + pkt := p.(*mhfpacket.MsgMhfGetRandFromTable) + bf := byteframe.NewByteFrame() + for i := uint16(0); i < pkt.Results; i++ { + bf.WriteUint32(0) + } + doAckBufSucceed(s, pkt.AckHandle, bf.Data()) +} func handleMsgMhfGetSenyuDailyCount(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetSenyuDailyCount) From f2c7986d82fdaf1b43e89f3ef74326164918418f Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 31 Jul 2023 21:17:40 +1000 Subject: [PATCH 48/66] hide Gacha before it was reworked --- server/channelserver/handlers_shop_gacha.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/channelserver/handlers_shop_gacha.go b/server/channelserver/handlers_shop_gacha.go index 0fe48ac03..38b036f7f 100644 --- a/server/channelserver/handlers_shop_gacha.go +++ b/server/channelserver/handlers_shop_gacha.go @@ -3,6 +3,7 @@ package channelserver import ( "erupe-ce/common/byteframe" ps "erupe-ce/common/pascalstring" + _config "erupe-ce/config" "erupe-ce/network/mhfpacket" "math/rand" ) @@ -109,6 +110,12 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) { // 8: special item switch pkt.ShopType { case 1: // Running gachas + // Fundamentally, gacha works completely differently, just hide it for now. + if _config.ErupeConfig.RealClientMode <= _config.G7 { + doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) + return + } + var count uint16 shopEntries, err := s.server.db.Queryx("SELECT id, min_gr, min_hr, name, url_banner, url_feature, url_thumbnail, wide, recommended, gacha_type, hidden FROM gacha_shop") if err != nil { From 165bdaf760e24234d176d2459030f8a37d925a18 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 2 Aug 2023 21:03:24 +1000 Subject: [PATCH 49/66] prevent link command from duplicating PSN connections --- server/channelserver/handlers_cast_binary.go | 12 +++++++++--- server/channelserver/sys_language.go | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go index 3e950657f..d93cf1a04 100644 --- a/server/channelserver/handlers_cast_binary.go +++ b/server/channelserver/handlers_cast_binary.go @@ -89,9 +89,15 @@ func parseChatCommand(s *Session, command string) { if err != nil || n != 1 { sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandPSNError"], commands["PSN"].Prefix)) } else { - _, err = s.server.db.Exec(`UPDATE users u SET psn_id=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, id, s.charID) - if err == nil { - sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandPSNSuccess"], id)) + var exists int + s.server.db.QueryRow(`SELECT count(*) FROM users WHERE psn_id = $1`, id).Scan(&exists) + if exists == 0 { + _, err = s.server.db.Exec(`UPDATE users u SET psn_id=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, id, s.charID) + if err == nil { + sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandPSNSuccess"], id)) + } + } else { + sendServerChatMessage(s, s.server.dict["commandPSNExists"]) } } } diff --git a/server/channelserver/sys_language.go b/server/channelserver/sys_language.go index f393c5689..418e1cecb 100644 --- a/server/channelserver/sys_language.go +++ b/server/channelserver/sys_language.go @@ -22,6 +22,7 @@ func getLangStrings(s *Server) map[string]string { strings["commandTeleportSuccess"] = "%d %dにテレポート" strings["commandPSNError"] = "PSN連携コマンドエラー　例：%s " strings["commandPSNSuccess"] = "PSN「%s」が連携されています" + strings["commandPSNExists"] = "PSNは既存のユーザに接続されています" strings["commandRaviNoCommand"] = "ラヴィコマンドが指定されていません" strings["commandRaviStartSuccess"] = "大討伐を開始します" @@ -72,6 +73,7 @@ func getLangStrings(s *Server) map[string]string { strings["commandTeleportSuccess"] = "Teleporting to %d %d" strings["commandPSNError"] = "Error in command. Format: %s " strings["commandPSNSuccess"] = "Connected PSN ID: %s" + strings["commandPSNExists"] = "PSN ID is connected to another account!" strings["commandRaviNoCommand"] = "No Raviente command specified!" strings["commandRaviStartSuccess"] = "The Great Slaying will begin in a moment" From 6c68b2f3ed3f020033b75feb00a15476f30546fe Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 2 Aug 2023 21:04:08 +1000 Subject: [PATCH 50/66] prevent PSN fake login from attempting to create a character --- server/signserver/dsgn_resp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/signserver/dsgn_resp.go b/server/signserver/dsgn_resp.go index d93730c92..77ac6468d 100644 --- a/server/signserver/dsgn_resp.go +++ b/server/signserver/dsgn_resp.go @@ -14,7 +14,7 @@ import ( func (s *Session) makeSignResponse(uid uint32) []byte { // Get the characters from the DB. chars, err := s.server.getCharactersForUser(uid) - if len(chars) == 0 { + if len(chars) == 0 && uid != 0 { err = s.server.newUserChara(uid) if err == nil { chars, err = s.server.getCharactersForUser(uid) From 86f63d6a388055e6706e1be725b430666c9ac942 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 9 Aug 2023 22:04:15 +1000 Subject: [PATCH 51/66] properly support PS3 account linking --- server/signserver/session.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/signserver/session.go b/server/signserver/session.go index f2c99f22e..5806f1108 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -65,8 +65,7 @@ func (s *Session) handlePacket(pkt []byte) error { case "WIIUSGN:": s.client = WIIU s.handleWIIUSGN(bf) - case "VITACOGLNK:": - s.client = VITA + case "VITACOGLNK:", "COGLNK:": s.handlePSNLink(bf) case "DELETE:": token := string(bf.ReadNullTerminatedBytes()) From 68600988297ae748ac52637ae2635702626cd238 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 9 Aug 2023 23:20:50 +1000 Subject: [PATCH 52/66] implement customisable Raviente latency --- config.json | 1 + config/config.go | 1 + server/channelserver/handlers.go | 3 +-- server/channelserver/handlers_register.go | 17 ++++++++++++++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/config.json b/config.json index b51709724..d3de778bb 100644 --- a/config.json +++ b/config.json @@ -48,6 +48,7 @@ "DailyQuestAllowance": 1, "MezfesSoloTickets": 10, "MezfesGroupTickets": 4, + "LowLatencyRaviente": false, "RegularRavienteMaxPlayers": 8, "ViolentRavienteMaxPlayers": 8, "BerserkRavienteMaxPlayers": 32, diff --git a/config/config.go b/config/config.go index 292388040..ac7e48af6 100644 --- a/config/config.go +++ b/config/config.go @@ -133,6 +133,7 @@ type GameplayOptions struct { DailyQuestAllowance uint32 // Number of Daily Quests to allow daily MezfesSoloTickets uint32 // Number of solo tickets given weekly MezfesGroupTickets uint32 // Number of group tickets given weekly + LowLatencyRaviente bool // Toggles low latency mode for Raviente, can be network intensive RegularRavienteMaxPlayers uint8 ViolentRavienteMaxPlayers uint8 BerserkRavienteMaxPlayers uint8 diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index c48a0ea6d..abc554d06 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -272,13 +272,12 @@ func handleMsgSysPing(s *Session, p mhfpacket.MHFPacket) { } func handleMsgSysTime(s *Session, p mhfpacket.MHFPacket) { - //pkt := p.(*mhfpacket.MsgSysTime) - resp := &mhfpacket.MsgSysTime{ GetRemoteTime: false, Timestamp: uint32(TimeAdjusted().Unix()), // JP timezone } s.QueueSendMHF(resp) + s.notifyRavi() } func handleMsgSysIssueLogkey(s *Session, p mhfpacket.MHFPacket) { diff --git a/server/channelserver/handlers_register.go b/server/channelserver/handlers_register.go index efe9dc1b1..33261a94e 100644 --- a/server/channelserver/handlers_register.go +++ b/server/channelserver/handlers_register.go @@ -196,7 +196,9 @@ func handleMsgSysOperateRegister(s *Session, p mhfpacket.MHFPacket) { resp.WriteUint8(0) doAckBufSucceed(s, pkt.AckHandle, resp.Data()) } - s.notifyRavi() + if s.server.erupeConfig.GameplayOptions.LowLatencyRaviente { + s.notifyRavi() + } s.server.raviente.Unlock() } @@ -241,6 +243,10 @@ func handleMsgSysLoadRegister(s *Session, p mhfpacket.MHFPacket) { } func (s *Session) notifyRavi() { + sema := getRaviSemaphore(s.server) + if sema == nil { + return + } var temp mhfpacket.MHFPacket raviNotif := byteframe.NewByteFrame() temp = &mhfpacket.MsgSysNotifyRegister{RegisterID: 4} @@ -253,11 +259,16 @@ func (s *Session) notifyRavi() { raviNotif.WriteUint16(uint16(temp.Opcode())) temp.Build(raviNotif, s.clientContext) raviNotif.WriteUint16(0x0010) // End it. - sema := getRaviSemaphore(s.server) - if sema != nil { + if s.server.erupeConfig.GameplayOptions.LowLatencyRaviente { for session := range sema.clients { session.QueueSend(raviNotif.Data()) } + } else { + for session := range sema.clients { + if session.charID == s.charID { + session.QueueSend(raviNotif.Data()) + } + } } } From 92771f007692bf6d37bba19f7c7cc8b13cf3a3b6 Mon Sep 17 00:00:00 2001 From: wish Date: Thu, 17 Aug 2023 01:07:53 +1000 Subject: [PATCH 53/66] test backwards compatible event quests --- server/channelserver/handlers_quest.go | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index e054e3e8b..d45b3725b 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -5,6 +5,7 @@ import ( "erupe-ce/common/byteframe" "erupe-ce/common/decryption" ps "erupe-ce/common/pascalstring" + _config "erupe-ce/config" "erupe-ce/network/mhfpacket" "fmt" "io" @@ -177,7 +178,9 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteBool(true) } bf.WriteUint16(0) - bf.WriteUint32(mark) + if _config.ErupeConfig.RealClientMode >= _config.G1 { + bf.WriteUint32(mark) + } bf.WriteUint16(0) bf.WriteUint16(uint16(len(data))) bf.WriteBytes(data) @@ -202,10 +205,18 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { continue } else { totalCount++ - if totalCount > pkt.Offset && len(bf.Data()) < 60000 { - returnedCount++ - bf.WriteBytes(data) - continue + if _config.ErupeConfig.RealClientMode == _config.F5 { + if totalCount > pkt.Offset && len(bf.Data()) < 21550 { + returnedCount++ + bf.WriteBytes(data) + continue + } + } else { + if totalCount > pkt.Offset && len(bf.Data()) < 60000 { + returnedCount++ + bf.WriteBytes(data) + continue + } } } } From b69b3969788f3f2209157fddaa9b737e2fa87c78 Mon Sep 17 00:00:00 2001 From: wish Date: Thu, 17 Aug 2023 22:15:36 +1000 Subject: [PATCH 54/66] fix maximum FP data size in response --- server/channelserver/handlers_festa.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/channelserver/handlers_festa.go b/server/channelserver/handlers_festa.go index 0f590b5d9..95cc14e0d 100644 --- a/server/channelserver/handlers_festa.go +++ b/server/channelserver/handlers_festa.go @@ -4,6 +4,7 @@ import ( "erupe-ce/common/byteframe" ps "erupe-ce/common/pascalstring" "erupe-ce/common/token" + _config "erupe-ce/config" "erupe-ce/network/mhfpacket" "sort" "time" @@ -265,7 +266,14 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint8(reward.Unk7) } - bf.WriteUint32(s.server.erupeConfig.GameplayOptions.MaximumFP) + if _config.ErupeConfig.RealClientMode <= _config.G61 { + if s.server.erupeConfig.GameplayOptions.MaximumFP > 0xFFFF { + s.server.erupeConfig.GameplayOptions.MaximumFP = 0xFFFF + } + bf.WriteUint16(uint16(s.server.erupeConfig.GameplayOptions.MaximumFP)) + } else { + bf.WriteUint32(s.server.erupeConfig.GameplayOptions.MaximumFP) + } bf.WriteUint16(500) categoryWinners := uint16(0) // NYI From 6f9974fa26981d403b095b6656ace38f095c48dc Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 20 Aug 2023 15:30:24 +1000 Subject: [PATCH 55/66] update Golang dependencies --- common/mhfcourse/mhfcourse.go | 6 +- go.mod | 43 +++--- go.sum | 270 ++++++++++------------------------ 3 files changed, 102 insertions(+), 217 deletions(-) diff --git a/common/mhfcourse/mhfcourse.go b/common/mhfcourse/mhfcourse.go index 6b0936e45..f838e64a5 100644 --- a/common/mhfcourse/mhfcourse.go +++ b/common/mhfcourse/mhfcourse.go @@ -1,8 +1,8 @@ package mhfcourse import ( - "golang.org/x/exp/slices" "math" + "sort" "time" ) @@ -68,8 +68,8 @@ func CourseExists(ID uint16, c []Course) bool { func GetCourseStruct(rights uint32) ([]Course, uint32) { resp := []Course{{ID: 1}, {ID: 23}, {ID: 24}} s := Courses() - slices.SortStableFunc(s, func(i, j Course) bool { - return i.ID > j.ID + sort.Slice(s, func(i, j int) bool { + return s[i].ID > s[j].ID }) var normalCafeCourseSet, netcafeCourseSet bool for _, course := range s { diff --git a/go.mod b/go.mod index 21ac00f07..e60ea0615 100644 --- a/go.mod +++ b/go.mod @@ -3,34 +3,33 @@ module erupe-ce go 1.19 require ( - github.com/bwmarrin/discordgo v0.23.2 + github.com/bwmarrin/discordgo v0.27.1 github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 - github.com/jmoiron/sqlx v1.3.4 - github.com/lib/pq v1.10.4 - github.com/spf13/viper v1.8.1 - go.uber.org/zap v1.18.1 - golang.org/x/crypto v0.1.0 - golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f - golang.org/x/text v0.7.0 + github.com/jmoiron/sqlx v1.3.5 + github.com/lib/pq v1.10.9 + github.com/spf13/viper v1.16.0 + go.uber.org/zap v1.25.0 + golang.org/x/crypto v0.12.0 + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 + golang.org/x/text v0.12.0 ) require ( - github.com/felixge/httpsnoop v1.0.1 // indirect - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/gorilla/websocket v1.4.2 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/magiconair/properties v1.8.5 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect - github.com/pelletier/go-toml v1.9.3 // indirect - github.com/spf13/afero v1.6.0 // indirect - github.com/spf13/cast v1.3.1 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect + github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.2.0 // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect - gopkg.in/ini.v1 v1.62.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/sys v0.11.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 863dc42a3..c07f7d615 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -15,9 +16,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -26,7 +25,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -36,19 +34,13 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/bwmarrin/discordgo v0.23.2 h1:BzrtTktixGHIu9Tt7dEE6diysEF9HWnXeHuoJEt2fH4= -github.com/bwmarrin/discordgo v0.23.2/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY= +github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -57,8 +49,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -67,21 +57,18 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -93,7 +80,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -108,9 +94,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -121,10 +104,8 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -137,157 +118,101 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jmoiron/sqlx v1.3.4 h1:wv+0IJZfL5z0uZoUjlpKgHkgaFSYD+r9CfrXjEXsO7w= -github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= +github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= -github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= +github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.18.1 h1:CSUJ2mjFszzEWt4CdKISEuChVIXGBn3lAPwkRGyVrc4= -go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -298,8 +223,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f h1:Al51T6tzvuh3oiwX11vex3QgJ2XTedFPGmbEVh8cdoc= -golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -313,8 +238,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -325,11 +248,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -356,12 +276,10 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -371,9 +289,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -384,10 +299,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -397,7 +309,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -419,15 +330,13 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,9 +344,10 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -447,7 +357,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -457,8 +366,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -481,7 +388,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -490,10 +396,8 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -517,9 +421,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -550,7 +451,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -562,12 +462,8 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -581,13 +477,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -598,22 +490,16 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From fdb966b11c639a43456168690f96638b8bf34b2f Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 20 Aug 2023 16:19:05 +1000 Subject: [PATCH 56/66] update Golang version in actions workflow --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c33872e81..e96e83b3e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: '1.19' - name: Build Linux-amd64 run: env GOOS=linux GOARCH=amd64 go build -v From 6856d71cece17e2ca578b4233191a016f1a2c2a7 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 20 Aug 2023 16:38:57 +1000 Subject: [PATCH 57/66] delete unused timeserver module --- server/channelserver/timeserver/time_mode.go | 87 -------------------- 1 file changed, 87 deletions(-) delete mode 100644 server/channelserver/timeserver/time_mode.go diff --git a/server/channelserver/timeserver/time_mode.go b/server/channelserver/timeserver/time_mode.go deleted file mode 100644 index e335b814a..000000000 --- a/server/channelserver/timeserver/time_mode.go +++ /dev/null @@ -1,87 +0,0 @@ -package timeserver - -import ( - "time" -) - -var DoOnce_midnight = false -var DoOnce_t2 = false -var DoOnce_t = false -var Fix_midnight = time.Time{} -var Fix_t2 = time.Time{} -var Fix_t = time.Time{} -var Pfixtimer time.Duration -var Pnewtime = 0 -var yearsFixed = -7 - -func PFadd_time() time.Duration { - Pnewtime = Pnewtime + 24 - Pfixtimer = time.Duration(Pnewtime) - return Pfixtimer -} - -func Time_static() time.Time { - if !DoOnce_t { - DoOnce_t = true - // Force to 201x - tFix1 := time.Now() - tFix2 := tFix1.AddDate(yearsFixed, 0, 0) - Fix_t = tFix2.In(time.FixedZone("UTC+1", 1*60*60)) - } - return Fix_t -} - -func Tstatic_midnight() time.Time { - if !DoOnce_midnight { - DoOnce_midnight = true - // Force to 201x - tFix1 := time.Now() - tFix2 := tFix1.AddDate(yearsFixed, 0, 0) - var tFix = tFix2.In(time.FixedZone("UTC+1", 1*60*60)) - yearFix, monthFix, dayFix := tFix2.Date() - Fix_midnight = time.Date(yearFix, monthFix, dayFix, 0, 0, 0, 0, tFix.Location()).Add(time.Hour) - } - return Fix_midnight -} - -func Time_midnight() time.Time { - // Force to 201x - t1 := time.Now() - t2 := t1.AddDate(yearsFixed, 0, 0) - var t = t2.In(time.FixedZone("UTC+1", 1*60*60)) - year, month, day := t2.Date() - midnight := time.Date(year, month, day, 0, 0, 0, 0, t.Location()).Add(time.Hour) - return midnight -} - -func TimeCurrent() time.Time { - // Force to 201x - t1 := time.Now() - t2 := t1.AddDate(yearsFixed, 0, 0) - var t = t2.In(time.FixedZone("UTC+1", 1*60*60)) - return t -} - -func Time_Current_Week_uint8() uint8 { - beginningOfTheMonth := time.Date(TimeCurrent().Year(), TimeCurrent().Month(), 1, 1, 1, 1, 1, time.UTC) - _, thisWeek := TimeCurrent().ISOWeek() - _, beginningWeek := beginningOfTheMonth.ISOWeek() - - return uint8(1 + thisWeek - beginningWeek) -} - -func Time_Current_Week_uint32() uint32 { - beginningOfTheMonth := time.Date(TimeCurrent().Year(), TimeCurrent().Month(), 1, 1, 1, 1, 1, time.UTC) - _, thisWeek := TimeCurrent().ISOWeek() - _, beginningWeek := beginningOfTheMonth.ISOWeek() - result := 1 + thisWeek - beginningWeek - return uint32(result) -} - -func Detect_Day() bool { - switch time.Now().Weekday() { - case time.Wednesday: - return true - } - return false -} From b7903f4e7a5469ffce6f3a785f081d96ff9797af Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 20 Aug 2023 18:44:33 +1000 Subject: [PATCH 58/66] update to Golang 1.21 --- .github/workflows/go.yml | 2 +- go.mod | 2 +- go.sum | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e96e83b3e..955febd9a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '1.19' + go-version: '1.21' - name: Build Linux-amd64 run: env GOOS=linux GOARCH=amd64 go build -v diff --git a/go.mod b/go.mod index e60ea0615..93c8f83ad 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module erupe-ce -go 1.19 +go 1.21 require ( github.com/bwmarrin/discordgo v0.27.1 diff --git a/go.sum b/go.sum index c07f7d615..9078343f0 100644 --- a/go.sum +++ b/go.sum @@ -39,6 +39,7 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY= github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -62,6 +63,7 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -106,6 +108,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -145,9 +148,11 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -166,6 +171,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= @@ -200,6 +206,7 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= From a9fabcab2388bb244ada4f7a2e14d196dce14077 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 20 Aug 2023 22:19:16 +1000 Subject: [PATCH 59/66] clean up config.go --- config/config.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/config.go b/config/config.go index ac7e48af6..b5afc6798 100644 --- a/config/config.go +++ b/config/config.go @@ -124,7 +124,7 @@ type GameplayOptions struct { FeaturedWeapons int // Number of Active Feature weapons to generate daily MaximumNP int // Maximum number of NP held by a player MaximumRP uint16 // Maximum number of RP held by a player - MaximumFP uint32 // Maximum number of FP held by a player + MaximumFP uint32 // Maximum number of FP held by a player DisableLoginBoost bool // Disables the Login Boost system DisableBoostTime bool // Disables the daily NetCafe Boost Time BoostTimeDuration int // The number of minutes NetCafe Boost Time lasts for @@ -147,7 +147,7 @@ type GameplayOptions struct { MaterialMultiplier float32 // Adjusts the multiplier of Monster Materials rewarded for quest completion ExtraCarves uint16 // Grant n extra chances to carve ALL carcasses DisableHunterNavi bool // Disables the Hunter Navi - EnableKaijiEvent bool // Enables the Kaiji event in the Rasta Bar + EnableKaijiEvent bool // Enables the Kaiji event in the Rasta Bar EnableHiganjimaEvent bool // Enables the Higanjima event in the Rasta Bar EnableNierEvent bool // Enables the Nier event in the Rasta Bar DisableRoad bool // Disables the Hunting Road @@ -258,8 +258,8 @@ func LoadConfig() (*Config, error) { viper.AddConfigPath(".") viper.SetDefault("DevModeOptions.SaveDumps", SaveDumpOptions{ - Enabled: false, - OutputDir: "savedata", + Enabled: true, + OutputDir: "save-backups", }) err := viper.ReadInConfig() @@ -281,7 +281,7 @@ func LoadConfig() (*Config, error) { if strings.ToUpper(c.ClientMode) == versionStrings[i] { c.RealClientMode = Mode(i + 1) c.ClientMode = strings.ToUpper(c.ClientMode) - if c.RealClientMode < Z1 { + if c.RealClientMode <= G101 { c.ClientMode += " (Debug only)" } } From 9381534a7d944e61f8fd2548600da91f5106babb Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 20 Aug 2023 22:24:04 +1000 Subject: [PATCH 60/66] rename Event type variables --- server/channelserver/handlers_event.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go index 7797bd6fc..0ba8fce6e 100644 --- a/server/channelserver/handlers_event.go +++ b/server/channelserver/handlers_event.go @@ -49,14 +49,14 @@ func handleMsgMhfReleaseEvent(s *Session, p mhfpacket.MHFPacket) { } type Event struct { - Unk0 uint16 - Unk1 uint16 - Unk2 uint16 - Unk3 uint16 - Unk4 uint16 - Unk5 uint32 - Unk6 uint32 - Unk7 []uint16 + EventType uint16 + Unk1 uint16 + Unk2 uint16 + Unk3 uint16 + Unk4 uint16 + Unk5 uint32 + Unk6 uint32 + QuestFileIDs []uint16 } func handleMsgMhfEnumerateEvent(s *Session, p mhfpacket.MHFPacket) { @@ -67,17 +67,17 @@ func handleMsgMhfEnumerateEvent(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint8(uint8(len(events))) for _, event := range events { - bf.WriteUint16(event.Unk0) + bf.WriteUint16(event.EventType) bf.WriteUint16(event.Unk1) bf.WriteUint16(event.Unk2) bf.WriteUint16(event.Unk3) bf.WriteUint16(event.Unk4) bf.WriteUint32(event.Unk5) bf.WriteUint32(event.Unk6) - if event.Unk0 == 2 { - bf.WriteUint8(uint8(len(event.Unk7))) - for _, u := range event.Unk7 { - bf.WriteUint16(u) + if event.EventType == 2 { + bf.WriteUint8(uint8(len(event.QuestFileIDs))) + for _, qf := range event.QuestFileIDs { + bf.WriteUint16(qf) } } } From ab81ca92335e85034bda5b8bf263ba62bd72c01c Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 20 Aug 2023 22:25:57 +1000 Subject: [PATCH 61/66] fix built-in shadowing in generateFeatureWeapons --- server/channelserver/handlers_event.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go index 0ba8fce6e..74d0cef13 100644 --- a/server/channelserver/handlers_event.go +++ b/server/channelserver/handlers_event.go @@ -123,24 +123,24 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) { } func generateFeatureWeapons(count int) activeFeature { - max := 14 + _max := 14 if _config.ErupeConfig.RealClientMode < _config.ZZ { - max = 13 + _max = 13 } if _config.ErupeConfig.RealClientMode < _config.G10 { - max = 12 + _max = 12 } if _config.ErupeConfig.RealClientMode < _config.GG { - max = 11 + _max = 11 } - if count > max { - count = max + if count > _max { + count = _max } nums := make([]int, 0) var result int for len(nums) < count { rng := token.RNG() - num := rng.Intn(max) + num := rng.Intn(_max) exist := false for _, v := range nums { if v == num { From 192e68ba86d982ce7a69a04c4f220516b4d058e0 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 21 Aug 2023 21:39:22 +1000 Subject: [PATCH 62/66] correctly parse some ravi packets & ignore zeroes --- network/mhfpacket/msg_mhf_announce.go | 3 ++- network/mhfpacket/msg_sys_load_register.go | 19 ++++--------------- network/mhfpacket/msg_sys_operate_register.go | 19 +++---------------- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/network/mhfpacket/msg_mhf_announce.go b/network/mhfpacket/msg_mhf_announce.go index 8e3971497..c4c9deb7f 100644 --- a/network/mhfpacket/msg_mhf_announce.go +++ b/network/mhfpacket/msg_mhf_announce.go @@ -28,7 +28,8 @@ func (m *MsgMhfAnnounce) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon m.IPAddress = bf.ReadUint32() m.Port = bf.ReadUint16() _ = bf.ReadUint8() - _ = bf.ReadUint16() + _ = bf.ReadUint8() + _ = bf.ReadUint8() m.StageID = bf.ReadBytes(32) _ = bf.ReadUint32() m.Type = bf.ReadUint8() diff --git a/network/mhfpacket/msg_sys_load_register.go b/network/mhfpacket/msg_sys_load_register.go index 24dc54052..730616d65 100644 --- a/network/mhfpacket/msg_sys_load_register.go +++ b/network/mhfpacket/msg_sys_load_register.go @@ -1,8 +1,7 @@ package mhfpacket import ( - "fmt" - + "errors" "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" @@ -25,22 +24,12 @@ func (m *MsgSysLoadRegister) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clien m.AckHandle = bf.ReadUint32() m.RegisterID = bf.ReadUint32() m.Unk1 = bf.ReadUint8() - fixedZero0 := bf.ReadUint16() - fixedZero1 := bf.ReadUint8() - - if fixedZero0 != 0 || fixedZero1 != 0 { - return fmt.Errorf("expected fixed-0 values, got %d %d", fixedZero0, fixedZero1) - } + _ = bf.ReadUint8() + _ = bf.ReadUint16() return nil } // Build builds a binary packet from the current data. func (m *MsgSysLoadRegister) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - bf.WriteUint32(m.AckHandle) - bf.WriteUint32(m.RegisterID) - bf.WriteUint8(m.Unk1) - bf.WriteUint16(0) - bf.WriteUint8(0) - - return nil + return errors.New("NOT IMPLEMENTED") } diff --git a/network/mhfpacket/msg_sys_operate_register.go b/network/mhfpacket/msg_sys_operate_register.go index e4213d45d..6978609b1 100644 --- a/network/mhfpacket/msg_sys_operate_register.go +++ b/network/mhfpacket/msg_sys_operate_register.go @@ -1,8 +1,7 @@ package mhfpacket import ( - "fmt" - + "errors" "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" @@ -12,7 +11,6 @@ import ( type MsgSysOperateRegister struct { AckHandle uint32 SemaphoreID uint32 - fixedZero uint16 RawDataPayload []byte } @@ -25,12 +23,7 @@ func (m *MsgSysOperateRegister) Opcode() network.PacketID { func (m *MsgSysOperateRegister) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() m.SemaphoreID = bf.ReadUint32() - m.fixedZero = bf.ReadUint16() - - if m.fixedZero != 0 { - return fmt.Errorf("expected fixed-0 values, got %d", m.fixedZero) - } - + _ = bf.ReadUint16() dataSize := bf.ReadUint16() m.RawDataPayload = bf.ReadBytes(uint(dataSize)) return nil @@ -38,11 +31,5 @@ func (m *MsgSysOperateRegister) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl // Build builds a binary packet from the current data. func (m *MsgSysOperateRegister) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - bf.WriteUint32(m.AckHandle) - bf.WriteUint32(m.SemaphoreID) - bf.WriteUint16(0) - bf.WriteUint16(uint16(len(m.RawDataPayload))) - bf.WriteBytes(m.RawDataPayload) - - return nil + return errors.New("NOT IMPLEMENTED") } From f680e33f1682dfd2ce5851bd979b4c01cce7b530 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 21 Aug 2023 22:22:15 +1000 Subject: [PATCH 63/66] fix EnumerateQuest parsing and limit tuneValue slice length --- network/mhfpacket/msg_mhf_enumerate_quest.go | 8 +++++--- server/channelserver/handlers_quest.go | 21 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/network/mhfpacket/msg_mhf_enumerate_quest.go b/network/mhfpacket/msg_mhf_enumerate_quest.go index 2bc7ea967..243dffcfa 100644 --- a/network/mhfpacket/msg_mhf_enumerate_quest.go +++ b/network/mhfpacket/msg_mhf_enumerate_quest.go @@ -30,10 +30,12 @@ func (m *MsgMhfEnumerateQuest) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli m.Unk0 = bf.ReadUint8() m.World = bf.ReadUint8() m.Counter = bf.ReadUint16() - m.Offset = bf.ReadUint16() - if _config.ErupeConfig.RealClientMode > _config.Z1 { - m.Unk4 = bf.ReadUint8() + if _config.ErupeConfig.RealClientMode <= _config.Z1 { + m.Offset = uint16(bf.ReadUint8()) + } else { + m.Offset = bf.ReadUint16() } + m.Unk4 = bf.ReadUint8() return nil } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index d45b3725b..a549086a8 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -632,6 +632,27 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { offset := uint16(time.Now().Unix()) bf.WriteUint16(offset) + + if _config.ErupeConfig.RealClientMode <= _config.F5 { + tuneValues = tuneValues[:256] + } else if _config.ErupeConfig.RealClientMode <= _config.G3 { + tuneValues = tuneValues[:283] + } else if _config.ErupeConfig.RealClientMode <= _config.GG { + tuneValues = tuneValues[:315] + } else if _config.ErupeConfig.RealClientMode <= _config.G61 { + tuneValues = tuneValues[:332] + } else if _config.ErupeConfig.RealClientMode <= _config.G7 { + tuneValues = tuneValues[:339] + } else if _config.ErupeConfig.RealClientMode <= _config.G81 { + tuneValues = tuneValues[:396] + } else if _config.ErupeConfig.RealClientMode <= _config.G91 { + tuneValues = tuneValues[:694] + } else if _config.ErupeConfig.RealClientMode <= _config.G101 { + tuneValues = tuneValues[:704] + } else if _config.ErupeConfig.RealClientMode <= _config.Z2 { + tuneValues = tuneValues[:750] + } + bf.WriteUint16(uint16(len(tuneValues))) for i := range tuneValues { bf.WriteUint16(tuneValues[i].ID ^ offset) From 3fe31f58bd849754d5c92e417d10669dadbba98a Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 27 Aug 2023 07:59:51 +1000 Subject: [PATCH 64/66] backwards compatibility for Campaigns --- server/channelserver/handlers_campaign.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers_campaign.go b/server/channelserver/handlers_campaign.go index 2041b484b..66473a366 100644 --- a/server/channelserver/handlers_campaign.go +++ b/server/channelserver/handlers_campaign.go @@ -4,6 +4,7 @@ import ( "erupe-ce/common/byteframe" ps "erupe-ce/common/pascalstring" "erupe-ce/common/stringsupport" + _config "erupe-ce/config" "erupe-ce/network/mhfpacket" "time" ) @@ -67,8 +68,10 @@ func handleMsgMhfEnumerateCampaign(s *Session, p mhfpacket.MHFPacket) { bf.WriteInt16(event.MaxHR) bf.WriteInt16(event.MinSR) bf.WriteInt16(event.MaxSR) - bf.WriteInt16(event.MinGR) - bf.WriteInt16(event.MaxGR) + if _config.ErupeConfig.RealClientMode >= _config.G1 { + bf.WriteInt16(event.MinGR) + bf.WriteInt16(event.MaxGR) + } bf.WriteUint16(event.Unk1) bf.WriteUint8(event.Unk2) bf.WriteUint8(event.Unk3) From e329e00d5afc5b152a4acb94d93f5ecc8512973a Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 27 Aug 2023 08:41:38 +1000 Subject: [PATCH 65/66] backwards compatibility for Campaigns --- server/channelserver/handlers_campaign.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/channelserver/handlers_campaign.go b/server/channelserver/handlers_campaign.go index 66473a366..ed8fc7c3e 100644 --- a/server/channelserver/handlers_campaign.go +++ b/server/channelserver/handlers_campaign.go @@ -68,7 +68,7 @@ func handleMsgMhfEnumerateCampaign(s *Session, p mhfpacket.MHFPacket) { bf.WriteInt16(event.MaxHR) bf.WriteInt16(event.MinSR) bf.WriteInt16(event.MaxSR) - if _config.ErupeConfig.RealClientMode >= _config.G1 { + if _config.ErupeConfig.RealClientMode >= _config.G3 { bf.WriteInt16(event.MinGR) bf.WriteInt16(event.MaxGR) } From a0f37d98b955b8651ad67f7a38d12aeea6d78d40 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 27 Aug 2023 22:09:59 +1000 Subject: [PATCH 66/66] fix Semaphore backwards compatibility --- network/mhfpacket/msg_sys_create_acquire_semaphore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/mhfpacket/msg_sys_create_acquire_semaphore.go b/network/mhfpacket/msg_sys_create_acquire_semaphore.go index 65ec3580d..694aaaeed 100644 --- a/network/mhfpacket/msg_sys_create_acquire_semaphore.go +++ b/network/mhfpacket/msg_sys_create_acquire_semaphore.go @@ -26,7 +26,7 @@ func (m *MsgSysCreateAcquireSemaphore) Opcode() network.PacketID { func (m *MsgSysCreateAcquireSemaphore) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() m.Unk0 = bf.ReadUint16() - if _config.ErupeConfig.RealClientMode >= _config.G1 { + if _config.ErupeConfig.RealClientMode >= _config.S7 { // Assuming this was added with Ravi? m.PlayerCount = bf.ReadUint8() } SemaphoreIDLength := bf.ReadUint8()