mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-06 09:39:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into nh-stuff

Browse Source
This commit is contained in:
JohnCorby 2022-10-29 14:28:48 -07:00
commit 06f9b5fb81
5 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Directory.Build.props
View File

@ -16,7 +16,6 @@
</PropertyGroup>
<PropertyGroup Label="Default Locations" Condition="!Exists('$(DevEnvLoc)')">
<GameDir>C:\Program Files\Epic Games\OuterWilds</GameDir>
<OwmlDir>$(AppData)\OuterWildsModManager\OWML</OwmlDir>
<UnityAssetsDir>$(SolutionDir)\qsb-unityproject\Assets</UnityAssetsDir>
</PropertyGroup>

7
QSB/DeathSync/Patches/DeathPatches.cs
View File

@ -141,11 +141,16 @@ 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);
if (deathType != DeathType.Dream && deathType != DeathType.DreamExplosion && deathType != DeathType.Supernova && deathType != DeathType.TimeLoop && deathType != DeathType.Meditation)
{
return;
}
}
if (!@this._isDying)
{

33
QSB/QSB.csproj
View File

@ -7,17 +7,6 @@
<NoWarn>CS1998;CS0649</NoWarn>
</PropertyGroup>
<Target Name="clean before building" BeforeTargets="PreBuildEvent">
<ItemGroup>
<_Files Remove="@(_Files)" />
<_Files Include="$(OutputPath)\*.dll" />
<_Files Include="$(OutputPath)\*.exe" />
<_Files Include="$(OutputPath)\*.pdb" />
<_Files Include="$(OutputPath)\AssetBundles\*" />
</ItemGroup>
<Delete Files="@(_Files)" />
</Target>
<Target Name="clean after building" AfterTargets="PostBuildEvent">
<ItemGroup>
<_Files Remove="@(_Files)" />
@ -31,33 +20,13 @@
</Target>
<PropertyGroup>
<GameDllsDir Condition="Exists('$(GameDir)')">$(GameDir)\OuterWilds_Data\Managed</GameDllsDir>
<UnityDllsDir Condition="Exists('$(UnityAssetsDir)')">$(UnityAssetsDir)\Dlls</UnityDllsDir>
</PropertyGroup>
<Target Name="copy dlls to unity" AfterTargets="PostBuildEvent" Condition="Exists('$(UnityDllsDir)') and Exists('$(GameDllsDir)')">
<ItemGroup>
<_Files Remove="@(_Files)" />
<_Files Include="$(UnityDllsDir)\*.dll" />
<_Files Include="$(UnityDllsDir)\*.exe" />
<_Files Include="$(UnityDllsDir)\*.pdb" />
</ItemGroup>
<Delete Files="@(_Files)" />
<Target Name="copy dlls to unity" AfterTargets="PostBuildEvent" Condition="Exists('$(UnityDllsDir)')">
<ItemGroup>
<_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" />
</ItemGroup>
<Copy SourceFiles="@(_Files)" DestinationFolder="$(UnityDllsDir)" />
</Target>

2
QSB/manifest.json
View File

@ -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" ]

1
README.md
View File

@ -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 `<OwmlDir>` to point to your OWML directory (it is installed inside the Mod Manager directory)
- (optional if no unity project) Edit the entry `<GameDir>` to point to the directory where Outer Wilds is installed
- (optional if no unity project) Edit the entry `<UnityAssetsDir>` to point to the Assets folder of the QSB unity project
- Open the project solution file `QSB.sln` in Visual Studio 2022