various Tower changes

network/mhfpacket/msg_mhf_get_tenrouirai.go

@@ -1,20 +1,21 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfGetTenrouirai represents the MSG_MHF_GET_TENROUIRAI
 type MsgMhfGetTenrouirai struct {
-	// Communicator type, multi-format. This might be valid for only one type.
 	AckHandle uint32
-	Unk0      uint16
-	Unk1      uint32
-	Unk2      uint16
+	Unk0      uint8
+	Unk1      uint8
+	GuildID   uint32
+	Unk3      uint8
+	Unk4      uint8
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -25,9 +26,11 @@ func (m *MsgMhfGetTenrouirai) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfGetTenrouirai) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Unk0 = bf.ReadUint16()
-	m.Unk1 = bf.ReadUint32()
-	m.Unk2 = bf.ReadUint16()
+	m.Unk0 = bf.ReadUint8()
+	m.Unk1 = bf.ReadUint8()
+	m.GuildID = bf.ReadUint32()
+	m.Unk3 = bf.ReadUint8()
+	m.Unk4 = bf.ReadUint8()
 	return nil
 }
 

server/channelserver/handlers_tower.go

@@ -169,22 +169,66 @@ type Tenrouirai struct {
 }
 
 func handleMsgMhfGetTenrouirai(s *Session, p mhfpacket.MHFPacket) {
-	// if the game gets bad responses for this it breaks the ability to save
 	pkt := p.(*mhfpacket.MsgMhfGetTenrouirai)
-	var data []byte
-	var err error
-	if pkt.Unk0 == 1 {
-		data, err = hex.DecodeString("0A218EAD000000000000000000000001010000000000060010")
-	} else if pkt.Unk2 == 4 {
-		data, err = hex.DecodeString("0A218EAD0000000000000000000000210101005000000202010102020104001000000202010102020106003200000202010002020104000C003202020101020201030032000002020101020202059C4000000202010002020105C35000320202010102020201003C00000202010102020203003200000201010001020203002800320201010101020204000C00000201010101020206002800000201010001020101003C00320201020101020105C35000000301020101020106003200000301020001020104001000320301020101020105C350000003010201010202030028000003010200010201030032003203010201010202059C4000000301020101010206002800000301020001010201003C00320301020101010206003200000301020101010204000C000003010200010101010050003203010201010101059C40000003010201010101030032000003010200010101040010003203010001010101060032000003010001010102030028000003010001010101010050003203010000010102059C4000000301000001010206002800000301000001010010")
-	} else {
-		data = []byte{0x00, 0x00, 0x00, 0x00}
-		s.logger.Info("GET_TENROUIRAI request for unknown type")
+	var data []*byteframe.ByteFrame
+
+	tenrouirai := Tenrouirai{
+		Data: []TenrouiraiData{
+			{1, 1, 80, 0, 2, 2, 1, 1, 2, 2},
+			{1, 4, 16, 0, 2, 2, 1, 1, 2, 2},
+			{1, 6, 50, 0, 2, 2, 1, 0, 2, 2},
+			{1, 4, 12, 50, 2, 2, 1, 1, 2, 2},
+			{1, 3, 50, 0, 2, 2, 1, 1, 2, 2},
+			{2, 5, 40000, 0, 2, 2, 1, 0, 2, 2},
+			{1, 5, 50000, 50, 2, 2, 1, 1, 2, 2},
+			{2, 1, 60, 0, 2, 2, 1, 1, 2, 2},
+			{2, 3, 50, 0, 2, 1, 1, 0, 1, 2},
+			{2, 3, 40, 50, 2, 1, 1, 1, 1, 2},
+			{2, 4, 12, 0, 2, 1, 1, 1, 1, 2},
+			{2, 6, 40, 0, 2, 1, 1, 0, 1, 2},
+			{1, 1, 60, 50, 2, 1, 2, 1, 1, 2},
+			{1, 5, 50000, 0, 3, 1, 2, 1, 1, 2},
+			{1, 6, 50, 0, 3, 1, 2, 0, 1, 2},
+			{1, 4, 16, 50, 3, 1, 2, 1, 1, 2},
+			{1, 5, 50000, 0, 3, 1, 2, 1, 1, 2},
+			{2, 3, 40, 0, 3, 1, 2, 0, 1, 2},
+			{1, 3, 50, 50, 3, 1, 2, 1, 1, 2},
+			{2, 5, 40000, 0, 3, 1, 2, 1, 1, 1},
+			{2, 6, 40, 0, 3, 1, 2, 0, 1, 1},
+			{2, 1, 60, 50, 3, 1, 2, 1, 1, 1},
+			{2, 6, 50, 0, 3, 1, 2, 1, 1, 1},
+			{2, 4, 12, 0, 3, 1, 2, 0, 1, 1},
+			{1, 1, 80, 50, 3, 1, 2, 1, 1, 1},
+			{1, 5, 40000, 0, 3, 1, 2, 1, 1, 1},
+			{1, 3, 50, 0, 3, 1, 2, 0, 1, 1},
+			{1, 4, 16, 50, 3, 1, 0, 1, 1, 1},
+			{1, 6, 50, 0, 3, 1, 0, 1, 1, 1},
+			{2, 3, 40, 0, 3, 1, 0, 1, 1, 1},
+			{1, 1, 80, 50, 3, 1, 0, 0, 1, 1},
+			{2, 5, 40000, 0, 3, 1, 0, 0, 1, 1},
+			{2, 6, 40, 0, 3, 1, 0, 0, 1, 1},
+		},
 	}
-	if err != nil {
-		panic(err)
+
+	switch pkt.Unk1 {
+	case 4:
+		for _, tdata := range tenrouirai.Data {
+			bf := byteframe.NewByteFrame()
+			bf.WriteUint8(tdata.Unk0)
+			bf.WriteUint8(tdata.Unk1)
+			bf.WriteUint16(tdata.Unk2)
+			bf.WriteUint16(tdata.Unk3)
+			bf.WriteUint8(tdata.Unk4)
+			bf.WriteUint8(tdata.Unk5)
+			bf.WriteUint8(tdata.Unk6)
+			bf.WriteUint8(tdata.Unk7)
+			bf.WriteUint8(tdata.Unk8)
+			bf.WriteUint8(tdata.Unk9)
+			data = append(data, bf)
+		}
 	}
-	doAckBufSucceed(s, pkt.AckHandle, data)
+
+	doAckEarthSucceed(s, pkt.AckHandle, data)
 }
 
 func handleMsgMhfPostTenrouirai(s *Session, p mhfpacket.MHFPacket) {