From d22a7c782f2adff174582cbe1ac02d0cfbc9c152 Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Tue, 20 Feb 2024 04:16:26 +1100
Subject: [PATCH] changes to FestivalColor

---
 server/channelserver/handlers_festa.go | 16 +++----
 server/channelserver/handlers_guild.go | 60 +++++++++++++-------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/server/channelserver/handlers_festa.go b/server/channelserver/handlers_festa.go
index 4b1929169..530f3fc7b 100644
--- a/server/channelserver/handlers_festa.go
+++ b/server/channelserver/handlers_festa.go
@@ -141,13 +141,13 @@ func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
 }
 
 type FestaTrial struct {
-	ID        uint32         `db:"id"`
-	Objective uint16         `db:"objective"`
-	GoalID    uint32         `db:"goal_id"`
-	TimesReq  uint16         `db:"times_req"`
-	Locale    uint16         `db:"locale_req"`
-	Reward    uint16         `db:"reward"`
-	Monopoly  FestivalColour `db:"monopoly"`
+	ID        uint32        `db:"id"`
+	Objective uint16        `db:"objective"`
+	GoalID    uint32        `db:"goal_id"`
+	TimesReq  uint16        `db:"times_req"`
+	Locale    uint16        `db:"locale_req"`
+	Reward    uint16        `db:"reward"`
+	Monopoly  FestivalColor `db:"monopoly"`
 	Unk       uint16
 }
 
@@ -233,7 +233,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint16(trial.TimesReq)
 		bf.WriteUint16(trial.Locale)
 		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
 			bf.WriteUint16(trial.Unk)
 		}
diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go
index 43629e49a..7fc90cdf1 100644
--- a/server/channelserver/handlers_guild.go
+++ b/server/channelserver/handlers_guild.go
@@ -21,18 +21,18 @@ import (
 	"go.uber.org/zap"
 )
 
-type FestivalColour string
+type FestivalColor string
 
 const (
-	FestivalColourNone FestivalColour = "none"
-	FestivalColourBlue FestivalColour = "blue"
-	FestivalColourRed  FestivalColour = "red"
+	FestivalColorNone FestivalColor = "none"
+	FestivalColorBlue FestivalColor = "blue"
+	FestivalColorRed  FestivalColor = "red"
 )
 
-var FestivalColourCodes = map[FestivalColour]int8{
-	FestivalColourNone: -1,
-	FestivalColourBlue: 0,
-	FestivalColourRed:  1,
+var FestivalColorCodes = map[FestivalColor]int16{
+	FestivalColorNone: -1,
+	FestivalColorBlue: 0,
+	FestivalColorRed:  1,
 }
 
 type GuildApplicationType string
@@ -43,27 +43,27 @@ const (
 )
 
 type Guild struct {
-	ID             uint32         `db:"id"`
-	Name           string         `db:"name"`
-	MainMotto      uint8          `db:"main_motto"`
-	SubMotto       uint8          `db:"sub_motto"`
-	CreatedAt      time.Time      `db:"created_at"`
-	MemberCount    uint16         `db:"member_count"`
-	RankRP         uint32         `db:"rank_rp"`
-	EventRP        uint32         `db:"event_rp"`
-	Comment        string         `db:"comment"`
-	PugiName1      string         `db:"pugi_name_1"`
-	PugiName2      string         `db:"pugi_name_2"`
-	PugiName3      string         `db:"pugi_name_3"`
-	PugiOutfit1    uint8          `db:"pugi_outfit_1"`
-	PugiOutfit2    uint8          `db:"pugi_outfit_2"`
-	PugiOutfit3    uint8          `db:"pugi_outfit_3"`
-	PugiOutfits    uint32         `db:"pugi_outfits"`
-	Recruiting     bool           `db:"recruiting"`
-	FestivalColour FestivalColour `db:"festival_colour"`
-	Souls          uint32         `db:"souls"`
-	AllianceID     uint32         `db:"alliance_id"`
-	Icon           *GuildIcon     `db:"icon"`
+	ID            uint32        `db:"id"`
+	Name          string        `db:"name"`
+	MainMotto     uint8         `db:"main_motto"`
+	SubMotto      uint8         `db:"sub_motto"`
+	CreatedAt     time.Time     `db:"created_at"`
+	MemberCount   uint16        `db:"member_count"`
+	RankRP        uint32        `db:"rank_rp"`
+	EventRP       uint32        `db:"event_rp"`
+	Comment       string        `db:"comment"`
+	PugiName1     string        `db:"pugi_name_1"`
+	PugiName2     string        `db:"pugi_name_2"`
+	PugiName3     string        `db:"pugi_name_3"`
+	PugiOutfit1   uint8         `db:"pugi_outfit_1"`
+	PugiOutfit2   uint8         `db:"pugi_outfit_2"`
+	PugiOutfit3   uint8         `db:"pugi_outfit_3"`
+	PugiOutfits   uint32        `db:"pugi_outfits"`
+	Recruiting    bool          `db:"recruiting"`
+	FestivalColor FestivalColor `db:"festival_colour"`
+	Souls         uint32        `db:"souls"`
+	AllianceID    uint32        `db:"alliance_id"`
+	Icon          *GuildIcon    `db:"icon"`
 
 	GuildLeader
 }
@@ -967,7 +967,7 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint8(uint8(len(guildLeaderName)))
 		bf.WriteBytes(guildName)
 		bf.WriteBytes(guildComment)
-		bf.WriteInt8(FestivalColourCodes[guild.FestivalColour])
+		bf.WriteInt8(int8(FestivalColorCodes[guild.FestivalColor]))
 		bf.WriteUint32(guild.RankRP)
 		bf.WriteBytes(guildLeaderName)
 		bf.WriteUint32(0)   // Unk