diff --git a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsSettingsMenu.cs b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsSettingsMenu.cs index b6408d2a4..5f1e6d90e 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsSettingsMenu.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsSettingsMenu.cs @@ -28,28 +28,6 @@ namespace Barotrauma } }; - new GUITickBox(new RectTransform(new Vector2(0.8f, 0.1f), list.Content.RectTransform), "Treat Forced Mods As Normal") - { - Selected = GameMain.LuaCs.TreatForcedModsAsNormal, - ToolTip = "This makes mods that were setup to run even when disabled to only run when enabled.", - OnSelected = (GUITickBox tick) => - { - GameMain.LuaCs.TreatForcedModsAsNormal = tick.Selected; - return true; - } - }; - - new GUITickBox(new RectTransform(new Vector2(0.8f, 0.1f), list.Content.RectTransform), "Prefer To Use Workshop Lua Setup") - { - Selected = GameMain.LuaCs.PreferToUseWorkshopLuaSetup, - ToolTip = "This makes Lua look first for the Lua/LuaSetup.lua located in the Workshop package instead of the one located locally.", - OnSelected = (GUITickBox tick) => - { - GameMain.LuaCs.PreferToUseWorkshopLuaSetup = tick.Selected; - return true; - } - }; - new GUITickBox(new RectTransform(new Vector2(0.8f, 0.1f), list.Content.RectTransform), "Disable Error GUI Overlay") { Selected = GameMain.LuaCs.DisableErrorGUIOverlay, diff --git a/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/Config/SettingsShared.xml b/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/Config/SettingsShared.xml new file mode 100644 index 000000000..e2241fa2f --- /dev/null +++ b/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/Config/SettingsShared.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/ModConfig.xml b/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/ModConfig.xml index e74277984..2119fc978 100644 --- a/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/ModConfig.xml +++ b/Barotrauma/BarotraumaShared/LocalMods/LuaCsForBarotrauma/ModConfig.xml @@ -1,4 +1,5 @@ - - \ No newline at end of file + + + diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index f19a3a5c2..080a55ff9 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -106,27 +106,6 @@ namespace Barotrauma private ISettingEntry _isCsEnabled; - /// - /// Whether mods marked as 'forced' or 'always load' should only be loaded if they're in the enabled mods list. - /// - public bool TreatForcedModsAsNormal - { - get => _treatForcedModsAsNormal?.Value ?? true; - internal set => _treatForcedModsAsNormal?.TrySetValue(value); - } - - private ISettingEntry _treatForcedModsAsNormal; - - /// - /// Whether the lua script runner from Workshop package should be used over the in-built version. - /// - public bool PreferToUseWorkshopLuaSetup - { - get => _preferToUseWorkshopLuaSetup?.Value ?? false; - internal set => _preferToUseWorkshopLuaSetup?.TrySetValue(value); - } - private ISettingEntry _preferToUseWorkshopLuaSetup; - /// /// Whether the popup error GUI should be hidden/suppressed. /// @@ -181,8 +160,6 @@ namespace Barotrauma { _isCsEnabled = ConfigService.TryGetConfig>(ContentPackageManager.VanillaCorePackage, "IsCsEnabled", out var val1) ? val1 : throw new NullReferenceException($"{nameof(IsCsEnabled)} cannot be loaded."); - _treatForcedModsAsNormal = ConfigService.TryGetConfig>(ContentPackageManager.VanillaCorePackage, "TreatForcedModsAsNormal", out var val2) ? val2 - : throw new NullReferenceException($"{nameof(TreatForcedModsAsNormal)} cannot be loaded."); _disableErrorGUIOverlay = ConfigService.TryGetConfig>(ContentPackageManager.VanillaCorePackage, "DisableErrorGUIOverlay", out var val3) ? val3 : throw new NullReferenceException($"{nameof(DisableErrorGUIOverlay)} cannot be loaded."); _hideUserNamesInLogs = ConfigService.TryGetConfig>(ContentPackageManager.VanillaCorePackage, "HideUserNamesInLogs", out var val4) ? val4 @@ -191,6 +168,8 @@ namespace Barotrauma : throw new NullReferenceException($"{nameof(LuaForBarotraumaSteamId)} cannot be loaded."); _restrictMessageSize = ConfigService.TryGetConfig>(ContentPackageManager.VanillaCorePackage, "RestrictMessageSize", out var val7) ? val7 : throw new NullReferenceException($"{nameof(RestrictMessageSize)} cannot be loaded."); + _localDataSavePath = ConfigService.TryGetConfig>(ContentPackageManager.VanillaCorePackage, "LocalDataSavePath", out var val8) ? val8 + : throw new NullReferenceException($"{nameof(LocalDataSavePath)} cannot be loaded."); } private IServicesProvider SetupServicesProvider() @@ -330,7 +309,8 @@ namespace Barotrauma if (!PackageManagementService.IsAnyPackageLoaded()) { Logger.LogResults(PackageManagementService.LoadPackagesInfo(ContentPackageManager.EnabledPackages.All.ToImmutableArray())); - LoadLuaCsConfig(); + // TODO: Enable later + //LoadLuaCsConfig(); } if (!PackageManagementService.IsAnyPackageRunning()) @@ -399,7 +379,6 @@ namespace Barotrauma void DisposeLuaCsConfig() { _isCsEnabled = null; - _treatForcedModsAsNormal = null; _disableErrorGUIOverlay = null; _hideUserNamesInLogs = null; _luaForBarotraumaSteamId = null;