Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-13 15:34:38 +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

16
server/channelserver/handlers_festa.go
View File

@@ -141,13 +141,13 @@ func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
} }
type FestaTrial struct { type FestaTrial struct {
ID uint32 `db:"id"` ID uint32 `db:"id"`
Objective uint16 `db:"objective"` Objective uint16 `db:"objective"`
GoalID uint32 `db:"goal_id"` GoalID uint32 `db:"goal_id"`
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)
} }

60
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
@@ -43,27 +43,27 @@ const (
) )
type Guild struct { type Guild struct {
ID uint32 `db:"id"` ID uint32 `db:"id"`
Name string `db:"name"` Name string `db:"name"`
MainMotto uint8 `db:"main_motto"` MainMotto uint8 `db:"main_motto"`
SubMotto uint8 `db:"sub_motto"` SubMotto uint8 `db:"sub_motto"`
CreatedAt time.Time `db:"created_at"` CreatedAt time.Time `db:"created_at"`
MemberCount uint16 `db:"member_count"` MemberCount uint16 `db:"member_count"`
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"` PugiName1 string `db:"pugi_name_1"`
PugiName2 string `db:"pugi_name_2"` PugiName2 string `db:"pugi_name_2"`
PugiName3 string `db:"pugi_name_3"` PugiName3 string `db:"pugi_name_3"`
PugiOutfit1 uint8 `db:"pugi_outfit_1"` PugiOutfit1 uint8 `db:"pugi_outfit_1"`
PugiOutfit2 uint8 `db:"pugi_outfit_2"` PugiOutfit2 uint8 `db:"pugi_outfit_2"`
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"`
GuildLeader GuildLeader
} }
@@ -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