Merge branch 'release/5400.0.1.5'

5390.0.1.4 5390.0.1.4

About/About.xml

@@ -5,6 +5,8 @@
     <author>Stardust3D</author>
     <supportedVersions>
         <li>1.3</li>
+        <li>1.4</li>
+        <li>1.5</li>
     </supportedVersions>
     <packageId>Stardust3D.RJW.patch.Autopsy</packageId>
     <description>This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.
@@ -27,8 +29,9 @@
         </li>
     </modDependencies>
     <loadAfter>
+        <li>Ludeon.RimWorld</li>
         <li>UnlimitedHugs.HugsLib</li>
         <li>Smuffle.HarvestOrgansPostMortem</li>
-        <!--<li>rim.job.world</li>-->
+        <li>rim.job.world</li>
     </loadAfter>
 </ModMetaData>

About/Manifest.xml

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

README.md

@@ -0,0 +1 @@
+I am sorry for the force push, but I had to remove some information from the repository's history.

Source/RJW_patch_Autopsy.sln

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32113.165
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_patch_Autopsy", "RJW_patch_Autopsy\RJW_patch_Autopsy.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_patch_Autopsy_1.3", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.3.csproj", "{F17C6B3F-BA9D-4133-A201-1265A64BCB71}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RimJobWorld.Main", "..\..\rjw-base\1.3\Source\RimJobWorld.Main.csproj", "{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_patch_Autopsy_1.4", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.4.csproj", "{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autopsy", "..\..\RimwoldAutopsy\Source\Autopsy\Autopsy.csproj", "{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RJW_patch_Autopsy_1.5", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.5.csproj", "{25A0821A-6B42-4FB0-A454-0AD22A7716E7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +19,14 @@ Global
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB71}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F17C6B3F-BA9D-4133-A201-1265A64BCB71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25A0821A-6B42-4FB0-A454-0AD22A7716E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25A0821A-6B42-4FB0-A454-0AD22A7716E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25A0821A-6B42-4FB0-A454-0AD22A7716E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25A0821A-6B42-4FB0-A454-0AD22A7716E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Source/RJW_patch_Autopsy/About/About.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ModMetaData>
+    <name>RJW patch - Harvest Organs Post Mortem</name>
+    <author>Stardust3D</author>
+    <supportedVersions>
+        <li>1.3</li>
+        <li>1.4</li>
+        <li>1.5</li>
+    </supportedVersions>
+    <packageId>Stardust3D.RJW.patch.Autopsy</packageId>
+    <description>This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.
+    </description>
+    <modDependencies>
+        <li>
+            <packageId>UnlimitedHugs.HugsLib</packageId>
+            <displayName>HugsLib</displayName>
+            <steamWorkshopUrl>steam://url/CommunityFilePage/818773962</steamWorkshopUrl>
+        </li>
+        <li>
+            <packageId>Smuffle.HarvestOrgansPostMortem</packageId>
+            <displayName>HarvestOrgansPostMortem</displayName>
+            <downloadUrl>https://github.com/DenJur/RimwoldAutopsy</downloadUrl>
+        </li>
+        <li>
+            <packageId>rim.job.world</packageId>
+            <displayName>RimJobWorld</displayName>
+            <downloadUrl>https://gitgud.io/Ed86/rjw</downloadUrl>
+        </li>
+    </modDependencies>
+    <loadAfter>
+        <li>Ludeon.RimWorld</li>
+        <li>UnlimitedHugs.HugsLib</li>
+        <li>Smuffle.HarvestOrgansPostMortem</li>
+        <li>rim.job.world</li>
+    </loadAfter>
+</ModMetaData>

Source/RJW_patch_Autopsy/About/Manifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<Manifest>
+    <identifier>RJW patch - Harvest Organs Post Mortem</identifier>
+    <version>5400.0.1.5</version>
+</Manifest>

Source/RJW_patch_Autopsy/Patches/Harmony.cs

@@ -5,10 +5,23 @@ using Verse;
 namespace RJW_patch_Autopsy
 {
     [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");
             har.PatchAll(Assembly.GetExecutingAssembly());
         }

Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs

@@ -11,11 +11,11 @@ namespace RJW_patch_Autopsy
     [HarmonyPatch(typeof(NewMedicalRecipesUtility), nameof(NewMedicalRecipesUtility.TraverseBody))]
     public static class NewMedicalRecipesUtilityPatch
     {
-        private const bool DO_LOG = false;
+        private const bool DEBUG = false;
 
         private static void log(String message)
         {
-            if (DO_LOG)
+            if (DEBUG)
             {
                 Log.Message(message);
             }
@@ -78,11 +78,11 @@ namespace RJW_patch_Autopsy
             //Simulate success chance scaled with skill etc.
             rjwNaturalThings.ForEach(t =>
             {
-                if (Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t);
+                if (DEBUG || Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t);
             });
             rjwArtificialThings.ForEach(t =>
             {
-                if (Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t);
+                if (DEBUG || Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t);
             });
 
             //Remove all parts that were tried to harvest from the corpse

Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs

@@ -1,37 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("RJW patch - Harvest Organs Post Mortem")]
-[assembly:
-    AssemblyDescription(
-        "This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RJW_patch_Autopsy")]
-[assembly: AssemblyCopyright("©2022 Stardust3D")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4a00fc3e-123a-492b-96de-06af9c982b7a")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4943.0.1.4")]
-[assembly: AssemblyFileVersion("4943.0.1.4")] 

Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F17C6B3F-BA9D-4133-A201-1265A64BCB71}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RJW_patch_Autopsy</RootNamespace>
-    <AssemblyName>RJW_patch_Autopsy</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <AssemblyOriginatorKeyFile>RJW_patch_Autopsy.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Assemblies\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Assemblies\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>..\..\Assemblies\RJW_patch_Autopsy.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="0Harmony, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.2.2.0\lib\net48\0Harmony.dll</HintPath>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HugsLib">
-      <HintPath>..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Patches\Harmony.cs" />
-    <Compile Include="Patches\NewMedicalRecipesUtilityPatch.cs" />
-    <Compile Include="Mod.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\About\About.xml">
-      <Link>About\About.xml</Link>
-    </Content>
-    <Content Include="..\..\About\Manifest.xml">
-      <Link>About\Manifest.xml</Link>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="RJW_patch_Autopsy.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\RimwoldAutopsy\Source\Autopsy\Autopsy.csproj">
-      <Project>{f17c6b3f-ba9d-4133-a201-1265a64bcb71}</Project>
-      <Name>Autopsy</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\rjw-base\1.3\Source\RimJobWorld.Main.csproj">
-      <Project>{22f82fff-8bd4-4cee-9f22-c7da71281e72}</Project>
-      <Name>RimJobWorld.Main</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj

@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{F17C6B3F-BA9D-4133-A201-1265A64BCB71}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>RJW_patch_Autopsy</RootNamespace>
+        <AssemblyName>RJW_patch_Autopsy</AssemblyName>
+        <TargetFramework>net48</TargetFramework>
+        <FileAlignment>512</FileAlignment>
+        <TargetFrameworkProfile>
+        </TargetFrameworkProfile>
+        <LangVersion>11</LangVersion>
+        <Copyright>©2024 Stardust3D</Copyright>
+        <Company>Stardust3D</Company>
+        <AssemblyVersion>5400.0.1.5</AssemblyVersion>
+        <FileVersion>5400.0.1.5</FileVersion>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>RJW_patch_Autopsy.snk</AssemblyOriginatorKeyFile>
+        <Description>This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.</Description>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <OutputPath>bin\Release\1.3\</OutputPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Remove="1.4\**"/>
+        <None Remove="1.5\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Lib.Harmony" Version="2.3.3" />
+        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
+        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.3.3389" />
+        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
+    </ItemGroup>
+    <ItemGroup>
+        <Reference Include="Autopsy">
+          <HintPath>..\..\..\RimwoldAutopsy\1.3\Assemblies\Autopsy.dll</HintPath>
+        </Reference>
+        <Reference Include="RJW">
+            <HintPath>..\..\..\rjw-base\1.3\Assemblies\RJW.dll</HintPath>
+        </Reference>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Remove="1.4\**"/>
+        <Compile Remove="1.5\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Remove="1.4\**"/>
+        <EmbeddedResource Remove="1.5\**"/>
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Properties\" />
+    </ItemGroup>
+</Project>

Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj

@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{fc20ca27-4400-4aac-99af-f18cafac942e}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>RJW_patch_Autopsy</RootNamespace>
+        <AssemblyName>RJW_patch_Autopsy</AssemblyName>
+        <TargetFramework>net48</TargetFramework>
+        <FileAlignment>512</FileAlignment>
+        <TargetFrameworkProfile>
+        </TargetFrameworkProfile>
+        <LangVersion>11</LangVersion>
+        <Copyright>©2024 Stardust3D</Copyright>
+        <Company>Stardust3D</Company>
+        <AssemblyVersion>5400.0.1.5</AssemblyVersion>
+        <FileVersion>5400.0.1.5</FileVersion>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>RJW_patch_Autopsy.snk</AssemblyOriginatorKeyFile>
+        <Description>This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.</Description>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <OutputPath>bin\Release\1.4\</OutputPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Remove="1.3\**"/>
+        <None Remove="1.5\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Lib.Harmony" Version="2.3.3" />
+        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
+        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" />
+        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
+    </ItemGroup>
+    <ItemGroup>
+        <Reference Include="Autopsy">
+          <HintPath>..\..\..\RimwoldAutopsy\1.4\Assemblies\Autopsy.dll</HintPath>
+        </Reference>
+        <Reference Include="RJW">
+            <HintPath>..\..\..\rjw-base\1.4\Assemblies\RJW.dll</HintPath>
+        </Reference>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Remove="1.3\**"/>
+        <Compile Remove="1.5\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Remove="1.3\**"/>
+        <EmbeddedResource Remove="1.5\**"/>
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Properties\" />
+    </ItemGroup>
+</Project>

Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj

@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{25a0821a-6b42-4fb0-a454-0ad22a7716e7}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>RJW_patch_Autopsy</RootNamespace>
+        <AssemblyName>RJW_patch_Autopsy</AssemblyName>
+        <TargetFramework>net48</TargetFramework>
+        <FileAlignment>512</FileAlignment>
+        <TargetFrameworkProfile>
+        </TargetFrameworkProfile>
+        <LangVersion>11</LangVersion>
+        <Copyright>©2024 Stardust3D</Copyright>
+        <Company>Stardust3D</Company>
+        <AssemblyVersion>5400.0.1.5</AssemblyVersion>
+        <FileVersion>5400.0.1.5</FileVersion>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>RJW_patch_Autopsy.snk</AssemblyOriginatorKeyFile>
+        <Description>This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts.</Description>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <OutputPath>bin\Release\1.5\</OutputPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Remove="1.3\**"/>
+        <None Remove="1.4\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Lib.Harmony" Version="2.3.3" />
+        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
+        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
+        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
+    </ItemGroup>
+    <ItemGroup>
+        <Reference Include="Autopsy">
+          <HintPath>..\..\..\RimwoldAutopsy\1.5\Assemblies\Autopsy.dll</HintPath>
+        </Reference>
+        <Reference Include="RJW">
+            <HintPath>..\..\..\rjw-base\1.5\Assemblies\RJW.dll</HintPath>
+        </Reference>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Remove="1.3\**"/>
+        <Compile Remove="1.4\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Remove="1.3\**"/>
+        <EmbeddedResource Remove="1.4\**"/>
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Properties\" />
+    </ItemGroup>
+</Project>

Source/RJW_patch_Autopsy/packages.config

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

Source/build.gradle.kts

@@ -7,18 +7,18 @@
  */
 
 plugins {
-    id("com.ullink.msbuild") version "3.15"
-    //id("com.ullink.nunit") version "1.12"
+    alias(libs.plugins.msbuild)    
+    alias(libs.plugins.versions)
 }
 
-version = "4943.0.1.4"
+version = "5400.0.1.5"
 val friendlyName = "rjw-patch-autopsy"
 
-tasks.register<com.ullink.Msbuild>("buildC#") {
+tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
     // either a solution file
     // solutionFile = "${rootProject.name}.sln"
     // or a project file (.csproj or .vbproj)
-    projectFile = file("${rootProject.name}/${rootProject.name}.csproj")
+    projectFile = file("${rootProject.name}/${rootProject.name}_1.3.csproj")
 
     targets = listOf("Clean", "Rebuild")
     configuration = "Release"
@@ -26,10 +26,34 @@ tasks.register<com.ullink.Msbuild>("buildC#") {
     // destinationDir = "build/msbuild/bin"
 }
 
-tasks.register<Exec>("sign") {
-    dependsOn("buildC#")
-    workingDir = project.projectDir.resolve("${rootProject.name}/obj/Release")
-    executable = "H:\\Windows Kits\\10\\bin\\10.0.22000.0\\x64\\signtool.exe"
+tasks.register<com.ullink.Msbuild>("buildC#_1.4") {
+    // either a solution file
+    // solutionFile = "${rootProject.name}.sln"
+    // or a project file (.csproj or .vbproj)
+    projectFile = file("${rootProject.name}/${rootProject.name}_1.4.csproj")
+
+    targets = listOf("Clean", "Rebuild")
+    configuration = "Release"
+
+    // destinationDir = "build/msbuild/bin"
+}
+
+tasks.register<com.ullink.Msbuild>("buildC#_1.5") {
+    // either a solution file
+    // solutionFile = "${rootProject.name}.sln"
+    // or a project file (.csproj or .vbproj)
+    projectFile = file("${rootProject.name}/${rootProject.name}_1.5.csproj")
+
+    targets = listOf("Clean", "Rebuild")
+    configuration = "Release"
+
+    // destinationDir = "build/msbuild/bin"
+}
+
+tasks.register<Exec>("sign_1.3") {
+    dependsOn("buildC#_1.3")
+    workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48")
+    executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
     args = listOf(
         "sign",
         "/seal",
@@ -44,46 +68,116 @@ tasks.register<Exec>("sign") {
     )
 }
 
-tasks.register("copyDll") {
-    dependsOn("copyDll_Assemblies", "copyDll_1.3")
+tasks.register<Exec>("sign_1.4") {
+    dependsOn("buildC#_1.4")
+    workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48")
+    executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
+    args = listOf(
+        "sign",
+        "/seal",
+        "/t",
+        "http://timestamp.digicert.com",
+        "/a",
+        "/n",
+        "Stardust3D",
+        "/fd",
+        "certHash",
+        "${rootProject.name}.dll"
+    )
 }
 
-tasks.register<Copy>("copyDll_Assemblies") {
-    dependsOn("sign", "clean")
-    from(project.projectDir.resolve("${rootProject.name}/obj/Release/${rootProject.name}.dll"))
-    into(project.projectDir.parentFile.resolve("Assemblies"))
+tasks.register<Exec>("sign_1.5") {
+    dependsOn("buildC#_1.5")
+    workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48")
+    executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe"
+    args = listOf(
+        "sign",
+        "/seal",
+        "/t",
+        "http://timestamp.digicert.com",
+        "/a",
+        "/n",
+        "Stardust3D",
+        "/fd",
+        "certHash",
+        "${rootProject.name}.dll"
+    )
+}
+
+tasks.register("copy") {
+    dependsOn("copy_1.3", "copy_1.4", "copy_1.5", "copy_about")
+}
+
+tasks.register<Copy>("copy_about") {
+    from(project.projectDir.resolve("${rootProject.name}/About"))
+    into(project.projectDir.parentFile.resolve("About"))
+}
+
+tasks.register<Copy>("copy_1.3") {
+    dependsOn("copyDll_1.3")
+    from(project.projectDir.resolve("${rootProject.name}/1.3"))
+    into(project.projectDir.parentFile.resolve("1.3"))
+}
+
+tasks.register<Copy>("copy_1.4") {
+    dependsOn("copyDll_1.4")
+    from(project.projectDir.resolve("${rootProject.name}/1.4"))
+    into(project.projectDir.parentFile.resolve("1.4"))
+}
+
+tasks.register<Copy>("copy_1.5") {
+    dependsOn("copyDll_1.5")
+    from(project.projectDir.resolve("${rootProject.name}/1.5"))
+    into(project.projectDir.parentFile.resolve("1.5"))
 }
 
 tasks.register<Copy>("copyDll_1.3") {
-    dependsOn("sign", "clean")
-    from(project.projectDir.resolve("${rootProject.name}/obj/Release/${rootProject.name}.dll"))
+    dependsOn("sign_1.3")
+    from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${rootProject.name}.dll"))
     into(project.projectDir.parentFile.resolve("1.3/Assemblies"))
 }
 
+tasks.register<Copy>("copyDll_1.4") {
+    dependsOn("sign_1.4")
+    from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48/${rootProject.name}.dll"))
+    into(project.projectDir.parentFile.resolve("1.4/Assemblies"))
+}
+
+tasks.register<Copy>("copyDll_1.5") {
+    dependsOn("sign_1.5")
+    from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48/${rootProject.name}.dll"))
+    into(project.projectDir.parentFile.resolve("1.5/Assemblies"))
+}
+
 tasks.register<Zip>("buildZip") {
-    dependsOn(":copyDll")
+    dependsOn("clean", ":copy")
     into("$friendlyName/1.3") {
         from(project.projectDir.parentFile.resolve("1.3"))
     }
+    into("$friendlyName/1.4") {
+        from(project.projectDir.parentFile.resolve("1.4"))
+    }
+    into("$friendlyName/1.5") {
+        from(project.projectDir.parentFile.resolve("1.5"))
+    }
     into("$friendlyName/About") {
         from(project.projectDir.parentFile.resolve("About"))
     }
-    into("$friendlyName/Assemblies") {
-        from(project.projectDir.parentFile.resolve("Assemblies"))
-    }
-    /*into("${rootProject.friendlyName}/Defs") {
+    into("$friendlyName/Defs") {
         from(project.projectDir.parentFile.resolve("Defs"))
-    }*/
+    }
     into("$friendlyName/Source/${rootProject.name}") {
         from(project.projectDir.parentFile.resolve("Source/${rootProject.name}"))
         excludes.add("**/obj/**")
+        excludes.add("**/bin/**")
     }
 }
 
 tasks.clean {
-    dependsOn("buildC#")
-    delete.add(project.projectDir.parentFile.resolve("Assemblies"))
-    delete.add(project.projectDir.parentFile.resolve("1.3/Assemblies"))
+    delete.add(project.projectDir.parentFile.resolve("1.3"))
+    delete.add(project.projectDir.parentFile.resolve("1.4"))
+    delete.add(project.projectDir.parentFile.resolve("1.5"))
+    delete.add(project.projectDir.parentFile.resolve("About"))
 }
 
 tasks.build {

Source/global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
+  }
+}

Source/gradle/libs.versions.toml

@@ -0,0 +1,11 @@
+[versions]
+versions = "0.51.0"
+msbuild = "4.6"
+
+[libraries]
+
+[bundles]
+
+[plugins]
+versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
+msbuild = { id = "com.ullink.msbuild", version.ref = "msbuild" }

Source/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Source/gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

Source/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal