Merge pull request #9 from sekaiwish/main

Guild Hall automatically available on Guild creation

Erupe/network/mhfpacket/msg_mhf_acquire_ud_item.go

@@ -9,7 +9,12 @@ import (
 )
 
 // MsgMhfAcquireUdItem represents the MSG_MHF_ACQUIRE_UD_ITEM
-type MsgMhfAcquireUdItem struct{}
+type MsgMhfAcquireUdItem struct{
+  AckHandle uint32
+	// Valid field size(s), not sure about the types.
+	Unk0 uint8
+	Unk1 uint32
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfAcquireUdItem) Opcode() network.PacketID {
@@ -18,7 +23,11 @@ func (m *MsgMhfAcquireUdItem) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireUdItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+  m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint8()
+	m.Unk1 = bf.ReadUint32()
+	return nil
+  //return errors.New("NOT IMPLEMENTED")
 }
 
 // Build builds a binary packet from the current data.

Erupe/server/channelserver/handlers_diva.go

@@ -191,7 +191,10 @@ func handleMsgMhfGetUdNormaPresentList(s *Session, p mhfpacket.MHFPacket) {
 	doAckBufSucceed(s, pkt.AckHandle, data)
 }
 
-func handleMsgMhfAcquireUdItem(s *Session, p mhfpacket.MHFPacket) {}
+func handleMsgMhfAcquireUdItem(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfAcquireUdItem)
+	doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
+}
 
 func handleMsgMhfGetUdRanking(s *Session, p mhfpacket.MHFPacket) {}
 

Erupe/server/channelserver/handlers_guild.go

@@ -415,8 +415,8 @@ func CreateGuild(s *Session, guildName string) (int32, error) {
 	}
 
 	guildResult, err := transaction.Query(
-		"INSERT INTO guilds (name, leader_id) VALUES ($1, $2) RETURNING id",
-		guildName, s.charID,
+		"INSERT INTO guilds (name, leader_id, rp, guild_hall) VALUES ($1, $2, $3, $4) RETURNING id",
+		guildName, s.charID, 48, 17,
 	)
 
 	if err != nil {