From a065643783a34ba7e41c664895d13a2f66dcb95b Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 02:50:38 -0400 Subject: [PATCH 01/27] feature: JPK encryption and databased events --- common/byteframe/byteframe.go | 4 + common/decryption/jpk.go | 117 +++++++++++++++++ patch-schema/event_quests.sql | 11 ++ server/channelserver/handlers_quest.go | 166 +++++++++++++++++++++++-- 4 files changed, 285 insertions(+), 13 deletions(-) create mode 100644 common/decryption/jpk.go create mode 100644 patch-schema/event_quests.sql diff --git a/common/byteframe/byteframe.go b/common/byteframe/byteframe.go index ffeb66dc1..357595fe0 100644 --- a/common/byteframe/byteframe.go +++ b/common/byteframe/byteframe.go @@ -138,6 +138,10 @@ func (b *ByteFrame) DataFromCurrent() []byte { return b.buf[b.index:b.usedSize] } +func (b *ByteFrame) Index() uint { + return b.index +} + // SetLE sets the byte order to litte endian. func (b *ByteFrame) SetLE() { b.byteOrder = binary.LittleEndian diff --git a/common/decryption/jpk.go b/common/decryption/jpk.go new file mode 100644 index 000000000..e40c97a43 --- /dev/null +++ b/common/decryption/jpk.go @@ -0,0 +1,117 @@ +package decryption + +/* + This code is HEAVILY based from + https://github.com/Chakratos/ReFrontier/blob/master/ReFrontier/Unpack.cs +*/ + +import ( + "erupe-ce/common/byteframe" + "io" +) + +var m_shiftIndex int = 0 +var m_flag byte = byte(0) + +func UnpackSimple(data []byte) []byte { + m_shiftIndex = 0 + m_flag = byte(0) + + bf := byteframe.NewByteFrameFromBytes(data) + bf.SetLE() + header := bf.ReadUint32() + + println("Decrypting") + + if header == 0x1A524B4A { + bf.Seek(0x2, io.SeekCurrent) + jpkType := bf.ReadUint16() + println("JPK Type: ", jpkType) + + switch jpkType { + case 3: + startOffset := bf.ReadInt32() + outSize := bf.ReadInt32() + outBuffer := make([]byte, outSize) + bf.Seek(int64(startOffset), io.SeekStart) + ProcessDecode(bf, outBuffer) + + return outBuffer + } + } + + println("Skipping") + + return data +} + +func ProcessDecode(data *byteframe.ByteFrame, outBuffer []byte) { + outIndex := 0 + + for int(data.Index()) < len(data.Data()) && outIndex < len(outBuffer)-1 { + if JPKBitshift(data) == 0 { + outBuffer[outIndex] = ReadByte(data) + outIndex++ + continue + } else { + if JPKBitshift(data) == 0 { + len := (JPKBitshift(data) << 1) | JPKBitshift(data) + off := ReadByte(data) + JPKCopy(outBuffer, int(off), int(len)+3, &outIndex) + continue + } else { + hi := ReadByte(data) + lo := ReadByte(data) + var len int = int((hi & 0xE0)) >> 5 + var off int = ((int(hi) & 0x1F) << 8) | int(lo) + if len != 0 { + JPKCopy(outBuffer, off, len+2, &outIndex) + continue + } else { + if JPKBitshift(data) == 0 { + len := (JPKBitshift(data) << 3) | (JPKBitshift(data) << 2) | (JPKBitshift(data) << 1) | JPKBitshift(data) + JPKCopy(outBuffer, off, int(len)+2+8, &outIndex) + continue + } else { + temp := ReadByte(data) + if temp == 0xFF { + for i := 0; i < off+0x1B; i++ { + outBuffer[outIndex] = ReadByte(data) + outIndex++ + continue + } + } else { + JPKCopy(outBuffer, off, int(temp)+0x1a, &outIndex) + } + } + } + } + } + } +} + +func JPKBitshift(data *byteframe.ByteFrame) byte { + m_shiftIndex-- + + if m_shiftIndex < 0 { + m_shiftIndex = 7 + m_flag = ReadByte(data) + } + + return (byte)((m_flag >> m_shiftIndex) & 1) +} + +func JPKCopy(outBuffer []byte, offset int, length int, index *int) { + for i := 0; i < length; i++ { + outBuffer[*index] = outBuffer[*index-offset-1] + *index++ + } +} + +func ReadByte(bf *byteframe.ByteFrame) byte { + value := bf.ReadUint8() + if value < 0 { + println("Not implemented") + } + return byte(value) +} diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql new file mode 100644 index 000000000..85e7bccfe --- /dev/null +++ b/patch-schema/event_quests.sql @@ -0,0 +1,11 @@ +BEGIN; + +create table if not exists event_quests +( + id serial, + max_players integer, + quest_type integer, + quest_id uint16 not null +); + +END; \ No newline at end of file diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 8f40f7539..eb984f028 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -1,14 +1,17 @@ package channelserver import ( + "database/sql" "erupe-ce/common/byteframe" + "erupe-ce/common/decryption" "erupe-ce/network/mhfpacket" "fmt" - "go.uber.org/zap" "io" "os" "path/filepath" "time" + + "go.uber.org/zap" ) func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { @@ -79,34 +82,170 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } +func readOriginalPointers(string_pointer int32, quest []byte) []byte { + file_bytes := byteframe.NewByteFrameFromBytes(quest) + file_bytes.SetLE() + file_bytes.Seek(int64(string_pointer), io.SeekStart) + + quest_name_pointer := file_bytes.ReadInt32() + quest_main_pointer := file_bytes.ReadInt32() + quest_a_pointer := file_bytes.ReadInt32() + quest_b_pointer := file_bytes.ReadInt32() + quest_clear_pointer := file_bytes.ReadInt32() + quest_failure_pointer := file_bytes.ReadInt32() + quest_contractor_pointer := file_bytes.ReadInt32() + quest_description_pointer := file_bytes.ReadInt32() + //Use String header pointers to seek to string and then read null terminated string + file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) + quest_name_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) + quest_main_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_a_pointer), io.SeekStart) + quest_a_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_b_pointer), io.SeekStart) + quest_b_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_clear_pointer), io.SeekStart) + quest_clear_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_failure_pointer), io.SeekStart) + quest_failure_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_contractor_pointer), io.SeekStart) + quest_contractor_string := file_bytes.ReadNullTerminatedBytes() + file_bytes.Seek(int64(quest_description_pointer), io.SeekStart) + quest_description_string := file_bytes.ReadNullTerminatedBytes() + + new_pointers := byteframe.NewByteFrame() + new_pointers.SetLE() + pointer_start := 352 + + new_pointers.WriteInt32(int32(pointer_start)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + 1)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + 2)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + 3)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + 26)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + 5)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + 6)) + new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + len(quest_contractor_string) + 7)) + + new_pointers.WriteNullTerminatedBytes(quest_name_string) + new_pointers.WriteNullTerminatedBytes(quest_main_string) + new_pointers.WriteNullTerminatedBytes(quest_a_string) + new_pointers.WriteNullTerminatedBytes(quest_b_string) + new_pointers.WriteNullTerminatedBytes(quest_clear_string) + new_pointers.WriteNullTerminatedBytes(quest_failure_string) + new_pointers.WriteNullTerminatedBytes(quest_contractor_string) + new_pointers.WriteNullTerminatedBytes(quest_description_string) + new_pointers.WriteUint8(18) + new_pointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) + + return new_pointers.Data() +} + +func loadQuestFile(s *Session, quest_id string) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", quest_id))) + + if err != nil { + s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, quest_id)) + return nil + } + + println(fmt.Sprintf("quests/%s.bin", quest_id)) + decrypted := decryption.UnpackSimple(file) + os.WriteFile(fmt.Sprintf("%s.bin", quest_id), decrypted, 0644) + + println("Reading quest file " + quest_id) + + file_bytes := byteframe.NewByteFrameFromBytes(decrypted) + file_bytes.SetLE() + file_bytes.Seek(0, io.SeekStart) + + data_pointer := file_bytes.ReadInt32() + file_bytes.Seek(int64(data_pointer), io.SeekStart) + + // Read the quest data. + quest_body := file_bytes.ReadBytes(320) + + quest_pointer := byteframe.NewByteFrameFromBytes(quest_body) + quest_pointer.SetLE() + + quest_pointer.Seek(40, io.SeekStart) + string_pointer := quest_pointer.ReadInt32() + + strings := readOriginalPointers(string_pointer, decrypted) + + body := byteframe.NewByteFrame() + body.WriteBytes(quest_body) + body.Seek(0, io.SeekEnd) + body.WriteBytes(strings) + + return body.Data() +} + +func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { + var id int32 + var max_players, quest_type, quest_id uint16 + rows.Scan(&id, &max_players, &quest_type, &quest_id) + + bf := byteframe.NewByteFrame() + bf.SetLE() + bf.WriteInt32(id) + bf.WriteInt32(0) + bf.WriteBytes([]byte{0x0F, byte(max_players), byte(quest_type), 0x01}) + bf.WriteUint16(0) + bf.WriteUint16(0) + bf.WriteBytes([]byte{0x00, 0x01}) + bf.WriteUint16(0) + bf.WriteBytes([]byte{0x02, 0x00}) + + data := loadQuestFile(s, fmt.Sprintf("%d", quest_id)+"d0") + + if data == nil { + return nil, fmt.Errorf("failed to load quest file") + } + + bf.WriteBytes(data) + + // update checksum + bf.Seek(21, io.SeekStart) + bf.WriteUint8(uint8(len(bf.Data()) - 553)) + + // overwrite bytes at pos 62 + bf.Seek(62, io.SeekStart) + bf.WriteInt16(320) + + return bf.Data(), nil +} + func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfEnumerateQuest) var totalCount, returnedCount uint16 bf := byteframe.NewByteFrame() bf.WriteUint16(0) - filepath.Walk(fmt.Sprintf("%s/events/", s.server.erupeConfig.BinPath), func(path string, info os.FileInfo, err error) error { + + rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id ASC") + + // Loop through each row and load the quest entry if it exists. + for rows.Next() { + var pointer []byte + var max_players, quest_type, checksum, quest_id uint16 + rows.Scan(&pointer, &max_players, &quest_type, &checksum, &quest_id) + + data, err := makeEventQuest(s, rows) + if err != nil { - return err - } else if info.IsDir() { - return nil - } - data, err := os.ReadFile(path) - if err != nil { - return err + continue } else { if len(data) > 850 || len(data) < 400 { - return nil // Could be more or less strict with size limits + continue } else { totalCount++ if totalCount > pkt.Offset && len(bf.Data()) < 60000 { returnedCount++ bf.WriteBytes(data) - return nil + continue } } } - return nil - }) + } type tuneValue struct { ID uint16 @@ -549,6 +688,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(pkt.Offset) bf.Seek(0, io.SeekStart) bf.WriteUint16(returnedCount) + doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } From 99bbb08758b10fa7aa05308ba113ae01e84eac31 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 02:53:45 -0400 Subject: [PATCH 02/27] refactor: Remove debug coded --- config.json | 4 ++-- server/channelserver/handlers_quest.go | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config.json b/config.json index 1e09daddd..1b5d46ff9 100644 --- a/config.json +++ b/config.json @@ -110,9 +110,9 @@ ], "Database": { "Host": "localhost", - "Port": 5432, + "Port": 5433, "User": "postgres", - "Password": "", + "Password": "admin", "Database": "erupe" }, "Sign": { diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index eb984f028..42868577c 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -144,15 +144,10 @@ func loadQuestFile(s *Session, quest_id string) []byte { file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", quest_id))) if err != nil { - s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, quest_id)) return nil } - println(fmt.Sprintf("quests/%s.bin", quest_id)) decrypted := decryption.UnpackSimple(file) - os.WriteFile(fmt.Sprintf("%s.bin", quest_id), decrypted, 0644) - - println("Reading quest file " + quest_id) file_bytes := byteframe.NewByteFrameFromBytes(decrypted) file_bytes.SetLE() From c3fb6aa821fcb67e9267b96650750c619d87f5b9 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 02:58:10 -0400 Subject: [PATCH 03/27] refactor: Remove more debug code --- common/decryption/jpk.go | 8 -------- server/channelserver/handlers_quest.go | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/common/decryption/jpk.go b/common/decryption/jpk.go index e40c97a43..08f756d28 100644 --- a/common/decryption/jpk.go +++ b/common/decryption/jpk.go @@ -21,12 +21,9 @@ func UnpackSimple(data []byte) []byte { bf.SetLE() header := bf.ReadUint32() - println("Decrypting") - if header == 0x1A524B4A { bf.Seek(0x2, io.SeekCurrent) jpkType := bf.ReadUint16() - println("JPK Type: ", jpkType) switch jpkType { case 3: @@ -40,8 +37,6 @@ func UnpackSimple(data []byte) []byte { } } - println("Skipping") - return data } @@ -110,8 +105,5 @@ func JPKCopy(outBuffer []byte, offset int, length int, index *int) { func ReadByte(bf *byteframe.ByteFrame) byte { value := bf.ReadUint8() - if value < 0 { - println("Not implemented") - } return byte(value) } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 42868577c..fe7eef115 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -95,7 +95,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { quest_failure_pointer := file_bytes.ReadInt32() quest_contractor_pointer := file_bytes.ReadInt32() quest_description_pointer := file_bytes.ReadInt32() - //Use String header pointers to seek to string and then read null terminated string + file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) quest_name_string := file_bytes.ReadNullTerminatedBytes() file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) @@ -134,6 +134,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { new_pointers.WriteNullTerminatedBytes(quest_failure_string) new_pointers.WriteNullTerminatedBytes(quest_contractor_string) new_pointers.WriteNullTerminatedBytes(quest_description_string) + new_pointers.WriteUint8(18) new_pointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) From 43b7418558da11ffe819b93b0d12a235015eb54b Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 03:08:35 -0400 Subject: [PATCH 04/27] refactor: General code clean up --- server/channelserver/handlers_quest.go | 27 +++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index fe7eef115..22c7823ca 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -96,6 +96,8 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { quest_contractor_pointer := file_bytes.ReadInt32() quest_description_pointer := file_bytes.ReadInt32() + // Read the strings in order to determine the length of the new string pointers for use in the new offsets + // It must seek to each initial pointer since the order is not consistent. file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) quest_name_string := file_bytes.ReadNullTerminatedBytes() file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) @@ -113,9 +115,10 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { file_bytes.Seek(int64(quest_description_pointer), io.SeekStart) quest_description_string := file_bytes.ReadNullTerminatedBytes() + pointer_start := 352 + new_pointers := byteframe.NewByteFrame() new_pointers.SetLE() - pointer_start := 352 new_pointers.WriteInt32(int32(pointer_start)) new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + 1)) @@ -157,19 +160,15 @@ func loadQuestFile(s *Session, quest_id string) []byte { data_pointer := file_bytes.ReadInt32() file_bytes.Seek(int64(data_pointer), io.SeekStart) - // Read the quest data. - quest_body := file_bytes.ReadBytes(320) + // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. + quest_body := byteframe.NewByteFrameFromBytes(file_bytes.ReadBytes(320)) + quest_body.SetLE() + quest_body.Seek(40, io.SeekStart) - quest_pointer := byteframe.NewByteFrameFromBytes(quest_body) - quest_pointer.SetLE() - - quest_pointer.Seek(40, io.SeekStart) - string_pointer := quest_pointer.ReadInt32() - - strings := readOriginalPointers(string_pointer, decrypted) + strings := readOriginalPointers(quest_body.ReadInt32(), decrypted) body := byteframe.NewByteFrame() - body.WriteBytes(quest_body) + body.WriteBytes(quest_body.Data()) body.Seek(0, io.SeekEnd) body.WriteBytes(strings) @@ -183,6 +182,8 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf := byteframe.NewByteFrame() bf.SetLE() + + // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. bf.WriteInt32(id) bf.WriteInt32(0) bf.WriteBytes([]byte{0x0F, byte(max_players), byte(quest_type), 0x01}) @@ -200,11 +201,11 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteBytes(data) - // update checksum + // Update the checksum at pos 21, the checksum is determined the total length of the file minus 553 turned into a single byte. bf.Seek(21, io.SeekStart) bf.WriteUint8(uint8(len(bf.Data()) - 553)) - // overwrite bytes at pos 62 + // Overwrite the string-pointer at 62 to point at 320. This is always 320 and does not count the 22 from the event header. bf.Seek(62, io.SeekStart) bf.WriteInt16(320) From b16ec769ced363ead229899cb49228168dd52fc9 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 03:15:57 -0400 Subject: [PATCH 05/27] Forgot to clear config --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 1b5d46ff9..1e09daddd 100644 --- a/config.json +++ b/config.json @@ -110,9 +110,9 @@ ], "Database": { "Host": "localhost", - "Port": 5433, + "Port": 5432, "User": "postgres", - "Password": "admin", + "Password": "", "Database": "erupe" }, "Sign": { From 0bd4658a23fd1661d3b80fbc6e58efa4e2da73ee Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 3 Jul 2023 20:31:53 +1000 Subject: [PATCH 06/27] golang formatting pass --- common/decryption/jpk.go | 44 ++++---- server/channelserver/handlers_quest.go | 136 ++++++++++++------------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/common/decryption/jpk.go b/common/decryption/jpk.go index 08f756d28..99011b625 100644 --- a/common/decryption/jpk.go +++ b/common/decryption/jpk.go @@ -10,12 +10,12 @@ import ( "io" ) -var m_shiftIndex int = 0 -var m_flag byte = byte(0) +var mShiftIndex = 0 +var mFlag = byte(0) func UnpackSimple(data []byte) []byte { - m_shiftIndex = 0 - m_flag = byte(0) + mShiftIndex = 0 + mFlag = byte(0) bf := byteframe.NewByteFrameFromBytes(data) bf.SetLE() @@ -44,28 +44,28 @@ func ProcessDecode(data *byteframe.ByteFrame, outBuffer []byte) { outIndex := 0 for int(data.Index()) < len(data.Data()) && outIndex < len(outBuffer)-1 { - if JPKBitshift(data) == 0 { + if JPKBitShift(data) == 0 { outBuffer[outIndex] = ReadByte(data) outIndex++ continue } else { - if JPKBitshift(data) == 0 { - len := (JPKBitshift(data) << 1) | JPKBitshift(data) + if JPKBitShift(data) == 0 { + length := (JPKBitShift(data) << 1) | JPKBitShift(data) off := ReadByte(data) - JPKCopy(outBuffer, int(off), int(len)+3, &outIndex) + JPKCopy(outBuffer, int(off), int(length)+3, &outIndex) continue } else { hi := ReadByte(data) lo := ReadByte(data) - var len int = int((hi & 0xE0)) >> 5 - var off int = ((int(hi) & 0x1F) << 8) | int(lo) - if len != 0 { - JPKCopy(outBuffer, off, len+2, &outIndex) + length := int(hi&0xE0) >> 5 + off := ((int(hi) & 0x1F) << 8) | int(lo) + if length != 0 { + JPKCopy(outBuffer, off, length+2, &outIndex) continue } else { - if JPKBitshift(data) == 0 { - len := (JPKBitshift(data) << 3) | (JPKBitshift(data) << 2) | (JPKBitshift(data) << 1) | JPKBitshift(data) - JPKCopy(outBuffer, off, int(len)+2+8, &outIndex) + if JPKBitShift(data) == 0 { + length := (JPKBitShift(data) << 3) | (JPKBitShift(data) << 2) | (JPKBitShift(data) << 1) | JPKBitShift(data) + JPKCopy(outBuffer, off, int(length)+2+8, &outIndex) continue } else { temp := ReadByte(data) @@ -85,15 +85,15 @@ func ProcessDecode(data *byteframe.ByteFrame, outBuffer []byte) { } } -func JPKBitshift(data *byteframe.ByteFrame) byte { - m_shiftIndex-- +func JPKBitShift(data *byteframe.ByteFrame) byte { + mShiftIndex-- - if m_shiftIndex < 0 { - m_shiftIndex = 7 - m_flag = ReadByte(data) + if mShiftIndex < 0 { + mShiftIndex = 7 + mFlag = ReadByte(data) } - return (byte)((m_flag >> m_shiftIndex) & 1) + return (byte)((mFlag >> mShiftIndex) & 1) } func JPKCopy(outBuffer []byte, offset int, length int, index *int) { @@ -105,5 +105,5 @@ func JPKCopy(outBuffer []byte, offset int, length int, index *int) { func ReadByte(bf *byteframe.ByteFrame) byte { value := bf.ReadUint8() - return byte(value) + return value } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 22c7823ca..dfa8bea0e 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -83,69 +83,69 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { } func readOriginalPointers(string_pointer int32, quest []byte) []byte { - file_bytes := byteframe.NewByteFrameFromBytes(quest) - file_bytes.SetLE() - file_bytes.Seek(int64(string_pointer), io.SeekStart) + fileBytes := byteframe.NewByteFrameFromBytes(quest) + fileBytes.SetLE() + fileBytes.Seek(int64(string_pointer), io.SeekStart) - quest_name_pointer := file_bytes.ReadInt32() - quest_main_pointer := file_bytes.ReadInt32() - quest_a_pointer := file_bytes.ReadInt32() - quest_b_pointer := file_bytes.ReadInt32() - quest_clear_pointer := file_bytes.ReadInt32() - quest_failure_pointer := file_bytes.ReadInt32() - quest_contractor_pointer := file_bytes.ReadInt32() - quest_description_pointer := file_bytes.ReadInt32() + questNamePointer := fileBytes.ReadInt32() + questMainPointer := fileBytes.ReadInt32() + questAPointer := fileBytes.ReadInt32() + questBPointer := fileBytes.ReadInt32() + questClearPointer := fileBytes.ReadInt32() + questFailurePointer := fileBytes.ReadInt32() + questContractorPointer := fileBytes.ReadInt32() + questDescriptionPointer := fileBytes.ReadInt32() // Read the strings in order to determine the length of the new string pointers for use in the new offsets // It must seek to each initial pointer since the order is not consistent. - file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) - quest_name_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) - quest_main_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_a_pointer), io.SeekStart) - quest_a_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_b_pointer), io.SeekStart) - quest_b_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_clear_pointer), io.SeekStart) - quest_clear_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_failure_pointer), io.SeekStart) - quest_failure_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_contractor_pointer), io.SeekStart) - quest_contractor_string := file_bytes.ReadNullTerminatedBytes() - file_bytes.Seek(int64(quest_description_pointer), io.SeekStart) - quest_description_string := file_bytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questNamePointer), io.SeekStart) + questNameString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questMainPointer), io.SeekStart) + questMainString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questAPointer), io.SeekStart) + questAString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questBPointer), io.SeekStart) + questBString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questClearPointer), io.SeekStart) + questClearString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questFailurePointer), io.SeekStart) + questFailureString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questContractorPointer), io.SeekStart) + questContractorString := fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(int64(questDescriptionPointer), io.SeekStart) + questDescriptionString := fileBytes.ReadNullTerminatedBytes() - pointer_start := 352 + pointerStart := 352 - new_pointers := byteframe.NewByteFrame() - new_pointers.SetLE() + newPointers := byteframe.NewByteFrame() + newPointers.SetLE() - new_pointers.WriteInt32(int32(pointer_start)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + 1)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + 2)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + 3)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + 26)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + 5)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + 6)) - new_pointers.WriteInt32(int32(pointer_start + len(quest_name_string) + len(quest_main_string) + len(quest_a_string) + len(quest_b_string) + len(quest_clear_string) + len(quest_failure_string) + len(quest_contractor_string) + 7)) + newPointers.WriteInt32(int32(pointerStart)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + 1)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + 2)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + 3)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 26)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + 5)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + 6)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + len(questContractorString) + 7)) - new_pointers.WriteNullTerminatedBytes(quest_name_string) - new_pointers.WriteNullTerminatedBytes(quest_main_string) - new_pointers.WriteNullTerminatedBytes(quest_a_string) - new_pointers.WriteNullTerminatedBytes(quest_b_string) - new_pointers.WriteNullTerminatedBytes(quest_clear_string) - new_pointers.WriteNullTerminatedBytes(quest_failure_string) - new_pointers.WriteNullTerminatedBytes(quest_contractor_string) - new_pointers.WriteNullTerminatedBytes(quest_description_string) + newPointers.WriteNullTerminatedBytes(questNameString) + newPointers.WriteNullTerminatedBytes(questMainString) + newPointers.WriteNullTerminatedBytes(questAString) + newPointers.WriteNullTerminatedBytes(questBString) + newPointers.WriteNullTerminatedBytes(questClearString) + newPointers.WriteNullTerminatedBytes(questFailureString) + newPointers.WriteNullTerminatedBytes(questContractorString) + newPointers.WriteNullTerminatedBytes(questDescriptionString) - new_pointers.WriteUint8(18) - new_pointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) + newPointers.WriteUint8(18) + newPointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) - return new_pointers.Data() + return newPointers.Data() } -func loadQuestFile(s *Session, quest_id string) []byte { - file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", quest_id))) +func loadQuestFile(s *Session, questId string) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questId))) if err != nil { return nil @@ -153,22 +153,22 @@ func loadQuestFile(s *Session, quest_id string) []byte { decrypted := decryption.UnpackSimple(file) - file_bytes := byteframe.NewByteFrameFromBytes(decrypted) - file_bytes.SetLE() - file_bytes.Seek(0, io.SeekStart) + fileBytes := byteframe.NewByteFrameFromBytes(decrypted) + fileBytes.SetLE() + fileBytes.Seek(0, io.SeekStart) - data_pointer := file_bytes.ReadInt32() - file_bytes.Seek(int64(data_pointer), io.SeekStart) + dataPointer := fileBytes.ReadInt32() + fileBytes.Seek(int64(dataPointer), io.SeekStart) // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. - quest_body := byteframe.NewByteFrameFromBytes(file_bytes.ReadBytes(320)) - quest_body.SetLE() - quest_body.Seek(40, io.SeekStart) + questBody := byteframe.NewByteFrameFromBytes(fileBytes.ReadBytes(320)) + questBody.SetLE() + questBody.Seek(40, io.SeekStart) - strings := readOriginalPointers(quest_body.ReadInt32(), decrypted) + strings := readOriginalPointers(questBody.ReadInt32(), decrypted) body := byteframe.NewByteFrame() - body.WriteBytes(quest_body.Data()) + body.WriteBytes(questBody.Data()) body.Seek(0, io.SeekEnd) body.WriteBytes(strings) @@ -177,8 +177,8 @@ func loadQuestFile(s *Session, quest_id string) []byte { func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { var id int32 - var max_players, quest_type, quest_id uint16 - rows.Scan(&id, &max_players, &quest_type, &quest_id) + var maxPlayers, questType, questId uint16 + rows.Scan(&id, &maxPlayers, &questType, &questId) bf := byteframe.NewByteFrame() bf.SetLE() @@ -186,14 +186,14 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. bf.WriteInt32(id) bf.WriteInt32(0) - bf.WriteBytes([]byte{0x0F, byte(max_players), byte(quest_type), 0x01}) + bf.WriteBytes([]byte{0x0F, byte(maxPlayers), byte(questType), 0x01}) bf.WriteUint16(0) bf.WriteUint16(0) bf.WriteBytes([]byte{0x00, 0x01}) bf.WriteUint16(0) bf.WriteBytes([]byte{0x02, 0x00}) - data := loadQuestFile(s, fmt.Sprintf("%d", quest_id)+"d0") + data := loadQuestFile(s, fmt.Sprintf("%d", questId)+"d0") if data == nil { return nil, fmt.Errorf("failed to load quest file") @@ -218,13 +218,13 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() bf.WriteUint16(0) - rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id ASC") + rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id") // Loop through each row and load the quest entry if it exists. for rows.Next() { var pointer []byte - var max_players, quest_type, checksum, quest_id uint16 - rows.Scan(&pointer, &max_players, &quest_type, &checksum, &quest_id) + var maxPlayers, questType, checksum, questId uint16 + rows.Scan(&pointer, &maxPlayers, &questType, &checksum, &questId) data, err := makeEventQuest(s, rows) From e29ce1d82f5132b7e68e7468915904489c454416 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 3 Jul 2023 20:33:03 +1000 Subject: [PATCH 07/27] fix events_quests id missing PK flag --- patch-schema/event_quests.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql index 85e7bccfe..8350d0a70 100644 --- a/patch-schema/event_quests.sql +++ b/patch-schema/event_quests.sql @@ -2,7 +2,7 @@ BEGIN; create table if not exists event_quests ( - id serial, + id serial primary key, max_players integer, quest_type integer, quest_id uint16 not null From 414eb3da908c6cb309bdccf0051fc4ff74d92aea Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 4 Jul 2023 20:34:00 +1000 Subject: [PATCH 08/27] fix Quest ID padding --- server/channelserver/handlers_quest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index dfa8bea0e..69f9e2e9a 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -193,7 +193,7 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint16(0) bf.WriteBytes([]byte{0x02, 0x00}) - data := loadQuestFile(s, fmt.Sprintf("%d", questId)+"d0") + data := loadQuestFile(s, fmt.Sprintf("%05d", questId)+"d0") if data == nil { return nil, fmt.Errorf("failed to load quest file") From f487db83dacee4c6c0a7d841c724799dda80b412 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 5 Jul 2023 00:03:16 +1000 Subject: [PATCH 09/27] change Enumerated Quest format --- patch-schema/event_quests.sql | 7 ++++--- server/channelserver/handlers_quest.go | 17 ++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql index 8350d0a70..b2566e50d 100644 --- a/patch-schema/event_quests.sql +++ b/patch-schema/event_quests.sql @@ -2,10 +2,11 @@ BEGIN; create table if not exists event_quests ( - id serial primary key, + id serial primary key, max_players integer, - quest_type integer, - quest_id uint16 not null + quest_type integer not null, + quest_id integer not null, + mark integer ); END; \ No newline at end of file diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 69f9e2e9a..5e6cb83a9 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -177,8 +177,9 @@ func loadQuestFile(s *Session, questId string) []byte { func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { var id int32 - var maxPlayers, questType, questId uint16 - rows.Scan(&id, &maxPlayers, &questType, &questId) + var questId uint16 + var maxPlayers, questType, mark uint8 + rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) bf := byteframe.NewByteFrame() bf.SetLE() @@ -186,12 +187,14 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. bf.WriteInt32(id) bf.WriteInt32(0) - bf.WriteBytes([]byte{0x0F, byte(maxPlayers), byte(questType), 0x01}) + bf.WriteUint8(0) // Indexer + bf.WriteUint8(maxPlayers) + bf.WriteUint8(questType) + bf.WriteUint8(mark) + bf.WriteUint16(0) + bf.WriteUint32(0) bf.WriteUint16(0) bf.WriteUint16(0) - bf.WriteBytes([]byte{0x00, 0x01}) - bf.WriteUint16(0) - bf.WriteBytes([]byte{0x02, 0x00}) data := loadQuestFile(s, fmt.Sprintf("%05d", questId)+"d0") @@ -218,7 +221,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() bf.WriteUint16(0) - rows, _ := s.server.db.Query("SELECT id, max_players, quest_type, quest_id FROM event_quests ORDER BY quest_id") + rows, _ := s.server.db.Query("SELECT id, COALESCE(max_players, 4) AS max_players, quest_type, quest_id, COALESCE(mark, 0) AS mark FROM event_quests ORDER BY quest_id") // Loop through each row and load the quest entry if it exists. for rows.Next() { From ba20d2da849520819bbedb910486393e1b09cfa8 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Tue, 4 Jul 2023 21:12:08 -0400 Subject: [PATCH 10/27] fix: Fix quest success check --- config.json | 4 ++-- server/channelserver/handlers_quest.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.json b/config.json index 1e09daddd..1b5d46ff9 100644 --- a/config.json +++ b/config.json @@ -110,9 +110,9 @@ ], "Database": { "Host": "localhost", - "Port": 5432, + "Port": 5433, "User": "postgres", - "Password": "", + "Password": "admin", "Database": "erupe" }, "Sign": { diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index dfa8bea0e..2baf6fb17 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -124,7 +124,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { newPointers.WriteInt32(int32(pointerStart + len(questNameString) + 1)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + 2)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + 3)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 26)) + newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 4)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + 5)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + 6)) newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + len(questContractorString) + 7)) From 35f9d5ac187099abe8851bd419948e98ffcfc59f Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Wed, 5 Jul 2023 19:29:39 -0400 Subject: [PATCH 11/27] feature: Season implementation --- config/config.go | 1 + server/channelserver/handlers_quest.go | 48 ++++++++++++++++++++++++-- server/entranceserver/make_resp.go | 10 ++---- 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/config/config.go b/config/config.go index 7ef6c9bad..5c4ee693d 100644 --- a/config/config.go +++ b/config/config.go @@ -110,6 +110,7 @@ type DevModeOptions struct { QuestDebugTools bool // Enable various quest debug logs EarthStatusOverride int32 EarthIDOverride int32 + DynamicSeasons bool // Enables dynamic seasons EarthMonsterOverride int32 SaveDumps SaveDumpOptions } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 99002afe0..0da70b21d 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -51,8 +51,19 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { zap.String("Filename", pkt.Filename), ) } - // Get quest file. - data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + + // Get quest file and convert to season if the option is enabled + var data []byte + var err error + + if s.server.erupeConfig.DevModeOptions.DynamicSeasons { + data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + } else { + data, err = os.ReadFile(seasonConversion(s, filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))) + } + + // convert based on season + if err != nil { s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) // This will crash the game. @@ -64,6 +75,39 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { } } +// Convert the file to load based on the season +func seasonConversion(s *Session, questPath string) string { + + // remove the last 6 from the quest path + newQuestPath := questPath[:len(questPath)-6] + + // Calculate the current day of the season in order to determine time scale + currentDayOfSeason := (time.Now().Unix()/6000)%15 + 1 + // Determine if it is day or night based on the current day of the season + timeCycle := uint8(((currentDayOfSeason % 1) * 24)) < 12 + + // Determine the current season based on a modulus of the current time + season := uint8((int(float64((time.Now().Unix() * int64(s.server.ID)) / (6000 * 15)))) % 3) + + var timeSet string + + // Determine the letter to append for day / night + if timeCycle { + timeSet = "n" + } else { + timeSet = "d" + } + + fileName := fmt.Sprintf("%s%s%d.bin", newQuestPath, timeSet, season) + + // Return the original if the season-based file does not exist for some reason + if _, err := os.Stat(fileName); err == nil { + return fileName + } else { + return questPath + } +} + func handleMsgMhfLoadFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfLoadFavoriteQuest) var data []byte diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index 0e2466865..cd4b97cdb 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -6,6 +6,7 @@ import ( _config "erupe-ce/config" "fmt" "net" + "time" "erupe-ce/common/stringsupport" @@ -13,9 +14,6 @@ import ( "erupe-ce/server/channelserver" ) -// Server Entries -var season uint8 - // Server Channels var currentplayers uint16 @@ -36,10 +34,8 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { } } sid := (4096 + serverIdx*256) + 16 - err := s.db.QueryRow("SELECT season FROM servers WHERE server_id=$1", sid).Scan(&season) - if err != nil { - season = 0 - } + //season := (uint8(float64((time.Now().Unix() + int64(sid)) / 1000))) % 3 + season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) if si.IP == "" { si.IP = config.Host } From 830bee8c6ff88e1ec2d99fc24f7d9eeb18f500f0 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Wed, 5 Jul 2023 19:31:26 -0400 Subject: [PATCH 12/27] config: Add config options for seasons --- config.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 1b5d46ff9..f9a092487 100644 --- a/config.json +++ b/config.json @@ -29,6 +29,7 @@ "QuestDebugTools": false, "EarthStatusOverride": 0, "EarthIDOverride": 0, + "DynamicSeasons": false, "EarthMonsterOverride": 0, "SaveDumps": { "Enabled": true, @@ -110,9 +111,9 @@ ], "Database": { "Host": "localhost", - "Port": 5433, + "Port": 5432, "User": "postgres", - "Password": "admin", + "Password": "", "Database": "erupe" }, "Sign": { From 6938b57a60ff661d79e7a756c33fa4ed01746339 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Thu, 6 Jul 2023 17:00:17 -0400 Subject: [PATCH 13/27] fix: Timescale fixes for seasons --- bin/quests/desktop.ini | 2372 +++++++++++++++++++++ config.json | 17 +- server/channelserver/handlers_distitem.go | 1 + server/channelserver/handlers_quest.go | 10 +- server/entranceserver/make_resp.go | 2 +- 5 files changed, 2391 insertions(+), 11 deletions(-) create mode 100644 bin/quests/desktop.ini diff --git a/bin/quests/desktop.ini b/bin/quests/desktop.ini new file mode 100644 index 000000000..a71744976 --- /dev/null +++ b/bin/quests/desktop.ini @@ -0,0 +1,2372 @@ +[LocalizedFileNames] +23484d1.bin=@23484d1.bin,0 +23484d2.bin=@23484d2.bin,0 +23484n0.bin=@23484n0.bin,0 +23484n1.bin=@23484n1.bin,0 +23484n2.bin=@23484n2.bin,0 +23485d0.bin=@23485d0.bin,0 +23485d1.bin=@23485d1.bin,0 +23485d2.bin=@23485d2.bin,0 +23485n0.bin=@23485n0.bin,0 +23485n1.bin=@23485n1.bin,0 +23485n2.bin=@23485n2.bin,0 +23486d0.bin=@23486d0.bin,0 +23486d1.bin=@23486d1.bin,0 +23486d2.bin=@23486d2.bin,0 +23486n0.bin=@23486n0.bin,0 +23486n1.bin=@23486n1.bin,0 +23486n2.bin=@23486n2.bin,0 +23487d0.bin=@23487d0.bin,0 +23487d1.bin=@23487d1.bin,0 +23487d2.bin=@23487d2.bin,0 +23487n0.bin=@23487n0.bin,0 +23487n1.bin=@23487n1.bin,0 +23487n2.bin=@23487n2.bin,0 +23488d0.bin=@23488d0.bin,0 +23488d1.bin=@23488d1.bin,0 +23488d2.bin=@23488d2.bin,0 +23488n0.bin=@23488n0.bin,0 +23488n1.bin=@23488n1.bin,0 +23488n2.bin=@23488n2.bin,0 +23489d0.bin=@23489d0.bin,0 +23489d1.bin=@23489d1.bin,0 +23489d2.bin=@23489d2.bin,0 +23489n0.bin=@23489n0.bin,0 +23489n1.bin=@23489n1.bin,0 +23489n2.bin=@23489n2.bin,0 +23490d0.bin=@23490d0.bin,0 +23490d1.bin=@23490d1.bin,0 +23490d2.bin=@23490d2.bin,0 +23490n0.bin=@23490n0.bin,0 +23490n1.bin=@23490n1.bin,0 +23490n2.bin=@23490n2.bin,0 +23491d0.bin=@23491d0.bin,0 +23491d1.bin=@23491d1.bin,0 +23491d2.bin=@23491d2.bin,0 +23491n0.bin=@23491n0.bin,0 +23491n1.bin=@23491n1.bin,0 +23491n2.bin=@23491n2.bin,0 +23492d0.bin=@23492d0.bin,0 +23492d1.bin=@23492d1.bin,0 +23492d2.bin=@23492d2.bin,0 +23492n0.bin=@23492n0.bin,0 +23492n1.bin=@23492n1.bin,0 +23492n2.bin=@23492n2.bin,0 +23484d0.bin=@23484d0.bin,0 +23585d0.bin=@23585d0.bin,0 +23585d1.bin=@23585d1.bin,0 +23585d2.bin=@23585d2.bin,0 +23585n0.bin=@23585n0.bin,0 +23585n1.bin=@23585n1.bin,0 +23585n2.bin=@23585n2.bin,0 +23586d0.bin=@23586d0.bin,0 +23586d1.bin=@23586d1.bin,0 +23586d2.bin=@23586d2.bin,0 +23586n0.bin=@23586n0.bin,0 +23586n1.bin=@23586n1.bin,0 +23586n2.bin=@23586n2.bin,0 +23587d0.bin=@23587d0.bin,0 +23587d1.bin=@23587d1.bin,0 +23587d2.bin=@23587d2.bin,0 +23587n0.bin=@23587n0.bin,0 +23587n1.bin=@23587n1.bin,0 +23587n2.bin=@23587n2.bin,0 +23588d0.bin=@23588d0.bin,0 +23588d1.bin=@23588d1.bin,0 +23588d2.bin=@23588d2.bin,0 +23588n0.bin=@23588n0.bin,0 +23588n1.bin=@23588n1.bin,0 +23588n2.bin=@23588n2.bin,0 +23589d0.bin=@23589d0.bin,0 +23589d1.bin=@23589d1.bin,0 +23589d2.bin=@23589d2.bin,0 +23589n0.bin=@23589n0.bin,0 +23589n1.bin=@23589n1.bin,0 +23589n2.bin=@23589n2.bin,0 +23590d0.bin=@23590d0.bin,0 +23590d1.bin=@23590d1.bin,0 +23590d2.bin=@23590d2.bin,0 +23590n0.bin=@23590n0.bin,0 +23590n1.bin=@23590n1.bin,0 +23590n2.bin=@23590n2.bin,0 +23591d0.bin=@23591d0.bin,0 +23591d1.bin=@23591d1.bin,0 +23591d2.bin=@23591d2.bin,0 +23591n0.bin=@23591n0.bin,0 +23591n1.bin=@23591n1.bin,0 +23591n2.bin=@23591n2.bin,0 +23592d0.bin=@23592d0.bin,0 +23592d1.bin=@23592d1.bin,0 +23592d2.bin=@23592d2.bin,0 +23592n0.bin=@23592n0.bin,0 +23592n1.bin=@23592n1.bin,0 +23592n2.bin=@23592n2.bin,0 +23593d0.bin=@23593d0.bin,0 +23593d1.bin=@23593d1.bin,0 +23593d2.bin=@23593d2.bin,0 +23593n0.bin=@23593n0.bin,0 +23593n1.bin=@23593n1.bin,0 +23593n2.bin=@23593n2.bin,0 +23594d0.bin=@23594d0.bin,0 +23594d1.bin=@23594d1.bin,0 +23594d2.bin=@23594d2.bin,0 +23594n0.bin=@23594n0.bin,0 +23594n1.bin=@23594n1.bin,0 +23594n2.bin=@23594n2.bin,0 +23595d0.bin=@23595d0.bin,0 +23595d1.bin=@23595d1.bin,0 +23595d2.bin=@23595d2.bin,0 +23595n0.bin=@23595n0.bin,0 +23595n1.bin=@23595n1.bin,0 +23595n2.bin=@23595n2.bin,0 +23596d0.bin=@23596d0.bin,0 +23596d1.bin=@23596d1.bin,0 +23596d2.bin=@23596d2.bin,0 +23596n0.bin=@23596n0.bin,0 +23596n1.bin=@23596n1.bin,0 +23596n2.bin=@23596n2.bin,0 +23597d0.bin=@23597d0.bin,0 +23597d1.bin=@23597d1.bin,0 +23597d2.bin=@23597d2.bin,0 +23597n0.bin=@23597n0.bin,0 +23597n1.bin=@23597n1.bin,0 +23597n2.bin=@23597n2.bin,0 +23598d0.bin=@23598d0.bin,0 +23598d1.bin=@23598d1.bin,0 +23598d2.bin=@23598d2.bin,0 +23598n0.bin=@23598n0.bin,0 +23598n1.bin=@23598n1.bin,0 +23598n2.bin=@23598n2.bin,0 +23599d0.bin=@23599d0.bin,0 +23599d1.bin=@23599d1.bin,0 +23599d2.bin=@23599d2.bin,0 +23599n0.bin=@23599n0.bin,0 +23599n1.bin=@23599n1.bin,0 +23599n2.bin=@23599n2.bin,0 +23601d0.bin=@23601d0.bin,0 +23601d1.bin=@23601d1.bin,0 +23601d2.bin=@23601d2.bin,0 +23601n0.bin=@23601n0.bin,0 +23601n1.bin=@23601n1.bin,0 +23601n2.bin=@23601n2.bin,0 +23602d0.bin=@23602d0.bin,0 +23602d1.bin=@23602d1.bin,0 +23602d2.bin=@23602d2.bin,0 +23602n0.bin=@23602n0.bin,0 +23602n1.bin=@23602n1.bin,0 +23602n2.bin=@23602n2.bin,0 +23603d0.bin=@23603d0.bin,0 +23603d1.bin=@23603d1.bin,0 +23603d2.bin=@23603d2.bin,0 +23603n0.bin=@23603n0.bin,0 +23603n1.bin=@23603n1.bin,0 +23603n2.bin=@23603n2.bin,0 +23604d0.bin=@23604d0.bin,0 +23604d1.bin=@23604d1.bin,0 +23604d2.bin=@23604d2.bin,0 +23604n0.bin=@23604n0.bin,0 +23604n1.bin=@23604n1.bin,0 +23604n2.bin=@23604n2.bin,0 +23605d0.bin=@23605d0.bin,0 +23605d1.bin=@23605d1.bin,0 +23605d2.bin=@23605d2.bin,0 +23605n0.bin=@23605n0.bin,0 +23605n1.bin=@23605n1.bin,0 +23605n2.bin=@23605n2.bin,0 +40241n0.bin=@40241n0.bin,0 +40241n1.bin=@40241n1.bin,0 +40241n2.bin=@40241n2.bin,0 +54594d0.bin=@54594d0.bin,0 +54594d1.bin=@54594d1.bin,0 +54594d2.bin=@54594d2.bin,0 +54594n0.bin=@54594n0.bin,0 +54594n1.bin=@54594n1.bin,0 +54594n2.bin=@54594n2.bin,0 +54603d0.bin=@54603d0.bin,0 +54603d1.bin=@54603d1.bin,0 +54603d2.bin=@54603d2.bin,0 +54603n0.bin=@54603n0.bin,0 +54603n1.bin=@54603n1.bin,0 +54603n2.bin=@54603n2.bin,0 +40241d0.bin=@40241d0.bin,0 +40241d1.bin=@40241d1.bin,0 +40241d2.bin=@40241d2.bin,0 +23493n0.bin=@23493n0.bin,0 +23493n1.bin=@23493n1.bin,0 +23493n2.bin=@23493n2.bin,0 +23494d0.bin=@23494d0.bin,0 +23494d1.bin=@23494d1.bin,0 +23494d2.bin=@23494d2.bin,0 +23494n0.bin=@23494n0.bin,0 +23494n1.bin=@23494n1.bin,0 +23494n2.bin=@23494n2.bin,0 +23495d0.bin=@23495d0.bin,0 +23495d1.bin=@23495d1.bin,0 +23495d2.bin=@23495d2.bin,0 +23495n0.bin=@23495n0.bin,0 +23495n1.bin=@23495n1.bin,0 +23495n2.bin=@23495n2.bin,0 +23496d0.bin=@23496d0.bin,0 +23496d1.bin=@23496d1.bin,0 +23496d2.bin=@23496d2.bin,0 +23496n0.bin=@23496n0.bin,0 +23496n1.bin=@23496n1.bin,0 +23496n2.bin=@23496n2.bin,0 +23497d0.bin=@23497d0.bin,0 +23497d1.bin=@23497d1.bin,0 +23497d2.bin=@23497d2.bin,0 +23497n0.bin=@23497n0.bin,0 +23497n1.bin=@23497n1.bin,0 +23497n2.bin=@23497n2.bin,0 +23498d0.bin=@23498d0.bin,0 +23498d1.bin=@23498d1.bin,0 +23498d2.bin=@23498d2.bin,0 +23498n0.bin=@23498n0.bin,0 +23498n1.bin=@23498n1.bin,0 +23498n2.bin=@23498n2.bin,0 +23499d0.bin=@23499d0.bin,0 +23499d1.bin=@23499d1.bin,0 +23499d2.bin=@23499d2.bin,0 +23499n0.bin=@23499n0.bin,0 +23499n1.bin=@23499n1.bin,0 +23499n2.bin=@23499n2.bin,0 +23513d0.bin=@23513d0.bin,0 +23513d1.bin=@23513d1.bin,0 +23513d2.bin=@23513d2.bin,0 +23513n0.bin=@23513n0.bin,0 +23513n1.bin=@23513n1.bin,0 +23513n2.bin=@23513n2.bin,0 +23528d0.bin=@23528d0.bin,0 +23528d1.bin=@23528d1.bin,0 +23528d2.bin=@23528d2.bin,0 +23528n0.bin=@23528n0.bin,0 +23528n1.bin=@23528n1.bin,0 +23528n2.bin=@23528n2.bin,0 +23643d0.bin=@23643d0.bin,0 +23643d1.bin=@23643d1.bin,0 +23643d2.bin=@23643d2.bin,0 +23643n0.bin=@23643n0.bin,0 +23643n1.bin=@23643n1.bin,0 +23643n2.bin=@23643n2.bin,0 +23667d0.bin=@23667d0.bin,0 +23667d1.bin=@23667d1.bin,0 +23667d2.bin=@23667d2.bin,0 +23667n0.bin=@23667n0.bin,0 +23667n1.bin=@23667n1.bin,0 +23667n2.bin=@23667n2.bin,0 +55679d0.bin=@55679d0.bin,0 +55679d1.bin=@55679d1.bin,0 +55679d2.bin=@55679d2.bin,0 +55679n0.bin=@55679n0.bin,0 +55679n1.bin=@55679n1.bin,0 +55679n2.bin=@55679n2.bin,0 +55680d0.bin=@55680d0.bin,0 +55680d1.bin=@55680d1.bin,0 +55680d2.bin=@55680d2.bin,0 +55680n0.bin=@55680n0.bin,0 +55680n1.bin=@55680n1.bin,0 +55680n2.bin=@55680n2.bin,0 +55772d0.bin=@55772d0.bin,0 +55772d1.bin=@55772d1.bin,0 +55772d2.bin=@55772d2.bin,0 +55772n0.bin=@55772n0.bin,0 +55772n1.bin=@55772n1.bin,0 +55772n2.bin=@55772n2.bin,0 +55916d0.bin=@55916d0.bin,0 +55916d1.bin=@55916d1.bin,0 +55916d2.bin=@55916d2.bin,0 +55916n0.bin=@55916n0.bin,0 +55916n1.bin=@55916n1.bin,0 +55916n2.bin=@55916n2.bin,0 +23493d0.bin=@23493d0.bin,0 +23493d1.bin=@23493d1.bin,0 +23493d2.bin=@23493d2.bin,0 +23199n2.bin=@23199n2.bin,0 +23201d0.bin=@23201d0.bin,0 +23201d1.bin=@23201d1.bin,0 +23201d2.bin=@23201d2.bin,0 +23201n0.bin=@23201n0.bin,0 +23201n1.bin=@23201n1.bin,0 +23201n2.bin=@23201n2.bin,0 +23202d0.bin=@23202d0.bin,0 +23202d1.bin=@23202d1.bin,0 +23202d2.bin=@23202d2.bin,0 +23202n0.bin=@23202n0.bin,0 +23202n1.bin=@23202n1.bin,0 +23202n2.bin=@23202n2.bin,0 +23203d0.bin=@23203d0.bin,0 +23203d1.bin=@23203d1.bin,0 +23203d2.bin=@23203d2.bin,0 +23203n0.bin=@23203n0.bin,0 +23203n1.bin=@23203n1.bin,0 +23203n2.bin=@23203n2.bin,0 +23204d0.bin=@23204d0.bin,0 +23204d1.bin=@23204d1.bin,0 +23204d2.bin=@23204d2.bin,0 +23204n0.bin=@23204n0.bin,0 +23204n1.bin=@23204n1.bin,0 +23204n2.bin=@23204n2.bin,0 +23205d0.bin=@23205d0.bin,0 +23205d1.bin=@23205d1.bin,0 +23205d2.bin=@23205d2.bin,0 +23205n0.bin=@23205n0.bin,0 +23205n1.bin=@23205n1.bin,0 +23205n2.bin=@23205n2.bin,0 +23206d0.bin=@23206d0.bin,0 +23206d1.bin=@23206d1.bin,0 +23206d2.bin=@23206d2.bin,0 +23206n0.bin=@23206n0.bin,0 +23206n1.bin=@23206n1.bin,0 +23206n2.bin=@23206n2.bin,0 +23207d0.bin=@23207d0.bin,0 +23207d1.bin=@23207d1.bin,0 +23207d2.bin=@23207d2.bin,0 +23207n0.bin=@23207n0.bin,0 +23207n1.bin=@23207n1.bin,0 +23207n2.bin=@23207n2.bin,0 +23208d0.bin=@23208d0.bin,0 +23208d1.bin=@23208d1.bin,0 +23208d2.bin=@23208d2.bin,0 +23208n0.bin=@23208n0.bin,0 +23208n1.bin=@23208n1.bin,0 +23208n2.bin=@23208n2.bin,0 +23209d0.bin=@23209d0.bin,0 +23209d1.bin=@23209d1.bin,0 +23209d2.bin=@23209d2.bin,0 +23209n0.bin=@23209n0.bin,0 +23209n1.bin=@23209n1.bin,0 +23209n2.bin=@23209n2.bin,0 +23210d0.bin=@23210d0.bin,0 +23210d1.bin=@23210d1.bin,0 +23210d2.bin=@23210d2.bin,0 +23210n0.bin=@23210n0.bin,0 +23210n1.bin=@23210n1.bin,0 +23210n2.bin=@23210n2.bin,0 +23253d0.bin=@23253d0.bin,0 +23253d1.bin=@23253d1.bin,0 +23253d2.bin=@23253d2.bin,0 +23253n0.bin=@23253n0.bin,0 +23253n1.bin=@23253n1.bin,0 +23253n2.bin=@23253n2.bin,0 +23254d0.bin=@23254d0.bin,0 +23254d1.bin=@23254d1.bin,0 +23254d2.bin=@23254d2.bin,0 +23254n0.bin=@23254n0.bin,0 +23254n1.bin=@23254n1.bin,0 +23254n2.bin=@23254n2.bin,0 +23269d0.bin=@23269d0.bin,0 +23269d1.bin=@23269d1.bin,0 +23269d2.bin=@23269d2.bin,0 +23269n0.bin=@23269n0.bin,0 +23269n1.bin=@23269n1.bin,0 +23269n2.bin=@23269n2.bin,0 +23270d0.bin=@23270d0.bin,0 +23270d1.bin=@23270d1.bin,0 +23270d2.bin=@23270d2.bin,0 +23270n0.bin=@23270n0.bin,0 +23270n1.bin=@23270n1.bin,0 +23270n2.bin=@23270n2.bin,0 +23271d0.bin=@23271d0.bin,0 +23271d1.bin=@23271d1.bin,0 +23271d2.bin=@23271d2.bin,0 +23271n0.bin=@23271n0.bin,0 +23271n1.bin=@23271n1.bin,0 +23271n2.bin=@23271n2.bin,0 +23272d0.bin=@23272d0.bin,0 +23272d1.bin=@23272d1.bin,0 +23272d2.bin=@23272d2.bin,0 +23272n0.bin=@23272n0.bin,0 +23272n1.bin=@23272n1.bin,0 +23272n2.bin=@23272n2.bin,0 +23273d0.bin=@23273d0.bin,0 +23273d1.bin=@23273d1.bin,0 +23273d2.bin=@23273d2.bin,0 +23273n0.bin=@23273n0.bin,0 +23273n1.bin=@23273n1.bin,0 +23273n2.bin=@23273n2.bin,0 +23274d0.bin=@23274d0.bin,0 +23274d1.bin=@23274d1.bin,0 +23274d2.bin=@23274d2.bin,0 +23274n0.bin=@23274n0.bin,0 +23274n1.bin=@23274n1.bin,0 +23274n2.bin=@23274n2.bin,0 +23280d0.bin=@23280d0.bin,0 +23280d1.bin=@23280d1.bin,0 +23280d2.bin=@23280d2.bin,0 +23280n0.bin=@23280n0.bin,0 +23280n1.bin=@23280n1.bin,0 +23280n2.bin=@23280n2.bin,0 +23281d0.bin=@23281d0.bin,0 +23281d1.bin=@23281d1.bin,0 +23281d2.bin=@23281d2.bin,0 +23281n0.bin=@23281n0.bin,0 +23281n1.bin=@23281n1.bin,0 +23281n2.bin=@23281n2.bin,0 +23303d0.bin=@23303d0.bin,0 +23303d1.bin=@23303d1.bin,0 +23303d2.bin=@23303d2.bin,0 +23303n0.bin=@23303n0.bin,0 +23303n1.bin=@23303n1.bin,0 +23303n2.bin=@23303n2.bin,0 +23304d0.bin=@23304d0.bin,0 +23304d1.bin=@23304d1.bin,0 +23304d2.bin=@23304d2.bin,0 +23304n0.bin=@23304n0.bin,0 +23304n1.bin=@23304n1.bin,0 +23304n2.bin=@23304n2.bin,0 +23323d0.bin=@23323d0.bin,0 +23323d1.bin=@23323d1.bin,0 +23323d2.bin=@23323d2.bin,0 +23323n0.bin=@23323n0.bin,0 +23323n1.bin=@23323n1.bin,0 +23323n2.bin=@23323n2.bin,0 +23326d0.bin=@23326d0.bin,0 +23326d1.bin=@23326d1.bin,0 +23326d2.bin=@23326d2.bin,0 +23326n0.bin=@23326n0.bin,0 +23326n1.bin=@23326n1.bin,0 +23326n2.bin=@23326n2.bin,0 +23199d0.bin=@23199d0.bin,0 +23199d1.bin=@23199d1.bin,0 +23199d2.bin=@23199d2.bin,0 +23199n0.bin=@23199n0.bin,0 +23199n1.bin=@23199n1.bin,0 +23211d2.bin=@23211d2.bin,0 +23211n0.bin=@23211n0.bin,0 +23211n1.bin=@23211n1.bin,0 +23211n2.bin=@23211n2.bin,0 +23212d0.bin=@23212d0.bin,0 +23212d1.bin=@23212d1.bin,0 +23212d2.bin=@23212d2.bin,0 +23212n0.bin=@23212n0.bin,0 +23212n1.bin=@23212n1.bin,0 +23212n2.bin=@23212n2.bin,0 +23213d0.bin=@23213d0.bin,0 +23213d1.bin=@23213d1.bin,0 +23213d2.bin=@23213d2.bin,0 +23213n0.bin=@23213n0.bin,0 +23213n1.bin=@23213n1.bin,0 +23213n2.bin=@23213n2.bin,0 +23214d0.bin=@23214d0.bin,0 +23214d1.bin=@23214d1.bin,0 +23214d2.bin=@23214d2.bin,0 +23214n0.bin=@23214n0.bin,0 +23214n1.bin=@23214n1.bin,0 +23214n2.bin=@23214n2.bin,0 +23215d0.bin=@23215d0.bin,0 +23215d1.bin=@23215d1.bin,0 +23215d2.bin=@23215d2.bin,0 +23215n0.bin=@23215n0.bin,0 +23215n1.bin=@23215n1.bin,0 +23215n2.bin=@23215n2.bin,0 +23216d0.bin=@23216d0.bin,0 +23216d1.bin=@23216d1.bin,0 +23216d2.bin=@23216d2.bin,0 +23216n0.bin=@23216n0.bin,0 +23216n1.bin=@23216n1.bin,0 +23216n2.bin=@23216n2.bin,0 +23217d0.bin=@23217d0.bin,0 +23217d1.bin=@23217d1.bin,0 +23217d2.bin=@23217d2.bin,0 +23217n0.bin=@23217n0.bin,0 +23217n1.bin=@23217n1.bin,0 +23217n2.bin=@23217n2.bin,0 +23218d0.bin=@23218d0.bin,0 +23218d1.bin=@23218d1.bin,0 +23218d2.bin=@23218d2.bin,0 +23218n0.bin=@23218n0.bin,0 +23218n1.bin=@23218n1.bin,0 +23218n2.bin=@23218n2.bin,0 +23219d0.bin=@23219d0.bin,0 +23219d1.bin=@23219d1.bin,0 +23219d2.bin=@23219d2.bin,0 +23219n0.bin=@23219n0.bin,0 +23219n1.bin=@23219n1.bin,0 +23219n2.bin=@23219n2.bin,0 +23220d0.bin=@23220d0.bin,0 +23220d1.bin=@23220d1.bin,0 +23220d2.bin=@23220d2.bin,0 +23220n0.bin=@23220n0.bin,0 +23220n1.bin=@23220n1.bin,0 +23220n2.bin=@23220n2.bin,0 +23221d0.bin=@23221d0.bin,0 +23221d1.bin=@23221d1.bin,0 +23221d2.bin=@23221d2.bin,0 +23221n0.bin=@23221n0.bin,0 +23221n1.bin=@23221n1.bin,0 +23221n2.bin=@23221n2.bin,0 +23223d0.bin=@23223d0.bin,0 +23223d1.bin=@23223d1.bin,0 +23223d2.bin=@23223d2.bin,0 +23223n0.bin=@23223n0.bin,0 +23223n1.bin=@23223n1.bin,0 +23223n2.bin=@23223n2.bin,0 +23255d0.bin=@23255d0.bin,0 +23255d1.bin=@23255d1.bin,0 +23255d2.bin=@23255d2.bin,0 +23255n0.bin=@23255n0.bin,0 +23255n1.bin=@23255n1.bin,0 +23255n2.bin=@23255n2.bin,0 +23256d0.bin=@23256d0.bin,0 +23256d1.bin=@23256d1.bin,0 +23256d2.bin=@23256d2.bin,0 +23256n0.bin=@23256n0.bin,0 +23256n1.bin=@23256n1.bin,0 +23256n2.bin=@23256n2.bin,0 +23282d0.bin=@23282d0.bin,0 +23282d1.bin=@23282d1.bin,0 +23282d2.bin=@23282d2.bin,0 +23282n0.bin=@23282n0.bin,0 +23282n1.bin=@23282n1.bin,0 +23282n2.bin=@23282n2.bin,0 +23283d0.bin=@23283d0.bin,0 +23283d1.bin=@23283d1.bin,0 +23283d2.bin=@23283d2.bin,0 +23283n0.bin=@23283n0.bin,0 +23283n1.bin=@23283n1.bin,0 +23283n2.bin=@23283n2.bin,0 +23305d0.bin=@23305d0.bin,0 +23305d1.bin=@23305d1.bin,0 +23305d2.bin=@23305d2.bin,0 +23305n0.bin=@23305n0.bin,0 +23305n1.bin=@23305n1.bin,0 +23305n2.bin=@23305n2.bin,0 +23320d0.bin=@23320d0.bin,0 +23320d1.bin=@23320d1.bin,0 +23320d2.bin=@23320d2.bin,0 +23320n0.bin=@23320n0.bin,0 +23320n1.bin=@23320n1.bin,0 +23320n2.bin=@23320n2.bin,0 +23321d0.bin=@23321d0.bin,0 +23321d1.bin=@23321d1.bin,0 +23321d2.bin=@23321d2.bin,0 +23321n0.bin=@23321n0.bin,0 +23321n1.bin=@23321n1.bin,0 +23321n2.bin=@23321n2.bin,0 +23324d0.bin=@23324d0.bin,0 +23324d1.bin=@23324d1.bin,0 +23324d2.bin=@23324d2.bin,0 +23324n0.bin=@23324n0.bin,0 +23324n1.bin=@23324n1.bin,0 +23324n2.bin=@23324n2.bin,0 +23350d0.bin=@23350d0.bin,0 +23350d1.bin=@23350d1.bin,0 +23350d2.bin=@23350d2.bin,0 +23350n0.bin=@23350n0.bin,0 +23350n1.bin=@23350n1.bin,0 +23350n2.bin=@23350n2.bin,0 +23351d0.bin=@23351d0.bin,0 +23351d1.bin=@23351d1.bin,0 +23351d2.bin=@23351d2.bin,0 +23351n0.bin=@23351n0.bin,0 +23351n1.bin=@23351n1.bin,0 +23351n2.bin=@23351n2.bin,0 +23369d0.bin=@23369d0.bin,0 +23369d1.bin=@23369d1.bin,0 +23369d2.bin=@23369d2.bin,0 +23369n0.bin=@23369n0.bin,0 +23369n1.bin=@23369n1.bin,0 +23369n2.bin=@23369n2.bin,0 +23370d0.bin=@23370d0.bin,0 +23370d1.bin=@23370d1.bin,0 +23370d2.bin=@23370d2.bin,0 +23370n0.bin=@23370n0.bin,0 +23370n1.bin=@23370n1.bin,0 +23370n2.bin=@23370n2.bin,0 +23399d0.bin=@23399d0.bin,0 +23399d1.bin=@23399d1.bin,0 +23399d2.bin=@23399d2.bin,0 +23399n0.bin=@23399n0.bin,0 +23399n1.bin=@23399n1.bin,0 +23399n2.bin=@23399n2.bin,0 +23401d0.bin=@23401d0.bin,0 +23401d1.bin=@23401d1.bin,0 +23401d2.bin=@23401d2.bin,0 +23401n0.bin=@23401n0.bin,0 +23401n1.bin=@23401n1.bin,0 +23401n2.bin=@23401n2.bin,0 +23211d0.bin=@23211d0.bin,0 +23211d1.bin=@23211d1.bin,0 +23224n1.bin=@23224n1.bin,0 +23224n2.bin=@23224n2.bin,0 +23225d0.bin=@23225d0.bin,0 +23225d1.bin=@23225d1.bin,0 +23225d2.bin=@23225d2.bin,0 +23225n0.bin=@23225n0.bin,0 +23225n1.bin=@23225n1.bin,0 +23225n2.bin=@23225n2.bin,0 +23226d0.bin=@23226d0.bin,0 +23226d1.bin=@23226d1.bin,0 +23226d2.bin=@23226d2.bin,0 +23226n0.bin=@23226n0.bin,0 +23226n1.bin=@23226n1.bin,0 +23226n2.bin=@23226n2.bin,0 +23227d0.bin=@23227d0.bin,0 +23227d1.bin=@23227d1.bin,0 +23227d2.bin=@23227d2.bin,0 +23227n0.bin=@23227n0.bin,0 +23227n1.bin=@23227n1.bin,0 +23227n2.bin=@23227n2.bin,0 +23228d0.bin=@23228d0.bin,0 +23228d1.bin=@23228d1.bin,0 +23228d2.bin=@23228d2.bin,0 +23228n0.bin=@23228n0.bin,0 +23228n1.bin=@23228n1.bin,0 +23228n2.bin=@23228n2.bin,0 +23229d0.bin=@23229d0.bin,0 +23229d1.bin=@23229d1.bin,0 +23229d2.bin=@23229d2.bin,0 +23229n0.bin=@23229n0.bin,0 +23229n1.bin=@23229n1.bin,0 +23229n2.bin=@23229n2.bin,0 +23230d0.bin=@23230d0.bin,0 +23230d1.bin=@23230d1.bin,0 +23230d2.bin=@23230d2.bin,0 +23230n0.bin=@23230n0.bin,0 +23230n1.bin=@23230n1.bin,0 +23230n2.bin=@23230n2.bin,0 +23231d0.bin=@23231d0.bin,0 +23231d1.bin=@23231d1.bin,0 +23231d2.bin=@23231d2.bin,0 +23231n0.bin=@23231n0.bin,0 +23231n1.bin=@23231n1.bin,0 +23231n2.bin=@23231n2.bin,0 +23232d0.bin=@23232d0.bin,0 +23232d1.bin=@23232d1.bin,0 +23232d2.bin=@23232d2.bin,0 +23232n0.bin=@23232n0.bin,0 +23232n1.bin=@23232n1.bin,0 +23232n2.bin=@23232n2.bin,0 +23233d0.bin=@23233d0.bin,0 +23233d1.bin=@23233d1.bin,0 +23233d2.bin=@23233d2.bin,0 +23233n0.bin=@23233n0.bin,0 +23233n1.bin=@23233n1.bin,0 +23233n2.bin=@23233n2.bin,0 +23238d0.bin=@23238d0.bin,0 +23238d1.bin=@23238d1.bin,0 +23238d2.bin=@23238d2.bin,0 +23238n0.bin=@23238n0.bin,0 +23238n1.bin=@23238n1.bin,0 +23238n2.bin=@23238n2.bin,0 +23239d0.bin=@23239d0.bin,0 +23239d1.bin=@23239d1.bin,0 +23239d2.bin=@23239d2.bin,0 +23239n0.bin=@23239n0.bin,0 +23239n1.bin=@23239n1.bin,0 +23239n2.bin=@23239n2.bin,0 +23257d0.bin=@23257d0.bin,0 +23257d1.bin=@23257d1.bin,0 +23257d2.bin=@23257d2.bin,0 +23257n0.bin=@23257n0.bin,0 +23257n1.bin=@23257n1.bin,0 +23257n2.bin=@23257n2.bin,0 +23258d0.bin=@23258d0.bin,0 +23258d1.bin=@23258d1.bin,0 +23258d2.bin=@23258d2.bin,0 +23258n0.bin=@23258n0.bin,0 +23258n1.bin=@23258n1.bin,0 +23258n2.bin=@23258n2.bin,0 +23284d0.bin=@23284d0.bin,0 +23284d1.bin=@23284d1.bin,0 +23284d2.bin=@23284d2.bin,0 +23284n0.bin=@23284n0.bin,0 +23284n1.bin=@23284n1.bin,0 +23284n2.bin=@23284n2.bin,0 +23285d0.bin=@23285d0.bin,0 +23285d1.bin=@23285d1.bin,0 +23285d2.bin=@23285d2.bin,0 +23285n0.bin=@23285n0.bin,0 +23285n1.bin=@23285n1.bin,0 +23285n2.bin=@23285n2.bin,0 +23311d0.bin=@23311d0.bin,0 +23311d1.bin=@23311d1.bin,0 +23311d2.bin=@23311d2.bin,0 +23311n0.bin=@23311n0.bin,0 +23311n1.bin=@23311n1.bin,0 +23311n2.bin=@23311n2.bin,0 +23346d0.bin=@23346d0.bin,0 +23346d1.bin=@23346d1.bin,0 +23346d2.bin=@23346d2.bin,0 +23346n0.bin=@23346n0.bin,0 +23346n1.bin=@23346n1.bin,0 +23346n2.bin=@23346n2.bin,0 +23347d0.bin=@23347d0.bin,0 +23347d1.bin=@23347d1.bin,0 +23347d2.bin=@23347d2.bin,0 +23347n0.bin=@23347n0.bin,0 +23347n1.bin=@23347n1.bin,0 +23347n2.bin=@23347n2.bin,0 +23371d0.bin=@23371d0.bin,0 +23371d1.bin=@23371d1.bin,0 +23371d2.bin=@23371d2.bin,0 +23371n0.bin=@23371n0.bin,0 +23371n1.bin=@23371n1.bin,0 +23371n2.bin=@23371n2.bin,0 +23372d0.bin=@23372d0.bin,0 +23372d1.bin=@23372d1.bin,0 +23372d2.bin=@23372d2.bin,0 +23372n0.bin=@23372n0.bin,0 +23372n1.bin=@23372n1.bin,0 +23372n2.bin=@23372n2.bin,0 +23386d0.bin=@23386d0.bin,0 +23386d1.bin=@23386d1.bin,0 +23386d2.bin=@23386d2.bin,0 +23386n0.bin=@23386n0.bin,0 +23386n1.bin=@23386n1.bin,0 +23386n2.bin=@23386n2.bin,0 +23387d0.bin=@23387d0.bin,0 +23387d1.bin=@23387d1.bin,0 +23387d2.bin=@23387d2.bin,0 +23387n0.bin=@23387n0.bin,0 +23387n1.bin=@23387n1.bin,0 +23387n2.bin=@23387n2.bin,0 +23224d0.bin=@23224d0.bin,0 +23224d1.bin=@23224d1.bin,0 +23224d2.bin=@23224d2.bin,0 +23224n0.bin=@23224n0.bin,0 +23236n0.bin=@23236n0.bin,0 +23236n1.bin=@23236n1.bin,0 +23236n2.bin=@23236n2.bin,0 +23237d0.bin=@23237d0.bin,0 +23237d1.bin=@23237d1.bin,0 +23237d2.bin=@23237d2.bin,0 +23237n0.bin=@23237n0.bin,0 +23237n1.bin=@23237n1.bin,0 +23237n2.bin=@23237n2.bin,0 +23240d0.bin=@23240d0.bin,0 +23240d1.bin=@23240d1.bin,0 +23240d2.bin=@23240d2.bin,0 +23240n0.bin=@23240n0.bin,0 +23240n1.bin=@23240n1.bin,0 +23240n2.bin=@23240n2.bin,0 +23241d0.bin=@23241d0.bin,0 +23241d1.bin=@23241d1.bin,0 +23241d2.bin=@23241d2.bin,0 +23241n0.bin=@23241n0.bin,0 +23241n1.bin=@23241n1.bin,0 +23241n2.bin=@23241n2.bin,0 +23250d0.bin=@23250d0.bin,0 +23250d1.bin=@23250d1.bin,0 +23250d2.bin=@23250d2.bin,0 +23250n0.bin=@23250n0.bin,0 +23250n1.bin=@23250n1.bin,0 +23250n2.bin=@23250n2.bin,0 +23251d0.bin=@23251d0.bin,0 +23251d1.bin=@23251d1.bin,0 +23251d2.bin=@23251d2.bin,0 +23251n0.bin=@23251n0.bin,0 +23251n1.bin=@23251n1.bin,0 +23251n2.bin=@23251n2.bin,0 +23252d0.bin=@23252d0.bin,0 +23252d1.bin=@23252d1.bin,0 +23252d2.bin=@23252d2.bin,0 +23252n0.bin=@23252n0.bin,0 +23252n1.bin=@23252n1.bin,0 +23252n2.bin=@23252n2.bin,0 +23259d0.bin=@23259d0.bin,0 +23259d1.bin=@23259d1.bin,0 +23259d2.bin=@23259d2.bin,0 +23259n0.bin=@23259n0.bin,0 +23259n1.bin=@23259n1.bin,0 +23259n2.bin=@23259n2.bin,0 +23260d0.bin=@23260d0.bin,0 +23260d1.bin=@23260d1.bin,0 +23260d2.bin=@23260d2.bin,0 +23260n0.bin=@23260n0.bin,0 +23260n1.bin=@23260n1.bin,0 +23260n2.bin=@23260n2.bin,0 +23286d0.bin=@23286d0.bin,0 +23286d1.bin=@23286d1.bin,0 +23286d2.bin=@23286d2.bin,0 +23286n0.bin=@23286n0.bin,0 +23286n1.bin=@23286n1.bin,0 +23286n2.bin=@23286n2.bin,0 +23287d0.bin=@23287d0.bin,0 +23287d1.bin=@23287d1.bin,0 +23287d2.bin=@23287d2.bin,0 +23287n0.bin=@23287n0.bin,0 +23287n1.bin=@23287n1.bin,0 +23287n2.bin=@23287n2.bin,0 +23288d0.bin=@23288d0.bin,0 +23288d1.bin=@23288d1.bin,0 +23288d2.bin=@23288d2.bin,0 +23288n0.bin=@23288n0.bin,0 +23288n1.bin=@23288n1.bin,0 +23288n2.bin=@23288n2.bin,0 +23289d0.bin=@23289d0.bin,0 +23289d1.bin=@23289d1.bin,0 +23289d2.bin=@23289d2.bin,0 +23289n0.bin=@23289n0.bin,0 +23289n1.bin=@23289n1.bin,0 +23289n2.bin=@23289n2.bin,0 +23325d0.bin=@23325d0.bin,0 +23325d1.bin=@23325d1.bin,0 +23325d2.bin=@23325d2.bin,0 +23325n0.bin=@23325n0.bin,0 +23325n1.bin=@23325n1.bin,0 +23325n2.bin=@23325n2.bin,0 +23327d0.bin=@23327d0.bin,0 +23327d1.bin=@23327d1.bin,0 +23327d2.bin=@23327d2.bin,0 +23327n0.bin=@23327n0.bin,0 +23327n1.bin=@23327n1.bin,0 +23327n2.bin=@23327n2.bin,0 +23348d0.bin=@23348d0.bin,0 +23348d1.bin=@23348d1.bin,0 +23348d2.bin=@23348d2.bin,0 +23348n0.bin=@23348n0.bin,0 +23348n1.bin=@23348n1.bin,0 +23348n2.bin=@23348n2.bin,0 +23349d0.bin=@23349d0.bin,0 +23349d1.bin=@23349d1.bin,0 +23349d2.bin=@23349d2.bin,0 +23349n0.bin=@23349n0.bin,0 +23349n1.bin=@23349n1.bin,0 +23349n2.bin=@23349n2.bin,0 +23382d0.bin=@23382d0.bin,0 +23382d1.bin=@23382d1.bin,0 +23382d2.bin=@23382d2.bin,0 +23382n0.bin=@23382n0.bin,0 +23382n1.bin=@23382n1.bin,0 +23382n2.bin=@23382n2.bin,0 +23383d0.bin=@23383d0.bin,0 +23383d1.bin=@23383d1.bin,0 +23383d2.bin=@23383d2.bin,0 +23383n0.bin=@23383n0.bin,0 +23383n1.bin=@23383n1.bin,0 +23383n2.bin=@23383n2.bin,0 +23384d0.bin=@23384d0.bin,0 +23384d1.bin=@23384d1.bin,0 +23384d2.bin=@23384d2.bin,0 +23384n0.bin=@23384n0.bin,0 +23384n1.bin=@23384n1.bin,0 +23384n2.bin=@23384n2.bin,0 +23385d0.bin=@23385d0.bin,0 +23385d1.bin=@23385d1.bin,0 +23385d2.bin=@23385d2.bin,0 +23385n0.bin=@23385n0.bin,0 +23385n1.bin=@23385n1.bin,0 +23385n2.bin=@23385n2.bin,0 +23394d0.bin=@23394d0.bin,0 +23394d1.bin=@23394d1.bin,0 +23394d2.bin=@23394d2.bin,0 +23394n0.bin=@23394n0.bin,0 +23394n1.bin=@23394n1.bin,0 +23394n2.bin=@23394n2.bin,0 +23395d0.bin=@23395d0.bin,0 +23395d1.bin=@23395d1.bin,0 +23395d2.bin=@23395d2.bin,0 +23395n0.bin=@23395n0.bin,0 +23395n1.bin=@23395n1.bin,0 +23395n2.bin=@23395n2.bin,0 +23396d0.bin=@23396d0.bin,0 +23396d1.bin=@23396d1.bin,0 +23396d2.bin=@23396d2.bin,0 +23396n0.bin=@23396n0.bin,0 +23396n1.bin=@23396n1.bin,0 +23396n2.bin=@23396n2.bin,0 +23236d0.bin=@23236d0.bin,0 +23236d1.bin=@23236d1.bin,0 +23236d2.bin=@23236d2.bin,0 +23234d2.bin=@23234d2.bin,0 +23234n0.bin=@23234n0.bin,0 +23234n1.bin=@23234n1.bin,0 +23234n2.bin=@23234n2.bin,0 +23235d0.bin=@23235d0.bin,0 +23235d1.bin=@23235d1.bin,0 +23235d2.bin=@23235d2.bin,0 +23235n0.bin=@23235n0.bin,0 +23235n1.bin=@23235n1.bin,0 +23235n2.bin=@23235n2.bin,0 +23246d0.bin=@23246d0.bin,0 +23246d1.bin=@23246d1.bin,0 +23246d2.bin=@23246d2.bin,0 +23246n0.bin=@23246n0.bin,0 +23246n1.bin=@23246n1.bin,0 +23246n2.bin=@23246n2.bin,0 +23247d0.bin=@23247d0.bin,0 +23247d1.bin=@23247d1.bin,0 +23247d2.bin=@23247d2.bin,0 +23247n0.bin=@23247n0.bin,0 +23247n1.bin=@23247n1.bin,0 +23247n2.bin=@23247n2.bin,0 +23248d0.bin=@23248d0.bin,0 +23248d1.bin=@23248d1.bin,0 +23248d2.bin=@23248d2.bin,0 +23248n0.bin=@23248n0.bin,0 +23248n1.bin=@23248n1.bin,0 +23248n2.bin=@23248n2.bin,0 +23249d0.bin=@23249d0.bin,0 +23249d1.bin=@23249d1.bin,0 +23249d2.bin=@23249d2.bin,0 +23249n0.bin=@23249n0.bin,0 +23249n1.bin=@23249n1.bin,0 +23249n2.bin=@23249n2.bin,0 +23261d0.bin=@23261d0.bin,0 +23261d1.bin=@23261d1.bin,0 +23261d2.bin=@23261d2.bin,0 +23261n0.bin=@23261n0.bin,0 +23261n1.bin=@23261n1.bin,0 +23261n2.bin=@23261n2.bin,0 +23262d0.bin=@23262d0.bin,0 +23262d1.bin=@23262d1.bin,0 +23262d2.bin=@23262d2.bin,0 +23262n0.bin=@23262n0.bin,0 +23262n1.bin=@23262n1.bin,0 +23262n2.bin=@23262n2.bin,0 +23267d0.bin=@23267d0.bin,0 +23267d1.bin=@23267d1.bin,0 +23267d2.bin=@23267d2.bin,0 +23267n0.bin=@23267n0.bin,0 +23267n1.bin=@23267n1.bin,0 +23267n2.bin=@23267n2.bin,0 +23268d0.bin=@23268d0.bin,0 +23268d1.bin=@23268d1.bin,0 +23268d2.bin=@23268d2.bin,0 +23268n0.bin=@23268n0.bin,0 +23268n1.bin=@23268n1.bin,0 +23268n2.bin=@23268n2.bin,0 +23275d0.bin=@23275d0.bin,0 +23275d1.bin=@23275d1.bin,0 +23275d2.bin=@23275d2.bin,0 +23275n0.bin=@23275n0.bin,0 +23275n1.bin=@23275n1.bin,0 +23275n2.bin=@23275n2.bin,0 +23309d0.bin=@23309d0.bin,0 +23309d1.bin=@23309d1.bin,0 +23309d2.bin=@23309d2.bin,0 +23309n0.bin=@23309n0.bin,0 +23309n1.bin=@23309n1.bin,0 +23309n2.bin=@23309n2.bin,0 +23310d0.bin=@23310d0.bin,0 +23310d1.bin=@23310d1.bin,0 +23310d2.bin=@23310d2.bin,0 +23310n0.bin=@23310n0.bin,0 +23310n1.bin=@23310n1.bin,0 +23310n2.bin=@23310n2.bin,0 +23345d0.bin=@23345d0.bin,0 +23345d1.bin=@23345d1.bin,0 +23345d2.bin=@23345d2.bin,0 +23345n0.bin=@23345n0.bin,0 +23345n1.bin=@23345n1.bin,0 +23345n2.bin=@23345n2.bin,0 +23397d0.bin=@23397d0.bin,0 +23397d1.bin=@23397d1.bin,0 +23397d2.bin=@23397d2.bin,0 +23397n0.bin=@23397n0.bin,0 +23397n1.bin=@23397n1.bin,0 +23397n2.bin=@23397n2.bin,0 +23398d0.bin=@23398d0.bin,0 +23398d1.bin=@23398d1.bin,0 +23398d2.bin=@23398d2.bin,0 +23398n0.bin=@23398n0.bin,0 +23398n1.bin=@23398n1.bin,0 +23398n2.bin=@23398n2.bin,0 +23403d0.bin=@23403d0.bin,0 +23403d1.bin=@23403d1.bin,0 +23403d2.bin=@23403d2.bin,0 +23403n0.bin=@23403n0.bin,0 +23403n1.bin=@23403n1.bin,0 +23403n2.bin=@23403n2.bin,0 +23404d0.bin=@23404d0.bin,0 +23404d1.bin=@23404d1.bin,0 +23404d2.bin=@23404d2.bin,0 +23404n0.bin=@23404n0.bin,0 +23404n1.bin=@23404n1.bin,0 +23404n2.bin=@23404n2.bin,0 +23425d0.bin=@23425d0.bin,0 +23425d1.bin=@23425d1.bin,0 +23425d2.bin=@23425d2.bin,0 +23425n0.bin=@23425n0.bin,0 +23425n1.bin=@23425n1.bin,0 +23425n2.bin=@23425n2.bin,0 +23426d0.bin=@23426d0.bin,0 +23426d1.bin=@23426d1.bin,0 +23426d2.bin=@23426d2.bin,0 +23426n0.bin=@23426n0.bin,0 +23426n1.bin=@23426n1.bin,0 +23426n2.bin=@23426n2.bin,0 +23433d0.bin=@23433d0.bin,0 +23433d1.bin=@23433d1.bin,0 +23433d2.bin=@23433d2.bin,0 +23433n0.bin=@23433n0.bin,0 +23433n1.bin=@23433n1.bin,0 +23433n2.bin=@23433n2.bin,0 +23434d0.bin=@23434d0.bin,0 +23434d1.bin=@23434d1.bin,0 +23434d2.bin=@23434d2.bin,0 +23434n0.bin=@23434n0.bin,0 +23434n1.bin=@23434n1.bin,0 +23434n2.bin=@23434n2.bin,0 +23234d0.bin=@23234d0.bin,0 +23234d1.bin=@23234d1.bin,0 +23242n0.bin=@23242n0.bin,0 +23242n1.bin=@23242n1.bin,0 +23242n2.bin=@23242n2.bin,0 +23243d0.bin=@23243d0.bin,0 +23243d1.bin=@23243d1.bin,0 +23243d2.bin=@23243d2.bin,0 +23243n0.bin=@23243n0.bin,0 +23243n1.bin=@23243n1.bin,0 +23243n2.bin=@23243n2.bin,0 +23244d0.bin=@23244d0.bin,0 +23244d1.bin=@23244d1.bin,0 +23244d2.bin=@23244d2.bin,0 +23244n0.bin=@23244n0.bin,0 +23244n1.bin=@23244n1.bin,0 +23244n2.bin=@23244n2.bin,0 +23245d0.bin=@23245d0.bin,0 +23245d1.bin=@23245d1.bin,0 +23245d2.bin=@23245d2.bin,0 +23245n0.bin=@23245n0.bin,0 +23245n1.bin=@23245n1.bin,0 +23245n2.bin=@23245n2.bin,0 +23263d0.bin=@23263d0.bin,0 +23263d1.bin=@23263d1.bin,0 +23263d2.bin=@23263d2.bin,0 +23263n0.bin=@23263n0.bin,0 +23263n1.bin=@23263n1.bin,0 +23263n2.bin=@23263n2.bin,0 +23264d0.bin=@23264d0.bin,0 +23264d1.bin=@23264d1.bin,0 +23264d2.bin=@23264d2.bin,0 +23264n0.bin=@23264n0.bin,0 +23264n1.bin=@23264n1.bin,0 +23264n2.bin=@23264n2.bin,0 +23277d0.bin=@23277d0.bin,0 +23277d1.bin=@23277d1.bin,0 +23277d2.bin=@23277d2.bin,0 +23277n0.bin=@23277n0.bin,0 +23277n1.bin=@23277n1.bin,0 +23277n2.bin=@23277n2.bin,0 +23278d0.bin=@23278d0.bin,0 +23278d1.bin=@23278d1.bin,0 +23278d2.bin=@23278d2.bin,0 +23278n0.bin=@23278n0.bin,0 +23278n1.bin=@23278n1.bin,0 +23278n2.bin=@23278n2.bin,0 +23279d0.bin=@23279d0.bin,0 +23279d1.bin=@23279d1.bin,0 +23279d2.bin=@23279d2.bin,0 +23279n0.bin=@23279n0.bin,0 +23279n1.bin=@23279n1.bin,0 +23279n2.bin=@23279n2.bin,0 +23307d0.bin=@23307d0.bin,0 +23307d1.bin=@23307d1.bin,0 +23307d2.bin=@23307d2.bin,0 +23307n0.bin=@23307n0.bin,0 +23307n1.bin=@23307n1.bin,0 +23307n2.bin=@23307n2.bin,0 +23312d0.bin=@23312d0.bin,0 +23312d1.bin=@23312d1.bin,0 +23312d2.bin=@23312d2.bin,0 +23312n0.bin=@23312n0.bin,0 +23312n1.bin=@23312n1.bin,0 +23312n2.bin=@23312n2.bin,0 +23313d0.bin=@23313d0.bin,0 +23313d1.bin=@23313d1.bin,0 +23313d2.bin=@23313d2.bin,0 +23313n0.bin=@23313n0.bin,0 +23313n1.bin=@23313n1.bin,0 +23313n2.bin=@23313n2.bin,0 +23318d0.bin=@23318d0.bin,0 +23318d1.bin=@23318d1.bin,0 +23318d2.bin=@23318d2.bin,0 +23318n0.bin=@23318n0.bin,0 +23318n1.bin=@23318n1.bin,0 +23318n2.bin=@23318n2.bin,0 +23319d0.bin=@23319d0.bin,0 +23319d1.bin=@23319d1.bin,0 +23319d2.bin=@23319d2.bin,0 +23319n0.bin=@23319n0.bin,0 +23319n1.bin=@23319n1.bin,0 +23319n2.bin=@23319n2.bin,0 +23322d0.bin=@23322d0.bin,0 +23322d1.bin=@23322d1.bin,0 +23322d2.bin=@23322d2.bin,0 +23322n0.bin=@23322n0.bin,0 +23322n1.bin=@23322n1.bin,0 +23322n2.bin=@23322n2.bin,0 +23342d0.bin=@23342d0.bin,0 +23342d1.bin=@23342d1.bin,0 +23342d2.bin=@23342d2.bin,0 +23342n0.bin=@23342n0.bin,0 +23342n1.bin=@23342n1.bin,0 +23342n2.bin=@23342n2.bin,0 +23343d0.bin=@23343d0.bin,0 +23343d1.bin=@23343d1.bin,0 +23343d2.bin=@23343d2.bin,0 +23343n0.bin=@23343n0.bin,0 +23343n1.bin=@23343n1.bin,0 +23343n2.bin=@23343n2.bin,0 +23344d0.bin=@23344d0.bin,0 +23344d1.bin=@23344d1.bin,0 +23344d2.bin=@23344d2.bin,0 +23344n0.bin=@23344n0.bin,0 +23344n1.bin=@23344n1.bin,0 +23344n2.bin=@23344n2.bin,0 +23373d0.bin=@23373d0.bin,0 +23373d1.bin=@23373d1.bin,0 +23373d2.bin=@23373d2.bin,0 +23373n0.bin=@23373n0.bin,0 +23373n1.bin=@23373n1.bin,0 +23373n2.bin=@23373n2.bin,0 +23429d0.bin=@23429d0.bin,0 +23429d1.bin=@23429d1.bin,0 +23429d2.bin=@23429d2.bin,0 +23429n0.bin=@23429n0.bin,0 +23429n1.bin=@23429n1.bin,0 +23429n2.bin=@23429n2.bin,0 +23430d0.bin=@23430d0.bin,0 +23430d1.bin=@23430d1.bin,0 +23430d2.bin=@23430d2.bin,0 +23430n0.bin=@23430n0.bin,0 +23430n1.bin=@23430n1.bin,0 +23430n2.bin=@23430n2.bin,0 +23431d0.bin=@23431d0.bin,0 +23431d1.bin=@23431d1.bin,0 +23431d2.bin=@23431d2.bin,0 +23431n0.bin=@23431n0.bin,0 +23431n1.bin=@23431n1.bin,0 +23431n2.bin=@23431n2.bin,0 +23432d0.bin=@23432d0.bin,0 +23432d1.bin=@23432d1.bin,0 +23432d2.bin=@23432d2.bin,0 +23432n0.bin=@23432n0.bin,0 +23432n1.bin=@23432n1.bin,0 +23432n2.bin=@23432n2.bin,0 +23242d0.bin=@23242d0.bin,0 +23242d1.bin=@23242d1.bin,0 +23242d2.bin=@23242d2.bin,0 +23265n2.bin=@23265n2.bin,0 +23266d0.bin=@23266d0.bin,0 +23266d1.bin=@23266d1.bin,0 +23266d2.bin=@23266d2.bin,0 +23266n0.bin=@23266n0.bin,0 +23266n1.bin=@23266n1.bin,0 +23266n2.bin=@23266n2.bin,0 +23306d0.bin=@23306d0.bin,0 +23306d1.bin=@23306d1.bin,0 +23306d2.bin=@23306d2.bin,0 +23306n0.bin=@23306n0.bin,0 +23306n1.bin=@23306n1.bin,0 +23306n2.bin=@23306n2.bin,0 +23308d0.bin=@23308d0.bin,0 +23308d1.bin=@23308d1.bin,0 +23308d2.bin=@23308d2.bin,0 +23308n0.bin=@23308n0.bin,0 +23308n1.bin=@23308n1.bin,0 +23308n2.bin=@23308n2.bin,0 +23314d0.bin=@23314d0.bin,0 +23314d1.bin=@23314d1.bin,0 +23314d2.bin=@23314d2.bin,0 +23314n0.bin=@23314n0.bin,0 +23314n1.bin=@23314n1.bin,0 +23314n2.bin=@23314n2.bin,0 +23367d0.bin=@23367d0.bin,0 +23367d1.bin=@23367d1.bin,0 +23367d2.bin=@23367d2.bin,0 +23367n0.bin=@23367n0.bin,0 +23367n1.bin=@23367n1.bin,0 +23367n2.bin=@23367n2.bin,0 +23368d0.bin=@23368d0.bin,0 +23368d1.bin=@23368d1.bin,0 +23368d2.bin=@23368d2.bin,0 +23368n0.bin=@23368n0.bin,0 +23368n1.bin=@23368n1.bin,0 +23368n2.bin=@23368n2.bin,0 +23380d0.bin=@23380d0.bin,0 +23380d1.bin=@23380d1.bin,0 +23380d2.bin=@23380d2.bin,0 +23380n0.bin=@23380n0.bin,0 +23380n1.bin=@23380n1.bin,0 +23380n2.bin=@23380n2.bin,0 +23381d0.bin=@23381d0.bin,0 +23381d1.bin=@23381d1.bin,0 +23381d2.bin=@23381d2.bin,0 +23381n0.bin=@23381n0.bin,0 +23381n1.bin=@23381n1.bin,0 +23381n2.bin=@23381n2.bin,0 +23392d0.bin=@23392d0.bin,0 +23392d1.bin=@23392d1.bin,0 +23392d2.bin=@23392d2.bin,0 +23392n0.bin=@23392n0.bin,0 +23392n1.bin=@23392n1.bin,0 +23392n2.bin=@23392n2.bin,0 +23393d0.bin=@23393d0.bin,0 +23393d1.bin=@23393d1.bin,0 +23393d2.bin=@23393d2.bin,0 +23393n0.bin=@23393n0.bin,0 +23393n1.bin=@23393n1.bin,0 +23393n2.bin=@23393n2.bin,0 +23402d0.bin=@23402d0.bin,0 +23402d1.bin=@23402d1.bin,0 +23402d2.bin=@23402d2.bin,0 +23402n0.bin=@23402n0.bin,0 +23402n1.bin=@23402n1.bin,0 +23402n2.bin=@23402n2.bin,0 +23424d0.bin=@23424d0.bin,0 +23424d1.bin=@23424d1.bin,0 +23424d2.bin=@23424d2.bin,0 +23424n0.bin=@23424n0.bin,0 +23424n1.bin=@23424n1.bin,0 +23424n2.bin=@23424n2.bin,0 +23427d0.bin=@23427d0.bin,0 +23427d1.bin=@23427d1.bin,0 +23427d2.bin=@23427d2.bin,0 +23427n0.bin=@23427n0.bin,0 +23427n1.bin=@23427n1.bin,0 +23427n2.bin=@23427n2.bin,0 +23428d0.bin=@23428d0.bin,0 +23428d1.bin=@23428d1.bin,0 +23428d2.bin=@23428d2.bin,0 +23428n0.bin=@23428n0.bin,0 +23428n1.bin=@23428n1.bin,0 +23428n2.bin=@23428n2.bin,0 +23514d0.bin=@23514d0.bin,0 +23514d1.bin=@23514d1.bin,0 +23514d2.bin=@23514d2.bin,0 +23514n0.bin=@23514n0.bin,0 +23514n1.bin=@23514n1.bin,0 +23514n2.bin=@23514n2.bin,0 +23515d0.bin=@23515d0.bin,0 +23515d1.bin=@23515d1.bin,0 +23515d2.bin=@23515d2.bin,0 +23515n0.bin=@23515n0.bin,0 +23515n1.bin=@23515n1.bin,0 +23515n2.bin=@23515n2.bin,0 +23626d0.bin=@23626d0.bin,0 +23626d1.bin=@23626d1.bin,0 +23626d2.bin=@23626d2.bin,0 +23626n0.bin=@23626n0.bin,0 +23626n1.bin=@23626n1.bin,0 +23626n2.bin=@23626n2.bin,0 +55016d0.bin=@55016d0.bin,0 +55016d1.bin=@55016d1.bin,0 +55016d2.bin=@55016d2.bin,0 +55016n0.bin=@55016n0.bin,0 +55016n1.bin=@55016n1.bin,0 +55016n2.bin=@55016n2.bin,0 +55202d0.bin=@55202d0.bin,0 +55202d1.bin=@55202d1.bin,0 +55202d2.bin=@55202d2.bin,0 +55202n0.bin=@55202n0.bin,0 +55202n1.bin=@55202n1.bin,0 +55202n2.bin=@55202n2.bin,0 +58073d0.bin=@58073d0.bin,0 +58073d1.bin=@58073d1.bin,0 +58073d2.bin=@58073d2.bin,0 +58073n0.bin=@58073n0.bin,0 +58073n1.bin=@58073n1.bin,0 +58073n2.bin=@58073n2.bin,0 +64551d0.bin=@64551d0.bin,0 +64551d1.bin=@64551d1.bin,0 +64551d2.bin=@64551d2.bin,0 +23265d0.bin=@23265d0.bin,0 +23265d1.bin=@23265d1.bin,0 +23265d2.bin=@23265d2.bin,0 +23265n0.bin=@23265n0.bin,0 +23265n1.bin=@23265n1.bin,0 +23648n1.bin=@23648n1.bin,0 +23648n2.bin=@23648n2.bin,0 +23649d0.bin=@23649d0.bin,0 +23649d1.bin=@23649d1.bin,0 +23649d2.bin=@23649d2.bin,0 +23649n0.bin=@23649n0.bin,0 +23649n1.bin=@23649n1.bin,0 +23649n2.bin=@23649n2.bin,0 +54926d0.bin=@54926d0.bin,0 +54926d1.bin=@54926d1.bin,0 +54926d2.bin=@54926d2.bin,0 +54926n0.bin=@54926n0.bin,0 +54926n1.bin=@54926n1.bin,0 +54926n2.bin=@54926n2.bin,0 +55195d0.bin=@55195d0.bin,0 +55195d1.bin=@55195d1.bin,0 +55195d2.bin=@55195d2.bin,0 +55195n0.bin=@55195n0.bin,0 +55195n1.bin=@55195n1.bin,0 +55195n2.bin=@55195n2.bin,0 +55529d0.bin=@55529d0.bin,0 +55529d1.bin=@55529d1.bin,0 +55529d2.bin=@55529d2.bin,0 +55529n0.bin=@55529n0.bin,0 +55529n1.bin=@55529n1.bin,0 +55529n2.bin=@55529n2.bin,0 +55530d0.bin=@55530d0.bin,0 +55530d1.bin=@55530d1.bin,0 +55530d2.bin=@55530d2.bin,0 +55530n0.bin=@55530n0.bin,0 +55530n1.bin=@55530n1.bin,0 +55530n2.bin=@55530n2.bin,0 +55531d0.bin=@55531d0.bin,0 +55531d1.bin=@55531d1.bin,0 +55531d2.bin=@55531d2.bin,0 +55531n0.bin=@55531n0.bin,0 +55531n1.bin=@55531n1.bin,0 +55531n2.bin=@55531n2.bin,0 +55532d0.bin=@55532d0.bin,0 +55532d1.bin=@55532d1.bin,0 +55532d2.bin=@55532d2.bin,0 +55532n0.bin=@55532n0.bin,0 +55532n1.bin=@55532n1.bin,0 +55532n2.bin=@55532n2.bin,0 +55534d0.bin=@55534d0.bin,0 +55534d1.bin=@55534d1.bin,0 +55534d2.bin=@55534d2.bin,0 +55534n0.bin=@55534n0.bin,0 +55534n1.bin=@55534n1.bin,0 +55534n2.bin=@55534n2.bin,0 +55535d0.bin=@55535d0.bin,0 +55535d1.bin=@55535d1.bin,0 +55535d2.bin=@55535d2.bin,0 +55535n0.bin=@55535n0.bin,0 +55535n1.bin=@55535n1.bin,0 +55535n2.bin=@55535n2.bin,0 +55714d0.bin=@55714d0.bin,0 +55714d1.bin=@55714d1.bin,0 +55714d2.bin=@55714d2.bin,0 +55714n0.bin=@55714n0.bin,0 +55714n1.bin=@55714n1.bin,0 +55714n2.bin=@55714n2.bin,0 +55917d0.bin=@55917d0.bin,0 +55917d1.bin=@55917d1.bin,0 +55917d2.bin=@55917d2.bin,0 +55917n0.bin=@55917n0.bin,0 +55917n1.bin=@55917n1.bin,0 +55917n2.bin=@55917n2.bin,0 +55918d0.bin=@55918d0.bin,0 +55918d1.bin=@55918d1.bin,0 +55918d2.bin=@55918d2.bin,0 +55918n0.bin=@55918n0.bin,0 +55918n1.bin=@55918n1.bin,0 +55918n2.bin=@55918n2.bin,0 +55920d0.bin=@55920d0.bin,0 +55920d1.bin=@55920d1.bin,0 +55920d2.bin=@55920d2.bin,0 +55920n0.bin=@55920n0.bin,0 +55920n1.bin=@55920n1.bin,0 +55920n2.bin=@55920n2.bin,0 +55921d0.bin=@55921d0.bin,0 +55921d1.bin=@55921d1.bin,0 +55921d2.bin=@55921d2.bin,0 +55921n0.bin=@55921n0.bin,0 +55921n1.bin=@55921n1.bin,0 +55921n2.bin=@55921n2.bin,0 +55922d0.bin=@55922d0.bin,0 +55922d1.bin=@55922d1.bin,0 +55922d2.bin=@55922d2.bin,0 +55922n0.bin=@55922n0.bin,0 +55922n1.bin=@55922n1.bin,0 +55922n2.bin=@55922n2.bin,0 +55935d0.bin=@55935d0.bin,0 +55935d1.bin=@55935d1.bin,0 +55935d2.bin=@55935d2.bin,0 +55935n0.bin=@55935n0.bin,0 +55935n1.bin=@55935n1.bin,0 +55935n2.bin=@55935n2.bin,0 +55936d0.bin=@55936d0.bin,0 +55936d1.bin=@55936d1.bin,0 +55936d2.bin=@55936d2.bin,0 +55936n0.bin=@55936n0.bin,0 +55936n1.bin=@55936n1.bin,0 +55936n2.bin=@55936n2.bin,0 +55948d0.bin=@55948d0.bin,0 +55948d1.bin=@55948d1.bin,0 +55948d2.bin=@55948d2.bin,0 +55948n0.bin=@55948n0.bin,0 +55948n1.bin=@55948n1.bin,0 +55948n2.bin=@55948n2.bin,0 +55949d0.bin=@55949d0.bin,0 +55949d1.bin=@55949d1.bin,0 +55949d2.bin=@55949d2.bin,0 +55949n0.bin=@55949n0.bin,0 +55949n1.bin=@55949n1.bin,0 +55949n2.bin=@55949n2.bin,0 +55950d0.bin=@55950d0.bin,0 +55950d1.bin=@55950d1.bin,0 +55950d2.bin=@55950d2.bin,0 +55950n0.bin=@55950n0.bin,0 +55950n1.bin=@55950n1.bin,0 +55950n2.bin=@55950n2.bin,0 +55951d0.bin=@55951d0.bin,0 +55951d1.bin=@55951d1.bin,0 +55951d2.bin=@55951d2.bin,0 +55951n0.bin=@55951n0.bin,0 +55951n1.bin=@55951n1.bin,0 +55951n2.bin=@55951n2.bin,0 +56106d0.bin=@56106d0.bin,0 +56106d1.bin=@56106d1.bin,0 +56106d2.bin=@56106d2.bin,0 +56106n0.bin=@56106n0.bin,0 +56106n1.bin=@56106n1.bin,0 +56106n2.bin=@56106n2.bin,0 +56115d0.bin=@56115d0.bin,0 +56115d1.bin=@56115d1.bin,0 +56115d2.bin=@56115d2.bin,0 +56115n0.bin=@56115n0.bin,0 +56115n1.bin=@56115n1.bin,0 +56115n2.bin=@56115n2.bin,0 +56126d0.bin=@56126d0.bin,0 +56126d1.bin=@56126d1.bin,0 +56126d2.bin=@56126d2.bin,0 +56126n0.bin=@56126n0.bin,0 +56126n1.bin=@56126n1.bin,0 +56126n2.bin=@56126n2.bin,0 +56127d0.bin=@56127d0.bin,0 +56127d1.bin=@56127d1.bin,0 +56127d2.bin=@56127d2.bin,0 +56127n0.bin=@56127n0.bin,0 +56127n1.bin=@56127n1.bin,0 +56127n2.bin=@56127n2.bin,0 +56128d0.bin=@56128d0.bin,0 +56128d1.bin=@56128d1.bin,0 +56128d2.bin=@56128d2.bin,0 +56128n0.bin=@56128n0.bin,0 +56128n1.bin=@56128n1.bin,0 +56128n2.bin=@56128n2.bin,0 +56130d0.bin=@56130d0.bin,0 +56130d1.bin=@56130d1.bin,0 +56130d2.bin=@56130d2.bin,0 +56130n0.bin=@56130n0.bin,0 +56130n1.bin=@56130n1.bin,0 +56130n2.bin=@56130n2.bin,0 +56131d0.bin=@56131d0.bin,0 +56131d1.bin=@56131d1.bin,0 +56131d2.bin=@56131d2.bin,0 +56131n0.bin=@56131n0.bin,0 +56131n1.bin=@56131n1.bin,0 +56131n2.bin=@56131n2.bin,0 +56133d0.bin=@56133d0.bin,0 +56133d1.bin=@56133d1.bin,0 +56133d2.bin=@56133d2.bin,0 +56133n0.bin=@56133n0.bin,0 +56133n1.bin=@56133n1.bin,0 +56133n2.bin=@56133n2.bin,0 +56152d0.bin=@56152d0.bin,0 +56152d1.bin=@56152d1.bin,0 +56152d2.bin=@56152d2.bin,0 +56152n0.bin=@56152n0.bin,0 +56152n1.bin=@56152n1.bin,0 +56152n2.bin=@56152n2.bin,0 +56153d0.bin=@56153d0.bin,0 +56153d1.bin=@56153d1.bin,0 +56153d2.bin=@56153d2.bin,0 +56153n0.bin=@56153n0.bin,0 +56153n1.bin=@56153n1.bin,0 +56153n2.bin=@56153n2.bin,0 +56158d0.bin=@56158d0.bin,0 +56158d1.bin=@56158d1.bin,0 +56158d2.bin=@56158d2.bin,0 +56158n0.bin=@56158n0.bin,0 +56158n1.bin=@56158n1.bin,0 +56158n2.bin=@56158n2.bin,0 +23648d0.bin=@23648d0.bin,0 +23648d1.bin=@23648d1.bin,0 +23648d2.bin=@23648d2.bin,0 +23648n0.bin=@23648n0.bin,0 +23468n0.bin=@23468n0.bin,0 +23468n1.bin=@23468n1.bin,0 +23468n2.bin=@23468n2.bin,0 +23472d0.bin=@23472d0.bin,0 +23472d1.bin=@23472d1.bin,0 +23472d2.bin=@23472d2.bin,0 +23472n0.bin=@23472n0.bin,0 +23472n1.bin=@23472n1.bin,0 +23472n2.bin=@23472n2.bin,0 +23476d0.bin=@23476d0.bin,0 +23476d1.bin=@23476d1.bin,0 +23476d2.bin=@23476d2.bin,0 +23476n0.bin=@23476n0.bin,0 +23476n1.bin=@23476n1.bin,0 +23476n2.bin=@23476n2.bin,0 +23480d0.bin=@23480d0.bin,0 +23480d1.bin=@23480d1.bin,0 +23480d2.bin=@23480d2.bin,0 +23480n0.bin=@23480n0.bin,0 +23480n1.bin=@23480n1.bin,0 +23480n2.bin=@23480n2.bin,0 +23516d0.bin=@23516d0.bin,0 +23516d1.bin=@23516d1.bin,0 +23516d2.bin=@23516d2.bin,0 +23516n0.bin=@23516n0.bin,0 +23516n1.bin=@23516n1.bin,0 +23516n2.bin=@23516n2.bin,0 +23520d0.bin=@23520d0.bin,0 +23520d1.bin=@23520d1.bin,0 +23520d2.bin=@23520d2.bin,0 +23520n0.bin=@23520n0.bin,0 +23520n1.bin=@23520n1.bin,0 +23520n2.bin=@23520n2.bin,0 +23536d0.bin=@23536d0.bin,0 +23536d1.bin=@23536d1.bin,0 +23536d2.bin=@23536d2.bin,0 +23536n0.bin=@23536n0.bin,0 +23536n1.bin=@23536n1.bin,0 +23536n2.bin=@23536n2.bin,0 +23540d0.bin=@23540d0.bin,0 +23540d1.bin=@23540d1.bin,0 +23540d2.bin=@23540d2.bin,0 +23540n0.bin=@23540n0.bin,0 +23540n1.bin=@23540n1.bin,0 +23540n2.bin=@23540n2.bin,0 +23606d0.bin=@23606d0.bin,0 +23606d1.bin=@23606d1.bin,0 +23606d2.bin=@23606d2.bin,0 +23606n0.bin=@23606n0.bin,0 +23606n1.bin=@23606n1.bin,0 +23606n2.bin=@23606n2.bin,0 +23610d0.bin=@23610d0.bin,0 +23610d1.bin=@23610d1.bin,0 +23610d2.bin=@23610d2.bin,0 +23610n0.bin=@23610n0.bin,0 +23610n1.bin=@23610n1.bin,0 +23610n2.bin=@23610n2.bin,0 +23614d0.bin=@23614d0.bin,0 +23614d1.bin=@23614d1.bin,0 +23614d2.bin=@23614d2.bin,0 +23614n0.bin=@23614n0.bin,0 +23614n1.bin=@23614n1.bin,0 +23614n2.bin=@23614n2.bin,0 +23618d0.bin=@23618d0.bin,0 +23618d1.bin=@23618d1.bin,0 +23618d2.bin=@23618d2.bin,0 +23618n0.bin=@23618n0.bin,0 +23618n1.bin=@23618n1.bin,0 +23618n2.bin=@23618n2.bin,0 +23622d0.bin=@23622d0.bin,0 +23622d1.bin=@23622d1.bin,0 +23622d2.bin=@23622d2.bin,0 +23622n0.bin=@23622n0.bin,0 +23622n1.bin=@23622n1.bin,0 +23622n2.bin=@23622n2.bin,0 +23644d0.bin=@23644d0.bin,0 +23644d1.bin=@23644d1.bin,0 +23644d2.bin=@23644d2.bin,0 +23644n0.bin=@23644n0.bin,0 +23644n1.bin=@23644n1.bin,0 +23644n2.bin=@23644n2.bin,0 +23655d0.bin=@23655d0.bin,0 +23655d1.bin=@23655d1.bin,0 +23655d2.bin=@23655d2.bin,0 +23655n0.bin=@23655n0.bin,0 +23655n1.bin=@23655n1.bin,0 +23655n2.bin=@23655n2.bin,0 +23659d0.bin=@23659d0.bin,0 +23659d1.bin=@23659d1.bin,0 +23659d2.bin=@23659d2.bin,0 +23659n0.bin=@23659n0.bin,0 +23659n1.bin=@23659n1.bin,0 +23659n2.bin=@23659n2.bin,0 +23668d0.bin=@23668d0.bin,0 +23668d1.bin=@23668d1.bin,0 +23668d2.bin=@23668d2.bin,0 +23668n0.bin=@23668n0.bin,0 +23668n1.bin=@23668n1.bin,0 +23668n2.bin=@23668n2.bin,0 +23705d0.bin=@23705d0.bin,0 +23705d1.bin=@23705d1.bin,0 +23705d2.bin=@23705d2.bin,0 +23705n0.bin=@23705n0.bin,0 +23705n1.bin=@23705n1.bin,0 +23705n2.bin=@23705n2.bin,0 +23709d0.bin=@23709d0.bin,0 +23709d1.bin=@23709d1.bin,0 +23709d2.bin=@23709d2.bin,0 +23709n0.bin=@23709n0.bin,0 +23709n1.bin=@23709n1.bin,0 +23709n2.bin=@23709n2.bin,0 +23713d0.bin=@23713d0.bin,0 +23713d1.bin=@23713d1.bin,0 +23713d2.bin=@23713d2.bin,0 +23713n0.bin=@23713n0.bin,0 +23713n1.bin=@23713n1.bin,0 +23713n2.bin=@23713n2.bin,0 +23718d0.bin=@23718d0.bin,0 +23718d1.bin=@23718d1.bin,0 +23718d2.bin=@23718d2.bin,0 +23718n0.bin=@23718n0.bin,0 +23718n1.bin=@23718n1.bin,0 +23718n2.bin=@23718n2.bin,0 +40236d0.bin=@40236d0.bin,0 +40236d1.bin=@40236d1.bin,0 +40236d2.bin=@40236d2.bin,0 +40236n0.bin=@40236n0.bin,0 +40236n1.bin=@40236n1.bin,0 +40236n2.bin=@40236n2.bin,0 +55691d0.bin=@55691d0.bin,0 +55691d1.bin=@55691d1.bin,0 +55691d2.bin=@55691d2.bin,0 +55691n0.bin=@55691n0.bin,0 +55691n1.bin=@55691n1.bin,0 +55691n2.bin=@55691n2.bin,0 +55692d0.bin=@55692d0.bin,0 +55692d1.bin=@55692d1.bin,0 +55692d2.bin=@55692d2.bin,0 +55692n0.bin=@55692n0.bin,0 +55692n1.bin=@55692n1.bin,0 +55692n2.bin=@55692n2.bin,0 +55693d0.bin=@55693d0.bin,0 +55693d1.bin=@55693d1.bin,0 +55693d2.bin=@55693d2.bin,0 +55693n0.bin=@55693n0.bin,0 +55693n1.bin=@55693n1.bin,0 +55693n2.bin=@55693n2.bin,0 +55694d0.bin=@55694d0.bin,0 +55694d1.bin=@55694d1.bin,0 +55694d2.bin=@55694d2.bin,0 +55694n0.bin=@55694n0.bin,0 +55694n1.bin=@55694n1.bin,0 +55694n2.bin=@55694n2.bin,0 +55695d0.bin=@55695d0.bin,0 +55695d1.bin=@55695d1.bin,0 +55695d2.bin=@55695d2.bin,0 +55695n0.bin=@55695n0.bin,0 +55695n1.bin=@55695n1.bin,0 +55695n2.bin=@55695n2.bin,0 +55696d0.bin=@55696d0.bin,0 +55696d1.bin=@55696d1.bin,0 +55696d2.bin=@55696d2.bin,0 +55696n0.bin=@55696n0.bin,0 +55696n1.bin=@55696n1.bin,0 +55696n2.bin=@55696n2.bin,0 +55697d0.bin=@55697d0.bin,0 +55697d1.bin=@55697d1.bin,0 +55697d2.bin=@55697d2.bin,0 +55697n0.bin=@55697n0.bin,0 +55697n1.bin=@55697n1.bin,0 +55697n2.bin=@55697n2.bin,0 +55698d0.bin=@55698d0.bin,0 +55698d1.bin=@55698d1.bin,0 +55698d2.bin=@55698d2.bin,0 +55698n0.bin=@55698n0.bin,0 +55698n1.bin=@55698n1.bin,0 +55698n2.bin=@55698n2.bin,0 +55728d0.bin=@55728d0.bin,0 +55728d1.bin=@55728d1.bin,0 +55728d2.bin=@55728d2.bin,0 +55728n0.bin=@55728n0.bin,0 +55728n1.bin=@55728n1.bin,0 +55728n2.bin=@55728n2.bin,0 +55738d0.bin=@55738d0.bin,0 +55738d1.bin=@55738d1.bin,0 +55738d2.bin=@55738d2.bin,0 +55738n0.bin=@55738n0.bin,0 +55738n1.bin=@55738n1.bin,0 +55738n2.bin=@55738n2.bin,0 +55923d0.bin=@55923d0.bin,0 +55923d1.bin=@55923d1.bin,0 +55923d2.bin=@55923d2.bin,0 +55923n0.bin=@55923n0.bin,0 +55923n1.bin=@55923n1.bin,0 +55923n2.bin=@55923n2.bin,0 +55929d0.bin=@55929d0.bin,0 +55929d1.bin=@55929d1.bin,0 +55929d2.bin=@55929d2.bin,0 +55929n0.bin=@55929n0.bin,0 +55929n1.bin=@55929n1.bin,0 +55929n2.bin=@55929n2.bin,0 +56076d0.bin=@56076d0.bin,0 +56076d1.bin=@56076d1.bin,0 +56076d2.bin=@56076d2.bin,0 +56076n0.bin=@56076n0.bin,0 +56076n1.bin=@56076n1.bin,0 +56076n2.bin=@56076n2.bin,0 +56077d0.bin=@56077d0.bin,0 +56077d1.bin=@56077d1.bin,0 +56077d2.bin=@56077d2.bin,0 +56077n0.bin=@56077n0.bin,0 +56077n1.bin=@56077n1.bin,0 +56077n2.bin=@56077n2.bin,0 +56078d0.bin=@56078d0.bin,0 +56078d1.bin=@56078d1.bin,0 +56078d2.bin=@56078d2.bin,0 +56078n0.bin=@56078n0.bin,0 +56078n1.bin=@56078n1.bin,0 +56078n2.bin=@56078n2.bin,0 +56079d0.bin=@56079d0.bin,0 +56079d1.bin=@56079d1.bin,0 +56079d2.bin=@56079d2.bin,0 +56079n0.bin=@56079n0.bin,0 +56079n1.bin=@56079n1.bin,0 +56079n2.bin=@56079n2.bin,0 +56080d0.bin=@56080d0.bin,0 +56080d1.bin=@56080d1.bin,0 +56080d2.bin=@56080d2.bin,0 +56080n0.bin=@56080n0.bin,0 +56080n1.bin=@56080n1.bin,0 +56080n2.bin=@56080n2.bin,0 +56125d0.bin=@56125d0.bin,0 +56125d1.bin=@56125d1.bin,0 +56125d2.bin=@56125d2.bin,0 +56125n0.bin=@56125n0.bin,0 +56125n1.bin=@56125n1.bin,0 +56125n2.bin=@56125n2.bin,0 +56144d0.bin=@56144d0.bin,0 +56144d1.bin=@56144d1.bin,0 +56144d2.bin=@56144d2.bin,0 +56144n0.bin=@56144n0.bin,0 +56144n1.bin=@56144n1.bin,0 +56144n2.bin=@56144n2.bin,0 +56145d0.bin=@56145d0.bin,0 +56145d1.bin=@56145d1.bin,0 +56145d2.bin=@56145d2.bin,0 +56145n0.bin=@56145n0.bin,0 +56145n1.bin=@56145n1.bin,0 +56145n2.bin=@56145n2.bin,0 +56150d0.bin=@56150d0.bin,0 +56150d1.bin=@56150d1.bin,0 +56150d2.bin=@56150d2.bin,0 +56150n0.bin=@56150n0.bin,0 +56150n1.bin=@56150n1.bin,0 +56150n2.bin=@56150n2.bin,0 +56151d0.bin=@56151d0.bin,0 +56151d1.bin=@56151d1.bin,0 +56151d2.bin=@56151d2.bin,0 +56151n0.bin=@56151n0.bin,0 +56151n1.bin=@56151n1.bin,0 +56151n2.bin=@56151n2.bin,0 +56154d0.bin=@56154d0.bin,0 +56154d1.bin=@56154d1.bin,0 +56154d2.bin=@56154d2.bin,0 +56154n0.bin=@56154n0.bin,0 +56154n1.bin=@56154n1.bin,0 +56154n2.bin=@56154n2.bin,0 +56155d0.bin=@56155d0.bin,0 +56155d1.bin=@56155d1.bin,0 +56155d2.bin=@56155d2.bin,0 +56155n0.bin=@56155n0.bin,0 +56155n1.bin=@56155n1.bin,0 +56155n2.bin=@56155n2.bin,0 +56156d0.bin=@56156d0.bin,0 +56156d1.bin=@56156d1.bin,0 +56156d2.bin=@56156d2.bin,0 +56156n0.bin=@56156n0.bin,0 +56156n1.bin=@56156n1.bin,0 +56156n2.bin=@56156n2.bin,0 +23468d0.bin=@23468d0.bin,0 +23468d1.bin=@23468d1.bin,0 +23468d2.bin=@23468d2.bin,0 +23469n2.bin=@23469n2.bin,0 +23473d0.bin=@23473d0.bin,0 +23473d1.bin=@23473d1.bin,0 +23473d2.bin=@23473d2.bin,0 +23473n0.bin=@23473n0.bin,0 +23473n1.bin=@23473n1.bin,0 +23473n2.bin=@23473n2.bin,0 +23477d0.bin=@23477d0.bin,0 +23477d1.bin=@23477d1.bin,0 +23477d2.bin=@23477d2.bin,0 +23477n0.bin=@23477n0.bin,0 +23477n1.bin=@23477n1.bin,0 +23477n2.bin=@23477n2.bin,0 +23481d0.bin=@23481d0.bin,0 +23481d1.bin=@23481d1.bin,0 +23481d2.bin=@23481d2.bin,0 +23481n0.bin=@23481n0.bin,0 +23481n1.bin=@23481n1.bin,0 +23481n2.bin=@23481n2.bin,0 +23517d0.bin=@23517d0.bin,0 +23517d1.bin=@23517d1.bin,0 +23517d2.bin=@23517d2.bin,0 +23517n0.bin=@23517n0.bin,0 +23517n1.bin=@23517n1.bin,0 +23517n2.bin=@23517n2.bin,0 +23521d0.bin=@23521d0.bin,0 +23521d1.bin=@23521d1.bin,0 +23521d2.bin=@23521d2.bin,0 +23521n0.bin=@23521n0.bin,0 +23521n1.bin=@23521n1.bin,0 +23521n2.bin=@23521n2.bin,0 +23537d0.bin=@23537d0.bin,0 +23537d1.bin=@23537d1.bin,0 +23537d2.bin=@23537d2.bin,0 +23537n0.bin=@23537n0.bin,0 +23537n1.bin=@23537n1.bin,0 +23537n2.bin=@23537n2.bin,0 +23541d0.bin=@23541d0.bin,0 +23541d1.bin=@23541d1.bin,0 +23541d2.bin=@23541d2.bin,0 +23541n0.bin=@23541n0.bin,0 +23541n1.bin=@23541n1.bin,0 +23541n2.bin=@23541n2.bin,0 +23607d0.bin=@23607d0.bin,0 +23607d1.bin=@23607d1.bin,0 +23607d2.bin=@23607d2.bin,0 +23607n0.bin=@23607n0.bin,0 +23607n1.bin=@23607n1.bin,0 +23607n2.bin=@23607n2.bin,0 +23611d0.bin=@23611d0.bin,0 +23611d1.bin=@23611d1.bin,0 +23611d2.bin=@23611d2.bin,0 +23611n0.bin=@23611n0.bin,0 +23611n1.bin=@23611n1.bin,0 +23611n2.bin=@23611n2.bin,0 +23615d0.bin=@23615d0.bin,0 +23615d1.bin=@23615d1.bin,0 +23615d2.bin=@23615d2.bin,0 +23615n0.bin=@23615n0.bin,0 +23615n1.bin=@23615n1.bin,0 +23615n2.bin=@23615n2.bin,0 +23619d0.bin=@23619d0.bin,0 +23619d1.bin=@23619d1.bin,0 +23619d2.bin=@23619d2.bin,0 +23619n0.bin=@23619n0.bin,0 +23619n1.bin=@23619n1.bin,0 +23619n2.bin=@23619n2.bin,0 +23623d0.bin=@23623d0.bin,0 +23623d1.bin=@23623d1.bin,0 +23623d2.bin=@23623d2.bin,0 +23623n0.bin=@23623n0.bin,0 +23623n1.bin=@23623n1.bin,0 +23623n2.bin=@23623n2.bin,0 +23645d0.bin=@23645d0.bin,0 +23645d1.bin=@23645d1.bin,0 +23645d2.bin=@23645d2.bin,0 +23645n0.bin=@23645n0.bin,0 +23645n1.bin=@23645n1.bin,0 +23645n2.bin=@23645n2.bin,0 +23656d0.bin=@23656d0.bin,0 +23656d1.bin=@23656d1.bin,0 +23656d2.bin=@23656d2.bin,0 +23656n0.bin=@23656n0.bin,0 +23656n1.bin=@23656n1.bin,0 +23656n2.bin=@23656n2.bin,0 +23660d0.bin=@23660d0.bin,0 +23660d1.bin=@23660d1.bin,0 +23660d2.bin=@23660d2.bin,0 +23660n0.bin=@23660n0.bin,0 +23660n1.bin=@23660n1.bin,0 +23660n2.bin=@23660n2.bin,0 +23669d0.bin=@23669d0.bin,0 +23669d1.bin=@23669d1.bin,0 +23669d2.bin=@23669d2.bin,0 +23669n0.bin=@23669n0.bin,0 +23669n1.bin=@23669n1.bin,0 +23669n2.bin=@23669n2.bin,0 +23706d0.bin=@23706d0.bin,0 +23706d1.bin=@23706d1.bin,0 +23706d2.bin=@23706d2.bin,0 +23706n0.bin=@23706n0.bin,0 +23706n1.bin=@23706n1.bin,0 +23706n2.bin=@23706n2.bin,0 +23710d0.bin=@23710d0.bin,0 +23710d1.bin=@23710d1.bin,0 +23710d2.bin=@23710d2.bin,0 +23710n0.bin=@23710n0.bin,0 +23710n1.bin=@23710n1.bin,0 +23710n2.bin=@23710n2.bin,0 +23714d0.bin=@23714d0.bin,0 +23714d1.bin=@23714d1.bin,0 +23714d2.bin=@23714d2.bin,0 +23714n0.bin=@23714n0.bin,0 +23714n1.bin=@23714n1.bin,0 +23714n2.bin=@23714n2.bin,0 +23719d0.bin=@23719d0.bin,0 +23719d1.bin=@23719d1.bin,0 +23719d2.bin=@23719d2.bin,0 +23719n0.bin=@23719n0.bin,0 +23719n1.bin=@23719n1.bin,0 +23719n2.bin=@23719n2.bin,0 +55513d0.bin=@55513d0.bin,0 +55513d1.bin=@55513d1.bin,0 +55513d2.bin=@55513d2.bin,0 +55513n0.bin=@55513n0.bin,0 +55513n1.bin=@55513n1.bin,0 +55513n2.bin=@55513n2.bin,0 +55924d0.bin=@55924d0.bin,0 +55924d1.bin=@55924d1.bin,0 +55924d2.bin=@55924d2.bin,0 +55924n0.bin=@55924n0.bin,0 +55924n1.bin=@55924n1.bin,0 +55924n2.bin=@55924n2.bin,0 +55930d0.bin=@55930d0.bin,0 +55930d1.bin=@55930d1.bin,0 +55930d2.bin=@55930d2.bin,0 +55930n0.bin=@55930n0.bin,0 +55930n1.bin=@55930n1.bin,0 +55930n2.bin=@55930n2.bin,0 +23469d0.bin=@23469d0.bin,0 +23469d1.bin=@23469d1.bin,0 +23469d2.bin=@23469d2.bin,0 +23469n0.bin=@23469n0.bin,0 +23469n1.bin=@23469n1.bin,0 +23470n2.bin=@23470n2.bin,0 +23474d0.bin=@23474d0.bin,0 +23474d1.bin=@23474d1.bin,0 +23474d2.bin=@23474d2.bin,0 +23474n0.bin=@23474n0.bin,0 +23474n1.bin=@23474n1.bin,0 +23474n2.bin=@23474n2.bin,0 +23478d0.bin=@23478d0.bin,0 +23478d1.bin=@23478d1.bin,0 +23478d2.bin=@23478d2.bin,0 +23478n0.bin=@23478n0.bin,0 +23478n1.bin=@23478n1.bin,0 +23478n2.bin=@23478n2.bin,0 +23482d0.bin=@23482d0.bin,0 +23482d1.bin=@23482d1.bin,0 +23482d2.bin=@23482d2.bin,0 +23482n0.bin=@23482n0.bin,0 +23482n1.bin=@23482n1.bin,0 +23482n2.bin=@23482n2.bin,0 +23518d0.bin=@23518d0.bin,0 +23518d1.bin=@23518d1.bin,0 +23518d2.bin=@23518d2.bin,0 +23518n0.bin=@23518n0.bin,0 +23518n1.bin=@23518n1.bin,0 +23518n2.bin=@23518n2.bin,0 +23522d0.bin=@23522d0.bin,0 +23522d1.bin=@23522d1.bin,0 +23522d2.bin=@23522d2.bin,0 +23522n0.bin=@23522n0.bin,0 +23522n1.bin=@23522n1.bin,0 +23522n2.bin=@23522n2.bin,0 +23538d0.bin=@23538d0.bin,0 +23538d1.bin=@23538d1.bin,0 +23538d2.bin=@23538d2.bin,0 +23538n0.bin=@23538n0.bin,0 +23538n1.bin=@23538n1.bin,0 +23538n2.bin=@23538n2.bin,0 +23542d0.bin=@23542d0.bin,0 +23542d1.bin=@23542d1.bin,0 +23542d2.bin=@23542d2.bin,0 +23542n0.bin=@23542n0.bin,0 +23542n1.bin=@23542n1.bin,0 +23542n2.bin=@23542n2.bin,0 +23608d0.bin=@23608d0.bin,0 +23608d1.bin=@23608d1.bin,0 +23608d2.bin=@23608d2.bin,0 +23608n0.bin=@23608n0.bin,0 +23608n1.bin=@23608n1.bin,0 +23608n2.bin=@23608n2.bin,0 +23612d0.bin=@23612d0.bin,0 +23612d1.bin=@23612d1.bin,0 +23612d2.bin=@23612d2.bin,0 +23612n0.bin=@23612n0.bin,0 +23612n1.bin=@23612n1.bin,0 +23612n2.bin=@23612n2.bin,0 +23616d0.bin=@23616d0.bin,0 +23616d1.bin=@23616d1.bin,0 +23616d2.bin=@23616d2.bin,0 +23616n0.bin=@23616n0.bin,0 +23616n1.bin=@23616n1.bin,0 +23616n2.bin=@23616n2.bin,0 +23620d0.bin=@23620d0.bin,0 +23620d1.bin=@23620d1.bin,0 +23620d2.bin=@23620d2.bin,0 +23620n0.bin=@23620n0.bin,0 +23620n1.bin=@23620n1.bin,0 +23620n2.bin=@23620n2.bin,0 +23624d0.bin=@23624d0.bin,0 +23624d1.bin=@23624d1.bin,0 +23624d2.bin=@23624d2.bin,0 +23624n0.bin=@23624n0.bin,0 +23624n1.bin=@23624n1.bin,0 +23624n2.bin=@23624n2.bin,0 +23646d0.bin=@23646d0.bin,0 +23646d1.bin=@23646d1.bin,0 +23646d2.bin=@23646d2.bin,0 +23646n0.bin=@23646n0.bin,0 +23646n1.bin=@23646n1.bin,0 +23646n2.bin=@23646n2.bin,0 +23657d0.bin=@23657d0.bin,0 +23657d1.bin=@23657d1.bin,0 +23657d2.bin=@23657d2.bin,0 +23657n0.bin=@23657n0.bin,0 +23657n1.bin=@23657n1.bin,0 +23657n2.bin=@23657n2.bin,0 +23661d0.bin=@23661d0.bin,0 +23661d1.bin=@23661d1.bin,0 +23661d2.bin=@23661d2.bin,0 +23661n0.bin=@23661n0.bin,0 +23661n1.bin=@23661n1.bin,0 +23661n2.bin=@23661n2.bin,0 +23670d0.bin=@23670d0.bin,0 +23670d1.bin=@23670d1.bin,0 +23670d2.bin=@23670d2.bin,0 +23670n0.bin=@23670n0.bin,0 +23670n1.bin=@23670n1.bin,0 +23670n2.bin=@23670n2.bin,0 +23707d0.bin=@23707d0.bin,0 +23707d1.bin=@23707d1.bin,0 +23707d2.bin=@23707d2.bin,0 +23707n0.bin=@23707n0.bin,0 +23707n1.bin=@23707n1.bin,0 +23707n2.bin=@23707n2.bin,0 +23711d0.bin=@23711d0.bin,0 +23711d1.bin=@23711d1.bin,0 +23711d2.bin=@23711d2.bin,0 +23711n0.bin=@23711n0.bin,0 +23711n1.bin=@23711n1.bin,0 +23711n2.bin=@23711n2.bin,0 +23715d0.bin=@23715d0.bin,0 +23715d1.bin=@23715d1.bin,0 +23715d2.bin=@23715d2.bin,0 +23715n0.bin=@23715n0.bin,0 +23715n1.bin=@23715n1.bin,0 +23715n2.bin=@23715n2.bin,0 +23720d0.bin=@23720d0.bin,0 +23720d1.bin=@23720d1.bin,0 +23720d2.bin=@23720d2.bin,0 +23720n0.bin=@23720n0.bin,0 +23720n1.bin=@23720n1.bin,0 +23720n2.bin=@23720n2.bin,0 +55925d0.bin=@55925d0.bin,0 +55925d1.bin=@55925d1.bin,0 +55925d2.bin=@55925d2.bin,0 +55925n0.bin=@55925n0.bin,0 +55925n1.bin=@55925n1.bin,0 +55925n2.bin=@55925n2.bin,0 +55931d0.bin=@55931d0.bin,0 +55931d1.bin=@55931d1.bin,0 +55931d2.bin=@55931d2.bin,0 +55931n0.bin=@55931n0.bin,0 +55931n1.bin=@55931n1.bin,0 +55931n2.bin=@55931n2.bin,0 +56042d0.bin=@56042d0.bin,0 +56042d1.bin=@56042d1.bin,0 +56042d2.bin=@56042d2.bin,0 +56042n0.bin=@56042n0.bin,0 +56042n1.bin=@56042n1.bin,0 +56042n2.bin=@56042n2.bin,0 +56063d0.bin=@56063d0.bin,0 +56063d1.bin=@56063d1.bin,0 +56063d2.bin=@56063d2.bin,0 +56063n0.bin=@56063n0.bin,0 +56063n1.bin=@56063n1.bin,0 +56063n2.bin=@56063n2.bin,0 +56064d0.bin=@56064d0.bin,0 +56064d1.bin=@56064d1.bin,0 +56064d2.bin=@56064d2.bin,0 +56064n0.bin=@56064n0.bin,0 +56064n1.bin=@56064n1.bin,0 +56064n2.bin=@56064n2.bin,0 +23470d0.bin=@23470d0.bin,0 +23470d1.bin=@23470d1.bin,0 +23470d2.bin=@23470d2.bin,0 +23470n0.bin=@23470n0.bin,0 +23470n1.bin=@23470n1.bin,0 +23475d0.bin=@23475d0.bin,0 +23475d1.bin=@23475d1.bin,0 +23475d2.bin=@23475d2.bin,0 +23475n0.bin=@23475n0.bin,0 +23475n1.bin=@23475n1.bin,0 +23475n2.bin=@23475n2.bin,0 +23479d0.bin=@23479d0.bin,0 +23479d1.bin=@23479d1.bin,0 +23479d2.bin=@23479d2.bin,0 +23479n0.bin=@23479n0.bin,0 +23479n1.bin=@23479n1.bin,0 +23479n2.bin=@23479n2.bin,0 +23483d0.bin=@23483d0.bin,0 +23483d1.bin=@23483d1.bin,0 +23483d2.bin=@23483d2.bin,0 +23483n0.bin=@23483n0.bin,0 +23483n1.bin=@23483n1.bin,0 +23483n2.bin=@23483n2.bin,0 +23519d0.bin=@23519d0.bin,0 +23519d1.bin=@23519d1.bin,0 +23519d2.bin=@23519d2.bin,0 +23519n0.bin=@23519n0.bin,0 +23519n1.bin=@23519n1.bin,0 +23519n2.bin=@23519n2.bin,0 +23523d0.bin=@23523d0.bin,0 +23523d1.bin=@23523d1.bin,0 +23523d2.bin=@23523d2.bin,0 +23523n0.bin=@23523n0.bin,0 +23523n1.bin=@23523n1.bin,0 +23523n2.bin=@23523n2.bin,0 +23539d0.bin=@23539d0.bin,0 +23539d1.bin=@23539d1.bin,0 +23539d2.bin=@23539d2.bin,0 +23539n0.bin=@23539n0.bin,0 +23539n1.bin=@23539n1.bin,0 +23539n2.bin=@23539n2.bin,0 +23543d0.bin=@23543d0.bin,0 +23543d1.bin=@23543d1.bin,0 +23543d2.bin=@23543d2.bin,0 +23543n0.bin=@23543n0.bin,0 +23543n1.bin=@23543n1.bin,0 +23543n2.bin=@23543n2.bin,0 +23609d0.bin=@23609d0.bin,0 +23609d1.bin=@23609d1.bin,0 +23609d2.bin=@23609d2.bin,0 +23609n0.bin=@23609n0.bin,0 +23609n1.bin=@23609n1.bin,0 +23609n2.bin=@23609n2.bin,0 +23613d0.bin=@23613d0.bin,0 +23613d1.bin=@23613d1.bin,0 +23613d2.bin=@23613d2.bin,0 +23613n0.bin=@23613n0.bin,0 +23613n1.bin=@23613n1.bin,0 +23613n2.bin=@23613n2.bin,0 +23617d0.bin=@23617d0.bin,0 +23617d1.bin=@23617d1.bin,0 +23617d2.bin=@23617d2.bin,0 +23617n0.bin=@23617n0.bin,0 +23617n1.bin=@23617n1.bin,0 +23617n2.bin=@23617n2.bin,0 +23621d0.bin=@23621d0.bin,0 +23621d1.bin=@23621d1.bin,0 +23621d2.bin=@23621d2.bin,0 +23621n0.bin=@23621n0.bin,0 +23621n1.bin=@23621n1.bin,0 +23621n2.bin=@23621n2.bin,0 +23625d0.bin=@23625d0.bin,0 +23625d1.bin=@23625d1.bin,0 +23625d2.bin=@23625d2.bin,0 +23625n0.bin=@23625n0.bin,0 +23625n1.bin=@23625n1.bin,0 +23625n2.bin=@23625n2.bin,0 +23647d0.bin=@23647d0.bin,0 +23647d1.bin=@23647d1.bin,0 +23647d2.bin=@23647d2.bin,0 +23647n0.bin=@23647n0.bin,0 +23647n1.bin=@23647n1.bin,0 +23647n2.bin=@23647n2.bin,0 +23658d0.bin=@23658d0.bin,0 +23658d1.bin=@23658d1.bin,0 +23658d2.bin=@23658d2.bin,0 +23658n0.bin=@23658n0.bin,0 +23658n1.bin=@23658n1.bin,0 +23658n2.bin=@23658n2.bin,0 +23662d0.bin=@23662d0.bin,0 +23662d1.bin=@23662d1.bin,0 +23662d2.bin=@23662d2.bin,0 +23662n0.bin=@23662n0.bin,0 +23662n1.bin=@23662n1.bin,0 +23662n2.bin=@23662n2.bin,0 +23671d0.bin=@23671d0.bin,0 +23671d1.bin=@23671d1.bin,0 +23671d2.bin=@23671d2.bin,0 +23671n0.bin=@23671n0.bin,0 +23671n1.bin=@23671n1.bin,0 +23671n2.bin=@23671n2.bin,0 +23708d0.bin=@23708d0.bin,0 +23708d1.bin=@23708d1.bin,0 +23708d2.bin=@23708d2.bin,0 +23708n0.bin=@23708n0.bin,0 +23708n1.bin=@23708n1.bin,0 +23708n2.bin=@23708n2.bin,0 +23712d0.bin=@23712d0.bin,0 +23712d1.bin=@23712d1.bin,0 +23712d2.bin=@23712d2.bin,0 +23712n0.bin=@23712n0.bin,0 +23712n1.bin=@23712n1.bin,0 +23712n2.bin=@23712n2.bin,0 +23716d0.bin=@23716d0.bin,0 +23716d1.bin=@23716d1.bin,0 +23716d2.bin=@23716d2.bin,0 +23716n0.bin=@23716n0.bin,0 +23716n1.bin=@23716n1.bin,0 +23716n2.bin=@23716n2.bin,0 +23721d0.bin=@23721d0.bin,0 +23721d1.bin=@23721d1.bin,0 +23721d2.bin=@23721d2.bin,0 +23721n0.bin=@23721n0.bin,0 +23721n1.bin=@23721n1.bin,0 +23721n2.bin=@23721n2.bin,0 +55926d0.bin=@55926d0.bin,0 +55926d1.bin=@55926d1.bin,0 +55926d2.bin=@55926d2.bin,0 +55926n0.bin=@55926n0.bin,0 +55926n1.bin=@55926n1.bin,0 +55926n2.bin=@55926n2.bin,0 +55932d0.bin=@55932d0.bin,0 +55932d1.bin=@55932d1.bin,0 +55932d2.bin=@55932d2.bin,0 +55932n0.bin=@55932n0.bin,0 +55932n1.bin=@55932n1.bin,0 +55932n2.bin=@55932n2.bin,0 +23471d0.bin=@23471d0.bin,0 +23471d1.bin=@23471d1.bin,0 +23471d2.bin=@23471d2.bin,0 +23471n0.bin=@23471n0.bin,0 +23471n1.bin=@23471n1.bin,0 +23471n2.bin=@23471n2.bin,0 +21731n0.bin=@21731n0.bin,0 +21731n1.bin=@21731n1.bin,0 +21731n2.bin=@21731n2.bin,0 +21746d0.bin=@21746d0.bin,0 +21746d1.bin=@21746d1.bin,0 +21746d2.bin=@21746d2.bin,0 +21746n0.bin=@21746n0.bin,0 +21746n1.bin=@21746n1.bin,0 +21746n2.bin=@21746n2.bin,0 +21731d0.bin=@21731d0.bin,0 +21731d1.bin=@21731d1.bin,0 +21731d2.bin=@21731d2.bin,0 +54633d0.bin=@54633d0.bin,0 +54633d1.bin=@54633d1.bin,0 +54633d2.bin=@54633d2.bin,0 +54633n0.bin=@54633n0.bin,0 +54633n1.bin=@54633n1.bin,0 +54633n2.bin=@54633n2.bin,0 +54801d0.bin=@54801d0.bin,0 +54801d1.bin=@54801d1.bin,0 +54801d2.bin=@54801d2.bin,0 +54801n0.bin=@54801n0.bin,0 +54801n1.bin=@54801n1.bin,0 +54801n2.bin=@54801n2.bin,0 +55203d0.bin=@55203d0.bin,0 +55203d1.bin=@55203d1.bin,0 +55203d2.bin=@55203d2.bin,0 +55203n0.bin=@55203n0.bin,0 +55203n1.bin=@55203n1.bin,0 +55203n2.bin=@55203n2.bin,0 +55204d0.bin=@55204d0.bin,0 +55204d1.bin=@55204d1.bin,0 +55204d2.bin=@55204d2.bin,0 +55204n0.bin=@55204n0.bin,0 +55204n1.bin=@55204n1.bin,0 +55204n2.bin=@55204n2.bin,0 +55464d0.bin=@55464d0.bin,0 +55464d1.bin=@55464d1.bin,0 +55464d2.bin=@55464d2.bin,0 +55464n0.bin=@55464n0.bin,0 +55464n1.bin=@55464n1.bin,0 +55464n2.bin=@55464n2.bin,0 +55619d0.bin=@55619d0.bin,0 +55619d1.bin=@55619d1.bin,0 +55619d2.bin=@55619d2.bin,0 +55619n0.bin=@55619n0.bin,0 +55619n1.bin=@55619n1.bin,0 +55619n2.bin=@55619n2.bin,0 +55730d0.bin=@55730d0.bin,0 +55730d1.bin=@55730d1.bin,0 +55730d2.bin=@55730d2.bin,0 +55730n0.bin=@55730n0.bin,0 +55730n1.bin=@55730n1.bin,0 +55730n2.bin=@55730n2.bin,0 +55771d0.bin=@55771d0.bin,0 +55771d1.bin=@55771d1.bin,0 +55771d2.bin=@55771d2.bin,0 +55771n0.bin=@55771n0.bin,0 +55771n1.bin=@55771n1.bin,0 +55771n2.bin=@55771n2.bin,0 +55896d0.bin=@55896d0.bin,0 +55896d1.bin=@55896d1.bin,0 +55896d2.bin=@55896d2.bin,0 +55896n0.bin=@55896n0.bin,0 +55896n1.bin=@55896n1.bin,0 +55896n2.bin=@55896n2.bin,0 +55937d0.bin=@55937d0.bin,0 +55937d1.bin=@55937d1.bin,0 +55937d2.bin=@55937d2.bin,0 +55937n0.bin=@55937n0.bin,0 +55937n1.bin=@55937n1.bin,0 +55937n2.bin=@55937n2.bin,0 +55938d0.bin=@55938d0.bin,0 +55938d1.bin=@55938d1.bin,0 +55938d2.bin=@55938d2.bin,0 +55938n0.bin=@55938n0.bin,0 +55938n1.bin=@55938n1.bin,0 +55938n2.bin=@55938n2.bin,0 +55939d0.bin=@55939d0.bin,0 +55939d1.bin=@55939d1.bin,0 +55939d2.bin=@55939d2.bin,0 +55939n0.bin=@55939n0.bin,0 +55939n1.bin=@55939n1.bin,0 +55939n2.bin=@55939n2.bin,0 +55964d0.bin=@55964d0.bin,0 +55964d1.bin=@55964d1.bin,0 +55964d2.bin=@55964d2.bin,0 +55964n0.bin=@55964n0.bin,0 +55964n1.bin=@55964n1.bin,0 +55964n2.bin=@55964n2.bin,0 +55967d0.bin=@55967d0.bin,0 +55967d1.bin=@55967d1.bin,0 +55967d2.bin=@55967d2.bin,0 +55967n0.bin=@55967n0.bin,0 +55967n1.bin=@55967n1.bin,0 +55967n2.bin=@55967n2.bin,0 +56109d0.bin=@56109d0.bin,0 +56109d1.bin=@56109d1.bin,0 +56109d2.bin=@56109d2.bin,0 +56109n0.bin=@56109n0.bin,0 +56109n1.bin=@56109n1.bin,0 +56109n2.bin=@56109n2.bin,0 +56110d0.bin=@56110d0.bin,0 +56110d1.bin=@56110d1.bin,0 +56110d2.bin=@56110d2.bin,0 +56110n0.bin=@56110n0.bin,0 +56110n1.bin=@56110n1.bin,0 +56110n2.bin=@56110n2.bin,0 +56143d0.bin=@56143d0.bin,0 +56143d1.bin=@56143d1.bin,0 +56143d2.bin=@56143d2.bin,0 +56143n0.bin=@56143n0.bin,0 +56143n1.bin=@56143n1.bin,0 +56143n2.bin=@56143n2.bin,0 +56147d0.bin=@56147d0.bin,0 +56147d1.bin=@56147d1.bin,0 +56147d2.bin=@56147d2.bin,0 +56147n0.bin=@56147n0.bin,0 +56147n1.bin=@56147n1.bin,0 +56147n2.bin=@56147n2.bin,0 +56157d0.bin=@56157d0.bin,0 +56157d1.bin=@56157d1.bin,0 +56157d2.bin=@56157d2.bin,0 +56157n0.bin=@56157n0.bin,0 +56157n1.bin=@56157n1.bin,0 +56157n2.bin=@56157n2.bin,0 +56159d0.bin=@56159d0.bin,0 +56159d1.bin=@56159d1.bin,0 +56159d2.bin=@56159d2.bin,0 +56159n0.bin=@56159n0.bin,0 +56159n1.bin=@56159n1.bin,0 +56159n2.bin=@56159n2.bin,0 +64552d0.bin=@64552d0.bin,0 +64552d1.bin=@64552d1.bin,0 +64552d2.bin=@64552d2.bin,0 +64555d0.bin=@64555d0.bin,0 +64555d1.bin=@64555d1.bin,0 +64555d2.bin=@64555d2.bin,0 +64556d0.bin=@64556d0.bin,0 +64556d1.bin=@64556d1.bin,0 +64556d2.bin=@64556d2.bin,0 +51122d0.bin=@51122d0.bin,0 +51122d1.bin=@51122d1.bin,0 +51122d2.bin=@51122d2.bin,0 +51122n0.bin=@51122n0.bin,0 +51122n1.bin=@51122n1.bin,0 +51122n2.bin=@51122n2.bin,0 +55732d0.bin=@55732d0.bin,0 +55732d1.bin=@55732d1.bin,0 +55732d2.bin=@55732d2.bin,0 +55732n0.bin=@55732n0.bin,0 +55732n1.bin=@55732n1.bin,0 +55732n2.bin=@55732n2.bin,0 +55731d0.bin=@55731d0.bin,0 +55731d1.bin=@55731d1.bin,0 +55731d2.bin=@55731d2.bin,0 +55731n0.bin=@55731n0.bin,0 +55731n1.bin=@55731n1.bin,0 +55731n2.bin=@55731n2.bin,0 +55818d0.bin=@55818d0.bin,0 +55818d1.bin=@55818d1.bin,0 +55818d2.bin=@55818d2.bin,0 +55818n0.bin=@55818n0.bin,0 +55818n1.bin=@55818n1.bin,0 +55818n2.bin=@55818n2.bin,0 +56112d0.bin=@56112d0.bin,0 +56112d1.bin=@56112d1.bin,0 +56112d2.bin=@56112d2.bin,0 +56112n0.bin=@56112n0.bin,0 +56112n1.bin=@56112n1.bin,0 +56112n2.bin=@56112n2.bin,0 +56105d0.bin=@56105d0.bin,0 +56105d1.bin=@56105d1.bin,0 +56105d2.bin=@56105d2.bin,0 +56105n0.bin=@56105n0.bin,0 +56105n1.bin=@56105n1.bin,0 +56105n2.bin=@56105n2.bin,0 +58007d2.bin=@58007d2.bin,0 +58008d2.bin=@58008d2.bin,0 +58009d2.bin=@58009d2.bin,0 +58010d2.bin=@58010d2.bin,0 +58129d0.bin=@58129d0.bin,0 +58130d0.bin=@58130d0.bin,0 +58139d0.bin=@58139d0.bin,0 diff --git a/config.json b/config.json index f9a092487..912a448f9 100644 --- a/config.json +++ b/config.json @@ -17,8 +17,8 @@ "AutoCreateAccount": true, "CleanDB": false, "MaxLauncherHR": false, - "LogInboundMessages": false, - "LogOutboundMessages": false, + "LogInboundMessages": true, + "LogOutboundMessages": true, "MaxHexdumpLength": 256, "DivaEvent": 0, "FestaEvent": -1, @@ -29,7 +29,7 @@ "QuestDebugTools": false, "EarthStatusOverride": 0, "EarthIDOverride": 0, - "DynamicSeasons": false, + "DynamicSeasons": true, "EarthMonsterOverride": 0, "SaveDumps": { "Enabled": true, @@ -111,9 +111,9 @@ ], "Database": { "Host": "localhost", - "Port": 5432, + "Port": 5433, "User": "postgres", - "Password": "", + "Password": "admin", "Database": "erupe" }, "Sign": { @@ -137,6 +137,13 @@ { "Port": 54001, "MaxPlayers": 100 }, { "Port": 54002, "MaxPlayers": 100 } ] + }, + { + "Name": "Newbie 2", "Description": "", "IP": "", "Type": 3, "Recommended": 2, "AllowedClientFlags": 0, + "Channels": [ + { "Port": 54009, "MaxPlayers": 100 }, + { "Port": 54010, "MaxPlayers": 100 } + ] }, { "Name": "Normal", "Description": "", "IP": "", "Type": 1, "Recommended": 0, "AllowedClientFlags": 0, "Channels": [ diff --git a/server/channelserver/handlers_distitem.go b/server/channelserver/handlers_distitem.go index 0da9347fa..a2979756f 100644 --- a/server/channelserver/handlers_distitem.go +++ b/server/channelserver/handlers_distitem.go @@ -4,6 +4,7 @@ import ( "erupe-ce/common/byteframe" ps "erupe-ce/common/pascalstring" "erupe-ce/network/mhfpacket" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 0da70b21d..132ae61e5 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -81,18 +81,18 @@ func seasonConversion(s *Session, questPath string) string { // remove the last 6 from the quest path newQuestPath := questPath[:len(questPath)-6] - // Calculate the current day of the season in order to determine time scale - currentDayOfSeason := (time.Now().Unix()/6000)%15 + 1 // Determine if it is day or night based on the current day of the season - timeCycle := uint8(((currentDayOfSeason % 1) * 24)) < 12 + timeCycle := uint8(time.Now().Unix()/3000) % 2 // Determine the current season based on a modulus of the current time - season := uint8((int(float64((time.Now().Unix() * int64(s.server.ID)) / (6000 * 15)))) % 3) + sid := (4096 + s.server.ID*256) * 6000 + + season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) var timeSet string // Determine the letter to append for day / night - if timeCycle { + if timeCycle == 0 { timeSet = "n" } else { timeSet = "d" diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index cd4b97cdb..473b3c74b 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -33,7 +33,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { continue } } - sid := (4096 + serverIdx*256) + 16 + sid := (4096 + serverIdx*256) * 6000 //season := (uint8(float64((time.Now().Unix() + int64(sid)) / 1000))) % 3 season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) if si.IP == "" { From 411477f9b3dd068e2f916c294171cb0f0ed3620e Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 16 Jul 2023 21:14:44 +1000 Subject: [PATCH 14/27] fix time calculations & undo config changes --- config.json | 11 +-- server/channelserver/handlers_quest.go | 97 ++++++++++---------------- server/channelserver/sys_time.go | 4 ++ server/entranceserver/make_resp.go | 9 +-- 4 files changed, 47 insertions(+), 74 deletions(-) diff --git a/config.json b/config.json index 912a448f9..647440201 100644 --- a/config.json +++ b/config.json @@ -111,9 +111,9 @@ ], "Database": { "Host": "localhost", - "Port": 5433, + "Port": 5432, "User": "postgres", - "Password": "admin", + "Password": "", "Database": "erupe" }, "Sign": { @@ -137,13 +137,6 @@ { "Port": 54001, "MaxPlayers": 100 }, { "Port": 54002, "MaxPlayers": 100 } ] - }, - { - "Name": "Newbie 2", "Description": "", "IP": "", "Type": 3, "Recommended": 2, "AllowedClientFlags": 0, - "Channels": [ - { "Port": 54009, "MaxPlayers": 100 }, - { "Port": 54010, "MaxPlayers": 100 } - ] }, { "Name": "Normal", "Description": "", "IP": "", "Type": 1, "Recommended": 0, "AllowedClientFlags": 0, "Channels": [ diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 132ae61e5..df6e76b50 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -38,73 +38,52 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { } doAckBufSucceed(s, pkt.AckHandle, data) } else { - if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin")); err == nil { - data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin")) - if err != nil { - panic(err) - } - doAckBufSucceed(s, pkt.AckHandle, data) - } else { - if s.server.erupeConfig.DevModeOptions.QuestDebugTools && s.server.erupeConfig.DevMode { - s.logger.Debug( - "Quest", - zap.String("Filename", pkt.Filename), - ) - } - - // Get quest file and convert to season if the option is enabled - var data []byte - var err error - - if s.server.erupeConfig.DevModeOptions.DynamicSeasons { - data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) - } else { - data, err = os.ReadFile(seasonConversion(s, filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))) - } - - // convert based on season - - if err != nil { - s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) - // This will crash the game. - doAckBufSucceed(s, pkt.AckHandle, data) - return - } - doAckBufSucceed(s, pkt.AckHandle, data) + if s.server.erupeConfig.DevModeOptions.QuestDebugTools && s.server.erupeConfig.DevMode { + s.logger.Debug( + "Quest", + zap.String("Filename", pkt.Filename), + ) } + + // Get quest file and convert to season if the option is enabled + var data []byte + var err error + + if s.server.erupeConfig.DevModeOptions.DynamicSeasons && s.server.erupeConfig.DevMode { + seasonConversion(s, pkt.Filename) + } + + data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + if err != nil { + s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) + // This will crash the game. + doAckBufSucceed(s, pkt.AckHandle, data) + return + } + doAckBufSucceed(s, pkt.AckHandle, data) } } -// Convert the file to load based on the season -func seasonConversion(s *Session, questPath string) string { - - // remove the last 6 from the quest path - newQuestPath := questPath[:len(questPath)-6] - - // Determine if it is day or night based on the current day of the season - timeCycle := uint8(time.Now().Unix()/3000) % 2 - - // Determine the current season based on a modulus of the current time - sid := (4096 + s.server.ID*256) * 6000 - - season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) - - var timeSet string - +func seasonConversion(s *Session, questFile string) string { // Determine the letter to append for day / night - if timeCycle == 0 { - timeSet = "n" - } else { + var timeSet string + if TimeGameAbsolute() > 2880 { timeSet = "d" + } else { + timeSet = "n" } - fileName := fmt.Sprintf("%s%s%d.bin", newQuestPath, timeSet, season) + // Determine the current season based on a modulus of the current time + sid := int64(((s.server.ID & 0xFF00) - 4096) / 256) + season := ((TimeAdjusted().Unix() / 86400) + sid) % 3 - // Return the original if the season-based file does not exist for some reason - if _, err := os.Stat(fileName); err == nil { - return fileName + filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, season) + + // Return original file if file doesn't exist + if _, err := os.Stat(filename); err == nil { + return filename } else { - return questPath + return questFile } } @@ -126,10 +105,10 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -func readOriginalPointers(string_pointer int32, quest []byte) []byte { +func readOriginalPointers(stringPointer int32, quest []byte) []byte { fileBytes := byteframe.NewByteFrameFromBytes(quest) fileBytes.SetLE() - fileBytes.Seek(int64(string_pointer), io.SeekStart) + fileBytes.Seek(int64(stringPointer), io.SeekStart) questNamePointer := fileBytes.ReadInt32() questMainPointer := fileBytes.ReadInt32() diff --git a/server/channelserver/sys_time.go b/server/channelserver/sys_time.go index 396ae4cf5..a41b18b2e 100644 --- a/server/channelserver/sys_time.go +++ b/server/channelserver/sys_time.go @@ -23,3 +23,7 @@ func TimeWeekStart() time.Time { func TimeWeekNext() time.Time { return TimeWeekStart().Add(time.Hour * 24 * 7) } + +func TimeGameAbsolute() uint32 { + return uint32((TimeAdjusted().Unix() - 2160) % 5760) +} diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index 473b3c74b..5f4135d88 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -3,12 +3,10 @@ package entranceserver import ( "encoding/binary" "encoding/hex" + "erupe-ce/common/stringsupport" _config "erupe-ce/config" "fmt" "net" - "time" - - "erupe-ce/common/stringsupport" "erupe-ce/common/byteframe" "erupe-ce/server/channelserver" @@ -33,9 +31,8 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { continue } } + sid := (4096 + serverIdx*256) * 6000 - //season := (uint8(float64((time.Now().Unix() + int64(sid)) / 1000))) % 3 - season := uint8((int(float64((time.Now().Unix() * int64(sid)) / (6000 * 15)))) % 3) if si.IP == "" { si.IP = config.Host } @@ -48,7 +45,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { bf.WriteUint16(0x0000) bf.WriteUint16(uint16(len(si.Channels))) bf.WriteUint8(si.Type) - bf.WriteUint8(season) + bf.WriteUint8(uint8(((channelserver.TimeAdjusted().Unix() / 86400) + int64(serverIdx)) % 3)) bf.WriteUint8(si.Recommended) if s.erupeConfig.RealClientMode <= _config.GG { From 568fa5e1162bd611e903c89ed033961b4c14d207 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 16 Jul 2023 21:16:44 +1000 Subject: [PATCH 15/27] fix not reading from quest file --- server/channelserver/handlers_quest.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index df6e76b50..6d12d1a11 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -45,15 +45,11 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { ) } - // Get quest file and convert to season if the option is enabled - var data []byte - var err error - if s.server.erupeConfig.DevModeOptions.DynamicSeasons && s.server.erupeConfig.DevMode { - seasonConversion(s, pkt.Filename) + pkt.Filename = seasonConversion(s, pkt.Filename) } - data, err = os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) + data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename))) if err != nil { s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename)) // This will crash the game. From a98ebf5d529ede0b09a24fbcee095a4977ae0507 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 16 Jul 2023 21:57:29 +1000 Subject: [PATCH 16/27] rewrite into SeasonOverride --- config.json | 4 ++-- config/config.go | 2 +- server/channelserver/handlers_quest.go | 8 ++------ server/channelserver/sys_channel_server.go | 5 +++++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/config.json b/config.json index 647440201..83d1ee480 100644 --- a/config.json +++ b/config.json @@ -29,7 +29,6 @@ "QuestDebugTools": false, "EarthStatusOverride": 0, "EarthIDOverride": 0, - "DynamicSeasons": true, "EarthMonsterOverride": 0, "SaveDumps": { "Enabled": true, @@ -58,7 +57,8 @@ "DisableHunterNavi": false, "EnableHiganjimaEvent": false, "EnableNierEvent": false, - "DisableRoad": false + "DisableRoad": false, + "SeasonOverride": false }, "Discord": { "Enabled": false, diff --git a/config/config.go b/config/config.go index 5c4ee693d..b8b52ee06 100644 --- a/config/config.go +++ b/config/config.go @@ -110,7 +110,6 @@ type DevModeOptions struct { QuestDebugTools bool // Enable various quest debug logs EarthStatusOverride int32 EarthIDOverride int32 - DynamicSeasons bool // Enables dynamic seasons EarthMonsterOverride int32 SaveDumps SaveDumpOptions } @@ -144,6 +143,7 @@ type GameplayOptions struct { EnableHiganjimaEvent bool // Enables the Higanjima event in the Rasta Bar EnableNierEvent bool // Enables the Nier event in the Rasta Bar DisableRoad bool // Disables the Hunting Road + SeasonOverride bool // Overrides the Quest Season with the current Mezeporta Season } // Discord holds the discord integration config. diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 6d12d1a11..63828da6f 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -45,7 +45,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { ) } - if s.server.erupeConfig.DevModeOptions.DynamicSeasons && s.server.erupeConfig.DevMode { + if s.server.erupeConfig.GameplayOptions.SeasonOverride { pkt.Filename = seasonConversion(s, pkt.Filename) } @@ -69,11 +69,7 @@ func seasonConversion(s *Session, questFile string) string { timeSet = "n" } - // Determine the current season based on a modulus of the current time - sid := int64(((s.server.ID & 0xFF00) - 4096) / 256) - season := ((TimeAdjusted().Unix() / 86400) + sid) % 3 - - filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, season) + filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, s.server.Season()) // Return original file if file doesn't exist if _, err := os.Stat(filename); err == nil { diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go index dccece844..b362c911e 100644 --- a/server/channelserver/sys_channel_server.go +++ b/server/channelserver/sys_channel_server.go @@ -405,3 +405,8 @@ func (s *Server) NextSemaphoreID() uint32 { } return s.semaphoreIndex } + +func (s *Server) Season() uint8 { + sid := int64(((s.ID & 0xFF00) - 4096) / 256) + return uint8(((TimeAdjusted().Unix() / 86400) + sid) % 3) +} From a497eaf4deffddf5683ea4ab57fea359a9d857a1 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Sun, 16 Jul 2023 19:00:25 -0400 Subject: [PATCH 17/27] refactor: Enumerate quests turned into a struct and loops --- server/channelserver/handlers_quest.go | 74 ++++++++++---------------- 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 63828da6f..d1b5ae960 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -97,64 +97,48 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } +type QuestMeta struct { + pointers []int32 + strings [][]byte +} + func readOriginalPointers(stringPointer int32, quest []byte) []byte { fileBytes := byteframe.NewByteFrameFromBytes(quest) fileBytes.SetLE() fileBytes.Seek(int64(stringPointer), io.SeekStart) - questNamePointer := fileBytes.ReadInt32() - questMainPointer := fileBytes.ReadInt32() - questAPointer := fileBytes.ReadInt32() - questBPointer := fileBytes.ReadInt32() - questClearPointer := fileBytes.ReadInt32() - questFailurePointer := fileBytes.ReadInt32() - questContractorPointer := fileBytes.ReadInt32() - questDescriptionPointer := fileBytes.ReadInt32() + stringMeta := QuestMeta{ + pointers: make([]int32, 8), + strings: make([][]byte, 8), + } - // Read the strings in order to determine the length of the new string pointers for use in the new offsets - // It must seek to each initial pointer since the order is not consistent. - fileBytes.Seek(int64(questNamePointer), io.SeekStart) - questNameString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questMainPointer), io.SeekStart) - questMainString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questAPointer), io.SeekStart) - questAString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questBPointer), io.SeekStart) - questBString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questClearPointer), io.SeekStart) - questClearString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questFailurePointer), io.SeekStart) - questFailureString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questContractorPointer), io.SeekStart) - questContractorString := fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(int64(questDescriptionPointer), io.SeekStart) - questDescriptionString := fileBytes.ReadNullTerminatedBytes() + for i := 0; i < 8; i++ { + stringMeta.pointers[i] = fileBytes.ReadInt32() + } - pointerStart := 352 + for i := 0; i < 8; i++ { + fileBytes.Seek(int64(stringMeta.pointers[i]), io.SeekStart) + stringMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() + } newPointers := byteframe.NewByteFrame() newPointers.SetLE() - newPointers.WriteInt32(int32(pointerStart)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + 1)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + 2)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + 3)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + 4)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + 5)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + 6)) - newPointers.WriteInt32(int32(pointerStart + len(questNameString) + len(questMainString) + len(questAString) + len(questBString) + len(questClearString) + len(questFailureString) + len(questContractorString) + 7)) + // write the new string pointers + for i := 0; i < 8; i++ { + length := 352 + for j := 0; j < i; j++ { + length += len(stringMeta.strings[j]) + 1 + } + newPointers.WriteInt32(int32(length)) + } - newPointers.WriteNullTerminatedBytes(questNameString) - newPointers.WriteNullTerminatedBytes(questMainString) - newPointers.WriteNullTerminatedBytes(questAString) - newPointers.WriteNullTerminatedBytes(questBString) - newPointers.WriteNullTerminatedBytes(questClearString) - newPointers.WriteNullTerminatedBytes(questFailureString) - newPointers.WriteNullTerminatedBytes(questContractorString) - newPointers.WriteNullTerminatedBytes(questDescriptionString) + for i := 0; i < 8; i++ { + newPointers.WriteNullTerminatedBytes(stringMeta.strings[i]) + } - newPointers.WriteUint8(18) - newPointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81}) + newPointers.WriteUint8(1) + newPointers.WriteInt8(0x00) return newPointers.Data() } From c6618b7688a540c5b2278cecf85690c89216f7f7 Mon Sep 17 00:00:00 2001 From: wish Date: Mon, 17 Jul 2023 19:48:54 +1000 Subject: [PATCH 18/27] squash Quest Enumeration functions --- server/channelserver/handlers_quest.go | 60 +++++++++----------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index d1b5ae960..86cd0c972 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -4,6 +4,7 @@ import ( "database/sql" "erupe-ce/common/byteframe" "erupe-ce/common/decryption" + ps "erupe-ce/common/pascalstring" "erupe-ce/network/mhfpacket" "fmt" "io" @@ -97,81 +98,62 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -type QuestMeta struct { - pointers []int32 - strings [][]byte -} - -func readOriginalPointers(stringPointer int32, quest []byte) []byte { +func readOriginalPointers(pointer int64, quest []byte) []byte { fileBytes := byteframe.NewByteFrameFromBytes(quest) fileBytes.SetLE() - fileBytes.Seek(int64(stringPointer), io.SeekStart) + fileBytes.Seek(pointer, 0) - stringMeta := QuestMeta{ - pointers: make([]int32, 8), - strings: make([][]byte, 8), + questMeta := struct { + pointers []int64 + strings [][]byte + }{ + make([]int64, 8), + make([][]byte, 8), } for i := 0; i < 8; i++ { - stringMeta.pointers[i] = fileBytes.ReadInt32() + questMeta.pointers[i] = int64(fileBytes.ReadUint32()) } - for i := 0; i < 8; i++ { - fileBytes.Seek(int64(stringMeta.pointers[i]), io.SeekStart) - stringMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(questMeta.pointers[i], 0) + questMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() } newPointers := byteframe.NewByteFrame() newPointers.SetLE() - - // write the new string pointers for i := 0; i < 8; i++ { length := 352 for j := 0; j < i; j++ { - length += len(stringMeta.strings[j]) + 1 + length += len(questMeta.strings[j]) + 1 } - newPointers.WriteInt32(int32(length)) + newPointers.WriteUint32(uint32(length)) } - for i := 0; i < 8; i++ { - newPointers.WriteNullTerminatedBytes(stringMeta.strings[i]) + newPointers.WriteNullTerminatedBytes(questMeta.strings[i]) } - - newPointers.WriteUint8(1) - newPointers.WriteInt8(0x00) - + ps.Uint8(newPointers, "", true) // Unused developer comment section? return newPointers.Data() } func loadQuestFile(s *Session, questId string) []byte { file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questId))) - if err != nil { return nil } decrypted := decryption.UnpackSimple(file) - fileBytes := byteframe.NewByteFrameFromBytes(decrypted) fileBytes.SetLE() - fileBytes.Seek(0, io.SeekStart) - - dataPointer := fileBytes.ReadInt32() - fileBytes.Seek(int64(dataPointer), io.SeekStart) + fileBytes.Seek(int64(fileBytes.ReadInt32()), io.SeekStart) // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. questBody := byteframe.NewByteFrameFromBytes(fileBytes.ReadBytes(320)) questBody.SetLE() questBody.Seek(40, io.SeekStart) - - strings := readOriginalPointers(questBody.ReadInt32(), decrypted) - - body := byteframe.NewByteFrame() - body.WriteBytes(questBody.Data()) - body.Seek(0, io.SeekEnd) - body.WriteBytes(strings) - - return body.Data() + strings := readOriginalPointers(int64(questBody.ReadUint32()), decrypted) + questBody.Seek(0, 2) + questBody.WriteBytes(strings) + return questBody.Data() } func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { From 2ae42d59af9da88be5b06ecf2d9f215c16e7ab22 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 18 Jul 2023 21:40:42 +1000 Subject: [PATCH 19/27] refactor Quest Enumeration --- server/channelserver/handlers_quest.go | 103 +++++++++---------------- 1 file changed, 36 insertions(+), 67 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 86cd0c972..b43f6c83c 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -98,45 +98,8 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -func readOriginalPointers(pointer int64, quest []byte) []byte { - fileBytes := byteframe.NewByteFrameFromBytes(quest) - fileBytes.SetLE() - fileBytes.Seek(pointer, 0) - - questMeta := struct { - pointers []int64 - strings [][]byte - }{ - make([]int64, 8), - make([][]byte, 8), - } - - for i := 0; i < 8; i++ { - questMeta.pointers[i] = int64(fileBytes.ReadUint32()) - } - for i := 0; i < 8; i++ { - fileBytes.Seek(questMeta.pointers[i], 0) - questMeta.strings[i] = fileBytes.ReadNullTerminatedBytes() - } - - newPointers := byteframe.NewByteFrame() - newPointers.SetLE() - for i := 0; i < 8; i++ { - length := 352 - for j := 0; j < i; j++ { - length += len(questMeta.strings[j]) + 1 - } - newPointers.WriteUint32(uint32(length)) - } - for i := 0; i < 8; i++ { - newPointers.WriteNullTerminatedBytes(questMeta.strings[i]) - } - ps.Uint8(newPointers, "", true) // Unused developer comment section? - return newPointers.Data() -} - -func loadQuestFile(s *Session, questId string) []byte { - file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questId))) +func loadQuestFile(s *Session, questFile string) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questFile))) if err != nil { return nil } @@ -144,30 +107,50 @@ func loadQuestFile(s *Session, questId string) []byte { decrypted := decryption.UnpackSimple(file) fileBytes := byteframe.NewByteFrameFromBytes(decrypted) fileBytes.SetLE() - fileBytes.Seek(int64(fileBytes.ReadInt32()), io.SeekStart) + fileBytes.Seek(int64(fileBytes.ReadUint32()), 0) // The 320 bytes directly following the data pointer must go directly into the event's body, after the header and before the string pointers. questBody := byteframe.NewByteFrameFromBytes(fileBytes.ReadBytes(320)) questBody.SetLE() - questBody.Seek(40, io.SeekStart) - strings := readOriginalPointers(int64(questBody.ReadUint32()), decrypted) + // Find the master quest string pointer + questBody.Seek(40, 0) + fileBytes.Seek(int64(questBody.ReadUint32()), 0) + // Overwrite it + questBody.WriteUint32(320) questBody.Seek(0, 2) - questBody.WriteBytes(strings) + + // Rewrite the quest strings and their pointers + var tempString []byte + newStrings := byteframe.NewByteFrame() + tempPointer := 352 + for i := 0; i < 8; i++ { + temp := int64(fileBytes.Index()) + fileBytes.Seek(int64(fileBytes.ReadUint32()), 0) + tempString = fileBytes.ReadNullTerminatedBytes() + fileBytes.Seek(temp, 0) + questBody.WriteUint32(uint32(tempPointer + len(tempString) + 1)) + tempPointer += len(tempString) + 1 + newStrings.WriteNullTerminatedBytes(tempString) + } + questBody.WriteBytes(newStrings.Data()) + return questBody.Data() } func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { - var id int32 - var questId uint16 + var id uint32 + var questId int var maxPlayers, questType, mark uint8 rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) - bf := byteframe.NewByteFrame() - bf.SetLE() + data := loadQuestFile(s, fmt.Sprintf("%05dd0", questId)) + if data == nil { + return nil, fmt.Errorf("failed to load quest file") + } - // Reconstructing the event-header itself. A lot of the data is not actually necessary for the quest to operate normally. - bf.WriteInt32(id) - bf.WriteInt32(0) + bf := byteframe.NewByteFrame() + bf.WriteUint32(id) + bf.WriteUint32(0) bf.WriteUint8(0) // Indexer bf.WriteUint8(maxPlayers) bf.WriteUint8(questType) @@ -175,23 +158,9 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint16(0) bf.WriteUint32(0) bf.WriteUint16(0) - bf.WriteUint16(0) - - data := loadQuestFile(s, fmt.Sprintf("%05d", questId)+"d0") - - if data == nil { - return nil, fmt.Errorf("failed to load quest file") - } - + bf.WriteUint16(uint16(len(data))) bf.WriteBytes(data) - - // Update the checksum at pos 21, the checksum is determined the total length of the file minus 553 turned into a single byte. - bf.Seek(21, io.SeekStart) - bf.WriteUint8(uint8(len(bf.Data()) - 553)) - - // Overwrite the string-pointer at 62 to point at 320. This is always 320 and does not count the 22 from the event header. - bf.Seek(62, io.SeekStart) - bf.WriteInt16(320) + ps.Uint8(bf, "", true) // What is this string for? return bf.Data(), nil } @@ -215,7 +184,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { if err != nil { continue } else { - if len(data) > 850 || len(data) < 400 { + if len(data) > 896 || len(data) < 352 { continue } else { totalCount++ From f2cd6b7edbd30d3e5debbaa1917a85466b253c86 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 18 Jul 2023 21:53:58 +1000 Subject: [PATCH 20/27] refactor loadQuestFile --- server/channelserver/handlers_quest.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index b43f6c83c..39642900e 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -98,8 +98,8 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) } -func loadQuestFile(s *Session, questFile string) []byte { - file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", questFile))) +func loadQuestFile(s *Session, questId int) []byte { + file, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%05dd0.bin", questId))) if err != nil { return nil } @@ -143,7 +143,7 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { var maxPlayers, questType, mark uint8 rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) - data := loadQuestFile(s, fmt.Sprintf("%05dd0", questId)) + data := loadQuestFile(s, questId) if data == nil { return nil, fmt.Errorf("failed to load quest file") } From f23da6fba5bfd09b6ef5ca564ee52011382a9675 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 18 Jul 2023 23:00:00 +1000 Subject: [PATCH 21/27] remove Season from database --- main.go | 2 +- patch-schema/event_quests.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index dacd0dd18..f549f4bc8 100644 --- a/main.go +++ b/main.go @@ -222,7 +222,7 @@ func main() { if err != nil { preventClose(fmt.Sprintf("Channel: Failed to start, %s", err.Error())) } else { - channelQuery += fmt.Sprintf(`INSERT INTO servers (server_id, season, current_players, world_name, world_description, land) VALUES (%d, %d, 0, '%s', '%s', %d);`, sid, si%3, ee.Name, ee.Description, i+1) + channelQuery += fmt.Sprintf(`INSERT INTO servers (server_id, current_players, world_name, world_description, land) VALUES (%d, 0, '%s', '%s', %d);`, sid, ee.Name, ee.Description, i+1) channels = append(channels, &c) logger.Info(fmt.Sprintf("Channel %d (%d): Started successfully", count, ce.Port)) ci++ diff --git a/patch-schema/event_quests.sql b/patch-schema/event_quests.sql index b2566e50d..94aac0c65 100644 --- a/patch-schema/event_quests.sql +++ b/patch-schema/event_quests.sql @@ -9,4 +9,6 @@ create table if not exists event_quests mark integer ); +ALTER TABLE IF EXISTS public.servers DROP COLUMN IF EXISTS season; + END; \ No newline at end of file From ab3acecce638d3d0831977dcae1b0101f7fb7634 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 00:00:40 +1000 Subject: [PATCH 22/27] fix Quest Enumeration strings --- server/channelserver/handlers_quest.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 39642900e..b41338bf6 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -124,11 +124,11 @@ func loadQuestFile(s *Session, questId int) []byte { newStrings := byteframe.NewByteFrame() tempPointer := 352 for i := 0; i < 8; i++ { + questBody.WriteUint32(uint32(tempPointer)) temp := int64(fileBytes.Index()) fileBytes.Seek(int64(fileBytes.ReadUint32()), 0) tempString = fileBytes.ReadNullTerminatedBytes() - fileBytes.Seek(temp, 0) - questBody.WriteUint32(uint32(tempPointer + len(tempString) + 1)) + fileBytes.Seek(temp+4, 0) tempPointer += len(tempString) + 1 newStrings.WriteNullTerminatedBytes(tempString) } From 064659c8292169e1486617fe5e2e72e7338453ae Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 00:03:09 +1000 Subject: [PATCH 23/27] split into questSuffix function --- server/channelserver/handlers_quest.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index b41338bf6..65a6a9288 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -61,7 +61,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) { } } -func seasonConversion(s *Session, questFile string) string { +func questSuffix(s *Session) string { // Determine the letter to append for day / night var timeSet string if TimeGameAbsolute() > 2880 { @@ -69,8 +69,11 @@ func seasonConversion(s *Session, questFile string) string { } else { timeSet = "n" } + return fmt.Sprintf("%s%d", timeSet, s.server.Season()) +} - filename := fmt.Sprintf("%s%s%d", questFile[:5], timeSet, s.server.Season()) +func seasonConversion(s *Session, questFile string) string { + filename := fmt.Sprintf("%s%s", questFile[:5], questSuffix(s)) // Return original file if file doesn't exist if _, err := os.Stat(filename); err == nil { From 452e8433be950a7b1bb2bfc43e23a2bff783c8d3 Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 00:17:17 +1000 Subject: [PATCH 24/27] fix Quests not enumerating --- server/channelserver/handlers_quest.go | 1 + 1 file changed, 1 insertion(+) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 65a6a9288..f8f219092 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -118,6 +118,7 @@ func loadQuestFile(s *Session, questId int) []byte { // Find the master quest string pointer questBody.Seek(40, 0) fileBytes.Seek(int64(questBody.ReadUint32()), 0) + questBody.Seek(40, 0) // Overwrite it questBody.WriteUint32(320) questBody.Seek(0, 2) From 06892439ac2acf06d60a72bf0b84c360b41d7dfa Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 21:40:36 +1000 Subject: [PATCH 25/27] remove unused code --- server/channelserver/handlers_quest.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index f8f219092..1b1c469ae 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -176,15 +176,8 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(0) rows, _ := s.server.db.Query("SELECT id, COALESCE(max_players, 4) AS max_players, quest_type, quest_id, COALESCE(mark, 0) AS mark FROM event_quests ORDER BY quest_id") - - // Loop through each row and load the quest entry if it exists. for rows.Next() { - var pointer []byte - var maxPlayers, questType, checksum, questId uint16 - rows.Scan(&pointer, &maxPlayers, &questType, &checksum, &questId) - data, err := makeEventQuest(s, rows) - if err != nil { continue } else { From 893e89937faabbd77a9e4ec1a1c9e69952f8756c Mon Sep 17 00:00:00 2001 From: wish Date: Wed, 19 Jul 2023 23:23:31 +1000 Subject: [PATCH 26/27] fix Quest Mark being labelled incorrectly --- server/channelserver/handlers_quest.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 1b1c469ae..754a4ce28 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -142,9 +142,9 @@ func loadQuestFile(s *Session, questId int) []byte { } func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { - var id uint32 + var id, mark uint32 var questId int - var maxPlayers, questType, mark uint8 + var maxPlayers, questType uint8 rows.Scan(&id, &maxPlayers, &questType, &questId, &mark) data := loadQuestFile(s, questId) @@ -158,9 +158,9 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint8(0) // Indexer bf.WriteUint8(maxPlayers) bf.WriteUint8(questType) - bf.WriteUint8(mark) + bf.WriteUint8(0) bf.WriteUint16(0) - bf.WriteUint32(0) + bf.WriteUint32(mark) bf.WriteUint16(0) bf.WriteUint16(uint16(len(data))) bf.WriteBytes(data) From c80afa60058a741ab5e02c91bc98cd1da9e45615 Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 29 Jul 2023 17:15:53 +1000 Subject: [PATCH 27/27] add customisable Raviente max players --- config.json | 5 +++ config/config.go | 51 ++++++++++++++------------ server/channelserver/handlers_quest.go | 15 +++++++- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/config.json b/config.json index 83d1ee480..6d519c763 100644 --- a/config.json +++ b/config.json @@ -47,6 +47,11 @@ "DailyQuestAllowance": 1, "MezfesSoloTickets": 10, "MezfesGroupTickets": 4, + "RegularRavienteMaxPlayers": 8, + "ViolentRavienteMaxPlayers": 8, + "BerserkRavienteMaxPlayers": 32, + "ExtremeRavienteMaxPlayers": 32, + "SmallBerserkRavienteMaxPlayers": 8, "GUrgentRate": 10, "GCPMultiplier": 1.00, "GRPMultiplier": 1.00, diff --git a/config/config.go b/config/config.go index b8b52ee06..f084e3e5e 100644 --- a/config/config.go +++ b/config/config.go @@ -121,29 +121,34 @@ type SaveDumpOptions struct { // GameplayOptions has various gameplay modifiers type GameplayOptions struct { - FeaturedWeapons int // Number of Active Feature weapons to generate daily - MaximumNP int // Maximum number of NP held by a player - MaximumRP uint16 // Maximum number of RP held by a player - DisableLoginBoost bool // Disables the Login Boost system - DisableBoostTime bool // Disables the daily NetCafe Boost Time - BoostTimeDuration int // The number of minutes NetCafe Boost Time lasts for - GuildMealDuration int // The number of minutes a Guild Meal can be activated for after cooking - 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 - GUrgentRate uint16 // Adjusts the rate of G Urgent quests spawning - GCPMultiplier float32 // Adjusts the multiplier of GCP rewarded for quest completion - GRPMultiplier float32 // Adjusts the multiplier of G Rank Points rewarded for quest completion - GSRPMultiplier float32 // Adjusts the multiplier of G Skill Rank Points rewarded for quest completion - GZennyMultiplier float32 // Adjusts the multiplier of G Zenny rewarded for quest completion - 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 - EnableHiganjimaEvent bool // Enables the Higanjima event in the Rasta Bar - EnableNierEvent bool // Enables the Nier event in the Rasta Bar - DisableRoad bool // Disables the Hunting Road - SeasonOverride bool // Overrides the Quest Season with the current Mezeporta Season + FeaturedWeapons int // Number of Active Feature weapons to generate daily + MaximumNP int // Maximum number of NP held by a player + MaximumRP uint16 // Maximum number of RP held by a player + DisableLoginBoost bool // Disables the Login Boost system + DisableBoostTime bool // Disables the daily NetCafe Boost Time + BoostTimeDuration int // The number of minutes NetCafe Boost Time lasts for + GuildMealDuration int // The number of minutes a Guild Meal can be activated for after cooking + 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 + RegularRavienteMaxPlayers uint8 + ViolentRavienteMaxPlayers uint8 + BerserkRavienteMaxPlayers uint8 + ExtremeRavienteMaxPlayers uint8 + SmallBerserkRavienteMaxPlayers uint8 + GUrgentRate uint16 // Adjusts the rate of G Urgent quests spawning + GCPMultiplier float32 // Adjusts the multiplier of GCP rewarded for quest completion + GRPMultiplier float32 // Adjusts the multiplier of G Rank Points rewarded for quest completion + GSRPMultiplier float32 // Adjusts the multiplier of G Skill Rank Points rewarded for quest completion + GZennyMultiplier float32 // Adjusts the multiplier of G Zenny rewarded for quest completion + 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 + EnableHiganjimaEvent bool // Enables the Higanjima event in the Rasta Bar + EnableNierEvent bool // Enables the Nier event in the Rasta Bar + DisableRoad bool // Disables the Hunting Road + SeasonOverride bool // Overrides the Quest Season with the current Mezeporta Season } // Discord holds the discord integration config. diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 754a4ce28..64041d8a5 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -156,7 +156,20 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) { bf.WriteUint32(id) bf.WriteUint32(0) bf.WriteUint8(0) // Indexer - bf.WriteUint8(maxPlayers) + switch questType { + case 16: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.RegularRavienteMaxPlayers) + case 22: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.ViolentRavienteMaxPlayers) + case 40: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.BerserkRavienteMaxPlayers) + case 50: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.ExtremeRavienteMaxPlayers) + case 51: + bf.WriteUint8(s.server.erupeConfig.GameplayOptions.SmallBerserkRavienteMaxPlayers) + default: + bf.WriteUint8(maxPlayers) + } bf.WriteUint8(questType) bf.WriteUint8(0) bf.WriteUint16(0)