remove obsolete EnableLauncherServer option

change recurring course names
remove free course from config
2025-12-13 07:25:03 +01:00 · 2022-11-04 19:31:41 +11:00 · 2022-11-04 18:02:41 +11:00 · 2022-11-04 12:54:11 +11:00 · 2022-11-02 23:44:35 +11:00 · 2022-11-02 23:41:58 +11:00
7 changed files with 61 additions and 36 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,7 @@

 www/jp/
 vendor/
-bin/*.bin
-bin/*.bak
-bin/quests/*.bin
-bin/questlists/*.bin
-bin/scenarios/*.bin
-bin/debug/*.bin
+*.bin
 savedata/*/
 *.exe
 *.lnk
--- a/bin/questlists/.gitkeep
+++ b/bin/questlists/.gitkeep
--- a/config.json
+++ b/config.json
@@ -8,9 +8,8 @@
    "PatchServerManifest": "",
    "PatchServerFile": "",
    "AutoCreateAccount": true,
-    "EnableLauncherServer": false,
    "HideLoginNotice": false,
-    "LoginNotice": "<BODY><CENTER><SIZE_3><C_4>Welcome to Erupe SU9.1 Beta!<BR><BODY><LEFT><SIZE_2><C_5>Erupe is experimental software<C_7>, we are not liable for any<BR><BODY>issues caused by installing the software!<BR><BODY><BR><BODY><C_4>■Report bugs on Discord!<C_7><BR><BODY><BR><BODY><C_4>■Test everything!<C_7><BR><BODY><BR><BODY><C_4>■Don't talk to softlocking NPCs!<C_7><BR><BODY><BR><BODY><C_4>■Fork the code on GitHub!<C_7><BR><BODY><BR><BODY>Thank you to all of the contributors,<BR><BODY><BR><BODY>this wouldn't exist without you.",
+    "LoginNotice": "<BODY><CENTER><SIZE_3><C_4>Welcome to Erupe SU9.1!<BR><BODY><LEFT><SIZE_2><C_5>Erupe is experimental software<C_7>, we are not liable for any<BR><BODY>issues caused by installing the software!<BR><BODY><BR><BODY><C_4>■Report bugs on Discord!<C_7><BR><BODY><BR><BODY><C_4>■Test everything!<C_7><BR><BODY><BR><BODY><C_4>■Don't talk to softlocking NPCs!<C_7><BR><BODY><BR><BODY><C_4>■Fork the code on GitHub!<C_7><BR><BODY><BR><BODY>Thank you to all of the contributors,<BR><BODY><BR><BODY>this wouldn't exist without you.",
    "CleanDB": false,
    "MaxLauncherHR": false,
    "LogInboundMessages": false,
@@ -71,9 +70,8 @@
    {"Name": "HunterSupport", "Enabled": false},
    {"Name": "NBoost", "Enabled": false},
    {"Name": "NetCafe", "Enabled": true},
-    {"Name": "HLContinue", "Enabled": true},
-    {"Name": "EXContinue", "Enabled": true},
-    {"Name": "Free", "Enabled": true}
+    {"Name": "HLRenewing", "Enabled": true},
+    {"Name": "EXRenewing", "Enabled": true}
  ],
  "Database": {
    "Host": "localhost",
--- a/main.go
+++ b/main.go
@@ -35,7 +35,7 @@ func main() {
 	defer zapLogger.Sync()
 	logger := zapLogger.Named("main")

-	logger.Info("Starting Erupe (9.1b)")
+	logger.Info("Starting Erupe (9.1)")

 	if config.ErupeConfig.Database.Password == "" {
 		preventClose("Database password is blank")
--- a/network/mhfpacket/msg_mhf_enumerate_quest.go
+++ b/network/mhfpacket/msg_mhf_enumerate_quest.go
@@ -1,20 +1,20 @@
 package mhfpacket

-import ( 
- "errors" 
+import (
+	"errors"

- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )

 // MsgMhfEnumerateQuest represents the MSG_MHF_ENUMERATE_QUEST
 type MsgMhfEnumerateQuest struct {
 	AckHandle uint32
 	Unk0      uint8 // Hardcoded 0 in the binary
-	Unk1      uint8
-	Unk2      uint16
-	QuestList uint16 // Increments to request following batches of quests
+	World     uint8
+	Counter   uint16
+	Offset    uint16 // Increments to request following batches of quests
 	Unk4      uint8  // Hardcoded 0 in the binary
 }

@@ -27,9 +27,9 @@ func (m *MsgMhfEnumerateQuest) Opcode() network.PacketID {
 func (m *MsgMhfEnumerateQuest) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint8()
-	m.Unk1 = bf.ReadUint8()
-	m.Unk2 = bf.ReadUint16()
-	m.QuestList = bf.ReadUint16()
+	m.World = bf.ReadUint8()
+	m.Counter = bf.ReadUint16()
+	m.Offset = bf.ReadUint16()
 	m.Unk4 = bf.ReadUint8()
 	return nil
 }
--- a/network/mhfpacket/msg_sys_update_right.go
+++ b/network/mhfpacket/msg_sys_update_right.go
@@ -91,8 +91,8 @@ func Courses() []Course {
 		{Aliases: []string{"NBoost", "NetCafeBoost", "Boost"}, ID: 12},
 		// 13-25 do nothing
 		{Aliases: []string{"NetCafe", "Cafe", "InternetCafe"}, ID: 26},
-		{Aliases: []string{"HLContinue", "HLC"}, ID: 27},
-		{Aliases: []string{"EXContinue", "EXC"}, ID: 28},
+		{Aliases: []string{"HLRenewing", "HLR", "HLRenewal", "HLRenew"}, ID: 27},
+		{Aliases: []string{"EXRenewing", "EXR", "EXRenewal", "EXRenew"}, ID: 28},
 		{Aliases: []string{"Free"}, ID: 29},
 		// 30 = real netcafe bit
 	}
--- a/server/channelserver/handlers_quest.go
+++ b/server/channelserver/handlers_quest.go
@@ -2,13 +2,13 @@ package channelserver

 import (
 	"fmt"
-	"go.uber.org/zap"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"

 	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"go.uber.org/zap"
 )

 func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
@@ -26,7 +26,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 		}
 		filename := fmt.Sprintf("%d_0_0_0_S%d_T%d_C%d", pkt.ScenarioIdentifer.CategoryID, pkt.ScenarioIdentifer.MainID, pkt.ScenarioIdentifer.Flags, pkt.ScenarioIdentifer.ChapterID)
 		// Read the scenario file.
-		data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("scenarios/%s.bin", filename)))
+		data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("scenarios/%s.bin", filename)))
 		if err != nil {
 			s.logger.Error(fmt.Sprintf("Failed to open file: %s/scenarios/%s.bin", s.server.erupeConfig.BinPath, filename))
 			// This will crash the game.
@@ -36,7 +36,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 		doAckBufSucceed(s, pkt.AckHandle, data)
 	} else {
 		if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin")); err == nil {
-			data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin"))
+			data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin"))
 			if err != nil {
 				panic(err)
 			}
@@ -49,7 +49,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 				)
 			}
 			// Get quest file.
