Merge branch 'main' into feature/event-tent

2025-12-17 09:24:50 +01:00 · 2024-03-11 20:16:20 +00:00
parent 83cb605fd7 19aadc6e10
commit 5e5a6d9bb9
9 changed files with 90 additions and 38 deletions
--- a/server/channelserver/handlers_guild.go
+++ b/server/channelserver/handlers_guild.go
@@ -51,6 +51,8 @@ type Guild struct {
 	MemberCount   uint16        `db:"member_count"`
 	RankRP        uint32        `db:"rank_rp"`
 	EventRP       uint32        `db:"event_rp"`
+	RoomRP        uint16        `db:"room_rp"`
+	RoomExpiry    time.Time     `db:"room_expiry"`
 	Comment       string        `db:"comment"`
 	PugiName1     string        `db:"pugi_name_1"`
 	PugiName2     string        `db:"pugi_name_2"`
@@ -153,6 +155,8 @@ SELECT
 	g.name,
 	rank_rp,
 	event_rp,
+	room_rp,
+	COALESCE(room_expiry, '1970-01-01') AS room_expiry,
 	main_motto,
 	sub_motto,
 	created_at,
@@ -706,7 +710,7 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) {
 		}
 		bf.WriteUint32(uint32(response))
 	case mhfpacket.OperateGuildDonateRank:
-		bf.WriteBytes(handleDonateRP(s, uint16(pkt.Data1.ReadUint32()), guild, false))
+		bf.WriteBytes(handleDonateRP(s, uint16(pkt.Data1.ReadUint32()), guild, 0))
 	case mhfpacket.OperateGuildSetApplicationDeny:
 		s.server.db.Exec("UPDATE guilds SET recruiting=false WHERE id=$1", guild.ID)
 	case mhfpacket.OperateGuildSetApplicationAllow:
