From 07c00cc2e34527559505ded95415169cf6ed90bc Mon Sep 17 00:00:00 2001 From: wish Date: Thu, 13 Oct 2022 04:21:07 +1100 Subject: [PATCH] stub guild hunt box --- network/mhfpacket/msg_mhf_guild_huntdata.go | 20 ++++++++++++-------- server/channelserver/handlers_guild.go | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/network/mhfpacket/msg_mhf_guild_huntdata.go b/network/mhfpacket/msg_mhf_guild_huntdata.go index b744cce23..9e114c968 100644 --- a/network/mhfpacket/msg_mhf_guild_huntdata.go +++ b/network/mhfpacket/msg_mhf_guild_huntdata.go @@ -1,17 +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" ) // MsgMhfGuildHuntdata represents the MSG_MHF_GUILD_HUNTDATA -type MsgMhfGuildHuntdata struct{ - AckHandle uint32 - Unk0 uint8 +type MsgMhfGuildHuntdata struct { + AckHandle uint32 + Operation uint8 + GuildID uint32 } // Opcode returns the ID associated with this packet type. @@ -22,7 +23,10 @@ func (m *MsgMhfGuildHuntdata) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfGuildHuntdata) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() - m.Unk0 = bf.ReadUint8() + m.Operation = bf.ReadUint8() + if m.Operation == 1 { + m.GuildID = bf.ReadUint32() + } return nil } diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go index e7c7d33d6..5c60bd009 100644 --- a/server/channelserver/handlers_guild.go +++ b/server/channelserver/handlers_guild.go @@ -1806,7 +1806,20 @@ func handleMsgMhfGetGuildWeeklyBonusActiveCount(s *Session, p mhfpacket.MHFPacke func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGuildHuntdata) - doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) + bf := byteframe.NewByteFrame() + switch pkt.Operation { + case 0: // Unk + doAckBufSucceed(s, pkt.AckHandle, []byte{}) + case 1: // Get Huntdata + bf.WriteUint8(0) // Entries + /* Entry format + uint32 UnkID + uint32 MonID + */ + doAckBufSucceed(s, pkt.AckHandle, bf.Data()) + case 2: // Unk, controls glow + doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00}) + } } type MessageBoardPost struct {