Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-15 00:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from sekaiwish/main

Browse Source 
Guild Hall automatically available on Guild creation
This commit is contained in:
xl3lackout
2022-03-29 21:31:46 -04:00
committed by GitHub
parent cb15c60592 18ed83d5f0
commit c3fd2c1006
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Erupe/network/mhfpacket/msg_mhf_acquire_ud_item.go
View File

@@ -1,7 +1,7 @@
package mhfpacket package mhfpacket
import ( import (
"errors" "errors"
"github.com/Solenataris/Erupe/network/clientctx" "github.com/Solenataris/Erupe/network/clientctx"
"github.com/Solenataris/Erupe/network" "github.com/Solenataris/Erupe/network"
@@ -9,7 +9,12 @@ import (
) )
// MsgMhfAcquireUdItem represents the MSG_MHF_ACQUIRE_UD_ITEM // 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. // Opcode returns the ID associated with this packet type.
func (m *MsgMhfAcquireUdItem) Opcode() network.PacketID { func (m *MsgMhfAcquireUdItem) Opcode() network.PacketID {
@@ -18,7 +23,11 @@ func (m *MsgMhfAcquireUdItem) Opcode() network.PacketID {
// Parse parses the packet from binary // Parse parses the packet from binary
func (m *MsgMhfAcquireUdItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { 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. // Build builds a binary packet from the current data.

5
Erupe/server/channelserver/handlers_diva.go
View File

@@ -191,7 +191,10 @@ func handleMsgMhfGetUdNormaPresentList(s *Session, p mhfpacket.MHFPacket) {
doAckBufSucceed(s, pkt.AckHandle, data) 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) {} func handleMsgMhfGetUdRanking(s *Session, p mhfpacket.MHFPacket) {}

8
Erupe/server/channelserver/handlers_guild.go
View File

@@ -135,7 +135,7 @@ func (guild *Guild) Save(s *Session) error {
func (guild *Guild) CreateApplication(s *Session, charID uint32, applicationType GuildApplicationType, transaction *sql.Tx) error { func (guild *Guild) CreateApplication(s *Session, charID uint32, applicationType GuildApplicationType, transaction *sql.Tx) error {
sql := ` sql := `
INSERT INTO guild_applications (guild_id, character_id, actor_id, application_type) INSERT INTO guild_applications (guild_id, character_id, actor_id, application_type)
VALUES ($1, $2, $3, $4) VALUES ($1, $2, $3, $4)
` `
@@ -415,8 +415,8 @@ func CreateGuild(s *Session, guildName string) (int32, error) {
} }
guildResult, err := transaction.Query( guildResult, err := transaction.Query(
"INSERT INTO guilds (name, leader_id) VALUES ($1, $2) RETURNING id", "INSERT INTO guilds (name, leader_id, rp, guild_hall) VALUES ($1, $2, $3, $4) RETURNING id",
guildName, s.charID, guildName, s.charID, 48, 17,
) )
if err != nil { if err != nil {
@@ -507,7 +507,7 @@ func FindGuildsByName(s *Session, name string) ([]*Guild, error) {
func GetGuildInfoByID(s *Session, guildID uint32) (*Guild, error) { func GetGuildInfoByID(s *Session, guildID uint32) (*Guild, error) {
rows, err := s.server.db.Queryx(fmt.Sprintf(` rows, err := s.server.db.Queryx(fmt.Sprintf(`
%s %s
WHERE g.id = $1 WHERE g.id = $1
LIMIT 1 LIMIT 1
`, guildInfoSelectQuery), guildID) `, guildInfoSelectQuery), guildID)