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

add support for reading pugi names

Browse Source
This commit is contained in:
wishu
2022-06-16 15:01:27 +10:00
parent b2627bf30d
commit fb3e3c2713
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,9 @@ type Guild struct {
RankRP uint32 `db:"rank_rp"` RankRP uint32 `db:"rank_rp"`
EventRP uint32 `db:"event_rp"` EventRP uint32 `db:"event_rp"`
Comment string `db:"comment"` Comment string `db:"comment"`
PugiName1 string `db:"pugi_name_1"`
PugiName2 string `db:"pugi_name_2"`
PugiName3 string `db:"pugi_name_3"`
FestivalColour FestivalColour `db:"festival_colour"` FestivalColour FestivalColour `db:"festival_colour"`
Rank uint16 `db:"rank"` Rank uint16 `db:"rank"`
Icon *GuildIcon `db:"icon"` Icon *GuildIcon `db:"icon"`
@@ -123,6 +126,9 @@ SELECT
leader_id, leader_id,
lc.name as leader_name, lc.name as leader_name,
comment, comment,
pugi_name_1,
pugi_name_2,
pugi_name_3,
festival_colour, festival_colour,
CASE CASE
WHEN rank_rp <= 48 THEN rank_rp/24 WHEN rank_rp <= 48 THEN rank_rp/24
@@ -915,10 +921,26 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
bf.WriteBytes([]byte{0x01, 0x02, 0x02}) // Unk bf.WriteBytes([]byte{0x01, 0x02, 0x02}) // Unk
bf.WriteUint32(guild.EventRP) bf.WriteUint32(guild.EventRP)
// Pugi's names, probably expected as null until you have them with levels? Null gives them a default japanese name if guild.PugiName1 == "" {
for i := 0; i < 3; i++ { bf.WriteUint16(0x0100)
bf.WriteUint8(0x1) // Name Length - 1 minimum due to null byte } else {
bf.WriteUint8(0x0) // Name string bf.WriteUint8(uint8(len(guild.PugiName1)+1))
pugiName := s.clientContext.StrConv.MustEncode(guild.PugiName1)
bf.WriteNullTerminatedBytes(pugiName)
}
if guild.PugiName2 == "" {
bf.WriteUint16(0x0100)
} else {
bf.WriteUint8(uint8(len(guild.PugiName2)+1))
pugiName := s.clientContext.StrConv.MustEncode(guild.PugiName2)
bf.WriteNullTerminatedBytes(pugiName)
}
if guild.PugiName3 == "" {
bf.WriteUint16(0x0100)
} else {
bf.WriteUint8(uint8(len(guild.PugiName3)+1))
pugiName := s.clientContext.StrConv.MustEncode(guild.PugiName3)
bf.WriteNullTerminatedBytes(pugiName)
} }
// probably guild pugi properties, should be status, stamina and luck outfits // probably guild pugi properties, should be status, stamina and luck outfits