Merge remote-tracking branch 'origin/main' into fix/dynamic-tune-vals

This commit is contained in:
wish
2023-05-23 21:54:27 +10:00
3 changed files with 12 additions and 12 deletions

View File

@@ -26,6 +26,7 @@
"MezFesAlt": false, "MezFesAlt": false,
"DisableTokenCheck": false, "DisableTokenCheck": false,
"QuestDebugTools": false, "QuestDebugTools": false,
"EarthStatusOverride": 0,
"SaveDumps": { "SaveDumps": {
"Enabled": true, "Enabled": true,
"OutputDir": "savedata" "OutputDir": "savedata"

View File

@@ -51,6 +51,7 @@ type DevModeOptions struct {
MezFesAlt bool // Swaps out Volpakkun for Tokotoko MezFesAlt bool // Swaps out Volpakkun for Tokotoko
DisableTokenCheck bool // Disables checking login token exists in the DB (security risk!) DisableTokenCheck bool // Disables checking login token exists in the DB (security risk!)
QuestDebugTools bool // Enable various quest debug logs QuestDebugTools bool // Enable various quest debug logs
EarthStatusOverride int32
SaveDumps SaveDumpOptions SaveDumps SaveDumpOptions
} }

View File

@@ -1608,18 +1608,16 @@ func handleMsgMhfKickExportForce(s *Session, p mhfpacket.MHFPacket) {}
func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfGetEarthStatus) pkt := p.(*mhfpacket.MsgMhfGetEarthStatus)
bf := byteframe.NewByteFrame()
// TODO(Andoryuuta): Track down format for this data, bf.WriteUint32(uint32(TimeWeekStart().Unix())) // Start
// it can somehow be parsed as 8*uint32 chunks if the header is right. bf.WriteUint32(uint32(TimeWeekNext().Unix())) // End
/* bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthStatusOverride)
BEFORE ack-refactor: bf.WriteInt32(21)
resp := byteframe.NewByteFrame() bf.WriteInt32(0)
resp.WriteUint32(0) bf.WriteInt32(0)
resp.WriteUint32(0) bf.WriteInt32(0)
bf.WriteInt32(0)
s.QueueAck(pkt.AckHandle, resp.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
*/
doAckBufSucceed(s, pkt.AckHandle, []byte{})
} }
func handleMsgMhfRegistSpabiTime(s *Session, p mhfpacket.MHFPacket) {} func handleMsgMhfRegistSpabiTime(s *Session, p mhfpacket.MHFPacket) {}