mirror of
https://github.com/Mezeporta/Erupe.git
synced 2026-03-26 09:33:02 +01:00
refactor(distribution): use distribution_items table instead of data blob
Distributions now read items from the distribution_items table instead of requiring a pre-built binary data blob. This enables creating distributions via simple SQL inserts rather than generating binary data manually. Changes: - Add getDistributionItems() to fetch items from distribution_items table - Update handleMsgMhfApplyDistItem to build response from table data - Move server-side rewards (points, RP) to handleMsgMhfAcquireDistItem - Support G8+ item format (13 bytes per item)
This commit is contained in:
Houmgaor
@@ -4,142 +4,158 @@ import (
|
|||||||
"erupe-ce/common/byteframe"
|
"erupe-ce/common/byteframe"
|
||||||
ps "erupe-ce/common/pascalstring"
|
ps "erupe-ce/common/pascalstring"
|
||||||
"erupe-ce/network/mhfpacket"
|
"erupe-ce/network/mhfpacket"
|
||||||
|
"time"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ItemDist struct {
|
type Distribution struct {
|
||||||
ID uint32 `db:"id"`
|
ID uint32 `db:"id"`
|
||||||
Deadline uint32 `db:"deadline"`
|
Deadline time.Time `db:"deadline"`
|
||||||
TimesAcceptable uint16 `db:"times_acceptable"`
|
Rights uint32 `db:"rights"`
|
||||||
TimesAccepted uint16 `db:"times_accepted"`
|
TimesAcceptable uint16 `db:"times_acceptable"`
|
||||||
MinHR uint16 `db:"min_hr"`
|
TimesAccepted uint16 `db:"times_accepted"`
|
||||||
MaxHR uint16 `db:"max_hr"`
|
MinHR int16 `db:"min_hr"`
|
||||||
MinSR uint16 `db:"min_sr"`
|
MaxHR int16 `db:"max_hr"`
|
||||||
MaxSR uint16 `db:"max_sr"`
|
MinSR int16 `db:"min_sr"`
|
||||||
MinGR uint16 `db:"min_gr"`
|
MaxSR int16 `db:"max_sr"`
|
||||||
MaxGR uint16 `db:"max_gr"`
|
MinGR int16 `db:"min_gr"`
|
||||||
EventName string `db:"event_name"`
|
MaxGR int16 `db:"max_gr"`
|
||||||
Description string `db:"description"`
|
EventName string `db:"event_name"`
|
||||||
Data []byte `db:"data"`
|
Description string `db:"description"`
|
||||||
|
Selection bool `db:"selection"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
|
func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
|
||||||
pkt := p.(*mhfpacket.MsgMhfEnumerateDistItem)
|
pkt := p.(*mhfpacket.MsgMhfEnumerateDistItem)
|
||||||
|
|
||||||
|
var itemDists []Distribution
|
||||||
bf := byteframe.NewByteFrame()
|
bf := byteframe.NewByteFrame()
|
||||||
distCount := 0
|
rows, err := s.server.db.Queryx(`
|
||||||
dists, err := s.server.db.Queryx(`
|
SELECT d.id, event_name, description, COALESCE(rights, 0) AS rights, COALESCE(selection, false) AS selection, times_acceptable,
|
||||||
SELECT d.id, event_name, description, times_acceptable,
|
COALESCE(min_hr, -1) AS min_hr, COALESCE(max_hr, -1) AS max_hr,
|
||||||
min_hr, max_hr, min_sr, max_sr, min_gr, max_gr,
|
COALESCE(min_sr, -1) AS min_sr, COALESCE(max_sr, -1) AS max_sr,
|
||||||
|
COALESCE(min_gr, -1) AS min_gr, COALESCE(max_gr, -1) AS max_gr,
|
||||||
(
|
(
|
||||||
SELECT count(*)
|
SELECT count(*) FROM distributions_accepted da
|
||||||
FROM distributions_accepted da
|
WHERE d.id = da.distribution_id AND da.character_id = $1
|
||||||
WHERE d.id = da.distribution_id
|
|
||||||
AND da.character_id = $1
|
|
||||||
) AS times_accepted,
|
) AS times_accepted,
|
||||||
CASE
|
COALESCE(deadline, TO_TIMESTAMP(0)) AS deadline
|
||||||
WHEN (EXTRACT(epoch FROM deadline)::int) IS NULL THEN 0
|
|
||||||
ELSE (EXTRACT(epoch FROM deadline)::int)
|
|
||||||
END deadline
|
|
||||||
FROM distribution d
|
FROM distribution d
|
||||||
WHERE character_id = $1 AND type = $2 OR character_id IS NULL AND type = $2 ORDER BY id DESC;
|
WHERE character_id = $1 AND type = $2 OR character_id IS NULL AND type = $2 ORDER BY id DESC
|
||||||
`, s.charID, pkt.Unk0)
|
`, s.charID, pkt.Unk0)
|
||||||
if err != nil {
|
|
||||||
s.logger.Error("Error getting distribution data from db", zap.Error(err))
|
if err == nil {
|
||||||
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
|
var itemDist Distribution
|
||||||
} else {
|
for rows.Next() {
|
||||||
for dists.Next() {
|
err = rows.StructScan(&itemDist)
|
||||||
distCount++
|
|
||||||
distData := &ItemDist{}
|
|
||||||
err = dists.StructScan(&distData)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.logger.Error("Error parsing item distribution data", zap.Error(err))
|
continue
|
||||||
}
|
}
|
||||||
bf.WriteUint32(distData.ID)
|
itemDists = append(itemDists, itemDist)
|
||||||
bf.WriteUint32(distData.Deadline)
|
|
||||||
bf.WriteUint32(0) // Unk
|
|
||||||
bf.WriteUint16(distData.TimesAcceptable)
|
|
||||||
bf.WriteUint16(distData.TimesAccepted)
|
|
||||||
bf.WriteUint16(0) // Unk
|
|
||||||
bf.WriteUint16(distData.MinHR)
|
|
||||||
bf.WriteUint16(distData.MaxHR)
|
|
||||||
bf.WriteUint16(distData.MinSR)
|
|
||||||
bf.WriteUint16(distData.MaxSR)
|
|
||||||
bf.WriteUint16(distData.MinGR)
|
|
||||||
bf.WriteUint16(distData.MaxGR)
|
|
||||||
bf.WriteUint32(0) // Unk
|
|
||||||
bf.WriteUint32(0) // Unk
|
|
||||||
ps.Uint16(bf, distData.EventName, true)
|
|
||||||
bf.WriteBytes(make([]byte, 391))
|
|
||||||
}
|
}
|
||||||
resp := byteframe.NewByteFrame()
|
|
||||||
resp.WriteUint16(uint16(distCount))
|
|
||||||
resp.WriteBytes(bf.Data())
|
|
||||||
resp.WriteUint8(0)
|
|
||||||
doAckBufSucceed(s, pkt.AckHandle, resp.Data())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bf.WriteUint16(uint16(len(itemDists)))
|
||||||
|
for _, dist := range itemDists {
|
||||||
|
bf.WriteUint32(dist.ID)
|
||||||
|
bf.WriteUint32(uint32(dist.Deadline.Unix()))
|
||||||
|
bf.WriteUint32(dist.Rights)
|
||||||
|
bf.WriteUint16(dist.TimesAcceptable)
|
||||||
|
bf.WriteUint16(dist.TimesAccepted)
|
||||||
|
bf.WriteUint16(0) // Unk (G9+)
|
||||||
|
bf.WriteInt16(dist.MinHR)
|
||||||
|
bf.WriteInt16(dist.MaxHR)
|
||||||
|
bf.WriteInt16(dist.MinSR)
|
||||||
|
bf.WriteInt16(dist.MaxSR)
|
||||||
|
bf.WriteInt16(dist.MinGR)
|
||||||
|
bf.WriteInt16(dist.MaxGR)
|
||||||
|
bf.WriteUint8(0) // Unk (G7+)
|
||||||
|
bf.WriteUint16(0) // Unk (G6+)
|
||||||
|
if dist.Selection {
|
||||||
|
bf.WriteUint8(2) // Selection (G8+)
|
||||||
|
} else {
|
||||||
|
bf.WriteUint8(0)
|
||||||
|
}
|
||||||
|
bf.WriteUint16(0) // Unk (G7+)
|
||||||
|
bf.WriteUint16(0) // Unk (G7+)
|
||||||
|
bf.WriteUint8(0) // Unk (G10+)
|
||||||
|
ps.Uint8(bf, dist.EventName, true)
|
||||||
|
// 6 item slots with 13 entries each (G8+ format)
|
||||||
|
for i := 0; i < 6; i++ {
|
||||||
|
for j := 0; j < 13; j++ {
|
||||||
|
bf.WriteUint8(0)
|
||||||
|
bf.WriteUint32(0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
|
||||||
|
}
|
||||||
|
|
||||||
|
type DistributionItem struct {
|
||||||
|
ItemType uint8 `db:"item_type"`
|
||||||
|
ID uint32 `db:"id"`
|
||||||
|
ItemID uint32 `db:"item_id"`
|
||||||
|
Quantity uint32 `db:"quantity"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func getDistributionItems(s *Session, i uint32) []DistributionItem {
|
||||||
|
var distItems []DistributionItem
|
||||||
|
rows, err := s.server.db.Queryx(`SELECT id, item_type, COALESCE(item_id, 0) AS item_id, COALESCE(quantity, 0) AS quantity FROM distribution_items WHERE distribution_id=$1`, i)
|
||||||
|
if err == nil {
|
||||||
|
var distItem DistributionItem
|
||||||
|
for rows.Next() {
|
||||||
|
err = rows.StructScan(&distItem)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
distItems = append(distItems, distItem)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return distItems
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleMsgMhfApplyDistItem(s *Session, p mhfpacket.MHFPacket) {
|
func handleMsgMhfApplyDistItem(s *Session, p mhfpacket.MHFPacket) {
|
||||||
pkt := p.(*mhfpacket.MsgMhfApplyDistItem)
|
pkt := p.(*mhfpacket.MsgMhfApplyDistItem)
|
||||||
|
bf := byteframe.NewByteFrame()
|
||||||
if pkt.DistributionID == 0 {
|
bf.WriteUint32(pkt.DistributionID)
|
||||||
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 6))
|
distItems := getDistributionItems(s, pkt.DistributionID)
|
||||||
} else {
|
bf.WriteUint16(uint16(len(distItems)))
|
||||||
row := s.server.db.QueryRowx("SELECT data FROM distribution WHERE id = $1", pkt.DistributionID)
|
for _, item := range distItems {
|
||||||
dist := &ItemDist{}
|
bf.WriteUint8(item.ItemType)
|
||||||
err := row.StructScan(dist)
|
bf.WriteUint32(item.ItemID)
|
||||||
if err != nil {
|
bf.WriteUint32(item.Quantity)
|
||||||
s.logger.Error("Error parsing item distribution data", zap.Error(err))
|
bf.WriteUint32(item.ID) // G8+ includes item ID
|
||||||
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 6))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(dist.Data) >= 2 {
|
|
||||||
distData := byteframe.NewByteFrameFromBytes(dist.Data)
|
|
||||||
distItems := int(distData.ReadUint16())
|
|
||||||
for i := 0; i < distItems; i++ {
|
|
||||||
if len(dist.Data) >= 2+(i*13) {
|
|
||||||
itemType := distData.ReadUint8()
|
|
||||||
_ = distData.ReadBytes(6)
|
|
||||||
quantity := int(distData.ReadUint16())
|
|
||||||
_ = distData.ReadBytes(4)
|
|
||||||
switch itemType {
|
|
||||||
case 17:
|
|
||||||
_ = addPointNetcafe(s, quantity)
|
|
||||||
case 19:
|
|
||||||
s.server.db.Exec("UPDATE users u SET gacha_premium=gacha_premium+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", quantity, s.charID)
|
|
||||||
case 20:
|
|
||||||
s.server.db.Exec("UPDATE users u SET gacha_trial=gacha_trial+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", quantity, s.charID)
|
|
||||||
case 21:
|
|
||||||
s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", quantity, s.charID)
|
|
||||||
case 23:
|
|
||||||
saveData, err := GetCharacterSaveData(s, s.charID)
|
|
||||||
if err == nil {
|
|
||||||
saveData.RP += uint16(quantity)
|
|
||||||
saveData.Save(s)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bf := byteframe.NewByteFrame()
|
|
||||||
bf.WriteUint32(pkt.DistributionID)
|
|
||||||
bf.WriteBytes(dist.Data)
|
|
||||||
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
|
|
||||||
|
|
||||||
_, err = s.server.db.Exec(`
|
|
||||||
INSERT INTO public.distributions_accepted
|
|
||||||
VALUES ($1, $2)
|
|
||||||
`, pkt.DistributionID, s.charID)
|
|
||||||
if err != nil {
|
|
||||||
s.logger.Error("Error updating accepted dist count", zap.Error(err))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleMsgMhfAcquireDistItem(s *Session, p mhfpacket.MHFPacket) {
|
func handleMsgMhfAcquireDistItem(s *Session, p mhfpacket.MHFPacket) {
|
||||||
pkt := p.(*mhfpacket.MsgMhfAcquireDistItem)
|
pkt := p.(*mhfpacket.MsgMhfAcquireDistItem)
|
||||||
|
if pkt.DistributionID > 0 {
|
||||||
|
_, err := s.server.db.Exec(`INSERT INTO public.distributions_accepted VALUES ($1, $2)`, pkt.DistributionID, s.charID)
|
||||||
|
if err == nil {
|
||||||
|
distItems := getDistributionItems(s, pkt.DistributionID)
|
||||||
|
for _, item := range distItems {
|
||||||
|
switch item.ItemType {
|
||||||
|
case 17:
|
||||||
|
_ = addPointNetcafe(s, int(item.Quantity))
|
||||||
|
case 19:
|
||||||
|
s.server.db.Exec("UPDATE users u SET gacha_premium=gacha_premium+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID)
|
||||||
|
case 20:
|
||||||
|
s.server.db.Exec("UPDATE users u SET gacha_trial=gacha_trial+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID)
|
||||||
|
case 21:
|
||||||
|
s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID)
|
||||||
|
case 23:
|
||||||
|
saveData, err := GetCharacterSaveData(s, s.charID)
|
||||||
|
if err == nil {
|
||||||
|
saveData.RP += uint16(item.Quantity)
|
||||||
|
saveData.Save(s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
|
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user