add support for multiple Conquest War targets

This commit is contained in:
wish
2023-11-30 00:34:51 +11:00
parent 67e791be2b
commit a108a67522
3 changed files with 12 additions and 7 deletions

View File

@@ -31,7 +31,7 @@
"QuestDebugTools": false, "QuestDebugTools": false,
"EarthStatusOverride": 0, "EarthStatusOverride": 0,
"EarthIDOverride": 0, "EarthIDOverride": 0,
"EarthMonsterOverride": 0, "EarthMonsterOverride": [0, 0, 0, 0],
"SaveDumps": { "SaveDumps": {
"Enabled": true, "Enabled": true,
"OutputDir": "save-backups" "OutputDir": "save-backups"

View File

@@ -112,7 +112,7 @@ type DevModeOptions struct {
QuestDebugTools bool // Enable various quest debug logs QuestDebugTools bool // Enable various quest debug logs
EarthStatusOverride int32 EarthStatusOverride int32
EarthIDOverride int32 EarthIDOverride int32
EarthMonsterOverride int32 EarthMonsterOverride []int32
SaveDumps SaveDumpOptions SaveDumps SaveDumpOptions
} }

View File

@@ -992,11 +992,16 @@ func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(uint32(TimeWeekNext().Unix())) // End bf.WriteUint32(uint32(TimeWeekNext().Unix())) // End
bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthStatusOverride) bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthStatusOverride)
bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthIDOverride) bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthIDOverride)
bf.WriteInt32(s.server.erupeConfig.DevModeOptions.EarthMonsterOverride) for i, m := range s.server.erupeConfig.DevModeOptions.EarthMonsterOverride {
bf.WriteInt32(0) if _config.ErupeConfig.RealClientMode >= _config.G91 {
bf.WriteInt32(0) if i == 3 {
if _config.ErupeConfig.RealClientMode >= _config.G91 { break
bf.WriteInt32(0) }
}
if i == 4 {
break
}
bf.WriteInt32(m)
} }
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }