mirror of
https://github.com/Sanae6/SmoOnlineServer.git
synced 2024-11-24 20:25:18 +00:00
bec6dde076
By not detecting new saves correctly before, players were sent all moons while still being in cap kingdom. Having those moons made the game crash if the cutscenes from cap to cascade were skipped. Changes: - Rename: `speedrun => `disableShineSync`. - Correctly detect new saves by scenario 1 instead of 0. - Let all stages that are not cap in scenario 1 enable shine sync again (e.g. for switching back to an older save). - Only disable shine sync once and not on every stage change (e.g. when entering cap overworld again and again). - Disable shine bag clearing by default, option to enable it again via `Shines/ClearOnNewSaves` (for speedruns). - Persist shines after clearing (otherwise a server crash/restart might load old moons from a previous run and sync them). - Clear only once per player till reaching cascade (otherwise collected moons might be cleared mid-run). - Reduce delay from 15s to 2s (even w/o a delay I couldn't reproduce a crash, but keeping it feels safer). - Only enable shine sync again after the delay, the delay was circumvented before by other tasks triggering shine sync earlier.
92 lines
3.3 KiB
C#
92 lines
3.3 KiB
C#
using System.Net;
|
|
using Newtonsoft.Json;
|
|
using Newtonsoft.Json.Converters;
|
|
using Newtonsoft.Json.Serialization;
|
|
using Shared;
|
|
|
|
namespace Server;
|
|
|
|
public class Settings {
|
|
public static Settings Instance = new Settings();
|
|
private static readonly Logger Logger = new Logger("Settings");
|
|
public static Action? LoadHandler;
|
|
|
|
static Settings() {
|
|
LoadSettings();
|
|
}
|
|
|
|
public static void LoadSettings() {
|
|
if (File.Exists("settings.json")) {
|
|
string text = File.ReadAllText("settings.json");
|
|
try {
|
|
Instance = JsonConvert.DeserializeObject<Settings>(text, new StringEnumConverter(new CamelCaseNamingStrategy())) ?? Instance;
|
|
Logger.Info("Loaded settings from settings.json");
|
|
}
|
|
catch (Exception e) {
|
|
Logger.Warn($"Failed to load settings.json: {e}");
|
|
}
|
|
}
|
|
SaveSettings();
|
|
LoadHandler?.Invoke();
|
|
}
|
|
|
|
public static void SaveSettings(bool silent = false) {
|
|
try {
|
|
File.WriteAllText("settings.json", JsonConvert.SerializeObject(Instance, Formatting.Indented, new StringEnumConverter(new CamelCaseNamingStrategy())));
|
|
if (!silent) { Logger.Info("Saved settings to settings.json"); }
|
|
}
|
|
catch (Exception e) {
|
|
Logger.Error($"Failed to save settings.json {e}");
|
|
}
|
|
}
|
|
|
|
public ServerTable Server { get; set; } = new ServerTable();
|
|
public FlipTable Flip { get; set; } = new FlipTable();
|
|
public ScenarioTable Scenario { get; set; } = new ScenarioTable();
|
|
public BanListTable BanList { get; set; } = new BanListTable();
|
|
public DiscordTable Discord { get; set; } = new DiscordTable();
|
|
public ShineTable Shines { get; set; } = new ShineTable();
|
|
public PersistShinesTable PersistShines { get; set; } = new PersistShinesTable();
|
|
|
|
public class ServerTable {
|
|
public string Address { get; set; } = IPAddress.Any.ToString();
|
|
public ushort Port { get; set; } = 1027;
|
|
public ushort MaxPlayers { get; set; } = 8;
|
|
}
|
|
|
|
public class ScenarioTable {
|
|
public bool MergeEnabled { get; set; } = false;
|
|
}
|
|
|
|
public class BanListTable {
|
|
public bool Enabled { get; set; } = false;
|
|
public ISet<Guid> Players { get; set; } = new SortedSet<Guid>();
|
|
public ISet<string> IpAddresses { get; set; } = new SortedSet<string>();
|
|
public ISet<string> Stages { get; set; } = new SortedSet<string>();
|
|
}
|
|
|
|
public class FlipTable {
|
|
public bool Enabled { get; set; } = true;
|
|
public ISet<Guid> Players { get; set; } = new SortedSet<Guid>();
|
|
public FlipOptions Pov { get; set; } = FlipOptions.Both;
|
|
}
|
|
|
|
public class DiscordTable {
|
|
public string? Token { get; set; }
|
|
public string Prefix { get; set; } = "$";
|
|
public string? CommandChannel { get; set; }
|
|
public string? LogChannel { get; set; }
|
|
}
|
|
|
|
public class ShineTable {
|
|
public bool Enabled { get; set; } = true;
|
|
public ISet<int> Excluded { get; set; } = new SortedSet<int> { 496 };
|
|
public bool ClearOnNewSaves { get; set; } = false;
|
|
}
|
|
|
|
public class PersistShinesTable
|
|
{
|
|
public bool Enabled { get; set; } = false;
|
|
public string Filename { get; set; } = "./moons.json";
|
|
}
|
|
}
|