diff --git a/Directory.Build.props b/Directory.Build.props index 4cf7c933..468bd66a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,6 @@ - C:\Program Files\Epic Games\OuterWilds $(AppData)\OuterWildsModManager\OWML $(SolutionDir)\qsb-unityproject\Assets diff --git a/QSB/DeathSync/Patches/DeathPatches.cs b/QSB/DeathSync/Patches/DeathPatches.cs index 478e25d8..2b1fe4a1 100644 --- a/QSB/DeathSync/Patches/DeathPatches.cs +++ b/QSB/DeathSync/Patches/DeathPatches.cs @@ -141,10 +141,15 @@ public class DeathPatches : QSBPatch Achievements.Earn(Achievements.Type.EARLY_ADOPTER); } - if (PlayerState.InDreamWorld() && deathType != DeathType.Dream && deathType != DeathType.DreamExplosion && deathType != DeathType.Supernova && deathType != DeathType.TimeLoop && deathType != DeathType.Meditation) + if (PlayerState.InDreamWorld()) { + // exit dream world either way to prevent goof with respawn + // TODO: test Locator.GetDreamWorldController().ExitDreamWorld(deathType); - return; + if (deathType != DeathType.Dream && deathType != DeathType.DreamExplosion && deathType != DeathType.Supernova && deathType != DeathType.TimeLoop && deathType != DeathType.Meditation) + { + return; + } } if (!@this._isDying) diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index f3bdfee4..8bfae7dd 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -7,17 +7,6 @@ CS1998;CS0649 - - - <_Files Remove="@(_Files)" /> - <_Files Include="$(OutputPath)\*.dll" /> - <_Files Include="$(OutputPath)\*.exe" /> - <_Files Include="$(OutputPath)\*.pdb" /> - - <_Files Include="$(OutputPath)\AssetBundles\*" /> - - - <_Files Remove="@(_Files)" /> @@ -31,33 +20,13 @@ - $(GameDir)\OuterWilds_Data\Managed $(UnityAssetsDir)\Dlls - - - <_Files Remove="@(_Files)" /> - <_Files Include="$(UnityDllsDir)\*.dll" /> - <_Files Include="$(UnityDllsDir)\*.exe" /> - <_Files Include="$(UnityDllsDir)\*.pdb" /> - - - + <_Files Remove="@(_Files)" /> <_Files Include="$(OutputPath)\*.dll" /> <_Files Include="$(OutputPath)\*.exe" /> - <_Files Include="$(OutputPath)\*.pdb" /> - - <_Files Include="$(GameDllsDir)\EOS-SDK.dll" /> - <_Files Include="$(GameDllsDir)\Autofac.dll" /> - <_Files Include="$(GameDllsDir)\Newtonsoft.Json.dll" /> - <_Files Include="$(GameDllsDir)\0Harmony.dll" /> - <_Files Include="$(GameDllsDir)\MonoMod*.dll" /> - <_Files Include="$(GameDllsDir)\Mono.Cecil.dll" /> - <_Files Include="$(GameDllsDir)\OWML*.dll" /> - <_Files Include="$(GameDllsDir)\NAudio-Unity.dll" /> - <_Files Include="$(GameDllsDir)\com.rlabrecque.steamworks.net.dll" /> diff --git a/QSB/manifest.json b/QSB/manifest.json index e0551f00..c49e7688 100644 --- a/QSB/manifest.json +++ b/QSB/manifest.json @@ -7,7 +7,7 @@ "body": "- Disable *all* other mods. (Can heavily affect performance)\n- Make sure you are not running any other network-intensive applications." }, "uniqueName": "Raicuparta.QuantumSpaceBuddies", - "version": "0.22.0", + "version": "0.23.0", "owmlVersion": "2.7.0", "dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ], "pathsToPreserve": [ "debugsettings.json", "storage.json" ] diff --git a/README.md b/README.md index 0c11f2cc..e0980867 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,6 @@ See [TRANSLATING.md](TRANSLATING.md) - Clone QSB's source - Open the file `DevEnv.targets` in your favorite text editor - (optional if copying built dlls manually) Edit the entry `` to point to your OWML directory (it is installed inside the Mod Manager directory) -- (optional if no unity project) Edit the entry `` to point to the directory where Outer Wilds is installed - (optional if no unity project) Edit the entry `` to point to the Assets folder of the QSB unity project - Open the project solution file `QSB.sln` in Visual Studio 2022