diff --git a/config.json b/config.json index ecb029225..f844b7e4a 100644 --- a/config.json +++ b/config.json @@ -3,7 +3,6 @@ "BinPath": "bin", "Language": "en", "DisableSoftCrash": false, - "FeaturedWeapons": 1, "HideLoginNotice": true, "LoginNotice": "
Welcome to Erupe SU9.1!
Erupe is experimental software, we are not liable for any
issues caused by installing the software!

■Report bugs on Discord!

■Test everything!

■Don't talk to softlocking NPCs!

■Fork the code on GitHub!

Thank you to all of the contributors,

this wouldn't exist without you.", "PatchServerManifest": "", @@ -32,6 +31,7 @@ } }, "GameplayOptions": { + "FeaturedWeapons": 1, "DisableLoginBoost": false, "GuildMealDuration": 60 }, diff --git a/config/config.go b/config/config.go index e1ca59276..0fd6300d5 100644 --- a/config/config.go +++ b/config/config.go @@ -16,7 +16,6 @@ type Config struct { BinPath string `mapstructure:"BinPath"` Language string DisableSoftCrash bool // Disables the 'Press Return to exit' dialog allowing scripts to reboot the server automatically - FeaturedWeapons int // Number of Active Feature weapons to generate daily HideLoginNotice bool // Hide the Erupe notice on login LoginNotice string // MHFML string of the login notice displayed PatchServerManifest string // Manifest patch server override @@ -63,6 +62,7 @@ type SaveDumpOptions struct { // GameplayOptions has various gameplay modifiers type GameplayOptions struct { + FeaturedWeapons int // Number of Active Feature weapons to generate daily DisableLoginBoost bool // Disables the Login Boost system GuildMealDuration int // The number of minutes a Guild Meal can be activated for after cooking } diff --git a/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go index da2ad6d44..1c8d3f319 100644 --- a/server/channelserver/handlers_event.go +++ b/server/channelserver/handlers_event.go @@ -71,7 +71,7 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) { var temp activeFeature err := s.server.db.QueryRowx(`SELECT start_time, featured FROM feature_weapon WHERE start_time=$1`, t).StructScan(&temp) if err != nil || temp.StartTime.IsZero() { - temp = generateFeatureWeapons(s.server.erupeConfig.FeaturedWeapons) + temp = generateFeatureWeapons(s.server.erupeConfig.GameplayOptions.FeaturedWeapons) temp.StartTime = t s.server.db.Exec(`INSERT INTO feature_weapon VALUES ($1, $2)`, temp.StartTime, temp.ActiveFeatures) }