vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from oiltanker/master

Browse Source 
cs RunConfig fix
This commit is contained in:
Evil Factory
2022-05-15 10:22:10 -03:00
committed by GitHub
parent 264ed1f4de 1ce8cb8cac
commit fbec2aa8b0
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs
View File

@@ -36,9 +36,9 @@ namespace Barotrauma
}
private enum RunType { Standard, Forced, None };
private RunType GetRunType(ContentPackage cp, string path)
private bool ShouldRun(ContentPackage cp, string path)
{
if (!Directory.Exists(path + "CSharp")) return RunType.None;
if (!Directory.Exists(path + "CSharp")) return false;
var isEnabled = ContentPackageManager.EnabledPackages.All.Contains(cp);
if (File.Exists(path + "CSharp/RunConfig.xml"))
@@ -47,30 +47,45 @@ namespace Barotrauma
var elems = doc.Root.Elements().ToArray();
var elem = elems.FirstOrDefault(e => e.Name.LocalName.Equals(LuaCsSetup.IsServer ? "Server" : (LuaCsSetup.IsClient ? "Client" : "None"), StringComparison.OrdinalIgnoreCase));
if (elem != null && Enum.TryParse(typeof(RunType), elem.Value, out object enumValue) && enumValue is RunType rtValue)
if (elem != null && Enum.TryParse(elem.Value, true, out RunType rtValue))
{
if (rtValue == RunType.Standard && isEnabled) LuaCsSetup.PrintCsMessage($"Standard run C# of {cp.Name}");
else if (rtValue == RunType.Forced) LuaCsSetup.PrintCsMessage($"Forced run C# of {cp.Name}");
return rtValue;
if (rtValue == RunType.Standard && isEnabled)
{
LuaCsSetup.PrintCsMessage($"Standard run C# of {cp.Name}");
return true;
}
else if (rtValue == RunType.Forced)
{
LuaCsSetup.PrintCsMessage($"Forced run C# of {cp.Name}");
return true;
}
else if (rtValue == RunType.None) return false;
}
}
if (isEnabled)
{
LuaCsSetup.PrintCsMessage($"Assumed run C# of {cp.Name}");
return RunType.Standard;
return true;
}
else return RunType.None;
else return false;
}
public void SearchFolders()
{
var paths = new List<string>();
var paths = new Dictionary<string, string>();
foreach (var cp in ContentPackageManager.AllPackages)
{
var path = $"{Path.GetFullPath(Path.GetDirectoryName(cp.Path)).Replace('\\','/')}/";
if (GetRunType(cp, path) != RunType.None) paths.Add(path);
if (ShouldRun(cp, path))
{
if (paths.ContainsKey(cp.Name))
{
if (ContentPackageManager.EnabledPackages.All.Contains(cp)) paths[cp.Name] = path;
}
else paths.Add(cp.Name, path);
}
}
paths.ForEach(p => RunFolder(p));
foreach ((var _, var path) in paths) RunFolder(path);
}
public bool HasSources { get => sources.Count > 0; }