simplify config

This commit is contained in:
wish
2023-12-31 12:54:18 +11:00
parent 0ea0dc217b
commit 32dee9039e
4 changed files with 13 additions and 13 deletions

View File

@@ -31,9 +31,9 @@
"LogOutboundMessages": false, "LogOutboundMessages": false,
"LogMessageData": false, "LogMessageData": false,
"MaxHexdumpLength": 256, "MaxHexdumpLength": 256,
"DivaEvent": 0, "DivaOverride": 0,
"FestaEvent": -1, "FestaOverride": -1,
"TournamentEvent": 0, "TournamentOverride": 0,
"DisableTokenCheck": false, "DisableTokenCheck": false,
"QuestTools": false, "QuestTools": false,
"ProxyPort": 0, "ProxyPort": 0,

View File

@@ -113,9 +113,9 @@ type DebugOptions struct {
LogOutboundMessages bool // Log all messages sent to the clients LogOutboundMessages bool // Log all messages sent to the clients
LogMessageData bool // Log all bytes transferred as a hexdump LogMessageData bool // Log all bytes transferred as a hexdump
MaxHexdumpLength int // Maximum number of bytes printed when logs are enabled MaxHexdumpLength int // Maximum number of bytes printed when logs are enabled
DivaEvent int // Diva Defense event status DivaOverride int // Diva Defense event status
FestaEvent int // Hunter's Festa event status FestaOverride int // Hunter's Festa event status
TournamentEvent int // VS Tournament event status TournamentOverride int // VS Tournament event status
DisableTokenCheck bool // Disables checking login token exists in the DB (security risk!) DisableTokenCheck bool // Disables checking login token exists in the DB (security risk!)
QuestTools bool // Enable various quest debug logs QuestTools bool // Enable various quest debug logs
ProxyPort uint16 // Forces the game to connect to a channel server proxy ProxyPort uint16 // Forces the game to connect to a channel server proxy

View File

@@ -70,8 +70,8 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
} }
var timestamps []uint32 var timestamps []uint32
if s.server.erupeConfig.DebugOptions.DivaEvent >= 0 { if s.server.erupeConfig.DebugOptions.DivaOverride >= 0 {
if s.server.erupeConfig.DebugOptions.DivaEvent == 0 { if s.server.erupeConfig.DebugOptions.DivaOverride == 0 {
if s.server.erupeConfig.RealClientMode >= _config.Z2 { if s.server.erupeConfig.RealClientMode >= _config.Z2 {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 36)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 36))
} else { } else {
@@ -79,7 +79,7 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
} }
return return
} }
timestamps = generateDivaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.DivaEvent), true) timestamps = generateDivaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.DivaOverride), true)
} else { } else {
timestamps = generateDivaTimestamps(s, start, false) timestamps = generateDivaTimestamps(s, start, false)
} }

View File

@@ -36,7 +36,7 @@ func handleMsgMhfLoadMezfesData(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfEnumerateRanking) pkt := p.(*mhfpacket.MsgMhfEnumerateRanking)
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
state := s.server.erupeConfig.DebugOptions.TournamentEvent state := s.server.erupeConfig.DebugOptions.TournamentOverride
// Unk // Unk
// Unk // Unk
// Start? // Start?
@@ -173,12 +173,12 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
} }
var timestamps []uint32 var timestamps []uint32
if s.server.erupeConfig.DebugOptions.FestaEvent >= 0 { if s.server.erupeConfig.DebugOptions.FestaOverride >= 0 {
if s.server.erupeConfig.DebugOptions.FestaEvent == 0 { if s.server.erupeConfig.DebugOptions.FestaOverride == 0 {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
return return
} }
timestamps = generateFestaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.FestaEvent), true) timestamps = generateFestaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.FestaOverride), true)
} else { } else {
timestamps = generateFestaTimestamps(s, start, false) timestamps = generateFestaTimestamps(s, start, false)
} }