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

Add more constants to central place

Browse Source
This commit is contained in:
stratic-dev
2024-10-17 02:55:46 +01:00
parent 6075e9c756
commit fa35141f97
5 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/channelserver/handlers_festa.go
View File

@@ -2,7 +2,9 @@ package channelserver
import (
"erupe-ce/config"
"erupe-ce/internal/constant"
"erupe-ce/internal/model"
"erupe-ce/network/mhfpacket"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
@@ -229,7 +231,7 @@ func handleMsgMhfInfoFesta(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
bf.WriteUint16(trial.TimesReq)
bf.WriteUint16(trial.Locale)
bf.WriteUint16(trial.Reward)
bf.WriteInt16(FestivalColorCodes[trial.Monopoly])
bf.WriteInt16(constant.FestivalColorCodes[trial.Monopoly])
if config.GetConfig().ClientID >= config.F4 { // Not in S6.0
bf.WriteUint16(trial.Unk)
}
@@ -294,7 +296,7 @@ func handleMsgMhfInfoFesta(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
for i := uint16(0); i < 4; i++ {
var guildID uint32
var guildName string
var guildTeam = FestivalColorNone
var guildTeam = constant.FestivalColorNone
db.QueryRow(`
SELECT fs.guild_id, g.name, fr.team, SUM(fs.souls) as _
FROM festa_submissions fs
@@ -306,14 +308,14 @@ func handleMsgMhfInfoFesta(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
`, i+1).Scan(&guildID, &guildName, &guildTeam, &temp)
bf.WriteUint32(guildID)
bf.WriteUint16(i + 1)
bf.WriteInt16(FestivalColorCodes[guildTeam])
bf.WriteInt16(constant.FestivalColorCodes[guildTeam])
ps.Uint8(bf, guildName, true)
}
bf.WriteUint16(7)
for i := uint16(0); i < 7; i++ {
var guildID uint32
var guildName string
var guildTeam = FestivalColorNone
var guildTeam = constant.FestivalColorNone
offset := 86400 * uint32(i)
db.QueryRow(`
SELECT fs.guild_id, g.name, fr.team, SUM(fs.souls) as _
@@ -326,7 +328,7 @@ func handleMsgMhfInfoFesta(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
`, timestamps[1]+offset, timestamps[1]+offset+86400).Scan(&guildID, &guildName, &guildTeam, &temp)
bf.WriteUint32(guildID)
bf.WriteUint16(i + 1)
bf.WriteInt16(FestivalColorCodes[guildTeam])
bf.WriteInt16(constant.FestivalColorCodes[guildTeam])
ps.Uint8(bf, guildName, true)
}