-			data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))
+			data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))
 			if err != nil {
 				s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename))
 				// This will crash the game.
@@ -80,15 +80,47 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
 }

 func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
-	// local files are easier for now, probably best would be to generate dynamically
 	pkt := p.(*mhfpacket.MsgMhfEnumerateQuest)
-	data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("questlists/list_%d.bin", pkt.QuestList)))
-	if err != nil {
-		fmt.Printf("questlists/list_%d.bin", pkt.QuestList)
-		stubEnumerateNoResults(s, pkt.AckHandle)
-	} else {
-		doAckBufSucceed(s, pkt.AckHandle, data)
+	var totalCount, returnedCount uint16
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint16(0)
+	err := filepath.Walk(fmt.Sprintf("%s/events/", s.server.erupeConfig.BinPath), func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		} else if info.IsDir() {
+			return nil
+		}
+		data, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		} else {
+			if len(data) > 850 || len(data) < 400 {
+				return nil // Could be more or less strict with size limits
+			} else {
+				totalCount++
+				if totalCount > pkt.Offset && len(bf.Data()) < 64000 {
+					returnedCount++
+					bf.WriteBytes(data)
+					return nil
+				}
+			}
+		}
+		return nil
+	})
+	if err != nil || totalCount == 0 {
+		doAckBufSucceed(s, pkt.AckHandle, make([]byte, 18))
+		return
 	}
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint32(0) // Unk
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint16(totalCount)
+	bf.WriteUint16(pkt.Offset)
+	bf.Seek(0, io.SeekStart)
+	bf.WriteUint16(returnedCount)
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

 func handleMsgMhfEnterTournamentQuest(s *Session, p mhfpacket.MHFPacket) {}
Author	SHA1	Message	Date
wish	bce9838790	remove obsolete EnableLauncherServer option	2022-11-04 19:31:41 +11:00
wish	a99fa78fc2	change recurring course names	2022-11-04 18:02:41 +11:00
wish	e4ac849309	remove free course from config	2022-11-04 12:54:11 +11:00
wish	77f8f2019d	finalise 9.1	2022-11-02 23:44:35 +11:00
wish	226f785c1b	repository cleanup	2022-11-02 23:41:58 +11:00
wish	faee3a3513	Merge pull request #51 from ZeruLight/feature/quest-enum feature/quest-enum	2022-11-02 23:36:26 +11:00
wish	cace0bb829	Merge branch 'main' into feature/quest-enum	2022-11-02 23:31:57 +11:00
wish	1085f54c0f	merge fixes	2022-11-01 12:41:45 +11:00
wish	f435c97f67	Merge branch 'main' into feature/quest-enum # Conflicts: # server/channelserver/handlers_quest.go	2022-11-01 12:24:23 +11:00
wish	a32040eaac	Merge branch 'main' into feature/quest-enum	2022-09-01 01:22:44 +10:00
wish	d993a095a0	update gitignore	2022-08-07 20:49:15 +10:00
wish	057e598cbc	retire questlists dir	2022-08-06 21:54:22 +10:00
wish	40f5744a7b	recurse quest enum into dirs	2022-08-06 19:59:45 +10:00
wish	e84bdd5adf	initial quest enumeration concept	2022-08-06 07:02:38 +10:00