From 49682524917415dc3f0ca960d5f095be7c5f8737 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 8 Aug 2022 18:21:54 +1000 Subject: [PATCH 1/5] initial mercenaries build --- patch-schema/mercenary.sql | 5 ++ server/channelserver/handlers_mercenary.go | 55 ++++++++++------------ 2 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 patch-schema/mercenary.sql diff --git a/patch-schema/mercenary.sql b/patch-schema/mercenary.sql new file mode 100644 index 000000000..f67e4fe4e --- /dev/null +++ b/patch-schema/mercenary.sql @@ -0,0 +1,5 @@ +BEGIN; + +CREATE SEQUENCE IF NOT EXISTS public.rasta_id_seq; + +END; \ No newline at end of file diff --git a/server/channelserver/handlers_mercenary.go b/server/channelserver/handlers_mercenary.go index 606579fe5..bbcf5dceb 100644 --- a/server/channelserver/handlers_mercenary.go +++ b/server/channelserver/handlers_mercenary.go @@ -9,7 +9,6 @@ import ( "go.uber.org/zap" "io" "io/ioutil" - "math/rand" "os" "path/filepath" ) @@ -132,8 +131,11 @@ func handleMsgMhfCreateMercenary(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() - bf.WriteUint32(0x00) // Unk - bf.WriteUint32(rand.Uint32()) // Partner ID? + var nextID uint32 + s.server.db.QueryRow("SELECT nextval('rasta_id_seq')").Scan(&nextID) + + bf.WriteUint32(nextID) // New MercID + bf.WriteUint32(0xDEADBEEF) // Unk doAckSimpleSucceed(s, pkt.AckHandle, bf.Data()) } @@ -141,24 +143,16 @@ func handleMsgMhfCreateMercenary(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSaveMercenary(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfSaveMercenary) bf := byteframe.NewByteFrameFromBytes(pkt.RawDataPayload) - GCPValue := bf.ReadUint32() + GCP := bf.ReadUint32() _ = bf.ReadUint32() // unk MercDataSize := bf.ReadUint32() MercData := bf.ReadBytes(uint(MercDataSize)) _ = bf.ReadUint32() // unk if MercDataSize > 0 { - // the save packet has an extra null byte after its size - _, err := s.server.db.Exec("UPDATE characters SET savemercenary=$1 WHERE id=$2", MercData[:MercDataSize], s.charID) - if err != nil { - s.logger.Fatal("Failed to update savemercenary and gcp in db", zap.Error(err)) - } - } - // gcp value is always present regardless - _, err := s.server.db.Exec("UPDATE characters SET gcp=$1 WHERE id=$2", GCPValue, s.charID) - if err != nil { - s.logger.Fatal("Failed to update savemercenary and gcp in db", zap.Error(err)) + s.server.db.Exec("UPDATE characters SET savemercenary=$1 WHERE id=$2", MercData[:MercDataSize], s.charID) } + s.server.db.Exec("UPDATE characters SET gcp=$1 WHERE id=$2", GCP, s.charID) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } @@ -166,31 +160,32 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfReadMercenaryW) var data []byte var gcp uint32 - // still has issues - err := s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id = $1", s.charID).Scan(&data) - if err != nil { - s.logger.Fatal("Failed to get savemercenary data from db", zap.Error(err)) - } - - err = s.server.db.QueryRow("SELECT COALESCE(gcp, 0) FROM characters WHERE id = $1", s.charID).Scan(&gcp) - if err != nil { - panic(err) - } - if len(data) == 0 { - data = []byte{0x00} - } + s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id = $1", s.charID).Scan(&data) + s.server.db.QueryRow("SELECT COALESCE(gcp, 0) FROM characters WHERE id = $1", s.charID).Scan(&gcp) resp := byteframe.NewByteFrame() - resp.WriteBytes(data) resp.WriteUint16(0) + if len(data) == 0 { + resp.WriteBool(false) + } else { + resp.WriteBool(true) + resp.WriteBytes(data) + } resp.WriteUint32(gcp) doAckBufSucceed(s, pkt.AckHandle, resp.Data()) } func handleMsgMhfReadMercenaryM(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfReadMercenaryM) - // accessing actual rasta data of someone else still unsure of the formatting of this - doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) + var data []byte + s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id = $1", pkt.CharID).Scan(&data) + resp := byteframe.NewByteFrame() + if len(data) == 0 { + resp.WriteBool(false) + } else { + resp.WriteBytes(data[4:]) + } + doAckBufSucceed(s, pkt.AckHandle, resp.Data()) } func handleMsgMhfContractMercenary(s *Session, p mhfpacket.MHFPacket) {} From 265dc258005d2a9fe06ee1692b0b082f93f23817 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 8 Aug 2022 21:02:07 +1000 Subject: [PATCH 2/5] fix merc saving/loading --- network/mhfpacket/msg_mhf_read_mercenary_w.go | 12 ++++----- network/mhfpacket/msg_mhf_save_mercenary.go | 25 +++++++++++-------- server/channelserver/handlers_mercenary.go | 24 ++++++++---------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/network/mhfpacket/msg_mhf_read_mercenary_w.go b/network/mhfpacket/msg_mhf_read_mercenary_w.go index 7cb0117e7..c80afee14 100644 --- a/network/mhfpacket/msg_mhf_read_mercenary_w.go +++ b/network/mhfpacket/msg_mhf_read_mercenary_w.go @@ -1,17 +1,17 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" - "erupe-ce/network" "erupe-ce/common/byteframe" + "erupe-ce/network" + "erupe-ce/network/clientctx" ) // MsgMhfReadMercenaryW represents the MSG_MHF_READ_MERCENARY_W type MsgMhfReadMercenaryW struct { AckHandle uint32 - Unk0 uint8 + Unk0 bool Unk1 uint8 Unk2 uint16 // Hardcoded 0 in the binary } @@ -24,7 +24,7 @@ func (m *MsgMhfReadMercenaryW) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfReadMercenaryW) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() - m.Unk0 = bf.ReadUint8() + m.Unk0 = bf.ReadBool() m.Unk1 = bf.ReadUint8() m.Unk2 = bf.ReadUint16() return nil diff --git a/network/mhfpacket/msg_mhf_save_mercenary.go b/network/mhfpacket/msg_mhf_save_mercenary.go index a52c973ab..3aa2b0311 100644 --- a/network/mhfpacket/msg_mhf_save_mercenary.go +++ b/network/mhfpacket/msg_mhf_save_mercenary.go @@ -1,18 +1,20 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" - "erupe-ce/network" "erupe-ce/common/byteframe" + "erupe-ce/network" + "erupe-ce/network/clientctx" ) // MsgMhfSaveMercenary represents the MSG_MHF_SAVE_MERCENARY -type MsgMhfSaveMercenary struct{ - AckHandle uint32 - DataSize uint32 - RawDataPayload []byte +type MsgMhfSaveMercenary struct { + AckHandle uint32 + GCP uint32 + Unk0 uint32 + MercData []byte + Unk1 uint32 } // Opcode returns the ID associated with this packet type. @@ -23,8 +25,11 @@ func (m *MsgMhfSaveMercenary) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfSaveMercenary) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() - m.DataSize = bf.ReadUint32() - m.RawDataPayload = bf.ReadBytes(uint(m.DataSize)) + bf.ReadUint32() // lenData + m.GCP = bf.ReadUint32() + m.Unk0 = bf.ReadUint32() + m.MercData = bf.ReadBytes(uint(bf.ReadUint32())) + m.Unk1 = bf.ReadUint32() return nil } diff --git a/server/channelserver/handlers_mercenary.go b/server/channelserver/handlers_mercenary.go index bbcf5dceb..37ce9e628 100644 --- a/server/channelserver/handlers_mercenary.go +++ b/server/channelserver/handlers_mercenary.go @@ -142,34 +142,30 @@ func handleMsgMhfCreateMercenary(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSaveMercenary(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfSaveMercenary) - bf := byteframe.NewByteFrameFromBytes(pkt.RawDataPayload) - GCP := bf.ReadUint32() - _ = bf.ReadUint32() // unk - MercDataSize := bf.ReadUint32() - MercData := bf.ReadBytes(uint(MercDataSize)) - _ = bf.ReadUint32() // unk - - if MercDataSize > 0 { - s.server.db.Exec("UPDATE characters SET savemercenary=$1 WHERE id=$2", MercData[:MercDataSize], s.charID) + if len(pkt.MercData) > 0 { + s.server.db.Exec("UPDATE characters SET savemercenary=$1 WHERE id=$2", pkt.MercData, s.charID) } - s.server.db.Exec("UPDATE characters SET gcp=$1 WHERE id=$2", GCP, s.charID) + s.server.db.Exec("UPDATE characters SET gcp=$1 WHERE id=$2", pkt.GCP, s.charID) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfReadMercenaryW) + if pkt.Unk0 { + doAckBufSucceed(s, pkt.AckHandle, make([]byte, 2)) + return + } var data []byte var gcp uint32 s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id = $1", s.charID).Scan(&data) s.server.db.QueryRow("SELECT COALESCE(gcp, 0) FROM characters WHERE id = $1", s.charID).Scan(&gcp) resp := byteframe.NewByteFrame() - resp.WriteUint16(0) if len(data) == 0 { - resp.WriteBool(false) + resp.WriteBytes(make([]byte, 3)) } else { - resp.WriteBool(true) - resp.WriteBytes(data) + resp.WriteBytes(data[1:]) + resp.WriteUint32(0) // Unk } resp.WriteUint32(gcp) doAckBufSucceed(s, pkt.AckHandle, resp.Data()) From 483490bbd572921f845d4dd91a8712c3530b3dd7 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 8 Aug 2022 22:17:14 +1000 Subject: [PATCH 3/5] use simplesucceed for existing semaphores --- server/channelserver/handlers_semaphore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/channelserver/handlers_semaphore.go b/server/channelserver/handlers_semaphore.go index 6659bd2da..95af79314 100644 --- a/server/channelserver/handlers_semaphore.go +++ b/server/channelserver/handlers_semaphore.go @@ -119,7 +119,7 @@ func handleMsgSysCreateAcquireSemaphore(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint32(newSemaphore.id) doAckSimpleSucceed(s, pkt.AckHandle, bf.Data()) } else { - doAckSimpleFail(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) + doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } } From 032ee1eac73e4ba2c9c07198df3bf2497016636f Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 8 Aug 2022 22:17:44 +1000 Subject: [PATCH 4/5] add missing castbinary messagetype --- server/channelserver/handlers_cast_binary.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go index 304369295..fbdaf6987 100644 --- a/server/channelserver/handlers_cast_binary.go +++ b/server/channelserver/handlers_cast_binary.go @@ -16,6 +16,7 @@ import ( const ( BinaryMessageTypeState = 0 BinaryMessageTypeChat = 1 + BinaryMessageTypeData = 3 BinaryMessageTypeMailNotify = 4 BinaryMessageTypeEmote = 6 ) @@ -164,6 +165,17 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) { fmt.Printf("Got chat message: %+v\n", chatMessage) + if strings.HasPrefix(chatMessage.Message, "!test ") { + var x uint32 + n, err := fmt.Sscanf(chatMessage.Message, "!test %d", &x) + if err != nil || n != 1 { + sendServerChatMessage(s, "Invalid command. Usage:\"!test X\"") + } else { + s.test = x + sendServerChatMessage(s, fmt.Sprintf("Set value to %d", x)) + } + } + // Set account rights if strings.HasPrefix(chatMessage.Message, "!rights") { var v uint32 From af48d75522bb1f47839260845683e4c170302775 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 9 Aug 2022 13:45:04 +1000 Subject: [PATCH 5/5] remove debug command --- server/channelserver/handlers_cast_binary.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go index fbdaf6987..bf0f2f105 100644 --- a/server/channelserver/handlers_cast_binary.go +++ b/server/channelserver/handlers_cast_binary.go @@ -165,17 +165,6 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) { fmt.Printf("Got chat message: %+v\n", chatMessage) - if strings.HasPrefix(chatMessage.Message, "!test ") { - var x uint32 - n, err := fmt.Sscanf(chatMessage.Message, "!test %d", &x) - if err != nil || n != 1 { - sendServerChatMessage(s, "Invalid command. Usage:\"!test X\"") - } else { - s.test = x - sendServerChatMessage(s, fmt.Sprintf("Set value to %d", x)) - } - } - // Set account rights if strings.HasPrefix(chatMessage.Message, "!rights") { var v uint32