add support for diva hall adventure cat

Erupe/server/channelserver/handlers_guild.go

@@ -1665,96 +1665,6 @@ func handleMsgMhfRegistGuildCooking(s *Session, p mhfpacket.MHFPacket) {
 	doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x01, 0x00})
 }
 
-type GuildAdventure struct {
-	ID          uint32 `db:"id"`
-	Destination uint32 `db:"destination"`
-	Charge      uint32 `db:"charge"`
-	Depart      uint32 `db:"depart"`
-	Return      uint32 `db:"return"`
-	CollectedBy string `db:"collected_by"`
-}
-
-func handleMsgMhfLoadGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfLoadGuildAdventure)
-	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
-	data, err := s.server.db.Queryx("SELECT id, destination, charge, depart, return, collected_by FROM guild_adventures WHERE guild_id = $1", guild.ID)
-	if err != nil {
-		s.logger.Fatal("Failed to get guild adventures from db", zap.Error(err))
-	}
-	temp := byteframe.NewByteFrame()
-	count := 0
-	for data.Next() {
-		count++
-		adventureData := &GuildAdventure{}
-		err = data.StructScan(&adventureData)
-		if err != nil {
-			s.logger.Fatal("Failed to scan adventure data", zap.Error(err))
-		}
-		temp.WriteUint32(adventureData.ID)
-		temp.WriteUint32(adventureData.Destination)
-		temp.WriteUint32(adventureData.Charge)
-		temp.WriteUint32(adventureData.Depart)
-		temp.WriteUint32(adventureData.Return)
-		collected := false
-		collectedBySlice := strings.Split(adventureData.CollectedBy, ",")
-		for i := 0; i < len(collectedBySlice); i++ {
-			j, _ := strconv.ParseInt(collectedBySlice[i], 10, 64)
-			if int(j) == int(s.charID) {
-				collected = true
-				break
-			}
-		}
-		if collected {
-			temp.WriteBool(true)
-		} else {
-			temp.WriteBool(false)
-		}
-	}
-	bf := byteframe.NewByteFrame()
-	bf.WriteUint8(uint8(count))
-	bf.WriteBytes(temp.Data())
-	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
-}
-
-func handleMsgMhfRegistGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfRegistGuildAdventure)
-	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
-	_, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, depart, return) VALUES ($1, $2, $3, $4)", guild.ID, pkt.Destination, Time_Current_Adjusted().Unix(), Time_Current_Adjusted().Add(6 * time.Hour).Unix())
-	if err != nil {
-		s.logger.Fatal("Failed to register guild adventure", zap.Error(err))
-	}
-	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
-}
-
-func handleMsgMhfAcquireGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfAcquireGuildAdventure)
-	var collectedBy string
-	err := s.server.db.QueryRow("SELECT collected_by FROM guild_adventures WHERE id = $1", pkt.ID).Scan(&collectedBy)
-	if err != nil {
-		s.logger.Fatal("Error parsing adventure collected by", zap.Error(err))
-	} else {
-		if len(collectedBy) == 0 {
-			collectedBy = strconv.Itoa(int(s.charID))
-		} else {
-			collectedBy += "," + strconv.Itoa(int(s.charID))
-		}
-		_, err := s.server.db.Exec("UPDATE guild_adventures SET collected_by = $1 WHERE id = $2", collectedBy, pkt.ID)
-		if err != nil {
-			s.logger.Fatal("Failed to collect adventure in db", zap.Error(err))
-		}
-	}
-	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
-}
-
-func handleMsgMhfChargeGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfChargeGuildAdventure)
-	_, err := s.server.db.Exec("UPDATE guild_adventures SET charge = charge + $1 WHERE id = $2", pkt.Amount, pkt.ID)
-	if err != nil {
-		s.logger.Fatal("Failed to charge guild adventure", zap.Error(err))
-	}
-	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
-}
-
 func handleMsgMhfGetGuildWeeklyBonusMaster(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfGetGuildWeeklyBonusMaster)
 

Erupe/server/channelserver/handlers_guild_adventure.go

