diff --git a/network/mhfpacket/msg_mhf_get_paper_data.go b/network/mhfpacket/msg_mhf_get_paper_data.go index 71f7d9c9f..3b83fd312 100644 --- a/network/mhfpacket/msg_mhf_get_paper_data.go +++ b/network/mhfpacket/msg_mhf_get_paper_data.go @@ -15,7 +15,7 @@ type MsgMhfGetPaperData struct { AckHandle uint32 Type uint32 Unk1 uint32 - Unk2 uint32 + ID uint32 } // Opcode returns the ID associated with this packet type. @@ -28,8 +28,8 @@ func (m *MsgMhfGetPaperData) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clien m.AckHandle = bf.ReadUint32() m.Type = bf.ReadUint32() m.Unk1 = bf.ReadUint32() - m.Unk2 = bf.ReadUint32() - fmt.Printf("MsgMhfGetPaperData: Type:[%d] Unk1:[%d] Unk2:[%d] \n\n", m.Type, m.Unk1, m.Unk2) + m.ID = bf.ReadUint32() + fmt.Printf("MsgMhfGetPaperData: Type:[%d] Unk1:[%d] ID:[%d] \n\n", m.Type, m.Unk1, m.ID) return nil } diff --git a/schemas/bundled-schema/PaperData.sql b/schemas/bundled-schema/PaperData.sql new file mode 100644 index 000000000..37cdadeb7 --- /dev/null +++ b/schemas/bundled-schema/PaperData.sql @@ -0,0 +1,754 @@ +BEGIN; + +INSERT INTO public.paper_data_gifts (gift_id, item_id, unk0,unk1,unk2) VALUES + + (6001,11159, 1, 1, 5000), + (6001,11160, 1, 1, 3350), + (6001,11161, 1, 1, 1500), + (6001,11162, 1, 1, 100), + (6001,11163, 1, 1, 50), + (6002,11159, 2, 1, 1800), + (6002,11160, 2, 1, 1200), + (6002,11161, 2, 1, 500), + (6002,11162, 1, 1, 50), + (6002,11037, 1, 1, 150), + (6002,11038, 1, 1, 150), + (6002,11044, 1, 1, 150), + (6002,11057, 1, 1, 150), + (6002,11059, 1, 1, 150), + (6002,11079, 1, 1, 150), + (6002,11098, 1, 1, 150), + (6002,11104, 1, 1, 150), + (6002,11117, 1, 1, 150), + (6002,11128, 1, 1, 150), + (6002,11133, 1, 1, 150), + (6002,11137, 1, 1, 150), + (6002,11143, 1, 1, 150), + (6002,11132, 1, 1, 150), + (6002,11039, 1, 1, 150), + (6002,11040, 1, 1, 150), + (6002,11049, 1, 1, 150), + (6002,11061, 1, 1, 150), + (6002,11063, 1, 1, 150), + (6002,11077, 1, 1, 150), + (6002,11099, 1, 1, 150), + (6002,11105, 1, 1, 150), + (6002,11129, 1, 1, 150), + (6002,11130, 1, 1, 150), + (6002,11131, 1, 1, 150), + (6002,11139, 1, 1, 150), + (6002,11145, 1, 1, 150), + (6002,11096, 1, 1, 150), + (6002,11041, 1, 1, 150), + (6002,11047, 1, 1, 150), + (6002,11054, 1, 1, 150), + (6002,11065, 1, 1, 150), + (6002,11068, 1, 1, 150), + (6002,11075, 1, 1, 150), + (6002,11100, 1, 1, 150), + (6002,11106, 1, 1, 150), + (6002,11119, 1, 1, 150), + (6002,11135, 1, 1, 150), + (6002,11136, 1, 1, 150), + (6002,11138, 1, 1, 150), + (6002,11088, 1, 1, 150), + (6002,10370, 1, 1, 150), + (6002,10368, 1, 1, 150), + (6010,11159, 1, 1, 3700), + (6010,11160, 1, 1, 2900), + (6010,11161, 1, 1, 1300), + (6010,11453, 1, 1, 250), + (6010,11454, 1, 1, 250), + (6010,12055, 1, 1, 250), + (6010,12065, 1, 1, 250), + (6010,12058, 1, 1, 250), + (6010,12068, 1, 1, 250), + (6010,11774, 1, 1, 200), + (6010,11773, 1, 1, 400), + (6011,11159, 1, 1, 3700), + (6011,11160, 1, 1, 2900), + (6011,11161, 1, 1, 1300), + (6011,11453, 1, 1, 250), + (6011,11454, 1, 1, 250), + (6011,12055, 1, 1, 250), + (6011,12065, 1, 1, 250), + (6011,12058, 1, 1, 250), + (6011,12068, 1, 1, 250), + (6011,11774, 1, 1, 200), + (6011,11773, 1, 1, 400), + (6012,11159, 2, 1, 3500), + (6012,11160, 2, 1, 2900), + (6012,11161, 2, 1, 1300), + (6012,12508, 1, 1, 400), + (6012,11453, 1, 1, 200), + (6012,11454, 1, 1, 200), + (6012,12055, 1, 1, 200), + (6012,12065, 1, 1, 200), + (6012,12058, 1, 1, 200), + (6012,12068, 1, 1, 200), + (6012,11775, 1, 1, 400), + (6012,11776, 1, 1, 200), + (6012,11777, 1, 1, 100), + (7001,11037, 1, 1, 290), + (7001,11038, 1, 1, 270), + (7001,11044, 1, 1, 270), + (7001,11057, 1, 1, 290), + (7001,11059, 1, 1, 290), + (7001,11079, 1, 1, 290), + (7001,11098, 1, 1, 280), + (7001,11104, 1, 1, 300), + (7001,11117, 1, 1, 280), + (7001,11128, 1, 1, 290), + (7001,11133, 1, 1, 290), + (7001,11137, 1, 1, 300), + (7001,11143, 1, 1, 290), + (7001,11132, 1, 1, 270), + (7001,11042, 1, 1, 47), + (7001,11045, 1, 1, 47), + (7001,11064, 1, 1, 47), + (7001,11062, 1, 1, 47), + (7001,11070, 1, 1, 48), + (7001,11101, 1, 1, 47), + (7001,11108, 1, 1, 47), + (7001,11109, 1, 1, 47), + (7001,11120, 1, 1, 47), + (7001,11122, 1, 1, 47), + (7001,11134, 1, 1, 47), + (7001,11141, 1, 1, 47), + (7001,11084, 1, 1, 47), + (7001,11087, 1, 1, 47), + (7001,11094, 1, 1, 47), + (7001,10374, 1, 1, 47), + (7001,10375, 1, 1, 47), + (7001,11051, 1, 1, 17), + (7001,11071, 1, 1, 16), + (7001,11076, 1, 1, 16), + (7001,11102, 1, 1, 17), + (7001,11124, 1, 1, 17), + (7001,11090, 1, 1, 17), + (7001,11159, 1, 1, 1200), + (7001,11159, 2, 1, 650), + (7001,11160, 1, 1, 800), + (7001,11160, 2, 1, 300), + (7001,11161, 1, 1, 100), + (7001,11161, 2, 1, 50), + (7001,11164, 1, 1, 100), + (7001,11162, 1, 1, 100), + (7001,11163, 1, 1, 100), + (7001,11158, 1, 1, 300), + (7001,11463, 1, 1, 300), + (7001,11356, 1, 1, 300), + (7001,11464, 1, 1, 300), + (7001,11357, 1, 1, 500), + (7001,11039, 1, 2, 300), + (7001,11040, 1, 2, 270), + (7001,11049, 1, 2, 300), + (7001,11061, 1, 2, 290), + (7001,11063, 1, 2, 290), + (7001,11077, 1, 2, 290), + (7001,11099, 1, 2, 280), + (7001,11105, 1, 2, 300), + (7001,11129, 1, 2, 250), + (7001,11130, 1, 2, 300), + (7001,11131, 1, 2, 280), + (7001,11139, 1, 2, 290), + (7001,11145, 1, 2, 260), + (7001,11096, 1, 2, 300), + (7001,11046, 1, 2, 47), + (7001,11066, 1, 2, 47), + (7001,11067, 1, 2, 47), + (7001,11072, 1, 2, 47), + (7001,11082, 1, 2, 47), + (7001,11103, 1, 2, 47), + (7001,11110, 1, 2, 47), + (7001,11112, 1, 2, 47), + (7001,11114, 1, 2, 47), + (7001,11115, 1, 2, 47), + (7001,11121, 1, 2, 47), + (7001,11144, 1, 2, 48), + (7001,11085, 1, 2, 47), + (7001,11089, 1, 2, 47), + (7001,11091, 1, 2, 47), + (7001,10376, 1, 2, 47), + (7001,10377, 1, 2, 47), + (7001,11127, 1, 2, 17), + (7001,11069, 1, 2, 17), + (7001,11142, 1, 2, 17), + (7001,11078, 1, 2, 17), + (7001,11056, 1, 2, 16), + (7001,11092, 1, 2, 16), + (7001,11159, 1, 2, 1200), + (7001,11159, 2, 2, 650), + (7001,11160, 1, 2, 800), + (7001,11160, 2, 2, 300), + (7001,11161, 1, 2, 100), + (7001,11161, 2, 2, 50), + (7001,11164, 1, 2, 100), + (7001,11162, 1, 2, 100), + (7001,11163, 1, 2, 100), + (7001,11158, 1, 2, 300), + (7001,11463, 1, 2, 300), + (7001,11356, 1, 2, 300), + (7001,11464, 1, 2, 300), + (7001,11357, 1, 2, 500), + (7001,11041, 1, 3, 266), + (7001,11047, 1, 3, 266), + (7001,11054, 1, 3, 266), + (7001,11065, 1, 3, 266), + (7001,11068, 1, 3, 266), + (7001,11075, 1, 3, 266), + (7001,11100, 1, 3, 266), + (7001,11106, 1, 3, 266), + (7001,11119, 1, 3, 266), + (7001,11135, 1, 3, 268), + (7001,11136, 1, 3, 268), + (7001,11138, 1, 3, 268), + (7001,11088, 1, 3, 268), + (7001,10370, 1, 3, 266), + (7001,10368, 1, 3, 268), + (7001,11043, 1, 3, 50), + (7001,11048, 1, 3, 50), + (7001,11050, 1, 3, 50), + (7001,11058, 1, 3, 50), + (7001,11060, 1, 3, 50), + (7001,11074, 1, 3, 50), + (7001,11107, 1, 3, 50), + (7001,11111, 1, 3, 50), + (7001,11113, 1, 3, 50), + (7001,11118, 1, 3, 50), + (7001,11126, 1, 3, 50), + (7001,11140, 1, 3, 50), + (7001,11086, 1, 3, 50), + (7001,11095, 1, 3, 50), + (7001,11055, 1, 3, 50), + (7001,10378, 1, 3, 50), + (7001,11052, 1, 3, 15), + (7001,11073, 1, 3, 15), + (7001,11146, 1, 3, 15), + (7001,11116, 1, 3, 15), + (7001,11123, 1, 3, 15), + (7001,11097, 1, 3, 15), + (7001,10367, 1, 3, 15), + (7001,10371, 1, 3, 15), + (7001,10373, 1, 3, 15), + (7001,10778, 1, 3, 375), + (7001,11209, 1, 3, 375), + (7001,10813, 1, 3, 375), + (7001,11389, 1, 3, 375), + (7001,11159, 1, 3, 1000), + (7001,11159, 2, 3, 250), + (7001,11160, 1, 3, 700), + (7001,11160, 2, 3, 175), + (7001,11161, 1, 3, 300), + (7001,11161, 2, 3, 75), + (7001,11465, 1, 3, 53), + (7001,11466, 1, 3, 27), + (7001,11467, 1, 3, 266), + (7001,11468, 1, 3, 533), + (7001,11469, 1, 3, 186), + (7002,11037, 1, 1, 100), + (7002,11038, 1, 1, 100), + (7002,11044, 1, 1, 100), + (7002,11057, 1, 1, 100), + (7002,11059, 1, 1, 100), + (7002,11079, 1, 1, 100), + (7002,11098, 1, 1, 100), + (7002,11104, 1, 1, 100), + (7002,11117, 1, 1, 100), + (7002,11128, 1, 1, 100), + (7002,11133, 1, 1, 100), + (7002,11137, 1, 1, 100), + (7002,11143, 1, 1, 100), + (7002,11132, 1, 1, 100), + (7002,11042, 1, 1, 60), + (7002,11045, 1, 1, 60), + (7002,11064, 1, 1, 60), + (7002,11062, 1, 1, 60), + (7002,11070, 1, 1, 60), + (7002,11101, 1, 1, 60), + (7002,11108, 1, 1, 60), + (7002,11109, 1, 1, 60), + (7002,11120, 1, 1, 60), + (7002,11122, 1, 1, 60), + (7002,11134, 1, 1, 60), + (7002,11141, 1, 1, 60), + (7002,11084, 1, 1, 60), + (7002,11087, 1, 1, 60), + (7002,11094, 1, 1, 60), + (7002,10374, 1, 1, 60), + (7002,10375, 1, 1, 60), + (7002,11051, 1, 1, 20), + (7002,11071, 1, 1, 20), + (7002,11076, 1, 1, 20), + (7002,11102, 1, 1, 20), + (7002,11124, 1, 1, 20), + (7002,11090, 1, 1, 20), + (7002,11164, 1, 1, 400), + (7002,11162, 1, 1, 200), + (7002,11163, 1, 1, 200), + (7002,11463, 1, 1, 100), + (7002,11464, 1, 1, 150), + (7002,10355, 1, 1, 150), + (7002,12506, 1, 1, 200), + (7002,12507, 1, 1, 300), + (7002,12508, 1, 1, 900), + (7002,13629, 1, 1, 350), + (7002,13628, 1, 1, 200), + (7002,11356, 1, 1, 100), + (7002,11357, 1, 1, 150), + (7002,12014, 1, 1, 250), + (7002,12016, 1, 1, 400), + (7002,12015, 1, 1, 410), + (7002,11159, 2, 1, 500), + (7002,11159, 4, 1, 500), + (7002,11159, 6, 1, 500), + (7002,11160, 2, 1, 400), + (7002,11160, 4, 1, 400), + (7002,11160, 6, 1, 400), + (7002,11161, 2, 1, 100), + (7002,11161, 4, 1, 100), + (7002,11161, 6, 1, 100), + (7002,11039, 1, 2, 100), + (7002,11040, 1, 2, 100), + (7002,11049, 1, 2, 100), + (7002,11061, 1, 2, 100), + (7002,11063, 1, 2, 100), + (7002,11077, 1, 2, 100), + (7002,11099, 1, 2, 100), + (7002,11105, 1, 2, 100), + (7002,11129, 1, 2, 100), + (7002,11130, 1, 2, 100), + (7002,11131, 1, 2, 100), + (7002,11139, 1, 2, 100), + (7002,11145, 1, 2, 100), + (7002,11096, 1, 2, 100), + (7002,11046, 1, 2, 60), + (7002,11066, 1, 2, 60), + (7002,11067, 1, 2, 60), + (7002,11072, 1, 2, 60), + (7002,11082, 1, 2, 60), + (7002,11103, 1, 2, 60), + (7002,11110, 1, 2, 60), + (7002,11112, 1, 2, 60), + (7002,11114, 1, 2, 60), + (7002,11115, 1, 2, 60), + (7002,11121, 1, 2, 60), + (7002,11144, 1, 2, 60), + (7002,11085, 1, 2, 60), + (7002,11089, 1, 2, 60), + (7002,11091, 1, 2, 60), + (7002,10376, 1, 2, 60), + (7002,10377, 1, 2, 60), + (7002,11127, 1, 2, 20), + (7002,11069, 1, 2, 20), + (7002,11142, 1, 2, 20), + (7002,11078, 1, 2, 20), + (7002,11056, 1, 2, 20), + (7002,11092, 1, 2, 20), + (7002,11164, 1, 2, 400), + (7002,11162, 1, 2, 200), + (7002,11163, 1, 2, 200), + (7002,11463, 1, 2, 250), + (7002,11464, 1, 2, 350), + (7002,12506, 1, 2, 150), + (7002,12507, 1, 2, 200), + (7002,12508, 1, 2, 350), + (7002,13629, 1, 2, 250), + (7002,13628, 1, 2, 200), + (7002,10355, 1, 2, 400), + (7002,11158, 1, 2, 100), + (7002,11356, 1, 2, 100), + (7002,11357, 1, 2, 100), + (7002,12014, 1, 2, 300), + (7002,12016, 1, 2, 450), + (7002,12015, 1, 2, 460), + (7002,11159, 2, 2, 500), + (7002,11159, 4, 2, 500), + (7002,11159, 6, 2, 500), + (7002,11160, 2, 2, 400), + (7002,11160, 4, 2, 400), + (7002,11160, 6, 2, 400), + (7002,11161, 2, 2, 100), + (7002,11161, 4, 2, 100), + (7002,11161, 6, 2, 100), + (7002,11041, 1, 3, 120), + (7002,11047, 1, 3, 120), + (7002,11054, 1, 3, 120), + (7002,11065, 1, 3, 120), + (7002,11068, 1, 3, 120), + (7002,11075, 1, 3, 120), + (7002,11100, 1, 3, 120), + (7002,11106, 1, 3, 120), + (7002,11119, 1, 3, 120), + (7002,11135, 1, 3, 120), + (7002,11136, 1, 3, 120), + (7002,11138, 1, 3, 120), + (7002,11088, 1, 3, 120), + (7002,10370, 1, 3, 120), + (7002,10368, 1, 3, 120), + (7002,11043, 1, 3, 65), + (7002,11048, 1, 3, 65), + (7002,11050, 1, 3, 65), + (7002,11058, 1, 3, 65), + (7002,11060, 1, 3, 65), + (7002,11074, 1, 3, 65), + (7002,11107, 1, 3, 65), + (7002,11111, 1, 3, 65), + (7002,11113, 1, 3, 65), + (7002,11118, 1, 3, 65), + (7002,11126, 1, 3, 65), + (7002,11140, 1, 3, 65), + (7002,11086, 1, 3, 65), + (7002,11095, 1, 3, 65), + (7002,11055, 1, 3, 65), + (7002,10378, 1, 3, 65), + (7002,11052, 1, 3, 15), + (7002,11073, 1, 3, 15), + (7002,11146, 1, 3, 15), + (7002,11116, 1, 3, 15), + (7002,11123, 1, 3, 15), + (7002,11097, 1, 3, 15), + (7002,10367, 1, 3, 15), + (7002,10371, 1, 3, 15), + (7002,10373, 1, 3, 15), + (7002,10778, 3, 3, 490), + (7002,11209, 3, 3, 490), + (7002,10813, 3, 3, 490), + (7002,11389, 3, 3, 490), + (7002,12046, 3, 3, 500), + (7002,12503, 3, 3, 500), + (7002,11159, 2, 3, 500), + (7002,11159, 4, 3, 500), + (7002,11159, 6, 3, 500), + (7002,11160, 2, 3, 400), + (7002,11160, 4, 3, 400), + (7002,11160, 6, 3, 400), + (7002,11161, 2, 3, 100), + (7002,11161, 4, 3, 100), + (7002,11161, 6, 3, 100), + (7002,11465, 1, 3, 53), + (7002,11466, 1, 3, 27), + (7002,11467, 1, 3, 266), + (7002,11468, 1, 3, 533), + (7002,11469, 1, 3, 186), + (7011,11037, 1, 1, 290), + (7011,11038, 1, 1, 270), + (7011,11044, 1, 1, 270), + (7011,11057, 1, 1, 290), + (7011,11059, 1, 1, 290), + (7011,11079, 1, 1, 290), + (7011,11098, 1, 1, 280), + (7011,11104, 1, 1, 300), + (7011,11117, 1, 1, 280), + (7011,11128, 1, 1, 290), + (7011,11133, 1, 1, 290), + (7011,11137, 1, 1, 300), + (7011,11143, 1, 1, 290), + (7011,11132, 1, 1, 270), + (7011,11042, 1, 1, 47), + (7011,11045, 1, 1, 47), + (7011,11064, 1, 1, 47), + (7011,11062, 1, 1, 47), + (7011,11070, 1, 1, 48), + (7011,11101, 1, 1, 47), + (7011,11108, 1, 1, 47), + (7011,11109, 1, 1, 47), + (7011,11120, 1, 1, 47), + (7011,11122, 1, 1, 47), + (7011,11134, 1, 1, 47), + (7011,11141, 1, 1, 47), + (7011,11084, 1, 1, 47), + (7011,11087, 1, 1, 47), + (7011,11094, 1, 1, 47), + (7011,10374, 1, 1, 47), + (7011,10375, 1, 1, 47), + (7011,11051, 1, 1, 17), + (7011,11071, 1, 1, 16), + (7011,11076, 1, 1, 16), + (7011,11102, 1, 1, 17), + (7011,11124, 1, 1, 17), + (7011,11090, 1, 1, 17), + (7011,11159, 1, 1, 1200), + (7011,11159, 2, 1, 650), + (7011,11160, 1, 1, 800), + (7011,11160, 2, 1, 300), + (7011,11161, 1, 1, 100), + (7011,11161, 2, 1, 50), + (7011,11164, 1, 1, 100), + (7011,11162, 1, 1, 100), + (7011,11163, 1, 1, 100), + (7011,11158, 1, 1, 300), + (7011,11463, 1, 1, 300), + (7011,11356, 1, 1, 300), + (7011,11464, 1, 1, 300), + (7011,11357, 1, 1, 500), + (7011,11039, 1, 2, 300), + (7011,11040, 1, 2, 270), + (7011,11049, 1, 2, 300), + (7011,11061, 1, 2, 290), + (7011,11063, 1, 2, 290), + (7011,11077, 1, 2, 290), + (7011,11099, 1, 2, 280), + (7011,11105, 1, 2, 300), + (7011,11129, 1, 2, 250), + (7011,11130, 1, 2, 300), + (7011,11131, 1, 2, 280), + (7011,11139, 1, 2, 290), + (7011,11145, 1, 2, 260), + (7011,11096, 1, 2, 300), + (7011,11046, 1, 2, 47), + (7011,11066, 1, 2, 47), + (7011,11067, 1, 2, 47), + (7011,11072, 1, 2, 47), + (7011,11082, 1, 2, 47), + (7011,11103, 1, 2, 47), + (7011,11110, 1, 2, 47), + (7011,11112, 1, 2, 47), + (7011,11114, 1, 2, 47), + (7011,11115, 1, 2, 47), + (7011,11121, 1, 2, 47), + (7011,11144, 1, 2, 48), + (7011,11085, 1, 2, 47), + (7011,11089, 1, 2, 47), + (7011,11091, 1, 2, 47), + (7011,10376, 1, 2, 47), + (7011,10377, 1, 2, 47), + (7011,11127, 1, 2, 17), + (7011,11069, 1, 2, 17), + (7011,11142, 1, 2, 17), + (7011,11078, 1, 2, 17), + (7011,11056, 1, 2, 16), + (7011,11092, 1, 2, 16), + (7011,11159, 1, 2, 1200), + (7011,11159, 2, 2, 650), + (7011,11160, 1, 2, 800), + (7011,11160, 2, 2, 300), + (7011,11161, 1, 2, 100), + (7011,11161, 2, 2, 50), + (7011,11164, 1, 2, 100), + (7011,11162, 1, 2, 100), + (7011,11163, 1, 2, 100), + (7011,11158, 1, 2, 300), + (7011,11463, 1, 2, 300), + (7011,11356, 1, 2, 300), + (7011,11464, 1, 2, 300), + (7011,11357, 1, 2, 500), + (7011,11041, 1, 3, 266), + (7011,11047, 1, 3, 266), + (7011,11054, 1, 3, 266), + (7011,11065, 1, 3, 266), + (7011,11068, 1, 3, 266), + (7011,11075, 1, 3, 266), + (7011,11100, 1, 3, 266), + (7011,11106, 1, 3, 266), + (7011,11119, 1, 3, 266), + (7011,11135, 1, 3, 268), + (7011,11136, 1, 3, 268), + (7011,11138, 1, 3, 268), + (7011,11088, 1, 3, 268), + (7011,10370, 1, 3, 266), + (7011,10368, 1, 3, 268), + (7011,11043, 1, 3, 50), + (7011,11048, 1, 3, 50), + (7011,11050, 1, 3, 50), + (7011,11058, 1, 3, 50), + (7011,11060, 1, 3, 50), + (7011,11074, 1, 3, 50), + (7011,11107, 1, 3, 50), + (7011,11111, 1, 3, 50), + (7011,11113, 1, 3, 50), + (7011,11118, 1, 3, 50), + (7011,11126, 1, 3, 50), + (7011,11140, 1, 3, 50), + (7011,11086, 1, 3, 50), + (7011,11095, 1, 3, 50), + (7011,11055, 1, 3, 50), + (7011,10378, 1, 3, 50), + (7011,11052, 1, 3, 15), + (7011,11073, 1, 3, 15), + (7011,11146, 1, 3, 15), + (7011,11116, 1, 3, 15), + (7011,11123, 1, 3, 15), + (7011,11097, 1, 3, 15), + (7011,10367, 1, 3, 15), + (7011,10371, 1, 3, 15), + (7011,10373, 1, 3, 15), + (7011,10778, 1, 3, 375), + (7011,11209, 1, 3, 375), + (7011,10813, 1, 3, 375), + (7011,11389, 1, 3, 375), + (7011,11159, 1, 3, 1000), + (7011,11159, 2, 3, 250), + (7011,11160, 1, 3, 700), + (7011,11160, 2, 3, 175), + (7011,11161, 1, 3, 300), + (7011,11161, 2, 3, 75), + (7011,11465, 1, 3, 53), + (7011,11466, 1, 3, 27), + (7011,11467, 1, 3, 266), + (7011,11468, 1, 3, 533), + (7011,11469, 1, 3, 186), + (7012,11037, 1, 1, 290), + (7012,11038, 1, 1, 270), + (7012,11044, 1, 1, 270), + (7012,11057, 1, 1, 290), + (7012,11059, 1, 1, 290), + (7012,11079, 1, 1, 290), + (7012,11098, 1, 1, 280), + (7012,11104, 1, 1, 300), + (7012,11117, 1, 1, 280), + (7012,11128, 1, 1, 290), + (7012,11133, 1, 1, 290), + (7012,11137, 1, 1, 300), + (7012,11143, 1, 1, 290), + (7012,11132, 1, 1, 270), + (7012,11042, 1, 1, 47), + (7012,11045, 1, 1, 47), + (7012,11064, 1, 1, 47), + (7012,11062, 1, 1, 47), + (7012,11070, 1, 1, 48), + (7012,11101, 1, 1, 47), + (7012,11108, 1, 1, 47), + (7012,11109, 1, 1, 47), + (7012,11120, 1, 1, 47), + (7012,11122, 1, 1, 47), + (7012,11134, 1, 1, 47), + (7012,11141, 1, 1, 47), + (7012,11084, 1, 1, 47), + (7012,11087, 1, 1, 47), + (7012,11094, 1, 1, 47), + (7012,10374, 1, 1, 47), + (7012,10375, 1, 1, 47), + (7012,11051, 1, 1, 17), + (7012,11071, 1, 1, 16), + (7012,11076, 1, 1, 16), + (7012,11102, 1, 1, 17), + (7012,11124, 1, 1, 17), + (7012,11090, 1, 1, 17), + (7012,11159, 1, 1, 1200), + (7012,11159, 2, 1, 650), + (7012,11160, 1, 1, 800), + (7012,11160, 2, 1, 300), + (7012,11161, 1, 1, 100), + (7012,11161, 2, 1, 50), + (7012,11164, 1, 1, 100), + (7012,11162, 1, 1, 100), + (7012,11163, 1, 1, 100), + (7012,11158, 1, 1, 300), + (7012,11463, 1, 1, 300), + (7012,11356, 1, 1, 300), + (7012,11464, 1, 1, 300), + (7012,11357, 1, 1, 500), + (7012,11039, 1, 2, 300), + (7012,11040, 1, 2, 270), + (7012,11049, 1, 2, 300), + (7012,11061, 1, 2, 290), + (7012,11063, 1, 2, 290), + (7012,11077, 1, 2, 290), + (7012,11099, 1, 2, 280), + (7012,11105, 1, 2, 300), + (7012,11129, 1, 2, 250), + (7012,11130, 1, 2, 300), + (7012,11131, 1, 2, 280), + (7012,11139, 1, 2, 290), + (7012,11145, 1, 2, 260), + (7012,11096, 1, 2, 300), + (7012,11046, 1, 2, 47), + (7012,11066, 1, 2, 47), + (7012,11067, 1, 2, 47), + (7012,11072, 1, 2, 47), + (7012,11082, 1, 2, 47), + (7012,11103, 1, 2, 47), + (7012,11110, 1, 2, 47), + (7012,11112, 1, 2, 47), + (7012,11114, 1, 2, 47), + (7012,11115, 1, 2, 47), + (7012,11121, 1, 2, 47), + (7012,11144, 1, 2, 48), + (7012,11085, 1, 2, 47), + (7012,11089, 1, 2, 47), + (7012,11091, 1, 2, 47), + (7012,10376, 1, 2, 47), + (7012,10377, 1, 2, 47), + (7012,11127, 1, 2, 17), + (7012,11069, 1, 2, 17), + (7012,11142, 1, 2, 17), + (7012,11078, 1, 2, 17), + (7012,11056, 1, 2, 16), + (7012,11092, 1, 2, 16), + (7012,11159, 1, 2, 1200), + (7012,11159, 2, 2, 650), + (7012,11160, 1, 2, 800), + (7012,11160, 2, 2, 300), + (7012,11161, 1, 2, 100), + (7012,11161, 2, 2, 50), + (7012,11164, 1, 2, 100), + (7012,11162, 1, 2, 100), + (7012,11163, 1, 2, 100), + (7012,11158, 1, 2, 300), + (7012,11463, 1, 2, 300), + (7012,11356, 1, 2, 300), + (7012,11464, 1, 2, 300), + (7012,11357, 1, 2, 500), + (7012,11041, 1, 3, 266), + (7012,11047, 1, 3, 266), + (7012,11054, 1, 3, 266), + (7012,11065, 1, 3, 266), + (7012,11068, 1, 3, 266), + (7012,11075, 1, 3, 266), + (7012,11100, 1, 3, 266), + (7012,11106, 1, 3, 266), + (7012,11119, 1, 3, 266), + (7012,11135, 1, 3, 268), + (7012,11136, 1, 3, 268), + (7012,11138, 1, 3, 268), + (7012,11088, 1, 3, 268), + (7012,10370, 1, 3, 266), + (7012,10368, 1, 3, 268), + (7012,11043, 1, 3, 50), + (7012,11048, 1, 3, 50), + (7012,11050, 1, 3, 50), + (7012,11058, 1, 3, 50), + (7012,11060, 1, 3, 50), + (7012,11074, 1, 3, 50), + (7012,11107, 1, 3, 50), + (7012,11111, 1, 3, 50), + (7012,11113, 1, 3, 50), + (7012,11118, 1, 3, 50), + (7012,11126, 1, 3, 50), + (7012,11140, 1, 3, 50), + (7012,11086, 1, 3, 50), + (7012,11095, 1, 3, 50), + (7012,11055, 1, 3, 50), + (7012,10378, 1, 3, 50), + (7012,11052, 1, 3, 15), + (7012,11073, 1, 3, 15), + (7012,11146, 1, 3, 15), + (7012,11116, 1, 3, 15), + (7012,11123, 1, 3, 15), + (7012,11097, 1, 3, 15), + (7012,10367, 1, 3, 15), + (7012,10371, 1, 3, 15), + (7012,10373, 1, 3, 15), + (7012,10778, 1, 3, 375), + (7012,11209, 1, 3, 375), + (7012,10813, 1, 3, 375), + (7012,11389, 1, 3, 375), + (7012,11159, 1, 3, 1000), + (7012,11159, 2, 3, 250), + (7012,11160, 1, 3, 700), + (7012,11160, 2, 3, 175), + (7012,11161, 1, 3, 300), + (7012,11161, 2, 3, 75), + (7012,11465, 1, 3, 53), + (7012,11466, 1, 3, 27), + (7012,11467, 1, 3, 266), + (7012,11468, 1, 3, 533), + (7012,11469, 1, 3, 186); + + + +END; + + + diff --git a/schemas/bundled-schema/TowerWeeklySeibatuRankingRewards.sql b/schemas/bundled-schema/TowerWeeklySeibatuRankingRewards.sql new file mode 100644 index 000000000..c9b335ed5 --- /dev/null +++ b/schemas/bundled-schema/TowerWeeklySeibatuRankingRewards.sql @@ -0,0 +1,189 @@ +BEGIN; + +INSERT INTO public.weekly_seibatu_ranking_reward (reward_id, index0, index1, index2, distribution_type, item_id, amount) VALUES + -- Contribution Reward -- + (260003,1, 0, 0, 7201, 11158, 1), + (260003,2, 0, 0, 7201, 11173, 1), + (260003,3, 0, 0, 7201, 10813, 3), + (260003,4, 0, 0, 7201, 11163, 1), + (260003,5, 0, 0, 7201, 11164, 1), + (260003,6, 0, 0, 7201, 11389, 3), + (260003,6, 0, 0, 7201, 11381, 1), + (260003,7, 0, 0, 7201, 11384, 1), + (260003,8, 0, 0, 7201, 11159, 10), + (260003,9, 0, 0, 7201, 11160, 10), + (260003,10, 0, 0, 7201, 11161, 10), + (260003,11, 0, 0, 7201, 11265, 2), + (260003,11, 0, 0, 7201, 7279, 2), + (260003,12, 0, 0, 7201, 11381, 1), + (260003,13, 0, 0, 7201, 11384, 1), + (260003,14, 0, 0, 7201, 11381, 1), + (260003,15, 0, 0, 7201, 11384, 1), + (260003,15, 0, 0, 7201, 11464, 1), + (260003,16, 0, 0, 7201, 11381, 1), + (260003,17, 0, 0, 7201, 11384, 1), + (260003,18, 0, 0, 7201, 11381, 1), + (260003,19, 0, 0, 7201, 11384, 1), + (260003,20, 0, 0, 7201, 10778, 3), + (260003,21, 0, 0, 7201, 11265, 2), + (260003,21, 0, 0, 7201, 7279, 2), + (260003,22, 0, 0, 7201, 11381, 1), + (260003,23, 0, 0, 7201, 11384, 1), + (260003,24, 0, 0, 7201, 11381, 1), + (260003,25, 0, 0, 7201, 11389, 3), + (260003,25, 0, 0, 7201, 11286, 4), + (260003,26, 0, 0, 7201, 11384, 1), + (260003,27, 0, 0, 7201, 11381, 1), + (260003,28, 0, 0, 7201, 11384, 1), + (260003,29, 0, 0, 7201, 11381, 1), + (260003,30, 0, 0, 7201, 11209, 3), + (260003,31, 0, 0, 7201, 11265, 2), + (260003,31, 0, 0, 7201, 7279, 2), + (260003,32, 0, 0, 7201, 11159, 10), + (260003,33, 0, 0, 7201, 11463, 1), + (260003,34, 0, 0, 7201, 11160, 10), + (260003,35, 0, 0, 7201, 11286, 4), + (260003,36, 0, 0, 7201, 11161, 10), + (260003,38, 0, 0, 7201, 11384, 1), + (260003,39, 0, 0, 7201, 11164, 1), + (260003,40, 0, 0, 7201, 10813, 3), + (260003,41, 0, 0, 7201, 11265, 2), + (260003,41, 0, 0, 7201, 7280, 2), + (260003,43, 0, 0, 7201, 11381, 1), + (260003,45, 0, 0, 7201, 11286, 4), + (260003,47, 0, 0, 7201, 11384, 1), + (260003,48, 0, 0, 7201, 11358, 1), + (260003,50, 0, 0, 7201, 11356, 1), + (260003,51, 0, 0, 7201, 11265, 2), + (260003,51, 0, 0, 7201, 7280, 2), + (260003,53, 0, 0, 7201, 11381, 2), + (260003,55, 0, 0, 7201, 11357, 1), + (260003,57, 0, 0, 7201, 11384, 1), + (260003,60, 0, 0, 7201, 11286, 4), + (260003,61, 0, 0, 7201, 11265, 2), + (260003,61, 0, 0, 7201, 7280, 2), + (260003,63, 0, 0, 7201, 11381, 2), + (260003,66, 0, 0, 7201, 11463, 1), + (260003,67, 0, 0, 7201, 11384, 1), + (260003,70, 0, 0, 7201, 11286, 4), + (260003,71, 0, 0, 7201, 11265, 2), + (260003,71, 0, 0, 7201, 7280, 2), + (260003,73, 0, 0, 7201, 11381, 2), + (260003,77, 0, 0, 7201, 11384, 1), + (260003,79, 0, 0, 7201, 11164, 1), + (260003,80, 0, 0, 7201, 11286, 6), + (260003,81, 0, 0, 7201, 11265, 2), + (260003,81, 0, 0, 7201, 7281, 1), + (260003,83, 0, 0, 7201, 11381, 2), + (260003,85, 0, 0, 7201, 11464, 1), + (260003,87, 0, 0, 7201, 11384, 1), + (260003,90, 0, 0, 7201, 11286, 6), + (260003,91, 0, 0, 7201, 11265, 2), + (260003,91, 0, 0, 7201, 7281, 1), + (260003,93, 0, 0, 7201, 11381, 2), + (260003,95, 0, 0, 7201, 10778, 3), + (260003,97, 0, 0, 7201, 11384, 1), + (260003,99, 0, 0, 7201, 11463, 1), + (260003,100, 0, 0, 7201, 11286, 6), + (260003,101, 0, 0, 7201, 11265, 2), + (260003,101, 0, 0, 7201, 7281, 1), + (260003,103, 0, 0, 7201, 11381, 2), + (260003,107, 0, 0, 7201, 11384, 1), + (260003,110, 0, 0, 7201, 11286, 6), + (260003,113, 0, 0, 7201, 11381, 2), + (260003,115, 0, 0, 7201, 11164, 1), + (260003,117, 0, 0, 7201, 11384, 1), + (260003,120, 0, 0, 7201, 11286, 12), + (260003,123, 0, 0, 7201, 11381, 2), + (260003,127, 0, 0, 7201, 11384, 1), + (260003,130, 0, 0, 7201, 11286, 12), + (260003,132, 0, 0, 7201, 11381, 2), + (260003,134, 0, 0, 7201, 11384, 1), + (260003,136, 0, 0, 7201, 11381, 2), + (260003,138, 0, 0, 7201, 11384, 1), + (260003,140, 0, 0, 7201, 11286, 12), + (260003,142, 0, 0, 7201, 11382, 1), + (260003,144, 0, 0, 7201, 11385, 1), + (260003,145, 0, 0, 7201, 11464, 1), + (260003,146, 0, 0, 7201, 11382, 1), + (260003,148, 0, 0, 7201, 11385, 1), + (260003,150, 0, 0, 7201, 11164, 1), + (260003,155, 0, 0, 7201, 11382, 1), + (260003,160, 0, 0, 7201, 11209, 3), + (260003,165, 0, 0, 7201, 11385, 1), + (260003,170, 0, 0, 7201, 11159, 10), + (260003,175, 0, 0, 7201, 11382, 1), + (260003,180, 0, 0, 7201, 11160, 10), + (260003,185, 0, 0, 7201, 11385, 1), + (260003,190, 0, 0, 7201, 11161, 10), + (260003,195, 0, 0, 7201, 11382, 1), + (260003,200, 0, 0, 7201, 11159, 15), + (260003,210, 0, 0, 7201, 11160, 15), + (260003,220, 0, 0, 7201, 11385, 1), + (260003,235, 0, 0, 7201, 11382, 2), + (260003,250, 0, 0, 7201, 11161, 15), + (260003,265, 0, 0, 7201, 11159, 20), + (260003,280, 0, 0, 7201, 11385, 1), + (260003,300, 0, 0, 7201, 11160, 20), + (260003,315, 0, 0, 7201, 11382, 2), + (260003,330, 0, 0, 7201, 11385, 1), + (260003,350, 0, 0, 7201, 11161, 20), + (260003,365, 0, 0, 7201, 11382, 2), + (260003,380, 0, 0, 7201, 11385, 1), + (260003,400, 0, 0, 7201, 11159, 25), + (260003,415, 0, 0, 7201, 11382, 2), + (260003,430, 0, 0, 7201, 11385, 1), + (260003,450, 0, 0, 7201, 11160, 25), + (260003,465, 0, 0, 7201, 11382, 2), + (260003,480, 0, 0, 7201, 11385, 1), + (260003,500, 0, 0, 7201, 11161, 25), + (260003,525, 0, 0, 7201, 11382, 2), + (260003,550, 0, 0, 7201, 11385, 1), + (260003,575, 0, 0, 7201, 11159, 25), + (260003,600, 0, 0, 7201, 11382, 2), + (260003,625, 0, 0, 7201, 11385, 1), + (260003,650, 0, 0, 7201, 11160, 25), + (260003,675, 0, 0, 7201, 11382, 2), + (260003,700, 0, 0, 7201, 11385, 1), + (260003,725, 0, 0, 7201, 11161, 25), + (260003,750, 0, 0, 7201, 11382, 2), + (260003,775, 0, 0, 7201, 11385, 1), + (260003,800, 0, 0, 7201, 11159, 25), + (260003,825, 0, 0, 7201, 11382, 2), + (260003,850, 0, 0, 7201, 11385, 1), + (260003,875, 0, 0, 7201, 11160, 25), + (260003,900, 0, 0, 7201, 11382, 2), + (260003,925, 0, 0, 7201, 11385, 1), + (260003,950, 0, 0, 7201, 11161, 25), + (260003,975, 0, 0, 7201, 11382, 2), + (260003,1000, 0, 0, 7201, 11385, 1), + (260003,1025, 0, 0, 7201, 11159, 25), + (260003,1050, 0, 0, 7201, 11382, 2), + (260003,1075, 0, 0, 7201, 11385, 1), + (260003,1100, 0, 0, 7201, 11160, 25), + (260003,1125, 0, 0, 7201, 11382, 2), + (260003,1150, 0, 0, 7201, 11385, 1), + (260003,1200, 0, 0, 7201, 11161, 25), + (260003,1235, 0, 0, 7201, 11382, 2), + (260003,1270, 0, 0, 7201, 11385, 1), + (260003,1305, 0, 0, 7201, 11159, 25), + (260003,1340, 0, 0, 7201, 11382, 2), + (260003,1375, 0, 0, 7201, 11385, 1), + (260003,1410, 0, 0, 7201, 11160, 25), + (260003,1445, 0, 0, 7201, 11382, 2), + (260003,1480, 0, 0, 7201, 11385, 1), + (260003,1500, 0, 0, 7201, 11161, 25), + -- Advance Contribution Reward -- + (260001,0, 0, 1, 7201, 11463, 1), + (260001,0, 0, 1, 7201, 11464, 1), + (260001,0, 0, 1, 7201, 11163, 1), + (260001,0, 0, 1, 7201, 11159, 5), + (260001,0, 0, 1, 7201, 11160, 5), + (260001,0, 0, 1, 7201, 11161, 5), + (260001,0, 0, 2, 7201, 12506, 1), + (260001,0, 0, 2, 7201, 10355, 1), + (260001,0, 0, 2, 7201, 11163, 1), + (260001,0, 0, 2, 7201, 11159, 5), + (260001,0, 0, 2, 7201, 11160, 5), + (260001,0, 0, 2, 7201, 11161, 5); +END; \ No newline at end of file diff --git a/schemas/patch-schema/paper-data.sql b/schemas/patch-schema/paper-data.sql new file mode 100644 index 000000000..39c3fb06f --- /dev/null +++ b/schemas/patch-schema/paper-data.sql @@ -0,0 +1,23 @@ +BEGIN; + +CREATE TABLE IF NOT EXISTS paper_data_gifts ( + id serial PRIMARY KEY, + gift_id integer, + item_id integer, + unk0 integer, + unk1 integer, + chance integer +); + +CREATE TABLE IF NOT EXISTS paper_data ( + id serial PRIMARY KEY, + paper_type integer, + paper_id integer, + option1 integer, + option2 integer, + option3 integer, + option4 integer, + option5 integer +); + +END; \ No newline at end of file diff --git a/schemas/patch-schema/weekly-seibatu-ranking-rewards.sql b/schemas/patch-schema/weekly-seibatu-ranking-rewards.sql new file mode 100644 index 000000000..63af8c165 --- /dev/null +++ b/schemas/patch-schema/weekly-seibatu-ranking-rewards.sql @@ -0,0 +1,14 @@ +BEGIN; + +CREATE TABLE IF NOT EXISTS weekly_seibatu_ranking_reward ( + id serial PRIMARY KEY, + reward_id integer, + index0 integer, + index1 integer, + index2 integer, + distribution_type integer, + item_id integer, + amount integer +); + +END; \ No newline at end of file diff --git a/server/channelserver/handlers_data.go b/server/channelserver/handlers_data.go index e63f8571a..d613c10ff 100644 --- a/server/channelserver/handlers_data.go +++ b/server/channelserver/handlers_data.go @@ -965,7 +965,7 @@ type PaperMissionTimetable struct { type PaperMissionData struct { Unk0 uint8 Unk1 uint8 - Unk2 int16 + Target int16 Reward1ID uint16 Reward1Quantity uint8 Reward2ID uint16 @@ -978,20 +978,20 @@ type PaperMission struct { } type PaperData struct { - Unk0 uint16 - Unk1 int16 - Unk2 int16 - Unk3 int16 - Unk4 int16 - Unk5 int16 - Unk6 int16 + ID uint16 + Ward int16 + Option1 int16 + Option2 int16 + Option3 int16 + Option4 int16 + Option5 int16 } type PaperGift struct { - Unk0 uint16 - Unk1 uint8 - Unk2 uint8 - Unk3 uint16 + ItemID uint16 + Unk1 uint8 + Unk2 uint8 + Chance uint16 } func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { @@ -1008,7 +1008,7 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { // if pkt.Type 2 then unk2 6001 6011 PaperGiftData // is pkt.Unk2 a index? - switch pkt.Unk2 { + switch pkt.ID { case 0: paperMissions = PaperMission{ []PaperMissionTimetable{{TimeMidnight(), TimeMidnight().Add(24 * time.Hour)}}, @@ -1028,7 +1028,6 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { //Value is based on 2001 for monsters {1011, 1, 0, 0, 0, 0, 0}, {1011, 2, 0, 0, 0, 0, 0}, - //Seen Items (id,on off, 0, 0, 0, 0, 0) //Value is based in 6001 for items {1012, 1, 0, 0, 0, 0, 0}, @@ -1071,33 +1070,35 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { {1105, 1, 10, 500, 0, 0, 0}, {1105, 2, 10, 500, 0, 0, 0}, // setServerBoss {ID, Block, Monster, Unk, Unk, Index, Points} - {2001, 1, mhfmon.Gravios, 58, 0, 6, 700}, - {2001, 1, mhfmon.Gypceros, 58, 0, 3, 200}, - {2001, 1, mhfmon.Basarios, 58, 0, 7, 250}, {2001, 1, mhfmon.Velocidrome, 58, 0, 1, 100}, - {2001, 1, mhfmon.Rajang, 58, 0, 8, 1000}, - {2001, 1, mhfmon.ShogunCeanataur, 58, 0, 9, 500}, {2001, 1, mhfmon.Bulldrome, 58, 0, 2, 150}, + {2001, 1, mhfmon.Gypceros, 58, 0, 3, 200}, {2001, 1, mhfmon.Hypnocatrice, 58, 0, 4, 200}, {2001, 1, mhfmon.Lavasioth, 58, 0, 5, 500}, + {2001, 1, mhfmon.Gravios, 58, 0, 6, 700}, + {2001, 1, mhfmon.Basarios, 58, 0, 7, 250}, + {2001, 1, mhfmon.Rajang, 58, 0, 8, 1000}, + {2001, 1, mhfmon.ShogunCeanataur, 58, 0, 9, 500}, {2001, 1, mhfmon.Tigrex, 58, 0, 10, 800}, {2001, 1, mhfmon.Espinas, 58, 0, 11, 900}, {2001, 1, mhfmon.Pariapuria, 58, 0, 12, 600}, - {2001, 2, mhfmon.Gravios, 60, 0, 6, 700}, - {2001, 2, mhfmon.Gypceros, 60, 0, 3, 200}, - {2001, 2, mhfmon.Basarios, 60, 0, 7, 350}, + {2001, 2, mhfmon.Velocidrome, 60, 0, 1, 100}, - {2001, 2, mhfmon.PurpleGypceros, 60, 0, 13, 200}, - {2001, 2, mhfmon.YianGaruga, 60, 0, 15, 600}, - {2001, 2, mhfmon.Rajang, 60, 0, 8, 1000}, {2001, 2, mhfmon.ShogunCeanataur, 60, 0, 2, 500}, - {2001, 2, mhfmon.Bulldrome, 60, 0, 9, 150}, + {2001, 2, mhfmon.Gypceros, 60, 0, 3, 200}, {2001, 2, mhfmon.Hypnocatrice, 60, 0, 4, 200}, {2001, 2, mhfmon.Lavasioth, 60, 0, 5, 500}, + + {2001, 2, mhfmon.Gravios, 60, 0, 6, 700}, + {2001, 2, mhfmon.Basarios, 60, 0, 7, 350}, + {2001, 2, mhfmon.Rajang, 60, 0, 8, 1000}, + {2001, 2, mhfmon.Bulldrome, 60, 0, 9, 150}, {2001, 2, mhfmon.Tigrex, 60, 0, 10, 800}, {2001, 2, mhfmon.Espinas, 60, 0, 11, 900}, - {2001, 2, mhfmon.BurningEspinas, 60, 0, 14, 900}, {2001, 2, mhfmon.Pariapuria, 60, 0, 12, 600}, + {2001, 2, mhfmon.PurpleGypceros, 60, 0, 13, 200}, + {2001, 2, mhfmon.BurningEspinas, 60, 0, 14, 900}, + {2001, 2, mhfmon.YianGaruga, 60, 0, 15, 600}, {2001, 2, mhfmon.Dyuragaua, 60, 0, 16, 1000}, } case 6: @@ -1535,8 +1536,8 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { {4202, 2, 0, 11469, 1, 1400, 1}, } default: - if pkt.Unk2 < 1000 { - s.logger.Info("PaperData request for unknown type", zap.Uint32("Unk2", pkt.Unk2)) + if pkt.ID < 1000 { + s.logger.Info("PaperData request for unknown type", zap.Uint32("Unk2", pkt.ID)) } } @@ -1546,29 +1547,29 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { case 0: for _, pdata := range paperData { bf := byteframe.NewByteFrame() - bf.WriteUint16(pdata.Unk0) - bf.WriteInt16(pdata.Unk1) - bf.WriteInt16(pdata.Unk2) - bf.WriteInt16(pdata.Unk3) - bf.WriteInt16(pdata.Unk4) - bf.WriteInt16(pdata.Unk5) - bf.WriteInt16(pdata.Unk6) + bf.WriteUint16(pdata.ID) + bf.WriteInt16(pdata.Ward) + bf.WriteInt16(pdata.Option1) + bf.WriteInt16(pdata.Option2) + bf.WriteInt16(pdata.Option3) + bf.WriteInt16(pdata.Option4) + bf.WriteInt16(pdata.Option5) data = append(data, bf) } doAckEarthSucceed(s, pkt.AckHandle, data) case 2: - _, ok := paperGiftData[pkt.Unk2] + _, ok := paperGiftData[pkt.ID] if ok { - paperGift = paperGiftData[pkt.Unk2] + paperGift = paperGiftData[pkt.ID] } else { - s.logger.Info("PaperGift request for unknown type", zap.Uint32("Unk2", pkt.Unk2)) + s.logger.Info("PaperGift request for unknown type", zap.Uint32("ID", pkt.ID)) } for _, gift := range paperGift { bf := byteframe.NewByteFrame() - bf.WriteUint16(gift.Unk0) + bf.WriteUint16(gift.ItemID) bf.WriteUint8(gift.Unk1) bf.WriteUint8(gift.Unk2) - bf.WriteUint16(gift.Unk3) + bf.WriteUint16(gift.Chance) data = append(data, bf) } doAckEarthSucceed(s, pkt.AckHandle, data) @@ -1584,7 +1585,7 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { for _, mdata := range paperMissions.Data { bf.WriteUint8(mdata.Unk0) bf.WriteUint8(mdata.Unk1) - bf.WriteInt16(mdata.Unk2) + bf.WriteInt16(mdata.Target) bf.WriteUint16(mdata.Reward1ID) bf.WriteUint8(mdata.Reward1Quantity) bf.WriteUint16(mdata.Reward2ID)