Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Commit

Permalink
tiny fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
atenfyr committed Jan 20, 2021
1 parent 76db250 commit 011c7fd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 17 deletions.
3 changes: 1 addition & 2 deletions AstroModLoader.csproj.user
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>
</StartArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<StartWorkingDirectory>C:\Program Files %28x86%29\Steam\steamapps\common\ASTRONEER Dedicated Server\</StartWorkingDirectory>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<StartWorkingDirectory>
Expand Down
21 changes: 12 additions & 9 deletions Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -671,23 +671,26 @@ private void playButton_Click(object sender, EventArgs e)
{
ModManager.FullUpdate();

if (ModManager.Platform == PlatformType.Steam)
if (!Program.CommandLineOptions.ServerMode)
{
Process.Start(@"steam://run/361420");
return;
}
else if (ModManager.Platform == PlatformType.Win10)
{
if (!string.IsNullOrEmpty(ModManager.MicrosoftRuntimeID)) Process.Start(@"shell:appsFolder\" + ModManager.MicrosoftRuntimeID + "!ASTRONEER");
return;
if (ModManager.Platform == PlatformType.Steam)
{
Process.Start(@"steam://run/361420");
return;
}
else if (ModManager.Platform == PlatformType.Win10)
{
if (!string.IsNullOrEmpty(ModManager.MicrosoftRuntimeID)) Process.Start(@"shell:appsFolder\" + ModManager.MicrosoftRuntimeID + "!ASTRONEER");
return;
}
}

if ((Program.CommandLineOptions.ServerMode || AMLUtils.IsLinux || string.IsNullOrEmpty(ModManager.BinaryFilePath)) && string.IsNullOrEmpty(ModManager.LaunchCommand))
{
TextPrompt initialPathPrompt = new TextPrompt
{
StartPosition = FormStartPosition.CenterScreen,
DisplayText = "Select a file to run",
DisplayText = "Select a file to run:",
AllowBrowse = true,
BrowseMode = BrowseMode.File
};
Expand Down
5 changes: 0 additions & 5 deletions ModConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ public bool ShouldSerializeLaunchCommand()
[DefaultValue(true)]
public bool RefuseMismatchedConnections;

public bool ShouldSerializeRefuseMismatchedConnections()
{
return RefuseMismatchedConnections || Program.CommandLineOptions.ServerMode;
}

[JsonProperty("current")]
public ModProfile ModsOnDisk;

Expand Down
3 changes: 2 additions & 1 deletion next_patch_notes.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
* Upgraded the bundled AstroModIntegrator copy to 1.2.0.
* Added automatic detection for server mode. If an executable file named AstroServer.exe is located in the current working directory, server mode is automatically enabled.
* Added the optional mods column in server mode to accomodate for increased configuration provided by the upgraded AstroModIntegrator version.
* Added the "Refuse mismatched connections" option, which determines whether or not a game host should kick modded clients with a mismatched set of mods.
* Added the optional mods column in server mode, which allows dedicated servers to select which mods should be enforced.
* Added an indicator that displays if a hash mismatch is detected with the Steam API DLL. This indicator does not affect usage of the mod loader itself.
* Added more robust game and local data path correction and verification.
* Fixed a bug where specific mods would fail to sync.
Expand Down

0 comments on commit 011c7fd

Please sign in to comment.