update various packets

Erupe/network/mhfpacket/msg_mhf_add_achievement.go

@@ -1,9 +1,11 @@
 package mhfpacket
 
 import (
+	"errors"
+
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfAddAchievement represents the MSG_MHF_ADD_ACHIEVEMENT
@@ -23,14 +25,10 @@ func (m *MsgMhfAddAchievement) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
 	m.AchievementID = bf.ReadUint8()
 	m.Unk1 = bf.ReadUint16()
 	m.Unk2 = bf.ReadUint16()
-	// doesn't expect a response
 	return nil
 }
 
 // Build builds a binary packet from the current data.
 func (m *MsgMhfAddAchievement) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	bf.WriteUint8(m.AchievementID)
+	return errors.New("NOT IMPLEMENTED")
-	bf.WriteUint16(m.Unk1)
-	bf.WriteUint16(m.Unk2)
-	return nil
 }

Erupe/network/mhfpacket/msg_mhf_enumerate_airoulist.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateAiroulist represents the MSG_MHF_ENUMERATE_AIROULIST

Erupe/network/mhfpacket/msg_mhf_enumerate_guacot.go

@@ -1,9 +1,11 @@
 package mhfpacket
 
 import (
+	"errors"
+
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfEnumerateGuacot represents the MSG_MHF_ENUMERATE_GUACOT
@@ -30,9 +32,5 @@ func (m *MsgMhfEnumerateGuacot) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl
 
 // Build builds a binary packet from the current data.
 func (m *MsgMhfEnumerateGuacot) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	bf.WriteUint32(m.AckHandle)
+	return errors.New("NOT IMPLEMENTED")
-	bf.WriteUint16(m.Unk0)
-	bf.WriteUint16(m.Unk1)
-	bf.WriteUint16(m.Unk2)
-	return nil
 }

Erupe/network/mhfpacket/msg_mhf_enumerate_guild.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 type EnumerateGuildType uint8
@@ -43,7 +43,7 @@ func (m *MsgMhfEnumerateGuild) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
 	m.AckHandle = bf.ReadUint32()
 	m.Type = EnumerateGuildType(bf.ReadUint8())
 	m.RawDataPayload = bf.DataFromCurrent()
-  bf.Seek(int64(len(bf.Data()) - 2), 0)
+	bf.Seek(int64(len(bf.Data())-2), 0)
 	return nil
 }
 

Erupe/network/mhfpacket/msg_mhf_mercenary_huntdata.go

@@ -3,13 +3,13 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfMercenaryHuntdata represents the MSG_MHF_MERCENARY_HUNTDATA
-type MsgMhfMercenaryHuntdata struct{
+type MsgMhfMercenaryHuntdata struct {
 	AckHandle uint32
 	Unk0      uint8
 }

Erupe/network/mhfpacket/msg_mhf_read_mail.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfReadMail represents the MSG_MHF_READ_MAIL

Erupe/network/mhfpacket/msg_mhf_read_mercenary_m.go

@@ -3,13 +3,13 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfReadMercenaryM represents the MSG_MHF_READ_MERCENARY_M
-type MsgMhfReadMercenaryM struct{
+type MsgMhfReadMercenaryM struct {
 	AckHandle uint32
 	CharID    uint32
 	Unk0      uint32

Erupe/network/mhfpacket/msg_mhf_update_guild_icon.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 type GuildIconMsgPart struct {

Erupe/network/mhfpacket/msg_mhf_update_guild_item.go

@@ -3,12 +3,12 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
-type Item struct{
+type Item struct {
 	Unk0   uint32
 	ItemId uint16
 	Amount uint16
@@ -16,7 +16,7 @@ type Item struct{
 }
 
 // MsgMhfUpdateGuildItem represents the MSG_MHF_UPDATE_GUILD_ITEM
-type MsgMhfUpdateGuildItem struct{
+type MsgMhfUpdateGuildItem struct {
 	AckHandle uint32
 	GuildId   uint32
 	Amount    uint16

Erupe/network/mhfpacket/msg_mhf_update_guild_message_board.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfUpdateGuildMessageBoard represents the MSG_MHF_UPDATE_GUILD_MESSAGE_BOARD
@@ -26,7 +26,7 @@ func (m *MsgMhfUpdateGuildMessageBoard) Parse(bf *byteframe.ByteFrame, ctx *clie
 	m.MessageOp = bf.ReadUint32()
 	if m.MessageOp != 5 {
 		m.Request = bf.DataFromCurrent()
-    bf.Seek(int64(len(bf.Data()) - 2), 0)
+		bf.Seek(int64(len(bf.Data())-2), 0)
 	}
 	return nil
 }

Erupe/network/mhfpacket/msg_mhf_update_interior.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfUpdateInterior represents the MSG_MHF_UPDATE_INTERIOR

Erupe/network/mhfpacket/msg_mhf_vote_festa.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfVoteFesta represents the MSG_MHF_VOTE_FESTA

Erupe/network/mhfpacket/msg_sys_check_semaphore.go

@@ -3,16 +3,15 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/bfutil"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgSysCheckSemaphore represents the MSG_SYS_CHECK_SEMAPHORE
-type MsgSysCheckSemaphore struct{
+type MsgSysCheckSemaphore struct {
 	AckHandle   uint32
-	StageID   string
+	SemaphoreID string
 }
 
 // Opcode returns the ID associated with this packet type.

Erupe/server/channelserver/handlers_semaphore.go

@@ -134,7 +134,7 @@ func handleMsgSysCheckSemaphore(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysCheckSemaphore)
 	resp := []byte{0x00, 0x00, 0x00, 0x00}
 	s.server.semaphoreLock.Lock()
-	if _, exists := s.server.semaphore[pkt.StageID]; exists {
+	if _, exists := s.server.semaphore[pkt.SemaphoreID]; exists {
 		resp = []byte{0x00, 0x00, 0x00, 0x01}
 	}
 	s.server.semaphoreLock.Unlock()

Erupe/server/channelserver/sys_channel_server.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"sync"
 
-	ps "erupe-ce/common/pascalstring"
 	"erupe-ce/common/byteframe"
+	ps "erupe-ce/common/pascalstring"
 	"erupe-ce/config"
 	"erupe-ce/network/binpacket"
 	"erupe-ce/network/mhfpacket"