Merge branch 'release/5380.0.1.4'

This commit is contained in:
Stardust3D 2024-03-25 10:42:24 +01:00
commit 6025f0ae53
11 changed files with 133 additions and 21 deletions

Binary file not shown.

Binary file not shown.

View file

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

View file

@ -5,7 +5,9 @@ VisualStudioVersion = 17.1.32113.165
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}") = "RJW_patch_Autopsy_1.4", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.4.csproj", "{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}"
Project("{AE4F3486-62B9-4146-845F-22D8FFA362AE}") = "RJW_patch_Autopsy_1.4", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.4.csproj", "{FC20CA27-4400-4AAC-99AF-F18CAFAC942E}"
EndProject
Project("{37127962-1266-4597-90C6-EBE1D79600EA}") = "RJW_patch_Autopsy_1.5", "RJW_patch_Autopsy\RJW_patch_Autopsy_1.5.csproj", "{25A0821A-6B42-4FB0-A454-0AD22A7716E7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View file

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

View file

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

View file

@ -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\" />

View file

@ -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\" />

View 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>

View file

@ -7,10 +7,11 @@
*/
plugins {
id("com.ullink.msbuild") version "3.15"
alias(libs.plugins.msbuild)
alias(libs.plugins.versions)
}
version = "5371.0.1.4"
version = "5380.0.1.4"
val friendlyName = "rjw-patch-autopsy"
tasks.register<com.ullink.Msbuild>("buildC#_1.3") {
@ -37,6 +38,18 @@ tasks.register<com.ullink.Msbuild>("buildC#_1.4") {
// 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")
@ -73,6 +86,24 @@ tasks.register<Exec>("sign_1.4") {
)
}
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_about")
}
@ -106,6 +137,12 @@ tasks.register<Copy>("copyDll_1.4") {
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("clean", ":copy")
into("$friendlyName/1.3") {

View file

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