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

add extra fields to Distributions

Browse Source
This commit is contained in:
wish
2024-08-08 22:14:35 +10:00
parent ae759be046
commit 1ab6940b01
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
schemas/patch-schema/23-rework-distributions-2.sql Normal file
View File

@@ -0,0 +1,6 @@
BEGIN;
ALTER TABLE distribution ADD COLUMN rights INTEGER;
ALTER TABLE distribution ADD COLUMN selection BOOLEAN;
END;

13
server/channelserver/handlers_distitem.go
View File

@@ -13,6 +13,7 @@ import (
type Distribution struct { type Distribution struct {
ID uint32 `db:"id"` ID uint32 `db:"id"`
Deadline time.Time `db:"deadline"` Deadline time.Time `db:"deadline"`
Rights uint32 `db:"rights"`
TimesAcceptable uint16 `db:"times_acceptable"` TimesAcceptable uint16 `db:"times_acceptable"`
TimesAccepted uint16 `db:"times_accepted"` TimesAccepted uint16 `db:"times_accepted"`
MinHR int16 `db:"min_hr"` MinHR int16 `db:"min_hr"`
@@ -23,7 +24,7 @@ type Distribution struct {
MaxGR int16 `db:"max_gr"` MaxGR int16 `db:"max_gr"`
EventName string `db:"event_name"` EventName string `db:"event_name"`
Description string `db:"description"` Description string `db:"description"`
Data []byte `db:"data"` Selection bool `db:"selection"`
} }
func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
@@ -32,7 +33,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
var itemDists []Distribution var itemDists []Distribution
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
rows, err := s.server.db.Queryx(` rows, err := s.server.db.Queryx(`
SELECT d.id, event_name, description, times_acceptable, SELECT d.id, event_name, description, COALESCE(rights, 0) AS rights, COALESCE(selection, false) AS selection, times_acceptable,
COALESCE(min_hr, -1) AS min_hr, COALESCE(max_hr, -1) AS max_hr, COALESCE(min_hr, -1) AS min_hr, COALESCE(max_hr, -1) AS max_hr,
COALESCE(min_sr, -1) AS min_sr, COALESCE(max_sr, -1) AS max_sr, 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, COALESCE(min_gr, -1) AS min_gr, COALESCE(max_gr, -1) AS max_gr,
@@ -60,7 +61,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
for _, dist := range itemDists { for _, dist := range itemDists {
bf.WriteUint32(dist.ID) bf.WriteUint32(dist.ID)
bf.WriteUint32(uint32(dist.Deadline.Unix())) bf.WriteUint32(uint32(dist.Deadline.Unix()))
bf.WriteUint32(0) // Unk bf.WriteUint32(dist.Rights)
bf.WriteUint16(dist.TimesAcceptable) bf.WriteUint16(dist.TimesAcceptable)
bf.WriteUint16(dist.TimesAccepted) bf.WriteUint16(dist.TimesAccepted)
if _config.ErupeConfig.RealClientMode >= _config.G9 { if _config.ErupeConfig.RealClientMode >= _config.G9 {
@@ -79,7 +80,11 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(0) // Unk bf.WriteUint16(0) // Unk
} }
if _config.ErupeConfig.RealClientMode >= _config.G8 { if _config.ErupeConfig.RealClientMode >= _config.G8 {
bf.WriteUint8(0) // Unk if dist.Selection {
bf.WriteUint8(2) // Selection
} else {
bf.WriteUint8(0)
}
} }
if _config.ErupeConfig.RealClientMode >= _config.G7 { if _config.ErupeConfig.RealClientMode >= _config.G7 {
bf.WriteUint16(0) // Unk bf.WriteUint16(0) // Unk