Merge remote-tracking branch 'origin/main' into feature/discord-login

2026-02-04 09:15:08 +01:00 · 2023-12-31 22:38:08 +11:00
parent 526a9504bb 3db6ee7b25
commit b3a265e218
25 changed files with 215 additions and 2569 deletions
--- a/bin/quests/desktop.ini
+++ b/bin/quests/desktop.ini
--- a/common/mhfcourse/mhfcourse.go
+++ b/common/mhfcourse/mhfcourse.go
@@ -1,6 +1,7 @@
 package mhfcourse

 import (
+	_config "erupe-ce/config"
 	"math"
 	"sort"
 	"time"
@@ -66,7 +67,10 @@ func CourseExists(ID uint16, c []Course) bool {

 // GetCourseStruct returns a slice of Course(s) from a rights integer
 func GetCourseStruct(rights uint32) ([]Course, uint32) {
-	resp := []Course{{ID: 1}, {ID: 23}, {ID: 24}}
+	var resp []Course
+	for _, c := range _config.ErupeConfig.DefaultCourses {
+		resp = append(resp, Course{ID: c})
+	}
 	s := Courses()
 	sort.Slice(s, func(i, j int) bool {
 		return s[i].ID > s[j].ID
--- a/config.json
+++ b/config.json
@@ -13,29 +13,35 @@
  "DeleteOnSaveCorruption": false,
  "ClientMode": "ZZ",
  "QuestCacheExpiry": 300,
-  "ProxyPort": 0,
  "CommandPrefix": "!",
-  "DevMode": true,
-  "DevModeOptions": {
-    "AutoCreateAccount": true,
+  "AutoCreateAccount": true,
+  "DefaultCourses": [1, 23, 24],
+  "EarthStatus": 0,
+  "EarthID": 0,
+  "EarthMonsters": [0, 0, 0, 0],
+  "SaveDumps": {
+    "Enabled": true,
+    "RawEnabled": false,
+    "OutputDir": "save-backups"
+  },
+  "DebugOptions": {
    "CleanDB": false,
    "MaxLauncherHR": false,
    "LogInboundMessages": false,
    "LogOutboundMessages": false,
    "LogMessageData": false,
    "MaxHexdumpLength": 256,
-    "DivaEvent": 0,
-    "FestaEvent": -1,
-    "TournamentEvent": 0,
+    "DivaOverride": 0,
+    "FestaOverride": -1,
+    "TournamentOverride": 0,
    "DisableTokenCheck": false,
-    "QuestDebugTools": false,
-    "EarthStatusOverride": 0,
-    "EarthIDOverride": 0,
-    "EarthMonsterOverride": [0, 0, 0, 0],
-    "SaveDumps": {
-      "Enabled": true,
-      "RawEnabled": false,
-      "OutputDir": "save-backups"
+    "QuestTools": false,
+    "ProxyPort": 0,
+    "CapLink": {
+      "Values": [51728, 20000, 51729, 1, 20000],
+      "Key": "",
+      "Host": "",
+      "Port": 80
    }
  },
  "GameplayOptions": {
@@ -51,8 +57,6 @@
    "ClanMemberLimits": [[0, 30], [3, 40], [7, 50], [10, 60]],
    "BonusQuestAllowance": 3,
    "DailyQuestAllowance": 1,
-    "MezfesSoloTickets": 10,
-    "MezfesGroupTickets": 4,
    "LowLatencyRaviente": false,
    "RegularRavienteMaxPlayers": 8,
    "ViolentRavienteMaxPlayers": 8,
@@ -67,6 +71,8 @@
    "MaterialMultiplier": 1.00,
    "ExtraCarves": 0,
    "DisableHunterNavi": false,
+    "MezFesSoloTickets": 5,
+    "MezFesGroupTickets": 1,
    "MezFesDuration": 172800,
    "MezFesSwitchMinigame": false,
    "EnableKaijiEvent": false,
--- a/config/config.go
+++ b/config/config.go
@@ -80,40 +80,23 @@ type Config struct {
 	ClientMode             string
 	RealClientMode         Mode
 	QuestCacheExpiry       int    // Number of seconds to keep quest data cached
-	ProxyPort              uint16 // Forces the game to connect to a channel server proxy
 	CommandPrefix          string // The prefix for commands
-	DevMode                bool
-
-	DevModeOptions  DevModeOptions
-	GameplayOptions GameplayOptions
-	Discord         Discord
-	Commands        []Command
-	Courses         []Course
-	Database        Database
-	Sign            Sign
-	SignV2          SignV2
-	Channel         Channel
-	Entrance        Entrance
-}
-
-// DevModeOptions holds various debug/temporary options for use while developing Erupe.
-type DevModeOptions struct {
-	AutoCreateAccount    bool // Automatically create accounts if they don't exist
-	CleanDB              bool // Automatically wipes the DB on server reset.
-	MaxLauncherHR        bool // Sets the HR returned in the launcher to HR7 so that you can join non-beginner worlds.
-	LogInboundMessages   bool // Log all messages sent to the server
-	LogOutboundMessages  bool // Log all messages sent to the clients
-	LogMessageData       bool // Log all bytes transferred as a hexdump
-	MaxHexdumpLength     int  // Maximum number of bytes printed when logs are enabled
-	DivaEvent            int  // Diva Defense event status
-	FestaEvent           int  // Hunter's Festa event status
-	TournamentEvent      int  // VS Tournament event status
-	DisableTokenCheck    bool // Disables checking login token exists in the DB (security risk!)
-	QuestDebugTools      bool // Enable various quest debug logs
-	EarthStatusOverride  int32
-	EarthIDOverride      int32
-	EarthMonsterOverride []int32
-	SaveDumps            SaveDumpOptions
+	AutoCreateAccount      bool   // Automatically create accounts if they don't exist
+	DefaultCourses         []uint16
+	EarthStatus            int32
+	EarthID                int32
+	EarthMonsters          []int32
+	SaveDumps              SaveDumpOptions
+	DebugOptions           DebugOptions
+	GameplayOptions        GameplayOptions
+	Discord                Discord
+	Commands               []Command
+	Courses                []Course
+	Database               Database
+	Sign                   Sign
+	SignV2                 SignV2
+	Channel                Channel
+	Entrance               Entrance
 }

 type SaveDumpOptions struct {
@@ -122,6 +105,30 @@ type SaveDumpOptions struct {
 	OutputDir  string
 }

+// DebugOptions holds various debug/temporary options for use while developing Erupe.
+type DebugOptions struct {
+	CleanDB             bool   // Automatically wipes the DB on server reset.
+	MaxLauncherHR       bool   // Sets the HR returned in the launcher to HR7 so that you can join non-beginner worlds.
+	LogInboundMessages  bool   // Log all messages sent to the server
+	LogOutboundMessages bool   // Log all messages sent to the clients
+	LogMessageData      bool   // Log all bytes transferred as a hexdump
+	MaxHexdumpLength    int    // Maximum number of bytes printed when logs are enabled
+	DivaOverride        int    // Diva Defense event status
+	FestaOverride       int    // Hunter's Festa event status
+	TournamentOverride  int    // VS Tournament event status
+	DisableTokenCheck   bool   // Disables checking login token exists in the DB (security risk!)
+	QuestTools          bool   // Enable various quest debug logs
+	ProxyPort           uint16 // Forces the game to connect to a channel server proxy
+	CapLink             CapLinkOptions
+}
+
+type CapLinkOptions struct {
+	Values []uint16
+	Key    string
+	Host   string
+	Port   int
+}
+
 // GameplayOptions has various gameplay modifiers
 type GameplayOptions struct {
 	FeaturedWeapons                int       // Number of Active Feature weapons to generate daily
@@ -137,8 +144,6 @@ type GameplayOptions struct {
 	ClanMemberLimits               [][]uint8 // Array of maximum Clan Members -> [Rank, Members]
 	BonusQuestAllowance            uint32    // Number of Bonus Point Quests to allow daily
 	DailyQuestAllowance            uint32    // Number of Daily Quests to allow daily
-	MezfesSoloTickets              uint32    // Number of solo tickets given weekly
-	MezfesGroupTickets             uint32    // Number of group tickets given weekly
 	LowLatencyRaviente             bool      // Toggles low latency mode for Raviente, can be network intensive
 	RegularRavienteMaxPlayers      uint8
 	ViolentRavienteMaxPlayers      uint8
@@ -153,6 +158,8 @@ type GameplayOptions struct {
 	MaterialMultiplier             float32 // Adjusts the multiplier of Monster Materials rewarded for quest completion
 	ExtraCarves                    uint16  // Grant n extra chances to carve ALL carcasses
 	DisableHunterNavi              bool    // Disables the Hunter Navi
+	MezFesSoloTickets              uint32  // Number of solo tickets given weekly
+	MezFesGroupTickets             uint32  // Number of group tickets given weekly
 	MezFesDuration                 int     // Seconds that MezFes will last for weekly (from 12AM Mon backwards)
 	MezFesSwitchMinigame           bool    // Swaps out Volpakkun Together for Tokotoko Partnya
 	EnableKaijiEvent               bool    // Enables the Kaiji event in the Rasta Bar
--- a/main.go
+++ b/main.go
@@ -23,13 +23,10 @@ import (
 )

 // Temporary DB auto clean on startup for quick development & testing.
-func cleanDB(db *sqlx.DB, config *_config.Config) {
+func cleanDB(db *sqlx.DB) {
 	_ = db.MustExec("DELETE FROM guild_characters")
 	_ = db.MustExec("DELETE FROM guilds")
 	_ = db.MustExec("DELETE FROM characters")
-	if config.ProxyPort == 0 {
-		_ = db.MustExec("DELETE FROM sign_sessions")
-	}
 	_ = db.MustExec("DELETE FROM users")
 }

@@ -49,11 +46,7 @@ func main() {

 	var zapLogger *zap.Logger
 	config := _config.ErupeConfig
-	if config.DevMode {
-		zapLogger, _ = zap.NewDevelopment()
-	} else {
-		zapLogger, _ = zap.NewProduction()
-	}
+	zapLogger, _ = zap.NewDevelopment()

 	defer zapLogger.Sync()
 	logger := zapLogger.Named("main")
@@ -158,16 +151,16 @@ func main() {
 	logger.Info("Database: Started successfully")

 	// Clear stale data
-	if config.ProxyPort == 0 {
+	if config.DebugOptions.ProxyPort == 0 {
 		_ = db.MustExec("DELETE FROM sign_sessions")
 	}
 	_ = db.MustExec("DELETE FROM servers")
 	_ = db.MustExec(`UPDATE guild_characters SET treasure_hunt=NULL`)

 	// Clean the DB if the option is on.
-	if config.DevMode && config.DevModeOptions.CleanDB {
+	if config.DebugOptions.CleanDB {
 		logger.Info("Database: Started clearing...")
-		cleanDB(db, config)
+		cleanDB(db)
 		logger.Info("Database: Finished clearing")
 	}

--- a/network/mhfpacket/msg_mhf_update_guacot.go
+++ b/network/mhfpacket/msg_mhf_update_guacot.go
@@ -9,7 +9,7 @@ import (

 type Goocoo struct {
 	Index uint32
-	Data1 []uint16
+	Data1 []int16
 	Data2 []uint32
 	Name  []byte
 }
@@ -35,7 +35,7 @@ func (m *MsgMhfUpdateGuacot) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clien
 	for i := 0; i < int(m.EntryCount); i++ {
 		temp.Index = bf.ReadUint32()
 		for j := 0; j < 22; j++ {
-			temp.Data1 = append(temp.Data1, bf.ReadUint16())
+			temp.Data1 = append(temp.Data1, bf.ReadInt16())
 		}
 		for j := 0; j < 2; j++ {
 			temp.Data2 = append(temp.Data2, bf.ReadUint32())
--- a/patch-schema/15-reset-goocoos.sql
+++ b/patch-schema/15-reset-goocoos.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+UPDATE goocoo SET goocoo0=NULL, goocoo1=NULL, goocoo2=NULL, goocoo3=NULL, goocoo4=NULL;
+
+END;
--- a/server/channelserver/handlers.go
+++ b/server/channelserver/handlers.go
@@ -31,7 +31,7 @@ func stubEnumerateNoResults(s *Session, ackHandle uint32) {

 func doAckEarthSucceed(s *Session, ackHandle uint32, data []*byteframe.ByteFrame) {
 	bf := byteframe.NewByteFrame()
-	bf.WriteUint32(uint32(s.server.erupeConfig.DevModeOptions.EarthIDOverride))
+	bf.WriteUint32(uint32(s.server.erupeConfig.EarthID))
 	bf.WriteUint32(0)
 	bf.WriteUint32(0)
 	bf.WriteUint32(uint32(len(data)))
@@ -127,7 +127,7 @@ func handleMsgSysTerminalLog(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysLogin)

-	if !s.server.erupeConfig.DevModeOptions.DisableTokenCheck {
+	if !s.server.erupeConfig.DebugOptions.DisableTokenCheck {
 		var token string
 		err := s.server.db.QueryRow("SELECT token FROM sign_sessions ss INNER JOIN public.users u on ss.user_id = u.id WHERE token=$1 AND ss.id=$2 AND u.id=(SELECT c.user_id FROM characters c WHERE c.id=$3)", pkt.LoginTokenString, pkt.LoginTokenNumber, pkt.CharID0).Scan(&token)
 		if err != nil {
@@ -959,39 +959,31 @@ func handleMsgMhfExchangeWeeklyStamp(s *Session, p mhfpacket.MHFPacket) {
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

-func getGookData(s *Session, cid uint32) (uint16, []byte) {
-	var data []byte
-	var count uint16
-	bf := byteframe.NewByteFrame()
+func getGoocooData(s *Session, cid uint32) [][]byte {
+	var goocoo []byte
+	var goocoos [][]byte
 	for i := 0; i < 5; i++ {
-		err := s.server.db.QueryRow(fmt.Sprintf("SELECT goocoo%d FROM goocoo WHERE id=$1", i), cid).Scan(&data)
+		err := s.server.db.QueryRow(fmt.Sprintf("SELECT goocoo%d FROM goocoo WHERE id=$1", i), cid).Scan(&goocoo)
 		if err != nil {
 			s.server.db.Exec("INSERT INTO goocoo (id) VALUES ($1)", s.charID)
-			return 0, bf.Data()
+			return goocoos
 		}
-		if err == nil && data != nil {
-			count++
-			if s.charID == cid && count == 1 {
-				goocoo := byteframe.NewByteFrameFromBytes(data)
-				bf.WriteBytes(goocoo.ReadBytes(4))
-				d := goocoo.ReadBytes(2)
-				bf.WriteBytes(d)
-				bf.WriteBytes(d)
-				bf.WriteBytes(goocoo.DataFromCurrent())
-			} else {
-				bf.WriteBytes(data)
-			}
+		if err == nil && goocoo != nil {
+			goocoos = append(goocoos, goocoo)
 		}
 	}
-	return count, bf.Data()
+	return goocoos
 }

 func handleMsgMhfEnumerateGuacot(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfEnumerateGuacot)
 	bf := byteframe.NewByteFrame()
-	count, data := getGookData(s, s.charID)
-	bf.WriteUint16(count)
-	bf.WriteBytes(data)
+	goocoos := getGoocooData(s, s.charID)
+	bf.WriteUint16(uint16(len(goocoos)))
+	bf.WriteUint16(0)
+	for _, goocoo := range goocoos {
+		bf.WriteBytes(goocoo)
+	}
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

@@ -1004,7 +996,7 @@ func handleMsgMhfUpdateGuacot(s *Session, p mhfpacket.MHFPacket) {
 			bf := byteframe.NewByteFrame()
 			bf.WriteUint32(goocoo.Index)
 			for i := range goocoo.Data1 {
-				bf.WriteUint16(goocoo.Data1[i])
+				bf.WriteInt16(goocoo.Data1[i])
 			}
 			for i := range goocoo.Data2 {
 				bf.WriteUint32(goocoo.Data2[i])
@@ -1155,9 +1147,9 @@ func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint32(uint32(TimeWeekStart().Unix())) // Start
 	bf.WriteUint32(uint32(TimeWeekNext().Unix()))  // End
-	bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthStatusOverride)
-	bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthIDOverride)
-	for i, m := range s.server.erupeConfig.DevModeOptions.EarthMonsterOverride {
+	bf.WriteInt32(s.server.erupeConfig.EarthStatus)
+	bf.WriteInt32(s.server.erupeConfig.EarthID)
+	for i, m := range s.server.erupeConfig.EarthMonsters {
 		if _config.ErupeConfig.RealClientMode <= _config.G9 {
 			if i == 3 {
 				break
--- a/server/channelserver/handlers_cast_binary.go
+++ b/server/channelserver/handlers_cast_binary.go
@@ -371,7 +371,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
 		}
 	}

-	if s.server.erupeConfig.DevModeOptions.QuestDebugTools == true && s.server.erupeConfig.DevMode {
+	if s.server.erupeConfig.DebugOptions.QuestTools {
 		if pkt.BroadcastType == 0x03 && pkt.MessageType == 0x02 && len(pkt.RawDataPayload) > 32 {
 			// This is only correct most of the time
 			tmp.ReadBytes(20)
--- a/server/channelserver/handlers_data.go
+++ b/server/channelserver/handlers_data.go
@@ -45,7 +45,7 @@ func handleMsgMhfSavedata(s *Session, p mhfpacket.MHFPacket) {
 			doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
 			return
 		}
-		if s.server.erupeConfig.DevModeOptions.SaveDumps.RawEnabled {
+		if s.server.erupeConfig.SaveDumps.RawEnabled {
 			dumpSaveData(s, saveData, "raw-savedata")
 		}
 		s.logger.Info("Updating save with blob")
@@ -112,11 +112,11 @@ func grpToGR(n int) uint16 {
 }

 func dumpSaveData(s *Session, data []byte, suffix string) {
-	if !s.server.erupeConfig.DevModeOptions.SaveDumps.Enabled {
+	if !s.server.erupeConfig.SaveDumps.Enabled {
 		return
 	} else {
-		dir := filepath.Join(s.server.erupeConfig.DevModeOptions.SaveDumps.OutputDir, fmt.Sprintf("%d", s.charID))
-		path := filepath.Join(s.server.erupeConfig.DevModeOptions.SaveDumps.OutputDir, fmt.Sprintf("%d", s.charID), fmt.Sprintf("%d_%s.bin", s.charID, suffix))
+		dir := filepath.Join(s.server.erupeConfig.SaveDumps.OutputDir, fmt.Sprintf("%d", s.charID))
+		path := filepath.Join(s.server.erupeConfig.SaveDumps.OutputDir, fmt.Sprintf("%d", s.charID), fmt.Sprintf("%d_%s.bin", s.charID, suffix))
 		_, err := os.Stat(dir)
 		if err != nil {
 			if os.IsNotExist(err) {
--- a/server/channelserver/handlers_diva.go
+++ b/server/channelserver/handlers_diva.go
@@ -70,16 +70,16 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
 	}

 	var timestamps []uint32
-	if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.DivaEvent >= 0 {
-		if s.server.erupeConfig.DevModeOptions.DivaEvent == 0 {
+	if s.server.erupeConfig.DebugOptions.DivaOverride >= 0 {
+		if s.server.erupeConfig.DebugOptions.DivaOverride == 0 {
 			if s.server.erupeConfig.RealClientMode >= _config.Z2 {
-				doAckBufSucceed(s, pkt.AckHandle, make([]byte, 32))
-			} else {
 				doAckBufSucceed(s, pkt.AckHandle, make([]byte, 36))
+			} else {
+				doAckBufSucceed(s, pkt.AckHandle, make([]byte, 32))
 			}
 			return
 		}
-		timestamps = generateDivaTimestamps(s, uint32(s.server.erupeConfig.DevModeOptions.DivaEvent), true)
+		timestamps = generateDivaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.DivaOverride), true)
 	} else {
 		timestamps = generateDivaTimestamps(s, start, false)
 	}
--- a/server/channelserver/handlers_festa.go
+++ b/server/channelserver/handlers_festa.go
@@ -36,7 +36,7 @@ func handleMsgMhfLoadMezfesData(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfEnumerateRanking)
 	bf := byteframe.NewByteFrame()
-	state := s.server.erupeConfig.DevModeOptions.TournamentEvent
+	state := s.server.erupeConfig.DebugOptions.TournamentOverride
 	// Unk
 	// Unk
 	// Start?
@@ -173,12 +173,12 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 	}

 	var timestamps []uint32
-	if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.FestaEvent >= 0 {
-		if s.server.erupeConfig.DevModeOptions.FestaEvent == 0 {
+	if s.server.erupeConfig.DebugOptions.FestaOverride >= 0 {
+		if s.server.erupeConfig.DebugOptions.FestaOverride == 0 {
 			doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
 			return
 		}
-		timestamps = generateFestaTimestamps(s, uint32(s.server.erupeConfig.DevModeOptions.FestaEvent), true)
+		timestamps = generateFestaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.FestaOverride), true)
 	} else {
 		timestamps = generateFestaTimestamps(s, start, false)
 	}
@@ -309,8 +309,8 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 		ps.Uint8(bf, "", true) // Guild Name
 	}

+	bf.WriteUint32(0) // Clan goal
 	// Final bonus rates
-	bf.WriteUint32(1)    // 5000-Infinity?
 	bf.WriteUint32(5000) // 5000+ souls
 	bf.WriteUint32(2000) // 2000-4999 souls
 	bf.WriteUint32(1000) // 1000-1999 souls
@@ -349,7 +349,6 @@ func handleMsgMhfStateFestaU(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteBool(false)
 		bf.WriteBool(true)
 	}
-	bf.WriteUint16(0) // Unk
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

@@ -364,18 +363,18 @@ func handleMsgMhfStateFestaG(s *Session, p mhfpacket.MHFPacket) {
 	resp := byteframe.NewByteFrame()
 	if err != nil || guild == nil || applicant {
 		resp.WriteUint32(0)
-		resp.WriteUint32(0)
-		resp.WriteUint32(0xFFFFFFFF)
-		resp.WriteUint32(0)
-		resp.WriteUint32(0)
+		resp.WriteInt32(0)
+		resp.WriteInt32(-1)
+		resp.WriteInt32(0)
+		resp.WriteInt32(0)
 		doAckBufSucceed(s, pkt.AckHandle, resp.Data())
 		return
 	}
 	resp.WriteUint32(guild.Souls)
-	resp.WriteUint32(1) // unk
-	resp.WriteUint32(1) // unk
-	resp.WriteUint32(1) // unk, rank?
-	resp.WriteUint32(1) // unk
+	resp.WriteInt32(0) // unk
+	resp.WriteInt32(1) // unk, rank?
+	resp.WriteInt32(0) // unk
+	resp.WriteInt32(0) // unk
 	doAckBufSucceed(s, pkt.AckHandle, resp.Data())
 }

@@ -391,13 +390,19 @@ func handleMsgMhfEnumerateFestaMember(s *Session, p mhfpacket.MHFPacket) {
 		doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
 		return
 	}
-	bf := byteframe.NewByteFrame()
-	bf.WriteUint16(uint16(len(members)))
-	bf.WriteUint16(0) // Unk
 	sort.Slice(members, func(i, j int) bool {
 		return members[i].Souls > members[j].Souls
 	})
+	var validMembers []*GuildMember
 	for _, member := range members {
+		if member.Souls > 0 {
+			validMembers = append(validMembers, member)
+		}
+	}
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint16(uint16(len(validMembers)))
+	bf.WriteUint16(0) // Unk
+	for _, member := range validMembers {
 		bf.WriteUint32(member.CharID)
 		bf.WriteUint32(member.Souls)
 	}
--- a/server/channelserver/handlers_guild.go
+++ b/server/channelserver/handlers_guild.go
@@ -1427,7 +1427,7 @@ func handleMsgMhfEnumerateGuildMember(s *Session, p mhfpacket.MHFPacket) {

 	bf := byteframe.NewByteFrame()

-	bf.WriteUint16(guild.MemberCount)
+	bf.WriteUint16(uint16(len(guildMembers)))

 	sort.Slice(guildMembers[:], func(i, j int) bool {
 		return guildMembers[i].OrderIndex < guildMembers[j].OrderIndex
@@ -1460,7 +1460,7 @@ func handleMsgMhfEnumerateGuildMember(s *Session, p mhfpacket.MHFPacket) {
 	}

 	if guild.AllianceID > 0 {
-		bf.WriteUint16(alliance.TotalMembers - guild.MemberCount)
+		bf.WriteUint16(alliance.TotalMembers - uint16(len(guildMembers)))
 		if guild.ID != alliance.ParentGuildID {
 			mems, err := GetGuildMembers(s, alliance.ParentGuildID, false)
 			if err != nil {
--- a/server/channelserver/handlers_house.go
+++ b/server/channelserver/handlers_house.go
@@ -215,10 +215,12 @@ func handleMsgMhfLoadHouse(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteBytes(houseFurniture)
 	case 10: // Garden
 		bf.WriteBytes(garden)
-		c, d := getGookData(s, pkt.CharID)
-		bf.WriteUint16(c)
+		goocoos := getGoocooData(s, pkt.CharID)
+		bf.WriteUint16(uint16(len(goocoos)))
 		bf.WriteUint16(0)
-		bf.WriteBytes(d)
+		for _, goocoo := range goocoos {
+			bf.WriteBytes(goocoo)
+		}
 	}
 	if len(bf.Data()) == 0 {
 		doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
--- a/server/channelserver/handlers_object.go
+++ b/server/channelserver/handlers_object.go
@@ -42,7 +42,7 @@ func handleMsgSysDeleteObject(s *Session, p mhfpacket.MHFPacket) {}

 func handleMsgSysPositionObject(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysPositionObject)
-	if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.LogInboundMessages {
+	if s.server.erupeConfig.DebugOptions.LogInboundMessages {
 		fmt.Printf("[%s] with objectID [%d] move to (%f,%f,%f)\n\n", s.Name, pkt.ObjID, pkt.X, pkt.Y, pkt.Z)
 	}
 	s.stage.Lock()
--- a/server/channelserver/handlers_quest.go
+++ b/server/channelserver/handlers_quest.go
@@ -20,7 +20,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysGetFile)

 	if pkt.IsScenario {
-		if s.server.erupeConfig.DevModeOptions.QuestDebugTools && s.server.erupeConfig.DevMode {
+		if s.server.erupeConfig.DebugOptions.QuestTools {
 			s.logger.Debug(
 				"Scenario",
 				zap.Uint8("CategoryID", pkt.ScenarioIdentifer.CategoryID),
@@ -40,7 +40,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 		}
 		doAckBufSucceed(s, pkt.AckHandle, data)
 	} else {
-		if s.server.erupeConfig.DevModeOptions.QuestDebugTools && s.server.erupeConfig.DevMode {
+		if s.server.erupeConfig.DebugOptions.QuestTools {
 			s.logger.Debug(
 				"Quest",
 				zap.String("Filename", pkt.Filename),
--- a/server/channelserver/handlers_tower.go
+++ b/server/channelserver/handlers_tower.go
@@ -105,7 +105,7 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfPostTowerInfo(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfPostTowerInfo)

-	if s.server.erupeConfig.DevModeOptions.QuestDebugTools {
+	if s.server.erupeConfig.DebugOptions.QuestTools {
 		s.logger.Debug(
 			p.Opcode().String(),
 			zap.Uint32("InfoType", pkt.InfoType),
@@ -328,7 +328,7 @@ func handleMsgMhfGetTenrouirai(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfPostTenrouirai(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfPostTenrouirai)

-	if s.server.erupeConfig.DevModeOptions.QuestDebugTools {
+	if s.server.erupeConfig.DebugOptions.QuestTools {
 		s.logger.Debug(
 			p.Opcode().String(),
 			zap.Uint8("Unk0", pkt.Unk0),
@@ -442,7 +442,7 @@ func handleMsgMhfGetGemInfo(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfPostGemInfo(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfPostGemInfo)

-	if s.server.erupeConfig.DevModeOptions.QuestDebugTools {
+	if s.server.erupeConfig.DebugOptions.QuestTools {
 		s.logger.Debug(
 			p.Opcode().String(),
 			zap.Uint32("Op", pkt.Op),
--- a/server/channelserver/sys_session.go
+++ b/server/channelserver/sys_session.go
@@ -253,13 +253,9 @@ func ignored(opcode network.PacketID) bool {
 }

 func (s *Session) logMessage(opcode uint16, data []byte, sender string, recipient string) {
-	if !s.server.erupeConfig.DevMode {
+	if sender == "Server" && !s.server.erupeConfig.DebugOptions.LogOutboundMessages {
 		return
-	}
-
-	if sender == "Server" && !s.server.erupeConfig.DevModeOptions.LogOutboundMessages {
-		return
-	} else if sender != "Server" && !s.server.erupeConfig.DevModeOptions.LogInboundMessages {
+	} else if sender != "Server" && !s.server.erupeConfig.DebugOptions.LogInboundMessages {
 		return
 	}

@@ -277,8 +273,8 @@ func (s *Session) logMessage(opcode uint16, data []byte, sender string, recipien
 		fmt.Printf("[%s] -> [%s]\n", sender, recipient)
 	}
 	fmt.Printf("Opcode: %s\n", opcodePID)
-	if s.server.erupeConfig.DevModeOptions.LogMessageData {
-		if len(data) <= s.server.erupeConfig.DevModeOptions.MaxHexdumpLength {
+	if s.server.erupeConfig.DebugOptions.LogMessageData {
+		if len(data) <= s.server.erupeConfig.DebugOptions.MaxHexdumpLength {
 			fmt.Printf("Data [%d bytes]:\n%s\n", len(data), hex.Dump(data))
 		} else {
 			fmt.Printf("Data [%d bytes]: (Too long!)\n\n", len(data))
--- a/server/entranceserver/crypto.go
+++ b/server/entranceserver/crypto.go
@@ -12,45 +12,40 @@ var (

 // CalcSum32 calculates the custom MHF "sum32" checksum of the given data.
 func CalcSum32(data []byte) uint32 {
-	tableIdx0 := int(len(data) & 0xFF)
-	tableIdx1 := int(data[len(data)>>1] & 0xFF)
-
+	tableIdx0 := (len(data) + 1) & 0xFF
+	tableIdx1 := int((data[len(data)>>1] + 1) & 0xFF)
 	out := make([]byte, 4)
 	for i := 0; i < len(data); i++ {
-		tableIdx0++
-		tableIdx1++
-
-		tmp := byte((_sum32Table1[tableIdx1%9] ^ _sum32Table0[tableIdx0%7]) ^ data[i])
-		out[i&3] = (out[i&3] + tmp) & 0xFF
+		key := data[i] ^ _sum32Table0[(tableIdx0+i)%7] ^ _sum32Table1[(tableIdx1+i)%9]
+		out[i&3] = (out[i&3] + key) & 0xFF
 	}
-
 	return binary.BigEndian.Uint32(out)
 }

+func rotate(k *uint32) {
+	*k = uint32(((54323 * uint(*k)) + 1) & 0xFFFFFFFF)
+}
+
 // EncryptBin8 encrypts the given data using MHF's "binary8" encryption.
 func EncryptBin8(data []byte, key byte) []byte {
-	curKey := uint32(((54323 * uint(key)) + 1) & 0xFFFFFFFF)
-
+	_key := uint32(key)
 	var output []byte
 	for i := 0; i < len(data); i++ {
-		tmp := (_bin8Key[i&7] ^ byte((curKey>>13)&0xFF))
+		rotate(&_key)
+		tmp := _bin8Key[i&7] ^ byte((_key>>13)&0xFF)
 		output = append(output, data[i]^tmp)
-		curKey = uint32(((54323 * uint(curKey)) + 1) & 0xFFFFFFFF)
 	}
-
 	return output
 }

 // DecryptBin8 decrypts the given MHF "binary8" data.
 func DecryptBin8(data []byte, key byte) []byte {
-	curKey := uint32(((54323 * uint(key)) + 1) & 0xFFFFFFFF)
-
+	_key := uint32(key)
 	var output []byte
 	for i := 0; i < len(data); i++ {
-		tmp := (data[i] ^ byte((curKey>>13)&0xFF))
+		rotate(&_key)
+		tmp := data[i] ^ byte((_key>>13)&0xFF)
 		output = append(output, tmp^_bin8Key[i&7])
-		curKey = uint32(((54323 * uint(curKey)) + 1) & 0xFFFFFFFF)
 	}
-
 	return output
 }
--- a/server/entranceserver/entrance_server.go
+++ b/server/entranceserver/entrance_server.go
@@ -111,7 +111,7 @@ func (s *Server) handleEntranceServerConnection(conn net.Conn) {
 		return
 	}

-	if s.erupeConfig.DevMode && s.erupeConfig.DevModeOptions.LogInboundMessages {
+	if s.erupeConfig.DebugOptions.LogInboundMessages {
 		fmt.Printf("[Client] -> [Server]\nData [%d bytes]:\n%s\n", len(pkt), hex.Dump(pkt))
 	}

--- a/server/entranceserver/make_resp.go
+++ b/server/entranceserver/make_resp.go
@@ -47,20 +47,15 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte {
 			bf.WriteUint8(si.Recommended)
 		}

-		if s.erupeConfig.RealClientMode <= _config.F5 {
-			combined := append(stringsupport.UTF8ToSJIS(si.Name), []byte{0x00}...)
-			combined = append(combined, stringsupport.UTF8ToSJIS(si.Description)...)
-			bf.WriteBytes(stringsupport.PaddedString(string(combined), 65, false))
-		} else if s.erupeConfig.RealClientMode <= _config.GG {
-			combined := append(stringsupport.UTF8ToSJIS(si.Name), []byte{0x00}...)
-			combined = append(combined, stringsupport.UTF8ToSJIS(si.Description)...)
-			bf.WriteUint8(uint8(len(combined)))
-			bf.WriteBytes(combined)
+		fullName := append(append(stringsupport.UTF8ToSJIS(si.Name), []byte{0x00}...), stringsupport.UTF8ToSJIS(si.Description)...)
+		if s.erupeConfig.RealClientMode >= _config.G1 && s.erupeConfig.RealClientMode <= _config.G5 {
+			bf.WriteUint8(uint8(len(fullName)))
+			bf.WriteBytes(fullName)
 		} else {
-			bf.WriteUint8(0) // Prevents malformed server name
-			combined := append(stringsupport.UTF8ToSJIS(si.Name), []byte{0x00}...)
-			combined = append(combined, stringsupport.UTF8ToSJIS(si.Description)...)
-			bf.WriteBytes(stringsupport.PaddedString(string(combined), 65, false))
+			if s.erupeConfig.RealClientMode >= _config.G51 {
+				bf.WriteUint8(0) // Ignored
+			}
+			bf.WriteBytes(stringsupport.PaddedString(string(fullName), 65, false))
 		}

 		if s.erupeConfig.RealClientMode >= _config.GG {
@@ -69,8 +64,8 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte {

 		for channelIdx, ci := range si.Channels {
 			sid = (4096 + serverIdx*256) + (16 + channelIdx)
-			if _config.ErupeConfig.DevMode && _config.ErupeConfig.ProxyPort != 0 {
-				bf.WriteUint16(_config.ErupeConfig.ProxyPort)
+			if _config.ErupeConfig.DebugOptions.ProxyPort != 0 {
+				bf.WriteUint16(_config.ErupeConfig.DebugOptions.ProxyPort)
 			} else {
 				bf.WriteUint16(ci.Port)
 			}
@@ -136,7 +131,7 @@ func makeSv2Resp(config *_config.Config, s *Server, local bool) []byte {
 	}
 	rawServerData := encodeServerInfo(config, s, local)

-	if s.erupeConfig.DevMode && s.erupeConfig.DevModeOptions.LogOutboundMessages {
+	if s.erupeConfig.DebugOptions.LogOutboundMessages {
 		fmt.Printf("[Server] -> [Client]\nData [%d bytes]:\n%s\n", len(rawServerData), hex.Dump(rawServerData))
 	}

@@ -168,7 +163,7 @@ func makeUsrResp(pkt []byte, s *Server) []byte {
 		}
 	}

-	if s.erupeConfig.DevMode && s.erupeConfig.DevModeOptions.LogOutboundMessages {
+	if s.erupeConfig.DebugOptions.LogOutboundMessages {
 		fmt.Printf("[Server] -> [Client]\nData [%d bytes]:\n%s\n", len(resp.Data()), hex.Dump(resp.Data()))
 	}

--- a/server/signserver/dbutils.go
+++ b/server/signserver/dbutils.go
@@ -231,7 +231,7 @@ func (s *Server) validateLogin(user string, pass string) (uint32, RespID) {
 	if err != nil {
 		if err == sql.ErrNoRows {
 			s.logger.Info("User not found", zap.String("User", user))
-			if s.erupeConfig.DevMode && s.erupeConfig.DevModeOptions.AutoCreateAccount {
+			if s.erupeConfig.AutoCreateAccount {
 				uid, err = s.registerDBAccount(user, pass)
 				if err == nil {
 					return uid, SIGN_SUCCESS
--- a/server/signserver/dsgn_resp.go
+++ b/server/signserver/dsgn_resp.go
@@ -72,7 +72,7 @@ func (s *Session) makeSignResponse(uid uint32) []byte {
 		bf.WriteUint32(char.ID)

 		// Exp, HR[x] is split by 0, 1, 30, 50, 99, 299, 998, 999
-		if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.MaxLauncherHR {
+		if s.server.erupeConfig.DebugOptions.MaxLauncherHR {
 			bf.WriteUint16(999)
 		} else {
 			bf.WriteUint16(char.HRP)
@@ -144,20 +144,38 @@ func (s *Session) makeSignResponse(uid uint32) []byte {
 		s.server.db.QueryRow("SELECT psn_id FROM users WHERE id = $1", uid).Scan(&psnUser)
 		bf.WriteBytes(stringsupport.PaddedString(psnUser, 20, true))
 	}
-	bf.WriteUint16(0xCA10)
-	bf.WriteUint16(0x4E20)
-	ps.Uint16(bf, "", false) // unk key
-	bf.WriteUint8(0x00)
-	bf.WriteUint16(0xCA11)
-	bf.WriteUint16(0x0001)
-	bf.WriteUint16(0x4E20)
-	ps.Uint16(bf, "", false) // unk ipv4
+
+	bf.WriteUint16(s.server.erupeConfig.DebugOptions.CapLink.Values[0])
+	if s.server.erupeConfig.DebugOptions.CapLink.Values[0] == 51728 {
+		bf.WriteUint16(s.server.erupeConfig.DebugOptions.CapLink.Values[1])
+		if s.server.erupeConfig.DebugOptions.CapLink.Values[1] == 20000 || s.server.erupeConfig.DebugOptions.CapLink.Values[1] == 20002 {
+			ps.Uint16(bf, s.server.erupeConfig.DebugOptions.CapLink.Key, false)
+		}
+	}
+	caStruct := []struct {
+		Unk0 uint8
+		Unk1 uint32
+		Unk2 string
+	}{}
+	bf.WriteUint8(uint8(len(caStruct)))
+	for i := range caStruct {
+		bf.WriteUint8(caStruct[i].Unk0)
+		bf.WriteUint32(caStruct[i].Unk1)
+		ps.Uint8(bf, caStruct[i].Unk2, false)
+	}
+	bf.WriteUint16(s.server.erupeConfig.DebugOptions.CapLink.Values[2])
+	bf.WriteUint16(s.server.erupeConfig.DebugOptions.CapLink.Values[3])
+	bf.WriteUint16(s.server.erupeConfig.DebugOptions.CapLink.Values[4])
+	if s.server.erupeConfig.DebugOptions.CapLink.Values[2] == 51729 && s.server.erupeConfig.DebugOptions.CapLink.Values[3] == 1 && s.server.erupeConfig.DebugOptions.CapLink.Values[4] == 20000 {
+		ps.Uint16(bf, fmt.Sprintf(`%s:%d`, s.server.erupeConfig.DebugOptions.CapLink.Host, s.server.erupeConfig.DebugOptions.CapLink.Port), false)
+	}
+
 	bf.WriteUint32(uint32(s.server.getReturnExpiry(uid).Unix()))
 	bf.WriteUint32(0)

 	tickets := []uint32{
-		s.server.erupeConfig.GameplayOptions.MezfesSoloTickets,
-		s.server.erupeConfig.GameplayOptions.MezfesGroupTickets,
+		s.server.erupeConfig.GameplayOptions.MezFesSoloTickets,
+		s.server.erupeConfig.GameplayOptions.MezFesGroupTickets,
 	}
 	stalls := []uint8{
 		10, 3, 6, 9, 4, 8, 5, 7,
--- a/server/signserver/session.go
+++ b/server/signserver/session.go
@@ -37,7 +37,7 @@ type Session struct {
 func (s *Session) work() {
 	pkt, err := s.cryptConn.ReadPacket()

-	if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.LogInboundMessages {
+	if s.server.erupeConfig.DebugOptions.LogInboundMessages {
 		fmt.Printf("\n[Client] -> [Server]\nData [%d bytes]:\n%s\n", len(pkt), hex.Dump(pkt))
 	}

@@ -78,7 +78,7 @@ func (s *Session) handlePacket(pkt []byte) error {
 		}
 	default:
 		s.logger.Warn("Unknown request", zap.String("reqType", reqType))
-		if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.LogInboundMessages {
+		if s.server.erupeConfig.DebugOptions.LogInboundMessages {
 			fmt.Printf("\n[Client] -> [Server]\nData [%d bytes]:\n%s\n", len(pkt), hex.Dump(pkt))
 		}
 	}
@@ -102,7 +102,7 @@ func (s *Session) authenticate(username string, password string) {
 	default:
 		bf.WriteUint8(uint8(resp))
 	}
-	if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.LogOutboundMessages {
+	if s.server.erupeConfig.DebugOptions.LogOutboundMessages {
 		fmt.Printf("\n[Server] -> [Client]\nData [%d bytes]:\n%s\n", len(bf.Data()), hex.Dump(bf.Data()))
 	}
 	_ = s.cryptConn.SendPacket(bf.Data())
--- a/server/signv2server/endpoints.go
+++ b/server/signv2server/endpoints.go
@@ -80,7 +80,7 @@ func (s *Server) newAuthData(userID uint32, userRights uint32, userTokenID uint3
 		PatchServer: s.erupeConfig.SignV2.PatchServer,
 		Notices:     []string{},
 	}
-	if s.erupeConfig.DevModeOptions.MaxLauncherHR {
+	if s.erupeConfig.DebugOptions.MaxLauncherHR {
 		for i := range resp.Characters {
 			resp.Characters[i].HR = 7
 		}
@@ -93,8 +93,8 @@ func (s *Server) newAuthData(userID uint32, userRights uint32, userTokenID uint3
 		ID:           uint32(channelserver.TimeWeekStart().Unix()),
 		Start:        uint32(channelserver.TimeWeekStart().Add(-time.Duration(s.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix()),
 		End:          uint32(channelserver.TimeWeekNext().Unix()),
-		SoloTickets:  s.erupeConfig.GameplayOptions.MezfesSoloTickets,
-		GroupTickets: s.erupeConfig.GameplayOptions.MezfesGroupTickets,
+		SoloTickets:  s.erupeConfig.GameplayOptions.MezFesSoloTickets,
+		GroupTickets: s.erupeConfig.GameplayOptions.MezFesGroupTickets,
 		Stalls:       stalls,
 	}
 	if !s.erupeConfig.HideLoginNotice {
@@ -226,7 +226,7 @@ func (s *Server) CreateCharacter(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(500)
 		return
 	}
-	if s.erupeConfig.DevModeOptions.MaxLauncherHR {
+	if s.erupeConfig.DebugOptions.MaxLauncherHR {
 		character.HR = 7
 	}
 	w.Header().Add("Content-Type", "application/json")