diff --git a/config.json b/config.json index 688a9879b..7b11421a1 100644 --- a/config.json +++ b/config.json @@ -31,7 +31,7 @@ "QuestDebugTools": false, "EarthStatusOverride": 0, "EarthIDOverride": 0, - "EarthMonsterOverride": 0, + "EarthMonsterOverride": [0, 0, 0, 0], "SaveDumps": { "Enabled": true, "OutputDir": "save-backups" diff --git a/config/config.go b/config/config.go index 12cb00316..488321357 100644 --- a/config/config.go +++ b/config/config.go @@ -112,7 +112,7 @@ type DevModeOptions struct { QuestDebugTools bool // Enable various quest debug logs EarthStatusOverride int32 EarthIDOverride int32 - EarthMonsterOverride int32 + EarthMonsterOverride []int32 SaveDumps SaveDumpOptions } diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index f4c106fcd..7886e7745 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -992,11 +992,16 @@ func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint32(uint32(TimeWeekNext().Unix())) // End bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthStatusOverride) bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthIDOverride) - bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthMonsterOverride) - bf.WriteInt32(0) - bf.WriteInt32(0) - if _config.ErupeConfig.RealClientMode >= _config.G91 { - bf.WriteInt32(0) + for i, m := range s.server.erupeConfig.DevModeOptions.EarthMonsterOverride { + if _config.ErupeConfig.RealClientMode >= _config.G91 { + if i == 3 { + break + } + } + if i == 4 { + break + } + bf.WriteInt32(m) } doAckBufSucceed(s, pkt.AckHandle, bf.Data()) }