@@ -0,0 +1,112 @@
+package channelserver
+
+import (
+  "strconv"
+	"strings"
+	"time"
+
+  "github.com/Andoryuuta/byteframe"
+  "erupe-ce/network/mhfpacket"
+  "go.uber.org/zap"
+)
+
+type GuildAdventure struct {
+	ID          uint32 `db:"id"`
+	Destination uint32 `db:"destination"`
+	Charge      uint32 `db:"charge"`
+	Depart      uint32 `db:"depart"`
+	Return      uint32 `db:"return"`
+	CollectedBy string `db:"collected_by"`
+}
+
+func handleMsgMhfLoadGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfLoadGuildAdventure)
+	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
+	data, err := s.server.db.Queryx("SELECT id, destination, charge, depart, return, collected_by FROM guild_adventures WHERE guild_id = $1", guild.ID)
+	if err != nil {
+		s.logger.Fatal("Failed to get guild adventures from db", zap.Error(err))
+	}
+	temp := byteframe.NewByteFrame()
+	count := 0
+	for data.Next() {
+		count++
+		adventureData := &GuildAdventure{}
+		err = data.StructScan(&adventureData)
+		if err != nil {
+			s.logger.Fatal("Failed to scan adventure data", zap.Error(err))
+		}
+		temp.WriteUint32(adventureData.ID)
+		temp.WriteUint32(adventureData.Destination)
+		temp.WriteUint32(adventureData.Charge)
+		temp.WriteUint32(adventureData.Depart)
+		temp.WriteUint32(adventureData.Return)
+		collected := false
+		collectedBySlice := strings.Split(adventureData.CollectedBy, ",")
+		for i := 0; i < len(collectedBySlice); i++ {
+			j, _ := strconv.ParseInt(collectedBySlice[i], 10, 64)
+			if int(j) == int(s.charID) {
+				collected = true
+				break
+			}
+		}
+		if collected {
+			temp.WriteBool(true)
+		} else {
+			temp.WriteBool(false)
+		}
+	}
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint8(uint8(count))
+	bf.WriteBytes(temp.Data())
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+}
+
+func handleMsgMhfRegistGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfRegistGuildAdventure)
+	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
+	_, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, depart, return) VALUES ($1, $2, $3, $4)", guild.ID, pkt.Destination, Time_Current_Adjusted().Unix(), Time_Current_Adjusted().Add(6 * time.Hour).Unix())
+	if err != nil {
+		s.logger.Fatal("Failed to register guild adventure", zap.Error(err))
+	}
+	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
+}
+
+func handleMsgMhfAcquireGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfAcquireGuildAdventure)
+	var collectedBy string
+	err := s.server.db.QueryRow("SELECT collected_by FROM guild_adventures WHERE id = $1", pkt.ID).Scan(&collectedBy)
+	if err != nil {
+		s.logger.Fatal("Error parsing adventure collected by", zap.Error(err))
+	} else {
+		if len(collectedBy) == 0 {
+			collectedBy = strconv.Itoa(int(s.charID))
+		} else {
+			collectedBy += "," + strconv.Itoa(int(s.charID))
+		}
+		_, err := s.server.db.Exec("UPDATE guild_adventures SET collected_by = $1 WHERE id = $2", collectedBy, pkt.ID)
+		if err != nil {
+			s.logger.Fatal("Failed to collect adventure in db", zap.Error(err))
+		}
+	}
+	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
+}
+
+func handleMsgMhfChargeGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfChargeGuildAdventure)
+	_, err := s.server.db.Exec("UPDATE guild_adventures SET charge = charge + $1 WHERE id = $2", pkt.Amount, pkt.ID)
+	if err != nil {
+		s.logger.Fatal("Failed to charge guild adventure", zap.Error(err))
+	}
+	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
+}
+
+// handleMsgMhfRegistGuildAdventureDiva
+func handleMsgSysReserve205(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgSysReserve205)
+	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
+	_, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, charge, depart, return) VALUES ($1, $2, $3, $4, $5)", guild.ID, pkt.Destination, pkt.Charge, Time_Current_Adjusted().Unix(), Time_Current_Adjusted().Add(1 * time.Hour).Unix())
+	if err != nil {
+		s.logger.Fatal("Failed to register guild adventure", zap.Error(err))
+	}
+	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
+}

Erupe/server/channelserver/handlers_reserve.go

@@ -100,8 +100,6 @@ func handleMsgSysReserve19F(s *Session, p mhfpacket.MHFPacket) {}
 
 func handleMsgSysReserve204(s *Session, p mhfpacket.MHFPacket) {}
 
-func handleMsgSysReserve205(s *Session, p mhfpacket.MHFPacket) {}
-
 func handleMsgSysReserve206(s *Session, p mhfpacket.MHFPacket) {}
 
 func handleMsgSysReserve207(s *Session, p mhfpacket.MHFPacket) {}