mirror of
				https://gitgud.io/Stardust3D/rjw-patch-autopsy.git
				synced 2024-08-15 00:43:41 +00:00 
			
		
		
		
	Merge branch 'release/5380.0.1.4'
This commit is contained in:
		
						commit
						6025f0ae53
					
				
					 11 changed files with 133 additions and 21 deletions
				
			
		| 
						 | 
				
			
			@ -2,5 +2,5 @@
 | 
			
		|||
 | 
			
		||||
<Manifest>
 | 
			
		||||
    <identifier>RJW patch - Harvest Organs Post Mortem</identifier>
 | 
			
		||||
    <version>5371.0.1.4</version>
 | 
			
		||||
    <version>5380.0.1.4</version>
 | 
			
		||||
</Manifest>
 | 
			
		||||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,10 +13,10 @@
 | 
			
		|||
        <TargetFrameworkProfile>
 | 
			
		||||
        </TargetFrameworkProfile>
 | 
			
		||||
        <LangVersion>11</LangVersion>
 | 
			
		||||
        <Copyright>©2023 Stardust3D</Copyright>
 | 
			
		||||
        <Copyright>©2024 Stardust3D</Copyright>
 | 
			
		||||
        <Company>Stardust3D</Company>
 | 
			
		||||
        <AssemblyVersion>5371.0.1.4</AssemblyVersion>
 | 
			
		||||
        <FileVersion>5371.0.1.4</FileVersion>
 | 
			
		||||
        <AssemblyVersion>5380.0.1.4</AssemblyVersion>
 | 
			
		||||
        <FileVersion>5380.0.1.4</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>
 | 
			
		||||
| 
						 | 
				
			
			@ -26,12 +26,13 @@
 | 
			
		|||
    </PropertyGroup>
 | 
			
		||||
    <ItemGroup>
 | 
			
		||||
        <None Remove="1.4\**"/>
 | 
			
		||||
        <None Remove="1.5\**"/>
 | 
			
		||||
    </ItemGroup>
 | 
			
		||||
    <ItemGroup>
 | 
			
		||||
        <PackageReference Include="Lib.Harmony" Version="2.2.2"/>
 | 
			
		||||
        <PackageReference Include="Lib.Harmony" Version="2.3.1.1" />
 | 
			
		||||
        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
 | 
			
		||||
        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704"/>
 | 
			
		||||
        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="10.0.1"/>
 | 
			
		||||
        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.3.3389" />
 | 
			
		||||
        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
 | 
			
		||||
    </ItemGroup>
 | 
			
		||||
    <ItemGroup>
 | 
			
		||||
        <Reference Include="Autopsy">
 | 
			
		||||
| 
						 | 
				
			
			@ -43,9 +44,11 @@
 | 
			
		|||
    </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\" />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,10 +13,10 @@
 | 
			
		|||
        <TargetFrameworkProfile>
 | 
			
		||||
        </TargetFrameworkProfile>
 | 
			
		||||
        <LangVersion>11</LangVersion>
 | 
			
		||||
        <Copyright>©2023 Stardust3D</Copyright>
 | 
			
		||||
        <Copyright>©2024 Stardust3D</Copyright>
 | 
			
		||||
        <Company>Stardust3D</Company>
 | 
			
		||||
        <AssemblyVersion>5371.0.1.4</AssemblyVersion>
 | 
			
		||||
        <FileVersion>5371.0.1.4</FileVersion>
 | 
			
		||||
        <AssemblyVersion>5380.0.1.4</AssemblyVersion>
 | 
			
		||||
        <FileVersion>5380.0.1.4</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>
 | 
			
		||||
| 
						 | 
				
			
			@ -26,12 +26,13 @@
 | 
			
		|||
    </PropertyGroup>
 | 
			
		||||
    <ItemGroup>
 | 
			
		||||
        <None Remove="1.3\**"/>
 | 
			
		||||
        <None Remove="1.5\**"/>
 | 
			
		||||
    </ItemGroup>
 | 
			
		||||
    <ItemGroup>
 | 
			
		||||
        <PackageReference Include="Lib.Harmony" Version="2.2.2"/>
 | 
			
		||||
        <PackageReference Include="Lib.Harmony" Version="2.3.1.1" />
 | 
			
		||||
        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
 | 
			
		||||
        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704"/>
 | 
			
		||||
        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="10.0.1"/>
 | 
			
		||||
        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" />
 | 
			
		||||
        <PackageReference Include="UnlimitedHugs.Rimworld.HugsLib" Version="11.0.3" />
 | 
			
		||||
    </ItemGroup>
 | 
			
		||||
    <ItemGroup>
 | 
			
		||||
        <Reference Include="Autopsy">
 | 
			
		||||
| 
						 | 
				
			
			@ -43,9 +44,11 @@
 | 
			
		|||
    </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\" />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										56
									
								
								Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -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>5380.0.1.4</AssemblyVersion>
 | 
			
		||||
        <FileVersion>5380.0.1.4</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.1.1" />
 | 
			
		||||
        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
 | 
			
		||||
        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4042-beta" />
 | 
			
		||||
        <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>
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue