From a62b62185f6ef0b2acc1bda03567e100e5629a04 Mon Sep 17 00:00:00 2001 From: MapleWheels Date: Fri, 22 Sep 2023 13:07:46 -0400 Subject: [PATCH] Made it to load Publicized Assemblies from the Workshop folder if "Use Workshop Lua Setup" is checked in the main menu lua config. --- .../SharedSource/LuaCs/Plugins/CsPackageManager.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs index 78084237f..ff504b7d5 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs @@ -286,6 +286,17 @@ public sealed class CsPackageManager : IDisposable // load publicized assemblies var publicizedDir = Path.Combine(Environment.CurrentDirectory, "Publicized"); + + // if using workshop lua setup is checked, try to use the publicized assemblies in the content package there instead. + if (_luaCsSetup.Config.PreferToUseWorkshopLuaSetup) + { + var pck = LuaCsSetup.GetPackage(LuaCsSetup.LuaForBarotraumaId); + if (pck is not null) + { + publicizedDir = Path.Combine(pck.Dir, "Binary", "Publicized"); + } + } + ImmutableList publicizedAssemblies = ImmutableList.Empty; if (Directory.Exists(publicizedDir)) {