Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-27 18:12:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): rename package _config to config with cfg alias

Browse Source 
The config package used `package _config` with a leading underscore,
which is unconventional in Go. Rename to `package config` (matching the
directory name) and use `cfg` as the standard import alias across all
93 importing files.
This commit is contained in:
Houmgaor
2026-02-21 13:20:15 +01:00
parent ad73f2fb55
commit f17cb96b52
98 changed files with 719 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/channelserver/channel_isolation_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"time"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"go.uber.org/zap"
)
@@ -19,8 +19,8 @@ func createListeningTestServer(t *testing.T, id uint16) *Server {
s := NewServer(&Config{
ID: id,
Logger: logger,
ErupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
ErupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
LogInboundMessages: false,
},

18
server/channelserver/guild_model.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"database/sql/driver"
"encoding/json"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"time"
)
@@ -111,12 +111,12 @@ func (gi *GuildIcon) Value() (valuer driver.Value, err error) {
return json.Marshal(gi)
}
func (g *Guild) Rank(mode _config.Mode) uint16 {
func (g *Guild) Rank(mode cfg.Mode) uint16 {
rpMap := []uint32{
24, 48, 96, 144, 192, 240, 288, 360, 432,
504, 600, 696, 792, 888, 984, 1080, 1200,
}
if mode <= _config.Z2 {
if mode <= cfg.Z2 {
rpMap = []uint32{
3500, 6000, 8500, 11000, 13500, 16000, 20000, 24000, 28000,
33000, 38000, 43000, 48000, 55000, 70000, 90000, 120000,
@@ -124,21 +124,21 @@ func (g *Guild) Rank(mode _config.Mode) uint16 {
}
for i, u := range rpMap {
if g.RankRP < u {
if mode <= _config.S6 && i >= 12 {
if mode <= cfg.S6 && i >= 12 {
return 12
} else if mode <= _config.F5 && i >= 13 {
} else if mode <= cfg.F5 && i >= 13 {
return 13
} else if mode <= _config.G32 && i >= 14 {
} else if mode <= cfg.G32 && i >= 14 {
return 14
}
return uint16(i)
}
}
if mode <= _config.S6 {
if mode <= cfg.S6 {
return 12
} else if mode <= _config.F5 {
} else if mode <= cfg.F5 {
return 13
} else if mode <= _config.G32 {
} else if mode <= cfg.G32 {
return 14
}
return 17

6
server/channelserver/handlers_bbs_test.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
)
@@ -51,8 +51,8 @@ func TestHandleMsgMhfGetBbsSnsStatus(t *testing.T) {
func TestHandleMsgMhfApplyBbsArticle(t *testing.T) {
server := createMockServer()
server.erupeConfig = &_config.Config{
Screenshots: _config.ScreenshotsOptions{
server.erupeConfig = &cfg.Config{
Screenshots: cfg.ScreenshotsOptions{
Host: "example.com",
Port: 8080,
},

4
server/channelserver/handlers_cafe.go
View File

@@ -4,7 +4,7 @@ import (
"erupe-ce/common/byteframe"
"erupe-ce/common/mhfcourse"
ps "erupe-ce/common/pascalstring"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"fmt"
"go.uber.org/zap"
@@ -99,7 +99,7 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
cafeTime = int(TimeAdjusted().Unix()) - int(s.sessionStart) + cafeTime
}
bf.WriteUint32(uint32(cafeTime))
if s.server.erupeConfig.RealClientMode >= _config.ZZ {
if s.server.erupeConfig.RealClientMode >= cfg.ZZ {
bf.WriteUint16(0)
ps.Uint16(bf, fmt.Sprintf(s.server.i18n.cafe.reset, int(cafeReset.Month()), cafeReset.Day()), true)
}

4
server/channelserver/handlers_campaign.go
View File

@@ -4,7 +4,7 @@ import (
"erupe-ce/common/byteframe"
ps "erupe-ce/common/pascalstring"
"erupe-ce/common/stringsupport"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"time"
)
@@ -71,7 +71,7 @@ func handleMsgMhfEnumerateCampaign(s *Session, p mhfpacket.MHFPacket) {
bf.WriteInt16(event.MaxHR)
bf.WriteInt16(event.MinSR)
bf.WriteInt16(event.MaxSR)
if s.server.erupeConfig.RealClientMode >= _config.G3 {
if s.server.erupeConfig.RealClientMode >= cfg.G3 {
bf.WriteInt16(event.MinGR)
bf.WriteInt16(event.MaxGR)
}

26
server/channelserver/handlers_cast_binary_test.go
View File

@@ -8,7 +8,7 @@ import (
"erupe-ce/common/byteframe"
"erupe-ce/common/mhfcourse"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/binpacket"
"erupe-ce/network/mhfpacket"
)
@@ -317,40 +317,40 @@ func TestBinaryMessageTypes(t *testing.T) {
func TestSlicesContainsUsage(t *testing.T) {
tests := []struct {
name string
items []_config.Course
target _config.Course
items []cfg.Course
target cfg.Course
expected bool
}{
{
name: "item_exists",
items: []_config.Course{
items: []cfg.Course{
{Name: "Course1", Enabled: true},
{Name: "Course2", Enabled: false},
},
target: _config.Course{Name: "Course1", Enabled: true},
target: cfg.Course{Name: "Course1", Enabled: true},
expected: true,
},
{
name: "item_not_found",
items: []_config.Course{
items: []cfg.Course{
{Name: "Course1", Enabled: true},
{Name: "Course2", Enabled: false},
},
target: _config.Course{Name: "Course3", Enabled: true},
target: cfg.Course{Name: "Course3", Enabled: true},
expected: false,
},
{
name: "empty_slice",
items: []_config.Course{},
target: _config.Course{Name: "Course1", Enabled: true},
items: []cfg.Course{},
target: cfg.Course{Name: "Course1", Enabled: true},
expected: false,
},
{
name: "enabled_mismatch",
items: []_config.Course{
items: []cfg.Course{
{Name: "Course1", Enabled: true},
},
target: _config.Course{Name: "Course1", Enabled: false},
target: cfg.Course{Name: "Course1", Enabled: false},
expected: false,
},
}
@@ -681,7 +681,7 @@ func BenchmarkHandleMsgSysCastBinary(b *testing.B) {
// BenchmarkSlicesContains benchmarks the slices.Contains function
func BenchmarkSlicesContains(b *testing.B) {
courses := []_config.Course{
courses := []cfg.Course{
{Name: "Course1", Enabled: true},
{Name: "Course2", Enabled: false},
{Name: "Course3", Enabled: true},
@@ -689,7 +689,7 @@ func BenchmarkSlicesContains(b *testing.B) {
{Name: "Course5", Enabled: true},
}
target := _config.Course{Name: "Course3", Enabled: true}
target := cfg.Course{Name: "Course3", Enabled: true}
b.ResetTimer()
for i := 0; i < b.N; i++ {

4
server/channelserver/handlers_character.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"go.uber.org/zap"
@@ -64,7 +64,7 @@ func (save *CharacterSaveData) Save(s *Session) {
save.updateSaveDataWithStruct()
if s.server.erupeConfig.RealClientMode >= _config.G1 {
if s.server.erupeConfig.RealClientMode >= cfg.G1 {
err := save.Compress()
if err != nil {
s.logger.Error("Failed to compress savedata", zap.Error(err))

26
server/channelserver/handlers_character_test.go
View File

@@ -5,7 +5,7 @@ import (
"encoding/binary"
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"erupe-ce/server/channelserver/compression/nullcomp"
)
@@ -14,37 +14,37 @@ import (
func TestGetPointers(t *testing.T) {
tests := []struct {
name string
clientMode _config.Mode
clientMode cfg.Mode
wantGender int
wantHR int
}{
{
name: "ZZ_version",
clientMode: _config.ZZ,
clientMode: cfg.ZZ,
wantGender: 81,
wantHR: 130550,
},
{
name: "Z2_version",
clientMode: _config.Z2,
clientMode: cfg.Z2,
wantGender: 81,
wantHR: 94550,
},
{
name: "G10_version",
clientMode: _config.G10,
clientMode: cfg.G10,
wantGender: 81,
wantHR: 94550,
},
{
name: "F5_version",
clientMode: _config.F5,
clientMode: cfg.F5,
wantGender: 81,
wantHR: 62550,
},
{
name: "S6_version",
clientMode: _config.S6,
clientMode: cfg.S6,
wantGender: 81,
wantHR: 14550,
},
@@ -258,8 +258,8 @@ func TestCharacterSaveData_updateStructWithSaveData(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
save := &CharacterSaveData{
Mode: _config.Z2,
Pointers: getPointers(_config.Z2),
Mode: cfg.Z2,
Pointers: getPointers(cfg.Z2),
decompSave: tt.setupSaveData(),
IsNewCharacter: tt.isNewCharacter,
}
@@ -308,8 +308,8 @@ func TestCharacterSaveData_updateSaveDataWithStruct(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
save := &CharacterSaveData{
Mode: _config.G10,
Pointers: getPointers(_config.G10),
Mode: cfg.G10,
Pointers: getPointers(cfg.G10),
decompSave: make([]byte, 150000),
RP: tt.rp,
KQF: tt.kqf,
@@ -414,7 +414,7 @@ func TestGetCharacterSaveData_Integration(t *testing.T) {
s := createTestSession(mock)
s.charID = charID
SetTestDB(s.server, db)
s.server.erupeConfig.RealClientMode = _config.Z2
s.server.erupeConfig.RealClientMode = cfg.Z2
// Get character save data
saveData, err := GetCharacterSaveData(s, charID)
@@ -458,7 +458,7 @@ func TestCharacterSaveData_Save_Integration(t *testing.T) {
s := createTestSession(mock)
s.charID = charID
SetTestDB(s.server, db)
s.server.erupeConfig.RealClientMode = _config.Z2
s.server.erupeConfig.RealClientMode = cfg.Z2
// Load character save data
saveData, err := GetCharacterSaveData(s, charID)

6
server/channelserver/handlers_clients_test.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network/mhfpacket"
"go.uber.org/zap"
@@ -390,8 +390,8 @@ func TestEnumerateClient_ConcurrentAccess(t *testing.T) {
server := &Server{
logger: logger,
stages: make(map[string]*Stage),
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
},

16
server/channelserver/handlers_commands.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/common/byteframe"
"erupe-ce/common/mhfcid"
"erupe-ce/common/mhfcourse"
"erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/binpacket"
"erupe-ce/network/mhfpacket"
@@ -22,13 +22,13 @@ import (
)
var (
commands map[string]_config.Command
commands map[string]cfg.Command
commandsOnce sync.Once
)
func initCommands(cmds []_config.Command, logger *zap.Logger) {
func initCommands(cmds []cfg.Command, logger *zap.Logger) {
commandsOnce.Do(func() {
commands = make(map[string]_config.Command)
commands = make(map[string]cfg.Command)
for _, cmd := range cmds {
commands[cmd.Name] = cmd
if cmd.Enabled {
@@ -40,7 +40,7 @@ func initCommands(cmds []_config.Command, logger *zap.Logger) {
})
}
func sendDisabledCommandMessage(s *Session, cmd _config.Command) {
func sendDisabledCommandMessage(s *Session, cmd cfg.Command) {
sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.disabled, cmd.Name))
}
@@ -230,7 +230,7 @@ func parseChatCommand(s *Session, command string) {
}
case commands["KeyQuest"].Prefix:
if commands["KeyQuest"].Enabled || s.isOp() {
if s.server.erupeConfig.RealClientMode < _config.G10 {
if s.server.erupeConfig.RealClientMode < cfg.G10 {
sendServerChatMessage(s, s.server.i18n.commands.kqf.version)
} else {
if len(args) > 1 {
@@ -274,7 +274,7 @@ func parseChatCommand(s *Session, command string) {
for _, course := range mhfcourse.Courses() {
for _, alias := range course.Aliases() {
if strings.EqualFold(args[1], alias) {
if slices.Contains(s.server.erupeConfig.Courses, _config.Course{Name: course.Aliases()[0], Enabled: true}) {
if slices.Contains(s.server.erupeConfig.Courses, cfg.Course{Name: course.Aliases()[0], Enabled: true}) {
var delta uint32
if mhfcourse.CourseExists(course.ID, s.courses) {
ei := slices.IndexFunc(s.courses, func(c mhfcourse.Course) bool {
@@ -329,7 +329,7 @@ func parseChatCommand(s *Session, command string) {
case "cm", "check", "checkmultiplier", "multiplier":
sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.ravi.multiplier, s.server.GetRaviMultiplier()))
case "sr", "sendres", "resurrection", "ss", "sendsed", "rs", "reqsed":
if s.server.erupeConfig.RealClientMode == _config.ZZ {
if s.server.erupeConfig.RealClientMode == cfg.ZZ {
switch args[1] {
case "sr", "sendres", "resurrection":
if s.server.raviente.state[28] > 0 {

10
server/channelserver/handlers_coverage2_test.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
)
@@ -202,8 +202,8 @@ func TestHandleMsgMhfMercenaryHuntdata_RequestTypeIs2(t *testing.T) {
func TestHandleMsgMhfEnumerateRanking_DefaultBranch(t *testing.T) {
server := createMockServer()
server.erupeConfig = &_config.Config{
DebugOptions: _config.DebugOptions{
server.erupeConfig = &cfg.Config{
DebugOptions: cfg.DebugOptions{
TournamentOverride: 0,
},
}
@@ -227,8 +227,8 @@ func TestHandleMsgMhfEnumerateRanking_DefaultBranch(t *testing.T) {
func TestHandleMsgMhfEnumerateRanking_NegativeState(t *testing.T) {
server := createMockServer()
server.erupeConfig = &_config.Config{
DebugOptions: _config.DebugOptions{
server.erupeConfig = &cfg.Config{
DebugOptions: cfg.DebugOptions{
TournamentOverride: -1,
},
}

10
server/channelserver/handlers_coverage5_test.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
)
@@ -12,28 +12,28 @@ import (
// =============================================================================
func TestEquipSkinHistSize_Default(t *testing.T) {
got := equipSkinHistSize(_config.ZZ)
got := equipSkinHistSize(cfg.ZZ)
if got != 3200 {
t.Errorf("equipSkinHistSize(ZZ) = %d, want 3200", got)
}
}
func TestEquipSkinHistSize_Z2(t *testing.T) {
got := equipSkinHistSize(_config.Z2)
got := equipSkinHistSize(cfg.Z2)
if got != 2560 {
t.Errorf("equipSkinHistSize(Z2) = %d, want 2560", got)
}
}
func TestEquipSkinHistSize_Z1(t *testing.T) {
got := equipSkinHistSize(_config.Z1)
got := equipSkinHistSize(cfg.Z1)
if got != 1280 {
t.Errorf("equipSkinHistSize(Z1) = %d, want 1280", got)
}
}
func TestEquipSkinHistSize_OlderMode(t *testing.T) {
got := equipSkinHistSize(_config.G1)
got := equipSkinHistSize(cfg.G1)
if got != 1280 {
t.Errorf("equipSkinHistSize(G1) = %d, want 1280", got)
}

4
server/channelserver/handlers_data.go
View File

@@ -2,7 +2,7 @@ package channelserver
import (
"erupe-ce/common/stringsupport"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"fmt"
"io"
"os"
@@ -90,7 +90,7 @@ func handleMsgMhfSavedata(s *Session, p mhfpacket.MHFPacket) {
characterSaveData.updateSaveDataWithStruct()
}
if characterSaveData.Name == s.Name || s.server.erupeConfig.RealClientMode <= _config.S10 {
if characterSaveData.Name == s.Name || s.server.erupeConfig.RealClientMode <= cfg.S10 {
characterSaveData.Save(s)
s.logger.Info("Wrote recompressed savedata back to DB.")
} else {

20
server/channelserver/handlers_distitem.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"erupe-ce/common/byteframe"
ps "erupe-ce/common/pascalstring"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"time"
@@ -41,7 +41,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(dist.Rights)
bf.WriteUint16(dist.TimesAcceptable)
bf.WriteUint16(dist.TimesAccepted)
if s.server.erupeConfig.RealClientMode >= _config.G9 {
if s.server.erupeConfig.RealClientMode >= cfg.G9 {
bf.WriteUint16(0) // Unk
}
bf.WriteInt16(dist.MinHR)
@@ -50,29 +50,29 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
bf.WriteInt16(dist.MaxSR)
bf.WriteInt16(dist.MinGR)
bf.WriteInt16(dist.MaxGR)
if s.server.erupeConfig.RealClientMode >= _config.G7 {
if s.server.erupeConfig.RealClientMode >= cfg.G7 {
bf.WriteUint8(0) // Unk
}
if s.server.erupeConfig.RealClientMode >= _config.G6 {
if s.server.erupeConfig.RealClientMode >= cfg.G6 {
bf.WriteUint16(0) // Unk
}
if s.server.erupeConfig.RealClientMode >= _config.G8 {
if s.server.erupeConfig.RealClientMode >= cfg.G8 {
if dist.Selection {
bf.WriteUint8(2) // Selection
} else {
bf.WriteUint8(0)
}
}
if s.server.erupeConfig.RealClientMode >= _config.G7 {
if s.server.erupeConfig.RealClientMode >= cfg.G7 {
bf.WriteUint16(0) // Unk
bf.WriteUint16(0) // Unk
}
if s.server.erupeConfig.RealClientMode >= _config.G10 {
if s.server.erupeConfig.RealClientMode >= cfg.G10 {
bf.WriteUint8(0) // Unk
}
ps.Uint8(bf, dist.EventName, true)
k := 6
if s.server.erupeConfig.RealClientMode >= _config.G8 {
if s.server.erupeConfig.RealClientMode >= cfg.G8 {
k = 13
}
for i := 0; i < 6; i++ {
@@ -81,7 +81,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(0)
}
}
if s.server.erupeConfig.RealClientMode >= _config.Z2 {
if s.server.erupeConfig.RealClientMode >= cfg.Z2 {
i := uint8(0)
bf.WriteUint8(i)
if i <= 10 {
@@ -114,7 +114,7 @@ func handleMsgMhfApplyDistItem(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint8(item.ItemType)
bf.WriteUint32(item.ItemID)
bf.WriteUint32(item.Quantity)
if s.server.erupeConfig.RealClientMode >= _config.G8 {
if s.server.erupeConfig.RealClientMode >= cfg.G8 {
bf.WriteUint32(item.ID)
}
}

6
server/channelserver/handlers_diva.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"encoding/hex"
"erupe-ce/common/stringsupport"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"time"
"erupe-ce/common/byteframe"
@@ -91,7 +91,7 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
var timestamps []uint32
if s.server.erupeConfig.DebugOptions.DivaOverride >= 0 {
if s.server.erupeConfig.DebugOptions.DivaOverride == 0 {
if s.server.erupeConfig.RealClientMode >= _config.Z2 {
if s.server.erupeConfig.RealClientMode >= cfg.Z2 {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 36))
} else {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 32))
@@ -103,7 +103,7 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
timestamps = generateDivaTimestamps(s, start, false)
}
if s.server.erupeConfig.RealClientMode >= _config.Z2 {
if s.server.erupeConfig.RealClientMode >= cfg.Z2 {
bf.WriteUint32(id)
}
for i := range timestamps {

10
server/channelserver/handlers_event.go
View File

@@ -2,7 +2,7 @@ package channelserver
import (
"erupe-ce/common/token"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"math"
"time"
@@ -88,15 +88,15 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) {
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
}
func generateFeatureWeapons(count int, mode _config.Mode) activeFeature {
func generateFeatureWeapons(count int, mode cfg.Mode) activeFeature {
_max := 14
if mode < _config.ZZ {
if mode < cfg.ZZ {
_max = 13
}
if mode < _config.G10 {
if mode < cfg.G10 {
_max = 12
}
if mode < _config.GG {
if mode < cfg.GG {
_max = 11
}
if count > _max {

16
server/channelserver/handlers_event_test.go
View File

@@ -4,7 +4,7 @@ import (
"math/bits"
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
)
@@ -122,7 +122,7 @@ func TestGenerateFeatureWeapons(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := generateFeatureWeapons(tt.count, _config.ZZ)
result := generateFeatureWeapons(tt.count, cfg.ZZ)
// Result should be non-zero for positive counts
if tt.count > 0 && result.ActiveFeatures == 0 {
@@ -143,7 +143,7 @@ func TestGenerateFeatureWeapons_Randomness(t *testing.T) {
iterations := 100
for i := 0; i < iterations; i++ {
result := generateFeatureWeapons(5, _config.ZZ)
result := generateFeatureWeapons(5, cfg.ZZ)
results[result.ActiveFeatures]++
}
@@ -154,7 +154,7 @@ func TestGenerateFeatureWeapons_Randomness(t *testing.T) {
}
func TestGenerateFeatureWeapons_ZeroCount(t *testing.T) {
result := generateFeatureWeapons(0, _config.ZZ)
result := generateFeatureWeapons(0, cfg.ZZ)
// Should return 0 for no weapons
if result.ActiveFeatures != 0 {
@@ -181,7 +181,7 @@ func TestGenerateFeatureWeapons_BitCount(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := generateFeatureWeapons(tt.count, _config.ZZ)
result := generateFeatureWeapons(tt.count, cfg.ZZ)
setBits := bits.OnesCount32(result.ActiveFeatures)
if setBits != tt.wantBits {
t.Errorf("Set bits = %d, want %d (ActiveFeatures=0b%032b)",
@@ -195,7 +195,7 @@ func TestGenerateFeatureWeapons_BitCount(t *testing.T) {
// bits 0-13 (no bits above bit 13 should be set).
func TestGenerateFeatureWeapons_BitsInRange(t *testing.T) {
for i := 0; i < 50; i++ {
result := generateFeatureWeapons(7, _config.ZZ)
result := generateFeatureWeapons(7, cfg.ZZ)
// Bits 14+ should never be set
if result.ActiveFeatures&^uint32(0x3FFF) != 0 {
t.Errorf("Bits above 13 are set: 0x%08X", result.ActiveFeatures)
@@ -206,7 +206,7 @@ func TestGenerateFeatureWeapons_BitsInRange(t *testing.T) {
// TestGenerateFeatureWeapons_MaxYieldsAllBits verifies that requesting 14
// weapons sets exactly bits 0-13 (the value 16383 = 0x3FFF).
func TestGenerateFeatureWeapons_MaxYieldsAllBits(t *testing.T) {
result := generateFeatureWeapons(14, _config.ZZ)
result := generateFeatureWeapons(14, cfg.ZZ)
if result.ActiveFeatures != 0x3FFF {
t.Errorf("ActiveFeatures = 0x%04X, want 0x3FFF (all 14 bits set)", result.ActiveFeatures)
}
@@ -215,7 +215,7 @@ func TestGenerateFeatureWeapons_MaxYieldsAllBits(t *testing.T) {
// TestGenerateFeatureWeapons_StartTimeZero verifies that the returned
// activeFeature has a zero StartTime (not set by generateFeatureWeapons).
func TestGenerateFeatureWeapons_StartTimeZero(t *testing.T) {
result := generateFeatureWeapons(5, _config.ZZ)
result := generateFeatureWeapons(5, cfg.ZZ)
if !result.StartTime.IsZero() {
t.Errorf("StartTime should be zero, got %v", result.StartTime)
}

12
server/channelserver/handlers_festa.go
View File

@@ -9,7 +9,7 @@ import (
"erupe-ce/common/byteframe"
ps "erupe-ce/common/pascalstring"
"erupe-ce/common/token"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"go.uber.org/zap"
@@ -230,7 +230,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(trial.Locale)
bf.WriteUint16(trial.Reward)
bf.WriteInt16(FestivalColorCodes[trial.Monopoly])
if s.server.erupeConfig.RealClientMode >= _config.F4 { // Not in S6.0
if s.server.erupeConfig.RealClientMode >= cfg.F4 { // Not in S6.0
bf.WriteUint16(trial.Unk)
}
}
@@ -274,13 +274,13 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(reward.Quantity)
bf.WriteUint16(reward.ItemID)
// Confirmed present in G3 via Wii U disassembly of import_festa_info
if s.server.erupeConfig.RealClientMode >= _config.G3 {
if s.server.erupeConfig.RealClientMode >= cfg.G3 {
bf.WriteUint16(reward.MinHR)
bf.WriteUint16(reward.MinSR)
bf.WriteUint8(reward.MinGR)
}
}
if s.server.erupeConfig.RealClientMode <= _config.G61 {
if s.server.erupeConfig.RealClientMode <= cfg.G61 {
if s.server.erupeConfig.GameplayOptions.MaximumFP > 0xFFFF {
s.server.erupeConfig.GameplayOptions.MaximumFP = 0xFFFF
}
@@ -326,7 +326,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(100) // Normal rate
bf.WriteUint16(50) // 50% penalty
if s.server.erupeConfig.RealClientMode >= _config.G52 {
if s.server.erupeConfig.RealClientMode >= cfg.G52 {
ps.Uint16(bf, "", false)
}
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
@@ -413,7 +413,7 @@ func handleMsgMhfEnumerateFestaMember(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(0) // Unk
for _, member := range validMembers {
bf.WriteUint32(member.CharID)
if s.server.erupeConfig.RealClientMode <= _config.Z1 {
if s.server.erupeConfig.RealClientMode <= cfg.Z1 {
bf.WriteUint16(uint16(member.Souls))
bf.WriteUint16(0)
} else {

18
server/channelserver/handlers_festa_test.go
View File

@@ -3,14 +3,14 @@ package channelserver
import (
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
)
func TestHandleMsgMhfEnumerateRanking_Default(t *testing.T) {
server := createMockServer()
server.erupeConfig = &_config.Config{
DebugOptions: _config.DebugOptions{
server.erupeConfig = &cfg.Config{
DebugOptions: cfg.DebugOptions{
TournamentOverride: 0, // Default state
},
}
@@ -34,8 +34,8 @@ func TestHandleMsgMhfEnumerateRanking_Default(t *testing.T) {
func TestHandleMsgMhfEnumerateRanking_State1(t *testing.T) {
server := createMockServer()
server.erupeConfig = &_config.Config{
DebugOptions: _config.DebugOptions{
server.erupeConfig = &cfg.Config{
DebugOptions: cfg.DebugOptions{
TournamentOverride: 1,
},
}
@@ -59,8 +59,8 @@ func TestHandleMsgMhfEnumerateRanking_State1(t *testing.T) {
func TestHandleMsgMhfEnumerateRanking_State2(t *testing.T) {
server := createMockServer()
server.erupeConfig = &_config.Config{
DebugOptions: _config.DebugOptions{
server.erupeConfig = &cfg.Config{
DebugOptions: cfg.DebugOptions{
TournamentOverride: 2,
},
}
@@ -84,8 +84,8 @@ func TestHandleMsgMhfEnumerateRanking_State2(t *testing.T) {
func TestHandleMsgMhfEnumerateRanking_State3(t *testing.T) {
server := createMockServer()
server.erupeConfig = &_config.Config{
DebugOptions: _config.DebugOptions{
server.erupeConfig = &cfg.Config{
DebugOptions: cfg.DebugOptions{
TournamentOverride: 3,
},
}

6
server/channelserver/handlers_guild.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/common/byteframe"
"erupe-ce/common/mhfitem"
_config "erupe-ce/config"
cfg "erupe-ce/config"
ps "erupe-ce/common/pascalstring"
"erupe-ce/network/mhfpacket"
@@ -144,10 +144,10 @@ func handleMsgMhfEnumerateGuildMember(s *Session, p mhfpacket.MHFPacket) {
for _, member := range guildMembers {
bf.WriteUint32(member.CharID)
bf.WriteUint16(member.HR)
if s.server.erupeConfig.RealClientMode >= _config.G10 {
if s.server.erupeConfig.RealClientMode >= cfg.G10 {
bf.WriteUint16(member.GR)
}
if s.server.erupeConfig.RealClientMode < _config.ZZ {
if s.server.erupeConfig.RealClientMode < cfg.ZZ {
// Magnet Spike crash workaround
bf.WriteUint16(0)
} else {

6
server/channelserver/handlers_guild_info.go
View File

@@ -7,7 +7,7 @@ import (
"erupe-ce/common/byteframe"
ps "erupe-ce/common/pascalstring"
"erupe-ce/common/stringsupport"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
)
@@ -110,7 +110,7 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint8(guild.PugiOutfit1)
bf.WriteUint8(guild.PugiOutfit2)
bf.WriteUint8(guild.PugiOutfit3)
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
bf.WriteUint8(guild.PugiOutfit1)
bf.WriteUint8(guild.PugiOutfit2)
bf.WriteUint8(guild.PugiOutfit3)
@@ -204,7 +204,7 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(applicant.CharID)
bf.WriteUint32(0)
bf.WriteUint16(applicant.HR)
if s.server.erupeConfig.RealClientMode >= _config.G10 {
if s.server.erupeConfig.RealClientMode >= cfg.G10 {
bf.WriteUint16(applicant.GR)
}
ps.Uint8(bf, applicant.Name, true)

12
server/channelserver/handlers_guild_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"time"
_config "erupe-ce/config"
cfg "erupe-ce/config"
)
// TestGuildCreation tests basic guild creation
@@ -87,31 +87,31 @@ func TestGuildRankCalculation(t *testing.T) {
name string
rankRP uint32
wantRank uint16
config _config.Mode
config cfg.Mode
}{
{
name: "rank_0_minimal_rp",
rankRP: 0,
wantRank: 0,
config: _config.Z2,
config: cfg.Z2,
},
{
name: "rank_1_threshold",
rankRP: 3500,
wantRank: 1,
config: _config.Z2,
config: cfg.Z2,
},
{
name: "rank_5_middle",
rankRP: 16000,
wantRank: 6,
config: _config.Z2,
config: cfg.Z2,
},
{
name: "max_rank",
rankRP: 120001,
wantRank: 17,
config: _config.Z2,
config: cfg.Z2,
},
}

8
server/channelserver/handlers_house.go
View File

@@ -6,7 +6,7 @@ import (
ps "erupe-ce/common/pascalstring"
"erupe-ce/common/stringsupport"
"erupe-ce/common/token"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"go.uber.org/zap"
"io"
@@ -90,7 +90,7 @@ func handleMsgMhfEnumerateHouse(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint8(0)
}
bf.WriteUint16(house.HR)
if s.server.erupeConfig.RealClientMode >= _config.G10 {
if s.server.erupeConfig.RealClientMode >= cfg.G10 {
bf.WriteUint16(house.GR)
}
ps.Uint8(bf, house.Name, true)
@@ -225,7 +225,7 @@ func handleMsgMhfUpdateMyhouseInfo(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfLoadDecoMyset(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfLoadDecoMyset)
defaultData := []byte{0x01, 0x00}
if s.server.erupeConfig.RealClientMode < _config.G10 {
if s.server.erupeConfig.RealClientMode < cfg.G10 {
defaultData = []byte{0x00, 0x00}
}
loadCharacterData(s, pkt.AckHandle, "decomyset", defaultData)
@@ -247,7 +247,7 @@ func handleMsgMhfSaveDecoMyset(s *Session, p mhfpacket.MHFPacket) {
// Version handling
bf := byteframe.NewByteFrame()
var size uint
if s.server.erupeConfig.RealClientMode >= _config.G10 {
if s.server.erupeConfig.RealClientMode >= cfg.G10 {
size = 76
bf.WriteUint8(1)
} else {

8
server/channelserver/handlers_house_test.go
View File

@@ -2,7 +2,7 @@ package channelserver
import (
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/mhfitem"
"erupe-ce/common/token"
"erupe-ce/network/mhfpacket"
@@ -54,7 +54,7 @@ func setupHouseTest(t *testing.T) (*sqlx.DB, *Server, *Session, uint32) {
t.Helper()
db := SetupTestDB(t)
server := createMockServer()
server.erupeConfig.RealClientMode = _config.ZZ
server.erupeConfig.RealClientMode = cfg.ZZ
SetTestDB(server, db)
userID := CreateTestUser(t, db, "house_test_user")
@@ -158,7 +158,7 @@ func TestUpdateWarehouse_BoxIndexTooHigh(t *testing.T) {
func TestEnumerateHouse_Method5_EmptyResult(t *testing.T) {
server := createMockServer()
server.erupeConfig.RealClientMode = _config.ZZ
server.erupeConfig.RealClientMode = cfg.ZZ
session := createMockSession(1, server)
pkt := &mhfpacket.MsgMhfEnumerateHouse{
@@ -759,7 +759,7 @@ func TestWarehouseEquipmentSerialization(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// Serialize
serialized := mhfitem.SerializeWarehouseEquipment(tt.equipment, _config.ZZ)
serialized := mhfitem.SerializeWarehouseEquipment(tt.equipment, cfg.ZZ)
// Basic validation
if serialized == nil {

6
server/channelserver/handlers_items.go
View File

@@ -4,7 +4,7 @@ import (
"erupe-ce/common/byteframe"
"erupe-ce/common/mhfitem"
"erupe-ce/common/mhfmon"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"go.uber.org/zap"
@@ -313,7 +313,7 @@ func handleMsgMhfStampcardStamp(s *Session, p mhfpacket.MHFPacket) {
{300, 5392, 1, 5392, 3},
{999, 5392, 1, 5392, 4},
}
if s.server.erupeConfig.RealClientMode <= _config.Z1 {
if s.server.erupeConfig.RealClientMode <= cfg.Z1 {
for _, reward := range rewards {
if pkt.HR >= reward.HR {
pkt.Item1 = reward.Item1
@@ -326,7 +326,7 @@ func handleMsgMhfStampcardStamp(s *Session, p mhfpacket.MHFPacket) {
bf := byteframe.NewByteFrame()
bf.WriteUint16(pkt.HR)
if s.server.erupeConfig.RealClientMode >= _config.G1 {
if s.server.erupeConfig.RealClientMode >= cfg.G1 {
bf.WriteUint16(pkt.GR)
}
var stamps, rewardTier, rewardUnk uint16

6
server/channelserver/handlers_mercenary.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"erupe-ce/common/byteframe"
"erupe-ce/common/stringsupport"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"erupe-ce/server/channelserver/compression/deltacomp"
"erupe-ce/server/channelserver/compression/nullcomp"
@@ -50,7 +50,7 @@ const (
func handleMsgMhfLoadHunterNavi(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfLoadHunterNavi)
naviLength := hunterNaviSizeG8
if s.server.erupeConfig.RealClientMode <= _config.G7 {
if s.server.erupeConfig.RealClientMode <= cfg.G7 {
naviLength = hunterNaviSizeG7
}
loadCharacterData(s, pkt.AckHandle, "hunternavi", make([]byte, naviLength))
@@ -74,7 +74,7 @@ func handleMsgMhfSaveHunterNavi(s *Session, p mhfpacket.MHFPacket) {
var dataSize int
if pkt.IsDataDiff {
naviLength := hunterNaviSizeG8
if s.server.erupeConfig.RealClientMode <= _config.G7 {
if s.server.erupeConfig.RealClientMode <= cfg.G7 {
naviLength = hunterNaviSizeG7
}
// Load existing save

10
server/channelserver/handlers_misc.go
View File

@@ -2,7 +2,7 @@ package channelserver
import (
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"math/bits"
"time"
@@ -73,7 +73,7 @@ func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
bf.WriteInt32(s.server.erupeConfig.EarthStatus)
bf.WriteInt32(s.server.erupeConfig.EarthID)
for i, m := range s.server.erupeConfig.EarthMonsters {
if s.server.erupeConfig.RealClientMode <= _config.G9 {
if s.server.erupeConfig.RealClientMode <= cfg.G9 {
if i == 3 {
break
}
@@ -157,12 +157,12 @@ const (
skinHistSizeZ1 = 1280 // Z1 and older
)
func equipSkinHistSize(mode _config.Mode) int {
func equipSkinHistSize(mode cfg.Mode) int {
size := skinHistSizeZZ
if mode <= _config.Z2 {
if mode <= cfg.Z2 {
size = skinHistSizeZ2
}
if mode <= _config.Z1 {
if mode <= cfg.Z1 {
size = skinHistSizeZ1
}
return size

46
server/channelserver/handlers_quest.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/common/byteframe"
"erupe-ce/common/decryption"
ps "erupe-ce/common/pascalstring"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"fmt"
"io"
@@ -49,7 +49,7 @@ func equal(a, b []byte) bool {
}
// BackportQuest converts a quest binary to an older format.
func BackportQuest(data []byte, mode _config.Mode) []byte {
func BackportQuest(data []byte, mode cfg.Mode) []byte {
wp := binary.LittleEndian.Uint32(data[0:4]) + questRewardTableBase
rp := wp + 4
for i := uint32(0); i < 6; i++ {
@@ -61,16 +61,16 @@ func BackportQuest(data []byte, mode _config.Mode) []byte {
}
fillLength := questBackportFillZZ
if mode <= _config.S6 {
if mode <= cfg.S6 {
fillLength = questBackportFillS6
} else if mode <= _config.F5 {
} else if mode <= cfg.F5 {
fillLength = questBackportFillF5
} else if mode <= _config.G101 {
} else if mode <= cfg.G101 {
fillLength = questBackportFillG101
}
copy(data[wp:wp+fillLength], data[rp:rp+fillLength])
if mode <= _config.G91 {
if mode <= cfg.G91 {
patterns := [][]byte{
{0x0A, 0x00, 0x01, 0x33, 0xD7, 0x00}, // 10% Armor Sphere -> Stone
{0x06, 0x00, 0x02, 0x33, 0xD8, 0x00}, // 6% Armor Sphere+ -> Iron Ore
@@ -87,7 +87,7 @@ func BackportQuest(data []byte, mode _config.Mode) []byte {
}
}
if mode <= _config.S6 {
if mode <= cfg.S6 {
binary.LittleEndian.PutUint32(data[16:20], binary.LittleEndian.Uint32(data[8:12]))
}
return data
@@ -133,7 +133,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
doAckBufFail(s, pkt.AckHandle, nil)
return
}
if s.server.erupeConfig.RealClientMode <= _config.Z1 && s.server.erupeConfig.DebugOptions.AutoQuestBackport {
if s.server.erupeConfig.RealClientMode <= cfg.Z1 && s.server.erupeConfig.DebugOptions.AutoQuestBackport {
data = BackportQuest(decryption.UnpackSimple(data), s.server.erupeConfig.RealClientMode)
}
doAckBufSucceed(s, pkt.AckHandle, data)
@@ -216,7 +216,7 @@ func loadQuestFile(s *Session, questId int) []byte {
}
decrypted := decryption.UnpackSimple(file)
if s.server.erupeConfig.RealClientMode <= _config.Z1 && s.server.erupeConfig.DebugOptions.AutoQuestBackport {
if s.server.erupeConfig.RealClientMode <= cfg.Z1 && s.server.erupeConfig.DebugOptions.AutoQuestBackport {
decrypted = BackportQuest(decrypted, s.server.erupeConfig.RealClientMode)
}
fileBytes := byteframe.NewByteFrameFromBytes(decrypted)
@@ -224,13 +224,13 @@ func loadQuestFile(s *Session, questId int) []byte {
_, _ = fileBytes.Seek(int64(fileBytes.ReadUint32()), 0)
bodyLength := questBodyLenZZ
if s.server.erupeConfig.RealClientMode <= _config.S6 {
if s.server.erupeConfig.RealClientMode <= cfg.S6 {
bodyLength = questBodyLenS6
} else if s.server.erupeConfig.RealClientMode <= _config.F5 {
} else if s.server.erupeConfig.RealClientMode <= cfg.F5 {
bodyLength = questBodyLenF5
} else if s.server.erupeConfig.RealClientMode <= _config.G101 {
} else if s.server.erupeConfig.RealClientMode <= cfg.G101 {
bodyLength = questBodyLenG101
} else if s.server.erupeConfig.RealClientMode <= _config.Z1 {
} else if s.server.erupeConfig.RealClientMode <= cfg.Z1 {
bodyLength = questBodyLenZ1
}
@@ -304,7 +304,7 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) {
bf.WriteBool(true)
}
bf.WriteUint16(0) // Unk
if s.server.erupeConfig.RealClientMode >= _config.G2 {
if s.server.erupeConfig.RealClientMode >= cfg.G2 {
bf.WriteUint32(mark)
}
bf.WriteUint16(0) // Unk
@@ -602,23 +602,23 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
tuneValues = temp
tuneLimit := tuneLimitZZ
if s.server.erupeConfig.RealClientMode <= _config.G1 {
if s.server.erupeConfig.RealClientMode <= cfg.G1 {
tuneLimit = tuneLimitG1
} else if s.server.erupeConfig.RealClientMode <= _config.G3 {
} else if s.server.erupeConfig.RealClientMode <= cfg.G3 {
tuneLimit = tuneLimitG3
} else if s.server.erupeConfig.RealClientMode <= _config.GG {
} else if s.server.erupeConfig.RealClientMode <= cfg.GG {
tuneLimit = tuneLimitGG
} else if s.server.erupeConfig.RealClientMode <= _config.G61 {
} else if s.server.erupeConfig.RealClientMode <= cfg.G61 {
tuneLimit = tuneLimitG61
} else if s.server.erupeConfig.RealClientMode <= _config.G7 {
} else if s.server.erupeConfig.RealClientMode <= cfg.G7 {
tuneLimit = tuneLimitG7
} else if s.server.erupeConfig.RealClientMode <= _config.G81 {
} else if s.server.erupeConfig.RealClientMode <= cfg.G81 {
tuneLimit = tuneLimitG81
} else if s.server.erupeConfig.RealClientMode <= _config.G91 {
} else if s.server.erupeConfig.RealClientMode <= cfg.G91 {
tuneLimit = tuneLimitG91
} else if s.server.erupeConfig.RealClientMode <= _config.G101 {
} else if s.server.erupeConfig.RealClientMode <= cfg.G101 {
tuneLimit = tuneLimitG101
} else if s.server.erupeConfig.RealClientMode <= _config.Z2 {
} else if s.server.erupeConfig.RealClientMode <= cfg.Z2 {
tuneLimit = tuneLimitZ2
}
if len(tuneValues) > tuneLimit {

12
server/channelserver/handlers_quest_backport_test.go
View File

@@ -4,7 +4,7 @@ import (
"encoding/binary"
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
)
func TestBackportQuest_Basic(t *testing.T) {
@@ -20,7 +20,7 @@ func TestBackportQuest_Basic(t *testing.T) {
data[i] = byte(i & 0xFF)
}
result := BackportQuest(data, _config.ZZ)
result := BackportQuest(data, cfg.ZZ)
if result == nil {
t.Fatal("BackportQuest returned nil")
}
@@ -43,7 +43,7 @@ func TestBackportQuest_S6Mode(t *testing.T) {
// Set some values at data[8:12] so we can check they get copied to data[16:20]
binary.LittleEndian.PutUint32(data[8:12], 0xDEADBEEF)
result := BackportQuest(data, _config.S6)
result := BackportQuest(data, cfg.S6)
if result == nil {
t.Fatal("BackportQuest returned nil")
}
@@ -67,7 +67,7 @@ func TestBackportQuest_G91Mode_PatternReplacement(t *testing.T) {
data[offset+2] = 0x01
data[offset+3] = 0x33
result := BackportQuest(data, _config.G91)
result := BackportQuest(data, cfg.G91)
// After BackportQuest, the pattern's last 2 bytes should be replaced
if result[offset+2] != 0xD7 || result[offset+3] != 0x00 {
@@ -80,7 +80,7 @@ func TestBackportQuest_F5Mode(t *testing.T) {
data := make([]byte, 512)
binary.LittleEndian.PutUint32(data[0:4], 0)
result := BackportQuest(data, _config.F5)
result := BackportQuest(data, cfg.F5)
if result == nil {
t.Fatal("BackportQuest returned nil")
}
@@ -90,7 +90,7 @@ func TestBackportQuest_G101Mode(t *testing.T) {
data := make([]byte, 512)
binary.LittleEndian.PutUint32(data[0:4], 0)
result := BackportQuest(data, _config.G101)
result := BackportQuest(data, cfg.G101)
if result == nil {
t.Fatal("BackportQuest returned nil")
}

6
server/channelserver/handlers_quest_test.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/binary"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"os"
"path/filepath"
@@ -62,7 +62,7 @@ func TestBackportQuestBasic(t *testing.T) {
}
}()
result := BackportQuest(data, _config.ZZ)
result := BackportQuest(data, cfg.ZZ)
if result != nil && !tc.verify(result) {
t.Errorf("BackportQuest verification failed for result: %d bytes", len(result))
}
@@ -686,7 +686,7 @@ func BenchmarkBackportQuest(b *testing.B) {
binary.LittleEndian.PutUint32(data[0:4], 100)
for i := 0; i < b.N; i++ {
_ = BackportQuest(data, _config.ZZ)
_ = BackportQuest(data, cfg.ZZ)
}
}

6
server/channelserver/handlers_savedata_integration_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"time"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/mhfitem"
"erupe-ce/network/mhfpacket"
"erupe-ce/server/channelserver/compression/nullcomp"
@@ -215,7 +215,7 @@ func TestSaveLoad_Warehouse(t *testing.T) {
}
// Serialize and save to warehouse
serializedEquip := mhfitem.SerializeWarehouseEquipment(equipment, _config.ZZ)
serializedEquip := mhfitem.SerializeWarehouseEquipment(equipment, cfg.ZZ)
// Initialize warehouse row then update
_, _ = db.Exec("INSERT INTO warehouse (character_id) VALUES ($1) ON CONFLICT DO NOTHING", charID)
@@ -426,7 +426,7 @@ func TestSaveLoad_CraftedEquipment(t *testing.T) {
}
equipment := []mhfitem.MHFEquipment{equip}
serialized := mhfitem.SerializeWarehouseEquipment(equipment, _config.ZZ)
serialized := mhfitem.SerializeWarehouseEquipment(equipment, cfg.ZZ)
// Save to warehouse
_, _ = db.Exec("INSERT INTO warehouse (character_id) VALUES ($1) ON CONFLICT DO NOTHING", charID)

26
server/channelserver/handlers_session.go
View File

@@ -8,7 +8,7 @@ import (
"erupe-ce/common/mhfmon"
ps "erupe-ce/common/pascalstring"
"erupe-ce/common/stringsupport"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"fmt"
"io"
@@ -422,7 +422,7 @@ const (
func handleMsgSysRecordLog(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgSysRecordLog)
if s.server.erupeConfig.RealClientMode == _config.ZZ {
if s.server.erupeConfig.RealClientMode == cfg.ZZ {
bf := byteframe.NewByteFrameFromBytes(pkt.Data)
_, _ = bf.Seek(killLogHeaderSize, 0)
var val uint8
@@ -580,7 +580,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
resp.WriteUint16(uint16(len(r.userBin3)))
// TODO: This case might be <=G2
if s.server.erupeConfig.RealClientMode <= _config.G1 {
if s.server.erupeConfig.RealClientMode <= cfg.G1 {
resp.WriteBytes(make([]byte, 8))
} else {
resp.WriteBytes(make([]byte, 40))
@@ -610,7 +610,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
case 0:
values := bf.ReadUint8()
for i := uint8(0); i < values; i++ {
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
findPartyParams.RankRestriction = bf.ReadInt16()
} else {
findPartyParams.RankRestriction = int16(bf.ReadInt8())
@@ -619,7 +619,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
case 1:
values := bf.ReadUint8()
for i := uint8(0); i < values; i++ {
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
findPartyParams.Targets = append(findPartyParams.Targets, bf.ReadInt16())
} else {
findPartyParams.Targets = append(findPartyParams.Targets, int16(bf.ReadInt8()))
@@ -629,7 +629,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
values := bf.ReadUint8()
for i := uint8(0); i < values; i++ {
var value int16
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
value = bf.ReadInt16()
} else {
value = int16(bf.ReadInt8())
@@ -650,7 +650,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
case 3: // Unknown
values := bf.ReadUint8()
for i := uint8(0); i < values; i++ {
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
findPartyParams.Unk0 = append(findPartyParams.Unk0, bf.ReadInt16())
} else {
findPartyParams.Unk0 = append(findPartyParams.Unk0, int16(bf.ReadInt8()))
@@ -659,7 +659,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
case 4: // Looking for n or already have n
values := bf.ReadUint8()
for i := uint8(0); i < values; i++ {
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
findPartyParams.Unk1 = append(findPartyParams.Unk1, bf.ReadInt16())
} else {
findPartyParams.Unk1 = append(findPartyParams.Unk1, int16(bf.ReadInt8()))
@@ -668,7 +668,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
case 5:
values := bf.ReadUint8()
for i := uint8(0); i < values; i++ {
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
findPartyParams.QuestID = append(findPartyParams.QuestID, bf.ReadInt16())
} else {
findPartyParams.QuestID = append(findPartyParams.QuestID, int16(bf.ReadInt8()))
@@ -705,15 +705,15 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
_, _ = sb3.Seek(4, 0)
stageDataParams := 7
if s.server.erupeConfig.RealClientMode <= _config.G10 {
if s.server.erupeConfig.RealClientMode <= cfg.G10 {
stageDataParams = 4
} else if s.server.erupeConfig.RealClientMode <= _config.Z1 {
} else if s.server.erupeConfig.RealClientMode <= cfg.Z1 {
stageDataParams = 6
}
var stageData []int16
for i := 0; i < stageDataParams; i++ {
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
stageData = append(stageData, sb3.ReadInt16())
} else {
stageData = append(stageData, int16(sb3.ReadInt8()))
@@ -790,7 +790,7 @@ func handleMsgMhfTransitMessage(s *Session, p mhfpacket.MHFPacket) {
resp.WriteUint8(uint8(len(sr.rawBinData1)))
for i := range sr.stageData {
if s.server.erupeConfig.RealClientMode >= _config.Z1 {
if s.server.erupeConfig.RealClientMode >= cfg.Z1 {
resp.WriteInt16(sr.stageData[i])
} else {
resp.WriteInt8(int8(sr.stageData[i]))

22
server/channelserver/handlers_shop.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"erupe-ce/common/byteframe"
ps "erupe-ce/common/pascalstring"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/mhfpacket"
"go.uber.org/zap"
@@ -25,11 +25,11 @@ type ShopItem struct {
RoadFatalis uint16 `db:"road_fatalis"`
}
func writeShopItems(bf *byteframe.ByteFrame, items []ShopItem, mode _config.Mode) {
func writeShopItems(bf *byteframe.ByteFrame, items []ShopItem, mode cfg.Mode) {
bf.WriteUint16(uint16(len(items)))
bf.WriteUint16(uint16(len(items)))
for _, item := range items {
if mode >= _config.Z2 {
if mode >= cfg.Z2 {
bf.WriteUint32(item.ID)
}
bf.WriteUint32(item.ItemID)
@@ -37,19 +37,19 @@ func writeShopItems(bf *byteframe.ByteFrame, items []ShopItem, mode _config.Mode
bf.WriteUint16(item.Quantity)
bf.WriteUint16(item.MinHR)
bf.WriteUint16(item.MinSR)
if mode >= _config.Z2 {
if mode >= cfg.Z2 {
bf.WriteUint16(item.MinGR)
}
bf.WriteUint8(0) // Unk
bf.WriteUint8(item.StoreLevel)
if mode >= _config.Z2 {
if mode >= cfg.Z2 {
bf.WriteUint16(item.MaxQuantity)
bf.WriteUint16(item.UsedQuantity)
}
if mode == _config.Z1 {
if mode == cfg.Z1 {
bf.WriteUint8(uint8(item.RoadFloors))
bf.WriteUint8(uint8(item.RoadFatalis))
} else if mode >= _config.Z2 {
} else if mode >= cfg.Z2 {
bf.WriteUint16(item.RoadFloors)
bf.WriteUint16(item.RoadFatalis)
}
@@ -87,7 +87,7 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) {
switch pkt.ShopType {
case 1: // Running gachas
// Fundamentally, gacha works completely differently, just hide it for now.
if s.server.erupeConfig.RealClientMode <= _config.G7 {
if s.server.erupeConfig.RealClientMode <= cfg.G7 {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
return
}
@@ -112,7 +112,7 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) {
ps.Uint8(bf, g.Name, true)
ps.Uint8(bf, g.URLBanner, false)
ps.Uint8(bf, g.URLFeature, false)
if s.server.erupeConfig.RealClientMode >= _config.G10 {
if s.server.erupeConfig.RealClientMode >= cfg.G10 {
bf.WriteBool(g.Wide)
ps.Uint8(bf, g.URLThumbnail, false)
}
@@ -122,7 +122,7 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(0)
}
bf.WriteUint8(g.GachaType)
if s.server.erupeConfig.RealClientMode >= _config.G10 {
if s.server.erupeConfig.RealClientMode >= cfg.G10 {
bf.WriteBool(g.Hidden)
}
}
@@ -286,7 +286,7 @@ func handleMsgMhfGetFpointExchangeList(s *Session, p mhfpacket.MHFPacket) {
exchanges = append(exchanges, exchange)
}
}
if s.server.erupeConfig.RealClientMode <= _config.Z2 {
if s.server.erupeConfig.RealClientMode <= cfg.Z2 {
bf.WriteUint8(uint8(len(exchanges)))
bf.WriteUint8(uint8(buyables))
} else {

8
server/channelserver/handlers_shop_gacha_test.go
View File

@@ -4,14 +4,14 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
)
func TestWriteShopItems_Empty(t *testing.T) {
bf := byteframe.NewByteFrame()
items := []ShopItem{}
writeShopItems(bf, items, _config.ZZ)
writeShopItems(bf, items, cfg.ZZ)
result := byteframe.NewByteFrameFromBytes(bf.Data())
count1 := result.ReadUint16()
@@ -44,7 +44,7 @@ func TestWriteShopItems_SingleItem(t *testing.T) {
},
}
writeShopItems(bf, items, _config.ZZ)
writeShopItems(bf, items, cfg.ZZ)
result := byteframe.NewByteFrameFromBytes(bf.Data())
count1 := result.ReadUint16()
@@ -118,7 +118,7 @@ func TestWriteShopItems_MultipleItems(t *testing.T) {
{ID: 3, ItemID: 300, Cost: 2000, Quantity: 1},
}
writeShopItems(bf, items, _config.ZZ)
writeShopItems(bf, items, cfg.ZZ)
result := byteframe.NewByteFrameFromBytes(bf.Data())
count1 := result.ReadUint16()

4
server/channelserver/handlers_tower.go
View File

@@ -1,7 +1,7 @@
package channelserver
import (
_config "erupe-ce/config"
cfg "erupe-ce/config"
"math"
"strings"
"time"
@@ -76,7 +76,7 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) {
towerInfo.Level[1].Floors = td.Block2
}
if s.server.erupeConfig.RealClientMode <= _config.G7 {
if s.server.erupeConfig.RealClientMode <= cfg.G7 {
towerInfo.Level = towerInfo.Level[:1]
}

36
server/channelserver/integration_test.go
View File

@@ -2,7 +2,7 @@ package channelserver
import (
"encoding/binary"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"sync"
"testing"
@@ -45,8 +45,8 @@ func IntegrationTest_PacketQueueFlow(t *testing.T) {
s := &Session{
sendPackets: make(chan packet, 100),
server: &Server{
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
},
@@ -119,8 +119,8 @@ func IntegrationTest_ConcurrentQueueing(t *testing.T) {
s := &Session{
sendPackets: make(chan packet, 200),
server: &Server{
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
},
@@ -217,8 +217,8 @@ func IntegrationTest_AckPacketFlow(t *testing.T) {
s := &Session{
sendPackets: make(chan packet, 100),
server: &Server{
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
},
@@ -282,8 +282,8 @@ func IntegrationTest_MixedPacketTypes(t *testing.T) {
s := &Session{
sendPackets: make(chan packet, 100),
server: &Server{
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
},
@@ -338,8 +338,8 @@ func IntegrationTest_PacketOrderPreservation(t *testing.T) {
s := &Session{
sendPackets: make(chan packet, 100),
server: &Server{
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
},
@@ -395,8 +395,8 @@ func IntegrationTest_QueueBackpressure(t *testing.T) {
s := &Session{
sendPackets: make(chan packet, 5),
server: &Server{
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
LoopDelay: 50, // Slower processing to create backpressure
@@ -599,22 +599,22 @@ func IntegrationTest_ClientVersionCompatibility(t *testing.T) {
tests := []struct {
name string
clientVersion _config.Mode
clientVersion cfg.Mode
shouldSucceed bool
}{
{
name: "version_z2",
clientVersion: _config.Z2,
clientVersion: cfg.Z2,
shouldSucceed: true,
},
{
name: "version_s6",
clientVersion: _config.S6,
clientVersion: cfg.S6,
shouldSucceed: true,
},
{
name: "version_g32",
clientVersion: _config.G32,
clientVersion: cfg.G32,
shouldSucceed: true,
},
}
@@ -625,7 +625,7 @@ func IntegrationTest_ClientVersionCompatibility(t *testing.T) {
s := &Session{
sendPackets: make(chan packet, 100),
server: &Server{
erupeConfig: &_config.Config{
erupeConfig: &cfg.Config{
RealClientMode: tt.clientVersion,
},
},

32
server/channelserver/model_character.go
View File

@@ -5,7 +5,7 @@ import (
"erupe-ce/common/bfutil"
"erupe-ce/common/stringsupport"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/server/channelserver/compression/nullcomp"
)
@@ -35,7 +35,7 @@ type CharacterSaveData struct {
CharID uint32
Name string
IsNewCharacter bool
Mode _config.Mode
Mode cfg.Mode
Pointers map[SavePointer]int
Gender bool
@@ -57,10 +57,10 @@ type CharacterSaveData struct {
decompSave []byte
}
func getPointers(mode _config.Mode) map[SavePointer]int {
func getPointers(mode cfg.Mode) map[SavePointer]int {
pointers := map[SavePointer]int{pGender: 81, lBookshelfData: 5576}
switch mode {
case _config.ZZ:
case cfg.ZZ:
pointers[pPlaytime] = 128356
pointers[pWeaponID] = 128522
pointers[pWeaponType] = 128789
@@ -74,9 +74,9 @@ func getPointers(mode _config.Mode) map[SavePointer]int {
pointers[pGardenData] = 142424
pointers[pRP] = 142614
pointers[pKQF] = 146720
case _config.Z2, _config.Z1, _config.G101, _config.G10, _config.G91, _config.G9, _config.G81, _config.G8,
_config.G7, _config.G61, _config.G6, _config.G52, _config.G51, _config.G5, _config.GG, _config.G32, _config.G31,
_config.G3, _config.G2, _config.G1:
case cfg.Z2, cfg.Z1, cfg.G101, cfg.G10, cfg.G91, cfg.G9, cfg.G81, cfg.G8,
cfg.G7, cfg.G61, cfg.G6, cfg.G52, cfg.G51, cfg.G5, cfg.GG, cfg.G32, cfg.G31,
cfg.G3, cfg.G2, cfg.G1:
pointers[pPlaytime] = 92356
pointers[pWeaponID] = 92522
pointers[pWeaponType] = 92789
@@ -90,7 +90,7 @@ func getPointers(mode _config.Mode) map[SavePointer]int {
pointers[pGardenData] = 106424
pointers[pRP] = 106614
pointers[pKQF] = 110720
case _config.F5, _config.F4:
case cfg.F5, cfg.F4:
pointers[pPlaytime] = 60356
pointers[pWeaponID] = 60522
pointers[pWeaponType] = 60789
@@ -102,7 +102,7 @@ func getPointers(mode _config.Mode) map[SavePointer]int {
pointers[pGalleryData] = 72064
pointers[pGardenData] = 74424
pointers[pRP] = 74614
case _config.S6:
case cfg.S6:
pointers[pPlaytime] = 12356
pointers[pWeaponID] = 12522
pointers[pWeaponType] = 12789
@@ -115,9 +115,9 @@ func getPointers(mode _config.Mode) map[SavePointer]int {
pointers[pGardenData] = 26424
pointers[pRP] = 26614
}
if mode == _config.G5 {
if mode == cfg.G5 {
pointers[lBookshelfData] = 5548
} else if mode <= _config.GG {
} else if mode <= cfg.GG {
pointers[lBookshelfData] = 4520
}
return pointers
@@ -145,10 +145,10 @@ func (save *CharacterSaveData) Decompress() error {
func (save *CharacterSaveData) updateSaveDataWithStruct() {
rpBytes := make([]byte, 2)
binary.LittleEndian.PutUint16(rpBytes, save.RP)
if save.Mode >= _config.F4 {
if save.Mode >= cfg.F4 {
copy(save.decompSave[save.Pointers[pRP]:save.Pointers[pRP]+saveFieldRP], rpBytes)
}
if save.Mode >= _config.G10 {
if save.Mode >= cfg.G10 {
copy(save.decompSave[save.Pointers[pKQF]:save.Pointers[pKQF]+saveFieldKQF], save.KQF)
}
}
@@ -179,7 +179,7 @@ func (save *CharacterSaveData) updateStructWithSaveData() {
save.Gender = false
}
if !save.IsNewCharacter {
if save.Mode >= _config.S6 {
if save.Mode >= cfg.S6 {
save.RP = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pRP] : save.Pointers[pRP]+saveFieldRP])
save.HouseTier = save.decompSave[save.Pointers[pHouseTier] : save.Pointers[pHouseTier]+saveFieldHouseTier]
save.HouseData = save.decompSave[save.Pointers[pHouseData] : save.Pointers[pHouseData]+saveFieldHouseData]
@@ -191,12 +191,12 @@ func (save *CharacterSaveData) updateStructWithSaveData() {
save.WeaponType = save.decompSave[save.Pointers[pWeaponType]]
save.WeaponID = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pWeaponID] : save.Pointers[pWeaponID]+saveFieldWeaponID])
save.HR = binary.LittleEndian.Uint16(save.decompSave[save.Pointers[pHR] : save.Pointers[pHR]+saveFieldHR])
if save.Mode >= _config.G1 {
if save.Mode >= cfg.G1 {
if save.HR == uint16(999) {
save.GR = grpToGR(int(binary.LittleEndian.Uint32(save.decompSave[save.Pointers[pGRP] : save.Pointers[pGRP]+saveFieldGRP])))
}
}
if save.Mode >= _config.G10 {
if save.Mode >= cfg.G10 {
save.KQF = save.decompSave[save.Pointers[pKQF] : save.Pointers[pKQF]+saveFieldKQF]
}
}

8
server/channelserver/session_lifecycle_integration_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
"time"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/mhfitem"
"erupe-ce/network/clientctx"
"erupe-ce/network/mhfpacket"
@@ -176,7 +176,7 @@ func TestSessionLifecycle_WarehouseDataPersistence(t *testing.T) {
createTestEquipmentItem(102, 3),
}
serializedEquip := mhfitem.SerializeWarehouseEquipment(equipment, _config.ZZ)
serializedEquip := mhfitem.SerializeWarehouseEquipment(equipment, cfg.ZZ)
// Save to warehouse directly (simulating a save handler)
_, _ = db.Exec("INSERT INTO warehouse (character_id) VALUES ($1) ON CONFLICT DO NOTHING", charID)
@@ -586,8 +586,8 @@ func createTestServerWithDB(t *testing.T, db *sqlx.DB) *Server {
userBinaryParts: make(map[userBinaryPartID][]byte),
minidataParts: make(map[uint32][]byte),
semaphore: make(map[string]*Semaphore),
erupeConfig: &_config.Config{
RealClientMode: _config.ZZ,
erupeConfig: &cfg.Config{
RealClientMode: cfg.ZZ,
},
isShuttingDown: false,
done: make(chan struct{}),

6
server/channelserver/sys_channel_server.go
View File

@@ -8,7 +8,7 @@ import (
"time"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/binpacket"
"erupe-ce/network/mhfpacket"
@@ -24,7 +24,7 @@ type Config struct {
Logger *zap.Logger
DB *sqlx.DB
DiscordBot *discordbot.DiscordBot
ErupeConfig *_config.Config
ErupeConfig *cfg.Config
Name string
Enable bool
}
@@ -62,7 +62,7 @@ type Server struct {
achievementRepo *AchievementRepository
shopRepo *ShopRepository
cafeRepo *CafeRepository
erupeConfig *_config.Config
erupeConfig *cfg.Config
acceptConns chan net.Conn
deleteConns chan net.Conn
sessions map[net.Conn]*Session

10
server/channelserver/sys_channel_server_test.go
View File

@@ -7,7 +7,7 @@ import (
"testing"
"time"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
"erupe-ce/network/mhfpacket"
@@ -60,8 +60,8 @@ func createTestServer() *Server {
semaphore: make(map[string]*Semaphore),
questCacheData: make(map[int][]byte),
questCacheTime: make(map[int]time.Time),
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
LogInboundMessages: false,
},
@@ -98,8 +98,8 @@ func TestNewServer(t *testing.T) {
config := &Config{
ID: 1,
Logger: logger,
ErupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{},
ErupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{},
},
Name: "test-server",
}

12
server/channelserver/sys_language_test.go
View File

@@ -3,12 +3,12 @@ package channelserver
import (
"testing"
_config "erupe-ce/config"
cfg "erupe-ce/config"
)
func TestGetLangStrings_English(t *testing.T) {
server := &Server{
erupeConfig: &_config.Config{
erupeConfig: &cfg.Config{
Language: "en",
},
}
@@ -39,7 +39,7 @@ func TestGetLangStrings_English(t *testing.T) {
func TestGetLangStrings_Japanese(t *testing.T) {
server := &Server{
erupeConfig: &_config.Config{
erupeConfig: &cfg.Config{
Language: "jp",
},
}
@@ -52,7 +52,7 @@ func TestGetLangStrings_Japanese(t *testing.T) {
// Verify Japanese strings are different from English
enServer := &Server{
erupeConfig: &_config.Config{
erupeConfig: &cfg.Config{
Language: "en",
},
}
@@ -65,7 +65,7 @@ func TestGetLangStrings_Japanese(t *testing.T) {
func TestGetLangStrings_DefaultToEnglish(t *testing.T) {
server := &Server{
erupeConfig: &_config.Config{
erupeConfig: &cfg.Config{
Language: "unknown_language",
},
}
@@ -80,7 +80,7 @@ func TestGetLangStrings_DefaultToEnglish(t *testing.T) {
func TestGetLangStrings_EmptyLanguage(t *testing.T) {
server := &Server{
erupeConfig: &_config.Config{
erupeConfig: &cfg.Config{
Language: "",
},
}

6
server/channelserver/sys_session_test.go
View File

@@ -5,7 +5,7 @@ import (
"encoding/binary"
"io"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"sync"
"testing"
@@ -60,8 +60,8 @@ func createTestSession(mock network.Conn) *Session {
sendPackets: make(chan packet, 20),
cryptConn: mock,
server: &Server{
erupeConfig: &_config.Config{
DebugOptions: _config.DebugOptions{
erupeConfig: &cfg.Config{
DebugOptions: cfg.DebugOptions{
LogOutboundMessages: false,
},
},

4
server/channelserver/test_helpers_test.go
View File

@@ -4,7 +4,7 @@ import (
"net"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
@@ -39,7 +39,7 @@ func createMockServer() *Server {
logger, _ := zap.NewDevelopment()
s := &Server{
logger: logger,
erupeConfig: &_config.Config{},
erupeConfig: &cfg.Config{},
stages: make(map[string]*Stage),
sessions: make(map[net.Conn]*Session),
handlerTable: buildHandlerTable(),