diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_house.go b/Erupe/network/mhfpacket/msg_mhf_enumerate_house.go index baa1eb2f4..3758a8c38 100644 --- a/Erupe/network/mhfpacket/msg_mhf_enumerate_house.go +++ b/Erupe/network/mhfpacket/msg_mhf_enumerate_house.go @@ -1,18 +1,20 @@ package mhfpacket import ( + "errors" + + "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" ) // MsgMhfEnumerateHouse represents the MSG_MHF_ENUMERATE_HOUSE type MsgMhfEnumerateHouse struct { AckHandle uint32 - Unk0 uint8 - Unk1 uint32 - Player uint8 - Unk2 uint16 + CharID uint32 + Method uint8 + Unk uint16 + Name []byte } // Opcode returns the ID associated with this packet type. @@ -23,19 +25,15 @@ func (m *MsgMhfEnumerateHouse) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfEnumerateHouse) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() - m.Unk0 = bf.ReadUint8() - m.Unk1 = bf.ReadUint32() - m.Player = bf.ReadUint8() - m.Unk2 = bf.ReadUint16() + m.CharID = bf.ReadUint32() + m.Method = bf.ReadUint8() + m.Unk = bf.ReadUint16() + _ = bf.ReadUint8() // len + m.Name = bf.ReadNullTerminatedBytes() return nil } // Build builds a binary packet from the current data. func (m *MsgMhfEnumerateHouse) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - bf.WriteUint32(m.AckHandle) - bf.WriteUint8(m.Unk0) - bf.WriteUint32(m.Unk1) - bf.WriteUint8(m.Player) - bf.WriteUint16(m.Unk2) - return nil + return errors.New("NOT IMPLEMENTED") } diff --git a/Erupe/network/mhfpacket/msg_mhf_update_house.go b/Erupe/network/mhfpacket/msg_mhf_update_house.go index 409a660e8..47354a23f 100644 --- a/Erupe/network/mhfpacket/msg_mhf_update_house.go +++ b/Erupe/network/mhfpacket/msg_mhf_update_house.go @@ -1,15 +1,26 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" - "erupe-ce/network" "erupe-ce/common/byteframe" + "erupe-ce/network" + "erupe-ce/network/clientctx" ) // MsgMhfUpdateHouse represents the MSG_MHF_UPDATE_HOUSE -type MsgMhfUpdateHouse struct{} +type MsgMhfUpdateHouse struct { + AckHandle uint32 + // 01 = closed + // 02 = open anyone + // 03 = open friends + // 04 = open guild + // 05 = open friends guild + State uint8 + Unk1 uint8 // Always 0x01 + Unk2 uint16 // Always 0x0000 + Password string +} // Opcode returns the ID associated with this packet type. func (m *MsgMhfUpdateHouse) Opcode() network.PacketID { @@ -18,7 +29,13 @@ func (m *MsgMhfUpdateHouse) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfUpdateHouse) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - return errors.New("NOT IMPLEMENTED") + m.AckHandle = bf.ReadUint32() + m.State = bf.ReadUint8() + m.Unk1 = bf.ReadUint8() + m.Unk2 = bf.ReadUint16() + _ = bf.ReadUint8() + m.Password = string(bf.ReadNullTerminatedBytes()) + return nil } // Build builds a binary packet from the current data.