Unstable fixes

This commit is contained in:
EvilFactory
2022-12-09 18:30:36 -03:00
parent 90c3cef977
commit c739ea3952
8 changed files with 11 additions and 15 deletions
@@ -93,7 +93,7 @@ namespace Barotrauma
}; };
filesToUpdate = filesToUpdate.Concat(Directory.EnumerateFiles(luaCsPath, "*.dll", SearchOption.AllDirectories) filesToUpdate = filesToUpdate.Concat(Directory.EnumerateFiles(luaCsPath, "*.dll", SearchOption.AllDirectories)
.Where(s => s.Contains("mscordaccore_amd64_amd64_4.")).Select(s => Path.GetFileName(s))).ToArray(); .Where(s => s.Contains("mscordaccore_amd64_amd64")).Select(s => Path.GetFileName(s))).ToArray();
try try
{ {
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\BarotraumaShared\LuaCsDependencies.props" /> <Import Project="..\BarotraumaShared\LuaCsDependencies.props" />
<ItemGroup> <ItemGroup>
@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace> <RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors> <Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product> <Product>Barotrauma</Product>
<Version>0.19.14.0</Version> <Version>0.20.12.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright> <Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName> <AssemblyName>Barotrauma</AssemblyName>
@@ -37,7 +37,7 @@ namespace Barotrauma
"System.Runtime.CompilerServices.Unsafe.dll" "System.Runtime.CompilerServices.Unsafe.dll"
}; };
filesToCopy = filesToCopy.Concat(Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories) filesToCopy = filesToCopy.Concat(Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories)
.Where(s => s.Contains("mscordaccore_amd64_amd64_4.")).Select(s => Path.GetFileName(s))).ToArray(); .Where(s => s.Contains("mscordaccore_amd64_amd64")).Select(s => Path.GetFileName(s))).ToArray();
CreateMissingDirectory(); CreateMissingDirectory();
@@ -100,7 +100,7 @@ namespace Barotrauma.Networking
if (canUse != null) if (canUse != null)
{ {
return should.Value; return canUse.Value;
} }
if (recipientRadio.CanReceive(senderRadio)) { return true; } if (recipientRadio.CanReceive(senderRadio)) { return true; }
@@ -77,11 +77,6 @@ namespace Barotrauma
Directory.SetCurrentDirectory(executableDir); Directory.SetCurrentDirectory(executableDir);
} }
if (File.Exists("usecurrentdirectoryforsaves"))
{
SaveUtil.SaveFolder = Environment.CurrentDirectory;
}
Game = new GameMain(args); Game = new GameMain(args);
Game.Run(); Game.Run();
@@ -14,7 +14,7 @@ namespace Barotrauma
{ {
public bool IsSingleplayer => GameMain.IsSingleplayer; public bool IsSingleplayer => GameMain.IsSingleplayer;
public bool IsMultiplayer => GameMain.IsMultiplayer; public bool IsMultiplayer => GameMain.IsMultiplayer;
public string SaveFolder => SaveUtil.SaveFolder; public string SaveFolder => string.IsNullOrEmpty(GameSettings.CurrentConfig.SavePath) ? SaveUtil.DefaultSaveFolder : GameSettings.CurrentConfig.SavePath;
#if CLIENT #if CLIENT
public GameClient Client public GameClient Client
@@ -28,7 +28,8 @@ namespace Barotrauma
#if CLIENT #if CLIENT
string tempDownloadDir = getFullPath(ModReceiver.DownloadFolder); string tempDownloadDir = getFullPath(ModReceiver.DownloadFolder);
#endif #endif
if (pathStartsWith(getFullPath(string.IsNullOrEmpty(GameSettings.CurrentConfig.SavePath) ? SaveUtil.DefaultSaveFolder : GameSettings.CurrentConfig.SavePath)))
return true;
if (pathStartsWith(localModsDir)) if (pathStartsWith(localModsDir))
return true; return true;
@@ -63,7 +64,7 @@ namespace Barotrauma
} }
} }
if (pathStartsWith(getFullPath(SaveUtil.SaveFolder))) if (pathStartsWith(getFullPath(string.IsNullOrEmpty(GameSettings.CurrentConfig.SavePath) ? SaveUtil.DefaultSaveFolder : GameSettings.CurrentConfig.SavePath)))
return true; return true;
if (pathStartsWith(getFullPath(ContentPackage.LocalModsDir))) if (pathStartsWith(getFullPath(ContentPackage.LocalModsDir)))
+2 -2
View File
@@ -25,7 +25,7 @@ local item = ...
item.SpriteColor = Color(0, 0, 255, 255) item.SpriteColor = Color(0, 0, 255, 255)
local property = item.SerializableProperties[Identifier("SpriteColor")] local property = item.SerializableProperties[Identifier("SpriteColor")]
Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(property)) Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(property, item))
``` ```
This is also possible to do with item components: This is also possible to do with item components:
@@ -36,7 +36,7 @@ local light = item.GetComponentString("LightComponent")
light.LightColor = Color(0, 0, 255, 255) light.LightColor = Color(0, 0, 255, 255)
local property = light.SerializableProperties[Identifier("LightColor")] local property = light.SerializableProperties[Identifier("LightColor")]
Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(property)) Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(property, light))
``` ```
## Sending Custom Net Messages ## Sending Custom Net Messages