fix reading and cancelling rasta contracts

network/mhfpacket/msg_mhf_contract_mercenary.go

@@ -1,15 +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"
 )
 
 // MsgMhfContractMercenary represents the MSG_MHF_CONTRACT_MERCENARY
-type MsgMhfContractMercenary struct{}
+type MsgMhfContractMercenary struct {
+	AckHandle  uint32
+	PactMercID uint32
+	CID        uint32
+	Unk        bool
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfContractMercenary) Opcode() network.PacketID {
@@ -18,7 +23,11 @@ func (m *MsgMhfContractMercenary) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfContractMercenary) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.PactMercID = bf.ReadUint32()
+	m.CID = bf.ReadUint32()
+	m.Unk = bf.ReadBool()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

server/channelserver/handlers_mercenary.go

@@ -181,6 +181,7 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
 			bf.WriteUint32(uint32(Time_Current_Adjusted().Add(time.Hour * 24 * 7).Unix()))
 			bf.WriteBytes(stringsupport.PaddedString(name, 18, true))
 			bf.WriteBool(false)
+			doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 		} else {
 			doAckBufSucceed(s, pkt.AckHandle, make([]byte, 2))
 		}
@@ -216,13 +217,11 @@ func handleMsgMhfReadMercenaryM(s *Session, p mhfpacket.MHFPacket) {
 	doAckBufSucceed(s, pkt.AckHandle, resp.Data())
 }
 
-func handleMsgMhfContractMercenary(s *Session, p mhfpacket.MHFPacket) {}
-
-///////////////////////////////////////////
-
-///////////////////////////////////////////
-///				OTOMO AIRU				 //
-///////////////////////////////////////////
+func handleMsgMhfContractMercenary(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfContractMercenary)
+	s.server.db.Exec("UPDATE characters SET pact_id=0 WHERE id=$1", s.charID)
+	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
+}
 
 func handleMsgMhfLoadOtomoAirou(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfLoadOtomoAirou)