mirror of
https://github.com/Mezeporta/Erupe.git
synced 2025-12-13 23:44:52 +01:00
simplify & handle Mail better
This commit is contained in:
@@ -1,17 +1,16 @@
|
||||
package mhfpacket
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"errors"
|
||||
|
||||
"erupe-ce/network/clientctx"
|
||||
"erupe-ce/network"
|
||||
"erupe-ce/common/byteframe"
|
||||
"erupe-ce/network"
|
||||
"erupe-ce/network/clientctx"
|
||||
)
|
||||
|
||||
// MsgMhfListMail represents the MSG_MHF_LIST_MAIL
|
||||
type MsgMhfListMail struct {
|
||||
AckHandle uint32
|
||||
Unk0 uint32
|
||||
}
|
||||
|
||||
// Opcode returns the ID associated with this packet type.
|
||||
@@ -22,7 +21,8 @@ func (m *MsgMhfListMail) Opcode() network.PacketID {
|
||||
// Parse parses the packet from binary
|
||||
func (m *MsgMhfListMail) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
|
||||
m.AckHandle = bf.ReadUint32()
|
||||
m.Unk0 = bf.ReadUint32()
|
||||
bf.ReadUint16() // Zeroed
|
||||
bf.ReadUint16() // Zeroed
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -11,10 +11,11 @@ import (
|
||||
type OperateMailOperation uint8
|
||||
|
||||
const (
|
||||
OPERATE_MAIL_DELETE = 0x01
|
||||
OPERATE_MAIL_LOCK = 0x02
|
||||
OPERATE_MAIL_UNLOCK = 0x03
|
||||
OPERATE_MAIL_ACQUIRE_ITEM = 0x05
|
||||
OperateMailDelete = iota + 1
|
||||
OperateMailLock
|
||||
OperateMailUnlock
|
||||
OpreateMailNull
|
||||
OperateMailAcquireItem
|
||||
)
|
||||
|
||||
// MsgMhfOprtMail represents the MSG_MHF_OPRT_MAIL
|
||||
@@ -23,7 +24,6 @@ type MsgMhfOprtMail struct {
|
||||
AccIndex uint8
|
||||
Index uint8
|
||||
Operation OperateMailOperation
|
||||
Unk0 uint8
|
||||
Data []byte
|
||||
Amount uint16
|
||||
ItemID uint16
|
||||
@@ -40,8 +40,8 @@ func (m *MsgMhfOprtMail) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
|
||||
m.AccIndex = bf.ReadUint8()
|
||||
m.Index = bf.ReadUint8()
|
||||
m.Operation = OperateMailOperation(bf.ReadUint8())
|
||||
m.Unk0 = bf.ReadUint8()
|
||||
if m.Operation == OPERATE_MAIL_ACQUIRE_ITEM {
|
||||
bf.ReadUint8() // Zeroed
|
||||
if m.Operation == OperateMailAcquireItem {
|
||||
m.Amount = bf.ReadUint16()
|
||||
m.ItemID = bf.ReadUint16()
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ type MsgMhfSendMail struct {
|
||||
RecipientID uint32
|
||||
SubjectLength uint16
|
||||
BodyLength uint16
|
||||
Quantity uint32
|
||||
Quantity uint16
|
||||
ItemID uint16
|
||||
Subject string
|
||||
Body string
|
||||
@@ -32,7 +32,8 @@ func (m *MsgMhfSendMail) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
|
||||
m.RecipientID = bf.ReadUint32()
|
||||
m.SubjectLength = bf.ReadUint16()
|
||||
m.BodyLength = bf.ReadUint16()
|
||||
m.Quantity = bf.ReadUint32()
|
||||
bf.ReadUint16() // Zeroed
|
||||
m.Quantity = bf.ReadUint16()
|
||||
m.ItemID = bf.ReadUint16()
|
||||
m.Subject = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
|
||||
m.Body = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
|
||||
|
||||
Reference in New Issue
Block a user