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

changes to FestivalColor

Browse Source
This commit is contained in:
wish
2024-02-20 04:16:26 +11:00
parent 1c4370b929
commit d22a7c782f
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/channelserver/handlers_festa.go
View File

@@ -147,7 +147,7 @@ type FestaTrial struct {
TimesReq uint16 `db:"times_req"` TimesReq uint16 `db:"times_req"`
Locale uint16 `db:"locale_req"` Locale uint16 `db:"locale_req"`
Reward uint16 `db:"reward"` Reward uint16 `db:"reward"`
Monopoly FestivalColour `db:"monopoly"` Monopoly FestivalColor `db:"monopoly"`
Unk uint16 Unk uint16
} }
@@ -233,7 +233,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(trial.TimesReq) bf.WriteUint16(trial.TimesReq)
bf.WriteUint16(trial.Locale) bf.WriteUint16(trial.Locale)
bf.WriteUint16(trial.Reward) bf.WriteUint16(trial.Reward)
bf.WriteInt16(int16(FestivalColourCodes[trial.Monopoly])) bf.WriteInt16(FestivalColorCodes[trial.Monopoly])
if _config.ErupeConfig.RealClientMode >= _config.F4 { // Not in S6.0 if _config.ErupeConfig.RealClientMode >= _config.F4 { // Not in S6.0
bf.WriteUint16(trial.Unk) bf.WriteUint16(trial.Unk)
} }

20
server/channelserver/handlers_guild.go
View File

@@ -21,18 +21,18 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
) )
type FestivalColour string type FestivalColor string
const ( const (
FestivalColourNone FestivalColour = "none" FestivalColorNone FestivalColor = "none"
FestivalColourBlue FestivalColour = "blue" FestivalColorBlue FestivalColor = "blue"
FestivalColourRed FestivalColour = "red" FestivalColorRed FestivalColor = "red"
) )
var FestivalColourCodes = map[FestivalColour]int8{ var FestivalColorCodes = map[FestivalColor]int16{
FestivalColourNone: -1, FestivalColorNone: -1,
FestivalColourBlue: 0, FestivalColorBlue: 0,
FestivalColourRed: 1, FestivalColorRed: 1,
} }
type GuildApplicationType string type GuildApplicationType string
@@ -60,7 +60,7 @@ type Guild struct {
PugiOutfit3 uint8 `db:"pugi_outfit_3"` PugiOutfit3 uint8 `db:"pugi_outfit_3"`
PugiOutfits uint32 `db:"pugi_outfits"` PugiOutfits uint32 `db:"pugi_outfits"`
Recruiting bool `db:"recruiting"` Recruiting bool `db:"recruiting"`
FestivalColour FestivalColour `db:"festival_colour"` FestivalColor FestivalColor `db:"festival_colour"`
Souls uint32 `db:"souls"` Souls uint32 `db:"souls"`
AllianceID uint32 `db:"alliance_id"` AllianceID uint32 `db:"alliance_id"`
Icon *GuildIcon `db:"icon"` Icon *GuildIcon `db:"icon"`
@@ -967,7 +967,7 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint8(uint8(len(guildLeaderName))) bf.WriteUint8(uint8(len(guildLeaderName)))
bf.WriteBytes(guildName) bf.WriteBytes(guildName)
bf.WriteBytes(guildComment) bf.WriteBytes(guildComment)
bf.WriteInt8(FestivalColourCodes[guild.FestivalColour]) bf.WriteInt8(int8(FestivalColorCodes[guild.FestivalColor]))
bf.WriteUint32(guild.RankRP) bf.WriteUint32(guild.RankRP)
bf.WriteBytes(guildLeaderName) bf.WriteBytes(guildLeaderName)
bf.WriteUint32(0) // Unk bf.WriteUint32(0) // Unk