Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-15 00:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix gacha rolling and add guaranteed rewards

Browse Source
This commit is contained in:
wish
2023-02-15 23:30:42 +11:00
parent e1986cb58b
commit e73d4a03f4
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/channelserver/handlers_shop_gacha.go
View File

@@ -294,6 +294,19 @@ func transactGacha(s *Session, gachaID uint32, rollID uint8) (error, int) {
return nil, rolls return nil, rolls
} }
func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []GachaItem {
var rewards []GachaItem
var reward GachaItem
items, err := s.server.db.Queryx(`SELECT item_type, item_id, quantity FROM gacha_items WHERE entry_id = (SELECT id FROM gacha_entries WHERE entry_type = $1 AND gacha_id = $2)`, rollID, gachaID)
if err == nil {
for items.Next() {
items.StructScan(&reward)
rewards = append(rewards, reward)
}
}
return rewards
}
func handleMsgMhfPlayNormalGacha(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfPlayNormalGacha(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfPlayNormalGacha) pkt := p.(*mhfpacket.MsgMhfPlayNormalGacha)
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
@@ -307,6 +320,19 @@ func handleMsgMhfPlayNormalGacha(s *Session, p mhfpacket.MHFPacket) {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1))
return return
} }
temp := byteframe.NewByteFrame()
/* Optional extended functionality
guaranteedItems := getGuaranteedItems(s, pkt.GachaID, pkt.RollType)
for _, item := range guaranteedItems {
temp.WriteUint8(item.ItemType)
temp.WriteUint16(reward.ItemID)
temp.WriteUint16(reward.Quantity)
temp.WriteUint8(0) // Lowest rarity
}
*/
entries, err := s.server.db.Queryx(`SELECT id, weight, rarity FROM gacha_entries WHERE gacha_id = $1 AND entry_type = 100 ORDER BY weight DESC`, pkt.GachaID) entries, err := s.server.db.Queryx(`SELECT id, weight, rarity FROM gacha_entries WHERE gacha_id = $1 AND entry_type = 100 ORDER BY weight DESC`, pkt.GachaID)
if err != nil { if err != nil {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1))
@@ -317,10 +343,9 @@ func handleMsgMhfPlayNormalGacha(s *Session, p mhfpacket.MHFPacket) {
gachaEntries = append(gachaEntries, entry) gachaEntries = append(gachaEntries, entry)
totalWeight += entry.Weight totalWeight += entry.Weight
} }
result := rand.Float64() * totalWeight
var rewardCount uint8
temp := byteframe.NewByteFrame()
for i := 0; i < rolls; i++ { for i := 0; i < rolls; i++ {
result := rand.Float64() * totalWeight
for _, entry := range gachaEntries { for _, entry := range gachaEntries {
result -= entry.Weight result -= entry.Weight
if result < 0 { if result < 0 {
@@ -330,7 +355,6 @@ func handleMsgMhfPlayNormalGacha(s *Session, p mhfpacket.MHFPacket) {
return return
} }
for items.Next() { for items.Next() {
rewardCount++
items.StructScan(&reward) items.StructScan(&reward)
rewards = append(rewards, reward) rewards = append(rewards, reward)
temp.WriteUint8(reward.ItemType) temp.WriteUint8(reward.ItemType)
@@ -342,7 +366,8 @@ func handleMsgMhfPlayNormalGacha(s *Session, p mhfpacket.MHFPacket) {
} }
} }
} }
bf.WriteUint8(rewardCount)
bf.WriteUint8(uint8(len(rewards)))
bf.WriteBytes(temp.Data()) bf.WriteBytes(temp.Data())
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
addGachaItem(s, rewards) addGachaItem(s, rewards)