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

cleanup logic and update cafe time

Browse Source
This commit is contained in:
wish
2022-08-13 17:21:24 +10:00
parent 18989e9435
commit 3bb0ab6295
3 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patch-schema/netcafe.sql
View File

@@ -6,10 +6,10 @@ ALTER TABLE IF EXISTS public.characters
CREATE TABLE IF NOT EXISTS public.cafebonus CREATE TABLE IF NOT EXISTS public.cafebonus
( (
id integer NOT NULL PRIMARY KEY, id integer NOT NULL PRIMARY KEY,
line integer NOT NULL, minutes_req integer NOT NULL,
itemclass integer NOT NULL, item_type integer NOT NULL,
itemid integer NOT NULL, item_id integer NOT NULL,
tradequantity integer NOT NULL quantity integer NOT NULL
); );
CREATE TABLE IF NOT EXISTS public.cafe_accepted CREATE TABLE IF NOT EXISTS public.cafe_accepted

25
server/channelserver/handlers.go
View File

@@ -190,8 +190,12 @@ func handleMsgSysLogout(s *Session, p mhfpacket.MHFPacket) {
} }
func logoutPlayer(s *Session) { func logoutPlayer(s *Session) {
delete(s.server.sessions, s.rawConn) if _, exists := s.server.sessions[s.rawConn]; exists {
s.rawConn.Close() delete(s.server.sessions, s.rawConn)
s.rawConn.Close()
} else {
return // Prevent re-running logout logic on real logouts
}
_, err := s.server.db.Exec("UPDATE sign_sessions SET server_id=NULL, char_id=NULL WHERE token=$1", s.token) _, err := s.server.db.Exec("UPDATE sign_sessions SET server_id=NULL, char_id=NULL WHERE token=$1", s.token)
if err != nil { if err != nil {
@@ -204,13 +208,13 @@ func logoutPlayer(s *Session) {
} }
var timePlayed int var timePlayed int
var sessionTime int
_ = s.server.db.QueryRow("SELECT time_played FROM characters WHERE id = $1", s.charID).Scan(&timePlayed) _ = s.server.db.QueryRow("SELECT time_played FROM characters WHERE id = $1", s.charID).Scan(&timePlayed)
sessionTime = int(Time_Current_Adjusted().Unix()) - int(s.sessionStart)
timePlayed = (int(Time_Current_Adjusted().Unix()) - int(s.sessionStart)) + timePlayed timePlayed += sessionTime
var rpGained int var rpGained int
if s.rights >= 0x40000000 { // N Course
if s.rights > 0x40000000 { // N Course
rpGained = timePlayed / 900 rpGained = timePlayed / 900
timePlayed = timePlayed % 900 timePlayed = timePlayed % 900
} else { } else {
@@ -218,10 +222,10 @@ func logoutPlayer(s *Session) {
timePlayed = timePlayed % 1800 timePlayed = timePlayed % 1800
} }
_, err = s.server.db.Exec("UPDATE characters SET time_played = $1 WHERE id = $2", timePlayed, s.charID) s.server.db.Exec("UPDATE characters SET time_played = $1 WHERE id = $2", timePlayed, s.charID)
if err != nil { s.server.db.Exec("UPDATE characters SET cafe_time=cafe_time+$1 WHERE id=$2", sessionTime, s.charID)
panic(err)
} treasureHuntUnregister(s)
if s.stage == nil { if s.stage == nil {
return return
@@ -241,7 +245,6 @@ func logoutPlayer(s *Session) {
removeSessionFromSemaphore(s) removeSessionFromSemaphore(s)
removeSessionFromStage(s) removeSessionFromStage(s)
treasureHuntUnregister(s)
saveData, err := GetCharacterSaveData(s, s.charID) saveData, err := GetCharacterSaveData(s, s.charID)
if err != nil { if err != nil {

66
server/channelserver/handlers_cafe.go
View File

@@ -10,26 +10,26 @@ import (
func handleMsgMhfAcquireCafeItem(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfAcquireCafeItem(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfAcquireCafeItem) pkt := p.(*mhfpacket.MsgMhfAcquireCafeItem)
var netcafe_points int var netcafePoints uint32
err := s.server.db.QueryRow("UPDATE characters SET netcafe_points = netcafe_points - $1 WHERE id = $2 RETURNING netcafe_points", pkt.PointCost, s.charID).Scan(&netcafe_points) err := s.server.db.QueryRow("UPDATE characters SET netcafe_points = netcafe_points - $1 WHERE id = $2 RETURNING netcafe_points", pkt.PointCost, s.charID).Scan(&netcafePoints)
if err != nil { if err != nil {
s.logger.Fatal("Failed to get plate data savedata from db", zap.Error(err)) s.logger.Fatal("Failed to get netcafe points from db", zap.Error(err))
} }
resp := byteframe.NewByteFrame() resp := byteframe.NewByteFrame()
resp.WriteUint32(uint32(netcafe_points)) resp.WriteUint32(netcafePoints)
doAckSimpleSucceed(s, pkt.AckHandle, resp.Data()) doAckSimpleSucceed(s, pkt.AckHandle, resp.Data())
} }
func handleMsgMhfUpdateCafepoint(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUpdateCafepoint(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfUpdateCafepoint) pkt := p.(*mhfpacket.MsgMhfUpdateCafepoint)
var netcafe_points int var netcafePoints uint32
err := s.server.db.QueryRow("SELECT COALESCE(netcafe_points, 0) FROM characters WHERE id = $1", s.charID).Scan(&netcafe_points) err := s.server.db.QueryRow("SELECT COALESCE(netcafe_points, 0) FROM characters WHERE id = $1", s.charID).Scan(&netcafePoints)
if err != nil { if err != nil {
s.logger.Fatal("Failed to get plate data savedata from db", zap.Error(err)) s.logger.Fatal("Failed to get netcate points from db", zap.Error(err))
} }
resp := byteframe.NewByteFrame() resp := byteframe.NewByteFrame()
resp.WriteUint32(0) resp.WriteUint32(0)
resp.WriteUint32(uint32(netcafe_points)) resp.WriteUint32(netcafePoints)
doAckSimpleSucceed(s, pkt.AckHandle, resp.Data()) doAckSimpleSucceed(s, pkt.AckHandle, resp.Data())
} }
@@ -77,19 +77,19 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
panic(err) panic(err)
} }
cafeTime = uint32(Time_Current_Adjusted().Unix()) - uint32(s.sessionStart) + cafeTime cafeTime = uint32(Time_Current_Adjusted().Unix()) - uint32(s.sessionStart) + cafeTime
bf.WriteUint32(cafeTime) // Total hours bf.WriteUint32(cafeTime) // Total cafe time
bf.WriteUint16(0) bf.WriteUint16(0)
ps.Uint16(bf, "Resets at next maintenance", true) ps.Uint16(bf, "Resets at next maintenance", true)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }
type CafeBonus struct { type CafeBonus struct {
ID uint32 `db:"id"` ID uint32 `db:"id"`
Line uint32 `db:"line"` Minutes uint32 `db:"minutes_req"`
ItemClass uint32 `db:"itemclass"` ItemType uint32 `db:"item_type"`
ItemID uint32 `db:"itemid"` ItemID uint32 `db:"item_id"`
TradeQuantity uint32 `db:"tradequantity"` Quantity uint32 `db:"quantity"`
FlagCount uint8 `db:"flagcount"` Claimed bool `db:"claimed"`
} }
func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
@@ -98,12 +98,12 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
var count uint32 var count uint32
rows, err := s.server.db.Queryx(` rows, err := s.server.db.Queryx(`
SELECT cb.id, line, itemclass, itemid, tradequantity, SELECT cb.id, minutes_req, item_type, item_id, quantity,
( (
SELECT count(*) SELECT count(*)
FROM cafe_accepted ca FROM cafe_accepted ca
WHERE cb.id = ca.cafe_id AND ca.character_id = $1 WHERE cb.id = ca.cafe_id AND ca.character_id = $1
) AS flagcount )::int::bool AS claimed
FROM cafebonus cb ORDER BY id ASC;`, s.charID) FROM cafebonus cb ORDER BY id ASC;`, s.charID)
if err != nil { if err != nil {
s.logger.Error("Error getting cafebonus", zap.Error(err)) s.logger.Error("Error getting cafebonus", zap.Error(err))
@@ -111,20 +111,20 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
} else { } else {
for rows.Next() { for rows.Next() {
count++ count++
Cafes := &CafeBonus{} cafeBonus := &CafeBonus{}
err = rows.StructScan(&Cafes) err = rows.StructScan(&cafeBonus)
if err != nil { if err != nil {
s.logger.Error("Error scanning cafebonus", zap.Error(err)) s.logger.Error("Error scanning cafebonus", zap.Error(err))
} }
bf.WriteUint32(Cafes.Line) // Time bf.WriteUint32(cafeBonus.Minutes)
bf.WriteUint32(0) // Unk bf.WriteUint32(0) // Unk
bf.WriteUint32(Cafes.ItemID) bf.WriteUint32(cafeBonus.ItemID)
bf.WriteUint32(Cafes.TradeQuantity) bf.WriteUint32(cafeBonus.Quantity)
bf.WriteUint8(Cafes.FlagCount) bf.WriteBool(cafeBonus.Claimed)
} }
resp := byteframe.NewByteFrame() resp := byteframe.NewByteFrame()
resp.WriteUint32(0) resp.WriteUint32(0)
resp.WriteUint32(uint32(time.Now().Unix())) //timestamp resp.WriteUint32(uint32(time.Now().Unix()))
resp.WriteUint32(count) resp.WriteUint32(count)
resp.WriteBytes(bf.Data()) resp.WriteBytes(bf.Data())
doAckBufSucceed(s, pkt.AckHandle, resp.Data()) doAckBufSucceed(s, pkt.AckHandle, resp.Data())
@@ -136,7 +136,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
row := s.server.db.QueryRowx(` row := s.server.db.QueryRowx(`
SELECT c.id, c.line, itemclass, itemid, tradequantity SELECT c.id, minutes_req, item_type, item_id, quantity
FROM cafebonus c FROM cafebonus c
WHERE ( WHERE (
SELECT count(*) SELECT count(*)
@@ -146,18 +146,18 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
SELECT ch.cafe_time + $2 SELECT ch.cafe_time + $2
FROM characters ch FROM characters ch
WHERE ch.id = $1 WHERE ch.id = $1
) >= c.line LIMIT 1;`, s.charID, Time_Current_Adjusted().Unix()-s.sessionStart) ) >= minutes_req LIMIT 1;`, s.charID, Time_Current_Adjusted().Unix()-s.sessionStart)
Cafe := &CafeBonus{} cafeBonus := &CafeBonus{}
err := row.StructScan(Cafe) err := row.StructScan(cafeBonus)
if err != nil { if err != nil {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 8)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 8))
return return
} }
bf.WriteUint32(1) bf.WriteUint32(1)
bf.WriteUint32(Cafe.ID) bf.WriteUint32(cafeBonus.ID)
bf.WriteUint32(Cafe.ItemClass) bf.WriteUint32(cafeBonus.ItemType)
bf.WriteUint32(Cafe.ItemID) bf.WriteUint32(cafeBonus.ItemID)
bf.WriteUint32(Cafe.TradeQuantity) bf.WriteUint32(cafeBonus.Quantity)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }