Merge branch 'release/4945.0.1.4'

This commit is contained in:
Stardust3D 2022-03-12 16:20:01 +01:00
commit 5b0e318c18
8 changed files with 26 additions and 11 deletions

Binary file not shown.

View File

@ -2,5 +2,5 @@
<Manifest> <Manifest>
<identifier>RJW patch - Harvest Organs Post Mortem</identifier> <identifier>RJW patch - Harvest Organs Post Mortem</identifier>
<version>4943.0.1.4</version> <version>4945.0.1.4</version>
</Manifest> </Manifest>

Binary file not shown.

View File

@ -5,10 +5,23 @@ using Verse;
namespace RJW_patch_Autopsy namespace RJW_patch_Autopsy
{ {
[StaticConstructorOnStartup] [StaticConstructorOnStartup]
internal static class First public class AutopsyPatch
{ {
static First() public static bool SizedApparelActive = false;
static AutopsyPatch()
{ {
//check SJW
if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "SizedApparel"))
{
SizedApparelActive = true;
}
if (LoadedModManager.RunningModsListForReading.Any(x => x.PackageId == "OTYOTY.SizedApparel"))
{
SizedApparelActive = true;
}
var har = new Harmony("Stardust3D.RJW.patch.Autopsy"); var har = new Harmony("Stardust3D.RJW.patch.Autopsy");
har.PatchAll(Assembly.GetExecutingAssembly()); har.PatchAll(Assembly.GetExecutingAssembly());
} }

View File

@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4943.0.1.4")] [assembly: AssemblyVersion("4945.0.1.4")]
[assembly: AssemblyFileVersion("4943.0.1.4")] [assembly: AssemblyFileVersion("4945.0.1.4")]

View File

@ -49,16 +49,17 @@
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="0Harmony, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="0Harmony, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Lib.Harmony.2.2.0\lib\net48\0Harmony.dll</HintPath> <HintPath>..\packages\Lib.Harmony.2.2.0\lib\net48\0Harmony.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="Assembly-CSharp"> <Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath> <HintPath>..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="HugsLib"> <Reference Include="HugsLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll</HintPath> <HintPath>..\packages\UnlimitedHugs.Rimworld.HugsLib.9.0.1\lib\net472\HugsLib.dll</HintPath>
<Private>False</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System.Core" /> <Reference Include="System.Core" />
</ItemGroup> </ItemGroup>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Lib.Harmony" version="2.2.0" targetFramework="net48"/> <package id="Lib.Harmony" version="2.2.0" targetFramework="net48" />
<package id="UnlimitedHugs.Rimworld.HugsLib" version="9.0.1" targetFramework="net48" />
</packages> </packages>

View File

@ -11,7 +11,7 @@ plugins {
//id("com.ullink.nunit") version "1.12" //id("com.ullink.nunit") version "1.12"
} }
version = "4943.0.1.4" version = "4945.0.1.4"
val friendlyName = "rjw-patch-autopsy" val friendlyName = "rjw-patch-autopsy"
tasks.register<com.ullink.Msbuild>("buildC#") { tasks.register<com.ullink.Msbuild>("buildC#") {