From d8072ee06e70ff8abf405e055fee6c4fd1e8d9a2 Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 13 Aug 2022 18:22:56 +1000 Subject: [PATCH] default netcafe rewards and maintenance --- main.go | 4 +++- patch-schema/netcafe.sql | 12 +++++++++++- server/channelserver/handlers_cafe.go | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index d0b13d649..c3c0162e0 100644 --- a/main.go +++ b/main.go @@ -108,9 +108,11 @@ func main() { } logger.Info("Connected to database") - // Clear existing tokens + // Clear stale data _ = db.MustExec("DELETE FROM sign_sessions") _ = db.MustExec("DELETE FROM servers") + _ = db.MustExec("DELETE FROM cafe_accepted") + _ = db.MustExec("UPDATE characters SET cafe_time=0") // Clean the DB if the option is on. if erupeConfig.DevMode && erupeConfig.DevModeOptions.CleanDB { diff --git a/patch-schema/netcafe.sql b/patch-schema/netcafe.sql index c7aeb9460..077adc7bd 100644 --- a/patch-schema/netcafe.sql +++ b/patch-schema/netcafe.sql @@ -5,7 +5,7 @@ ALTER TABLE IF EXISTS public.characters CREATE TABLE IF NOT EXISTS public.cafebonus ( - id integer NOT NULL PRIMARY KEY, + id serial NOT NULL PRIMARY KEY, time_req integer NOT NULL, item_type integer NOT NULL, item_id integer NOT NULL, @@ -18,4 +18,14 @@ CREATE TABLE IF NOT EXISTS public.cafe_accepted character_id integer NOT NULL ); +INSERT INTO public.cafebonus (time_req, item_type, item_id, quantity) +VALUES + (1800, 17, 0, 250), + (3600, 17, 0, 500), + (7200, 17, 0, 1000), + (10800, 17, 0, 1500), + (18000, 17, 0, 1750), + (28800, 17, 0, 3000), + (43200, 17, 0, 4000); + END; \ No newline at end of file diff --git a/server/channelserver/handlers_cafe.go b/server/channelserver/handlers_cafe.go index cfac96cc7..a020d38a0 100644 --- a/server/channelserver/handlers_cafe.go +++ b/server/channelserver/handlers_cafe.go @@ -118,7 +118,7 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) { s.logger.Error("Error scanning cafebonus", zap.Error(err)) } bf.WriteUint32(cafeBonus.TimeReq) - bf.WriteUint32(0) // Unk + bf.WriteUint32(cafeBonus.ItemType) bf.WriteUint32(cafeBonus.ItemID) bf.WriteUint32(cafeBonus.Quantity) bf.WriteBool(cafeBonus.Claimed)