@@ -747,10 +751,11 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) {
 		// TODO: This doesn't implement blocking, if someone unlocked the same outfit at the same time
 		s.server.db.Exec(`UPDATE guilds SET pugi_outfits=pugi_outfits+$1 WHERE id=$2`, int(math.Pow(float64(pkt.Data1.ReadUint32()), 2)), guild.ID)
 	case mhfpacket.OperateGuildDonateRoom:
-		// TODO: Where does this go?
+		quantity := uint16(pkt.Data1.ReadUint32())
+		bf.WriteBytes(handleDonateRP(s, quantity, guild, 2))
 	case mhfpacket.OperateGuildDonateEvent:
 		quantity := uint16(pkt.Data1.ReadUint32())
-		bf.WriteBytes(handleDonateRP(s, quantity, guild, true))
+		bf.WriteBytes(handleDonateRP(s, quantity, guild, 1))
 		// TODO: Move this value onto rp_yesterday and reset to 0... daily?
 		s.server.db.Exec(`UPDATE guild_characters SET rp_today=rp_today+$1 WHERE character_id=$2`, quantity, s.charID)
 	case mhfpacket.OperateGuildEventExchange:
@@ -794,20 +799,37 @@ func handleChangePugi(s *Session, outfit uint8, guild *Guild, num int) {
 	guild.Save(s)
 }

-func handleDonateRP(s *Session, amount uint16, guild *Guild, isEvent bool) []byte {
+func handleDonateRP(s *Session, amount uint16, guild *Guild, _type int) []byte {
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint32(0)
 	saveData, err := GetCharacterSaveData(s, s.charID)
 	if err != nil {
 		return bf.Data()
 	}
+	var resetRoom bool
+	if _type == 2 {
+		var currentRP uint16
+		s.server.db.QueryRow(`SELECT room_rp FROM guilds WHERE id = $1`, guild.ID).Scan(&currentRP)
+		if currentRP+amount >= 30 {
+			amount = 30 - currentRP
+			resetRoom = true
+		}
+	}
 	saveData.RP -= amount
 	saveData.Save(s)
-	updateSQL := "UPDATE guilds SET rank_rp = rank_rp + $1 WHERE id = $2"
-	if isEvent {
-		updateSQL = "UPDATE guilds SET event_rp = event_rp + $1 WHERE id = $2"
+	switch _type {
+	case 0:
+		s.server.db.Exec(`UPDATE guilds SET rank_rp = rank_rp + $1 WHERE id = $2`, amount, guild.ID)
+	case 1:
+		s.server.db.Exec(`UPDATE guilds SET event_rp = event_rp + $1 WHERE id = $2`, amount, guild.ID)
+	case 2:
+		if resetRoom {
+			s.server.db.Exec(`UPDATE guilds SET room_rp = 0 WHERE id = $1`, guild.ID)
+			s.server.db.Exec(`UPDATE guilds SET room_expiry = $1 WHERE id = $2`, TimeAdjusted().Add(time.Hour*24*7), guild.ID)
+		} else {
+			s.server.db.Exec(`UPDATE guilds SET room_rp = room_rp + $1 WHERE id = $2`, amount, guild.ID)
+		}
 	}
-	s.server.db.Exec(updateSQL, amount, guild.ID)
 	bf.Seek(0, 0)
 	bf.WriteUint32(uint32(saveData.RP))
 	return bf.Data()
@@ -1001,8 +1023,8 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint8(limit)

 		bf.WriteUint32(55000)
-		bf.WriteUint32(0)
-		bf.WriteUint16(0) // Changing Room RP
+		bf.WriteUint32(uint32(guild.RoomExpiry.Unix()))
+		bf.WriteUint16(guild.RoomRP)
 		bf.WriteUint16(0) // Ignored

 		if guild.AllianceID > 0 {
--- a/server/channelserver/handlers_stage.go
+++ b/server/channelserver/handlers_stage.go
@@ -148,9 +148,21 @@ func removeSessionFromStage(s *Session) {
 	destructEmptySemaphores(s)
 }

+func isStageFull(s *Session, StageID string) bool {
+	if stage, exists := s.server.stages[StageID]; exists {
+		return len(stage.reservedClientSlots)+len(stage.clients) >= int(stage.maxPlayers)
+	}
+	return false
+}
+
 func handleMsgSysEnterStage(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysEnterStage)

+	if isStageFull(s, pkt.StageID) {
+		doAckSimpleFail(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01})
+		return
+	}
+
 	// Push our current stage ID to the movement stack before entering another one.
 	if s.stage != nil {
 		s.stage.Lock()
@@ -175,6 +187,12 @@ func handleMsgSysBackStage(s *Session, p mhfpacket.MHFPacket) {
 		backStage = "sl1Ns200p0a0u0"
 	}

+	if isStageFull(s, backStage) {
+		s.stageMoveStack.Push(backStage)
+		doAckSimpleFail(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01})
+		return
+	}
+
 	if _, exists := s.stage.reservedClientSlots[s.charID]; exists {
 		delete(s.stage.reservedClientSlots, s.charID)
 	}
@@ -188,6 +206,12 @@ func handleMsgSysBackStage(s *Session, p mhfpacket.MHFPacket) {

 func handleMsgSysMoveStage(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgSysMoveStage)
+
+	if isStageFull(s, pkt.StageID) {
+		doAckSimpleFail(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01})
+		return
+	}
+
 	doStageTransfer(s, pkt.AckHandle, pkt.StageID)
 }

--- a/server/channelserver/sys_stage.go
+++ b/server/channelserver/sys_stage.go
@@ -59,7 +59,7 @@ func NewStage(ID string) *Stage {
 		objects:             make(map[uint32]*Object),
 		objectIndex:         0,
 		rawBinaryData:       make(map[stageBinaryKey][]byte),
-		maxPlayers:          4,
+		maxPlayers:          127,
 	}
 	return s
 }
--- a/server/signserver/dsgn_resp.go
+++ b/server/signserver/dsgn_resp.go
@@ -38,25 +38,24 @@ func (s *Session) makeSignResponse(uid uint32) []byte {
 		return bf.Data()
 	}

-	bf.WriteUint8(uint8(SIGN_SUCCESS)) // resp_code
-	if (s.server.erupeConfig.PatchServerManifest != "" && s.server.erupeConfig.PatchServerFile != "") || s.client == PS3 {
-		bf.WriteUint8(2)
-	} else {
-		bf.WriteUint8(0)
+	if s.client == PS3 && (s.server.erupeConfig.PatchServerFile == "" || s.server.erupeConfig.PatchServerManifest == "") {
+		bf.WriteUint8(uint8(SIGN_EABORT))
+		return bf.Data()
 	}
+
+	bf.WriteUint8(uint8(SIGN_SUCCESS))
+	bf.WriteUint8(2) // patch server count
 	bf.WriteUint8(1) // entrance server count
 	bf.WriteUint8(uint8(len(chars)))
 	bf.WriteUint32(tokenID)
 	bf.WriteBytes([]byte(sessToken))
 	bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix()))
 	if s.client == PS3 {
-		ps.Uint8(bf, fmt.Sprintf(`ps3-%s.zerulight.cc`, s.server.erupeConfig.Language), false)
-		ps.Uint8(bf, fmt.Sprintf(`ps3-%s.zerulight.cc`, s.server.erupeConfig.Language), false)
+		ps.Uint8(bf, fmt.Sprintf("%s/ps3", s.server.erupeConfig.PatchServerManifest), false)
+		ps.Uint8(bf, fmt.Sprintf("%s/ps3", s.server.erupeConfig.PatchServerFile), false)
 	} else {
-		if s.server.erupeConfig.PatchServerManifest != "" && s.server.erupeConfig.PatchServerFile != "" {
-			ps.Uint8(bf, s.server.erupeConfig.PatchServerManifest, false)
-			ps.Uint8(bf, s.server.erupeConfig.PatchServerFile, false)
-		}
+		ps.Uint8(bf, s.server.erupeConfig.PatchServerManifest, false)
+		ps.Uint8(bf, s.server.erupeConfig.PatchServerFile, false)
 	}
 	if strings.Split(s.rawConn.RemoteAddr().String(), ":")[0] == "127.0.0.1" {
 		ps.Uint8(bf, fmt.Sprintf("127.0.0.1:%d", s.server.erupeConfig.Entrance.Port), false)